From 8087085fc050095b20aa8a300f66d60bad1bac39 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Mon, 22 Jul 2013 02:32:36 +0200
Subject: [PATCH] Updated KeePassKit Submodule Minor changes to localization

---
 KeePassKit                           |   2 +-
 MacPass/MacPass-Info.plist           |   2 +-
 MacPass/en.lproj/Localizable.strings | Bin 11244 -> 11702 bytes
 MacPassTests/KPKTreeLoadingTest.m    |   8 ++++----
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/KeePassKit b/KeePassKit
index 4e8693c8..3c0af98c 160000
--- a/KeePassKit
+++ b/KeePassKit
@@ -1 +1 @@
-Subproject commit 4e8693c89c269534ee578a012ff08dfa571d1d50
+Subproject commit 3c0af98c46e8ec2d50653bd8f7b62410f5144c20
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 74e37406..6c06ec7c 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2521</string>
+	<string>2522</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 459b2cbe45f0cae9b432371bcf2eb8348384e0e2..135e3db750dd5bcbb6d98d90444bd231820f6780 100644
GIT binary patch
delta 403
zcmb79F%E)25S&(wzTu#u;0eaU0tf-bphgo5V-zEaf)PyYc*H$KEB|6|=_4G3SXfCW
zyL+>{nVoyh?u*;gkc!a_T$scN1B?j^4m|QDqpUt-hzYsRNx9*W+t47;XK0-55b-tV
zh6f?9x~k@N&*dbd_6iwcA;$i*8_9>R79j$n)NXp~f&-NVwqM0HQY6TEDQ3+$OV|+z
snN#*FzTtHZJt)kk>=^CB=0<=iJvMhy|M(9VHcoVL#_`uji&iSU0X{85)c^nh

delta 16
TcmdlM{U&_F6KxJI1_%TIHsS<C

diff --git a/MacPassTests/KPKTreeLoadingTest.m b/MacPassTests/KPKTreeLoadingTest.m
index bb7a511a..0ab4637e 100644
--- a/MacPassTests/KPKTreeLoadingTest.m
+++ b/MacPassTests/KPKTreeLoadingTest.m
@@ -7,7 +7,7 @@
 //
 
 #import "KPKTreeLoadingTest.h"
-#import "KPKTreeLoader.h"
+#import "KPKTreeCryptor.h"
 #import "KPKPassword.h"
 
 @implementation KPKTreeLoadingTest
@@ -25,9 +25,9 @@
 }
 
 - (void)testLoading {
-  KPKTreeLoader *loader = [[KPKTreeLoader alloc] initWithData:_data password:_password];
-  KPKTree *tree = [loader loadTree:NULL];
-  STAssertNil(tree, @"Loading should broken");
+  KPKTreeCryptor *cryptor = [KPKTreeCryptor treeCryptorWithData:_data password:_password];
+  KPKTree *tree = [cryptor decryptTree:NULL];
+  STAssertNotNil(tree, @"Loading should result in a tree object");
 }
 
 @end