diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 7b2e506d..25b8cf03 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -13,7 +13,6 @@
 		4C0104BE17C37DA400173EF3 /* KPKXmlUtilities.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0104BD17C37DA400173EF3 /* KPKXmlUtilities.m */; };
 		4C01C2421764D8980016D5D0 /* MPContextMenuHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C2411764D8980016D5D0 /* MPContextMenuHelper.m */; };
 		4C01C245176500C40016D5D0 /* HNHLevelIndicatorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C01C244176500C40016D5D0 /* HNHLevelIndicatorCell.m */; };
-		4C0728BA17B5B7A4005A7DD9 /* PasswordEditWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C0728B917B5B7A4005A7DD9 /* PasswordEditWindow.xib */; };
 		4C0728BD17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C0728BC17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m */; };
 		4C0728BF17B68ED0005A7DD9 /* SavePanelAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */; };
 		4C08C3AE17B3022400BBBC95 /* KPKLegacyHeaderWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C08C3AD17B3022400BBBC95 /* KPKLegacyHeaderWriter.m */; };
@@ -114,11 +113,8 @@
 		4C473A8718AFD85B0073FD2E /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C473A8518AFD7250073FD2E /* XCTest.framework */; };
 		4C4A100F176286FD00BBF2CA /* MPTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4A100E176286FD00BBF2CA /* MPTableView.m */; };
 		4C4B7EE917A45EC6000234C7 /* MPDatePickingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4B7EE717A45EC5000234C7 /* MPDatePickingViewController.m */; };
-		4C4B7EEA17A45EC6000234C7 /* DatePickingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C4B7EE817A45EC5000234C7 /* DatePickingView.xib */; };
 		4C4B7EEE17A467E1000234C7 /* MPGroupInspectorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4B7EEC17A467E1000234C7 /* MPGroupInspectorViewController.m */; };
-		4C4B7EEF17A467E1000234C7 /* GroupInspectorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C4B7EED17A467E1000234C7 /* GroupInspectorView.xib */; };
 		4C4B7EF317A467FC000234C7 /* MPEntryInspectorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4B7EF117A467FC000234C7 /* MPEntryInspectorViewController.m */; };
-		4C4B7EF417A467FC000234C7 /* EntryInspectorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C4B7EF217A467FC000234C7 /* EntryInspectorView.xib */; };
 		4C4B7EF817A4B335000234C7 /* MPUniqueCharactersFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4B7EF717A4B335000234C7 /* MPUniqueCharactersFormatter.m */; };
 		4C4F72D118DF704400E8D378 /* DDHotKeyTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4F72CF18DF704400E8D378 /* DDHotKeyTextField.m */; };
 		4C4FCE15177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C4FCE14177CFE6B00BBF7AE /* MPCustomFieldTableCellView.m */; };
@@ -139,7 +135,6 @@
 		4C591B57178F897A0080B16B /* KPKBinary.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C591B56178F897A0080B16B /* KPKBinary.m */; };
 		4C59745118B3CE7200C8EBD1 /* KPKTestAutotypeNormalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C59745018B3CE7200C8EBD1 /* KPKTestAutotypeNormalization.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 */; };
 		4C5CD35517D15DBD000B7F38 /* NSData+Gzip.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5CD34A17D15DBD000B7F38 /* NSData+Gzip.m */; };
 		4C5CD35617D15DBD000B7F38 /* NSData+Random.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5CD34C17D15DBD000B7F38 /* NSData+Random.m */; };
@@ -256,10 +251,8 @@
 		4CD3ABC2178F72720073F5C5 /* KPKGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD3ABC1178F72720073F5C5 /* KPKGroup.m */; };
 		4CD4901018513C180017397F /* KPKXmlElements.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD4900F18513C180017397F /* KPKXmlElements.m */; };
 		4CD5A79118BFE17900162DCB /* CloneEntryWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CD5A79018BFE17900162DCB /* CloneEntryWindow.xib */; };
-		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 */; };
-		4CD7223817A7C9EA00F5A1E1 /* WorkflowSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CD7223717A7C9EA00F5A1E1 /* WorkflowSettings.xib */; };
 		4CD7223B17A7CB0700F5A1E1 /* MPWorkflowSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CD7223A17A7CB0700F5A1E1 /* MPWorkflowSettingsController.m */; };
 		4CD78ABC16D155FF00768A1D /* 07_NotepadTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78AB716D155FF00768A1D /* 07_NotepadTemplate.pdf */; };
 		4CD78ABD16D155FF00768A1D /* 08_SocketTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4CD78AB816D155FF00768A1D /* 08_SocketTemplate.pdf */; };
@@ -295,15 +288,22 @@
 		4CF78057176E5CFD0032EE71 /* MPConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78056176E5CFD0032EE71 /* MPConnection.m */; };
 		4CF7805A176E6D5F0032EE71 /* HNHTableRowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78059176E6D5F0032EE71 /* HNHTableRowView.m */; };
 		4CF7805D176E71170032EE71 /* MPServerDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF7805C176E71170032EE71 /* MPServerDaemon.m */; };
-		4CF7805F176E75110032EE71 /* IntegrationSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CF7805E176E75110032EE71 /* IntegrationSettings.xib */; };
 		4CF78064176E75AD0032EE71 /* MPIntegrationSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78063176E75AD0032EE71 /* MPIntegrationSettingsController.m */; };
 		4CFB18E418A17FA20097A34B /* MPUpdateSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFB18E318A17FA20097A34B /* MPUpdateSettingsController.m */; };
-		4CFB18E618A180430097A34B /* UpdateSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CFB18E518A180430097A34B /* UpdateSettings.xib */; };
 		4CFC53BF16E94729007396BE /* MPShadowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC53BE16E94729007396BE /* MPShadowBox.m */; };
 		4CFC873B179DEDF3000DFC03 /* KPKMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC873A179DEDF3000DFC03 /* KPKMetaData.m */; };
 		4CFC873E179DF200000DFC03 /* KPKTimeInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC873D179DF200000DFC03 /* KPKTimeInfo.m */; };
 		4CFC8743179DFD3E000DFC03 /* KPKTestXmlLoading.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC8742179DFD3E000DFC03 /* KPKTestXmlLoading.m */; };
 		4CFDDDE9185E92A600A9E7F1 /* HNHTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFDDDE8185E92A600A9E7F1 /* HNHTextView.m */; };
+		6021FE3B18E1341900C3BC51 /* EntryInspectorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE3D18E1341900C3BC51 /* EntryInspectorView.xib */; };
+		6021FE4B18E13F1D00C3BC51 /* GroupInspectorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE4D18E13F1D00C3BC51 /* GroupInspectorView.xib */; };
+		6021FE5618E1429500C3BC51 /* IntegrationSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE5818E1429500C3BC51 /* IntegrationSettings.xib */; };
+		6021FE6118E15D9100C3BC51 /* WorkflowSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE6318E15D9100C3BC51 /* WorkflowSettings.xib */; };
+		6021FE6C18E15E6D00C3BC51 /* UpdateSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE6E18E15E6D00C3BC51 /* UpdateSettings.xib */; };
+		6021FE7718E15FF300C3BC51 /* DatePickingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE7918E15FF300C3BC51 /* DatePickingView.xib */; };
+		6021FE8218E160BC00C3BC51 /* PasswordEditWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE8418E160BC00C3BC51 /* PasswordEditWindow.xib */; };
+		6021FE8D18E1617300C3BC51 /* PasswordCreatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE8F18E1617300C3BC51 /* PasswordCreatorView.xib */; };
+		6021FE9818E1650F00C3BC51 /* DatabaseSettingsWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6021FE9A18E1650F00C3BC51 /* DatabaseSettingsWindow.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -370,7 +370,6 @@
 		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>"; };
-		4C0728B917B5B7A4005A7DD9 /* PasswordEditWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordEditWindow.xib; sourceTree = "<group>"; };
 		4C0728BB17B5B7F7005A7DD9 /* MPPasswordEditWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordEditWindowController.h; sourceTree = "<group>"; };
 		4C0728BC17B5B7F7005A7DD9 /* MPPasswordEditWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordEditWindowController.m; sourceTree = "<group>"; };
 		4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SavePanelAccessoryView.xib; sourceTree = "<group>"; };
@@ -556,13 +555,10 @@
 		4C4A100E176286FD00BBF2CA /* MPTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTableView.m; sourceTree = "<group>"; };
 		4C4B7EE617A45EC5000234C7 /* MPDatePickingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatePickingViewController.h; sourceTree = "<group>"; };
 		4C4B7EE717A45EC5000234C7 /* MPDatePickingViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatePickingViewController.m; sourceTree = "<group>"; };
-		4C4B7EE817A45EC5000234C7 /* DatePickingView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DatePickingView.xib; sourceTree = "<group>"; };
 		4C4B7EEB17A467E1000234C7 /* MPGroupInspectorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPGroupInspectorViewController.h; sourceTree = "<group>"; };
 		4C4B7EEC17A467E1000234C7 /* MPGroupInspectorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPGroupInspectorViewController.m; sourceTree = "<group>"; };
-		4C4B7EED17A467E1000234C7 /* GroupInspectorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GroupInspectorView.xib; sourceTree = "<group>"; };
 		4C4B7EF017A467FC000234C7 /* MPEntryInspectorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPEntryInspectorViewController.h; sourceTree = "<group>"; };
 		4C4B7EF117A467FC000234C7 /* MPEntryInspectorViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPEntryInspectorViewController.m; sourceTree = "<group>"; };
-		4C4B7EF217A467FC000234C7 /* EntryInspectorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EntryInspectorView.xib; sourceTree = "<group>"; };
 		4C4B7EF617A4B335000234C7 /* MPUniqueCharactersFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPUniqueCharactersFormatter.h; sourceTree = "<group>"; };
 		4C4B7EF717A4B335000234C7 /* MPUniqueCharactersFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUniqueCharactersFormatter.m; sourceTree = "<group>"; };
 		4C4F72CF18DF704400E8D378 /* DDHotKeyTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DDHotKeyTextField.m; path = DDHotKey/DDHotKeyTextField.m; sourceTree = "<group>"; };
@@ -595,7 +591,6 @@
 		4C59745018B3CE7200C8EBD1 /* KPKTestAutotypeNormalization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKTestAutotypeNormalization.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>"; };
@@ -814,12 +809,10 @@
 		4CD4900E18513C180017397F /* KPKXmlElements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KPKXmlElements.h; path = Format/KPKXmlElements.h; sourceTree = "<group>"; };
 		4CD4900F18513C180017397F /* KPKXmlElements.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KPKXmlElements.m; path = Format/KPKXmlElements.m; sourceTree = "<group>"; };
 		4CD5A79018BFE17900162DCB /* CloneEntryWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CloneEntryWindow.xib; 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>"; };
 		4CD6C5AC1789FDE6000891F6 /* HNHRoundedSecureTextField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHRoundedSecureTextField.h; sourceTree = "<group>"; };
 		4CD6C5AD1789FDE6000891F6 /* HNHRoundedSecureTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHRoundedSecureTextField.m; sourceTree = "<group>"; };
-		4CD7223717A7C9EA00F5A1E1 /* WorkflowSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WorkflowSettings.xib; sourceTree = "<group>"; };
 		4CD7223917A7CB0700F5A1E1 /* MPWorkflowSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPWorkflowSettingsController.h; sourceTree = "<group>"; };
 		4CD7223A17A7CB0700F5A1E1 /* MPWorkflowSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPWorkflowSettingsController.m; sourceTree = "<group>"; };
 		4CD78AB716D155FF00768A1D /* 07_NotepadTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 07_NotepadTemplate.pdf; sourceTree = "<group>"; };
@@ -881,12 +874,10 @@
 		4CF78059176E6D5F0032EE71 /* HNHTableRowView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHTableRowView.m; sourceTree = "<group>"; };
 		4CF7805B176E71170032EE71 /* MPServerDaemon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPServerDaemon.h; sourceTree = "<group>"; };
 		4CF7805C176E71170032EE71 /* MPServerDaemon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPServerDaemon.m; sourceTree = "<group>"; };
-		4CF7805E176E75110032EE71 /* IntegrationSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IntegrationSettings.xib; sourceTree = "<group>"; };
 		4CF78062176E75AD0032EE71 /* MPIntegrationSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPIntegrationSettingsController.h; sourceTree = "<group>"; };
 		4CF78063176E75AD0032EE71 /* MPIntegrationSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPIntegrationSettingsController.m; sourceTree = "<group>"; };
 		4CFB18E218A17FA20097A34B /* MPUpdateSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPUpdateSettingsController.h; sourceTree = "<group>"; };
 		4CFB18E318A17FA20097A34B /* MPUpdateSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUpdateSettingsController.m; sourceTree = "<group>"; };
-		4CFB18E518A180430097A34B /* UpdateSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UpdateSettings.xib; sourceTree = "<group>"; };
 		4CFC53BD16E94729007396BE /* MPShadowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPShadowBox.h; sourceTree = "<group>"; };
 		4CFC53BE16E94729007396BE /* MPShadowBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPShadowBox.m; sourceTree = "<group>"; };
 		4CFC8739179DEDF3000DFC03 /* KPKMetaData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKMetaData.h; sourceTree = "<group>"; };
@@ -906,6 +897,51 @@
 		601F811A18E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		601F811B18E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/KPKLocalizeable.strings"; sourceTree = "<group>"; };
 		601F811C18E016340028F3DE /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		6021FE3C18E1341900C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EntryInspectorView.xib; sourceTree = "<group>"; };
+		6021FE4418E1342500C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/EntryInspectorView.strings"; sourceTree = "<group>"; };
+		6021FE4618E1344A00C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EntryInspectorView.strings; sourceTree = "<group>"; };
+		6021FE4818E1356800C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/EntryInspectorView.strings; sourceTree = "<group>"; };
+		6021FE4A18E1356B00C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/EntryInspectorView.strings; sourceTree = "<group>"; };
+		6021FE4C18E13F1D00C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/GroupInspectorView.xib; sourceTree = "<group>"; };
+		6021FE4F18E13F2500C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GroupInspectorView.strings; sourceTree = "<group>"; };
+		6021FE5118E13F2700C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/GroupInspectorView.strings; sourceTree = "<group>"; };
+		6021FE5318E13F2900C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/GroupInspectorView.strings; sourceTree = "<group>"; };
+		6021FE5518E13F2A00C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/GroupInspectorView.strings"; sourceTree = "<group>"; };
+		6021FE5718E1429500C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/IntegrationSettings.xib; sourceTree = "<group>"; };
+		6021FE5A18E142A000C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/IntegrationSettings.strings; sourceTree = "<group>"; };
+		6021FE5C18E142A200C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/IntegrationSettings.strings; sourceTree = "<group>"; };
+		6021FE5E18E142A300C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/IntegrationSettings.strings; sourceTree = "<group>"; };
+		6021FE6018E142A400C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/IntegrationSettings.strings"; sourceTree = "<group>"; };
+		6021FE6218E15D9100C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/WorkflowSettings.xib; sourceTree = "<group>"; };
+		6021FE6518E15D9800C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/WorkflowSettings.strings; sourceTree = "<group>"; };
+		6021FE6718E15D9A00C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/WorkflowSettings.strings; sourceTree = "<group>"; };
+		6021FE6918E15D9B00C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WorkflowSettings.strings; sourceTree = "<group>"; };
+		6021FE6B18E15D9D00C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/WorkflowSettings.strings"; sourceTree = "<group>"; };
+		6021FE6D18E15E6D00C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UpdateSettings.xib; sourceTree = "<group>"; };
+		6021FE7018E15E7400C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/UpdateSettings.strings; sourceTree = "<group>"; };
+		6021FE7218E15E7700C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/UpdateSettings.strings; sourceTree = "<group>"; };
+		6021FE7418E15E7900C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UpdateSettings.strings; sourceTree = "<group>"; };
+		6021FE7618E15E7B00C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/UpdateSettings.strings"; sourceTree = "<group>"; };
+		6021FE7818E15FF300C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatePickingView.xib; sourceTree = "<group>"; };
+		6021FE7B18E15FFD00C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatePickingView.strings; sourceTree = "<group>"; };
+		6021FE7D18E15FFF00C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/DatePickingView.strings; sourceTree = "<group>"; };
+		6021FE7F18E1600000C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/DatePickingView.strings; sourceTree = "<group>"; };
+		6021FE8118E1600200C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/DatePickingView.strings"; sourceTree = "<group>"; };
+		6021FE8318E160BC00C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PasswordEditWindow.xib; sourceTree = "<group>"; };
+		6021FE8618E160C700C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PasswordEditWindow.strings; sourceTree = "<group>"; };
+		6021FE8818E160C800C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PasswordEditWindow.strings; sourceTree = "<group>"; };
+		6021FE8A18E160C900C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/PasswordEditWindow.strings; sourceTree = "<group>"; };
+		6021FE8C18E160CB00C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/PasswordEditWindow.strings"; sourceTree = "<group>"; };
+		6021FE8E18E1617300C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PasswordCreatorView.xib; sourceTree = "<group>"; };
+		6021FE9118E1617A00C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PasswordCreatorView.strings; sourceTree = "<group>"; };
+		6021FE9318E1617C00C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PasswordCreatorView.strings; sourceTree = "<group>"; };
+		6021FE9518E1617D00C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/PasswordCreatorView.strings; sourceTree = "<group>"; };
+		6021FE9718E1617E00C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/PasswordCreatorView.strings"; sourceTree = "<group>"; };
+		6021FE9918E1650F00C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DatabaseSettingsWindow.xib; sourceTree = "<group>"; };
+		6021FE9C18E1651A00C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
+		6021FE9E18E1651C00C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
+		6021FEA018E1651E00C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
+		6021FEA218E1652000C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/DatabaseSettingsWindow.strings"; sourceTree = "<group>"; };
 		6E719715172058BA00E4C5FC /* MPDatabaseVersion.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPDatabaseVersion.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -974,7 +1010,7 @@
 				4C4B7EF517A46815000234C7 /* Inspector */,
 				4CE39AC016ECE359000FE29D /* IconSelection.xib */,
 				4C2C8B331787500E009649F3 /* UnprotectedWarningView.xib */,
-				4C4B7EE817A45EC5000234C7 /* DatePickingView.xib */,
+				6021FE7918E15FF300C3BC51 /* DatePickingView.xib */,
 				4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */,
 				4C26C34A18D8D5A300CF1A1C /* PreviewView.xib */,
 				4C74DD05177BD1640034A9DB /* MPCustomFieldView.h */,
@@ -1363,8 +1399,8 @@
 			isa = PBXGroup;
 			children = (
 				4C76156F1764C0E20015A1A6 /* InspectorView.xib */,
-				4C4B7EED17A467E1000234C7 /* GroupInspectorView.xib */,
-				4C4B7EF217A467FC000234C7 /* EntryInspectorView.xib */,
+				6021FE4D18E13F1D00C3BC51 /* GroupInspectorView.xib */,
+				6021FE3D18E1341900C3BC51 /* EntryInspectorView.xib */,
 			);
 			name = Inspector;
 			sourceTree = "<group>";
@@ -1858,8 +1894,8 @@
 				4CD884B615BD47080042BBF8 /* DocumentWindow.xib */,
 				4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */,
 				4C1DDCDC1711ECEB00C98DA3 /* PasswordCreatorWindow.xib */,
-				4CD5D701177A5EE400100649 /* DatabaseSettingsWindow.xib */,
-				4C0728B917B5B7A4005A7DD9 /* PasswordEditWindow.xib */,
+				6021FE9A18E1650F00C3BC51 /* DatabaseSettingsWindow.xib */,
+				6021FE8418E160BC00C3BC51 /* PasswordEditWindow.xib */,
 				4C68456E17BC2A0700FCDBFC /* WelcomeWindow.xib */,
 				4C0DD6C518B2A44700FCB193 /* AutotypeCandidateSelectionWindow.xib */,
 				4CD5A79018BFE17900162DCB /* CloneEntryWindow.xib */,
@@ -1892,9 +1928,9 @@
 			isa = PBXGroup;
 			children = (
 				4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */,
-				4CF7805E176E75110032EE71 /* IntegrationSettings.xib */,
-				4CD7223717A7C9EA00F5A1E1 /* WorkflowSettings.xib */,
-				4CFB18E518A180430097A34B /* UpdateSettings.xib */,
+				6021FE5818E1429500C3BC51 /* IntegrationSettings.xib */,
+				6021FE6318E15D9100C3BC51 /* WorkflowSettings.xib */,
+				6021FE6E18E15E6D00C3BC51 /* UpdateSettings.xib */,
 			);
 			name = Settings;
 			sourceTree = "<group>";
@@ -1903,7 +1939,7 @@
 			isa = PBXGroup;
 			children = (
 				4C76156A1764C0C40015A1A6 /* PasswordInputView.xib */,
-				4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */,
+				6021FE8F18E1617300C3BC51 /* PasswordCreatorView.xib */,
 			);
 			name = PasswordInputs;
 			sourceTree = "<group>";
@@ -2065,7 +2101,7 @@
 				4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */,
 				4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */,
 				4C2E381D16D11FF900037A9D /* 03_ServerTemplate.pdf in Resources */,
-				4CFB18E618A180430097A34B /* UpdateSettings.xib in Resources */,
+				6021FE6C18E15E6D00C3BC51 /* UpdateSettings.xib in Resources */,
 				4C2E381E16D11FF900037A9D /* 04_KlipperTemplate.pdf in Resources */,
 				4C2E381F16D11FF900037A9D /* 05_LanguagesTemplate.pdf in Resources */,
 				4CD78ABC16D155FF00768A1D /* 07_NotepadTemplate.pdf in Resources */,
@@ -2081,14 +2117,14 @@
 				4C76156D1764C0E20015A1A6 /* InspectorView.xib in Resources */,
 				4C888C9016EB6C91003D34A1 /* Localizable.strings in Resources */,
 				4CE39AC116ECE359000FE29D /* IconSelection.xib in Resources */,
-				4C5A11FF1708DE8800223D8A /* PasswordCreatorView.xib in Resources */,
+				6021FE8D18E1617300C3BC51 /* PasswordCreatorView.xib in Resources */,
 				4C1DDCDD1711ECEB00C98DA3 /* PasswordCreatorWindow.xib in Resources */,
 				4C7714AA176C998F00549F2A /* 43_TrashTemplate.pdf in Resources */,
 				4CD5A79118BFE17900162DCB /* CloneEntryWindow.xib in Resources */,
 				4C7714AC176C9D4600549F2A /* 99_InfoTemplate.pdf in Resources */,
-				4CF7805F176E75110032EE71 /* IntegrationSettings.xib in Resources */,
+				6021FE5618E1429500C3BC51 /* IntegrationSettings.xib in Resources */,
 				4CA3531218A5577300839B0F /* dsa_sparkle_pub.pem in Resources */,
-				4CD5D702177A5EE400100649 /* DatabaseSettingsWindow.xib in Resources */,
+				6021FE9818E1650F00C3BC51 /* DatabaseSettingsWindow.xib in Resources */,
 				4C6D1D25178579570014C5A5 /* 48_FolderTemplate.pdf in Resources */,
 				4C6D1D27178586CA0014C5A5 /* 99_AddFolderTemplate.pdf in Resources */,
 				4C6D1D2B17858A250014C5A5 /* MacPass.icns in Resources */,
@@ -2101,11 +2137,11 @@
 				4C52A8901788628B00868229 /* 18_DisplayTemplate.pdf in Resources */,
 				4C52A892178863B000868229 /* 68_PhoneTemplate.pdf in Resources */,
 				4C96D15417A12E4F00D931FA /* 99_CreatedTemplate.pdf in Resources */,
-				4C4B7EEA17A45EC6000234C7 /* DatePickingView.xib in Resources */,
-				4C4B7EEF17A467E1000234C7 /* GroupInspectorView.xib in Resources */,
-				4C4B7EF417A467FC000234C7 /* EntryInspectorView.xib in Resources */,
-				4CD7223817A7C9EA00F5A1E1 /* WorkflowSettings.xib in Resources */,
-				4C0728BA17B5B7A4005A7DD9 /* PasswordEditWindow.xib in Resources */,
+				6021FE7718E15FF300C3BC51 /* DatePickingView.xib in Resources */,
+				6021FE4B18E13F1D00C3BC51 /* GroupInspectorView.xib in Resources */,
+				6021FE3B18E1341900C3BC51 /* EntryInspectorView.xib in Resources */,
+				6021FE6118E15D9100C3BC51 /* WorkflowSettings.xib in Resources */,
+				6021FE8218E160BC00C3BC51 /* PasswordEditWindow.xib in Resources */,
 				4C0728BF17B68ED0005A7DD9 /* SavePanelAccessoryView.xib in Resources */,
 				4CE88B9717BA651C0042E078 /* contextTriangleTemplate.pdf in Resources */,
 				4C7ABA4817BAEC6700FF5799 /* 15_ScannerTemplate.pdf in Resources */,
@@ -2469,6 +2505,114 @@
 			name = Credits.rtf;
 			sourceTree = "<group>";
 		};
+		6021FE3D18E1341900C3BC51 /* EntryInspectorView.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6021FE3C18E1341900C3BC51 /* Base */,
+				6021FE4418E1342500C3BC51 /* zh-Hans */,
+				6021FE4618E1344A00C3BC51 /* en */,
+				6021FE4818E1356800C3BC51 /* de */,
+				6021FE4A18E1356B00C3BC51 /* fr */,
+			);
+			name = EntryInspectorView.xib;
+			sourceTree = "<group>";
+		};
+		6021FE4D18E13F1D00C3BC51 /* GroupInspectorView.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6021FE4C18E13F1D00C3BC51 /* Base */,
+				6021FE4F18E13F2500C3BC51 /* en */,
+				6021FE5118E13F2700C3BC51 /* de */,
+				6021FE5318E13F2900C3BC51 /* fr */,
+				6021FE5518E13F2A00C3BC51 /* zh-Hans */,
+			);
+			name = GroupInspectorView.xib;
+			sourceTree = "<group>";
+		};
+		6021FE5818E1429500C3BC51 /* IntegrationSettings.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6021FE5718E1429500C3BC51 /* Base */,
+				6021FE5A18E142A000C3BC51 /* en */,
+				6021FE5C18E142A200C3BC51 /* de */,
+				6021FE5E18E142A300C3BC51 /* fr */,
+				6021FE6018E142A400C3BC51 /* zh-Hans */,
+			);
+			name = IntegrationSettings.xib;
+			sourceTree = "<group>";
+		};
+		6021FE6318E15D9100C3BC51 /* WorkflowSettings.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6021FE6218E15D9100C3BC51 /* Base */,
+				6021FE6518E15D9800C3BC51 /* en */,
+				6021FE6718E15D9A00C3BC51 /* de */,
+				6021FE6918E15D9B00C3BC51 /* fr */,
+				6021FE6B18E15D9D00C3BC51 /* zh-Hans */,
+			);
+			name = WorkflowSettings.xib;
+			sourceTree = "<group>";
+		};
+		6021FE6E18E15E6D00C3BC51 /* UpdateSettings.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6021FE6D18E15E6D00C3BC51 /* Base */,
+				6021FE7018E15E7400C3BC51 /* en */,
+				6021FE7218E15E7700C3BC51 /* de */,
+				6021FE7418E15E7900C3BC51 /* fr */,
+				6021FE7618E15E7B00C3BC51 /* zh-Hans */,
+			);
+			name = UpdateSettings.xib;
+			sourceTree = "<group>";
+		};
+		6021FE7918E15FF300C3BC51 /* DatePickingView.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6021FE7818E15FF300C3BC51 /* Base */,
+				6021FE7B18E15FFD00C3BC51 /* en */,
+				6021FE7D18E15FFF00C3BC51 /* de */,
+				6021FE7F18E1600000C3BC51 /* fr */,
+				6021FE8118E1600200C3BC51 /* zh-Hans */,
+			);
+			name = DatePickingView.xib;
+			sourceTree = "<group>";
+		};
+		6021FE8418E160BC00C3BC51 /* PasswordEditWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6021FE8318E160BC00C3BC51 /* Base */,
+				6021FE8618E160C700C3BC51 /* en */,
+				6021FE8818E160C800C3BC51 /* de */,
+				6021FE8A18E160C900C3BC51 /* fr */,
+				6021FE8C18E160CB00C3BC51 /* zh-Hans */,
+			);
+			name = PasswordEditWindow.xib;
+			sourceTree = "<group>";
+		};
+		6021FE8F18E1617300C3BC51 /* PasswordCreatorView.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6021FE8E18E1617300C3BC51 /* Base */,
+				6021FE9118E1617A00C3BC51 /* en */,
+				6021FE9318E1617C00C3BC51 /* de */,
+				6021FE9518E1617D00C3BC51 /* fr */,
+				6021FE9718E1617E00C3BC51 /* zh-Hans */,
+			);
+			name = PasswordCreatorView.xib;
+			sourceTree = "<group>";
+		};
+		6021FE9A18E1650F00C3BC51 /* DatabaseSettingsWindow.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				6021FE9918E1650F00C3BC51 /* Base */,
+				6021FE9C18E1651A00C3BC51 /* en */,
+				6021FE9E18E1651C00C3BC51 /* de */,
+				6021FEA018E1651E00C3BC51 /* fr */,
+				6021FEA218E1652000C3BC51 /* zh-Hans */,
+			);
+			name = DatabaseSettingsWindow.xib;
+			sourceTree = "<group>";
+		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
diff --git a/MacPass/DatabaseSettingsWindow.xib b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
similarity index 100%
rename from MacPass/DatabaseSettingsWindow.xib
rename to MacPass/Base.lproj/DatabaseSettingsWindow.xib
diff --git a/MacPass/DatePickingView.xib b/MacPass/Base.lproj/DatePickingView.xib
similarity index 99%
rename from MacPass/DatePickingView.xib
rename to MacPass/Base.lproj/DatePickingView.xib
index 074267ae..14f557e7 100644
--- a/MacPass/DatePickingView.xib
+++ b/MacPass/Base.lproj/DatePickingView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment version="1070" defaultVersion="1080" identifier="macosx"/>
+        <deployment defaultVersion="1080" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
     </dependencies>
     <objects>
diff --git a/MacPass/EntryInspectorView.xib b/MacPass/Base.lproj/EntryInspectorView.xib
similarity index 99%
rename from MacPass/EntryInspectorView.xib
rename to MacPass/Base.lproj/EntryInspectorView.xib
index 317b0f9b..d055fd41 100644
--- a/MacPass/EntryInspectorView.xib
+++ b/MacPass/Base.lproj/EntryInspectorView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment version="1070" defaultVersion="1080" identifier="macosx"/>
+        <deployment defaultVersion="1080" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
     </dependencies>
     <objects>
diff --git a/MacPass/GroupInspectorView.xib b/MacPass/Base.lproj/GroupInspectorView.xib
similarity index 99%
rename from MacPass/GroupInspectorView.xib
rename to MacPass/Base.lproj/GroupInspectorView.xib
index 0f967dd1..fc2e90df 100644
--- a/MacPass/GroupInspectorView.xib
+++ b/MacPass/Base.lproj/GroupInspectorView.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment version="1070" defaultVersion="1080" identifier="macosx"/>
+        <deployment defaultVersion="1080" identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
     </dependencies>
     <objects>
diff --git a/MacPass/IntegrationSettings.xib b/MacPass/Base.lproj/IntegrationSettings.xib
similarity index 100%
rename from MacPass/IntegrationSettings.xib
rename to MacPass/Base.lproj/IntegrationSettings.xib
diff --git a/MacPass/PasswordCreatorView.xib b/MacPass/Base.lproj/PasswordCreatorView.xib
similarity index 98%
rename from MacPass/PasswordCreatorView.xib
rename to MacPass/Base.lproj/PasswordCreatorView.xib
index 04fd546e..035406ef 100644
--- a/MacPass/PasswordCreatorView.xib
+++ b/MacPass/Base.lproj/PasswordCreatorView.xib
@@ -34,7 +34,7 @@
                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="148">
                     <rect key="frame" x="18" y="237" width="66" height="17"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password:" id="149">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Password:" id="149">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -60,7 +60,7 @@
                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="178">
                     <rect key="frame" x="32" y="206" width="52" height="17"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Length:" id="179">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Length:" id="179">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -217,7 +217,7 @@
                 <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="646">
                     <rect key="frame" x="27" y="174" width="57" height="17"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Entropy:" id="647">
+                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Entropy:" id="647">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
diff --git a/MacPass/PasswordEditWindow.xib b/MacPass/Base.lproj/PasswordEditWindow.xib
similarity index 100%
rename from MacPass/PasswordEditWindow.xib
rename to MacPass/Base.lproj/PasswordEditWindow.xib
diff --git a/MacPass/UpdateSettings.xib b/MacPass/Base.lproj/UpdateSettings.xib
similarity index 100%
rename from MacPass/UpdateSettings.xib
rename to MacPass/Base.lproj/UpdateSettings.xib
diff --git a/MacPass/WorkflowSettings.xib b/MacPass/Base.lproj/WorkflowSettings.xib
similarity index 100%
rename from MacPass/WorkflowSettings.xib
rename to MacPass/Base.lproj/WorkflowSettings.xib
diff --git a/MacPass/UnprotectedWarningView.xib b/MacPass/UnprotectedWarningView.xib
index 91994252..5211e638 100644
--- a/MacPass/UnprotectedWarningView.xib
+++ b/MacPass/UnprotectedWarningView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment defaultVersion="1080" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPDocument">
@@ -48,4 +48,4 @@
     <resources>
         <image name="02_MessageBoxWarningTemplate" width="16" height="16"/>
     </resources>
-</document>
\ No newline at end of file
+</document>
diff --git a/MacPass/de.lproj/DatabaseSettingsWindow.strings b/MacPass/de.lproj/DatabaseSettingsWindow.strings
new file mode 100644
index 00000000..5d13e741
--- /dev/null
+++ b/MacPass/de.lproj/DatabaseSettingsWindow.strings
@@ -0,0 +1,96 @@
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
+"1.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Database name:"; ObjectID = "190"; */
+"190.title" = "Database name:";
+
+/* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "257"; */
+"257.title" = "Description:";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "289"; */
+"289.title" = "OK";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "358"; */
+"358.label" = "General";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "368"; */
+"368.label" = "Advanced";
+
+/* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
+"370.label" = "Security";
+
+/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
+"464.title" = "Protect Title";
+
+/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
+"477.title" = "Protect Username";
+
+/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
+"505.title" = "Protect Password";
+
+/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
+"510.title" = "Protect URL";
+
+/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
+"514.title" = "Protect Notes";
+
+/* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
+"532.title" = "Enable Entry History";
+
+/* Class = "NSButtonCell"; title = "Enable Recycle Bin"; ObjectID = "536"; */
+"536.title" = "Enable Recycle Bin";
+
+/* Class = "NSButtonCell"; title = "Empty Recycle Bin on Quit"; ObjectID = "540"; */
+"540.title" = "Empty Recycle Bin on Quit";
+
+/* Class = "NSTextFieldCell"; title = "Maxium Items:"; ObjectID = "558"; */
+"558.title" = "Maxium Items:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "680"; */
+"680.title" = "OtherViews";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "957"; */
+"957.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Maxium Size:"; ObjectID = "1269"; */
+"1269.title" = "Maxium Size:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1396"; */
+"1396.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "1397"; */
+"1397.title" = "None";
+
+/* Class = "NSMenuItem"; title = "GZip"; ObjectID = "1398"; */
+"1398.title" = "GZip";
+
+/* Class = "NSTextFieldCell"; title = "Compression:"; ObjectID = "1405"; */
+"1405.title" = "Compression:";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "1435"; */
+"1435.title" = "Color:";
+
+/* Class = "NSTextFieldCell"; title = "Template Group:"; ObjectID = "1588"; */
+"1588.title" = "Template Group:";
+
+/* Class = "NSTextFieldCell"; title = "Default Username:"; ObjectID = "1591"; */
+"1591.title" = "Default Username:";
+
+/* Class = "NSTextFieldCell"; title = "Key encryption rounds:"; ObjectID = "1644"; */
+"1644.title" = "Key encryption rounds:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
+"1740.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
+"1741.title" = "Item 1";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
+"1742.title" = "Item 2";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
+"1743.title" = "Item 3";
+
+/* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
+"1775.title" = "Benchmark";
diff --git a/MacPass/de.lproj/DatePickingView.strings b/MacPass/de.lproj/DatePickingView.strings
new file mode 100644
index 00000000..04bc932e
--- /dev/null
+++ b/MacPass/de.lproj/DatePickingView.strings
@@ -0,0 +1,9 @@
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "17"; */
+"17.title" = "OtherViews";
+
+/* Class = "NSButtonCell"; title = "Use Date"; ObjectID = "26"; */
+"26.title" = "Use Date";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "30"; */
+"30.title" = "Cancel";
diff --git a/MacPass/de.lproj/EntryInspectorView.strings b/MacPass/de.lproj/EntryInspectorView.strings
new file mode 100644
index 00000000..f3febdd5
--- /dev/null
+++ b/MacPass/de.lproj/EntryInspectorView.strings
@@ -0,0 +1,114 @@
+
+/* Class = "NSButtonCell"; title = "Generate"; ObjectID = "64"; */
+"64.title" = "Generate";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "65"; */
+"65.title" = "Password";
+
+/* Class = "NSTextFieldCell"; title = "URL"; ObjectID = "66"; */
+"66.title" = "URL";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "69"; */
+"69.title" = "Username";
+
+/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "71"; */
+"71.title" = "Title";
+
+/* Class = "NSButtonCell"; title = "Expires"; ObjectID = "78"; */
+"78.title" = "Expires";
+
+/* Class = "NSTextFieldCell"; title = "Tags"; ObjectID = "79"; */
+"79.title" = "Tags";
+
+/* Class = "NSTabViewItem"; label = "Fields"; ObjectID = "108"; */
+"108.label" = "Fields";
+
+/* Class = "NSTabViewItem"; label = "Attachments"; ObjectID = "109"; */
+"109.label" = "Attachments";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "110"; */
+"110.label" = "General";
+
+/* Class = "NSTextFieldCell"; title = "Attachments"; ObjectID = "135"; */
+"135.title" = "Attachments";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "142"; */
+"142.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "151"; */
+"151.title" = "Table View Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "171"; */
+"171.title" = "Table View Cell";
+
+/* Class = "NSTextFieldCell"; title = "Custom Fields"; ObjectID = "190"; */
+"190.title" = "Custom Fields";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "197"; */
+"197.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "211"; */
+"211.placeholderString" = "Title";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "214"; */
+"214.placeholderString" = "Value";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "225"; */
+"225.placeholderString" = "Value";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "228"; */
+"228.placeholderString" = "Title";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[0] = "General"; ObjectID = "238"; */
+"238.ibShadowedLabels[0]" = "General";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
+"238.ibShadowedLabels[1]" = "Files";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
+"238.ibShadowedLabels[2]" = "Custom";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
+"238.ibShadowedLabels[3]" = "Autotype";
+
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
+"0ok-MC-QMP.title" = "Save";
+
+/* Class = "NSButtonCell"; title = "Enable Autotype"; ObjectID = "9Nx-mE-DK3"; */
+"9Nx-mE-DK3.title" = "Enable Autotype";
+
+/* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "NtM-y3-l4D"; */
+"NtM-y3-l4D.title" = "Quicklook";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Entry Sequence"; ObjectID = "R2X-Ex-c6q"; */
+"R2X-Ex-c6q.placeholderString" = "Custom Entry Sequence";
+
+/* Class = "NSTextFieldCell"; title = "Window Sequence"; ObjectID = "RQB-bR-MC0"; */
+"RQB-bR-MC0.title" = "Window Sequence";
+
+/* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "bQ5-0E-h3O"; */
+"bQ5-0E-h3O.title" = "Autotype Sequence";
+
+/* Class = "NSTextFieldCell"; title = "Window Title"; ObjectID = "bkO-Bk-AuX"; */
+"bkO-Bk-AuX.title" = "Window Title";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "bke-G2-oEf"; */
+"bke-G2-oEf.title" = "Delete";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "dyA-lo-PGa"; */
+"dyA-lo-PGa.title" = "Table View Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "ep5-bQ-cfZ"; */
+"ep5-bQ-cfZ.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Window Sequence"; ObjectID = "fW9-9p-wwR"; */
+"fW9-9p-wwR.placeholderString" = "Custom Window Sequence";
+
+/* Class = "NSTabViewItem"; label = "Autotype"; ObjectID = "hK7-Dx-yjH"; */
+"hK7-Dx-yjH.label" = "Autotype";
+
+/* Class = "NSTextFieldCell"; title = "Window Associations"; ObjectID = "ned-1Q-FXA"; */
+"ned-1Q-FXA.title" = "Window Associations";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "sNS-o1-pD7"; */
+"sNS-o1-pD7.title" = "OtherViews";
diff --git a/MacPass/de.lproj/GroupInspectorView.strings b/MacPass/de.lproj/GroupInspectorView.strings
new file mode 100644
index 00000000..660fc3ac
--- /dev/null
+++ b/MacPass/de.lproj/GroupInspectorView.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "25"; */
+"25.title" = "Name";
+
+/* Class = "NSButtonCell"; title = "Expires"; ObjectID = "32"; */
+"32.title" = "Expires";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "231"; */
+"231.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Inherit Search Settings"; ObjectID = "232"; */
+"232.title" = "Inherit Search Settings";
+
+/* Class = "NSMenuItem"; title = "Include in Search"; ObjectID = "233"; */
+"233.title" = "Include in Search";
+
+/* Class = "NSMenuItem"; title = "Exclude from Search"; ObjectID = "234"; */
+"234.title" = "Exclude from Search";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
+"243.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */
+"244.title" = "Disable Autotype";
+
+/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */
+"245.title" = "Enable Autotype";
+
+/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */
+"246.title" = "Inherit Autotype Settings";
+
+/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
+"265.title" = "Search";
+
+/* Class = "NSTextFieldCell"; title = "Autotype"; ObjectID = "277"; */
+"277.title" = "Autotype";
diff --git a/MacPass/de.lproj/IntegrationSettings.strings b/MacPass/de.lproj/IntegrationSettings.strings
new file mode 100644
index 00000000..462c05c1
--- /dev/null
+++ b/MacPass/de.lproj/IntegrationSettings.strings
@@ -0,0 +1,24 @@
+
+/* Class = "NSButtonCell"; title = "Enable KeePassHttp server"; ObjectID = "3"; */
+"3.title" = "Enable KeePassHttp server";
+
+/* Class = "NSButtonCell"; title = "Enable global Autotype"; ObjectID = "1qb-Rd-jYu"; */
+"1qb-Rd-jYu.title" = "Enable global Autotype";
+
+/* Class = "NSTextFieldCell"; title = "Shortcut"; ObjectID = "6oN-CH-T0O"; */
+"6oN-CH-T0O.title" = "Shortcut";
+
+/* Class = "NSButtonCell"; title = "Enabel Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
+"ERs-ct-Eyx.title" = "Enabel Quicklook Preview";
+
+/* Class = "NSBox"; title = "Keepass HTTP"; ObjectID = "KbH-0Q-5Tw"; */
+"KbH-0Q-5Tw.title" = "Keepass HTTP";
+
+/* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
+"P9N-HM-wER.title" = "Autotype";
+
+/* Class = "NSBox"; title = "Preview"; ObjectID = "VVs-b5-cX9"; */
+"VVs-b5-cX9.title" = "Preview";
+
+/* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
+"WmI-IB-Aso.title" = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed.";
diff --git a/MacPass/de.lproj/PasswordCreatorView.strings b/MacPass/de.lproj/PasswordCreatorView.strings
new file mode 100644
index 00000000..0c97735e
--- /dev/null
+++ b/MacPass/de.lproj/PasswordCreatorView.strings
@@ -0,0 +1,39 @@
+
+/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "149"; */
+"149.title" = "Password:";
+
+/* Class = "NSTextFieldCell"; title = "Length:"; ObjectID = "179"; */
+"179.title" = "Length:";
+
+/* Class = "NSBox"; title = "Allowed Characters"; ObjectID = "332"; */
+"332.title" = "Allowed Characters";
+
+/* Class = "NSButtonCell"; title = "A-Z"; ObjectID = "453"; */
+"453.title" = "A-Z";
+
+/* Class = "NSButtonCell"; title = "a-z"; ObjectID = "457"; */
+"457.title" = "a-z";
+
+/* Class = "NSButtonCell"; title = "0-9"; ObjectID = "461"; */
+"461.title" = "0-9";
+
+/* Class = "NSButtonCell"; title = "#!?"; ObjectID = "465"; */
+"465.title" = "#!?";
+
+/* Class = "NSButtonCell"; title = "Custom"; ObjectID = "469"; */
+"469.title" = "Custom";
+
+/* Class = "NSButtonCell"; title = "Use Password"; ObjectID = "495"; */
+"495.title" = "Use Password";
+
+/* Class = "NSButtonCell"; title = "Copy password to pasteboard"; ObjectID = "501"; */
+"501.title" = "Copy password to pasteboard";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "614"; */
+"614.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Entropy:"; ObjectID = "647"; */
+"647.title" = "Entropy:";
+
+/* Class = "NSTextFieldCell"; title = "25000 bit"; ObjectID = "653"; */
+"653.title" = "25000 bit";
diff --git a/MacPass/de.lproj/PasswordEditWindow.strings b/MacPass/de.lproj/PasswordEditWindow.strings
new file mode 100644
index 00000000..17b9aeda
--- /dev/null
+++ b/MacPass/de.lproj/PasswordEditWindow.strings
@@ -0,0 +1,30 @@
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
+"1.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Missmatching Passwords"; ObjectID = "14"; */
+"14.title" = "Missmatching Passwords";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat Password"; ObjectID = "15"; */
+"15.placeholderString" = "Repeat Password";
+
+/* Class = "NSTextFieldCell"; title = "Repeat:"; ObjectID = "16"; */
+"16.title" = "Repeat:";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter Password"; ObjectID = "18"; */
+"18.placeholderString" = "Enter Password";
+
+/* Class = "NSButtonCell"; title = "Generate Keyfile"; ObjectID = "21"; */
+"21.title" = "Generate Keyfile";
+
+/* Class = "NSTextFieldCell"; title = "Keyfile:"; ObjectID = "22"; */
+"22.title" = "Keyfile:";
+
+/* Class = "NSButtonCell"; title = "Change Password"; ObjectID = "69"; */
+"69.title" = "Change Password";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "73"; */
+"73.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Password:"; ObjectID = "OQz-DA-SoY"; */
+"OQz-DA-SoY.title" = "Password:";
diff --git a/MacPass/de.lproj/UpdateSettings.strings b/MacPass/de.lproj/UpdateSettings.strings
new file mode 100644
index 00000000..66a60c59
--- /dev/null
+++ b/MacPass/de.lproj/UpdateSettings.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSMenuItem"; title = "every Week"; ObjectID = "3FR-Va-iau"; */
+"3FR-Va-iau.title" = "every Week";
+
+/* Class = "NSTextFieldCell"; title = "Check for Updates"; ObjectID = "9tL-CA-Vdg"; */
+"9tL-CA-Vdg.title" = "Check for Updates";
+
+/* Class = "NSMenuItem"; title = "every Hour"; ObjectID = "DjF-1I-6Nq"; */
+"DjF-1I-6Nq.title" = "every Hour";
+
+/* Class = "NSButtonCell"; title = "Automatically Check for Updates"; ObjectID = "RFg-q1-AwJ"; */
+"RFg-q1-AwJ.title" = "Automatically Check for Updates";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "RKd-H8-eCF"; */
+"RKd-H8-eCF.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "every Month"; ObjectID = "Uo3-kv-1ro"; */
+"Uo3-kv-1ro.title" = "every Month";
+
+/* Class = "NSMenuItem"; title = "every Day"; ObjectID = "o9E-hk-H1T"; */
+"o9E-hk-H1T.title" = "every Day";
diff --git a/MacPass/de.lproj/WorkflowSettings.strings b/MacPass/de.lproj/WorkflowSettings.strings
new file mode 100644
index 00000000..10c668c9
--- /dev/null
+++ b/MacPass/de.lproj/WorkflowSettings.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSBox"; title = "Entry Table"; ObjectID = "2"; */
+"2.title" = "Entry Table";
+
+/* Class = "NSTextFieldCell"; title = "Double-click on URL:"; ObjectID = "10"; */
+"10.title" = "Double-click on URL:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "15"; */
+"15.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Copies URL"; ObjectID = "16"; */
+"16.title" = "Copies URL";
+
+/* Class = "NSMenuItem"; title = "Opens URL"; ObjectID = "17"; */
+"17.title" = "Opens URL";
+
+/* Class = "NSTextFieldCell"; title = "Double-click on Title:"; ObjectID = "37"; */
+"37.title" = "Double-click on Title:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "42"; */
+"42.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "is Ignored"; ObjectID = "43"; */
+"43.title" = "is Ignored";
+
+/* Class = "NSMenuItem"; title = "Opens Inspector"; ObjectID = "44"; */
+"44.title" = "Opens Inspector";
+
+/* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
+"7YX-EA-9KA.title" = "Default Browser";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
+"XgO-Tj-QjO.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
+"gej-kA-GzQ.title" = "Item 2";
+
+/* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
+"soD-wI-YOH.title" = "Open URLs in:";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
+"zC2-cM-KDv.title" = "Item 3";
diff --git a/MacPass/en.lproj/DatabaseSettingsWindow.strings b/MacPass/en.lproj/DatabaseSettingsWindow.strings
new file mode 100644
index 00000000..5d13e741
--- /dev/null
+++ b/MacPass/en.lproj/DatabaseSettingsWindow.strings
@@ -0,0 +1,96 @@
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
+"1.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Database name:"; ObjectID = "190"; */
+"190.title" = "Database name:";
+
+/* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "257"; */
+"257.title" = "Description:";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "289"; */
+"289.title" = "OK";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "358"; */
+"358.label" = "General";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "368"; */
+"368.label" = "Advanced";
+
+/* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
+"370.label" = "Security";
+
+/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
+"464.title" = "Protect Title";
+
+/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
+"477.title" = "Protect Username";
+
+/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
+"505.title" = "Protect Password";
+
+/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
+"510.title" = "Protect URL";
+
+/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
+"514.title" = "Protect Notes";
+
+/* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
+"532.title" = "Enable Entry History";
+
+/* Class = "NSButtonCell"; title = "Enable Recycle Bin"; ObjectID = "536"; */
+"536.title" = "Enable Recycle Bin";
+
+/* Class = "NSButtonCell"; title = "Empty Recycle Bin on Quit"; ObjectID = "540"; */
+"540.title" = "Empty Recycle Bin on Quit";
+
+/* Class = "NSTextFieldCell"; title = "Maxium Items:"; ObjectID = "558"; */
+"558.title" = "Maxium Items:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "680"; */
+"680.title" = "OtherViews";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "957"; */
+"957.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Maxium Size:"; ObjectID = "1269"; */
+"1269.title" = "Maxium Size:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1396"; */
+"1396.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "1397"; */
+"1397.title" = "None";
+
+/* Class = "NSMenuItem"; title = "GZip"; ObjectID = "1398"; */
+"1398.title" = "GZip";
+
+/* Class = "NSTextFieldCell"; title = "Compression:"; ObjectID = "1405"; */
+"1405.title" = "Compression:";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "1435"; */
+"1435.title" = "Color:";
+
+/* Class = "NSTextFieldCell"; title = "Template Group:"; ObjectID = "1588"; */
+"1588.title" = "Template Group:";
+
+/* Class = "NSTextFieldCell"; title = "Default Username:"; ObjectID = "1591"; */
+"1591.title" = "Default Username:";
+
+/* Class = "NSTextFieldCell"; title = "Key encryption rounds:"; ObjectID = "1644"; */
+"1644.title" = "Key encryption rounds:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
+"1740.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
+"1741.title" = "Item 1";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
+"1742.title" = "Item 2";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
+"1743.title" = "Item 3";
+
+/* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
+"1775.title" = "Benchmark";
diff --git a/MacPass/en.lproj/DatePickingView.strings b/MacPass/en.lproj/DatePickingView.strings
new file mode 100644
index 00000000..04bc932e
--- /dev/null
+++ b/MacPass/en.lproj/DatePickingView.strings
@@ -0,0 +1,9 @@
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "17"; */
+"17.title" = "OtherViews";
+
+/* Class = "NSButtonCell"; title = "Use Date"; ObjectID = "26"; */
+"26.title" = "Use Date";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "30"; */
+"30.title" = "Cancel";
diff --git a/MacPass/en.lproj/EntryInspectorView.strings b/MacPass/en.lproj/EntryInspectorView.strings
new file mode 100644
index 00000000..f3febdd5
--- /dev/null
+++ b/MacPass/en.lproj/EntryInspectorView.strings
@@ -0,0 +1,114 @@
+
+/* Class = "NSButtonCell"; title = "Generate"; ObjectID = "64"; */
+"64.title" = "Generate";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "65"; */
+"65.title" = "Password";
+
+/* Class = "NSTextFieldCell"; title = "URL"; ObjectID = "66"; */
+"66.title" = "URL";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "69"; */
+"69.title" = "Username";
+
+/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "71"; */
+"71.title" = "Title";
+
+/* Class = "NSButtonCell"; title = "Expires"; ObjectID = "78"; */
+"78.title" = "Expires";
+
+/* Class = "NSTextFieldCell"; title = "Tags"; ObjectID = "79"; */
+"79.title" = "Tags";
+
+/* Class = "NSTabViewItem"; label = "Fields"; ObjectID = "108"; */
+"108.label" = "Fields";
+
+/* Class = "NSTabViewItem"; label = "Attachments"; ObjectID = "109"; */
+"109.label" = "Attachments";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "110"; */
+"110.label" = "General";
+
+/* Class = "NSTextFieldCell"; title = "Attachments"; ObjectID = "135"; */
+"135.title" = "Attachments";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "142"; */
+"142.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "151"; */
+"151.title" = "Table View Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "171"; */
+"171.title" = "Table View Cell";
+
+/* Class = "NSTextFieldCell"; title = "Custom Fields"; ObjectID = "190"; */
+"190.title" = "Custom Fields";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "197"; */
+"197.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "211"; */
+"211.placeholderString" = "Title";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "214"; */
+"214.placeholderString" = "Value";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "225"; */
+"225.placeholderString" = "Value";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "228"; */
+"228.placeholderString" = "Title";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[0] = "General"; ObjectID = "238"; */
+"238.ibShadowedLabels[0]" = "General";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
+"238.ibShadowedLabels[1]" = "Files";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
+"238.ibShadowedLabels[2]" = "Custom";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
+"238.ibShadowedLabels[3]" = "Autotype";
+
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
+"0ok-MC-QMP.title" = "Save";
+
+/* Class = "NSButtonCell"; title = "Enable Autotype"; ObjectID = "9Nx-mE-DK3"; */
+"9Nx-mE-DK3.title" = "Enable Autotype";
+
+/* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "NtM-y3-l4D"; */
+"NtM-y3-l4D.title" = "Quicklook";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Entry Sequence"; ObjectID = "R2X-Ex-c6q"; */
+"R2X-Ex-c6q.placeholderString" = "Custom Entry Sequence";
+
+/* Class = "NSTextFieldCell"; title = "Window Sequence"; ObjectID = "RQB-bR-MC0"; */
+"RQB-bR-MC0.title" = "Window Sequence";
+
+/* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "bQ5-0E-h3O"; */
+"bQ5-0E-h3O.title" = "Autotype Sequence";
+
+/* Class = "NSTextFieldCell"; title = "Window Title"; ObjectID = "bkO-Bk-AuX"; */
+"bkO-Bk-AuX.title" = "Window Title";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "bke-G2-oEf"; */
+"bke-G2-oEf.title" = "Delete";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "dyA-lo-PGa"; */
+"dyA-lo-PGa.title" = "Table View Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "ep5-bQ-cfZ"; */
+"ep5-bQ-cfZ.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Window Sequence"; ObjectID = "fW9-9p-wwR"; */
+"fW9-9p-wwR.placeholderString" = "Custom Window Sequence";
+
+/* Class = "NSTabViewItem"; label = "Autotype"; ObjectID = "hK7-Dx-yjH"; */
+"hK7-Dx-yjH.label" = "Autotype";
+
+/* Class = "NSTextFieldCell"; title = "Window Associations"; ObjectID = "ned-1Q-FXA"; */
+"ned-1Q-FXA.title" = "Window Associations";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "sNS-o1-pD7"; */
+"sNS-o1-pD7.title" = "OtherViews";
diff --git a/MacPass/en.lproj/GroupInspectorView.strings b/MacPass/en.lproj/GroupInspectorView.strings
new file mode 100644
index 00000000..660fc3ac
--- /dev/null
+++ b/MacPass/en.lproj/GroupInspectorView.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "25"; */
+"25.title" = "Name";
+
+/* Class = "NSButtonCell"; title = "Expires"; ObjectID = "32"; */
+"32.title" = "Expires";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "231"; */
+"231.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Inherit Search Settings"; ObjectID = "232"; */
+"232.title" = "Inherit Search Settings";
+
+/* Class = "NSMenuItem"; title = "Include in Search"; ObjectID = "233"; */
+"233.title" = "Include in Search";
+
+/* Class = "NSMenuItem"; title = "Exclude from Search"; ObjectID = "234"; */
+"234.title" = "Exclude from Search";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
+"243.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */
+"244.title" = "Disable Autotype";
+
+/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */
+"245.title" = "Enable Autotype";
+
+/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */
+"246.title" = "Inherit Autotype Settings";
+
+/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
+"265.title" = "Search";
+
+/* Class = "NSTextFieldCell"; title = "Autotype"; ObjectID = "277"; */
+"277.title" = "Autotype";
diff --git a/MacPass/en.lproj/IntegrationSettings.strings b/MacPass/en.lproj/IntegrationSettings.strings
new file mode 100644
index 00000000..462c05c1
--- /dev/null
+++ b/MacPass/en.lproj/IntegrationSettings.strings
@@ -0,0 +1,24 @@
+
+/* Class = "NSButtonCell"; title = "Enable KeePassHttp server"; ObjectID = "3"; */
+"3.title" = "Enable KeePassHttp server";
+
+/* Class = "NSButtonCell"; title = "Enable global Autotype"; ObjectID = "1qb-Rd-jYu"; */
+"1qb-Rd-jYu.title" = "Enable global Autotype";
+
+/* Class = "NSTextFieldCell"; title = "Shortcut"; ObjectID = "6oN-CH-T0O"; */
+"6oN-CH-T0O.title" = "Shortcut";
+
+/* Class = "NSButtonCell"; title = "Enabel Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
+"ERs-ct-Eyx.title" = "Enabel Quicklook Preview";
+
+/* Class = "NSBox"; title = "Keepass HTTP"; ObjectID = "KbH-0Q-5Tw"; */
+"KbH-0Q-5Tw.title" = "Keepass HTTP";
+
+/* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
+"P9N-HM-wER.title" = "Autotype";
+
+/* Class = "NSBox"; title = "Preview"; ObjectID = "VVs-b5-cX9"; */
+"VVs-b5-cX9.title" = "Preview";
+
+/* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
+"WmI-IB-Aso.title" = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed.";
diff --git a/MacPass/en.lproj/PasswordCreatorView.strings b/MacPass/en.lproj/PasswordCreatorView.strings
new file mode 100644
index 00000000..0c97735e
--- /dev/null
+++ b/MacPass/en.lproj/PasswordCreatorView.strings
@@ -0,0 +1,39 @@
+
+/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "149"; */
+"149.title" = "Password:";
+
+/* Class = "NSTextFieldCell"; title = "Length:"; ObjectID = "179"; */
+"179.title" = "Length:";
+
+/* Class = "NSBox"; title = "Allowed Characters"; ObjectID = "332"; */
+"332.title" = "Allowed Characters";
+
+/* Class = "NSButtonCell"; title = "A-Z"; ObjectID = "453"; */
+"453.title" = "A-Z";
+
+/* Class = "NSButtonCell"; title = "a-z"; ObjectID = "457"; */
+"457.title" = "a-z";
+
+/* Class = "NSButtonCell"; title = "0-9"; ObjectID = "461"; */
+"461.title" = "0-9";
+
+/* Class = "NSButtonCell"; title = "#!?"; ObjectID = "465"; */
+"465.title" = "#!?";
+
+/* Class = "NSButtonCell"; title = "Custom"; ObjectID = "469"; */
+"469.title" = "Custom";
+
+/* Class = "NSButtonCell"; title = "Use Password"; ObjectID = "495"; */
+"495.title" = "Use Password";
+
+/* Class = "NSButtonCell"; title = "Copy password to pasteboard"; ObjectID = "501"; */
+"501.title" = "Copy password to pasteboard";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "614"; */
+"614.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Entropy:"; ObjectID = "647"; */
+"647.title" = "Entropy:";
+
+/* Class = "NSTextFieldCell"; title = "25000 bit"; ObjectID = "653"; */
+"653.title" = "25000 bit";
diff --git a/MacPass/en.lproj/PasswordEditWindow.strings b/MacPass/en.lproj/PasswordEditWindow.strings
new file mode 100644
index 00000000..17b9aeda
--- /dev/null
+++ b/MacPass/en.lproj/PasswordEditWindow.strings
@@ -0,0 +1,30 @@
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
+"1.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Missmatching Passwords"; ObjectID = "14"; */
+"14.title" = "Missmatching Passwords";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat Password"; ObjectID = "15"; */
+"15.placeholderString" = "Repeat Password";
+
+/* Class = "NSTextFieldCell"; title = "Repeat:"; ObjectID = "16"; */
+"16.title" = "Repeat:";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter Password"; ObjectID = "18"; */
+"18.placeholderString" = "Enter Password";
+
+/* Class = "NSButtonCell"; title = "Generate Keyfile"; ObjectID = "21"; */
+"21.title" = "Generate Keyfile";
+
+/* Class = "NSTextFieldCell"; title = "Keyfile:"; ObjectID = "22"; */
+"22.title" = "Keyfile:";
+
+/* Class = "NSButtonCell"; title = "Change Password"; ObjectID = "69"; */
+"69.title" = "Change Password";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "73"; */
+"73.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Password:"; ObjectID = "OQz-DA-SoY"; */
+"OQz-DA-SoY.title" = "Password:";
diff --git a/MacPass/en.lproj/UpdateSettings.strings b/MacPass/en.lproj/UpdateSettings.strings
new file mode 100644
index 00000000..66a60c59
--- /dev/null
+++ b/MacPass/en.lproj/UpdateSettings.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSMenuItem"; title = "every Week"; ObjectID = "3FR-Va-iau"; */
+"3FR-Va-iau.title" = "every Week";
+
+/* Class = "NSTextFieldCell"; title = "Check for Updates"; ObjectID = "9tL-CA-Vdg"; */
+"9tL-CA-Vdg.title" = "Check for Updates";
+
+/* Class = "NSMenuItem"; title = "every Hour"; ObjectID = "DjF-1I-6Nq"; */
+"DjF-1I-6Nq.title" = "every Hour";
+
+/* Class = "NSButtonCell"; title = "Automatically Check for Updates"; ObjectID = "RFg-q1-AwJ"; */
+"RFg-q1-AwJ.title" = "Automatically Check for Updates";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "RKd-H8-eCF"; */
+"RKd-H8-eCF.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "every Month"; ObjectID = "Uo3-kv-1ro"; */
+"Uo3-kv-1ro.title" = "every Month";
+
+/* Class = "NSMenuItem"; title = "every Day"; ObjectID = "o9E-hk-H1T"; */
+"o9E-hk-H1T.title" = "every Day";
diff --git a/MacPass/en.lproj/WorkflowSettings.strings b/MacPass/en.lproj/WorkflowSettings.strings
new file mode 100644
index 00000000..10c668c9
--- /dev/null
+++ b/MacPass/en.lproj/WorkflowSettings.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSBox"; title = "Entry Table"; ObjectID = "2"; */
+"2.title" = "Entry Table";
+
+/* Class = "NSTextFieldCell"; title = "Double-click on URL:"; ObjectID = "10"; */
+"10.title" = "Double-click on URL:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "15"; */
+"15.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Copies URL"; ObjectID = "16"; */
+"16.title" = "Copies URL";
+
+/* Class = "NSMenuItem"; title = "Opens URL"; ObjectID = "17"; */
+"17.title" = "Opens URL";
+
+/* Class = "NSTextFieldCell"; title = "Double-click on Title:"; ObjectID = "37"; */
+"37.title" = "Double-click on Title:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "42"; */
+"42.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "is Ignored"; ObjectID = "43"; */
+"43.title" = "is Ignored";
+
+/* Class = "NSMenuItem"; title = "Opens Inspector"; ObjectID = "44"; */
+"44.title" = "Opens Inspector";
+
+/* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
+"7YX-EA-9KA.title" = "Default Browser";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
+"XgO-Tj-QjO.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
+"gej-kA-GzQ.title" = "Item 2";
+
+/* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
+"soD-wI-YOH.title" = "Open URLs in:";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
+"zC2-cM-KDv.title" = "Item 3";
diff --git a/MacPass/fr.lproj/DatabaseSettingsWindow.strings b/MacPass/fr.lproj/DatabaseSettingsWindow.strings
new file mode 100644
index 00000000..5d13e741
--- /dev/null
+++ b/MacPass/fr.lproj/DatabaseSettingsWindow.strings
@@ -0,0 +1,96 @@
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
+"1.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Database name:"; ObjectID = "190"; */
+"190.title" = "Database name:";
+
+/* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "257"; */
+"257.title" = "Description:";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "289"; */
+"289.title" = "OK";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "358"; */
+"358.label" = "General";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "368"; */
+"368.label" = "Advanced";
+
+/* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
+"370.label" = "Security";
+
+/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
+"464.title" = "Protect Title";
+
+/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
+"477.title" = "Protect Username";
+
+/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
+"505.title" = "Protect Password";
+
+/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
+"510.title" = "Protect URL";
+
+/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
+"514.title" = "Protect Notes";
+
+/* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
+"532.title" = "Enable Entry History";
+
+/* Class = "NSButtonCell"; title = "Enable Recycle Bin"; ObjectID = "536"; */
+"536.title" = "Enable Recycle Bin";
+
+/* Class = "NSButtonCell"; title = "Empty Recycle Bin on Quit"; ObjectID = "540"; */
+"540.title" = "Empty Recycle Bin on Quit";
+
+/* Class = "NSTextFieldCell"; title = "Maxium Items:"; ObjectID = "558"; */
+"558.title" = "Maxium Items:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "680"; */
+"680.title" = "OtherViews";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "957"; */
+"957.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Maxium Size:"; ObjectID = "1269"; */
+"1269.title" = "Maxium Size:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1396"; */
+"1396.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "1397"; */
+"1397.title" = "None";
+
+/* Class = "NSMenuItem"; title = "GZip"; ObjectID = "1398"; */
+"1398.title" = "GZip";
+
+/* Class = "NSTextFieldCell"; title = "Compression:"; ObjectID = "1405"; */
+"1405.title" = "Compression:";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "1435"; */
+"1435.title" = "Color:";
+
+/* Class = "NSTextFieldCell"; title = "Template Group:"; ObjectID = "1588"; */
+"1588.title" = "Template Group:";
+
+/* Class = "NSTextFieldCell"; title = "Default Username:"; ObjectID = "1591"; */
+"1591.title" = "Default Username:";
+
+/* Class = "NSTextFieldCell"; title = "Key encryption rounds:"; ObjectID = "1644"; */
+"1644.title" = "Key encryption rounds:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
+"1740.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
+"1741.title" = "Item 1";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
+"1742.title" = "Item 2";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
+"1743.title" = "Item 3";
+
+/* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
+"1775.title" = "Benchmark";
diff --git a/MacPass/fr.lproj/DatePickingView.strings b/MacPass/fr.lproj/DatePickingView.strings
new file mode 100644
index 00000000..04bc932e
--- /dev/null
+++ b/MacPass/fr.lproj/DatePickingView.strings
@@ -0,0 +1,9 @@
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "17"; */
+"17.title" = "OtherViews";
+
+/* Class = "NSButtonCell"; title = "Use Date"; ObjectID = "26"; */
+"26.title" = "Use Date";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "30"; */
+"30.title" = "Cancel";
diff --git a/MacPass/fr.lproj/EntryInspectorView.strings b/MacPass/fr.lproj/EntryInspectorView.strings
new file mode 100644
index 00000000..f3febdd5
--- /dev/null
+++ b/MacPass/fr.lproj/EntryInspectorView.strings
@@ -0,0 +1,114 @@
+
+/* Class = "NSButtonCell"; title = "Generate"; ObjectID = "64"; */
+"64.title" = "Generate";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "65"; */
+"65.title" = "Password";
+
+/* Class = "NSTextFieldCell"; title = "URL"; ObjectID = "66"; */
+"66.title" = "URL";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "69"; */
+"69.title" = "Username";
+
+/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "71"; */
+"71.title" = "Title";
+
+/* Class = "NSButtonCell"; title = "Expires"; ObjectID = "78"; */
+"78.title" = "Expires";
+
+/* Class = "NSTextFieldCell"; title = "Tags"; ObjectID = "79"; */
+"79.title" = "Tags";
+
+/* Class = "NSTabViewItem"; label = "Fields"; ObjectID = "108"; */
+"108.label" = "Fields";
+
+/* Class = "NSTabViewItem"; label = "Attachments"; ObjectID = "109"; */
+"109.label" = "Attachments";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "110"; */
+"110.label" = "General";
+
+/* Class = "NSTextFieldCell"; title = "Attachments"; ObjectID = "135"; */
+"135.title" = "Attachments";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "142"; */
+"142.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "151"; */
+"151.title" = "Table View Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "171"; */
+"171.title" = "Table View Cell";
+
+/* Class = "NSTextFieldCell"; title = "Custom Fields"; ObjectID = "190"; */
+"190.title" = "Custom Fields";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "197"; */
+"197.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "211"; */
+"211.placeholderString" = "Title";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "214"; */
+"214.placeholderString" = "Value";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "225"; */
+"225.placeholderString" = "Value";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "228"; */
+"228.placeholderString" = "Title";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[0] = "General"; ObjectID = "238"; */
+"238.ibShadowedLabels[0]" = "General";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
+"238.ibShadowedLabels[1]" = "Files";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
+"238.ibShadowedLabels[2]" = "Custom";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
+"238.ibShadowedLabels[3]" = "Autotype";
+
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
+"0ok-MC-QMP.title" = "Save";
+
+/* Class = "NSButtonCell"; title = "Enable Autotype"; ObjectID = "9Nx-mE-DK3"; */
+"9Nx-mE-DK3.title" = "Enable Autotype";
+
+/* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "NtM-y3-l4D"; */
+"NtM-y3-l4D.title" = "Quicklook";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Entry Sequence"; ObjectID = "R2X-Ex-c6q"; */
+"R2X-Ex-c6q.placeholderString" = "Custom Entry Sequence";
+
+/* Class = "NSTextFieldCell"; title = "Window Sequence"; ObjectID = "RQB-bR-MC0"; */
+"RQB-bR-MC0.title" = "Window Sequence";
+
+/* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "bQ5-0E-h3O"; */
+"bQ5-0E-h3O.title" = "Autotype Sequence";
+
+/* Class = "NSTextFieldCell"; title = "Window Title"; ObjectID = "bkO-Bk-AuX"; */
+"bkO-Bk-AuX.title" = "Window Title";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "bke-G2-oEf"; */
+"bke-G2-oEf.title" = "Delete";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "dyA-lo-PGa"; */
+"dyA-lo-PGa.title" = "Table View Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "ep5-bQ-cfZ"; */
+"ep5-bQ-cfZ.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Window Sequence"; ObjectID = "fW9-9p-wwR"; */
+"fW9-9p-wwR.placeholderString" = "Custom Window Sequence";
+
+/* Class = "NSTabViewItem"; label = "Autotype"; ObjectID = "hK7-Dx-yjH"; */
+"hK7-Dx-yjH.label" = "Autotype";
+
+/* Class = "NSTextFieldCell"; title = "Window Associations"; ObjectID = "ned-1Q-FXA"; */
+"ned-1Q-FXA.title" = "Window Associations";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "sNS-o1-pD7"; */
+"sNS-o1-pD7.title" = "OtherViews";
diff --git a/MacPass/fr.lproj/GroupInspectorView.strings b/MacPass/fr.lproj/GroupInspectorView.strings
new file mode 100644
index 00000000..660fc3ac
--- /dev/null
+++ b/MacPass/fr.lproj/GroupInspectorView.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "25"; */
+"25.title" = "Name";
+
+/* Class = "NSButtonCell"; title = "Expires"; ObjectID = "32"; */
+"32.title" = "Expires";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "231"; */
+"231.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Inherit Search Settings"; ObjectID = "232"; */
+"232.title" = "Inherit Search Settings";
+
+/* Class = "NSMenuItem"; title = "Include in Search"; ObjectID = "233"; */
+"233.title" = "Include in Search";
+
+/* Class = "NSMenuItem"; title = "Exclude from Search"; ObjectID = "234"; */
+"234.title" = "Exclude from Search";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
+"243.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */
+"244.title" = "Disable Autotype";
+
+/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */
+"245.title" = "Enable Autotype";
+
+/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */
+"246.title" = "Inherit Autotype Settings";
+
+/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
+"265.title" = "Search";
+
+/* Class = "NSTextFieldCell"; title = "Autotype"; ObjectID = "277"; */
+"277.title" = "Autotype";
diff --git a/MacPass/fr.lproj/IntegrationSettings.strings b/MacPass/fr.lproj/IntegrationSettings.strings
new file mode 100644
index 00000000..462c05c1
--- /dev/null
+++ b/MacPass/fr.lproj/IntegrationSettings.strings
@@ -0,0 +1,24 @@
+
+/* Class = "NSButtonCell"; title = "Enable KeePassHttp server"; ObjectID = "3"; */
+"3.title" = "Enable KeePassHttp server";
+
+/* Class = "NSButtonCell"; title = "Enable global Autotype"; ObjectID = "1qb-Rd-jYu"; */
+"1qb-Rd-jYu.title" = "Enable global Autotype";
+
+/* Class = "NSTextFieldCell"; title = "Shortcut"; ObjectID = "6oN-CH-T0O"; */
+"6oN-CH-T0O.title" = "Shortcut";
+
+/* Class = "NSButtonCell"; title = "Enabel Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
+"ERs-ct-Eyx.title" = "Enabel Quicklook Preview";
+
+/* Class = "NSBox"; title = "Keepass HTTP"; ObjectID = "KbH-0Q-5Tw"; */
+"KbH-0Q-5Tw.title" = "Keepass HTTP";
+
+/* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
+"P9N-HM-wER.title" = "Autotype";
+
+/* Class = "NSBox"; title = "Preview"; ObjectID = "VVs-b5-cX9"; */
+"VVs-b5-cX9.title" = "Preview";
+
+/* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
+"WmI-IB-Aso.title" = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed.";
diff --git a/MacPass/fr.lproj/PasswordCreatorView.strings b/MacPass/fr.lproj/PasswordCreatorView.strings
new file mode 100644
index 00000000..0c97735e
--- /dev/null
+++ b/MacPass/fr.lproj/PasswordCreatorView.strings
@@ -0,0 +1,39 @@
+
+/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "149"; */
+"149.title" = "Password:";
+
+/* Class = "NSTextFieldCell"; title = "Length:"; ObjectID = "179"; */
+"179.title" = "Length:";
+
+/* Class = "NSBox"; title = "Allowed Characters"; ObjectID = "332"; */
+"332.title" = "Allowed Characters";
+
+/* Class = "NSButtonCell"; title = "A-Z"; ObjectID = "453"; */
+"453.title" = "A-Z";
+
+/* Class = "NSButtonCell"; title = "a-z"; ObjectID = "457"; */
+"457.title" = "a-z";
+
+/* Class = "NSButtonCell"; title = "0-9"; ObjectID = "461"; */
+"461.title" = "0-9";
+
+/* Class = "NSButtonCell"; title = "#!?"; ObjectID = "465"; */
+"465.title" = "#!?";
+
+/* Class = "NSButtonCell"; title = "Custom"; ObjectID = "469"; */
+"469.title" = "Custom";
+
+/* Class = "NSButtonCell"; title = "Use Password"; ObjectID = "495"; */
+"495.title" = "Use Password";
+
+/* Class = "NSButtonCell"; title = "Copy password to pasteboard"; ObjectID = "501"; */
+"501.title" = "Copy password to pasteboard";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "614"; */
+"614.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Entropy:"; ObjectID = "647"; */
+"647.title" = "Entropy:";
+
+/* Class = "NSTextFieldCell"; title = "25000 bit"; ObjectID = "653"; */
+"653.title" = "25000 bit";
diff --git a/MacPass/fr.lproj/PasswordEditWindow.strings b/MacPass/fr.lproj/PasswordEditWindow.strings
new file mode 100644
index 00000000..17b9aeda
--- /dev/null
+++ b/MacPass/fr.lproj/PasswordEditWindow.strings
@@ -0,0 +1,30 @@
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
+"1.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Missmatching Passwords"; ObjectID = "14"; */
+"14.title" = "Missmatching Passwords";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat Password"; ObjectID = "15"; */
+"15.placeholderString" = "Repeat Password";
+
+/* Class = "NSTextFieldCell"; title = "Repeat:"; ObjectID = "16"; */
+"16.title" = "Repeat:";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter Password"; ObjectID = "18"; */
+"18.placeholderString" = "Enter Password";
+
+/* Class = "NSButtonCell"; title = "Generate Keyfile"; ObjectID = "21"; */
+"21.title" = "Generate Keyfile";
+
+/* Class = "NSTextFieldCell"; title = "Keyfile:"; ObjectID = "22"; */
+"22.title" = "Keyfile:";
+
+/* Class = "NSButtonCell"; title = "Change Password"; ObjectID = "69"; */
+"69.title" = "Change Password";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "73"; */
+"73.title" = "Cancel";
+
+/* Class = "NSButtonCell"; title = "Password:"; ObjectID = "OQz-DA-SoY"; */
+"OQz-DA-SoY.title" = "Password:";
diff --git a/MacPass/fr.lproj/UpdateSettings.strings b/MacPass/fr.lproj/UpdateSettings.strings
new file mode 100644
index 00000000..66a60c59
--- /dev/null
+++ b/MacPass/fr.lproj/UpdateSettings.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSMenuItem"; title = "every Week"; ObjectID = "3FR-Va-iau"; */
+"3FR-Va-iau.title" = "every Week";
+
+/* Class = "NSTextFieldCell"; title = "Check for Updates"; ObjectID = "9tL-CA-Vdg"; */
+"9tL-CA-Vdg.title" = "Check for Updates";
+
+/* Class = "NSMenuItem"; title = "every Hour"; ObjectID = "DjF-1I-6Nq"; */
+"DjF-1I-6Nq.title" = "every Hour";
+
+/* Class = "NSButtonCell"; title = "Automatically Check for Updates"; ObjectID = "RFg-q1-AwJ"; */
+"RFg-q1-AwJ.title" = "Automatically Check for Updates";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "RKd-H8-eCF"; */
+"RKd-H8-eCF.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "every Month"; ObjectID = "Uo3-kv-1ro"; */
+"Uo3-kv-1ro.title" = "every Month";
+
+/* Class = "NSMenuItem"; title = "every Day"; ObjectID = "o9E-hk-H1T"; */
+"o9E-hk-H1T.title" = "every Day";
diff --git a/MacPass/fr.lproj/WorkflowSettings.strings b/MacPass/fr.lproj/WorkflowSettings.strings
new file mode 100644
index 00000000..10c668c9
--- /dev/null
+++ b/MacPass/fr.lproj/WorkflowSettings.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSBox"; title = "Entry Table"; ObjectID = "2"; */
+"2.title" = "Entry Table";
+
+/* Class = "NSTextFieldCell"; title = "Double-click on URL:"; ObjectID = "10"; */
+"10.title" = "Double-click on URL:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "15"; */
+"15.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Copies URL"; ObjectID = "16"; */
+"16.title" = "Copies URL";
+
+/* Class = "NSMenuItem"; title = "Opens URL"; ObjectID = "17"; */
+"17.title" = "Opens URL";
+
+/* Class = "NSTextFieldCell"; title = "Double-click on Title:"; ObjectID = "37"; */
+"37.title" = "Double-click on Title:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "42"; */
+"42.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "is Ignored"; ObjectID = "43"; */
+"43.title" = "is Ignored";
+
+/* Class = "NSMenuItem"; title = "Opens Inspector"; ObjectID = "44"; */
+"44.title" = "Opens Inspector";
+
+/* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
+"7YX-EA-9KA.title" = "Default Browser";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
+"XgO-Tj-QjO.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
+"gej-kA-GzQ.title" = "Item 2";
+
+/* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
+"soD-wI-YOH.title" = "Open URLs in:";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
+"zC2-cM-KDv.title" = "Item 3";
diff --git a/MacPass/zh-Hans.lproj/DatabaseSettingsWindow.strings b/MacPass/zh-Hans.lproj/DatabaseSettingsWindow.strings
new file mode 100644
index 00000000..97c23ec4
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/DatabaseSettingsWindow.strings
@@ -0,0 +1,96 @@
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
+"1.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Database name:"; ObjectID = "190"; */
+"190.title" = "数据库名称:";
+
+/* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "257"; */
+"257.title" = "描述:";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "289"; */
+"289.title" = "确定";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "358"; */
+"358.label" = "通用";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "368"; */
+"368.label" = "高级";
+
+/* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
+"370.label" = "安全";
+
+/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
+"464.title" = "保护标题";
+
+/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
+"477.title" = "保护用户名";
+
+/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
+"505.title" = "保护密码";
+
+/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
+"510.title" = "保护 URL";
+
+/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
+"514.title" = "保护注释";
+
+/* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
+"532.title" = "使用项目历史";
+
+/* Class = "NSButtonCell"; title = "Enable Recycle Bin"; ObjectID = "536"; */
+"536.title" = "使用废纸篓";
+
+/* Class = "NSButtonCell"; title = "Empty Recycle Bin on Quit"; ObjectID = "540"; */
+"540.title" = "退出时清空废纸篓";
+
+/* Class = "NSTextFieldCell"; title = "Maxium Items:"; ObjectID = "558"; */
+"558.title" = "最多项目数:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "680"; */
+"680.title" = "OtherViews";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "957"; */
+"957.title" = "取消";
+
+/* Class = "NSTextFieldCell"; title = "Maxium Size:"; ObjectID = "1269"; */
+"1269.title" = "最大大小:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1396"; */
+"1396.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "1397"; */
+"1397.title" = "无";
+
+/* Class = "NSMenuItem"; title = "GZip"; ObjectID = "1398"; */
+"1398.title" = "GZip";
+
+/* Class = "NSTextFieldCell"; title = "Compression:"; ObjectID = "1405"; */
+"1405.title" = "压缩:";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "1435"; */
+"1435.title" = "颜色:";
+
+/* Class = "NSTextFieldCell"; title = "Template Group:"; ObjectID = "1588"; */
+"1588.title" = "模板组:";
+
+/* Class = "NSTextFieldCell"; title = "Default Username:"; ObjectID = "1591"; */
+"1591.title" = "缺省用户名:";
+
+/* Class = "NSTextFieldCell"; title = "Key encryption rounds:"; ObjectID = "1644"; */
+"1644.title" = "加密轮次:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
+"1740.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
+"1741.title" = "Item 1";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
+"1742.title" = "Item 2";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
+"1743.title" = "Item 3";
+
+/* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
+"1775.title" = "测试";
diff --git a/MacPass/zh-Hans.lproj/DatePickingView.strings b/MacPass/zh-Hans.lproj/DatePickingView.strings
new file mode 100644
index 00000000..0fc10d6c
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/DatePickingView.strings
@@ -0,0 +1,9 @@
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "17"; */
+"17.title" = "OtherViews";
+
+/* Class = "NSButtonCell"; title = "Use Date"; ObjectID = "26"; */
+"26.title" = "使用";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "30"; */
+"30.title" = "取消";
diff --git a/MacPass/zh-Hans.lproj/EntryInspectorView.strings b/MacPass/zh-Hans.lproj/EntryInspectorView.strings
new file mode 100644
index 00000000..67550daa
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/EntryInspectorView.strings
@@ -0,0 +1,114 @@
+
+/* Class = "NSButtonCell"; title = "Generate"; ObjectID = "64"; */
+"64.title" = "生成";
+
+/* Class = "NSTextFieldCell"; title = "Password"; ObjectID = "65"; */
+"65.title" = "密码";
+
+/* Class = "NSTextFieldCell"; title = "URL"; ObjectID = "66"; */
+"66.title" = "URL";
+
+/* Class = "NSTextFieldCell"; title = "Username"; ObjectID = "69"; */
+"69.title" = "用户名";
+
+/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "71"; */
+"71.title" = "标题";
+
+/* Class = "NSButtonCell"; title = "Expires"; ObjectID = "78"; */
+"78.title" = "失效";
+
+/* Class = "NSTextFieldCell"; title = "Tags"; ObjectID = "79"; */
+"79.title" = "标签";
+
+/* Class = "NSTabViewItem"; label = "Fields"; ObjectID = "108"; */
+"108.label" = "字段";
+
+/* Class = "NSTabViewItem"; label = "Attachments"; ObjectID = "109"; */
+"109.label" = "附件";
+
+/* Class = "NSTabViewItem"; label = "General"; ObjectID = "110"; */
+"110.label" = "通用";
+
+/* Class = "NSTextFieldCell"; title = "Attachments"; ObjectID = "135"; */
+"135.title" = "附件";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "142"; */
+"142.title" = "文本单元";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "151"; */
+"151.title" = "表格视图单元";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "171"; */
+"171.title" = "表格视图单元";
+
+/* Class = "NSTextFieldCell"; title = "Custom Fields"; ObjectID = "190"; */
+"190.title" = "自定义字段";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "197"; */
+"197.title" = "文本单元";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "211"; */
+"211.placeholderString" = "标题";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "214"; */
+"214.placeholderString" = "值";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "225"; */
+"225.placeholderString" = "值";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "228"; */
+"228.placeholderString" = "标题";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[0] = "General"; ObjectID = "238"; */
+"238.ibShadowedLabels[0]" = "通用";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[1] = "Files"; ObjectID = "238"; */
+"238.ibShadowedLabels[1]" = "文件";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Custom"; ObjectID = "238"; */
+"238.ibShadowedLabels[2]" = "自定义";
+
+/* Class = "NSSegmentedCell"; 238.ibShadowedLabels[3] = "Autotype"; ObjectID = "238"; */
+"238.ibShadowedLabels[3]" = "自动键入";
+
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "0ok-MC-QMP"; */
+"0ok-MC-QMP.title" = "保存";
+
+/* Class = "NSButtonCell"; title = "Enable Autotype"; ObjectID = "9Nx-mE-DK3"; */
+"9Nx-mE-DK3.title" = "使用自动键入";
+
+/* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "NtM-y3-l4D"; */
+"NtM-y3-l4D.title" = "Quicklook";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Entry Sequence"; ObjectID = "R2X-Ex-c6q"; */
+"R2X-Ex-c6q.placeholderString" = "自定义项目序列";
+
+/* Class = "NSTextFieldCell"; title = "Window Sequence"; ObjectID = "RQB-bR-MC0"; */
+"RQB-bR-MC0.title" = "窗口序列";
+
+/* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "bQ5-0E-h3O"; */
+"bQ5-0E-h3O.title" = "自动键入序列";
+
+/* Class = "NSTextFieldCell"; title = "Window Title"; ObjectID = "bkO-Bk-AuX"; */
+"bkO-Bk-AuX.title" = "窗口标题";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "bke-G2-oEf"; */
+"bke-G2-oEf.title" = "删除";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "dyA-lo-PGa"; */
+"dyA-lo-PGa.title" = "表格视图单元";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "ep5-bQ-cfZ"; */
+"ep5-bQ-cfZ.title" = "文本单元";
+
+/* Class = "NSTextFieldCell"; placeholderString = "Custom Window Sequence"; ObjectID = "fW9-9p-wwR"; */
+"fW9-9p-wwR.placeholderString" = "自定义窗口序列";
+
+/* Class = "NSTabViewItem"; label = "Autotype"; ObjectID = "hK7-Dx-yjH"; */
+"hK7-Dx-yjH.label" = "自动键入";
+
+/* Class = "NSTextFieldCell"; title = "Window Associations"; ObjectID = "ned-1Q-FXA"; */
+"ned-1Q-FXA.title" = "窗口关系";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "sNS-o1-pD7"; */
+"sNS-o1-pD7.title" = "其他视图";
diff --git a/MacPass/zh-Hans.lproj/GeneralSettings.strings b/MacPass/zh-Hans.lproj/GeneralSettings.strings
index 0db6ada8..2ff061bf 100644
--- a/MacPass/zh-Hans.lproj/GeneralSettings.strings
+++ b/MacPass/zh-Hans.lproj/GeneralSettings.strings
@@ -12,58 +12,58 @@
 "424.title" = "1分钟之后";
 
 /* Class = "NSMenuItem"; title = "Never"; ObjectID = "429"; */
-"429.title" = "用不";
+"429.title" = "从不";
 
 /* Class = "NSTextFieldCell"; title = "Clear Copied Items"; ObjectID = "432"; */
-"432.title" = "Clear Copied Items";
+"432.title" = "清除拷贝的项目";
 
 /* Class = "NSButtonCell"; title = "Clear Clipboard on Quit"; ObjectID = "448"; */
 "448.title" = "退出时清空剪贴板";
 
 /* Class = "NSBox"; title = "Security"; ObjectID = "465"; */
-"465.title" = "Security";
+"465.title" = "安全";
 
 /* Class = "NSButtonCell"; title = "Reopen last Database after Launch"; ObjectID = "531"; */
-"531.title" = "Reopen last Database after Launch";
+"531.title" = "运行时重新打开上次的数据库";
 
 /* Class = "NSMenu"; title = "LockTimes"; ObjectID = "586"; */
-"586.title" = "LockTimes";
+"586.title" = "锁定次数";
 
 /* Class = "NSMenuItem"; title = "for 1 Minute"; ObjectID = "588"; */
-"588.title" = "for 1 Minute";
+"588.title" = "1分钟";
 
 /* Class = "NSMenuItem"; title = "for 5 Minutes"; ObjectID = "589"; */
-"589.title" = "for 5 Minutes";
+"589.title" = "5分钟";
 
 /* Class = "NSMenuItem"; title = "for 15 Minutes"; ObjectID = "603"; */
-"603.title" = "for 15 Minutes";
+"603.title" = "15分钟";
 
 /* Class = "NSButtonCell"; title = "Lock after sleep"; ObjectID = "631"; */
-"631.title" = "Lock after sleep";
+"631.title" = "睡眠时锁定";
 
 /* Class = "NSMenuItem"; title = "Never"; ObjectID = "804"; */
-"804.title" = "Never";
+"804.title" = "从不";
 
 /* Class = "NSTextFieldCell"; title = "Lock while idle"; ObjectID = "806"; */
-"806.title" = "Lock while idle";
+"806.title" = "空闲时锁定";
 
 /* Class = "NSButtonCell"; title = "Create new Database if activated"; ObjectID = "880"; */
-"880.title" = "Create new Database if activated";
+"880.title" = "激活时创建新的数据库";
 
 /* Class = "NSBox"; title = "Startup"; ObjectID = "888"; */
-"888.title" = "Startup";
+"888.title" = "启动";
 
 /* Class = "NSBox"; title = "General"; ObjectID = "928"; */
-"928.title" = "General";
+"928.title" = "通用";
 
 /* Class = "NSButtonCell"; title = "Double-click entry URL to Launch"; ObjectID = "937"; */
-"937.title" = "Double-click entry URL to Launch";
+"937.title" = "双击项目的 URL 将在浏览器中打开";
 
 /* Class = "NSButtonCell"; title = "Clear all stored locations"; ObjectID = "8Ri-2s-c39"; */
-"8Ri-2s-c39.title" = "Clear all stored locations";
+"8Ri-2s-c39.title" = "清除所有储存的位置";
 
 /* Class = "NSTextFieldCell"; title = "Enabling this compromises security. If enabled, your preferences will contain mappings from database to keyfile. Key locations for databases without a password will not be saved."; ObjectID = "ACh-7H-42N"; */
-"ACh-7H-42N.title" = "Enabling this compromises security. If enabled, your preferences will contain mappings from database to keyfile. Key locations for databases without a password will not be saved.";
+"ACh-7H-42N.title" = "使用此功能将影响安全性。若使用此功能，您的设置将包含从数据库到密钥文件的映射。没有密码的数据库密钥位置将不会保存。";
 
 /* Class = "NSButtonCell"; title = "Remember Keyfile for Databases"; ObjectID = "r6q-He-nYU"; */
-"r6q-He-nYU.title" = "Remember Keyfile for Databases";
+"r6q-He-nYU.title" = "记住数据库的密钥文件";
diff --git a/MacPass/zh-Hans.lproj/GroupInspectorView.strings b/MacPass/zh-Hans.lproj/GroupInspectorView.strings
new file mode 100644
index 00000000..6349ae2f
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/GroupInspectorView.strings
@@ -0,0 +1,36 @@
+
+/* Class = "NSTextFieldCell"; title = "Name"; ObjectID = "25"; */
+"25.title" = "名称";
+
+/* Class = "NSButtonCell"; title = "Expires"; ObjectID = "32"; */
+"32.title" = "失效";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "231"; */
+"231.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Inherit Search Settings"; ObjectID = "232"; */
+"232.title" = "继承搜索设置";
+
+/* Class = "NSMenuItem"; title = "Include in Search"; ObjectID = "233"; */
+"233.title" = "包含在搜索中";
+
+/* Class = "NSMenuItem"; title = "Exclude from Search"; ObjectID = "234"; */
+"234.title" = "不包含在搜索中";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
+"243.title" = "OtherViews";
+
+/* Class = "NSMenuItem"; title = "Disable Autotype"; ObjectID = "244"; */
+"244.title" = "不使用自动键入";
+
+/* Class = "NSMenuItem"; title = "Enable Autotype"; ObjectID = "245"; */
+"245.title" = "使用自动键入";
+
+/* Class = "NSMenuItem"; title = "Inherit Autotype Settings"; ObjectID = "246"; */
+"246.title" = "继承自动键入设置";
+
+/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
+"265.title" = "搜索";
+
+/* Class = "NSTextFieldCell"; title = "Autotype"; ObjectID = "277"; */
+"277.title" = "自动键入";
diff --git a/MacPass/zh-Hans.lproj/InspectorView.strings b/MacPass/zh-Hans.lproj/InspectorView.strings
index c7839a84..21b861ed 100644
--- a/MacPass/zh-Hans.lproj/InspectorView.strings
+++ b/MacPass/zh-Hans.lproj/InspectorView.strings
@@ -6,13 +6,13 @@
 "2897.label" = "项目";
 
 /* Class = "NSTabViewItem"; label = "NoSelection"; ObjectID = "2974"; */
-"2974.label" = "NoSelection";
+"2974.label" = "未选择";
 
 /* Class = "NSTextFieldCell"; title = "No Selection"; ObjectID = "2986"; */
-"2986.title" = "No Selection";
+"2986.title" = "未选择";
 
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "3014"; */
-"3014.title" = "Label";
+"3014.title" = "标记";
 
 /* Class = "NSButtonCell"; title = "Edit"; ObjectID = "3110"; */
 "3110.title" = "编辑";
@@ -21,4 +21,4 @@
 "3127.title" = "取消";
 
 /* Class = "NSTextFieldCell"; title = "Notes"; ObjectID = "hwn-UY-9Cr"; */
-"hwn-UY-9Cr.title" = "Notes";
+"hwn-UY-9Cr.title" = "注释";
diff --git a/MacPass/zh-Hans.lproj/IntegrationSettings.strings b/MacPass/zh-Hans.lproj/IntegrationSettings.strings
new file mode 100644
index 00000000..1e3cff48
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/IntegrationSettings.strings
@@ -0,0 +1,24 @@
+
+/* Class = "NSButtonCell"; title = "Enable KeePassHttp server"; ObjectID = "3"; */
+"3.title" = "使用 KeePassHttp 服务器";
+
+/* Class = "NSButtonCell"; title = "Enable global Autotype"; ObjectID = "1qb-Rd-jYu"; */
+"1qb-Rd-jYu.title" = "使用全局自动键入";
+
+/* Class = "NSTextFieldCell"; title = "Shortcut"; ObjectID = "6oN-CH-T0O"; */
+"6oN-CH-T0O.title" = "快捷键";
+
+/* Class = "NSButtonCell"; title = "Enabel Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
+"ERs-ct-Eyx.title" = "使用 Quicklook 预览";
+
+/* Class = "NSBox"; title = "Keepass HTTP"; ObjectID = "KbH-0Q-5Tw"; */
+"KbH-0Q-5Tw.title" = "Keepass HTTP";
+
+/* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
+"P9N-HM-wER.title" = "自动键入";
+
+/* Class = "NSBox"; title = "Preview"; ObjectID = "VVs-b5-cX9"; */
+"VVs-b5-cX9.title" = "预览";
+
+/* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
+"WmI-IB-Aso.title" = "若使用此功能，预览时附件文件将被拷贝到临时文件夹，并且在预览后将被删除。";
diff --git a/MacPass/zh-Hans.lproj/KPKLocalizeable.strings b/MacPass/zh-Hans.lproj/KPKLocalizeable.strings
index ff086339..eccdca6e 100644
--- a/MacPass/zh-Hans.lproj/KPKLocalizeable.strings
+++ b/MacPass/zh-Hans.lproj/KPKLocalizeable.strings
@@ -7,30 +7,30 @@
 */
 
 /* Copy */
-"KPK_GROUP_COPY_%@" = "%@ copy";
-"KPK_ENTRY_COPY_%@" = "%@ copy";
+"KPK_GROUP_COPY_%@" = "%@ 拷贝";
+"KPK_ENTRY_COPY_%@" = "%@ 拷贝";
 
 /* Validation Errors */
-"ERROR_WINDOW_TITLE_VALIDATION_FAILED" = "The Format of the Window Title is not valid!";
-"ERROR_ATTRIBUTE_KEY_VALIDATION_FAILED" = "The Attribute Key is not unique!";
-"ERROR_AUTOTYPE_SEQUENCE_VALIDATION_FAILED" = "Tht Autotype Sequence is not valid!";
+"ERROR_WINDOW_TITLE_VALIDATION_FAILED" = "窗口标题格式不正确!";
+"ERROR_ATTRIBUTE_KEY_VALIDATION_FAILED" = "属性键 (Attribute Key) 不唯一!";
+"ERROR_AUTOTYPE_SEQUENCE_VALIDATION_FAILED" = "自动键入序列不正确!";
 
 /* Errors */
-"ERROR_CORRUPT_TREE" = "The internal file structure is corrupted!";
+"ERROR_CORRUPT_TREE" = "内部文件结构已损坏!";
 "ERROR_INVALID_FIELD_SIZE" = "数据字段大小错误，可能是由于密码错误。";
 "ERROR_INVALID_FIELD_TYPE" = "未知数据字段，可能是由于密码错误。";
-"ERROR_UNSUPPORTED_DATABASER_VERSION" = "The Database version is not supported";
-"ERROR_UNSUPPORTED_CHIPHER" = "Unsupported chipher algorithm";
-"ERROR_UNKNOWN_FILE_FORMAT" = "Unknown file format";
-"ERROR_HEADER_CORRUPTED" = "Header is corrupted";
-"ERROR_UNSUPPORTED_KDBX_COMPRESSION_ALGORITHM" = "Unsported compression algorithm";
-"ERROR_UNSUPPORTED_KDBX_RANDOM_STREAM" = "Unsupported random stream type";
-"ERROR_INTEGRITY_CHECK_FAILED" = "The database integrity isn't ensured";
-"ERROR_PASSWORD_OR_KEYFILE_WRONG" = "The password and/or the keyfile is wrong";
-"ERROR_KEEPASSFILE_ELEMENT_MISSING" = "The XML file is missing the KeePassFile element";
-"ERROR_ROOT_ELEMENT_MISSING" = "The XML file contains no Root node";
-"ERROR_GROUP_ELEMENT_MISSING" = "The XML file contains no Group node";
-"ERROR_HEADER_HASH_MISSMATCH" = "The header hash doesn't match. File corrupted";
-"ERROR_XML_KEYFILE_WITHOUT_KEY_ELEMENT" = "The XML keyfile is missing the key element";
-"ERROR_XML_KEYFILE_WITHOUT_DATA_ELEMENT" = "The XML keyfiel is missing the data element";
-"ERROR_XML_KEYFILE_DATA_PARSING_ERROR" = "Unable to read the data of the XML keyfile";
\ No newline at end of file
+"ERROR_UNSUPPORTED_DATABASER_VERSION" = "不支持的数据库版本";
+"ERROR_UNSUPPORTED_CHIPHER" = "不支持的密码算法";
+"ERROR_UNKNOWN_FILE_FORMAT" = "未知文件格式";
+"ERROR_HEADER_CORRUPTED" = "文件头已损坏";
+"ERROR_UNSUPPORTED_KDBX_COMPRESSION_ALGORITHM" = "不支持的压缩算法";
+"ERROR_UNSUPPORTED_KDBX_RANDOM_STREAM" = "不支持的随机流 (random stream) 种类";
+"ERROR_INTEGRITY_CHECK_FAILED" = "数据库完整性已被破坏";
+"ERROR_PASSWORD_OR_KEYFILE_WRONG" = "密码与/或密钥文件错误";
+"ERROR_KEEPASSFILE_ELEMENT_MISSING" = "XML 文件缺少 KeePassFile 元素";
+"ERROR_ROOT_ELEMENT_MISSING" = "XML 文件未包含根节点";
+"ERROR_GROUP_ELEMENT_MISSING" = "XML 文件未包含组节点";
+"ERROR_HEADER_HASH_MISSMATCH" = "文件头哈希表不匹配。文件已损坏";
+"ERROR_XML_KEYFILE_WITHOUT_KEY_ELEMENT" = "XML 密钥文件缺少键 (key) 元素";
+"ERROR_XML_KEYFILE_WITHOUT_DATA_ELEMENT" = "XML 密钥文件缺少数据 (data) 元素";
+"ERROR_XML_KEYFILE_DATA_PARSING_ERROR" = "无法读取 XML 密钥文件的数据";
\ No newline at end of file
diff --git a/MacPass/zh-Hans.lproj/Localizable.strings b/MacPass/zh-Hans.lproj/Localizable.strings
index a7af42a6..136b6f90 100644
Binary files a/MacPass/zh-Hans.lproj/Localizable.strings and b/MacPass/zh-Hans.lproj/Localizable.strings differ
diff --git a/MacPass/zh-Hans.lproj/PasswordCreatorView.strings b/MacPass/zh-Hans.lproj/PasswordCreatorView.strings
new file mode 100644
index 00000000..7662d244
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/PasswordCreatorView.strings
@@ -0,0 +1,39 @@
+
+/* Class = "NSTextFieldCell"; title = "Password:"; ObjectID = "149"; */
+"149.title" = "密码:";
+
+/* Class = "NSTextFieldCell"; title = "Length:"; ObjectID = "179"; */
+"179.title" = "长度:";
+
+/* Class = "NSBox"; title = "Allowed Characters"; ObjectID = "332"; */
+"332.title" = "允许使用的字符";
+
+/* Class = "NSButtonCell"; title = "A-Z"; ObjectID = "453"; */
+"453.title" = "A-Z";
+
+/* Class = "NSButtonCell"; title = "a-z"; ObjectID = "457"; */
+"457.title" = "a-z";
+
+/* Class = "NSButtonCell"; title = "0-9"; ObjectID = "461"; */
+"461.title" = "0-9";
+
+/* Class = "NSButtonCell"; title = "#!?"; ObjectID = "465"; */
+"465.title" = "#!?";
+
+/* Class = "NSButtonCell"; title = "Custom"; ObjectID = "469"; */
+"469.title" = "自定义";
+
+/* Class = "NSButtonCell"; title = "Use Password"; ObjectID = "495"; */
+"495.title" = "使用密码";
+
+/* Class = "NSButtonCell"; title = "Copy password to pasteboard"; ObjectID = "501"; */
+"501.title" = "将密码拷贝到剪贴板";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "614"; */
+"614.title" = "取消";
+
+/* Class = "NSTextFieldCell"; title = "Entropy:"; ObjectID = "647"; */
+"647.title" = "熵:";
+
+/* Class = "NSTextFieldCell"; title = "25000 bit"; ObjectID = "653"; */
+"653.title" = "25000 bit";
diff --git a/MacPass/zh-Hans.lproj/PasswordEditWindow.strings b/MacPass/zh-Hans.lproj/PasswordEditWindow.strings
new file mode 100644
index 00000000..49de0206
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/PasswordEditWindow.strings
@@ -0,0 +1,30 @@
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "1"; */
+"1.title" = "Window";
+
+/* Class = "NSTextFieldCell"; title = "Missmatching Passwords"; ObjectID = "14"; */
+"14.title" = "密码不匹配";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Repeat Password"; ObjectID = "15"; */
+"15.placeholderString" = "重复密码";
+
+/* Class = "NSTextFieldCell"; title = "Repeat:"; ObjectID = "16"; */
+"16.title" = "重复:";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter Password"; ObjectID = "18"; */
+"18.placeholderString" = "输入密码";
+
+/* Class = "NSButtonCell"; title = "Generate Keyfile"; ObjectID = "21"; */
+"21.title" = "生成密钥文件";
+
+/* Class = "NSTextFieldCell"; title = "Keyfile:"; ObjectID = "22"; */
+"22.title" = "密钥文件:";
+
+/* Class = "NSButtonCell"; title = "Change Password"; ObjectID = "69"; */
+"69.title" = "修改密码";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "73"; */
+"73.title" = "取消";
+
+/* Class = "NSButtonCell"; title = "Password:"; ObjectID = "OQz-DA-SoY"; */
+"OQz-DA-SoY.title" = "密码:";
diff --git a/MacPass/zh-Hans.lproj/UpdateSettings.strings b/MacPass/zh-Hans.lproj/UpdateSettings.strings
new file mode 100644
index 00000000..a4fdf3a3
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/UpdateSettings.strings
@@ -0,0 +1,21 @@
+
+/* Class = "NSMenuItem"; title = "every Week"; ObjectID = "3FR-Va-iau"; */
+"3FR-Va-iau.title" = "每周";
+
+/* Class = "NSTextFieldCell"; title = "Check for Updates"; ObjectID = "9tL-CA-Vdg"; */
+"9tL-CA-Vdg.title" = "检查更新";
+
+/* Class = "NSMenuItem"; title = "every Hour"; ObjectID = "DjF-1I-6Nq"; */
+"DjF-1I-6Nq.title" = "每小时";
+
+/* Class = "NSButtonCell"; title = "Automatically Check for Updates"; ObjectID = "RFg-q1-AwJ"; */
+"RFg-q1-AwJ.title" = "自动检查更新";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "RKd-H8-eCF"; */
+"RKd-H8-eCF.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "every Month"; ObjectID = "Uo3-kv-1ro"; */
+"Uo3-kv-1ro.title" = "每月";
+
+/* Class = "NSMenuItem"; title = "every Day"; ObjectID = "o9E-hk-H1T"; */
+"o9E-hk-H1T.title" = "每天";
diff --git a/MacPass/zh-Hans.lproj/WorkflowSettings.strings b/MacPass/zh-Hans.lproj/WorkflowSettings.strings
new file mode 100644
index 00000000..7ccd85af
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/WorkflowSettings.strings
@@ -0,0 +1,42 @@
+
+/* Class = "NSBox"; title = "Entry Table"; ObjectID = "2"; */
+"2.title" = "项目表";
+
+/* Class = "NSTextFieldCell"; title = "Double-click on URL:"; ObjectID = "10"; */
+"10.title" = "双击 URL:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "15"; */
+"15.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "Copies URL"; ObjectID = "16"; */
+"16.title" = "拷贝 URL";
+
+/* Class = "NSMenuItem"; title = "Opens URL"; ObjectID = "17"; */
+"17.title" = "打开 URL";
+
+/* Class = "NSTextFieldCell"; title = "Double-click on Title:"; ObjectID = "37"; */
+"37.title" = "双击标题:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "42"; */
+"42.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "is Ignored"; ObjectID = "43"; */
+"43.title" = "被忽略了";
+
+/* Class = "NSMenuItem"; title = "Opens Inspector"; ObjectID = "44"; */
+"44.title" = "打开检查器";
+
+/* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
+"7YX-EA-9KA.title" = "缺省浏览器";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
+"XgO-Tj-QjO.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
+"gej-kA-GzQ.title" = "Item 2";
+
+/* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
+"soD-wI-YOH.title" = "用其他浏览器打开 URL:";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "zC2-cM-KDv"; */
+"zC2-cM-KDv.title" = "Item 3";