Updated Screenshots

Fixed some localization errors

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "CocoaHTTPServer"]
 	path = CocoaHTTPServer
 	url = git://github.com/robbiehanson/CocoaHTTPServer.git
+[submodule "KeePassKit"]
+	path = KeePassKit
+	url = https://mstarke@github.com/mstarke/KeePassKit

MacPass.xcodeproj/project.pbxproj

@@ -10,7 +10,11 @@
 		4C01C23F1764D2980016D5D0 /* KdbEntry+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C23E1764D2980016D5D0 /* KdbEntry+Undo.m */; };
 		4C01C2421764D8980016D5D0 /* MPContextMenuHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */; };
 		4C01C245176500C40016D5D0 /* HNHLevelIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */; };
+		4C10412C178CDD44001B5239 /* NSDate+Humanized.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C10412B178CDD44001B5239 /* NSDate+Humanized.m */; };
 		4C16BA6217879A3C002B42BD /* MPPasswordStringFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */; };
+		4C18F9AB178E122500890BCE /* Test_Password_1234.kdb in Resources */ = {isa = PBXBuildFile; fileRef = 4C18F9AA178E122500890BCE /* Test_Password_1234.kdb */; };
+		4C19E500178E26EF002F2CD0 /* Test_Password_1234.kdbx in Resources */ = {isa = PBXBuildFile; fileRef = 4C19E4FF178E26EF002F2CD0 /* Test_Password_1234.kdbx */; };
+		4C19E503178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C19E502178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m */; };
 		4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */; };
 		4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C22040C1746ED160054C916 /* KdbGroup+Undo.m */; };
 		4C245B76176E1E3D0086100E /* DDData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C245A6A176E1E3C0086100E /* DDData.m */; };
@@ -42,7 +46,7 @@
 		4C2724CE1778EFB100FD8456 /* NSData+Random.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724CD1778EFB100FD8456 /* NSData+Random.m */; };
 		4C2724D11778EFE300FD8456 /* NSString+Empty.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D01778EFE300FD8456 /* NSString+Empty.m */; };
 		4C2724D41778FA0700FD8456 /* NSDate+Packed.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D31778FA0700FD8456 /* NSDate+Packed.m */; };
-		4C2724D71778FF1A00FD8456 /* NSUUID+KeePassLib.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D61778FF1A00FD8456 /* NSUUID+KeePassLib.m */; };
+		4C2724D71778FF1A00FD8456 /* NSUUID+KeePassKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D61778FF1A00FD8456 /* NSUUID+KeePassKit.m */; };
 		4C2724DA17790E7C00FD8456 /* NSMutableData+Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2724D917790E7C00FD8456 /* NSMutableData+Base64.m */; };
 		4C2A6134177A1D5F00C9826C /* KPLErrorCodes.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2A6133177A1D5F00C9826C /* KPLErrorCodes.m */; };
 		4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPTreeTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPTreeTools.m */; };
@@ -57,14 +61,23 @@
 		4C36E5B4177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C36E5B3177CD4FB00152132 /* Kdb4Tree+KVOAdditions.m */; };
 		4C37A6731769393300AD0A40 /* HNHTableHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A6721769393300AD0A40 /* HNHTableHeaderCell.m */; };
 		4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; };
+		4C39B3F5178FEFAE0027DC7C /* KPKNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C39B3F4178FEFAE0027DC7C /* KPKNode.m */; };
 		4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */; };
 		4C3D4C0817594CA40038DAAC /* HNHSeparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3D4C0717594CA40038DAAC /* HNHSeparator.m */; };
 		4C3E1CC0177DEFB3003BD9BD /* StringField+Undo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3E1CBF177DEFB3003BD9BD /* StringField+Undo.m */; };
+		4C3F28541791EDFD00703281 /* KPKErrors.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3F28531791EDFD00703281 /* KPKErrors.m */; };
+		4C3F28581791F04F00703281 /* LocalizableErrors.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C3F28571791F04F00703281 /* LocalizableErrors.strings */; };
 		4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */; };
 		4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */; };
 		4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */; };
+		4C4436771792BE810099E220 /* KPKFormat.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4436761792BE810099E220 /* KPKFormat.m */; };
+		4C45FB1C178E09ED0010007D /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C45FB1B178E09ED0010007D /* SenTestingKit.framework */; };
+		4C45FB1D178E09ED0010007D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77E36615B84A240093A587 /* Cocoa.framework */; };
+		4C45FB23178E09ED0010007D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C45FB21178E09ED0010007D /* InfoPlist.strings */; };
+		4C45FB2D178E0BCB0010007D /* MPDatabaseLoading.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C45FB2C178E0BCB0010007D /* MPDatabaseLoading.m */; };
+		4C45FB30178E0CE20010007D /* MPDatabaseCreation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C45FB2F178E0CE20010007D /* MPDatabaseCreation.m */; };
 		4C46B88517063A070046109A /* NSString+MPPasswordCreation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */; };
-		4C46B88817063A170046109A /* NSString+MPPasswordAnalysis.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88717063A170046109A /* NSString+MPPasswordAnalysis.m */; };
+		4C46B88817063A170046109A /* NSString+PasswordStrength.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46B88717063A170046109A /* NSString+PasswordStrength.m */; };
 		4C46E09E17673A0A00DA62E8 /* HNHShadowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */; };
 		4C4A100F176286FD00BBF2CA /* MPTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A100E176286FD00BBF2CA /* MPTableView.m */; };
 		4C4A101217629DA900BBF2CA /* KdbGroup+KVOAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A101117629DA900BBF2CA /* KdbGroup+KVOAdditions.m */; };
@@ -82,8 +95,10 @@
 		4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */; };
 		4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */; };
 		4C58BD4F176370B100B8178C /* HNHBadgedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C58BD4E176370B100B8178C /* HNHBadgedTextField.m */; };
+		4C591B57178F897A0080B16B /* KPKAttachment.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C591B56178F897A0080B16B /* KPKAttachment.m */; };
 		4C5A11FE1708DE8700223D8A /* MPPasswordCreatorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5A11FC1708DE8700223D8A /* MPPasswordCreatorViewController.m */; };
 		4C5A11FF1708DE8800223D8A /* PasswordCreatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */; };
+		4C5AA591179549A1008ECAD7 /* KPKXmlTreeWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5AA590179549A1008ECAD7 /* KPKXmlTreeWriter.m */; };
 		4C5BF67B175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5BF67A175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m */; };
 		4C5EC302177B700D00DA955B /* MPRootAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5EC301177B700D00DA955B /* MPRootAdapter.m */; };
 		4C5FE9AE17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5FE9AD17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m */; };
@@ -127,6 +142,8 @@
 		4C6D1D27178586CA0014C5A5 /* 99_AddFolderTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */; };
 		4C6D1D2B17858A250014C5A5 /* MacPass.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D2A17858A250014C5A5 /* MacPass.icns */; };
 		4C701CBC178618A000581B88 /* 12_RemoteTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */; };
+		4C70D0FD1790924700652EE9 /* KPKParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C70D0FC1790924700652EE9 /* KPKParser.m */; };
+		4C70D100179092F200652EE9 /* KPKPassword.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C70D0FF179092F200652EE9 /* KPKPassword.m */; };
 		4C74DD07177BD1640034A9DB /* MPCustomFieldView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C74DD06177BD1640034A9DB /* MPCustomFieldView.m */; };
 		4C76155C1764C04C0015A1A6 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */; };
 		4C7615681764C0C40015A1A6 /* PasswordInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76156A1764C0C40015A1A6 /* PasswordInputView.xib */; };
@@ -141,6 +158,7 @@
 		4C77E37D15B84A240093A587 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E37B15B84A240093A587 /* MainMenu.xib */; };
 		4C79DF2A176685870083708F /* HNHRoundedTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C79DF29176685870083708F /* HNHRoundedTextField.m */; };
 		4C7F35681779DFFB00C57890 /* Errors.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C7F356A1779DFFB00C57890 /* Errors.strings */; };
+		4C801AFC179310E2002821E3 /* NSString+Hexdata.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C801AFB179310E2002821E3 /* NSString+Hexdata.m */; };
 		4C80BB6F176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */; };
 		4C811C8316ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */; };
 		4C83814215BF4677001AE468 /* MPDocumentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPDocumentWindowController.m */; };
@@ -149,6 +167,7 @@
 		4C888C9016EB6C91003D34A1 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C888C8E16EB6C91003D34A1 /* Localizable.strings */; };
 		4C888C9316EB6F5E003D34A1 /* MPToolbarItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C888C9216EB6F5E003D34A1 /* MPToolbarItem.m */; };
 		4C888C9716EB754B003D34A1 /* MPActionHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C888C9616EB754B003D34A1 /* MPActionHelper.m */; };
+		4C8A173D1790AA41008B5C17 /* NSData+Keyfile.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C8A173C1790AA41008B5C17 /* NSData+Keyfile.m */; };
 		4C8FECC816D57E3200BF26CF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C8FECC716D57E3200BF26CF /* QuartzCore.framework */; };
 		4C920E2A16DCDFA00083839B /* MPLoggerProxy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C920E2916DCDFA00083839B /* MPLoggerProxy.m */; };
 		4C9D6AA917615199001C660C /* HNHRoundedSecureTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C9D6AA817615199001C660C /* HNHRoundedSecureTextFieldCell.m */; };
@@ -174,6 +193,9 @@
 		4CC672791781D0C0006DEDCF /* KdbGroup+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC672781781D0C0006DEDCF /* KdbGroup+MPAdditions.m */; };
 		4CC6727C1781D0D2006DEDCF /* KdbEntry+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6727B1781D0D2006DEDCF /* KdbEntry+MPAdditions.m */; };
 		4CC7EA1B17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7EA1A17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m */; };
+		4CD3ABBA178F71B50073F5C5 /* KPKTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABB4178F71B50073F5C5 /* KPKTree.m */; };
+		4CD3ABBF178F72610073F5C5 /* KPKEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABBE178F72610073F5C5 /* KPKEntry.m */; };
+		4CD3ABC2178F72720073F5C5 /* KPKGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABC1178F72720073F5C5 /* KPKGroup.m */; };
 		4CD5D702177A5EE400100649 /* DatabaseSettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CD5D701177A5EE400100649 /* DatabaseSettingsWindow.xib */; };
 		4CD5D705177A5F3300100649 /* MPDatabaseSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD5D704177A5F3300100649 /* MPDatabaseSettingsWindowController.m */; };
 		4CD6C5AE1789FDE6000891F6 /* HNHRoundedSecureTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD6C5AD1789FDE6000891F6 /* HNHRoundedSecureTextField.m */; };
@@ -183,7 +205,9 @@
 		4CD78ABF16D155FF00768A1D /* 10_ContactTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78ABA16D155FF00768A1D /* 10_ContactTemplate.pdf */; };
 		4CD78AC016D155FF00768A1D /* 11_CameraTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78ABB16D155FF00768A1D /* 11_CameraTemplate.pdf */; };
 		4CD884B715BD47080042BBF8 /* DocumentWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CD884B615BD47080042BBF8 /* DocumentWindow.xib */; };
+		4CDB5C421794AA4F0017667E /* KPKTree+Serializing.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CDB5C411794AA4F0017667E /* KPKTree+Serializing.m */; };
 		4CDF01A316D1B76700D0AC08 /* MPEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CDF01A216D1B76700D0AC08 /* MPEntryViewController.m */; };
+		4CE298EB1795FC2A00DF7BDB /* MPEntryMenuDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE298EA1795FC2A00DF7BDB /* MPEntryMenuDelegate.m */; };
 		4CE39ABF16ECE34A000FE29D /* MPIconSelectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE39ABE16ECE34A000FE29D /* MPIconSelectViewController.m */; };
 		4CE39AC116ECE359000FE29D /* IconSelection.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CE39AC016ECE359000FE29D /* IconSelection.xib */; };
 		4CE39AC416ECE4F7000FE29D /* MPPopupImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE39AC316ECE4F7000FE29D /* MPPopupImageView.m */; };
@@ -192,6 +216,7 @@
 		4CE8247516E2F2B900573141 /* MPOverlayView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CE8247416E2F2B900573141 /* MPOverlayView.m */; };
 		4CF1F0CA1786B37900CD920E /* NSData+Gzip.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF1F0C81786B37900CD920E /* NSData+Gzip.m */; };
 		4CF29BF417879D0000851B60 /* 26_FileSaveTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CF29BF317879D0000851B60 /* 26_FileSaveTemplate.pdf */; };
+		4CF62B86179385D700B660B6 /* KPKAttribute.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF62B85179385D700B660B6 /* KPKAttribute.m */; };
 		4CF6C711176F4533007A811D /* MPStringLengthValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF6C710176F4533007A811D /* MPStringLengthValueTransformer.m */; };
 		4CF6C718176F5234007A811D /* MPAssociateRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF6C717176F5234007A811D /* MPAssociateRequestHandler.m */; };
 		4CF78057176E5CFD0032EE71 /* MPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78056176E5CFD0032EE71 /* MPConnection.m */; };
@@ -209,8 +234,14 @@
 		4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPContextMenuHelper.m; sourceTree = "<group>"; };
 		4C01C243176500C40016D5D0 /* HNHLevelIndicatorCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHLevelIndicatorCell.h; sourceTree = "<group>"; };
 		4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHLevelIndicatorCell.m; sourceTree = "<group>"; };
+		4C10412A178CDD44001B5239 /* NSDate+Humanized.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Humanized.h"; sourceTree = "<group>"; };
+		4C10412B178CDD44001B5239 /* NSDate+Humanized.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Humanized.m"; sourceTree = "<group>"; };
 		4C16BA6017879A3C002B42BD /* MPPasswordStringFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordStringFormatter.h; sourceTree = "<group>"; };
 		4C16BA6117879A3C002B42BD /* MPPasswordStringFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordStringFormatter.m; sourceTree = "<group>"; };
+		4C18F9AA178E122500890BCE /* Test_Password_1234.kdb */ = {isa = PBXFileReference; lastKnownFileType = file; name = Test_Password_1234.kdb; path = Databases/Test_Password_1234.kdb; sourceTree = "<group>"; };
+		4C19E4FF178E26EF002F2CD0 /* Test_Password_1234.kdbx */ = {isa = PBXFileReference; lastKnownFileType = file; name = Test_Password_1234.kdbx; path = Databases/Test_Password_1234.kdbx; sourceTree = "<group>"; };
+		4C19E501178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabasePasswordAndKeyfile.h; sourceTree = "<group>"; };
+		4C19E502178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabasePasswordAndKeyfile.m; sourceTree = "<group>"; };
 		4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorWindow.xib; sourceTree = "<group>"; };
 		4C22040B1746ED160054C916 /* KdbGroup+Undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+Undo.h"; sourceTree = "<group>"; };
 		4C22040C1746ED160054C916 /* KdbGroup+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbGroup+Undo.m"; sourceTree = "<group>"; };
@@ -273,8 +304,8 @@
 		4C2724D01778EFE300FD8456 /* NSString+Empty.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Empty.m"; sourceTree = "<group>"; };
 		4C2724D21778FA0700FD8456 /* NSDate+Packed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+Packed.h"; sourceTree = "<group>"; };
 		4C2724D31778FA0700FD8456 /* NSDate+Packed.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDate+Packed.m"; sourceTree = "<group>"; };
-		4C2724D51778FF1A00FD8456 /* NSUUID+KeePassLib.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSUUID+KeePassLib.h"; sourceTree = "<group>"; };
+		4C2724D51778FF1A00FD8456 /* NSUUID+KeePassKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSUUID+KeePassKit.h"; sourceTree = "<group>"; };
-		4C2724D61778FF1A00FD8456 /* NSUUID+KeePassLib.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSUUID+KeePassLib.m"; sourceTree = "<group>"; };
+		4C2724D61778FF1A00FD8456 /* NSUUID+KeePassKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSUUID+KeePassKit.m"; sourceTree = "<group>"; };
 		4C2724D817790E7C00FD8456 /* NSMutableData+Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSMutableData+Base64.h"; sourceTree = "<group>"; };
 		4C2724D917790E7C00FD8456 /* NSMutableData+Base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableData+Base64.m"; sourceTree = "<group>"; };
 		4C2A6132177A181300C9826C /* KPLErrorCodes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPLErrorCodes.h; sourceTree = "<group>"; };
@@ -297,20 +328,36 @@
 		4C37A6721769393300AD0A40 /* HNHTableHeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHTableHeaderCell.m; sourceTree = "<group>"; };
 		4C37A83E15B8B474005EF8EE /* MPOutlineDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineDataSource.h; sourceTree = "<group>"; };
 		4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineDataSource.m; sourceTree = "<group>"; };
+		4C39B3F3178FEFAE0027DC7C /* KPKNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKNode.h; sourceTree = "<group>"; };
+		4C39B3F4178FEFAE0027DC7C /* KPKNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKNode.m; sourceTree = "<group>"; };
 		4C3BD51316D276F800389F1F /* MPToolbarDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPToolbarDelegate.h; sourceTree = "<group>"; };
 		4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarDelegate.m; sourceTree = "<group>"; };
 		4C3D4C0617594CA40038DAAC /* HNHSeparator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHSeparator.h; sourceTree = "<group>"; };
 		4C3D4C0717594CA40038DAAC /* HNHSeparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHSeparator.m; sourceTree = "<group>"; };
 		4C3E1CBE177DEFB3003BD9BD /* StringField+Undo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "StringField+Undo.h"; sourceTree = "<group>"; };
 		4C3E1CBF177DEFB3003BD9BD /* StringField+Undo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "StringField+Undo.m"; sourceTree = "<group>"; };
+		4C3F28521791EDE800703281 /* KPKErrors.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KPKErrors.h; sourceTree = "<group>"; };
+		4C3F28531791EDFD00703281 /* KPKErrors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKErrors.m; sourceTree = "<group>"; };
+		4C3F28571791F04F00703281 /* LocalizableErrors.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = LocalizableErrors.strings; path = Resources/LocalizableErrors.strings; sourceTree = "<group>"; };
 		4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterBar.xib; sourceTree = "<group>"; };
 		4C431BCB16E2A82700700A81 /* MPPasteBoardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasteBoardController.h; sourceTree = "<group>"; };
 		4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasteBoardController.m; sourceTree = "<group>"; };
 		4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OverlayWindow.xib; sourceTree = "<group>"; };
+		4C4436751792BE810099E220 /* KPKFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKFormat.h; sourceTree = "<group>"; };
+		4C4436761792BE810099E220 /* KPKFormat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKFormat.m; sourceTree = "<group>"; };
+		4C45FB1A178E09ED0010007D /* MacPassTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MacPassTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
+		4C45FB1B178E09ED0010007D /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
+		4C45FB20178E09ED0010007D /* MacPassTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "MacPassTests-Info.plist"; sourceTree = "<group>"; };
+		4C45FB22178E09ED0010007D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		4C45FB27178E09ED0010007D /* MacPassTests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MacPassTests-Prefix.pch"; sourceTree = "<group>"; };
+		4C45FB2B178E0BCB0010007D /* MPDatabaseLoading.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabaseLoading.h; sourceTree = "<group>"; };
+		4C45FB2C178E0BCB0010007D /* MPDatabaseLoading.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseLoading.m; sourceTree = "<group>"; };
+		4C45FB2E178E0CE20010007D /* MPDatabaseCreation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabaseCreation.h; sourceTree = "<group>"; };
+		4C45FB2F178E0CE20010007D /* MPDatabaseCreation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseCreation.m; sourceTree = "<group>"; };
 		4C46B88317063A070046109A /* NSString+MPPasswordCreation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+MPPasswordCreation.h"; sourceTree = "<group>"; };
 		4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+MPPasswordCreation.m"; sourceTree = "<group>"; };
-		4C46B88617063A170046109A /* NSString+MPPasswordAnalysis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+MPPasswordAnalysis.h"; sourceTree = "<group>"; };
+		4C46B88617063A170046109A /* NSString+PasswordStrength.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+PasswordStrength.h"; sourceTree = "<group>"; };
-		4C46B88717063A170046109A /* NSString+MPPasswordAnalysis.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+MPPasswordAnalysis.m"; sourceTree = "<group>"; };
+		4C46B88717063A170046109A /* NSString+PasswordStrength.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+PasswordStrength.m"; sourceTree = "<group>"; };
 		4C46E09C17673A0A00DA62E8 /* HNHShadowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHShadowBox.h; sourceTree = "<group>"; };
 		4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHShadowBox.m; sourceTree = "<group>"; };
 		4C4A100D176286FD00BBF2CA /* MPTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPTableView.h; sourceTree = "<group>"; };
@@ -338,9 +385,13 @@
 		4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 02_MessageBoxWarningTemplate.pdf; sourceTree = "<group>"; };
 		4C58BD4D176370B100B8178C /* HNHBadgedTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHBadgedTextField.h; sourceTree = "<group>"; };
 		4C58BD4E176370B100B8178C /* HNHBadgedTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHBadgedTextField.m; sourceTree = "<group>"; };
+		4C591B55178F897A0080B16B /* KPKAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKAttachment.h; sourceTree = "<group>"; };
+		4C591B56178F897A0080B16B /* KPKAttachment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKAttachment.m; sourceTree = "<group>"; };
 		4C5A11FB1708DE8700223D8A /* MPPasswordCreatorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordCreatorViewController.h; sourceTree = "<group>"; };
 		4C5A11FC1708DE8700223D8A /* MPPasswordCreatorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordCreatorViewController.m; sourceTree = "<group>"; };
 		4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorView.xib; sourceTree = "<group>"; };
+		4C5AA58F179549A1008ECAD7 /* KPKXmlTreeWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKXmlTreeWriter.h; sourceTree = "<group>"; };
+		4C5AA590179549A1008ECAD7 /* KPKXmlTreeWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKXmlTreeWriter.m; sourceTree = "<group>"; };
 		4C5ADC2E17830AFB004E1E8D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InspectorView.strings; sourceTree = "<group>"; };
 		4C5ADC3017830B09004E1E8D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InspectorView.strings; sourceTree = "<group>"; };
 		4C5BF679175C01F300D53DF7 /* MPUppercaseStringValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPUppercaseStringValueTransformer.h; sourceTree = "<group>"; };
@@ -427,6 +478,10 @@
 		4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 99_AddFolderTemplate.pdf; sourceTree = "<group>"; };
 		4C6D1D2A17858A250014C5A5 /* MacPass.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacPass.icns; path = "../Assets/App icon/MacPass.icns"; sourceTree = "<group>"; };
 		4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 12_RemoteTemplate.pdf; sourceTree = "<group>"; };
+		4C70D0FB1790924700652EE9 /* KPKParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKParser.h; sourceTree = "<group>"; };
+		4C70D0FC1790924700652EE9 /* KPKParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKParser.m; sourceTree = "<group>"; };
+		4C70D0FE179092F200652EE9 /* KPKPassword.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKPassword.h; sourceTree = "<group>"; };
+		4C70D0FF179092F200652EE9 /* KPKPassword.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKPassword.m; sourceTree = "<group>"; };
 		4C74DD05177BD1640034A9DB /* MPCustomFieldView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCustomFieldView.h; sourceTree = "<group>"; };
 		4C74DD06177BD1640034A9DB /* MPCustomFieldView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCustomFieldView.m; sourceTree = "<group>"; };
 		4C76155F1764C0590015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/GeneralSettings.xib; sourceTree = "<group>"; };
@@ -456,8 +511,10 @@
 		4C77E37915B84A240093A587 /* MPAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate.m; sourceTree = "<group>"; };
 		4C79DF28176685870083708F /* HNHRoundedTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHRoundedTextField.h; sourceTree = "<group>"; };
 		4C79DF29176685870083708F /* HNHRoundedTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHRoundedTextField.m; sourceTree = "<group>"; };
-		4C7F35691779DFFB00C57890 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Errors.strings; sourceTree = "<group>"; };
+		4C7F35691779DFFB00C57890 /* en */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Errors.strings; sourceTree = "<group>"; };
-		4C7F356B1779DFFF00C57890 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Errors.strings; sourceTree = "<group>"; };
+		4C7F356B1779DFFF00C57890 /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Errors.strings; sourceTree = "<group>"; };
+		4C801AFA179310E2002821E3 /* NSString+Hexdata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+Hexdata.h"; sourceTree = "<group>"; };
+		4C801AFB179310E2002821E3 /* NSString+Hexdata.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Hexdata.m"; sourceTree = "<group>"; };
 		4C80BB6D176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHScrollDocumentViewAdapter.h; sourceTree = "<group>"; };
 		4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHScrollDocumentViewAdapter.m; sourceTree = "<group>"; };
 		4C811C8116ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPKeyfilePathControlDelegate.h; sourceTree = "<group>"; };
@@ -473,6 +530,8 @@
 		4C888C9216EB6F5E003D34A1 /* MPToolbarItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarItem.m; sourceTree = "<group>"; };
 		4C888C9516EB754B003D34A1 /* MPActionHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPActionHelper.h; sourceTree = "<group>"; };
 		4C888C9616EB754B003D34A1 /* MPActionHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPActionHelper.m; sourceTree = "<group>"; };
+		4C8A173B1790AA41008B5C17 /* NSData+Keyfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Keyfile.h"; sourceTree = "<group>"; };
+		4C8A173C1790AA41008B5C17 /* NSData+Keyfile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Keyfile.m"; sourceTree = "<group>"; };
 		4C8FECC716D57E3200BF26CF /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		4C920E2816DCDFA00083839B /* MPLoggerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPLoggerProxy.h; sourceTree = "<group>"; };
 		4C920E2916DCDFA00083839B /* MPLoggerProxy.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPLoggerProxy.m; sourceTree = "<group>"; };
@@ -523,6 +582,13 @@
 		4CC6727B1781D0D2006DEDCF /* KdbEntry+MPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KdbEntry+MPAdditions.m"; sourceTree = "<group>"; };
 		4CC7EA1917807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHRoundendTextFieldCellHelper.h; sourceTree = "<group>"; };
 		4CC7EA1A17807E7E0089D4F3 /* HNHRoundendTextFieldCellHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHRoundendTextFieldCellHelper.m; sourceTree = "<group>"; };
+		4CD3ABB2178F71B50073F5C5 /* KPKVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKVersion.h; sourceTree = "<group>"; };
+		4CD3ABB3178F71B50073F5C5 /* KPKTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKTree.h; sourceTree = "<group>"; };
+		4CD3ABB4178F71B50073F5C5 /* KPKTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTree.m; sourceTree = "<group>"; };
+		4CD3ABBD178F72610073F5C5 /* KPKEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKEntry.h; sourceTree = "<group>"; };
+		4CD3ABBE178F72610073F5C5 /* KPKEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKEntry.m; sourceTree = "<group>"; };
+		4CD3ABC0178F72720073F5C5 /* KPKGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKGroup.h; sourceTree = "<group>"; };
+		4CD3ABC1178F72720073F5C5 /* KPKGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKGroup.m; sourceTree = "<group>"; };
 		4CD5D701177A5EE400100649 /* DatabaseSettingsWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DatabaseSettingsWindow.xib; sourceTree = "<group>"; };
 		4CD5D703177A5F3300100649 /* MPDatabaseSettingsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabaseSettingsWindowController.h; sourceTree = "<group>"; };
 		4CD5D704177A5F3300100649 /* MPDatabaseSettingsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseSettingsWindowController.m; sourceTree = "<group>"; };
@@ -534,8 +600,12 @@
 		4CD78ABA16D155FF00768A1D /* 10_ContactTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 10_ContactTemplate.pdf; sourceTree = "<group>"; };
 		4CD78ABB16D155FF00768A1D /* 11_CameraTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 11_CameraTemplate.pdf; sourceTree = "<group>"; };
 		4CD884B615BD47080042BBF8 /* DocumentWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DocumentWindow.xib; sourceTree = "<group>"; };
+		4CDB5C401794AA4F0017667E /* KPKTree+Serializing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "KPKTree+Serializing.h"; path = "../Core/KPKTree+Serializing.h"; sourceTree = "<group>"; };
+		4CDB5C411794AA4F0017667E /* KPKTree+Serializing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "KPKTree+Serializing.m"; path = "../Core/KPKTree+Serializing.m"; sourceTree = "<group>"; };
 		4CDF01A116D1B76700D0AC08 /* MPEntryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEntryViewController.h; sourceTree = "<group>"; };
 		4CDF01A216D1B76700D0AC08 /* MPEntryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPEntryViewController.m; sourceTree = "<group>"; };
+		4CE298E91795FC2A00DF7BDB /* MPEntryMenuDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEntryMenuDelegate.h; sourceTree = "<group>"; };
+		4CE298EA1795FC2A00DF7BDB /* MPEntryMenuDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPEntryMenuDelegate.m; sourceTree = "<group>"; };
 		4CE39ABD16ECE34A000FE29D /* MPIconSelectViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPIconSelectViewController.h; sourceTree = "<group>"; };
 		4CE39ABE16ECE34A000FE29D /* MPIconSelectViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPIconSelectViewController.m; sourceTree = "<group>"; };
 		4CE39AC016ECE359000FE29D /* IconSelection.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IconSelection.xib; sourceTree = "<group>"; };
@@ -550,6 +620,8 @@
 		4CF1F0C81786B37900CD920E /* NSData+Gzip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSData+Gzip.m"; sourceTree = "<group>"; };
 		4CF1F0C91786B37900CD920E /* NSData+Gzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSData+Gzip.h"; sourceTree = "<group>"; };
 		4CF29BF317879D0000851B60 /* 26_FileSaveTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 26_FileSaveTemplate.pdf; sourceTree = "<group>"; };
+		4CF62B84179385D700B660B6 /* KPKAttribute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKAttribute.h; sourceTree = "<group>"; };
+		4CF62B85179385D700B660B6 /* KPKAttribute.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKAttribute.m; sourceTree = "<group>"; };
 		4CF6C70F176F4533007A811D /* MPStringLengthValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPStringLengthValueTransformer.h; sourceTree = "<group>"; };
 		4CF6C710176F4533007A811D /* MPStringLengthValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPStringLengthValueTransformer.m; sourceTree = "<group>"; };
 		4CF6C715176F5183007A811D /* MPServerRequestHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPServerRequestHandler.h; sourceTree = "<group>"; };
@@ -570,6 +642,15 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
+		4C45FB16178E09ED0010007D /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4C45FB1C178E09ED0010007D /* SenTestingKit.framework in Frameworks */,
+				4C45FB1D178E09ED0010007D /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		4C77E35F15B84A240093A587 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -614,6 +695,15 @@
 			name = Views;
 			sourceTree = "<group>";
 		};
+		4C104129178CDD26001B5239 /* Categories */ = {
+			isa = PBXGroup;
+			children = (
+				4C10412A178CDD44001B5239 /* NSDate+Humanized.h */,
+				4C10412B178CDD44001B5239 /* NSDate+Humanized.m */,
+			);
+			name = Categories;
+			sourceTree = "<group>";
+		};
 		4C16BA5F1787997E002B42BD /* ValueTransformer */ = {
 			isa = PBXGroup;
 			children = (
@@ -625,6 +715,15 @@
 			name = ValueTransformer;
 			sourceTree = "<group>";
 		};
+		4C18F9AC178E123200890BCE /* Databases */ = {
+			isa = PBXGroup;
+			children = (
+				4C19E4FF178E26EF002F2CD0 /* Test_Password_1234.kdbx */,
+				4C18F9AA178E122500890BCE /* Test_Password_1234.kdb */,
+			);
+			name = Databases;
+			sourceTree = "<group>";
+		};
 		4C245A64176E1E3C0086100E /* CocoaHTTPServer */ = {
 			isa = PBXGroup;
 			children = (
@@ -780,10 +879,10 @@
 				4C2724D31778FA0700FD8456 /* NSDate+Packed.m */,
 				4CF1F0C81786B37900CD920E /* NSData+Gzip.m */,
 				4CF1F0C91786B37900CD920E /* NSData+Gzip.h */,
-				4C2724D51778FF1A00FD8456 /* NSUUID+KeePassLib.h */,
-				4C2724D61778FF1A00FD8456 /* NSUUID+KeePassLib.m */,
 				4C2724D817790E7C00FD8456 /* NSMutableData+Base64.h */,
 				4C2724D917790E7C00FD8456 /* NSMutableData+Base64.m */,
+				4C801AFA179310E2002821E3 /* NSString+Hexdata.h */,
+				4C801AFB179310E2002821E3 /* NSString+Hexdata.m */,
 			);
 			name = Categories;
 			sourceTree = "<group>";
@@ -854,6 +953,8 @@
 				4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */,
 				4C811C8116ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.h */,
 				4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */,
+				4CE298E91795FC2A00DF7BDB /* MPEntryMenuDelegate.h */,
+				4CE298EA1795FC2A00DF7BDB /* MPEntryMenuDelegate.m */,
 			);
 			name = Delegates;
 			sourceTree = "<group>";
@@ -875,13 +976,46 @@
 			name = Model;
 			sourceTree = "<group>";
 		};
+		4C3F28591791F05400703281 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				4C3F28571791F04F00703281 /* LocalizableErrors.strings */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		4C45FB1E178E09ED0010007D /* MacPassTests */ = {
+			isa = PBXGroup;
+			children = (
+				4C18F9AC178E123200890BCE /* Databases */,
+				4C45FB2B178E0BCB0010007D /* MPDatabaseLoading.h */,
+				4C45FB2C178E0BCB0010007D /* MPDatabaseLoading.m */,
+				4C45FB2E178E0CE20010007D /* MPDatabaseCreation.h */,
+				4C45FB2F178E0CE20010007D /* MPDatabaseCreation.m */,
+				4C19E501178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.h */,
+				4C19E502178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m */,
+				4C45FB1F178E09ED0010007D /* Supporting Files */,
+			);
+			path = MacPassTests;
+			sourceTree = "<group>";
+		};
+		4C45FB1F178E09ED0010007D /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				4C45FB20178E09ED0010007D /* MacPassTests-Info.plist */,
+				4C45FB21178E09ED0010007D /* InfoPlist.strings */,
+				4C45FB27178E09ED0010007D /* MacPassTests-Prefix.pch */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
 		4C46B8821706397A0046109A /* Security Additions */ = {
 			isa = PBXGroup;
 			children = (
 				4C46B88317063A070046109A /* NSString+MPPasswordCreation.h */,
 				4C46B88417063A070046109A /* NSString+MPPasswordCreation.m */,
-				4C46B88617063A170046109A /* NSString+MPPasswordAnalysis.h */,
+				4C46B88617063A170046109A /* NSString+PasswordStrength.h */,
-				4C46B88717063A170046109A /* NSString+MPPasswordAnalysis.m */,
+				4C46B88717063A170046109A /* NSString+PasswordStrength.m */,
 			);
 			name = "Security Additions";
 			sourceTree = "<group>";
@@ -1009,9 +1143,11 @@
 			children = (
 				4C245A64176E1E3C0086100E /* CocoaHTTPServer */,
 				4CC3AAB6175F4983003EF01B /* HNHUi */,
+				4CD3ABAD178F71B50073F5C5 /* KeePassKit */,
 				4C669B2D16760ED100DD0774 /* MiniKeePassLib */,
 				4CAD745415B887FD00104512 /* KissXML */,
 				4C77E36C15B84A240093A587 /* MacPass */,
+				4C45FB1E178E09ED0010007D /* MacPassTests */,
 				4C77E36515B84A240093A587 /* Frameworks */,
 				4C77E36315B84A240093A587 /* Products */,
 			);
@@ -1021,6 +1157,7 @@
 			isa = PBXGroup;
 			children = (
 				4C77E36215B84A240093A587 /* MacPass.app */,
+				4C45FB1A178E09ED0010007D /* MacPassTests.octest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1032,6 +1169,7 @@
 				4C8FECC716D57E3200BF26CF /* QuartzCore.framework */,
 				4CAD748B15B889B700104512 /* Security.framework */,
 				4C77E36615B84A240093A587 /* Cocoa.framework */,
+				4C45FB1B178E09ED0010007D /* SenTestingKit.framework */,
 				4C77E36815B84A240093A587 /* Other Frameworks */,
 			);
 			name = Frameworks;
@@ -1050,6 +1188,7 @@
 		4C77E36C15B84A240093A587 /* MacPass */ = {
 			isa = PBXGroup;
 			children = (
+				4C104129178CDD26001B5239 /* Categories */,
 				4C245C11176E22150086100E /* KeepassHttp */,
 				4C46B8821706397A0046109A /* Security Additions */,
 				4C2C4C2516D3BCEA00D49295 /* KeePassLib Categories */,
@@ -1199,6 +1338,67 @@
 			path = HNHUi;
 			sourceTree = "<group>";
 		};
+		4CD3ABAD178F71B50073F5C5 /* KeePassKit */ = {
+			isa = PBXGroup;
+			children = (
+				4C3F28591791F05400703281 /* Resources */,
+				4CD3ABAF178F71B50073F5C5 /* Categories */,
+				4CD3ABB1178F71B50073F5C5 /* Core */,
+				4CD3ABB5178F71B50073F5C5 /* IO */,
+			);
+			path = KeePassKit;
+			sourceTree = "<group>";
+		};
+		4CD3ABAF178F71B50073F5C5 /* Categories */ = {
+			isa = PBXGroup;
+			children = (
+				4C2724D51778FF1A00FD8456 /* NSUUID+KeePassKit.h */,
+				4C2724D61778FF1A00FD8456 /* NSUUID+KeePassKit.m */,
+				4C8A173B1790AA41008B5C17 /* NSData+Keyfile.h */,
+				4C8A173C1790AA41008B5C17 /* NSData+Keyfile.m */,
+				4CDB5C401794AA4F0017667E /* KPKTree+Serializing.h */,
+				4CDB5C411794AA4F0017667E /* KPKTree+Serializing.m */,
+			);
+			path = Categories;
+			sourceTree = "<group>";
+		};
+		4CD3ABB1178F71B50073F5C5 /* Core */ = {
+			isa = PBXGroup;
+			children = (
+				4C70D0FE179092F200652EE9 /* KPKPassword.h */,
+				4C70D0FF179092F200652EE9 /* KPKPassword.m */,
+				4C70D0FB1790924700652EE9 /* KPKParser.h */,
+				4C70D0FC1790924700652EE9 /* KPKParser.m */,
+				4C4436751792BE810099E220 /* KPKFormat.h */,
+				4C4436761792BE810099E220 /* KPKFormat.m */,
+				4CD3ABB2178F71B50073F5C5 /* KPKVersion.h */,
+				4CD3ABB3178F71B50073F5C5 /* KPKTree.h */,
+				4CD3ABB4178F71B50073F5C5 /* KPKTree.m */,
+				4CD3ABBD178F72610073F5C5 /* KPKEntry.h */,
+				4CD3ABBE178F72610073F5C5 /* KPKEntry.m */,
+				4CD3ABC0178F72720073F5C5 /* KPKGroup.h */,
+				4CD3ABC1178F72720073F5C5 /* KPKGroup.m */,
+				4C591B55178F897A0080B16B /* KPKAttachment.h */,
+				4C591B56178F897A0080B16B /* KPKAttachment.m */,
+				4C39B3F3178FEFAE0027DC7C /* KPKNode.h */,
+				4C39B3F4178FEFAE0027DC7C /* KPKNode.m */,
+				4C3F28521791EDE800703281 /* KPKErrors.h */,
+				4C3F28531791EDFD00703281 /* KPKErrors.m */,
+				4CF62B84179385D700B660B6 /* KPKAttribute.h */,
+				4CF62B85179385D700B660B6 /* KPKAttribute.m */,
+				4C5AA58F179549A1008ECAD7 /* KPKXmlTreeWriter.h */,
+				4C5AA590179549A1008ECAD7 /* KPKXmlTreeWriter.m */,
+			);
+			path = Core;
+			sourceTree = "<group>";
+		};
+		4CD3ABB5178F71B50073F5C5 /* IO */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = IO;
+			sourceTree = "<group>";
+		};
 		4CDB556616E29A8A00635918 /* Controls */ = {
 			isa = PBXGroup;
 			children = (
@@ -1267,13 +1467,30 @@
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
+		4C45FB19178E09ED0010007D /* MacPassTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4C45FB2A178E09ED0010007D /* Build configuration list for PBXNativeTarget "MacPassTests" */;
+			buildPhases = (
+				4C45FB15178E09ED0010007D /* Sources */,
+				4C45FB16178E09ED0010007D /* Frameworks */,
+				4C45FB17178E09ED0010007D /* Resources */,
+				4C45FB18178E09ED0010007D /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = MacPassTests;
+			productName = MacPassTests;
+			productReference = 4C45FB1A178E09ED0010007D /* MacPassTests.octest */;
+			productType = "com.apple.product-type.bundle";
+		};
 		4C77E36115B84A240093A587 /* MacPass */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 4C77E38015B84A240093A587 /* Build configuration list for PBXNativeTarget "MacPass" */;
 			buildPhases = (
 				4C77E35E15B84A240093A587 /* Sources */,
 				4C77E35F15B84A240093A587 /* Frameworks */,
-				4CB9339616D3A04100A13B5D /* ShellScript */,
 				4C77E36015B84A240093A587 /* Resources */,
 			);
 			buildRules = (
@@ -1311,11 +1528,22 @@
 			projectRoot = "";
 			targets = (
 				4C77E36115B84A240093A587 /* MacPass */,
+				4C45FB19178E09ED0010007D /* MacPassTests */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
+		4C45FB17178E09ED0010007D /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4C45FB23178E09ED0010007D /* InfoPlist.strings in Resources */,
+				4C18F9AB178E122500890BCE /* Test_Password_1234.kdb in Resources */,
+				4C19E500178E26EF002F2CD0 /* Test_Password_1234.kdbx in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		4C77E36015B84A240093A587 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1363,13 +1591,14 @@
 				4C52A88F1788628B00868229 /* 13_KeysTemplate.pdf in Resources */,
 				4C52A8901788628B00868229 /* 18_DisplayTemplate.pdf in Resources */,
 				4C52A892178863B000868229 /* 68_PhoneTemplate.pdf in Resources */,
+				4C3F28581791F04F00703281 /* LocalizableErrors.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		4CB9339616D3A04100A13B5D /* ShellScript */ = {
+		4C45FB18178E09ED0010007D /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -1380,11 +1609,21 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "#!/bin/bash\nbuildNumber=$(/usr/libexec/PlistBuddy -c \"Print CFBundleVersion\" \"$INFOPLIST_FILE\")\n#buildNumber=$((0x$buildNumber))\nbuildNumber=$(($buildNumber + 1))\nbuildNumber=$(printf \"%d\" $buildNumber)\n/usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $buildNumber\" \"$INFOPLIST_FILE\"";
+			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
+		4C45FB15178E09ED0010007D /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4C45FB2D178E0BCB0010007D /* MPDatabaseLoading.m in Sources */,
+				4C45FB30178E0CE20010007D /* MPDatabaseCreation.m in Sources */,
+				4C19E503178E2871002F2CD0 /* MPDatabasePasswordAndKeyfile.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		4C77E35E15B84A240093A587 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1454,7 +1693,7 @@
 				4CE39ABF16ECE34A000FE29D /* MPIconSelectViewController.m in Sources */,
 				4CE39AC416ECE4F7000FE29D /* MPPopupImageView.m in Sources */,
 				4C46B88517063A070046109A /* NSString+MPPasswordCreation.m in Sources */,
-				4C46B88817063A170046109A /* NSString+MPPasswordAnalysis.m in Sources */,
+				4C46B88817063A170046109A /* NSString+PasswordStrength.m in Sources */,
 				4C5A11FE1708DE8700223D8A /* MPPasswordCreatorViewController.m in Sources */,
 				4CE5B54B173AFBA700207B39 /* MPDocument.m in Sources */,
 				4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */,
@@ -1516,7 +1755,7 @@
 				4C2724CE1778EFB100FD8456 /* NSData+Random.m in Sources */,
 				4C2724D11778EFE300FD8456 /* NSString+Empty.m in Sources */,
 				4C2724D41778FA0700FD8456 /* NSDate+Packed.m in Sources */,
-				4C2724D71778FF1A00FD8456 /* NSUUID+KeePassLib.m in Sources */,
+				4C2724D71778FF1A00FD8456 /* NSUUID+KeePassKit.m in Sources */,
 				4C2724DA17790E7C00FD8456 /* NSMutableData+Base64.m in Sources */,
 				4C2A6134177A1D5F00C9826C /* KPLErrorCodes.m in Sources */,
 				4CD5D705177A5F3300100649 /* MPDatabaseSettingsWindowController.m in Sources */,
@@ -1535,12 +1774,36 @@
 				4C3666411787327E00B249F1 /* MPDocument+Attachments.m in Sources */,
 				4C16BA6217879A3C002B42BD /* MPPasswordStringFormatter.m in Sources */,
 				4CD6C5AE1789FDE6000891F6 /* HNHRoundedSecureTextField.m in Sources */,
+				4C10412C178CDD44001B5239 /* NSDate+Humanized.m in Sources */,
+				4CD3ABBA178F71B50073F5C5 /* KPKTree.m in Sources */,
+				4CD3ABBF178F72610073F5C5 /* KPKEntry.m in Sources */,
+				4CD3ABC2178F72720073F5C5 /* KPKGroup.m in Sources */,
+				4C591B57178F897A0080B16B /* KPKAttachment.m in Sources */,
+				4C39B3F5178FEFAE0027DC7C /* KPKNode.m in Sources */,
+				4C70D0FD1790924700652EE9 /* KPKParser.m in Sources */,
+				4C70D100179092F200652EE9 /* KPKPassword.m in Sources */,
+				4C8A173D1790AA41008B5C17 /* NSData+Keyfile.m in Sources */,
+				4C3F28541791EDFD00703281 /* KPKErrors.m in Sources */,
+				4C4436771792BE810099E220 /* KPKFormat.m in Sources */,
+				4C801AFC179310E2002821E3 /* NSString+Hexdata.m in Sources */,
+				4CF62B86179385D700B660B6 /* KPKAttribute.m in Sources */,
+				4CDB5C421794AA4F0017667E /* KPKTree+Serializing.m in Sources */,
+				4C5AA591179549A1008ECAD7 /* KPKXmlTreeWriter.m in Sources */,
+				4CE298EB1795FC2A00DF7BDB /* MPEntryMenuDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
+		4C45FB21178E09ED0010007D /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				4C45FB22178E09ED0010007D /* en */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
 		4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -1619,6 +1882,44 @@
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
+		4C45FB28178E09ED0010007D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MacPass.app/Contents/MacOS/MacPass";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				COMBINE_HIDPI_IMAGES = YES;
+				FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "MacPassTests/MacPassTests-Prefix.pch";
+				INFOPLIST_FILE = "MacPassTests/MacPassTests-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUNDLE_LOADER)";
+				WRAPPER_EXTENSION = octest;
+			};
+			name = Debug;
+		};
+		4C45FB29178E09ED0010007D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/MacPass.app/Contents/MacOS/MacPass";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				COMBINE_HIDPI_IMAGES = YES;
+				FRAMEWORK_SEARCH_PATHS = "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"";
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "MacPassTests/MacPassTests-Prefix.pch";
+				INFOPLIST_FILE = "MacPassTests/MacPassTests-Info.plist";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUNDLE_LOADER)";
+				WRAPPER_EXTENSION = octest;
+			};
+			name = Release;
+		};
 		4C77E37E15B84A240093A587 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1709,6 +2010,15 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		4C45FB2A178E09ED0010007D /* Build configuration list for PBXNativeTarget "MacPassTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4C45FB28178E09ED0010007D /* Debug */,
+				4C45FB29178E09ED0010007D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		4C77E35C15B84A240093A587 /* Build configuration list for PBXProject "MacPass" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

MacPass.xcodeproj/xcshareddata/xcschemes/MacPass.xcscheme

@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0460"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4C77E36115B84A240093A587"
+               BuildableName = "MacPass.app"
+               BlueprintName = "MacPass"
+               ReferencedContainer = "container:MacPass.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "4C45FB19178E09ED0010007D"
+               BuildableName = "MacPassTests.octest"
+               BlueprintName = "MacPassTests"
+               ReferencedContainer = "container:MacPass.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4C77E36115B84A240093A587"
+            BuildableName = "MacPass.app"
+            BlueprintName = "MacPass"
+            ReferencedContainer = "container:MacPass.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4C77E36115B84A240093A587"
+            BuildableName = "MacPass.app"
+            BlueprintName = "MacPass"
+            ReferencedContainer = "container:MacPass.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-NSConstraintBasedLayoutVisualizeMutuallyExclusiveConstraints YES"
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "4C77E36115B84A240093A587"
+            BuildableName = "MacPass.app"
+            BlueprintName = "MacPass"
+            ReferencedContainer = "container:MacPass.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "PLIST_FILE=$PROJECT_DIR/$INFOPLIST_FILE&#10;VERSION=$(/usr/libexec/PlistBuddy -c &quot;Print CFBundleVersion&quot; $PLIST_FILE)&#10;VERSION=$(($VERSION + 1))&#10;/usr/libexec/PlistBuddy -c &quot;Set :CFBundleVersion $VERSION&quot; $PLIST_FILE"
+               shellToInvoke = "/bin/bash">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "4C77E36115B84A240093A587"
+                     BuildableName = "MacPass.app"
+                     BlueprintName = "MacPass"
+                     ReferencedContainer = "container:MacPass.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
+   </ArchiveAction>
+</Scheme>

MacPass/Base.lproj/InspectorView.xib

@@ -133,11 +133,65 @@
 					<object class="NSCustomView" id="816254670">
 						<reference key="NSNextResponder" ref="87082330"/>
 						<int key="NSvFlags">268</int>
-						<array class="NSMutableArray" key="NSSubviews"/>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="NSButton" id="277685969">
+								<reference key="NSNextResponder" ref="816254670"/>
+								<int key="NSvFlags">-2147483380</int>
+								<string key="NSFrame">{{184, 5}, {45, 19}}</string>
+								<reference key="NSSuperview" ref="816254670"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="442762067"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSButtonCell" key="NSCell" id="740692320">
+									<int key="NSCellFlags">-2080374784</int>
+									<int key="NSCellFlags2">134217728</int>
+									<string key="NSContents">Done</string>
+									<object class="NSFont" key="NSSupport" id="323604925">
+										<string key="NSName">LucidaGrande</string>
+										<double key="NSSize">12</double>
+										<int key="NSfFlags">16</int>
+									</object>
+									<string key="NSCellIdentifier">_NS:9</string>
+									<reference key="NSControlView" ref="277685969"/>
+									<int key="NSButtonFlags">-2038153216</int>
+									<int key="NSButtonFlags2">164</int>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							</object>
+							<object class="NSButton" id="442762067">
+								<reference key="NSNextResponder" ref="816254670"/>
+								<int key="NSvFlags">-2147483380</int>
+								<string key="NSFrame">{{237, 5}, {36, 19}}</string>
+								<reference key="NSSuperview" ref="816254670"/>
+								<reference key="NSWindow"/>
+								<string key="NSReuseIdentifierKey">_NS:9</string>
+								<bool key="NSEnabled">YES</bool>
+								<object class="NSButtonCell" key="NSCell" id="669709526">
+									<int key="NSCellFlags">-2080374784</int>
+									<int key="NSCellFlags2">134217728</int>
+									<string key="NSContents">Edit</string>
+									<reference key="NSSupport" ref="323604925"/>
+									<string key="NSCellIdentifier">_NS:9</string>
+									<reference key="NSControlView" ref="442762067"/>
+									<int key="NSButtonFlags">-2038153216</int>
+									<int key="NSButtonFlags2">164</int>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+								<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+							</object>
+						</array>
 						<string key="NSFrameSize">{293, 30}</string>
 						<reference key="NSSuperview" ref="87082330"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
+						<reference key="NSNextKeyView" ref="277685969"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<string key="NSClassName">HNHGradientView</string>
 					</object>
@@ -255,7 +309,7 @@
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="648519567">
 												<int key="NSCellFlags">-1804599231</int>
-												<int key="NSCellFlags2">272630784</int>
+												<int key="NSCellFlags2">272631040</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="308723166"/>
 												<string key="NSCellIdentifier">_NS:9</string>
@@ -333,7 +387,7 @@
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="1007924351">
 												<int key="NSCellFlags">-1804599231</int>
-												<int key="NSCellFlags2">272630784</int>
+												<int key="NSCellFlags2">272631040</int>
 												<string key="NSContents"/>
 												<reference key="NSSupport" ref="308723166"/>
 												<string key="NSCellIdentifier">_NS:9</string>
@@ -400,11 +454,7 @@
 												<int key="NSCellFlags">-2080374784</int>
 												<int key="NSCellFlags2">134217728</int>
 												<string key="NSContents">Generate</string>
-												<object class="NSFont" key="NSSupport" id="323604925">
+												<reference key="NSSupport" ref="323604925"/>
-													<string key="NSName">LucidaGrande</string>
-													<double key="NSSize">12</double>
-													<int key="NSfFlags">16</int>
-												</object>
 												<string key="NSCellIdentifier">_NS:9</string>
 												<reference key="NSControlView" ref="172507372"/>
 												<int key="NSButtonFlags">-2038153216</int>
@@ -546,7 +596,7 @@
 															<int key="NSvFlags">2322</int>
 															<string key="NSFrameSize">{251, 332}</string>
 															<reference key="NSSuperview" ref="454120122"/>
-															<reference key="NSNextKeyView" ref="657519150"/>
+															<reference key="NSNextKeyView" ref="942541726"/>
 															<string key="NSReuseIdentifierKey">_NS:13</string>
 															<object class="NSTextContainer" key="NSTextContainer" id="77792568">
 																<object class="NSLayoutManager" key="NSLayoutManager">
@@ -638,6 +688,7 @@
 													<int key="NSvFlags">256</int>
 													<string key="NSFrame">{{236, 1}, {16, 332}}</string>
 													<reference key="NSSuperview" ref="850153963"/>
+													<reference key="NSNextKeyView" ref="894571713"/>
 													<string key="NSReuseIdentifierKey">_NS:83</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<reference key="NSTarget" ref="850153963"/>
@@ -662,7 +713,7 @@
 											</array>
 											<string key="NSFrame">{{20, 20}, {253, 334}}</string>
 											<reference key="NSSuperview" ref="13134025"/>
-											<reference key="NSNextKeyView" ref="454120122"/>
+											<reference key="NSNextKeyView" ref="657519150"/>
 											<string key="NSReuseIdentifierKey">_NS:9</string>
 											<int key="NSsFlags">133138</int>
 											<reference key="NSVScroller" ref="942541726"/>
@@ -875,6 +926,7 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{1, 147}, {52, 16}}</string>
 													<reference key="NSSuperview" ref="994354248"/>
+													<reference key="NSNextKeyView" ref="894571713"/>
 													<string key="NSReuseIdentifierKey">_NS:60</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<int key="NSsFlags">1</int>
@@ -1053,6 +1105,7 @@
 													<int key="NSvFlags">-2147483392</int>
 													<string key="NSFrame">{{1, 119}, {223, 15}}</string>
 													<reference key="NSSuperview" ref="892620201"/>
+													<reference key="NSNextKeyView" ref="894571713"/>
 													<string key="NSReuseIdentifierKey">_NS:60</string>
 													<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 													<int key="NSsFlags">1</int>
@@ -1691,8 +1744,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="87082330"/>
-								<int key="scoringType">3</int>
+								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">9</float>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="314156867">
@@ -1950,6 +2003,70 @@
 						<int key="objectID">662</int>
 						<reference key="object" ref="816254670"/>
 						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="34368549">
+								<reference key="firstItem" ref="442762067"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="277685969"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="816254670"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="752675649">
+								<reference key="firstItem" ref="816254670"/>
+								<int key="firstAttribute">6</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="442762067"/>
+								<int key="secondAttribute">6</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="816254670"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="824671915">
+								<reference key="firstItem" ref="277685969"/>
+								<int key="firstAttribute">11</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="442762067"/>
+								<int key="secondAttribute">11</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="816254670"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1053370990">
+								<reference key="firstItem" ref="277685969"/>
+								<int key="firstAttribute">10</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="816254670"/>
+								<int key="secondAttribute">10</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="816254670"/>
+								<int key="scoringType">5</int>
+								<float key="scoringTypeFloat">22</float>
+								<int key="contentType">2</int>
+							</object>
 							<object class="IBNSLayoutConstraint" id="574545128">
 								<reference key="firstItem" ref="816254670"/>
 								<int key="firstAttribute">8</int>
@@ -1966,6 +2083,8 @@
 								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">1</int>
 							</object>
+							<reference ref="442762067"/>
+							<reference ref="277685969"/>
 						</array>
 						<reference key="parent" ref="87082330"/>
 					</object>
@@ -2176,8 +2295,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">3</int>
+								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">9</float>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="802970543">
@@ -2208,8 +2327,24 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
+								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">24</float>
+								<float key="scoringTypeFloat">40</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="775474818">
+								<reference key="firstItem" ref="13391205"/>
+								<int key="firstAttribute">3</int>
+								<int key="relation">1</int>
+								<reference key="secondItem" ref="172507372"/>
+								<int key="secondAttribute">4</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">8</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="726109125"/>
+								<int key="scoringType">9</int>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="400643134">
@@ -2304,8 +2439,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
+								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">24</float>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="806657697">
@@ -2368,8 +2503,8 @@
 								</object>
 								<float key="priority">1000</float>
 								<reference key="containingView" ref="726109125"/>
-								<int key="scoringType">6</int>
+								<int key="scoringType">9</int>
-								<float key="scoringTypeFloat">24</float>
+								<float key="scoringTypeFloat">40</float>
 								<int key="contentType">3</int>
 							</object>
 							<object class="IBNSLayoutConstraint" id="502895567">
@@ -4544,6 +4679,57 @@
 						<reference key="object" ref="849686715"/>
 						<reference key="parent" ref="726109125"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2313</int>
+						<reference key="object" ref="442762067"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="669709526"/>
+						</array>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2314</int>
+						<reference key="object" ref="669709526"/>
+						<reference key="parent" ref="442762067"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2315</int>
+						<reference key="object" ref="752675649"/>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2317</int>
+						<reference key="object" ref="277685969"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="740692320"/>
+						</array>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2318</int>
+						<reference key="object" ref="740692320"/>
+						<reference key="parent" ref="277685969"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2319</int>
+						<reference key="object" ref="34368549"/>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2320</int>
+						<reference key="object" ref="1053370990"/>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2321</int>
+						<reference key="object" ref="824671915"/>
+						<reference key="parent" ref="816254670"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2322</int>
+						<reference key="object" ref="775474818"/>
+						<reference key="parent" ref="726109125"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -4629,6 +4815,7 @@
 					<reference ref="849686715"/>
 					<reference ref="989194529"/>
 					<reference ref="400643134"/>
+					<reference ref="775474818"/>
 					<reference ref="19592612"/>
 					<reference ref="802970543"/>
 					<reference ref="983418579"/>
@@ -4920,6 +5107,17 @@
 				<string key="2275.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2278.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="2313.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2313.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2314.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2315.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="NO" key="2317.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+				<string key="2317.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2318.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2319.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2321.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2322.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array key="455.IBNSViewMetadataConstraints">
 					<reference ref="222939184"/>
 					<reference ref="1058743908"/>
@@ -4954,6 +5152,10 @@
 				<string key="651.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<array class="NSMutableArray" key="662.IBNSViewMetadataConstraints">
 					<reference ref="574545128"/>
+					<reference ref="1053370990"/>
+					<reference ref="824671915"/>
+					<reference ref="752675649"/>
+					<reference ref="34368549"/>
 				</array>
 				<boolean value="NO" key="662.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="662.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -4966,7 +5168,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">2280</int>
+			<int key="maxID">2322</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -5054,6 +5256,8 @@
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="addAttachment:">id</string>
 						<string key="addCustomField:">id</string>
+						<string key="edit:">id</string>
+						<string key="finishEdit:">id</string>
 						<string key="removeAttachment:">id</string>
 						<string key="removeCustomField:">id</string>
 						<string key="saveAttachment:">id</string>
@@ -5067,6 +5271,14 @@
 							<string key="name">addCustomField:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="edit:">
+							<string key="name">edit:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="finishEdit:">
+							<string key="name">finishEdit:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="removeAttachment:">
 							<string key="name">removeAttachment:</string>
 							<string key="candidateClassName">id</string>

MacPass/Base.lproj/MainMenu.xib

@@ -253,6 +253,24 @@
 									<reference key="NSOnImage" ref="35465992"/>
 									<reference key="NSMixedImage" ref="502551668"/>
 								</object>
+								<object class="NSMenuItem" id="663106531">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Save As…</string>
+									<string key="NSKeyEquiv">S</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="438377242">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Export As XML…</string>
+									<string key="NSKeyEquiv">E</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
 								<object class="NSMenuItem" id="579971712">
 									<reference key="NSMenu" ref="720053764"/>
 									<string key="NSTitle">Revert to Saved</string>
@@ -794,6 +812,22 @@
 					</object>
 					<int key="connectionID">1234</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">saveDocumentAs:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="663106531"/>
+					</object>
+					<int key="connectionID">1255</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">exportDatabase:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="438377242"/>
+					</object>
+					<int key="connectionID">1260</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">showPreferences:</string>
@@ -896,6 +930,8 @@
 							<reference ref="1010469920"/>
 							<reference ref="915918141"/>
 							<reference ref="544639599"/>
+							<reference ref="663106531"/>
+							<reference ref="438377242"/>
 						</array>
 						<reference key="parent" ref="379814623"/>
 					</object>
@@ -1226,6 +1262,16 @@
 						<reference key="object" ref="544639599"/>
 						<reference key="parent" ref="720053764"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1243</int>
+						<reference key="object" ref="663106531"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1259</int>
+						<reference key="object" ref="438377242"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1241,7 +1287,9 @@
 				<string key="1203.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1231.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1243.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1259.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="130.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1298,7 +1346,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">1234</int>
+			<int key="maxID">1260</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1358,6 +1406,7 @@
 					<string key="superclassName">NSWindowController</string>
 					<dictionary class="NSMutableDictionary" key="actions">
 						<string key="editPassword:">id</string>
+						<string key="exportDatabase:">id</string>
 						<string key="showDatabaseSettings:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
@@ -1365,6 +1414,10 @@
 							<string key="name">editPassword:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="exportDatabase:">
+							<string key="name">exportDatabase:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="showDatabaseSettings:">
 							<string key="name">showDatabaseSettings:</string>
 							<string key="candidateClassName">id</string>

MacPass/Kdb3Tree+NewTree.m

@@ -18,32 +18,32 @@
   tree.root = rootGroup;
   
   KdbGroup *parentGroup = [tree createGroup:rootGroup];
-  parentGroup.name = @"General";
+  parentGroup.name = NSLocalizedString(@"GENERAL", "General");
   parentGroup.image = 48;
   [rootGroup addGroup:parentGroup];
   
   KdbGroup *group = [tree createGroup:parentGroup];
-  group.name = @"Windows";
+  group.name = NSLocalizedString(@"WINDOWS", "Windows");
   group.image = 38;
   [parentGroup addGroup:group];
   
   group = [tree createGroup:parentGroup];
-  group.name = @"Network";
+  group.name = NSLocalizedString(@"NETWORK", "Network");
   group.image = 3;
   [parentGroup addGroup:group];
   
   group = [tree createGroup:parentGroup];
-  group.name = @"Internet";
+  group.name = NSLocalizedString(@"INTERNET", "Internet");
   group.image = 1;
   [parentGroup addGroup:group];
   
   group = [tree createGroup:parentGroup];
-  group.name = @"eMail";
+  group.name = NSLocalizedString(@"EMAIL", "EMail");
   group.image = 19;
   [parentGroup addGroup:group];
   
   group = [tree createGroup:parentGroup];
-  group.name = @"Homebanking";
+  group.name = NSLocalizedString(@"HOMEBANKING", "Homebanking");
   group.image = 37;
   [parentGroup addGroup:group];
   

MacPass/Kdb4Tree+NewTree.m

@@ -15,7 +15,7 @@
   
   Kdb4Tree *tree = [[Kdb4Tree alloc] init];
   tree.generator = @"MacPass";
-  tree.databaseName = NSLocalizedString(@"NEW_DATABASE", "Name for a newly created Database");
+  tree.databaseName = NSLocalizedString(@"DATABASE", "");
   tree.databaseNameChanged = currentTime;
   tree.databaseDescription = @"";
   tree.databaseDescriptionChanged = currentTime;
@@ -42,32 +42,32 @@
   tree.lastTopVisibleGroup = [UUID nullUuid];
   
   KdbGroup *parentGroup = [tree createGroup:nil];
-  parentGroup.name = @"General";
+  parentGroup.name = NSLocalizedString(@"GENERAL", "General");
   parentGroup.image = 48;
   tree.root = parentGroup;
   
   KdbGroup *group = [tree createGroup:parentGroup];
-  group.name = @"Windows";
+  group.name = NSLocalizedString(@"WINDOWS", "Windows");
   group.image = 38;
   [parentGroup addGroup:group];
   
   group = [tree createGroup:parentGroup];
-  group.name = @"Network";
+  group.name = NSLocalizedString(@"NETWORK", "Network");
   group.image = 3;
   [parentGroup addGroup:group];
   
   group = [tree createGroup:parentGroup];
-  group.name = @"Internet";
+  group.name = NSLocalizedString(@"INTERNET", "Internet");
   group.image = 1;
   [parentGroup addGroup:group];
   
   group = [tree createGroup:parentGroup];
-  group.name = @"eMail";
+  group.name = NSLocalizedString(@"EMAIL", "EMail");
   group.image = 19;
   [parentGroup addGroup:group];
   
   group = [tree createGroup:parentGroup];
-  group.name = @"Homebanking";
+  group.name = NSLocalizedString(@"HOMEBANKING", "Homebanking");
   group.image = 37;
   [parentGroup addGroup:group];
   

MacPass/KdbEntry+Undo.h

@@ -17,8 +17,6 @@ APPKIT_EXTERN NSString *const MPEntryNotesUndoableKey;
 
 @interface KdbEntry (Undo)
 
-+ (NSUndoManager *)undoManager;
-
 - (NSString *)titleUndoable;
 - (NSString *)usernameUndoable;
 - (NSString *)passwordUndoable;
@@ -31,4 +29,8 @@ APPKIT_EXTERN NSString *const MPEntryNotesUndoableKey;
 - (void)setUrlUndoable:(NSString *)url;
 - (void)setNotesUndoable:(NSString *)notes;
 
+- (void)deleteUndoable;
+- (void)moveToGroupUndoable:(KdbGroup *)group atIndex:(NSUInteger)index;
+- (void)moveToTrashUndoable:(KdbGroup *)trash atIndex:(NSUInteger)index;
+
 @end

MacPass/KdbEntry+Undo.m

@@ -7,6 +7,8 @@
 //
 
 #import "KdbEntry+Undo.h"
+#import "KdbGroup+Undo.h"
+#import "KdbGroup+KVOAdditions.h"
 #import "KdbGroup+MPTreeTools.h"
 
 NSString *const MPEntryTitleUndoableKey = @"titleUndoable";
@@ -15,9 +17,16 @@ NSString *const MPEntryPasswordUndoableKey = @"passwordUndoable";
 NSString *const MPEntryUrlUndoableKey = @"urlUndoable";
 NSString *const MPEntryNotesUndoableKey = @"notesUndoable";
 
+#ifndef MPSetActionName
+#define MPSetActionName(key, comment) \
+if(![[self undoManager] isUndoing]) {\
+[[self undoManager] setActionName:[[NSBundle mainBundle] localizedStringForKey:(key) value:@"" table:nil]];\
+}
+#endif
+
 @implementation KdbEntry (Undo)
 
-+ (NSUndoManager *)undoManager {
+- (NSUndoManager *)undoManager {
   return [[[NSDocumentController sharedDocumentController] currentDocument] undoManager];
 }
 
@@ -41,40 +50,110 @@ NSString *const MPEntryNotesUndoableKey = @"notesUndoable";
   return [self notes];
 }
 
-
 - (void)setTitleUndoable:(NSString *)title {
-  [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setTitleUndoable:) object:self.title];
+  [[self undoManager] registerUndoWithTarget:self selector:@selector(setTitleUndoable:) object:self.title];
-  [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_TITLE", "Undo set title")];
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"SET_TITLE", "Set Title")];
+  }
+  
   [self setLastModificationTime:[NSDate date]];
   [self setTitle:title];
 }
 
 - (void)setUsernameUndoable:(NSString *)username {
-  [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setUsernameUndoable:) object:self.username];
+  [[self undoManager] registerUndoWithTarget:self selector:@selector(setUsernameUndoable:) object:self.username];
-  [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_USERNAME", "Undo set username")];
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"SET_USERNAME", "Undo set username")];
+  }
+  
   [self setLastModificationTime:[NSDate date]];
   [self setUsername:username];
 }
 
 - (void)setPasswordUndoable:(NSString *)password {
-  [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setPasswordUndoable:) object:self.password];
+  [[self undoManager] registerUndoWithTarget:self selector:@selector(setPasswordUndoable:) object:self.password];
-  [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_PASSWORT", "Undo set password")];
+  MPSetActionName(@"SET_PASSWORT", "Undo set password");
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"SET_TITLE", "Set Title")];
+  }
+  
   [self setLastModificationTime:[NSDate date]];
   [self setPassword:password];
 }
 
 - (void)setUrlUndoable:(NSString *)url {
-  [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setUrlUndoable:) object:self.url];
+  [[self undoManager] registerUndoWithTarget:self selector:@selector(setUrlUndoable:) object:self.url];
-  [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_URL", "Undo set URL")];
+  MPSetActionName(@"SET_URL", "Undo set URL");
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"SET_TITLE", "Set Title")];
+  }
+  
   [self setLastModificationTime:[NSDate date]];
   [self setUrl:url];
 }
 
 - (void)setNotesUndoable:(NSString *)notes {
-  [[KdbEntry undoManager] registerUndoWithTarget:self selector:@selector(setNotesUndoable:) object:self.notes];
+  [[self undoManager] registerUndoWithTarget:self selector:@selector(setNotesUndoable:) object:self.notes];
-  [[KdbEntry undoManager] setActionName:NSLocalizedString(@"UNDO_SET_NOTES", "Undo set notes")];
+  MPSetActionName(@"SET_NOTES", "Set Notes");
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"SET_TITLE", "Set Title")];
+  }
+  
   [self setLastModificationTime:[NSDate date]];
   [self setNotes:notes];
 }
 
+- (void)deleteUndoable {
+  if(!self.parent) {
+    return; // No parent to be removed from
+  }
+  NSUInteger oldIndex = [self.parent.entries indexOfObject:self];
+  if(oldIndex == NSNotFound) {
+    return; // We're not in our parents entries list
+  }
+  [[[self undoManager] prepareWithInvocationTarget:self.parent] addEntryUndoable:self atIndex:oldIndex];
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"DELETE_ENTRY", "Set Title")];
+  }
+  
+  //[[NSNotificationCenter defaultCenter] postNotificationName:@"" object:self userInfo:nil];
+  [self.parent removeObjectFromEntriesAtIndex:oldIndex];
+}
+
+- (void)moveToGroupUndoable:(KdbGroup *)group atIndex:(NSUInteger)index {
+  [self _moveToGroup:group atIndex:index actionName:NSLocalizedString(@"MOVE_ENTRY", "Move Group")];
+}
+
+- (void)moveToTrashUndoable:(KdbGroup *)trash atIndex:(NSUInteger)index {
+  [self _moveToGroup:trash atIndex:index actionName:NSLocalizedString(@"TRASH_ENTRY", "Move Entry to Trash")];
+}
+
+- (void)_moveToGroup:(KdbGroup *)group atIndex:(NSUInteger)index actionName:(NSString *)name {
+  if(!group || !self.parent) {
+    return; // Nothing to be moved about
+  }
+  NSUInteger oldIndex = [self.parent.entries indexOfObject:self];
+  if(oldIndex == NSNotFound) {
+    return; // Not found in entries of parent!
+  }
+  [[[self undoManager] prepareWithInvocationTarget:self] _moveToGroup:self.parent atIndex:oldIndex actionName:name];
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:name];
+  }
+  
+  [self.parent removeObjectFromEntriesAtIndex:oldIndex];
+  // Old indices might be wrong, correct them if necessary
+  index = MIN(index, [group.entries count]);
+  [group insertObject:self inEntriesAtIndex:index];
+}
+
+
+
 @end

MacPass/KdbGroup+Undo.h

@@ -17,4 +17,10 @@ APPKIT_EXTERN NSString *const MPGroupNameUndoableKey;
 - (NSString *)nameUndoable;
 - (void)setNameUndoable:(NSString *)newName;
 
+- (void)deleteUndoable;
+- (void)addGroupUndoable:(KdbGroup *)group atIndex:(NSUInteger)index;
+- (void)addEntryUndoable:(KdbEntry *)entry atIndex:(NSUInteger)index;
+- (void)moveToGroupUndoable:(KdbGroup *)group atIndex:(NSUInteger)index;
+- (void)moveToTrashUndoable:(KdbGroup *)trash atIndex:(NSUInteger)index;
+
 @end

MacPass/KdbGroup+Undo.m

@@ -8,6 +8,7 @@
 
 #import "KdbGroup+Undo.h"
 #import "KdbGroup+KVOAdditions.h"
+#import "KdbEntry+Undo.h"
 
 NSString *const MPGroupNameUndoableKey = @"nameUndoable";
 
@@ -23,8 +24,85 @@ NSString *const MPGroupNameUndoableKey = @"nameUndoable";
 
 - (void)setNameUndoable:(NSString *)newName {
   [[self undoManager] registerUndoWithTarget:self selector:@selector(setNameUndoable:) object:self.name];
-  [[self undoManager] setActionName:NSLocalizedString(@"UNDO_SET_NAME", "Undo set name")];
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"SET_NAME", "Set Name")];
+  }
+  
   self.name = newName;
 }
 
+- (void)deleteUndoable {
+  if(!self.parent) {
+    return;
+  }
+  NSUInteger oldIndex = [self.parent.groups indexOfObject:self];
+  if(oldIndex == NSNotFound) {
+    return; // Inconsistent data
+  }
+  [[[self undoManager] prepareWithInvocationTarget:self.parent] addGroupUndoable:self atIndex:oldIndex];
+
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"DELETE_GROUP", "Delete Group")];
+  }
+
+  [self.parent removeObjectFromGroupsAtIndex:oldIndex];
+}
+
+- (void)addGroupUndoable:(KdbGroup *)group atIndex:(NSUInteger)index {
+  if(!group) {
+    return;
+  }
+  
+  [[[self undoManager] prepareWithInvocationTarget:group] deleteUndoable];
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"ADD_GROUP", "Add Group")];
+  }
+  
+  index = MIN(index, [group.groups count]);
+  [self insertObject:group inGroupsAtIndex:index];
+}
+
+- (void)addEntryUndoable:(KdbEntry *)entry atIndex:(NSUInteger)index {
+  if(!entry) {
+    return;
+  }
+  index = MIN(index, [self.entries count]);
+  [[[self undoManager] prepareWithInvocationTarget:entry] deleteUndoable];
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:NSLocalizedString(@"ADD_ENTRY", "Add Entry")];
+  }
+  
+  [self insertObject:entry inEntriesAtIndex:index];
+}
+
+- (void)moveToGroupUndoable:(KdbGroup *)group atIndex:(NSUInteger)index {
+  [self _moveToGroup:group atIndex:index actionName:NSLocalizedString(@"MOVE_GROUP", "Move Group" )];
+}
+
+- (void)moveToTrashUndoable:(KdbGroup *)trash atIndex:(NSUInteger)index {
+  [self _moveToGroup:trash atIndex:index actionName:NSLocalizedString(@"TRASH_GROUP", "Move Group to Trash")];
+}
+
+- (void)_moveToGroup:(KdbGroup *)group atIndex:(NSUInteger)index actionName:(NSString *)actionName {
+  if(!self.parent || !group) {
+    return; // No target or origin
+  }
+  NSUInteger oldIndex = [self.parent.groups indexOfObject:self];
+  if(oldIndex == NSNotFound) {
+    return; // We aren't in our parents groups list.
+  }
+  [[[self undoManager] prepareWithInvocationTarget:self] moveToGroupUndoable:self.parent atIndex:oldIndex];
+  
+  if(![[self undoManager] isUndoing]) {
+    [[self undoManager] setActionName:actionName];
+  }
+  
+  [self.parent removeObjectFromGroupsAtIndex:oldIndex];
+  index = MIN(index, [group.groups count]);
+  [group insertObject:self inGroupsAtIndex:index];
+}
+
 @end

MacPass/MPDocument.h

@@ -34,14 +34,15 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 @interface MPDocument : NSDocument
 
 /* true, if password and/or keyfile are set */
-@property (assign, readonly, getter = isSecured) BOOL secured;
+@property (assign, readonly) BOOL hasPasswordOrKey;
 /* true, if lock screen is present (no phyiscal locking) */
-@property (assign, getter = isLocked) BOOL locked;
+@property (assign, nonatomic) BOOL locked;
-/* true, if document is loaded and decrypted (tree is loaded) */
+@property (assign, readonly) BOOL decrypted;
-@property (assign, readonly, getter = isDecrypted) BOOL decrypted;
+
 @property (strong, readonly, nonatomic) KdbTree *tree;
 @property (weak, readonly, nonatomic) KdbGroup *root;
 @property (readonly, strong) MPRootAdapter *rootAdapter;
+
 @property (nonatomic, copy) NSString *password;
 @property (nonatomic, strong) NSURL *key;
 
@@ -49,7 +50,10 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 @property (assign, readonly, getter = isReadOnly) BOOL readOnly;
 
 - (id)initWithVersion:(MPDatabaseVersion)version;
-- (BOOL)decryptWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL;
+
+#pragma mark Lock/Decrypt
+- (void)lockDatabase:(id)sender;
+- (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL;
 
 #pragma mark Data Lookup
 /*
@@ -63,6 +67,8 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 
 - (void)useGroupAsTrash:(KdbGroup *)group;
 
+#pragma mark Export
+- (void)writeXMLToURL:(NSURL *)url;
 
 #pragma mark Undo Data Manipulation
 /* Undoable Intiialization of elements */
@@ -73,18 +79,14 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 /*
  All non-setter undoable actions
 */
-
-- (void)moveGroup:(KdbGroup *)group toGroup:(KdbGroup *)target index:(NSInteger)index;
 - (BOOL)group:(KdbGroup *)group isMoveableToGroup:(KdbGroup *)target;
-- (void)moveEntry:(KdbEntry *)entry toGroup:(KdbGroup *)target index:(NSInteger)index;
 
-- (void)group:(KdbGroup *)group addEntry:(KdbEntry *)entry atIndex:(NSUInteger)index;
+/* TODO in UNDO auslagen */
-- (void)group:(KdbGroup *)group addGroup:(KdbGroup *)aGroup atIndex:(NSUInteger)index;
+- (void)addStringField:(StringField *)field toEntry:(Kdb4Entry *)entry atIndex:(NSUInteger)index;
-- (void)group:(KdbGroup *)group removeEntry:(KdbEntry *)entry;
+- (void)removeStringField:(StringField *)field formEntry:(Kdb4Entry *)entry;
-- (void)group:(KdbGroup *)group removeGroup:(KdbGroup *)aGroup;
 
-- (void)entry:(Kdb4Entry *)entry addStringField:(StringField *)field atIndex:(NSUInteger)index;
+- (void)deleteGroup:(KdbGroup *)group;
-- (void)entry:(Kdb4Entry *)entry removeStringField:(StringField *)field;
+- (void)deleteEntry:(KdbEntry *)entry;
 
 - (void)emptyTrash:(id)sender;
 

MacPass/MPDocument.m

@@ -17,6 +17,7 @@
 #import "KdbLib.h"
 #import "Kdb3Node.h"
 #import "Kdb4Node.h"
+#import "Kdb4Persist.h"
 #import "KdbPassword.h"
 #import "KdbGroup+Undo.h"
 #import "KdbGroup+KVOAdditions.h"
@@ -27,6 +28,10 @@
 #import "Kdb3Tree+NewTree.h"
 #import "Kdb4Tree+NewTree.h"
 
+#import "DataOutputStream.h"
+
+#import "DDXMLNode.h"
+
 NSString *const MPDocumentDidAddGroupNotification     = @"com.hicknhack.macpass.MPDocumentDidAddGroupNotification";
 NSString *const MPDocumentWillDelteGroupNotification  = @"com.hicknhack.macpass.MPDocumentDidDelteGroupNotification";
 NSString *const MPDocumentDidAddEntryNotification     = @"com.hicknhack.macpass.MPDocumentDidAddEntryNotification";
@@ -40,6 +45,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 @interface MPDocument () {
 @private
   BOOL _didLockFile;
+  NSData *_fileData;
 }
 
 
@@ -48,7 +54,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 @property (weak, nonatomic, readonly) KdbPassword *passwordHash;
 @property (assign) MPDatabaseVersion version;
 
-@property (assign, nonatomic) BOOL secured;
+@property (assign, nonatomic) BOOL hasPasswordOrKey;
 @property (assign) BOOL decrypted;
 @property (assign) BOOL readOnly;
 
@@ -72,9 +78,10 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 - (id)initWithVersion:(MPDatabaseVersion)version {
   self = [super init];
   if(self) {
+    _fileData = nil;
     _didLockFile = NO;
     _decrypted = YES;
-    _secured = NO;
+    _hasPasswordOrKey = NO;
     _locked = NO;
     _readOnly = NO;
     _rootAdapter = [[MPRootAdapter alloc] init];
@@ -121,16 +128,21 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 
 - (BOOL)readFromURL:(NSURL *)url ofType:(NSString *)typeName error:(NSError **)outError {
   /* FIXME: Logfile handling
-  self.lockFileURL = [url URLByAppendingPathExtension:@"lock"];
+   self.lockFileURL = [url URLByAppendingPathExtension:@"lock"];
-  if([[NSFileManager defaultManager] fileExistsAtPath:[_lockFileURL path]]) {
+   if([[NSFileManager defaultManager] fileExistsAtPath:[_lockFileURL path]]) {
-    self.readOnly = YES;
+   self.readOnly = YES;
-  }
+   }
-  else {
+   else {
-    [[NSFileManager defaultManager] createFileAtPath:[_lockFileURL path] contents:nil attributes:nil];
+   [[NSFileManager defaultManager] createFileAtPath:[_lockFileURL path] contents:nil attributes:nil];
-    _didLockFile = YES;
+   _didLockFile = YES;
-    self.readOnly = NO;
+   self.readOnly = NO;
-  }
+   }
    */
+  /*
+   Delete our old Tree, and just grab the data
+   */
+  self.tree = nil;
+  _fileData = [NSData dataWithContentsOfURL:url options:NSDataReadingUncached error:outError];
   self.decrypted = NO;
   return YES;
 }
@@ -153,9 +165,16 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   [super close];
 }
 
-#pragma mark Protection
+- (void)writeXMLToURL:(NSURL *)url {
+  DataOutputStream *outputStream = [[DataOutputStream alloc] init];
+  Kdb4Persist *persist = [[Kdb4Persist alloc] initWithTree:self.treeV4 outputStream:outputStream randomStream:nil];
+  [persist persistWithOptions:DDXMLNodeCompactEmptyElement|DDXMLNodePrettyPrint];
+  [outputStream.data writeToURL:url atomically:YES];
+}
 
-- (BOOL)decryptWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL {
+#pragma mark Lock/Unlock/Decrypt
+
+- (BOOL)unlockWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL {
   self.key = keyFileURL;
   self.password = [password length] > 0 ? password : nil;
   @try {
@@ -175,6 +194,15 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   return YES;
 }
 
+- (void)lockDatabase:(id)sender {
+  // Persist Tree into data
+  self.tree = nil;
+  self.locked = YES;
+}
+
+
+#pragma mark Custom Setter
+
 - (void)setPassword:(NSString *)password {
   if(![_password isEqualToString:password]) {
     _password = [password copy];
@@ -200,7 +228,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 }
 
 - (BOOL)prepareSavePanel:(NSSavePanel *)savePanel {
-  if(self.isSecured) {
+  if(self.hasPasswordOrKey) {
     [savePanel setAccessoryView:nil];
     return YES;
   }
@@ -294,7 +322,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   if(self.treeV4 && ([self.treeV4.defaultUserName length] > 0)) {
     newEntry.title = self.treeV4.defaultUserName;
   }
-  [self group:parent addEntry:newEntry atIndex:[parent.entries count]];
+  [parent addEntryUndoable:newEntry atIndex:[parent.entries count]];
   NSDictionary *userInfo = @{ MPDocumentEntryKey : newEntry };
   [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentDidAddEntryNotification object:self userInfo:userInfo];
   return newEntry;
@@ -307,7 +335,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   KdbGroup *newGroup = [self.tree createGroup:parent];
   newGroup.name = NSLocalizedString(@"DEFAULT_GROUP_NAME", @"Title for a newly created group");
   newGroup.image = MPIconFolder;
-  [self group:parent addGroup:newGroup atIndex:[parent.groups count]];
+  [parent addGroupUndoable:newGroup atIndex:[parent.groups count]];
   NSDictionary *userInfo = @{ MPDocumentGroupKey : newGroup };
   [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentDidAddGroupNotification object:self userInfo:userInfo];
   return newGroup;
@@ -322,7 +350,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   NSString *title = NSLocalizedString(@"DEFAULT_CUSTOM_FIELD_TITLE", @"Default Titel for new Custom-Fields");
   NSString *value = NSLocalizedString(@"DEFAULT_CUSTOM_FIELD_VALUE", @"Default Value for new Custom-Fields");
   StringField *newStringField = [StringField stringFieldWithKey:title andValue:value];
-  [self entry:entryV4 addStringField:newStringField atIndex:[entryV4.stringFields count]];
+  [self addStringField:newStringField toEntry:entryV4 atIndex:[entryV4.stringFields count]];
   return newStringField;
 }
 
@@ -363,91 +391,44 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   return isMovable;
 }
 
-- (void)moveEntry:(KdbEntry *)entry toGroup:(KdbGroup *)target index:(NSInteger)index {
+- (void)deleteEntry:(KdbEntry *)entry {
-  NSInteger oldIndex = [entry.parent.entries indexOfObject:entry];
+  if(self.useTrash) {
-  if(entry.parent == target && oldIndex == index) {
+    if(!self.trash) {
-    return; // No changes
+      [self _createTrashGroup];
-  }
+    }
-  [[[self undoManager] prepareWithInvocationTarget:self] moveEntry:entry toGroup:entry.parent index:oldIndex];
+    [entry moveToTrashUndoable:self.trash atIndex:[self.trash.entries count]];
-  if(self.trash == target || self.trash == entry.parent) {
-    [[self undoManager] setActionName:@"UNDO_DELETE_ENTRY"];
   }
   else {
-    [[self undoManager] setActionName:@"MOVE_ENTRY"];
+    [entry deleteUndoable];
   }
-  [entry.parent removeObjectFromEntriesAtIndex:oldIndex];
-  if(index < 0 || index > [target.groups count] ) {
-    index = [target.groups count];
-  }
-  [target insertObject:entry inEntriesAtIndex:index];
 }
 
-- (void)group:(KdbGroup *)group addEntry:(KdbEntry *)entry atIndex:(NSUInteger)index {
+- (void)deleteGroup:(KdbGroup *)group {
-  [[[self undoManager] prepareWithInvocationTarget:self] group:group removeEntry:entry];
-  [[self undoManager] setActionName:NSLocalizedString(@"UNDO_ADD_ENTRY", "Undo adding of entry")];
-  [group insertObject:entry inEntriesAtIndex:index];
-}
-
-- (void)group:(KdbGroup *)group addGroup:(KdbGroup *)aGroup atIndex:(NSUInteger)index {
-  [[[self undoManager] prepareWithInvocationTarget:self] group:group removeGroup:aGroup];
-  [[self undoManager] setActionName:NSLocalizedString(@"UNDO_ADD_GROUP", @"Create Group Undo")];
-  [group insertObject:aGroup inGroupsAtIndex:index];
-}
-
-- (void)group:(KdbGroup *)group removeEntry:(KdbEntry *)entry {
-  NSInteger index = [group.entries indexOfObject:entry];
-  if(NSNotFound == index) {
-    return; // No object found;
-  }
   if(self.useTrash) {
     if(!self.trash) {
       [self _createTrashGroup];
     }
-    [self moveEntry:entry toGroup:self.trash index:[self.trash.entries count]];
+    [group moveToTrashUndoable:self.trash atIndex:[self.trash.groups count]];
-    return;
+  }
+  else {
+    [group deleteUndoable];
   }
-  [[[self undoManager] prepareWithInvocationTarget:self] group:group addEntry:entry atIndex:index];
-  [[self undoManager] setActionName:NSLocalizedString(@"UNDO_DELETE_ENTRY", "Undo deleting of entry")];
-  [group removeObjectFromEntriesAtIndex:index];
 }
 
-- (void)group:(KdbGroup *)group removeGroup:(KdbGroup *)aGroup {
+#pragma mark CustomFields
-  NSInteger index = [group.groups indexOfObject:aGroup];
-  if(NSNotFound == index) {
-    return; // No object found
-  }
-  if(self.trash == aGroup) {
-    return;
-    // delete Trash?
-  }
-  /*
-   Cleaning the recyclebin is not undoable
-   So we do this in a separate action
-   */
-  if(self.useTrash) {
-    if(!self.trash) {
-      [self _createTrashGroup];
-    }
-    [self moveGroup:aGroup toGroup:self.trash index:[self.trash.groups count]];
-    return; // Done!
-  }
-  [[[self undoManager] prepareWithInvocationTarget:self] group:group addGroup:aGroup atIndex:index];
-  [[self undoManager] setActionName:NSLocalizedString(@"UNDO_DELETE_GROUP", @"Delete Group Undo")];
-  [group removeObjectFromGroupsAtIndex:index];
-}
 
-- (void)entry:(Kdb4Entry *)entry addStringField:(StringField *)field atIndex:(NSUInteger)index {
+- (void)addStringField:(StringField *)field toEntry:(Kdb4Entry *)entry atIndex:(NSUInteger)index {
-  [[[self undoManager] prepareWithInvocationTarget:self] entry:entry removeStringField:field];
+  [[[self undoManager] prepareWithInvocationTarget:self] removeStringField:field formEntry:entry];
   [[self undoManager] setActionName:NSLocalizedString(@"UNDO_ADD_STRING_FIELD", @"Add Stringfield Undo")];
   [entry insertObject:field inStringFieldsAtIndex:index];
 }
 
-- (void)entry:(Kdb4Entry *)entry removeStringField:(StringField *)field {
+- (void)removeStringField:(StringField *)field formEntry:(Kdb4Entry *)entry {
   NSInteger index = [entry.stringFields indexOfObject:field];
   if(NSNotFound == index) {
     return; // Nothing found to be removed
   }
-  [[[self undoManager] prepareWithInvocationTarget:self] entry:entry addStringField:field atIndex:index];
+  [[[self undoManager] prepareWithInvocationTarget:self] addStringField:field toEntry:entry atIndex:index];
   [[self undoManager] setActionName:NSLocalizedString(@"UNDO_DELETE_STRING_FIELD", @"Delte Stringfield undo")];
   [entry removeObjectFromStringFieldsAtIndex:index];
 }
@@ -455,8 +436,23 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 #pragma mark Actions
 
 - (void)emptyTrash:(id)sender {
-  [[self undoManager] setActionIsDiscardable:YES];
+  NSAlert *alert = [[NSAlert alloc] init];
-  [self.trash clear];
+  [alert setAlertStyle:NSWarningAlertStyle];
+  [alert setMessageText:NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_TITLE", "")];
+  [alert setInformativeText:NSLocalizedString(@"WARNING_ON_EMPTY_TRASH_DESCRIPTION", "Informative Text displayed when clearing the Trash")];
+  [alert addButtonWithTitle:NSLocalizedString(@"EMPTY_TRASH", "Empty Trash")];
+  [alert addButtonWithTitle:NSLocalizedString(@"CANCEL", "Cancel")];
+  
+  [[alert buttons][1] setKeyEquivalent:[NSString stringWithFormat:@"%c", 0x1b]];
+  
+  NSWindow *window = [[self windowControllers][0] window];
+  [alert beginSheetModalForWindow:window modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:NULL];
+}
+
+- (void) alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+  if(returnCode == NSAlertFirstButtonReturn) {
+    [self _emptyTrash];
+  }
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
@@ -472,7 +468,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 - (void)_updateIsSecured {
   BOOL securePassword = ([self.password length] > 0);
   BOOL secureKey = (nil != self.key);
-  self.secured = (secureKey || securePassword);
+  self.hasPasswordOrKey = (secureKey || securePassword);
 }
 
 - (void)_cleanupLock {
@@ -489,7 +485,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   }
   else if(self.version == MPDatabaseVersion4) {
     KdbGroup *trash = [self.tree createGroup:self.tree.root];
-    trash.name = NSLocalizedString(@"TRASH_GROUP", @"Name for the trash group");
+    trash.name = NSLocalizedString(@"TRASH", @"Name for the trash group");
     trash.image = MPIconTrash;
     [self.tree.root insertObject:trash inGroupsAtIndex:[self.tree.root.groups count]];
     self.treeV4.recycleBinUuid = ((Kdb4Group *)trash).uuid;
@@ -501,4 +497,14 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   }
 }
 
+- (void)_emptyTrash {
+  for(KdbEntry *entry in [self.trash childEntries]) {
+    [[self undoManager] removeAllActionsWithTarget:entry];
+  }
+  for(KdbGroup *group in [self.trash childGroups]) {
+    [[self undoManager] removeAllActionsWithTarget:group];
+  }
+  [self.trash clear];
+}
+
 @end

MacPass/MPDocumentWindowController.h

@@ -38,6 +38,7 @@ APPKIT_EXTERN NSString *const MPCurrentItemChangedNotification;
 - (void)performFindPanelAction:(id)sender;
 - (IBAction)editPassword:(id)sender;
 - (IBAction)showDatabaseSettings:(id)sender;
+- (IBAction)exportDatabase:(id)sender;
 
 - (void)lock:(id)sender;
 

MacPass/MPDocumentWindowController.m

@@ -97,7 +97,7 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
   [[self window] setDelegate:self];
   
   MPDocument *document = [self document];
-  if(!document.isDecrypted) {
+  if(!document.decrypted) {
     [self showPasswordInput];
   }
   else {
@@ -162,13 +162,27 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
 }
 
 #pragma mark Actions
+- (void)exportDatabase:(id)sender {
+  NSSavePanel *savePanel = [NSSavePanel savePanel];
+  [savePanel setAllowsOtherFileTypes:YES];
+  [savePanel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result) {
+    if(result == NSFileHandlingPanelOKButton) {
+      [[self document] writeXMLToURL:savePanel.URL];
+    }
+  }];
+}
 - (void)performFindPanelAction:(id)sender {
   [self.entryViewController showFilter:sender];
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
+  BOOL enabled = YES;
   MPDocument *document = [self document];
-  return !( document.isLocked || document.isReadOnly );
+  if([menuItem action] == @selector(exportDatabase:)) {
+    enabled = (nil != document.treeV4);
+  }
+  enabled &= !( document.isLocked || document.isReadOnly );
+  return enabled;
 }
 
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem {
@@ -178,7 +192,7 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
   }
   SEL itemAction = [theItem action];
   if( itemAction == [MPActionHelper actionOfType:MPActionLock]) {
-    return document.isSecured;
+    return document.hasPasswordOrKey;
   }
   if(itemAction == [MPActionHelper actionOfType:MPActionAddEntry]) {
     return (nil != _outlineViewController.selectedGroup);
@@ -211,7 +225,7 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
 
 - (void)lock:(id)sender {
   MPDocument *document = [self document];
-  if(!document.isSecured) {
+  if(!document.hasPasswordOrKey) {
     return; // Document needs a password/keyfile to be lockable
   }
   if(document.isLocked) {

MacPass/MPEntryMenuDelegate.h

@@ -0,0 +1,16 @@
+//
+//  MPEntryMenuDelegate.h
+//  MacPass
+//
+//  Created by Michael Starke on 17.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+@class MPEntryViewController;
+
+@interface MPEntryMenuDelegate : NSObject <NSMenuDelegate>
+
+@property (weak) MPEntryViewController *viewController;
+
+@end

MacPass/MPEntryMenuDelegate.m

@@ -0,0 +1,54 @@
+//
+//  MPEntryMenuDelegate.m
+//  MacPass
+//
+//  Created by Michael Starke on 17.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPEntryMenuDelegate.h"
+#import "MPEntryViewController.h"
+
+#import "Kdb4Node.h"
+
+static NSUInteger const kMPCustomFieldMenuItem = 1000;
+static NSUInteger const kMPAttachmentsMenuItem = 2000;
+
+@implementation MPEntryMenuDelegate
+
+- (void)menuNeedsUpdate:(NSMenu *)menu {
+  NSMenuItem *fieldsMenu = [menu itemWithTag:kMPCustomFieldMenuItem];
+  NSMenuItem *attachmentsMenu = [menu itemWithTag:kMPAttachmentsMenuItem];
+  if(fieldsMenu) {
+    [menu removeItem:fieldsMenu];
+  }
+  if(attachmentsMenu) {
+    [menu removeItem:attachmentsMenu];
+  }
+
+  NSMenuItem *lastItem = [[menu itemArray] lastObject];
+  if([lastItem isSeparatorItem]) {
+    [menu removeItem:lastItem];
+  }
+  
+  if([self.viewController.selectedEntry isKindOfClass:[Kdb4Entry class]]) {
+    Kdb4Entry *entry = (Kdb4Entry *)self.viewController.selectedEntry;
+    if([entry.stringFields count] > 0) {
+      [menu addItem:[NSMenuItem separatorItem]];
+      NSMenuItem *customFieldsItem = [[NSMenuItem alloc] init];
+      NSMenu *submenu = [[NSMenu alloc] initWithTitle:@"Fields"];
+      [customFieldsItem setTitle:NSLocalizedString(@"COPY_CUSTOM_FIELDS", "Submenu to Copy custom fields")];
+      [customFieldsItem setTag:kMPCustomFieldMenuItem];
+      for (StringField *field in entry.stringFields) {
+        NSString *title = [NSString stringWithFormat:NSLocalizedString(@"COPY_FIELD_%@", "Mask for title to copy field value"), field.key];
+        NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:title action:@selector(copyCustomField:) keyEquivalent:@""];
+        [item setTag:[entry.stringFields indexOfObject:field]];
+        [submenu addItem:item];
+      }
+      [customFieldsItem setSubmenu:submenu];
+      [menu addItem:customFieldsItem];
+    }
+  }
+}
+
+@end

MacPass/MPEntryViewController.h

@@ -48,9 +48,11 @@ typedef NS_ENUM( NSUInteger, MPCopyContentTypeTag) {
 /* Copy/Paste */
 - (void)copyUsername:(id)sender;
 - (void)copyPassword:(id)sender;
+- (void)copyCustomField:(id)sender;
 - (void)copyURL:(id)sender;
 - (void)openURL:(id)sender;
 
+
 /* Entry Handling*/
 - (void)deleteNode:(id)sender;
 

MacPass/MPEntryViewController.m

@@ -20,10 +20,12 @@
 #import "MPConstants.h"
 #import "MPEntryTableDataSource.h"
 #import "MPStringLengthValueTransformer.h"
+#import "MPEntryMenuDelegate.h"
 
 #import "HNHTableHeaderCell.h"
 #import "HNHGradientView.h"
 
+#import "Kdb4Node.h"
 #import "KdbGroup+MPTreeTools.h"
 #import "KdbGroup+Undo.h"
 #import "KdbEntry+Undo.h"
@@ -43,6 +45,7 @@ typedef NS_ENUM(NSUInteger,MPOVerlayInfoType) {
   MPOverlayInfoPassword,
   MPOverlayInfoUsername,
   MPOverlayInfoURL,
+  MPOverlayInfoCustom
 };
 
 NSString *const MPEntryTableUserNameColumnIdentifier = @"MPUserNameColumnIdentifier";
@@ -59,7 +62,9 @@ NSString *const _toggleFilterURLButton = @"SearchURL";
 NSString *const _toggleFilterTitleButton = @"SearchTitle";
 NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 
-@interface MPEntryViewController ()
+@interface MPEntryViewController () {
+  MPEntryMenuDelegate *_menuDelegate;
+}
 
 @property (strong) NSArrayController *entryArrayController;
 @property (strong) NSArray *filteredEntries;
@@ -103,6 +108,9 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
     _entryArrayController = [[NSArrayController alloc] init];
     _dataSource = [[MPEntryTableDataSource alloc] init];
     _dataSource.viewController = self;
+    _menuDelegate = [[MPEntryMenuDelegate alloc] init];
+    _menuDelegate.viewController = self;
+    
     _selectedEntry = nil;
   }
   return self;
@@ -124,7 +132,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   [self.entryTable setDoubleAction:@selector(_columnDoubleClick:)];
   [self.entryTable setTarget:self];
   [self.entryTable setFloatsGroupRows:NO];
-  [self.entryTable registerForDraggedTypes:@[MPPasteBoardType]];
+  //[self.entryTable registerForDraggedTypes:@[MPPasteBoardType]];
   [self _setupEntryMenu];
   
   NSTableColumn *parentColumn = [self.entryTable tableColumns][0];
@@ -396,7 +404,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   }
 }
 
-- (void)_copyToPasteboard:(NSString *)data overlayInfo:(MPOVerlayInfoType)overlayInfoType {
+- (void)_copyToPasteboard:(NSString *)data overlayInfo:(MPOVerlayInfoType)overlayInfoType name:(NSString *)name{
   if(data) {
     [[MPPasteBoardController defaultController] copyObjects:@[ data ]];
   }
@@ -417,6 +425,11 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
       infoImage = [[NSBundle mainBundle] imageForResource:@"09_IdentityTemplate"];
       infoText = NSLocalizedString(@"COPIED_USERNAME", @"Username was copied to the pasteboard");
       break;
+  
+    case MPOverlayInfoCustom:
+      infoImage = [[NSBundle mainBundle] imageForResource:@"00_PasswordTemplate"];
+      infoText = [NSString stringWithFormat:NSLocalizedString(@"COPIED_FIELD_%@", "Field nam that was copied to the pasteboard"), name];
+      break;
   }
   [[MPOverlayWindowController sharedController] displayOverlayImage:infoImage label:infoText atView:self.view];
 }
@@ -430,7 +443,9 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
   for(NSMenuItem *item in items) {
     [menu addItem:item];
   }
+  [menu setDelegate:_menuDelegate];
   [self.entryTable setMenu:menu];
+  
 }
 
 #pragma makr Action Helper
@@ -452,21 +467,32 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 - (void)copyPassword:(id)sender {
   KdbEntry *selectedEntry = [self _clickedOrSelectedEntry];
   if(selectedEntry) {
-    [self _copyToPasteboard:selectedEntry.password overlayInfo:MPOverlayInfoPassword];
+    [self _copyToPasteboard:selectedEntry.password overlayInfo:MPOverlayInfoPassword name:nil];
   }
 }
 
 - (void)copyUsername:(id)sender {
   KdbEntry *selectedEntry = [self _clickedOrSelectedEntry];
   if(selectedEntry) {
-    [self _copyToPasteboard:selectedEntry.username overlayInfo:MPOverlayInfoUsername];
+    [self _copyToPasteboard:selectedEntry.username overlayInfo:MPOverlayInfoUsername name:nil];
+  }
+}
+
+- (void)copyCustomField:(id)sender {
+  KdbEntry *selectedEntry = [self _clickedOrSelectedEntry];
+  if(selectedEntry && [selectedEntry isKindOfClass:[Kdb4Entry class]]) {
+    Kdb4Entry *entry = (Kdb4Entry *)selectedEntry;
+    NSUInteger index = [sender tag];
+    NSAssert((index >= 0)  && (index < [entry.stringFields count]), @"Index for custom field needs to be valid");
+    StringField *field = entry.stringFields[index];
+    [self _copyToPasteboard:field.value overlayInfo:MPOverlayInfoCustom name:field.key];
   }
 }
 
 - (void)copyURL:(id)sender {
   KdbEntry *selectedEntry = [self _clickedOrSelectedEntry];
   if(selectedEntry) {
-    [self _copyToPasteboard:selectedEntry.url overlayInfo:MPOverlayInfoURL];
+    [self _copyToPasteboard:selectedEntry.url overlayInfo:MPOverlayInfoURL name:nil];
   }
 }
 
@@ -481,7 +507,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
 - (void)deleteNode:(id)sender {
   KdbEntry *entry =[self _clickedOrSelectedEntry];
   MPDocument *document = [[self windowController] document];
-  [document group:entry.parent removeEntry:entry];
+  [document deleteEntry:entry];
 }
 
 - (void)_toggleFilterSpace:(id)sender {

MacPass/MPInspectorViewController.m

@@ -21,6 +21,8 @@
 #import "MPCustomFieldTableCellView.h"
 #import "MPSelectedAttachmentTableCellView.h"
 
+#import "NSDate+Humanized.h"
+
 #import "KdbLib.h"
 #import "Kdb4Node.h"
 #import "Kdb3Node.h"
@@ -66,6 +68,8 @@ enum {
 - (IBAction)saveAttachment:(id)sender;
 - (IBAction)addAttachment:(id)sender;
 - (IBAction)removeAttachment:(id)sender;
+- (IBAction)edit:(id)sender;
+- (IBAction)finishEdit:(id)sender;
 
 @end
 
@@ -128,6 +132,9 @@ enum {
   NSString *modificationString = [NSDateFormatter localizedStringFromDate:modificationDate
                                                                 dateStyle:NSDateFormatterShortStyle
                                                                 timeStyle:NSDateFormatterShortStyle];
+  
+  modificationString = [modificationDate humanized];
+  
   NSString *modifedAtTemplate = NSLocalizedString(@"MODIFED_AT_%@", @"Modifed at template string. %@ is replaced by locaized date and time");
   [self.modifiedTextField setStringValue:[NSString stringWithFormat:modifedAtTemplate, modificationString]];
   
@@ -137,6 +144,7 @@ enum {
   NSString *creationString = [NSDateFormatter localizedStringFromDate:creationDate
                                                             dateStyle:NSDateFormatterShortStyle
                                                             timeStyle:NSDateFormatterShortStyle];
+  creationString = [creationDate humanized];
   
   NSString *createdAtTemplate = NSLocalizedString(@"CREATED_AT_%@", @"Created at template string. %@ is replaced by locaized date and time");
   [self.createdTextField setStringValue:[NSString stringWithFormat:createdAtTemplate, creationString]];
@@ -323,7 +331,7 @@ enum {
   MPDocument *document = [[self windowController] document];
   NSUInteger index = [sender tag];
   Kdb4Entry *entry = (Kdb4Entry *)self.selectedEntry;
-  [document entry:entry removeStringField:(entry.stringFields)[index]];
+  [document removeStringField:(entry.stringFields)[index] formEntry:entry];
 }
 
 - (IBAction)saveAttachment:(id)sender {
@@ -370,6 +378,21 @@ enum {
   }
 }
 
+- (IBAction)edit:(id)sender {
+  [self.titleTextField setEditable:YES];
+  [self.usernameTextField setEditable:YES];
+  [[[[self windowController] document] undoManager] beginUndoGrouping];
+}
+
+- (IBAction)finishEdit:(id)sender {
+  NSUndoManager *undoManger =   [[[self windowController] document] undoManager];
+  [undoManger setActionName:@"Edit"];
+  [undoManger endUndoGrouping];
+  [self.titleTextField setEditable:NO];
+  [self.usernameTextField setEditable:NO];
+
+}
+
 #pragma mark Notificiations
 - (void)_didChangeCurrentItem:(NSNotification *)notification {
   MPDocumentWindowController *sender = [notification object];

MacPass/MPOutlineDataSource.m

@@ -13,6 +13,7 @@
 
 #import "KdbLib.h"
 #import "KdbGroup+Undo.h"
+#import "KdbEntry+Undo.h"
 #import "KdbGroup+MPTreeTools.h"
 #import "KdbEntry+MPTreeTools.h"
 
@@ -79,7 +80,7 @@
     MPDocument *document = [[[outlineView window] windowController] document];
     accepted = [document group:_draggedItem isMoveableToGroup:target];
     if( accepted ) {
-      [document moveGroup:_draggedItem toGroup:target index:index];
+      [_draggedItem moveToGroupUndoable:target atIndex:index];
     }
     info.animatesToDestination = !accepted;
     return accepted;
@@ -94,7 +95,7 @@
     KdbEntry *draggedEntry = [rootGroup entryForUUID:uuid];
     if(draggedEntry) {
       if(draggedEntry.parent != target && index == NSOutlineViewDropOnItemIndex) {
-        [document moveEntry:draggedEntry toGroup:target index:index];
+        [draggedEntry moveToGroupUndoable:target atIndex:index];
         return YES;
       }
     }

MacPass/MPOutlineViewController.m

@@ -39,6 +39,8 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 @property (strong) MPOutlineDataSource *datasource;
 @property (strong) NSMenu *menu;
 
+@property (copy, nonatomic) NSString *databaseNameWrapper;
+
 @end
 
 @implementation MPOutlineViewController
@@ -53,6 +55,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
     _treeController = [[NSTreeController alloc] init];
     _bindingEstablished = NO;
     _datasource = [[MPOutlineDataSource alloc] init];
+    _databaseNameWrapper = NSLocalizedString(@"NEW_DATABASE", "Name for a newly created Database");
   }
   
   return self;
@@ -64,7 +67,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   [_outlineView setMenu:[self _contextMenu]];
   [_outlineView setAllowsEmptySelection:YES];
   [_outlineView setFloatsGroupRows:NO];
-  [_outlineView registerForDraggedTypes:@[ MPPasteBoardType ]];
+  //[_outlineView registerForDraggedTypes:@[ MPPasteBoardType ]];
   [_outlineView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES];
   [_bottomBar setBorderType:HNHBorderTop];
   [_addGroupButton setAction:[MPActionHelper actionOfType:MPActionAddGroup]];
@@ -76,6 +79,9 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
     [_treeController setChildrenKeyPath:@"groups"];
     [_treeController bind:NSContentBinding toObject:document withKeyPath:@"rootAdapter" options:nil];
     [_outlineView bind:NSContentBinding toObject:_treeController withKeyPath:@"arrangedObjects" options:nil];
+    if([document.tree respondsToSelector:@selector(databaseName)]) {
+      [self bind:@"databaseNameWrapper" toObject:document.tree withKeyPath:@"databaseName" options:nil];
+    }
     [_outlineView setDataSource:self.datasource];
     _bindingEstablished = YES;
   }
@@ -83,7 +89,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   [_outlineView expandItem:node expandChildren:YES];
 }
 
-#pragma makr Notifications
+#pragma mark Notifications
 - (void)setupNotifications:(MPDocumentWindowController *)windowController {
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(_didCreateGroup:) name:MPDocumentDidAddGroupNotification object:[windowController document]];
 }
@@ -108,6 +114,17 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   }
 }
 
+- (void)setDatabaseNameWrapper:(NSString *)databaseNameWrapper {
+  if(![_databaseNameWrapper isEqualToString:databaseNameWrapper]) {
+    if([databaseNameWrapper length] == 0) {
+      _databaseNameWrapper = NSLocalizedString(@"DATABASE", "Default name database");
+    }
+    else {
+      _databaseNameWrapper= [databaseNameWrapper copy];
+    }
+  }
+}
+
 #pragma mark -
 #pragma mark Actions
 
@@ -121,18 +138,12 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 }
 
 - (void)createEntry:(id)sender {
-  KdbGroup *group = [self _clickedOrSelectedGroup];
+  MPDocument *document = [[self windowController] document];
-  if(group) {
+  [document createEntry:[self _clickedOrSelectedGroup]];
-    MPDocument *document = [[self windowController] document];
-    [document createEntry:group];
-  }
 }
 
 - (void)deleteNode:(id)sender {
-  KdbGroup *group = [self _clickedOrSelectedGroup];
+  [[[self windowController] document] deleteGroup:[self _clickedOrSelectedGroup]];
-  if(group && group.parent) {
-    [[[self windowController] document] group:group.parent removeGroup:group];
-  }
 }
 
 #pragma mark NSOutlineViewDelegate
@@ -141,13 +152,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   if( [self _itemIsRootNodeAdapter:item] ) {
     //NSDictionary *options = @{ NSValueTransformerBindingOption : [NSValueTransformer valueTransformerForName:MPUppsercaseStringValueTransformerName] };
     view = [outlineView makeViewWithIdentifier:_MPOutlinveViewHeaderViewIdentifier owner:self];
-    MPRootAdapter *rootNode = [item representedObject];
+    [view.textField bind:NSValueBinding toObject:self  withKeyPath:@"databaseNameWrapper" options:nil];
-    if([rootNode.tree respondsToSelector:@selector(databaseName)]) {
-      [view.textField bind:NSValueBinding toObject:rootNode.tree withKeyPath:@"databaseName" options:nil];
-    }
-    else {
-      [view.textField setStringValue:NSLocalizedString(@"GROUPS", @"")];
-    }
   }
   else {
     KdbGroup *group = [item representedObject];

MacPass/MPPasswordInputController.m

@@ -60,7 +60,7 @@
   MPDocument *document = [windowController document];
   if(document) {
     BOOL isOk = NO;
-    if(document.isDecrypted) {
+    if(document.decrypted) {
       // TODO: Fix unlocking to actually test
       BOOL noPassword = !document.password && [[self.passwordTextField stringValue] length] == 0;
       BOOL passwordOk = [document.password isEqualToString:[self.passwordTextField stringValue]];
@@ -69,7 +69,7 @@
       isOk = (noPassword || passwordOk) && (noKey || keyOk);
     }
     else {
-      isOk = [document decryptWithPassword:[self.passwordTextField stringValue] keyFileURL:[self.keyPathControl URL]];
+      isOk = [document unlockWithPassword:[self.passwordTextField stringValue] keyFileURL:[self.keyPathControl URL]];
     }
     if(!isOk) {
       [self _showError];

MacPass/MPRootAdapter.m

@@ -21,7 +21,12 @@
 - (void)setTree:(KdbTree *)tree {
   if(_tree != tree) {
     _tree = tree;
-    self.groups = @[_tree.root];
+    if(_tree) {
+      self.groups = @[_tree.root];
+    }
+    else {
+      self.groups = nil;
+    }
   }
 }
 

MacPass/MacPass-Info.plist

@@ -44,11 +44,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.1</string>
+	<string>0.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2301</string>
+	<string>2506</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>

MacPass/NSDate+Humanized.h

@@ -0,0 +1,16 @@
+//
+//  NSDate+Humanized.h
+//  MacPass
+//
+//  Created by Michael Starke on 10.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSDate (Humanized)
+
++ (NSString *)humanizedDate:(NSDate *)date;
+- (NSString *)humanized;
+
+@end

MacPass/NSDate+Humanized.m

@@ -0,0 +1,39 @@
+//
+//  NSDate+Humanized.m
+//  MacPass
+//
+//  Created by Michael Starke on 10.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "NSDate+Humanized.h"
+
+@implementation NSDate (Humanized)
+
++ (NSString *)humanizedDate:(NSDate *)date {
+  return [date humanized];
+}
+
+- (NSString *)humanized {
+  NSCalendar *calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+  NSDateComponents *components = [calendar components:NSMinuteCalendarUnit|NSHourCalendarUnit|NSDayCalendarUnit fromDate:self toDate:[NSDate date] options:0];
+  if([components day] > 1) {
+    return [NSDateFormatter localizedStringFromDate:self
+                                          dateStyle:NSDateFormatterShortStyle
+                                          timeStyle:NSDateFormatterShortStyle];
+  }
+  if([components day] == 1) {
+    return NSLocalizedString(@"YESTERDAY", "Yesterday");
+  }
+  if([components hour] > 1) {
+    NSString *hourTemplate = NSLocalizedString(@"%ld_HOURS_AGO", "% Hours ago");
+    return [NSString stringWithFormat:hourTemplate, [components hour]];
+  }
+  NSInteger minutes = [components minute];
+  if(minutes > 1) {
+    NSString *minuteTemplate = NSLocalizedString(@"%ld_MINUTES_AGO", "% Minutes ago");
+    return [NSString stringWithFormat:minuteTemplate, minutes];
+  }
+  return NSLocalizedString(@"JUST_NOW", "Just now");
+}
+@end

MacPass/NSString+MPPasswordAnalysis.h

@@ -1,23 +0,0 @@
-//
-//  NSString+MPPasswordAnalysis.h
-//  MacPass
-//
-//  Created by Michael Starke on 29.03.13.
-//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-typedef NS_ENUM(NSUInteger, MPPasswordStrength) {
-  MPPasswordWeak,
-  MPPasswordOK,
-  MPPasswordGood,
-  MPPasswordStrong,
-  MPPasswordExcelent,
-};
-
-@interface NSString (MPPasswordAnalysis)
-
-- (MPPasswordStrength)passwordStrenght;
-
-@end

MacPass/NSString+PasswordStrength.h

@@ -0,0 +1,17 @@
+//
+//  NSString+MPPasswordAnalysis.h
+//  MacPass
+//
+//  Created by Michael Starke on 29.03.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+
+@interface NSString (PasswordStrenght)
+
+- (NSUInteger)passwordStrenght;
+
+
+@end

MacPass/NSString+PasswordStrength.m

@@ -6,12 +6,12 @@
 //  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
 //
 
-#import "NSString+MPPasswordAnalysis.h"
+#import "NSString+PasswordStrength.h"
 
-@implementation NSString (MPPasswordAnalysis)
+@implementation NSString (PasswordStrenght)
 
-- (MPPasswordStrength)passwordStrenght {
+- (NSUInteger)passwordStrenght {
-  return MPPasswordOK;
+  return 0;
 }
 
 @end

MacPassTests/CustomIcon_Password_1234.xml

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<KeePassFile>
+	<Meta>
+		<Generator>KeePassX</Generator>
+		<DatabaseName/>
+		<DatabaseNameChanged>2013-07-15T19:35:54Z</DatabaseNameChanged>
+		<DatabaseDescription/>
+		<DatabaseDescriptionChanged>2013-07-15T19:35:54Z</DatabaseDescriptionChanged>
+		<DefaultUserName/>
+		<DefaultUserNameChanged>2013-07-15T19:35:54Z</DefaultUserNameChanged>
+		<MaintenanceHistoryDays>365</MaintenanceHistoryDays>
+		<Color/>
+		<MasterKeyChanged>2013-07-15T19:36:02Z</MasterKeyChanged>
+		<MasterKeyChangeRec>-1</MasterKeyChangeRec>
+		<MasterKeyChangeForce>-1</MasterKeyChangeForce>
+		<MemoryProtection>
+			<ProtectTitle>False</ProtectTitle>
+			<ProtectUserName>False</ProtectUserName>
+			<ProtectPassword>True</ProtectPassword>
+			<ProtectURL>False</ProtectURL>
+			<ProtectNotes>False</ProtectNotes>
+		</MemoryProtection>
+		<CustomIcons>
+			<Icon>
+				<UUID>RaP8u/B18ngIutqc2B5c9g==</UUID>
+				<Data>iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAA3NCSVQICAjb4U/gAAAACXBIWXMAAAsSAAALEgHS3X78AAACHUlEQVQokV2SzUtUYRTGn/Pe915HZyIwJ0FDEsqCXORGaBFYLWoR7foDglZt+xuCFu76G9q0iFBKMgQhhUhIhIRM7EuHq+N8ODN37uf7ntNCR249q7P4wfOccx4SEfRkwY4oEIyVNAoLJVdZTxxD0KeMQk4OKxCSKF5893KgJEkkcAyJzjOQnJiZRSp7P01rh4Ot+devjFjLeUT+cQCJyez3zRVH2sTd+/euB60O0T+IEjAACAAWIwfNg5lrZ5HWkNZxtL24NEcCgCEnVM+BACjlYG9jFU5HzCFnR+Duw1vjQdTpAUyAolyqSqU2PbGPqLrwYXf+/VdYH40vywtz1vZiCTR6s8mi0eK21Npg7NZ9sQWElLC+MymNuj9UHiFSICgc7wA0age8u0CpWLt/6VzxwlCfZK2+NHTT/eWltxADAGB9vEoUhmVnh6KqQb+WdPpKod6o0e+P1loNmSmO+od3R86PQZQGFEm2tbU+5c9K/Ed321BUGrx4Rg1mnZZrGZbKvPFpfW749iPxigowzSCbLG2nvzak6SPu2m61k4zFXHQ7KQIgDhAXJiovmkGsJaHM8I+11YmVm/CAzAOlrPHm21U/bD2ZqoIsGcWKlcHm5dnxB08pC41ee24/P3NsZPVJbYgoX8rjF7e5nDze0bFSCjoZvmGUUr2LAaAcnyrX4ywxxX6XiVkobTbR77H5r7yncjnp6tIA2z6v8BeUfknGrtTw7gAAAABJRU5ErkJggg==</Data>
+			</Icon>
+		</CustomIcons>
+		<RecycleBinEnabled>True</RecycleBinEnabled>
+		<RecycleBinUUID>AAAAAAAAAAAAAAAAAAAAAA==</RecycleBinUUID>
+		<RecycleBinChanged>2013-07-15T19:35:54Z</RecycleBinChanged>
+		<EntryTemplatesGroup>AAAAAAAAAAAAAAAAAAAAAA==</EntryTemplatesGroup>
+		<EntryTemplatesGroupChanged>2013-07-15T19:35:54Z</EntryTemplatesGroupChanged>
+		<HistoryMaxItems>10</HistoryMaxItems>
+		<HistoryMaxSize>6291456</HistoryMaxSize>
+		<LastSelectedGroup>AAAAAAAAAAAAAAAAAAAAAA==</LastSelectedGroup>
+		<LastTopVisibleGroup>AAAAAAAAAAAAAAAAAAAAAA==</LastTopVisibleGroup>
+		<Binaries/>
+		<CustomData/>
+	</Meta>
+	<Root>
+		<Group>
+			<UUID>8XPXLHyIoM9KLqrjDHjsZQ==</UUID>
+			<Name>Root</Name>
+			<Notes/>
+			<IconID>48</IconID>
+			<Times>
+				<LastModificationTime>2013-07-15T19:35:54Z</LastModificationTime>
+				<CreationTime>2013-07-15T19:35:54Z</CreationTime>
+				<LastAccessTime>2013-07-15T19:35:54Z</LastAccessTime>
+				<ExpiryTime>2013-07-15T19:35:54Z</ExpiryTime>
+				<Expires>False</Expires>
+				<UsageCount>0</UsageCount>
+				<LocationChanged>2013-07-15T19:35:54Z</LocationChanged>
+			</Times>
+			<IsExpanded>True</IsExpanded>
+			<DefaultAutoTypeSequence/>
+			<EnableAutoType>null</EnableAutoType>
+			<EnableSearching>null</EnableSearching>
+			<LastTopVisibleEntry>AAAAAAAAAAAAAAAAAAAAAA==</LastTopVisibleEntry>
+			<Entry>
+				<UUID>XW1C9XAjxqVKt4bJsOpgRQ==</UUID>
+				<IconID>0</IconID>
+				<CustomIconUUID>RaP8u/B18ngIutqc2B5c9g==</CustomIconUUID>
+				<ForegroundColor/>
+				<BackgroundColor/>
+				<OverrideURL/>
+				<Tags/>
+				<Times>
+					<LastModificationTime>2013-07-15T19:37:38Z</LastModificationTime>
+					<CreationTime>2013-07-15T19:36:04Z</CreationTime>
+					<LastAccessTime>2013-07-15T19:37:38Z</LastAccessTime>
+					<ExpiryTime>2013-07-15T19:36:04Z</ExpiryTime>
+					<Expires>False</Expires>
+					<UsageCount>0</UsageCount>
+					<LocationChanged>2013-07-15T19:36:08Z</LocationChanged>
+				</Times>
+				<String>
+					<Key>Title</Key>
+					<Value>CustomIcon</Value>
+				</String>
+				<String>
+					<Key>UserName</Key>
+					<Value/>
+				</String>
+				<String>
+					<Key>Password</Key>
+					<Value Protected="True"/>
+				</String>
+				<String>
+					<Key>URL</Key>
+					<Value/>
+				</String>
+				<String>
+					<Key>Notes</Key>
+					<Value/>
+				</String>
+				<AutoType>
+					<Enabled>True</Enabled>
+					<DataTransferObfuscation>0</DataTransferObfuscation>
+					<DefaultSequence/>
+				</AutoType>
+				<History>
+					<Entry>
+						<UUID>XW1C9XAjxqVKt4bJsOpgRQ==</UUID>
+						<IconID>0</IconID>
+						<ForegroundColor/>
+						<BackgroundColor/>
+						<OverrideURL/>
+						<Tags/>
+						<Times>
+							<LastModificationTime>2013-07-15T19:36:08Z</LastModificationTime>
+							<CreationTime>2013-07-15T19:36:04Z</CreationTime>
+							<LastAccessTime>2013-07-15T19:36:08Z</LastAccessTime>
+							<ExpiryTime>2013-07-15T19:36:04Z</ExpiryTime>
+							<Expires>False</Expires>
+							<UsageCount>0</UsageCount>
+							<LocationChanged>2013-07-15T19:36:08Z</LocationChanged>
+						</Times>
+						<String>
+							<Key>Title</Key>
+							<Value>CustomIcon</Value>
+						</String>
+						<String>
+							<Key>UserName</Key>
+							<Value/>
+						</String>
+						<String>
+							<Key>Password</Key>
+							<Value Protected="True"/>
+						</String>
+						<String>
+							<Key>URL</Key>
+							<Value/>
+						</String>
+						<String>
+							<Key>Notes</Key>
+							<Value/>
+						</String>
+						<AutoType>
+							<Enabled>True</Enabled>
+							<DataTransferObfuscation>0</DataTransferObfuscation>
+							<DefaultSequence/>
+						</AutoType>
+					</Entry>
+				</History>
+			</Entry>
+		</Group>
+	</Root>
+</KeePassFile>

MacPassTests/MPDatabaseCreation.h

@@ -0,0 +1,15 @@
+//
+//  MPDatabaseCreation.h
+//  MacPass
+//
+//  Created by Michael Starke on 10.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface MPDatabaseCreation : SenTestCase
+
+
+
+@end

MacPassTests/MPDatabaseCreation.m

@@ -0,0 +1,34 @@
+//
+//  MPDatabaseCreation.m
+//  MacPass
+//
+//  Created by Michael Starke on 10.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPDatabaseCreation.h"
+#import "MPDocument.h"
+
+@implementation MPDatabaseCreation
+
+- (void)testCreateDatabaseVersion1 {
+  MPDocument *document = [[MPDocument alloc] initWithVersion:MPDatabaseVersion3];
+  STAssertNotNil(document, @"Document should be created");
+  STAssertTrue(document.version == MPDatabaseVersion3, @"Database should be Version1");
+  STAssertNotNil(document.treeV3, @"Database Tree needs to be Kdb3Tree");
+  STAssertNil(document.treeV4,  @"Database Tree cannot be Kdb4Tree");
+  STAssertTrue(document.decrypted, @"Document has to be decrypted new database is created");
+  STAssertFalse(document.hasPasswordOrKey, @"Document has no Password/Keyfile and thus is not secured");
+}
+
+- (void)testCreateDatabaseVersion2 {
+  MPDocument *document = [[MPDocument alloc] initWithVersion:MPDatabaseVersion4];
+  STAssertNotNil(document, @"Document should be created");
+  STAssertTrue(document.version == MPDatabaseVersion4, @"Database should be Version2");
+  STAssertNotNil(document.treeV4, @"Database Tree needs to be Kdb4Tree");
+  STAssertNil(document.treeV3, @"Database Tree cannot be Kdb3Tree");
+  STAssertTrue(document.decrypted, @"Document has to be decrypted new database is created");
+  STAssertFalse(document.hasPasswordOrKey, @"Document has no Password/Keyfile and thus is not secured");
+}
+
+@end

MacPassTests/MPDatabaseLoading.h

@@ -0,0 +1,13 @@
+//
+//  MPDatabaseLoadingTest.h
+//  MacPass
+//
+//  Created by Michael Starke on 10.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface MPDatabaseLoading : SenTestCase
+
+@end

MacPassTests/MPDatabaseLoading.m

@@ -0,0 +1,58 @@
+//
+//  MPDatabaseLoadingTest.m
+//  MacPass
+//
+//  Created by Michael Starke on 10.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPDatabaseLoading.h"
+
+#import "MPDocument.h"
+
+@implementation MPDatabaseLoading
+
+
+- (void)testLoadVersion1 {
+  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdb"];
+  NSError *error = nil;
+  MPDocument *document = [[MPDocument alloc] initWithContentsOfURL:url ofType:@"kdb" error:&error];
+  STAssertNil(error, @"No Error should occur on loading");
+  STAssertNotNil(document, @"Document cannot be nil");
+  STAssertFalse(document.decrypted, @"Document is not decrypted after inital load");
+  STAssertTrue([document unlockWithPassword:@"1234" keyFileURL:nil], @"Should decrypt with password");
+  STAssertTrue(document.decrypted, @"Document is decrypted if decryptiong succeeds");
+  STAssertNotNil(document.treeV3, @"Tree shoudl be version1");
+  STAssertNil(document.treeV4, @"Tree should not be version2");
+  STAssertTrue(document.version == MPDatabaseVersion3, @"Internal databse version should be correct");
+}
+
+- (void)testVersion1WrongPassword {
+  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdb"];
+  NSError *error = nil;
+  MPDocument *document = [[MPDocument alloc] initWithContentsOfURL:url ofType:@"kdb" error:&error];
+  STAssertNil(error, @"No Error should occur on loading");
+  STAssertNotNil(document, @"Document should not be nil");
+  STAssertFalse(document.decrypted, @"Document is not decrypted after inital load");
+  STAssertFalse([document unlockWithPassword:@"123" keyFileURL:nil], @"Decryption should fail");
+  STAssertFalse(document.decrypted, @"Document is not decrypted with wrong password supplied");
+}
+
+- (void)testLoadDatabaseVerions2 {
+  NSBundle *myBundle = [NSBundle bundleForClass:[self class]];
+  NSURL *url = [myBundle URLForResource:@"Test_Password_1234" withExtension:@"kdbx"];
+  NSError *error = nil;
+  MPDocument *document = [[MPDocument alloc] initWithContentsOfURL:url ofType:@"kdbx" error:&error];
+  STAssertNil(error, @"No Error should occur on loading");
+  STAssertNotNil(document, @"Document cannot be nil");
+  STAssertFalse(document.decrypted, @"Document is not decrypted after inital load");
+  STAssertTrue([document unlockWithPassword:@"1234" keyFileURL:nil], @"Should decrypt with password");
+  STAssertTrue(document.decrypted, @"Document is decrypted if decryptiong succeeds");
+  STAssertNil(document.treeV3, @"Tree should not be version1");
+  STAssertNotNil(document.treeV4, @"Tree shoud be version2");
+  STAssertTrue(document.version == MPDatabaseVersion4, @"Internal database version should be correct");
+}
+
+@end

MacPassTests/MPDatabasePasswordAndKeyfile.h

@@ -0,0 +1,18 @@
+//
+//  MPDatabasePasswordAndKeyfile.h
+//  MacPass
+//
+//  Created by Michael Starke on 11.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@class MPDocument;
+
+@interface MPDatabasePasswordAndKeyfile : SenTestCase {
+  MPDocument *_databaseV3;
+  MPDocument *_databaseV4;
+}
+
+@end

MacPassTests/MPDatabasePasswordAndKeyfile.m

@@ -0,0 +1,47 @@
+//
+//  MPDatabasePasswordAndKeyfile.m
+//  MacPass
+//
+//  Created by Michael Starke on 11.07.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPDatabasePasswordAndKeyfile.h"
+
+#import "MPDocument.h"
+
+@implementation MPDatabasePasswordAndKeyfile
+
+- (void)setUp {
+  _databaseV3 = [[MPDocument alloc] initWithVersion:MPDatabaseVersion3];
+  _databaseV4 = [[MPDocument alloc] initWithVersion:MPDatabaseVersion4];
+}
+
+- (void)tearDown {
+  _databaseV3 = nil;
+  _databaseV4 = nil;
+}
+
+- (void)testSetPassword {
+  STAssertTrue([_databaseV3.password length] == 0, @"Password should not be set");
+  STAssertNil(_databaseV3.key, @"Keyfile should not be set");
+  STAssertFalse(_databaseV3.hasPasswordOrKey, @"Database without password is not secure");
+  _databaseV3.password = @"test";
+  STAssertTrue([_databaseV3.password isEqualToString:@"test"], @"Password should be set");
+  STAssertTrue(_databaseV3.hasPasswordOrKey, @"Database with password is secured");
+  _databaseV3.password = nil;
+  STAssertFalse(_databaseV3.hasPasswordOrKey, @"Database with removed password is not secure anymore");
+}
+
+- (void)testSetKeyfile {
+  STAssertTrue([_databaseV3.password length] == 0, @"Password should not be set");
+  STAssertNil(_databaseV3.key, @"Keyfile should not be set");
+  STAssertFalse(_databaseV3.hasPasswordOrKey, @"Database without keyfile is not secure");
+  _databaseV3.key = [NSURL URLWithString:@"noKeyFile"];
+  STAssertTrue(_databaseV3.hasPasswordOrKey, @"Database with keyfile is secured");
+  _databaseV3.key = nil;
+  STAssertFalse(_databaseV3.hasPasswordOrKey, @"Database with removed keyfile is not secure anymore");
+}
+
+
+@end

MacPassTests/MacPassTests-Info.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.hicknhacksoftware.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>

MacPassTests/MacPassTests-Prefix.pch

@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'MacPassTests' target in the 'MacPassTests' project
+//
+
+#ifdef __OBJC__
+  #import <Cocoa/Cocoa.h>
+#endif

MacPassTests/en.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+

README.md

@@ -3,48 +3,30 @@
 There a lot of iOS KeePass tools around but a distinct lack of a good OS X Version.
 KeePass can be used via Mono on OS X but lacks vital functionality and feels sluggish.
 
-This is an attempt to create an OS X port that should at least be able to read KeePass files.
+MacPass is an attempt to create an OS X port of KeePass.
 
 ##Disclaimer
-
+The Project is in heavy development. Beware that I'm going to shift things around so stuff is going to break. A lot.
-The Project is in heavy development and it's likely to take some time till it reaches a usable state.
-Beware that I'm going to shift things around so stuff is going to break. A lot.
 
 ##Dowload
 
-I'm trying to upload new builds along the way for all of you that just want to take a quick look.
+Since github now provides a release feature, I'm trying to upload binaries on all the tags I create along the way.
-As stated in the disclaimer, this software cannot be considered safe for work in it's current development status.
+Use it with caution, it's unfinished. Really!
-Use it with caution! Since I did start refactoring the KeePassLib there is even more potential broken code!
 
-[Older Version of MacPass at Dropbox](https://www.dropbox.com/sh/yqgfwi7f8mnd747/NCQlJmg0f0) (build 1882 07/04/2013)
+All releases can be found at [Github](https://github.com/mstarke/MacPass/releases).
 
-All [new Release](https://github.com/mstarke/MacPass/releases) are server from Github.
+##Known Major Issues
 
-##Known Issues
+* Databas V1 handling is dodgy. (e.g. attachments)
 
-* Undo/Redo get's messed up when the Trash (=RecylcleBin in KeePass terms) is enabled/used
+##System Requirement
-* Drag and Drop in Outline/Entry View broken
 
-##Help
+The Minimum OS X Version for MacPass currently is 10.8 Mountain Lion.
-
+With 10.9 Mavericks around the corner, I'm a bit hesitant to support 10.7 Lion.
-I'm in constant need of a full set of Databases with all possible keyfile/password and format combinations.
-If you are able to provide databases with keyfiles (Hashed, Binary, XML) I would love to hear from you!
-
-##Requirement
-
-MacPass needs OS X 10.8 as a minimum OS version since it takes advantage of some of the enhancements in Autolayout in 10.8.
-It might be possible to target 10.7 but with the upcomming 10.9 release, I think 10.8 is a feasable minimum.
 
 ##Status
 
-Take a look at the [Wiki](https://github.com/mstarke/MacPass/wiki/Status)
+The Status can be found on the dedicated [Wiki page](https://github.com/mstarke/MacPass/wiki/Status).
-
-##Alternatives
-
-Currently there is an alpha Version available of [KeePassX](http://www.keepassx.org).
-It's Qt based KeePass manager, than can handle KeePass 1 and 2 containers rather nicely.
-Compared to running KeePass with Mono it very fast and remarkably stable for an alpha relaese.
-Feel free to give it a try. The biggest draw-back is it's inablity to create passwords via a wizzard.
 
 ##What does it look like?
 
@@ -52,6 +34,21 @@ Feel free to give it a try. The biggest draw-back is it's inablity to create pas
 
 More Screenshots in the [Wiki](https://github.com/mstarke/MacPass/wiki/Screenshots)
 
+##Alternatives
+
+[KeePassX](http://www.keepassx.org) is a Qt based KeePass port, than can read Databases Version 1 and 2 and write Version 2 containers rather nicely.
+It's in active development, open source. Sadly there's only an older alpha binary release. It fully supports all database features.
+
+[KyPass Companion](http://www.kyuran.be/logiciels/kypass4mac/) is a native Cocoa port and offers KeePassHttp compatiblity.
+Should be able to read and write version 1 and 2 database. Is closed source and in early development. Beta releases have an expiry date. Not all database features are fully supported.
+
+[S3crets](http://s3crets.com/en/help/) native Cocoa Port with a different approach to displaying the database fully inside a tree.
+Is able to read and write version 1 and 2 databases. Not all database features are fully supported.
+
+## Help
+
+You might get help in the IRC channel [#macpass](irc://irc.freenode.org/macpass) on [irc.freenode.org](irc://irc.freenode.org)
+
 ##License
 
 MacPass KeePass compatible client for OS X