diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 958c433a..3f119dd1 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -361,10 +361,8 @@
 		4C0B038A18E36DA400B9F9C9 /* MPFixAutotypeWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPFixAutotypeWindowController.m; sourceTree = "<group>"; };
 		4C0B038B18E36DA400B9F9C9 /* FixAutotypeWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FixAutotypeWindow.xib; sourceTree = "<group>"; };
 		4C0B5339205C1516003D277E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PickcharsView.xib; sourceTree = "<group>"; };
-		4C0B533C205C151D003D277E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PickcharsView.strings; sourceTree = "<group>"; };
 		4C0B533E205C1526003D277E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PickcharsView.strings; sourceTree = "<group>"; };
 		4C0B5340205C1561003D277E /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PickfieldView.xib; sourceTree = "<group>"; };
-		4C0B5343205C1563003D277E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PickfieldView.strings; sourceTree = "<group>"; };
 		4C0B5345205C1567003D277E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PickfieldView.strings; sourceTree = "<group>"; };
 		4C0C59EF18B17F10009C7B76 /* DDHotKeyUtilities.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DDHotKeyUtilities.m; path = DDHotKey/DDHotKeyUtilities.m; sourceTree = "<group>"; };
 		4C0C59F018B17F10009C7B76 /* DDHotKeyUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = DDHotKeyUtilities.h; path = DDHotKey/DDHotKeyUtilities.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
@@ -372,7 +370,6 @@
 		4C0F043E2147A6FA000B8568 /* MPCustomFieldTableView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPCustomFieldTableView.h; sourceTree = "<group>"; };
 		4C0F043F2147A6FA000B8568 /* MPCustomFieldTableView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPCustomFieldTableView.m; sourceTree = "<group>"; };
 		4C0F04422147FB49000B8568 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OpenPanelAccessoryView.xib; sourceTree = "<group>"; };
-		4C0F04452147FB4D000B8568 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/OpenPanelAccessoryView.strings; sourceTree = "<group>"; };
 		4C0F04472147FB4E000B8568 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/OpenPanelAccessoryView.strings; sourceTree = "<group>"; };
 		4C0F647917B6BC9C00D9522A /* MPSavePanelAccessoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSavePanelAccessoryViewController.h; sourceTree = "<group>"; };
 		4C0F647A17B6BC9C00D9522A /* MPSavePanelAccessoryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSavePanelAccessoryViewController.m; sourceTree = "<group>"; };
@@ -382,13 +379,13 @@
 		4C15B74518BCA3B1003F8008 /* MPDocument+Search.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPDocument+Search.m"; sourceTree = "<group>"; };
 		4C17D11F2250EFBC00C650C4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SavePanelAccessoryView.xib; sourceTree = "<group>"; };
 		4C17D1222250EFBF00C650C4 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SavePanelAccessoryView.strings; sourceTree = "<group>"; };
-		4C17D1242250EFC500C650C4 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SavePanelAccessoryView.strings; sourceTree = "<group>"; };
 		4C17D1262250EFC900C650C4 /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/SavePanelAccessoryView.strings; sourceTree = "<group>"; };
 		4C17D8E317A1C780006C8C1E /* MPDocumentWindowDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDocumentWindowDelegate.h; sourceTree = "<group>"; };
 		4C17D8E417A1C780006C8C1E /* MPDocumentWindowDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDocumentWindowDelegate.m; sourceTree = "<group>"; };
 		4C17F104184E630200E85625 /* 14_BatteryTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 14_BatteryTemplate.pdf; sourceTree = "<group>"; };
 		4C17F106184E6B6C00E85625 /* 31_PrintTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 31_PrintTemplate.pdf; sourceTree = "<group>"; };
 		4C17F107184E6B6C00E85625 /* 30_TerminalTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 30_TerminalTemplate.pdf; sourceTree = "<group>"; };
+		4C1888CF230FBC080054A38F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/AutotypeDoctorReportViewController.strings; sourceTree = "<group>"; };
 		4C1BDF281E4392640012A3F0 /* MPPluginDataViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPluginDataViewController.h; sourceTree = "<group>"; };
 		4C1BDF291E4392640012A3F0 /* MPPluginDataViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPluginDataViewController.m; sourceTree = "<group>"; };
 		4C1D562F2271F4BC00C3E594 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = fr; path = fr.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
@@ -408,7 +405,6 @@
 		4C1F7FA01E3A12E600D6A40E /* MPModifiedKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPModifiedKey.h; sourceTree = "<group>"; };
 		4C1F7FA11E3A12E600D6A40E /* MPModifiedKey.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPModifiedKey.m; sourceTree = "<group>"; };
 		4C1FA07A18231900003A3F8C /* MPDocument+Autotype.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPDocument+Autotype.m"; sourceTree = "<group>"; };
-		4C21F29D195B39B9002D610D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		4C21F29F195B3A48002D610D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		4C224B4017DFCB2300FF6AEE /* MPNumericalInputFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPNumericalInputFormatter.h; sourceTree = "<group>"; };
 		4C224B4117DFCB2400FF6AEE /* MPNumericalInputFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPNumericalInputFormatter.m; sourceTree = "<group>"; };
@@ -527,11 +523,7 @@
 		4C473A8518AFD7250073FD2E /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		4C4A100D176286FD00BBF2CA /* MPTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPTableView.h; sourceTree = "<group>"; };
 		4C4A100E176286FD00BBF2CA /* MPTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTableView.m; sourceTree = "<group>"; };
-		4C4B2ED022D8C9B400EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/GeneralPreferences.strings; sourceTree = "<group>"; };
 		4C4B2ED122D8CA6100EB6BFD /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PluginRepositoryBrowserView.strings; sourceTree = "<group>"; };
-		4C4B2ED322D8D31F00EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
-		4C4B2ED522D8D3B100EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/IntegrationPreferences.strings; sourceTree = "<group>"; };
-		4C4B2ED822D8D40200EB6BFD /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/WorkflowPreferences.strings; sourceTree = "<group>"; };
 		4C4B728318E4B9B400A1A5D5 /* MPDockTileHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDockTileHelper.h; sourceTree = "<group>"; };
 		4C4B728418E4B9B400A1A5D5 /* MPDockTileHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDockTileHelper.m; sourceTree = "<group>"; };
 		4C4B7EE617A45EC5000234C7 /* MPDatePickingViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatePickingViewController.h; sourceTree = "<group>"; };
@@ -578,7 +570,6 @@
 		4C5CD34817D15920000B7F38 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InspectorView.strings; sourceTree = "<group>"; };
 		4C5EF814218CA03F0003C00E /* MPAutotypeParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAutotypeParser.h; sourceTree = "<group>"; };
 		4C5EF815218CA03F0003C00E /* MPAutotypeParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAutotypeParser.m; sourceTree = "<group>"; };
-		4C5F72851FC4351E00929153 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InspectorView.strings; sourceTree = "<group>"; };
 		4C5FE9AC17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSelectedAttachmentTableCellView.h; sourceTree = "<group>"; };
 		4C5FE9AD17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSelectedAttachmentTableCellView.m; sourceTree = "<group>"; };
 		4C61EA0116D2FD0800AC519E /* MPOutlineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineViewController.h; sourceTree = "<group>"; };
@@ -599,7 +590,6 @@
 		4C6BC65F1A36717E00BDDF3D /* MPDatabaseSearch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseSearch.m; sourceTree = "<group>"; };
 		4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 48_FolderTemplate.pdf; sourceTree = "<group>"; };
 		4C6DCC461FA2457900C8AD3F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ContextBar.xib; sourceTree = "<group>"; };
-		4C6DCC491FA2457C00C8AD3F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/ContextBar.strings; sourceTree = "<group>"; };
 		4C6DCC4B1FA2457D00C8AD3F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/ContextBar.strings; sourceTree = "<group>"; };
 		4C6DCC4D1FA2457E00C8AD3F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ContextBar.strings; sourceTree = "<group>"; };
 		4C6DCC4F1FA2457F00C8AD3F /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/ContextBar.strings"; sourceTree = "<group>"; };
@@ -621,7 +611,6 @@
 		4C7155E61A10DB7600979307 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/IconSelection.strings"; sourceTree = "<group>"; };
 		4C7155E81A10DB7700979307 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/IconSelection.strings; sourceTree = "<group>"; };
 		4C7155EA1A10DB7800979307 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/IconSelection.strings; sourceTree = "<group>"; };
-		4C7155EC1A10DB7900979307 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/IconSelection.strings; sourceTree = "<group>"; };
 		4C71BCB32167B75900B4CBDA /* MPTestPluginVersionComparator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPTestPluginVersionComparator.m; sourceTree = "<group>"; };
 		4C71BCB52167B79C00B4CBDA /* MPPluginVersionComparator.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPluginVersionComparator.h; sourceTree = "<group>"; };
 		4C71BCB62167B79C00B4CBDA /* MPPluginVersionComparator.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPPluginVersionComparator.m; sourceTree = "<group>"; };
@@ -634,7 +623,6 @@
 		4C76155F1764C0590015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/GeneralPreferences.xib; sourceTree = "<group>"; };
 		4C7615601764C05A0015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		4C76156B1764C0C80015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PasswordInputView.xib; sourceTree = "<group>"; };
-		4C76156C1764C0CC0015A1A6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PasswordInputView.strings; sourceTree = "<group>"; };
 		4C7615701764C0E80015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/InspectorView.xib; sourceTree = "<group>"; };
 		4C7615751764C4A40015A1A6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PasswordInputView.strings; sourceTree = "<group>"; };
 		4C7615771764C4A40015A1A6 /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; lineEnding = 0; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.simpleColoring; };
@@ -660,7 +648,6 @@
 		4C77E37415B84A240093A587 /* MacPass-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MacPass-Prefix.pch"; sourceTree = "<group>"; };
 		4C77E37815B84A240093A587 /* MPAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAppDelegate.h; sourceTree = "<group>"; };
 		4C77E37915B84A240093A587 /* MPAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAppDelegate.m; sourceTree = "<group>"; };
-		4C79B6401FB0562D008250D8 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/ReferenceBuilderView.strings; sourceTree = "<group>"; };
 		4C7ABA4317BAEC6700FF5799 /* 15_ScannerTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 15_ScannerTemplate.pdf; sourceTree = "<group>"; };
 		4C7ABA4417BAEC6700FF5799 /* 16_BrowserTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 16_BrowserTemplate.pdf; sourceTree = "<group>"; };
 		4C7ABA4517BAEC6700FF5799 /* 17_CDRomTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 17_CDRomTemplate.pdf; sourceTree = "<group>"; };
@@ -690,7 +677,6 @@
 		4C7F8B761A10B69400CCB83D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/WelcomeView.strings"; sourceTree = "<group>"; };
 		4C7F8B781A10B69500CCB83D /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WelcomeView.strings; sourceTree = "<group>"; };
 		4C7F8B7A1A10B69700CCB83D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/WelcomeView.strings; sourceTree = "<group>"; };
-		4C7F8B7C1A10B69800CCB83D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/WelcomeView.strings; sourceTree = "<group>"; };
 		4C8030491E2FBAA300133E4C /* MPTestKeyMapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTestKeyMapper.m; sourceTree = "<group>"; };
 		4C81867B216664C70068DAFB /* MPPluginRepositoryItemVersionInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPluginRepositoryItemVersionInfo.h; sourceTree = "<group>"; };
 		4C81867C216664C70068DAFB /* MPPluginRepositoryItemVersionInfo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPPluginRepositoryItemVersionInfo.m; sourceTree = "<group>"; };
@@ -744,8 +730,6 @@
 		4C8F0C771FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSString+MPPrettyPasswordDisplay.h"; sourceTree = "<group>"; };
 		4C8F0C781FD05A6A00BE157F /* NSString+MPPrettyPasswordDisplay.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSString+MPPrettyPasswordDisplay.m"; sourceTree = "<group>"; };
 		4C8FB9FA1FC2D0EF003691AA /* MPPlugin_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPlugin_Private.h; sourceTree = "<group>"; };
-		4C93C5701FBDFEF700F36855 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AutotypeCandidateSelectionView.strings; sourceTree = "<group>"; };
-		4C93C5711FBDFEF900F36855 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AutotypeBuilderView.strings; sourceTree = "<group>"; };
 		4C978E0C19AE54AB003067DF /* MPFlagsHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPFlagsHelper.m; sourceTree = "<group>"; };
 		4C97CCEF1FA727DC00E58F8C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		4C9BFFF91FD19B5400264B16 /* MPPrettyPasswordTransformer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPrettyPasswordTransformer.h; sourceTree = "<group>"; };
@@ -766,7 +750,6 @@
 		4CA182761F96512800DD4A4A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PluginPreferences.strings; sourceTree = "<group>"; };
 		4CA182771F96512800DD4A4A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/ReferenceBuilderView.strings; sourceTree = "<group>"; };
 		4CA182791F96523600DD4A4A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DuplicateEntryOptionsWindow.xib; sourceTree = "<group>"; };
-		4CA1827C1F96524100DD4A4A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/DuplicateEntryOptionsWindow.strings; sourceTree = "<group>"; };
 		4CA1827E1F96524400DD4A4A /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/DuplicateEntryOptionsWindow.strings; sourceTree = "<group>"; };
 		4CA182801F96524600DD4A4A /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/DuplicateEntryOptionsWindow.strings; sourceTree = "<group>"; };
 		4CA182821F96524B00DD4A4A /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/DuplicateEntryOptionsWindow.strings"; sourceTree = "<group>"; };
@@ -809,7 +792,6 @@
 		4CC6DB7917D23719002C6091 /* KPKNode+IconImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KPKNode+IconImage.m"; sourceTree = "<group>"; };
 		4CCA7EEC1797866F00B0B55E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/GeneralPreferences.strings; sourceTree = "<group>"; };
 		4CCA8E9A18D91ED9001A6754 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = System/Library/Frameworks/Quartz.framework; sourceTree = SDKROOT; };
-		4CCCE532230ACB73009B3D4D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/AutotypeDoctorReportViewController.strings; sourceTree = "<group>"; };
 		4CCCE7FF1D75CA48006AA951 /* MPArrayController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPArrayController.h; sourceTree = "<group>"; };
 		4CCCE8001D75CA48006AA951 /* MPArrayController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPArrayController.m; sourceTree = "<group>"; };
 		4CCEDE28179F203B008402BE /* MPOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineView.h; sourceTree = "<group>"; };
@@ -877,7 +859,6 @@
 		4CF5BE6B1BF33E3000048505 /* NSApplication+MPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSApplication+MPAdditions.h"; sourceTree = "<group>"; };
 		4CF5BE6C1BF33E3000048505 /* NSApplication+MPAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSApplication+MPAdditions.m"; sourceTree = "<group>"; };
 		4CF6653920E67A140008A25C /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PluginDataView.xib; sourceTree = "<group>"; };
-		4CF6653C20E67A180008A25C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PluginDataView.strings; sourceTree = "<group>"; };
 		4CF6653E20E67A1A0008A25C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PluginDataView.strings; sourceTree = "<group>"; };
 		4CF6C3001FBF39BF0055AD03 /* MPPluginTabelCellView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPPluginTabelCellView.h; sourceTree = "<group>"; };
 		4CF6C3011FBF39BF0055AD03 /* MPPluginTabelCellView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPPluginTabelCellView.m; sourceTree = "<group>"; };
@@ -885,7 +866,6 @@
 		4CF6C710176F4533007A811D /* MPStringLengthValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPStringLengthValueTransformer.m; sourceTree = "<group>"; };
 		4CF78062176E75AD0032EE71 /* MPIntegrationPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPIntegrationPreferencesController.h; sourceTree = "<group>"; };
 		4CF78063176E75AD0032EE71 /* MPIntegrationPreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPIntegrationPreferencesController.m; sourceTree = "<group>"; };
-		4CF7CCA12211AFD400F6D5A0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PluginPreferences.strings; sourceTree = "<group>"; };
 		4CFB18E218A17FA20097A34B /* MPUpdatePreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPUpdatePreferencesController.h; sourceTree = "<group>"; };
 		4CFB18E318A17FA20097A34B /* MPUpdatePreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUpdatePreferencesController.m; sourceTree = "<group>"; };
 		4CFC53BD16E94729007396BE /* MPShadowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPShadowBox.h; sourceTree = "<group>"; };
@@ -899,11 +879,9 @@
 		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>"; };
@@ -914,22 +892,18 @@
 		6021FE6718E15D9A00C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/WorkflowPreferences.strings; sourceTree = "<group>"; };
 		6021FE6918E15D9B00C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WorkflowPreferences.strings; sourceTree = "<group>"; };
 		6021FE6D18E15E6D00C3BC51 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UpdatePreferences.xib; sourceTree = "<group>"; };
-		6021FE7018E15E7400C3BC51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/UpdatePreferences.strings; sourceTree = "<group>"; };
 		6021FE7218E15E7700C3BC51 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/UpdatePreferences.strings; sourceTree = "<group>"; };
 		6021FE7418E15E7900C3BC51 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UpdatePreferences.strings; sourceTree = "<group>"; };
 		6021FE7618E15E7B00C3BC51 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/UpdatePreferences.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>"; };
@@ -973,7 +947,6 @@
 		7837112B22553B1D009BD28D /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AutotypeBuilderView.strings; sourceTree = "<group>"; };
 		7837112D225540D1009BD28D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PluginRepositoryBrowserView.xib; sourceTree = "<group>"; };
 		78371130225540D8009BD28D /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/PluginRepositoryBrowserView.strings; sourceTree = "<group>"; };
-		78371132225540DE009BD28D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/PluginRepositoryBrowserView.strings; sourceTree = "<group>"; };
 		78E1F8AF22E3A3DF00E738AE /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/IntegrationPreferences.strings; sourceTree = "<group>"; };
 		78E1F8B122E3A5D600E738AE /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/AutotypeDoctorReportViewController.xib; sourceTree = "<group>"; };
 		78E1F8B422E3A5DB00E738AE /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AutotypeDoctorReportViewController.strings; sourceTree = "<group>"; };
@@ -2192,7 +2165,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				4C0B5339205C1516003D277E /* Base */,
-				4C0B533C205C151D003D277E /* en */,
 				4C0B533E205C1526003D277E /* de */,
 				6A74B0752076F4B50049BC29 /* sv-SE */,
 				4C272A282224871900186EEC /* nl */,
@@ -2207,7 +2179,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				4C0B5340205C1561003D277E /* Base */,
-				4C0B5343205C1563003D277E /* en */,
 				4C0B5345205C1567003D277E /* de */,
 				6A74B0762076F4B50049BC29 /* sv-SE */,
 				A50AD5D0212884A0007C85EB /* pl */,
@@ -2232,7 +2203,6 @@
 				4CA182761F96512800DD4A4A /* de */,
 				4C8C10061FC489D8003DDD5E /* nl */,
 				6A74B0692076F4B40049BC29 /* sv-SE */,
-				4CF7CCA12211AFD400F6D5A0 /* en */,
 			);
 			name = PluginPreferences.xib;
 			sourceTree = "<group>";
@@ -2241,7 +2211,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				4C0F04422147FB49000B8568 /* Base */,
-				4C0F04452147FB4D000B8568 /* en */,
 				4C0F04472147FB4E000B8568 /* de */,
 				4C272A2A2224871900186EEC /* nl */,
 				4C1D56332271F4BC00C3E594 /* fr */,
@@ -2256,7 +2225,6 @@
 			children = (
 				4C17D11F2250EFBC00C650C4 /* Base */,
 				4C17D1222250EFBF00C650C4 /* de */,
-				4C17D1242250EFC500C650C4 /* en */,
 				4C17D1262250EFC900C650C4 /* nl */,
 				7837112922553A74009BD28D /* ru */,
 				4C1D56342271F4BC00C3E594 /* fr */,
@@ -2285,7 +2253,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				4C6DCC461FA2457900C8AD3F /* Base */,
-				4C6DCC491FA2457C00C8AD3F /* en */,
 				4C6DCC4B1FA2457D00C8AD3F /* de */,
 				4C6DCC4D1FA2457E00C8AD3F /* fr */,
 				4C6DCC4F1FA2457F00C8AD3F /* zh-Hans */,
@@ -2307,7 +2274,6 @@
 				4C7155E61A10DB7600979307 /* zh-Hans */,
 				4C7155E81A10DB7700979307 /* fr */,
 				4C7155EA1A10DB7800979307 /* de */,
-				4C7155EC1A10DB7900979307 /* en */,
 				FA638D1C1C39BFCC00B10CC6 /* ru */,
 				4825CC8F1C414D58003E37E9 /* it */,
 				4C840C521D773E5E0081F605 /* pl */,
@@ -2330,7 +2296,6 @@
 				4C840C471D773E5D0081F605 /* pl */,
 				4C4161041F50333B003BC0AF /* es */,
 				6A74B0652076F4B40049BC29 /* sv-SE */,
-				4C4B2ED022D8C9B400EB6BFD /* en */,
 			);
 			name = GeneralPreferences.xib;
 			sourceTree = "<group>";
@@ -2339,7 +2304,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				4C76156B1764C0C80015A1A6 /* Base */,
-				4C76156C1764C0CC0015A1A6 /* en */,
 				4C7615751764C4A40015A1A6 /* de */,
 				4C5CD34717D1591A000B7F38 /* fr */,
 				601F811318E016340028F3DE /* zh-Hans */,
@@ -2365,7 +2329,6 @@
 				4825CC8C1C414D58003E37E9 /* it */,
 				4C840C4F1D773E5E0081F605 /* pl */,
 				4C4161091F50333B003BC0AF /* es */,
-				4C5F72851FC4351E00929153 /* en */,
 				6A74B06A2076F4B40049BC29 /* sv-SE */,
 			);
 			name = InspectorView.xib;
@@ -2395,7 +2358,6 @@
 				4C5CD34617D15912000B7F38 /* fr */,
 				601F811218E016340028F3DE /* zh-Hans */,
 				BD6C365C19484CF40089EB37 /* nl */,
-				4C21F29D195B39B9002D610D /* en */,
 				4C21F29F195B3A48002D610D /* de */,
 				FA638D161C39BFCC00B10CC6 /* ru */,
 				4825CC891C414D57003E37E9 /* it */,
@@ -2414,7 +2376,6 @@
 				4C7F8B761A10B69400CCB83D /* zh-Hans */,
 				4C7F8B781A10B69500CCB83D /* fr */,
 				4C7F8B7A1A10B69700CCB83D /* de */,
-				4C7F8B7C1A10B69800CCB83D /* en */,
 				FA638D101C39BFCB00B10CC6 /* ru */,
 				4825CC831C414D57003E37E9 /* it */,
 				4C840C461D773E5D0081F605 /* pl */,
@@ -2445,7 +2406,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				4CA182791F96523600DD4A4A /* Base */,
-				4CA1827C1F96524100DD4A4A /* en */,
 				4CA1827E1F96524400DD4A4A /* de */,
 				4CA182801F96524600DD4A4A /* fr */,
 				4CA182821F96524B00DD4A4A /* zh-Hans */,
@@ -2476,7 +2436,6 @@
 				4C840C541D773E5E0081F605 /* pl */,
 				4C4161101F50333C003BC0AF /* es */,
 				4CA182771F96512800DD4A4A /* de */,
-				4C79B6401FB0562D008250D8 /* en */,
 				BB3E050E1FE9D1CC00F0B46F /* nl */,
 				6A74B0722076F4B50049BC29 /* sv-SE */,
 				4C1D56362271F4BC00C3E594 /* fr */,
@@ -2488,7 +2447,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				4CF6653920E67A140008A25C /* Base */,
-				4CF6653C20E67A180008A25C /* en */,
 				4CF6653E20E67A1A0008A25C /* de */,
 				A50AD5CF212884A0007C85EB /* pl */,
 				4C272A292224871900186EEC /* nl */,
@@ -2504,7 +2462,6 @@
 			children = (
 				6021FE3C18E1341900C3BC51 /* Base */,
 				6021FE4418E1342500C3BC51 /* zh-Hans */,
-				6021FE4618E1344A00C3BC51 /* en */,
 				6021FE4818E1356800C3BC51 /* de */,
 				6021FE4A18E1356B00C3BC51 /* fr */,
 				BD6C366119484CF40089EB37 /* nl */,
@@ -2521,7 +2478,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				6021FE4C18E13F1D00C3BC51 /* Base */,
-				6021FE4F18E13F2500C3BC51 /* en */,
 				6021FE5118E13F2700C3BC51 /* de */,
 				6021FE5318E13F2900C3BC51 /* fr */,
 				6021FE5518E13F2A00C3BC51 /* zh-Hans */,
@@ -2547,7 +2503,6 @@
 				60ECAD271F12262400EA9DB3 /* zh-Hans */,
 				4C4161051F50333B003BC0AF /* es */,
 				6A74B0662076F4B40049BC29 /* sv-SE */,
-				4C4B2ED522D8D3B100EB6BFD /* en */,
 				78E1F8AF22E3A3DF00E738AE /* ru */,
 			);
 			name = IntegrationPreferences.xib;
@@ -2566,7 +2521,6 @@
 				60ECAD251F12253C00EA9DB3 /* zh-Hans */,
 				4C4161061F50333B003BC0AF /* es */,
 				6A74B0672076F4B40049BC29 /* sv-SE */,
-				4C4B2ED822D8D40200EB6BFD /* en */,
 			);
 			name = WorkflowPreferences.xib;
 			sourceTree = "<group>";
@@ -2575,7 +2529,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				6021FE6D18E15E6D00C3BC51 /* Base */,
-				6021FE7018E15E7400C3BC51 /* en */,
 				6021FE7218E15E7700C3BC51 /* de */,
 				6021FE7418E15E7900C3BC51 /* fr */,
 				6021FE7618E15E7B00C3BC51 /* zh-Hans */,
@@ -2593,7 +2546,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				6021FE7818E15FF300C3BC51 /* Base */,
-				6021FE7B18E15FFD00C3BC51 /* en */,
 				6021FE7D18E15FFF00C3BC51 /* de */,
 				6021FE7F18E1600000C3BC51 /* fr */,
 				6021FE8118E1600200C3BC51 /* zh-Hans */,
@@ -2611,7 +2563,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				6021FE8318E160BC00C3BC51 /* Base */,
-				6021FE8618E160C700C3BC51 /* en */,
 				6021FE8818E160C800C3BC51 /* de */,
 				6021FE8A18E160C900C3BC51 /* fr */,
 				6021FE8C18E160CB00C3BC51 /* zh-Hans */,
@@ -2629,7 +2580,6 @@
 			isa = PBXVariantGroup;
 			children = (
 				6021FE8E18E1617300C3BC51 /* Base */,
-				6021FE9118E1617A00C3BC51 /* en */,
 				6021FE9318E1617C00C3BC51 /* de */,
 				6021FE9518E1617D00C3BC51 /* fr */,
 				6021FE9718E1617E00C3BC51 /* zh-Hans */,
@@ -2656,7 +2606,6 @@
 				4C840C441D773E5D0081F605 /* pl */,
 				4C4161021F50333B003BC0AF /* es */,
 				6A74B0622076F4B30049BC29 /* sv-SE */,
-				4C4B2ED322D8D31F00EB6BFD /* en */,
 			);
 			name = DatabaseSettingsWindow.xib;
 			sourceTree = "<group>";
@@ -2666,7 +2615,6 @@
 			children = (
 				7837112D225540D1009BD28D /* Base */,
 				78371130225540D8009BD28D /* ru */,
-				78371132225540DE009BD28D /* en */,
 				4C1D56382271F4BC00C3E594 /* fr */,
 				4C4B2ED122D8CA6100EB6BFD /* de */,
 				A083E28022DF467B0020E0D5 /* es */,
@@ -2679,7 +2627,7 @@
 			children = (
 				78E1F8B122E3A5D600E738AE /* Base */,
 				78E1F8B422E3A5DB00E738AE /* ru */,
-				4CCCE532230ACB73009B3D4D /* en */,
+				4C1888CF230FBC080054A38F /* de */,
 			);
 			name = AutotypeDoctorReportViewController.xib;
 			sourceTree = "<group>";
@@ -2705,7 +2653,6 @@
 				FA9FD3281FB5E8F4003CEDD6 /* Base */,
 				FA9FD32B1FB5E8FD003CEDD6 /* pl */,
 				4C73EB951FBB5A8F0033000F /* de */,
-				4C93C5701FBDFEF700F36855 /* en */,
 				BB3E050C1FE9D1CA00F0B46F /* nl */,
 				6A74B0742076F4B50049BC29 /* sv-SE */,
 				4C1D56322271F4BC00C3E594 /* fr */,
@@ -2721,7 +2668,6 @@
 				FA9FD32D1FB5EDD3003CEDD6 /* Base */,
 				FA9FD32F1FB5EDDE003CEDD6 /* pl */,
 				4C73EB961FBB5A910033000F /* de */,
-				4C93C5711FBDFEF900F36855 /* en */,
 				BB3E050F1FE9D1CD00F0B46F /* nl */,
 				6A74B0732076F4B50049BC29 /* sv-SE */,
 				7837112B22553B1D009BD28D /* ru */,
diff --git a/MacPass/Base.lproj/DatabaseSettingsWindow.xib b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
index fe6f5b03..969e6b5c 100644
--- a/MacPass/Base.lproj/DatabaseSettingsWindow.xib
+++ b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
@@ -159,7 +159,7 @@ Gw
                                             <rect key="frame" x="154" y="117" width="280" height="100"/>
                                             <clipView key="contentView" drawsBackground="NO" id="WOI-1v-RCe">
                                                 <rect key="frame" x="1" y="1" width="278" height="98"/>
-                                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                                <autoresizingMask key="autoresizingMask"/>
                                                 <subviews>
                                                     <textView importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" spellingCorrection="YES" smartInsertDelete="YES" id="1531">
                                                         <rect key="frame" x="0.0" y="0.0" width="278" height="98"/>
diff --git a/MacPass/Base.lproj/WorkflowPreferences.xib b/MacPass/Base.lproj/WorkflowPreferences.xib
index cbadd50d..66372731 100644
--- a/MacPass/Base.lproj/WorkflowPreferences.xib
+++ b/MacPass/Base.lproj/WorkflowPreferences.xib
@@ -140,8 +140,8 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vT4-wF-ned">
-                                <rect key="frame" x="18" y="18" width="283" height="18"/>
-                                <buttonCell key="cell" type="check" title="Hide application after copying to clipboard " bezelStyle="regularSquare" imagePosition="left" inset="2" id="1Vr-nY-Ogv">
+                                <rect key="frame" x="18" y="18" width="280" height="18"/>
+                                <buttonCell key="cell" type="check" title="Hide application after copying to clipboard" bezelStyle="regularSquare" imagePosition="left" inset="2" id="1Vr-nY-Ogv">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib
index 49079d6d..d6fcbc59 100644
--- a/MacPass/EntryView.xib
+++ b/MacPass/EntryView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
diff --git a/MacPass/MPActionHelper.h b/MacPass/MPActionHelper.h
index 2d35e7df..98c22f76 100644
--- a/MacPass/MPActionHelper.h
+++ b/MacPass/MPActionHelper.h
@@ -28,6 +28,7 @@ typedef NS_ENUM(NSUInteger, MPActionType) {
   MPActionAddGroup, // Add a new group
   MPActionDuplicateEntry, // Simply duplicate an entry (including history)
   MPActionDuplicateEntryWithOptions, // Request user input on what to duplicate
+  MPActionDuplicateGroup, // Duplicate the group and all it's children
   MPActionReverToHistoryEntry, // Restore an entry to an older state in history
   MPActionDelete, // Delete entry or group
   MPActionCopyUsername, // copy username to pasteboard
diff --git a/MacPass/MPActionHelper.m b/MacPass/MPActionHelper.m
index dca564ec..69b405a9 100644
--- a/MacPass/MPActionHelper.m
+++ b/MacPass/MPActionHelper.m
@@ -38,6 +38,7 @@
                    @(MPActionAddGroup):                         NSStringFromSelector(@selector(createGroup:)),
                    @(MPActionDuplicateEntry):                   NSStringFromSelector(@selector(duplicateEntry:)),
                    @(MPActionDuplicateEntryWithOptions):        NSStringFromSelector(@selector(duplicateEntryWithOptions:)),
+                   @(MPActionDuplicateGroup):                   NSStringFromSelector(@selector(duplicateGroup:)),
                    @(MPActionReverToHistoryEntry):              NSStringFromSelector(@selector(revertToHistoryEntry:)),
                    @(MPActionCopyPassword):                     NSStringFromSelector(@selector(copyPassword:)),
                    @(MPActionCopyURL):                          NSStringFromSelector(@selector(copyURL:)),
diff --git a/MacPass/MPContextMenuHelper.h b/MacPass/MPContextMenuHelper.h
index a6072221..9d46358b 100644
--- a/MacPass/MPContextMenuHelper.h
+++ b/MacPass/MPContextMenuHelper.h
@@ -31,7 +31,7 @@ typedef NS_OPTIONS(NSUInteger, MPContextMenuItemsFlags) {
   MPContextMenuAutotype           = 1 << 5,
   MPContextMenuHistory            = 1 << 6,
   MPContextMenuShowGroupInOutline = 1 << 7,
-  MPContextMenuMinimal            = MPContextMenuCreate | MPContextMenuDelete,
+  MPContextMenuMinimal            = MPContextMenuCreate | MPContextMenuDelete | MPContextMenuDuplicate,
   MPContextMenuFull               = MPContextMenuMinimal | MPContextMenuCopy | MPContextMenuDuplicate | MPContextMenuAutotype | MPContextMenuHistory,
   MPContextMenuExtended           = MPContextMenuFull | MPContextMenuTrash
 };
diff --git a/MacPass/MPContextMenuHelper.m b/MacPass/MPContextMenuHelper.m
index 058cbb60..7304dc91 100644
--- a/MacPass/MPContextMenuHelper.m
+++ b/MacPass/MPContextMenuHelper.m
@@ -64,8 +64,11 @@ static void MPContextmenuHelperBeginSection(NSMutableArray *items) {
     NSMenuItem *duplicateEntyWithOptions = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"DUPLICATE_ENTRY_WITH_OPTIONS", @"Menu item to duplicate an entry with options how to duplicate. Will present a dialog.")
                                                                       action:[MPActionHelper actionOfType:MPActionDuplicateEntryWithOptions]
                                                                keyEquivalent:@""];
-    
-    [items addObjectsFromArray:@[ duplicateEntry, duplicateEntyWithOptions ]];
+    NSMenuItem *duplicateGroup = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"DUPLICATE_GROUP", @"Menu item to directly diplicate a group")
+                                                            action:[MPActionHelper actionOfType:MPActionDuplicateGroup]
+                                                     keyEquivalent:@""];
+
+    [items addObjectsFromArray:@[ duplicateEntry, duplicateEntyWithOptions, duplicateGroup ]];
     
   }
   if(insertDelete || insertTrash) {
diff --git a/MacPass/MPDocument.h b/MacPass/MPDocument.h
index ce09967d..469e2a59 100644
--- a/MacPass/MPDocument.h
+++ b/MacPass/MPDocument.h
@@ -165,7 +165,6 @@ FOUNDATION_EXPORT NSString *const MPDocumentGroupKey;
 - (void)deleteNode:(KPKNode *)node;
 - (void)duplicateEntryWithOptions:(KPKCopyOptions)options;
 
-
 #pragma mark Actions
 /**
  *  Empties the Trash group. Removing all Groups and Entries inside. This action is not undo-able
@@ -179,6 +178,7 @@ FOUNDATION_EXPORT NSString *const MPDocumentGroupKey;
  */
 - (IBAction)createEntryFromTemplate:(id)sender;
 - (IBAction)duplicateEntry:(id)sender;
+- (IBAction)duplicateGroup:(id)sender;
 
 @end
 
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index d6a54948..574bff14 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -828,7 +828,16 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
     KPKEntry *duplicate = [entry copyWithTitle:nil options:options];
     [duplicate addToGroup:entry.parent];
   }
-  [self.undoManager setActionName:[NSString stringWithFormat:NSLocalizedString(@"DUPLICATE_ENTRIES_%ld", @"Action name for duplicating entries"), self.selectedEntries.count]];
+  [self.undoManager setActionName:[NSString stringWithFormat:NSLocalizedString(@"DUPLICATE_ENTRIES_ACTION_NAME", @"Action name for duplicating entries"), self.selectedEntries.count]];
+}
+
+- (void)duplicateGroup:(id)sender {
+  for(KPKGroup *group in self.selectedGroups) {
+    KPKGroup *duplicate = [group copyWithTitle:nil options:kKPKCopyOptionNone];
+    /* if group is root group, add the duplicate below */
+    [duplicate addToGroup:(group.parent ? group.parent : group)];
+  }
+  [self.undoManager setActionName:[NSString stringWithFormat:NSLocalizedString(@"DUPLICATE_GROUPS_ACTION_NAME", @"Action name for duplicating groups"), self.selectedGroups.count]];
 }
 
 #pragma mark Validation
@@ -886,6 +895,9 @@ NSString *const MPDocumentGroupKey                            = @"MPDocumentGrou
       valid &= targetEntries.count > 0;
       valid &= !self.historyEntry;
       break;
+    case MPActionDuplicateGroup:
+      valid &= targetGroups.count > 0;
+      break;
     case MPActionEmptyTrash:
       valid &= (self.trash.groups.count + self.trash.entries.count) > 0;
       break;
diff --git a/MacPass/MPOutlineContextMenuDelegate.m b/MacPass/MPOutlineContextMenuDelegate.m
index 5f1ce530..0165b19b 100644
--- a/MacPass/MPOutlineContextMenuDelegate.m
+++ b/MacPass/MPOutlineContextMenuDelegate.m
@@ -57,7 +57,7 @@ NSString *const _MPOutlineMenuTemplate = @"Template";
   
   if( [item isKindOfClass:KPKGroup.class]) {
     KPKGroup *group = (KPKGroup *)item;
-    MPDocument *document = [NSDocumentController sharedDocumentController].currentDocument;
+    MPDocument *document = NSDocumentController.sharedDocumentController.currentDocument;
     if(group && document.root == group ) {
       
     }
diff --git a/MacPass/en.lproj/AutotypeDoctorReportViewController.strings b/MacPass/de.lproj/AutotypeDoctorReportViewController.strings
similarity index 53%
rename from MacPass/en.lproj/AutotypeDoctorReportViewController.strings
rename to MacPass/de.lproj/AutotypeDoctorReportViewController.strings
index b5a81f3d..f9a0d592 100644
--- a/MacPass/en.lproj/AutotypeDoctorReportViewController.strings
+++ b/MacPass/de.lproj/AutotypeDoctorReportViewController.strings
@@ -1,18 +1,18 @@
-
 /* Class = "NSTextFieldCell"; title = "MacPass will send key press events to the system when Autotype or Global Autotype is executed. Since macOS 10.14 Mojave this is only possible, if Accessibility permissions are granted to the application."; ObjectID = "6GI-KJ-Xue"; */
-"6GI-KJ-Xue.title" = "MacPass will send key press events to the system when Autotype or Global Autotype is executed. Since macOS 10.14 Mojave this is only possible, if Accessibility permissions are granted to the application.";
+"6GI-KJ-Xue.title" = "MacPass sendet Tastendrücke an das System, wenn Autotype oder Global Autotype ausgeführt wird. Seit macOS 10.14 Mojave ist dies nur noch möglich, wenn der Anwendung Berechtigung zur Bedienungshilfe erteilt wurden.";
 
 /* Class = "NSTextFieldCell"; title = "MacPass will read every window title when Global Autotype is executed to find a match. Since macOS 10.15 Catalina it is not possible to read any window title, if the user has not granted permissions to record the screen. If you are running macOS 10.15 or higher, MacPass will check if it can read every window title of currently visible windows. This test will not read the actual title. The titles aren't stored or processed in any way."; ObjectID = "7of-1z-Nfk"; */
-"7of-1z-Nfk.title" = "MacPass will read every window title when Global Autotype is executed to find a match. Since macOS 10.15 Catalina it is not possible to read any window title, if the user has not granted permissions to record the screen. If you are running macOS 10.15 or higher, MacPass will check if it can read every window title of currently visible windows. This test will not read the actual title. The titles aren't stored or processed in any way.";
+"7of-1z-Nfk.title" = "MacPass liest jeden Fenstertitel, wenn Global Autotype ausgeführt wird, um eine Übereinstimmung zu finden. Seit macOS 10.15 Catalina ist es nicht mehr möglich, einen Fenstertitel zu lesen, wenn der Benutzer keine Berechtigung zur Aufzeichnung des Bildschirms erteilt hat. Wenn Sie macOS 10.15 oder höher verwenden, wird MacPass prüfen, ob es jeden Fenstertitel der aktuell sichtbaren Fenster lesen kann. Dieser Test liest weder den aktuellen Titel, noch wird dieser gespeichert oder verarbeitet.";
 
 /* Class = "NSButtonCell"; title = "Open Accessibilty Preferences…"; ObjectID = "8m1-vs-pd5"; */
-"8m1-vs-pd5.title" = "Open Accessibilty Preferences…";
+"8m1-vs-pd5.title" = "Einstellungen zu Bedienungshilfen öffnen …";
 
 /* Class = "NSTextFieldCell"; title = "Screen Recording"; ObjectID = "9gr-mz-2I4"; */
-"9gr-mz-2I4.title" = "Screen Recording";
+"9gr-mz-2I4.title" = "Bildschirmaufzeichnung";
 
 /* Class = "NSTextFieldCell"; title = "Accessibility"; ObjectID = "aIL-8W-63g"; */
-"aIL-8W-63g.title" = "Accessibility";
+"aIL-8W-63g.title" = "Bedienungshilfen";
 
 /* Class = "NSButtonCell"; title = "Open Screen Recording Preferences…"; ObjectID = "lgB-Ys-L9R"; */
-"lgB-Ys-L9R.title" = "Open Screen Recording Preferences…";
+"lgB-Ys-L9R.title" = "Bildschirmaufzeichnungseinstellungen öffnen …";
+
diff --git a/MacPass/de.lproj/DuplicateEntryOptionsWindow.strings b/MacPass/de.lproj/DuplicateEntryOptionsWindow.strings
index 4d66cab8..e84f2bd3 100644
--- a/MacPass/de.lproj/DuplicateEntryOptionsWindow.strings
+++ b/MacPass/de.lproj/DuplicateEntryOptionsWindow.strings
@@ -5,7 +5,7 @@
 "dXl-KS-4rE.title" = "Historie duplizieren";
 
 /* Class = "NSButtonCell"; title = "Reference username instead of copying it"; ObjectID = "O9X-XH-n8o"; */
-"O9X-XH-n8o.title" = "Nutzernamen als Referenz statt Kopie ";
+"O9X-XH-n8o.title" = "Nutzernamen als Referenz statt Kopie";
 
 /* Class = "NSWindow"; title = "Duplicate Entry Options"; ObjectID = "QvC-M9-y7g"; */
 "QvC-M9-y7g.title" = "Window";
diff --git a/MacPass/de.lproj/GeneralPreferences.strings b/MacPass/de.lproj/GeneralPreferences.strings
index d4d583f8..1535c89a 100644
--- a/MacPass/de.lproj/GeneralPreferences.strings
+++ b/MacPass/de.lproj/GeneralPreferences.strings
@@ -32,7 +32,7 @@
 "531.title" = "Letzte Datenbank beim Start wieder öffnen";
 
 /* Class = "NSMenu"; title = "LockTimes"; ObjectID = "586"; */
-"586.title" = "LockTimes";
+"586.title" = "Sperrzeiten";
 
 /* Class = "NSMenuItem"; title = "for 1 Minute"; ObjectID = "588"; */
 "588.title" = "für 1 Minute";
@@ -65,7 +65,7 @@
 "fNy-mS-phi.title" = "Universelle Zwischenablage";
 
 /* Class = "NSTextFieldCell"; title = "Disabling this compromises security. If enabled, anything copied to the Clipboard in MacPass will be available on your connected iOS devices. You should clear the clipboard on those devices manually."; ObjectID = "JGX-Tp-KJk"; */
-"JGX-Tp-KJk.title" = "Das Ausschalten dieser Option beeinträchtigt die Sicherheit. Wird diese Option deaktiviert, werden alle Daten, die von MacPass in die Zwischenablage kopiert werden it verbundenen iOS Geräten synchronisiert. Die Zwischenablage sollte dann manuell auf diesen Geräten geleert werden.";
+"JGX-Tp-KJk.title" = "Das Ausschalten dieser Option beeinträchtigt die Sicherheit. Wird diese Option deaktiviert, werden alle Daten, die von MacPass in die Zwischenablage kopiert werden mit verbundenen iOS Geräten synchronisiert. Die Zwischenablage sollte dann manuell auf diesen Geräten geleert werden.";
 
 /* Class = "NSTextFieldCell"; title = "If file changes:"; ObjectID = "QrK-hM-Xt1"; */
 "QrK-hM-Xt1.title" = "Bei Dateiänderungen:";
diff --git a/MacPass/de.lproj/InfoPlist.strings b/MacPass/de.lproj/InfoPlist.strings
index 56323c87..b89aecef 100644
--- a/MacPass/de.lproj/InfoPlist.strings
+++ b/MacPass/de.lproj/InfoPlist.strings
@@ -1,3 +1,6 @@
+/* Bundle name */
+"CFBundleName" = "MacPass";
+
 /* (No Comment) */
 "KDB Database" = "KDB Datenbank";
 
diff --git a/MacPass/de.lproj/IntegrationPreferences.strings b/MacPass/de.lproj/IntegrationPreferences.strings
index a926f27e..7b08a00b 100644
--- a/MacPass/de.lproj/IntegrationPreferences.strings
+++ b/MacPass/de.lproj/IntegrationPreferences.strings
@@ -8,7 +8,7 @@
 "B1D-j9-L8x.title" = "URL-Host beim Suchen von Einträgen berücksichtigen";
 
 /* Class = "NSButtonCell"; title = "Enable Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
-"ERs-ct-Eyx.title" = "Quicklook Preview aktivieren";
+"ERs-ct-Eyx.title" = "Quicklook-Vorschau aktivieren";
 
 /* Class = "NSTextFieldCell"; title = "Autotype might not work properly. Some issues where found that prevent Autotype or Global Autotype to work. Please run the Autotype Doctor to fix those issues."; ObjectID = "H37-ku-aTc"; */
 "H37-ku-aTc.title" = "Autotype steht nicht zur Verfügung, da MacPass den Computer nicht steuern darf. Um Autotype zu ermöglichen, fügen Sie MacPass in den Einstellungen zur Privatsphäre zu den Bedienungshilfen hinzu.";
@@ -17,7 +17,7 @@
 "Lxp-wI-yQy.title" = "Der Kurzbefehl ist unvollständig";
 
 /* Class = "NSButtonCell"; title = "Run Autotype Doctor…"; ObjectID = "NP0-R3-m6n"; */
-"NP0-R3-m6n.title" = "Systemeinstellungen öffnen…";
+"NP0-R3-m6n.title" = "Systemeinstellungen öffnen …";
 
 /* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
 "P9N-HM-wER.title" = "Autotype";
@@ -26,7 +26,7 @@
 "QfO-yG-l3F.title" = "^ als ⌘ interpretieren";
 
 /* Class = "NSTextFieldCell"; title = "If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to."; ObjectID = "QRy-CY-ENC"; */
-"QRy-CY-ENC.title" = "Wenn aktiviert, werden {CONTROL} Befehle als ⌘ gesendet. Deaktivieren Sie diese Option nur wenn Sie sich dessen sicher sind.";
+"QRy-CY-ENC.title" = "Wenn aktiviert, werden {CONTROL} Befehle als ⌘ gesendet. Deaktivieren Sie diese Option nur, wenn Sie sich dessen sicher sind.";
 
 /* Class = "NSButtonCell"; title = "Include Entry Tags for matches"; ObjectID = "rbu-G7-MT8"; */
 "rbu-G7-MT8.title" = "Tags beim Suchen von Einträgen berücksichtigen";
@@ -41,5 +41,5 @@
 "VVs-b5-cX9.title" = "Vorschau";
 
 /* Class = "NSTextFieldCell"; title = "If enabled attached files will be copied to a temporary location for preview and deleted after the preview is closed."; ObjectID = "WmI-IB-Aso"; */
-"WmI-IB-Aso.title" = "Die Daten werden zur Vorschau in einen temporären Ordern entschlüsselt und beim Beenden der Vorschau wieder gelöscht. Diese Feature ist eine potentielle Sicherheitslücke!";
+"WmI-IB-Aso.title" = "Die Daten werden zur Vorschau in einem temporären Ordern entschlüsselt und beim Beenden der Vorschau wieder gelöscht. Dieses Feature ist eine potenzielle Sicherheitslücke!";
 
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 71164b2b..1f6ca2d9 100644
--- a/MacPass/de.lproj/Localizable.strings
+++ b/MacPass/de.lproj/Localizable.strings
@@ -41,26 +41,14 @@
 "ALERT_ASK_FOR_PLUGIN_REPOSITORY_ALLOW_DOWNLOAD" = "Aktualisiere Daten online.";
 
 /* Informative text displayed on the alert that shows up when MacPass asks for permssion to download the plugin repository JSON file */
-"ALERT_ASK_FOR_PLUGIN_REPOSITORY_CONNECTION_PERMISSION_INFORMATIVE_TEXT" = "Das Verzeichnis ist auf https://macpassapp.org hinterlegt. MacPass verbindet lädt die Defintionen herunter um sicher zu stellen, dass alle Daten auf dem neusten Stand sind.";
+"ALERT_ASK_FOR_PLUGIN_REPOSITORY_CONNECTION_PERMISSION_INFORMATIVE_TEXT" = "Das Verzeichnis ist auf https://macpassapp.org hinterlegt. MacPass lädt die Definitionen herunter, um sicher zu stellen, dass alle Daten auf dem neusten Stand sind.";
 
-/* Message displayed on the alert that askf for permission to download the plugin repository JSON file */
+/* Message displayed on the alert that asks for permission to download the plugin repository JSON file */
 "ALERT_ASK_FOR_PLUGIN_REPOSITORY_CONNECTION_PERMISSION_MESSAGE" = "MacPass möchte das Pluginverzeichnis aktualisieren.";
 
 /* Disallow the download of the plugin repository file */
 "ALERT_ASK_FOR_PLUGIN_REPOSITORY_DISALLOW_DOWNLOAD" = "Keine Daten herunterladen.";
 
-/* Button in dialog to leave autotype disabled and continiue! */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OK" = "Autotype deaktiviert lassen.";
-
-/* Button in dialog to open accessibilty preferences pane! */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_BUTTON_OPEN_PREFERENCES" = "Systemeinstellung Bedienungshilfen öffnen …";
-
-/* Alert informative text displayed when Autotype performs self check and lacks accessibilty permissions */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_INFORMATIVE_TEXT" = "Das System erlaubt MacPass nicht, Autotype-Tastenbefehle an andere Anwendungen zu schicken. Um Autotype zu ermöglichen fügen Sie MacPass zu den Bedienungshilfen in den Datenschutzeinstellung hinzu. ";
-
-/* Alert message displayed when Autotype performs self check and lacks accessibilty permissions */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_MESSAGE_TEXT" = "MacPass kann Autotype nicht ausführen.";
-
 /* Button in dialog to leave plugin ds disabled and continiue! */
 "ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_BUTTON_OK" = "OK";
 
@@ -89,7 +77,7 @@
 "ALERT_MERGE_KDB_FILE_INFO_TEXT" = "KDB Datenbanken enthalten nicht alle notwendigen Informationen für eine eindeutige Synchronisation. Einzelne Einträgen werden korrekt synchronisiert. Gruppen werden jedoch nur durch den Namens zugeordnet werden, was zu unerwarteten Ergebnissen führen kann. Etwa können lokal bewegte Einträge wieder in alte Gruppen geschoben werden, unbenannte Gruppen können leer werden und die Einträge unter einer Gruppe mit dem vorherigen Namen wieder auftauchen. Weiterhin können gelöschte Einträge wieder auftauchen, da keine Informationen über diese gespeichert wird. Soll mit der Synchronisation fortgefahren werden?";
 
 /* Alert message warning user about KDB file merge */
-"ALERT_MERGE_KDB_FILE_MESSAGE" = "Es werden KDB Datenbanken synchronisiert! ";
+"ALERT_MERGE_KDB_FILE_MESSAGE" = "Es werden KDB Datenbanken synchronisiert!";
 
 /* Alert message text when plugins or their settings change and require a restart */
 "ALERT_MESSAGE_PLUGINS_CHANGED_SUGGEST_RESTART" = "Die globalen Plugineinstellungen haben sich geändert.";
@@ -315,15 +303,15 @@
    Actiontitle for copying groups via drag and drop to antother database */
 "DRAG_GROUP" = "Gruppe verschieben";
 
-/* Action name for duplicating entries */
-"DUPLICATE_ENTRIES_%ld" = "Einträge duplizieren %ld";
-
 /* Menu item to directly diplicate an entry */
 "DUPLICATE_ENTRY" = "Eintrag duplizieren";
 
 /* Menu item to duplicate an entry with options how to duplicate. Will present a dialog. */
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Eintrag duplizieren …";
 
+/* Menu item to directly diplicate a group */
+"DUPLICATE_GROUP" = "Gruppe duplizieren";
+
 /* Menu item in the database outline context menu to change the template group
    Menu item on the add entry context menu to edit template groups */
 "EDIT_TEMPLATE_GROUP" = "Vorlagengruppe bearbeiten";
@@ -356,7 +344,7 @@
 "ERROR_INVALID_PLUGIN" = "Kein MacPass-Plugin";
 
 /* Error description for missing accessibilty permissions */
-"ERROR_NO_ACCESSIBILTY_PERMISSIONS" = "MacPass hat keine Berechtigung den Bildschirminhalt aufzuzeichen.";
+"ERROR_NO_ACCESSIBILTY_PERMISSIONS" = "MacPass hat keine Berechtigung den Bildschirminhalt aufzuzeichnen.";
 
 /* Error description for missing screen recording permissions */
 "ERROR_NO_PERMISSION_TO_RECORD_SCREEN" = "MacPass hat keine Berechtigungen den Bildschirminhalt aufzuzeichnen";
@@ -367,9 +355,6 @@
 /* Passwords do not match, keyfile is invalid */
 "ERROR_PASSWORD_MISSMATCH_INVALID_KEYFILE" = "Passwörter stimmen nicht überein oder die Schlüsseldatei ist ungültig!";
 
-/* Recommend/Enforce key change intervall format */
-"EVERY_%ld_DAYS" = "alle %ld Tage";
-
 /* Format to returen the date an item expires. Includes %@ placehoder for date */
 "EXPIRES_AT_DATE_%@" = "verfällt: %@";
 
@@ -528,7 +513,7 @@
 /* Select Browser */
 "OTHER_BROWSER" = "Browser wählen …";
 
-/* No comment provided by engineer. */
+/* Value field for reference lookup */
 "OUTPUT_VALUE" = "Ausgabewert";
 
 /* Menu item to toggle display of password column in entry table
@@ -560,20 +545,14 @@
 /* Menu item to perform autotype with the selected entry */
 "PERFORM_AUTOTYPE_FOR_ENTRY" = "Auto-Type ausführen";
 
-/* Info about how many character has to pick in pickchar dialog */
-"PICKCHAR_INFO_MESSAGE_PICK_CHARACTERS_%ld" = "Bitte wählen Sie %ld Zeichen aus";
-
 /* Window displayed to the user to pick an amout of characters */
 "PICKCHAR_WINDOW_TITLE" = "Zeichen auswählen";
 
-/* Count of picked characters in pickchars dialog if no limit is set */
-"PICKED_%ld_CHARACTERS" = "%ld Zeichen ausgewählt";
-
 /* Window displayed to the user to pick an amout of characters */
 "PICKFIELD_WINDOW_TITLE" = "Wert auswählen";
 
 /* Label for the button when a download is in progress! */
-"PLUGIN_BROWSER_ACTION_DOWNLOAD_IN_PROGRESS" = "Wird heruntergeladen…";
+"PLUGIN_BROWSER_ACTION_DOWNLOAD_IN_PROGRESS" = "Wird heruntergeladen …";
 
 /* Label for the button when a download did not succeed */
 "PLUGIN_BROWSER_ACTION_RETRY_FAILED_DOWNLOAD" = "Fehler. Erneut herunterladen.";
@@ -669,7 +648,7 @@
 /* Disable search menu item */
 "SEARCH_NO" = "Nicht durchsuchbar";
 
-/* No comment provided by engineer. */
+/* Search field for references lookup */
 "SEARCH_VALUE" = "Suche nach";
 
 /* Enable search menu item */
@@ -696,6 +675,9 @@
 /* Action button in Notification to show the Autotype Doctor */
 "SHOW_AUTOTYPE_DOCTOR" = "Autotype Doktor anzeigen";
 
+/* Menu item to show the entries group in the outline view */
+"SHOW_GROUP_IN_OUTLINE" = "Gruppe in Übersicht anzeigen";
+
 /* Menu item to show the history of the selected entry
    Toolbar item to toggle history display */
 "SHOW_HISTORY" = "Historie anzeigen";
@@ -743,7 +725,7 @@
 "TOUCHBAR_SEARCH" = "Datenbank durchsuchen";
 
 /* Touchbar button label for showing the password */
-"TOUCHBAR_SHOW_PASSWORD" = "Password anzeigen";
+"TOUCHBAR_SHOW_PASSWORD" = "Passwort anzeigen";
 
 /* Touchbar button label for unlocking the database */
 "TOUCHBAR_UNLOCK_DATABASE" = "Datenbank entsperren";
diff --git a/MacPass/de.lproj/Localizable.stringsdict b/MacPass/de.lproj/Localizable.stringsdict
index 37d23e10..3c491ef9 100644
--- a/MacPass/de.lproj/Localizable.stringsdict
+++ b/MacPass/de.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>alle Zeichen ausgewählt</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
@@ -38,6 +38,22 @@
 			<string>Einträge duplizieren</string>
 		</dict>
 	</dict>
+	<key>DUPLICATE_GROUPS_ACTION_NAME</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@groups@</string>
+		<key>groups</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>one</key>
+			<string>Gruppe duplizieren</string>
+			<key>other</key>
+			<string>Gruppen duplizieren</string>
+		</dict>
+	</dict>
 	<key>EVERY_%ld_DAYS</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
diff --git a/MacPass/de.lproj/MainMenu.strings b/MacPass/de.lproj/MainMenu.strings
index 06d44b59..77d01d01 100644
--- a/MacPass/de.lproj/MainMenu.strings
+++ b/MacPass/de.lproj/MainMenu.strings
@@ -143,7 +143,7 @@
 "1200.title" = "Passwortgenerator anzeigen";
 
 /* Class = "NSMenuItem"; title = "Change Master Password…"; ObjectID = "1203"; */
-"1203.title" = "Datenbankpassword ändern …";
+"1203.title" = "Datenbankpasswort ändern …";
 
 /* Class = "NSMenuItem"; title = "Database Settings…"; ObjectID = "1231"; */
 "1231.title" = "Datenbankeinstellungen …";
diff --git a/MacPass/de.lproj/PluginPreferences.strings b/MacPass/de.lproj/PluginPreferences.strings
index 385b15b1..31bbbc8c 100644
--- a/MacPass/de.lproj/PluginPreferences.strings
+++ b/MacPass/de.lproj/PluginPreferences.strings
@@ -7,6 +7,9 @@
 /* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "fug-79-n9g"; */
 "fug-79-n9g.title" = "Table View Cell";
 
+/* Class = "NSTextFieldCell"; title = "If enabled, a remote connection is established to macpassapp.org"; ObjectID = "i3S-9b-Bpf"; */
+"i3S-9b-Bpf.title" = "Sofern aktiviert, wird eine Verbindung zu macpassapp.org hergestellt";
+
 /* Class = "NSTextFieldCell"; title = "Plugin Settings Info"; ObjectID = "OOr-SW-jZb"; */
 "OOr-SW-jZb.title" = "Informationen zu Plugin-Einstellungen";
 
@@ -16,6 +19,9 @@
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "STt-PQ-Szr"; */
 "STt-PQ-Szr.title" = "Text Cell";
 
+/* Class = "NSButtonCell"; title = "Download current plugin information"; ObjectID = "uHR-uL-Ddm"; */
+"uHR-uL-Ddm.title" = "Aktuelle Plugin-Informationen herunterladen";
+
 /* Class = "NSBox"; title = "Box"; ObjectID = "vBs-Ga-aq0"; */
 "vBs-Ga-aq0.title" = "Box";
 
diff --git a/MacPass/de.lproj/PluginRepositoryBrowserView.strings b/MacPass/de.lproj/PluginRepositoryBrowserView.strings
index f5b5b4a9..957318ea 100644
--- a/MacPass/de.lproj/PluginRepositoryBrowserView.strings
+++ b/MacPass/de.lproj/PluginRepositoryBrowserView.strings
@@ -1,9 +1,15 @@
 /* Class = "NSButtonCell"; title = "Action"; ObjectID = "6jQ-Uk-uqD"; */
 "6jQ-Uk-uqD.title" = "Aktion";
 
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "cFE-KE-Xjx"; */
+"cFE-KE-Xjx.title" = "Text Cell";
+
 /* Class = "NSTextFieldCell"; title = "Updated at"; ObjectID = "DhR-ED-6gV"; */
 "DhR-ED-6gV.title" = "Aktualisiert am";
 
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "DRt-Gz-DUm"; */
+"DRt-Gz-DUm.title" = "Table View Cell";
+
 /* Class = "NSTableColumn"; headerCell.title = "Status"; ObjectID = "g1Q-BS-vCR"; */
 "g1Q-BS-vCR.headerCell.title" = "Status";
 
@@ -13,8 +19,11 @@
 /* Class = "NSButtonCell"; title = "Done"; ObjectID = "j9a-fn-Pye"; */
 "j9a-fn-Pye.title" = "Fertig";
 
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "nc9-mo-2e5"; */
+"nc9-mo-2e5.title" = "Table View Cell";
+
 /* Class = "NSTextFieldCell"; title = "Last updated:"; ObjectID = "ntD-sJ-NRw"; */
-"ntD-sJ-NRw.title" = "Letze Aktualisierung:";
+"ntD-sJ-NRw.title" = "Letzte Aktualisierung:";
 
 /* Class = "NSTableColumn"; headerCell.title = "Plugin"; ObjectID = "Nzo-rR-Hfx"; */
 "Nzo-rR-Hfx.headerCell.title" = "Plugin";
@@ -22,3 +31,12 @@
 /* Class = "NSButtonCell"; title = "Refresh"; ObjectID = "NZw-nO-lZ3"; */
 "NZw-nO-lZ3.title" = "Aktualisieren";
 
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Pl1-4o-5uY"; */
+"Pl1-4o-5uY.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "QPj-W1-su1"; */
+"QPj-W1-su1.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "ZIf-CU-gh7"; */
+"ZIf-CU-gh7.title" = "Table View Cell";
+
diff --git a/MacPass/de.lproj/WelcomeView.strings b/MacPass/de.lproj/WelcomeView.strings
index a007a51b..35fc39ce 100644
--- a/MacPass/de.lproj/WelcomeView.strings
+++ b/MacPass/de.lproj/WelcomeView.strings
@@ -1,9 +1,15 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Fbl-HT-XIu"; */
+"Fbl-HT-XIu.title" = "Text Cell";
+
 /* Class = "NSButtonCell"; title = "Open Database…"; ObjectID = "Jj3-zy-gaz"; */
 "Jj3-zy-gaz.title" = "Datenbank öffnen…";
 
 /* Class = "NSButtonCell"; title = "Create new Database"; ObjectID = "Vxx-Ql-eI5"; */
 "Vxx-Ql-eI5.title" = "Neue Datenbank erstellen";
 
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "vzM-ly-CYn"; */
+"vzM-ly-CYn.title" = "Table View Cell";
+
 /* Class = "NSTextFieldCell"; title = "Welcome to MacPass"; ObjectID = "zdv-z8-khG"; */
 "zdv-z8-khG.title" = "Willkommen zu MacPass";
 
diff --git a/MacPass/de.lproj/WorkflowPreferences.strings b/MacPass/de.lproj/WorkflowPreferences.strings
index 33fad6f0..ce961108 100644
--- a/MacPass/de.lproj/WorkflowPreferences.strings
+++ b/MacPass/de.lproj/WorkflowPreferences.strings
@@ -29,7 +29,7 @@
 "43.title" = "ignorieren";
 
 /* Class = "NSMenuItem"; title = "Opens Inspector"; ObjectID = "44"; */
-"44.title" = "Inspector öffnen";
+"44.title" = "Inspektor öffnen";
 
 /* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
 "gej-kA-GzQ.title" = "Item 2";
diff --git a/MacPass/en.lproj/AutotypeBuilderView.strings b/MacPass/en.lproj/AutotypeBuilderView.strings
deleted file mode 100644
index 0fb59601..00000000
--- a/MacPass/en.lproj/AutotypeBuilderView.strings
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "8ny-Qk-Jvo"; */
-"8ny-Qk-Jvo.title" = "Autotype Sequence";
-
-/* Class = "NSButtonCell"; title = "Set Autotype Sequence"; ObjectID = "aOD-Ih-Sft"; */
-"aOD-Ih-Sft.title" = "Set Autotype Sequence";
-
-/* Class = "NSTextFieldCell"; title = "Available Commands and Placeholders"; ObjectID = "lug-97-H9D"; */
-"lug-97-H9D.title" = "Available Commands and Placeholders";
-
diff --git a/MacPass/en.lproj/AutotypeCandidateSelectionView.strings b/MacPass/en.lproj/AutotypeCandidateSelectionView.strings
deleted file mode 100644
index 67348f19..00000000
--- a/MacPass/en.lproj/AutotypeCandidateSelectionView.strings
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "60p-7v-Nje"; */
-"60p-7v-Nje.title" = "Cancel";
-
-/* Class = "NSTextFieldCell"; title = "There are multiple matches for the current window. Please select which match should be used."; ObjectID = "gcf-gb-ZsF"; */
-"gcf-gb-ZsF.title" = "There are multiple matches for the current window. Please select which match should be used.";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "PKW-gr-yqN"; */
-"PKW-gr-yqN.title" = "Text Cell";
-
-/* Class = "NSTextFieldCell"; title = "Content"; ObjectID = "TN3-3a-LaA"; */
-"TN3-3a-LaA.title" = "Content";
-
-/* Class = "NSButtonCell"; title = "Perform Autotype"; ObjectID = "w7H-hx-CUF"; */
-"w7H-hx-CUF.title" = "Perform Autotype";
-
diff --git a/MacPass/en.lproj/ContextBar.strings b/MacPass/en.lproj/ContextBar.strings
deleted file mode 100644
index fe2e757f..00000000
--- a/MacPass/en.lproj/ContextBar.strings
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
-"7.title" = "Search:";
-
-/* Class = "NSButtonCell"; title = "Empty Trash"; ObjectID = "8Ok-oe-6AB"; */
-"8Ok-oe-6AB.title" = "Empty Trash";
-
-/* Class = "NSTextFieldCell"; title = "Trash"; ObjectID = "8P1-Rp-sF4"; */
-"8P1-Rp-sF4.title" = "Trash";
-
-/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
-"53D-ne-nv6.title" = "Title";
-
-/* Class = "NSButtonCell"; title = "URL"; ObjectID = "92o-gN-Psj"; */
-"92o-gN-Psj.title" = "URL";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "CFk-71-NYQ"; */
-"CFk-71-NYQ.title" = "Item 3";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
-"cpr-p6-YAY.title" = "Item 2";
-
-/* Class = "NSTextFieldCell"; title = "History"; ObjectID = "ER3-Ic-v0N"; */
-"ER3-Ic-v0N.title" = "History";
-
-/* Class = "NSButtonCell"; title = "Exit History"; ObjectID = "ewQ-8F-e1E"; */
-"ewQ-8F-e1E.title" = "Exit History";
-
-/* Class = "NSButtonCell"; title = "Notes"; ObjectID = "iDN-2E-hwt"; */
-"iDN-2E-hwt.title" = "Notes";
-
-/* Class = "NSButtonCell"; title = "Username"; ObjectID = "jfQ-Jh-2gl"; */
-"jfQ-Jh-2gl.title" = "Username";
-
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "LRm-iZ-XrA"; */
-"LRm-iZ-XrA.title" = "Item 1";
-
-/* Class = "NSTabViewItem"; label = "Trash"; ObjectID = "na6-h9-r9q"; */
-"na6-h9-r9q.label" = "Trash";
-
-/* Class = "NSButtonCell"; title = "Password"; ObjectID = "rvQ-4V-SsS"; */
-"rvQ-4V-SsS.title" = "Password";
-
-/* Class = "NSTabViewItem"; label = "Filter"; ObjectID = "Ud6-Nz-6PS"; */
-"Ud6-Nz-6PS.label" = "Filter";
-
-/* Class = "NSButtonCell"; title = "Restore Entry"; ObjectID = "UTg-y9-4DN"; */
-"UTg-y9-4DN.title" = "Restore Entry";
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
-"wC4-fF-dLW.title" = "OtherViews";
-
-/* Class = "NSButtonCell"; title = "Everywhere"; ObjectID = "WMK-bb-ESj"; */
-"WMK-bb-ESj.title" = "Everywhere";
-
-/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
-"z4I-cp-nhf.label" = "History";
-
diff --git a/MacPass/en.lproj/DatabaseSettingsWindow.strings b/MacPass/en.lproj/DatabaseSettingsWindow.strings
deleted file mode 100644
index 2a22988e..00000000
--- a/MacPass/en.lproj/DatabaseSettingsWindow.strings
+++ /dev/null
@@ -1,117 +0,0 @@
-
-/* 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 = "Enable Entry History"; ObjectID = "532"; */
-"532.title" = "Enable Entry History";
-
-/* Class = "NSButtonCell"; title = "Enable Recycle Bin"; ObjectID = "536"; */
-"536.title" = "Enable Recycle Bin";
-
-/* Class = "NSTextFieldCell"; title = "Maximum items in history:"; ObjectID = "558"; */
-"558.title" = "Maximum items in history:";
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "680"; */
-"680.title" = "OtherViews";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "957"; */
-"957.title" = "Cancel";
-
-/* Class = "NSTextFieldCell"; title = "Maximum history size:"; ObjectID = "1269"; */
-"1269.title" = "Maximum history 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 = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
-"1740.title" = "OtherViews";
-
-/* Class = "NSTextFieldCell"; title = "Threads"; ObjectID = "2QI-ne-N5d"; */
-"2QI-ne-N5d.title" = "Threads";
-
-/* Class = "NSTextFieldCell"; title = "Iterations"; ObjectID = "2ZA-Gc-JdZ"; */
-"2ZA-Gc-JdZ.title" = "Iterations";
-
-/* Class = "NSTextFieldCell"; title = "Enforce key change"; ObjectID = "5QH-N1-FHK"; */
-"5QH-N1-FHK.title" = "Enforce key change";
-
-/* Class = "NSTabViewItem"; label = "Argon2"; ObjectID = "6qB-sH-9FI"; */
-"6qB-sH-9FI.label" = "Argon2";
-
-/* Class = "NSButtonCell"; title = "Recommend key change"; ObjectID = "CtU-Eq-dgy"; */
-"CtU-Eq-dgy.title" = "Recommend key change";
-
-/* Class = "NSTextFieldCell"; title = "Algorithm"; ObjectID = "GVd-KH-pHc"; */
-"GVd-KH-pHc.title" = "Algorithm";
-
-/* Class = "NSButtonCell"; title = "Generate Parameters"; ObjectID = "PoI-Er-Y8P"; */
-"PoI-Er-Y8P.title" = "Generate Parameters";
-
-/* Class = "NSTextFieldCell"; title = "VersionInfo"; ObjectID = "Ush-4r-A1A"; */
-"Ush-4r-A1A.title" = "VersionInfo";
-
-/* Class = "NSTextFieldCell"; title = "Recommend key change"; ObjectID = "Xib-Fn-sqx"; */
-"Xib-Fn-sqx.title" = "Recommend key change";
-
-/* Class = "NSTextFieldCell"; title = "File format:"; ObjectID = "bTk-YZ-x0G"; */
-"bTk-YZ-x0G.title" = "File format:";
-
-/* Class = "NSTabViewItem"; label = "Aes"; ObjectID = "ft1-pl-lpO"; */
-"ft1-pl-lpO.label" = "Aes";
-
-/* Class = "NSTextFieldCell"; title = "Encryption:"; ObjectID = "gxY-UL-bEG"; */
-"gxY-UL-bEG.title" = "Encryption:";
-
-/* Class = "NSTextFieldCell"; title = "Memory"; ObjectID = "iRY-If-Kwn"; */
-"iRY-If-Kwn.title" = "Memory";
-
-/* Class = "NSTextFieldCell"; title = "Recyclebin Group:"; ObjectID = "kI5-Kp-byE"; */
-"kI5-Kp-byE.title" = "Recyclebin Group:";
-
-/* Class = "NSButtonCell"; title = "Force key change once after unlocking"; ObjectID = "pA1-aL-KjT"; */
-"pA1-aL-KjT.title" = "Force key change once after unlocking";
-
-/* Class = "NSBox"; title = "Key derivation"; ObjectID = "pbl-Mb-r8V"; */
-"pbl-Mb-r8V.title" = "Key derivation";
-
-/* Class = "NSTextFieldCell"; title = "Rounds"; ObjectID = "uUQ-9s-M5E"; */
-"uUQ-9s-M5E.title" = "Rounds";
-
-/* Class = "NSButtonCell"; title = "Force key change"; ObjectID = "z6u-YT-7LE"; */
-"z6u-YT-7LE.title" = "Force key change";
diff --git a/MacPass/en.lproj/DatePickingView.strings b/MacPass/en.lproj/DatePickingView.strings
deleted file mode 100644
index 59bb3f98..00000000
--- a/MacPass/en.lproj/DatePickingView.strings
+++ /dev/null
@@ -1,9 +0,0 @@
-/* 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/DuplicateEntryOptionsWindow.strings b/MacPass/en.lproj/DuplicateEntryOptionsWindow.strings
deleted file mode 100644
index 60afa4f6..00000000
--- a/MacPass/en.lproj/DuplicateEntryOptionsWindow.strings
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Class = "NSButtonCell"; title = "Reference password instead of copying it"; ObjectID = "daA-QV-CDq"; */
-"daA-QV-CDq.title" = "Reference password instead of copying it";
-
-/* Class = "NSButtonCell"; title = "Duplicate history"; ObjectID = "dXl-KS-4rE"; */
-"dXl-KS-4rE.title" = "Duplicate history";
-
-/* Class = "NSButtonCell"; title = "Reference username instead of copying it"; ObjectID = "O9X-XH-n8o"; */
-"O9X-XH-n8o.title" = "Reference username instead of copying it";
-
-/* Class = "NSWindow"; title = "Duplicate Entry Options"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Duplicate Entry Options";
-
-/* Class = "NSButtonCell"; title = "Duplicate Entry"; ObjectID = "WqI-qH-ARf"; */
-"WqI-qH-ARf.title" = "Duplicate Entry";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "x6e-bE-Y6R"; */
-"x6e-bE-Y6R.title" = "Cancel";
-
diff --git a/MacPass/en.lproj/EntryInspectorView.strings b/MacPass/en.lproj/EntryInspectorView.strings
deleted file mode 100644
index bfec3552..00000000
--- a/MacPass/en.lproj/EntryInspectorView.strings
+++ /dev/null
@@ -1,108 +0,0 @@
-/* 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 = "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 = "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 = "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 = "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] = "Autotype"; ObjectID = "238"; */
-"238.ibShadowedLabels[2]" = "Autotype";
-
-/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "bke-G2-oEf"; */
-"bke-G2-oEf.title" = "Delete";
-
-/* Class = "NSTextFieldCell"; title = "Window Title"; ObjectID = "bkO-Bk-AuX"; */
-"bkO-Bk-AuX.title" = "Window Title";
-
-/* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "bQ5-0E-h3O"; */
-"bQ5-0E-h3O.title" = "Autotype Sequence";
-
-/* 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 = "NSMenuItem"; title = "Quicklook"; ObjectID = "NtM-y3-l4D"; */
-"NtM-y3-l4D.title" = "Quicklook";
-
-/* Class = "NSButtonCell"; title = "Obfuscate Autotype"; ObjectID = "oNq-kB-3eb"; */
-"oNq-kB-3eb.title" = "Obfuscate Autotype";
-
-/* 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 = "NSMenu"; title = "OtherViews"; ObjectID = "sNS-o1-pD7"; */
-"sNS-o1-pD7.title" = "OtherViews";
-
-/* Class = "NSTextFieldCell"; title = "UUID"; ObjectID = "vTq-N1-5oa"; */
-"vTq-N1-5oa.title" = "UUID";
-
-/* Class = "NSButtonCell"; title = "Show Plugin Data"; ObjectID = "X9y-K7-lix"; */
-"X9y-K7-lix.title" = "Show Plugin Data";
-
diff --git a/MacPass/en.lproj/GeneralPreferences.strings b/MacPass/en.lproj/GeneralPreferences.strings
deleted file mode 100644
index 9844edf3..00000000
--- a/MacPass/en.lproj/GeneralPreferences.strings
+++ /dev/null
@@ -1,81 +0,0 @@
-
-/* Class = "NSMenu"; title = "ClipboardClearInterval"; ObjectID = "421"; */
-"421.title" = "ClipboardClearInterval";
-
-/* Class = "NSMenuItem"; title = "after 10 Seconds"; ObjectID = "422"; */
-"422.title" = "after 10 Seconds";
-
-/* Class = "NSMenuItem"; title = "after 30 Seconds"; ObjectID = "423"; */
-"423.title" = "after 30 Seconds";
-
-/* Class = "NSMenuItem"; title = "after 1 Minute"; ObjectID = "424"; */
-"424.title" = "after 1 Minute";
-
-/* Class = "NSMenuItem"; title = "Never"; ObjectID = "429"; */
-"429.title" = "Never";
-
-/* Class = "NSTextFieldCell"; title = "Clear Copied Items"; ObjectID = "432"; */
-"432.title" = "Clear Copied Items";
-
-/* Class = "NSButtonCell"; title = "Clear Clipboard on Quit"; ObjectID = "448"; */
-"448.title" = "Clear Clipboard on Quit";
-
-/* Class = "NSBox"; title = "Security"; ObjectID = "465"; */
-"465.title" = "Security";
-
-/* Class = "NSButtonCell"; title = "Reopen last Database after Launch"; ObjectID = "531"; */
-"531.title" = "Reopen last Database after Launch";
-
-/* Class = "NSMenu"; title = "LockTimes"; ObjectID = "586"; */
-"586.title" = "LockTimes";
-
-/* Class = "NSMenuItem"; title = "for 1 Minute"; ObjectID = "588"; */
-"588.title" = "for 1 Minute";
-
-/* Class = "NSMenuItem"; title = "for 5 Minutes"; ObjectID = "589"; */
-"589.title" = "for 5 Minutes";
-
-/* Class = "NSMenuItem"; title = "for 15 Minutes"; ObjectID = "603"; */
-"603.title" = "for 15 Minutes";
-
-/* Class = "NSButtonCell"; title = "Lock after sleep"; ObjectID = "631"; */
-"631.title" = "Lock after sleep";
-
-/* Class = "NSMenuItem"; title = "Never"; ObjectID = "804"; */
-"804.title" = "Never";
-
-/* Class = "NSTextFieldCell"; title = "Lock while idle"; ObjectID = "806"; */
-"806.title" = "Lock while idle";
-
-/* Class = "NSBox"; title = "File Handling"; ObjectID = "888"; */
-"888.title" = "File Handling";
-
-/* Class = "NSMenuItem"; title = "after 5 Minutes"; ObjectID = "5gh-b6-cmG"; */
-"5gh-b6-cmG.title" = "after 5 Minutes";
-
-/* Class = "NSButtonCell"; title = "Clear all stored locations"; ObjectID = "8Ri-2s-c39"; */
-"8Ri-2s-c39.title" = "Clear all stored locations";
-
-/* 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.";
-
-/* Class = "NSButtonCell"; title = "Lock after log out"; ObjectID = "Dzn-9R-JjE"; */
-"Dzn-9R-JjE.title" = "Lock after log out";
-
-/* Class = "NSTextFieldCell"; title = "Disabling this compromises security. If enabled, anything copied to the Clipboard in MacPass will be available on your connected iOS devices. You should clear the clipboard on those devices manually."; ObjectID = "JGX-Tp-KJk"; */
-"JGX-Tp-KJk.title" = "Disabling this compromises security. If enabled, anything copied to the Clipboard in MacPass will be available on your connected iOS devices. You should clear the clipboard on those devices manually.";
-
-/* Class = "NSTextFieldCell"; title = "If file changes:"; ObjectID = "QrK-hM-Xt1"; */
-"QrK-hM-Xt1.title" = "If file changes:";
-
-/* Class = "NSButtonCell"; title = "Prevent Universal Clipboard support"; ObjectID = "fNy-mS-phi"; */
-"fNy-mS-phi.title" = "Prevent Universal Clipboard support";
-
-/* Class = "NSButtonCell"; title = "Remember Keyfile for Databases"; ObjectID = "r6q-He-nYU"; */
-"r6q-He-nYU.title" = "Remember Keyfile for Databases";
-
-/* Class = "NSButtonCell"; title = "Enable Autosave"; ObjectID = "wG7-bi-2fi"; */
-"wG7-bi-2fi.title" = "Enable Autosave";
-
-/* Class = "NSTextFieldCell"; title = "Close and open all documents for changes to take effect"; ObjectID = "ya5-ps-c4W"; */
-"ya5-ps-c4W.title" = "Close and open all documents for changes to take effect";
diff --git a/MacPass/en.lproj/GroupInspectorView.strings b/MacPass/en.lproj/GroupInspectorView.strings
deleted file mode 100644
index e643759e..00000000
--- a/MacPass/en.lproj/GroupInspectorView.strings
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "6FG-UZ-Adh"; */
-"6FG-UZ-Adh.title" = "Autotype Sequence";
-
-/* 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 = "NSMenu"; title = "OtherViews"; ObjectID = "243"; */
-"243.title" = "OtherViews";
-
-/* Class = "NSTextFieldCell"; title = "Search"; ObjectID = "265"; */
-"265.title" = "Search";
-
-/* Class = "NSTextFieldCell"; title = "Autotype"; ObjectID = "277"; */
-"277.title" = "Autotype";
-
-/* Class = "NSButtonCell"; title = "Show Plugin Data"; ObjectID = "qGr-oT-WjP"; */
-"qGr-oT-WjP.title" = "Show Plugin Data";
-
diff --git a/MacPass/en.lproj/IconSelection.strings b/MacPass/en.lproj/IconSelection.strings
deleted file mode 100644
index 6055741a..00000000
--- a/MacPass/en.lproj/IconSelection.strings
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "1kM-cI-P1o"; */
-"1kM-cI-P1o.title" = "Cancel";
-
-/* Class = "NSButtonCell"; title = "Use Default Icon"; ObjectID = "102"; */
-"102.title" = "Use Default Icon";
-
-/* Class = "NSButtonCell"; title = "Download Icon"; ObjectID = "iaf-XW-XUo"; */
-"iaf-XW-XUo.title" = "Download Icon";
-
diff --git a/MacPass/en.lproj/InspectorView.strings b/MacPass/en.lproj/InspectorView.strings
deleted file mode 100644
index 400d63f6..00000000
--- a/MacPass/en.lproj/InspectorView.strings
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Class = "NSTabViewItem"; label = "Group"; ObjectID = "2896"; */
-"2896.label" = "Group";
-
-/* Class = "NSTabViewItem"; label = "Entry"; ObjectID = "2897"; */
-"2897.label" = "Entry";
-
-/* Class = "NSTabViewItem"; label = "NoSelection"; ObjectID = "2974"; */
-"2974.label" = "NoSelection";
-
-/* Class = "NSTextFieldCell"; title = "No Selection"; ObjectID = "2986"; */
-"2986.title" = "No Selection";
-
-/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "3014"; */
-"3014.title" = "Label";
-
-/* Class = "NSTextFieldCell"; title = "Notes"; ObjectID = "hwn-UY-9Cr"; */
-"hwn-UY-9Cr.title" = "Notes";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "None"; ObjectID = "Xpb-G8-gXl"; */
-"Xpb-G8-gXl.ibShadowedIsNilPlaceholder" = "None";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedNoSelectionPlaceholder = "No Selection"; ObjectID = "Xpb-G8-gXl"; */
-"Xpb-G8-gXl.ibShadowedNoSelectionPlaceholder" = "No Selection";
-
diff --git a/MacPass/en.lproj/IntegrationPreferences.strings b/MacPass/en.lproj/IntegrationPreferences.strings
deleted file mode 100644
index 50d6223e..00000000
--- a/MacPass/en.lproj/IntegrationPreferences.strings
+++ /dev/null
@@ -1,45 +0,0 @@
-
-/* 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 = "Include Entry URL Host for matches"; ObjectID = "B1D-j9-L8x"; */
-"B1D-j9-L8x.title" = "Include Entry URL Host for matches";
-
-/* Class = "NSButtonCell"; title = "Enable Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
-"ERs-ct-Eyx.title" = "Enable Quicklook Preview";
-
-/* Class = "NSTextFieldCell"; title = "Autotype might not work properly. Some issues where found that prevent Autotype or Global Autotype to work. Please run the Autotype Doctor to fix those issues."; ObjectID = "H37-ku-aTc"; */
-"H37-ku-aTc.title" = "Autotype might not work properly. Some issues where found that prevent Autotype or Global Autotype to work. Please run the Autotype Doctor to fix those issues.";
-
-/* Class = "NSTextFieldCell"; title = "Shortcut is missing Key"; ObjectID = "Lxp-wI-yQy"; */
-"Lxp-wI-yQy.title" = "Shortcut is missing Key";
-
-/* Class = "NSButtonCell"; title = "Run Autotype Doctor…"; ObjectID = "NP0-R3-m6n"; */
-"NP0-R3-m6n.title" = "Run Autotype Doctor…";
-
-/* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
-"P9N-HM-wER.title" = "Autotype";
-
-/* Class = "NSTextFieldCell"; title = "If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to."; ObjectID = "QRy-CY-ENC"; */
-"QRy-CY-ENC.title" = "If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to.";
-
-/* Class = "NSButtonCell"; title = "Interpret ⌃ as ⌘"; ObjectID = "QfO-yG-l3F"; */
-"QfO-yG-l3F.title" = "Interpret ⌃ as ⌘";
-
-/* Class = "NSButtonCell"; title = "Include Entry URL for matches"; ObjectID = "TzR-00-Vp3"; */
-"TzR-00-Vp3.title" = "Include Entry URL for matches";
-
-/* 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 temporary 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 temporary location for preview and deleted after the preview is closed.";
-
-/* Class = "NSButtonCell"; title = "Include Entry Tags for matches"; ObjectID = "rbu-G7-MT8"; */
-"rbu-G7-MT8.title" = "Include Entry Tags for matches";
-
-/* Class = "NSButtonCell"; title = "Include Entry Title for matches"; ObjectID = "tmL-dT-D0G"; */
-"tmL-dT-D0G.title" = "Include Entry Title for matches";
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 4a6db4cb..f34cb98b 100644
--- a/MacPass/en.lproj/Localizable.strings
+++ b/MacPass/en.lproj/Localizable.strings
@@ -304,7 +304,7 @@
 "DRAG_GROUP" = "Drag Group";
 
 /* Action name for duplicating entries */
-"DUPLICATE_ENTRIES_%ld" = "Duplicate Entries %ld";
+"DUPLICATE_ENTRIES_ACTION_NAME" = "Duplicate Entries";
 
 /* Menu item to directly diplicate an entry */
 "DUPLICATE_ENTRY" = "Duplicate Entry";
@@ -312,6 +312,12 @@
 /* Menu item to duplicate an entry with options how to duplicate. Will present a dialog. */
 "DUPLICATE_ENTRY_WITH_OPTIONS" = "Duplicate Entry…";
 
+/* Menu item to directly diplicate a group */
+"DUPLICATE_GROUP" = "Duplicate Group";
+
+/* Action name for duplicating groups */
+"DUPLICATE_GROUPS_ACTION_NAME" = "Duplicate Group";
+
 /* Menu item in the database outline context menu to change the template group
    Menu item on the add entry context menu to edit template groups */
 "EDIT_TEMPLATE_GROUP" = "Edit Entry Template Group";
diff --git a/MacPass/en.lproj/Localizable.stringsdict b/MacPass/en.lproj/Localizable.stringsdict
index e3db31f3..2d22e855 100644
--- a/MacPass/en.lproj/Localizable.stringsdict
+++ b/MacPass/en.lproj/Localizable.stringsdict
@@ -2,6 +2,22 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>DUPLICATE_GROUPS_ACTION_NAME</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@groups@</string>
+		<key>groups</key>
+		<dict>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>one</key>
+			<string>Duplicate Group</string>
+			<key>other</key>
+			<string>Duplicate Groups</string>
+		</dict>
+	</dict>
 	<key>%ld_CHARACTERS_TO_PICK_REMAINING</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
@@ -20,7 +36,7 @@
 			<string>All characters picked</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
diff --git a/MacPass/en.lproj/MainMenu.strings b/MacPass/en.lproj/MainMenu.strings
deleted file mode 100644
index d98009fc..00000000
--- a/MacPass/en.lproj/MainMenu.strings
+++ /dev/null
@@ -1,195 +0,0 @@
-/* Class = "NSMenuItem"; title = "Focus Entries"; ObjectID = "2VP-vB-IeX"; */
-"2VP-vB-IeX.title" = "Focus Entries";
-
-/* Class = "NSMenuItem"; title = "Item"; ObjectID = "3st-rv-EeQ"; */
-"3st-rv-EeQ.title" = "Item";
-
-/* Class = "NSMenu"; title = "Import"; ObjectID = "4q9-u1-pcm"; */
-"4q9-u1-pcm.title" = "Import";
-
-/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
-"5.title" = "Bring All to Front";
-
-/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
-"19.title" = "Window";
-
-/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
-"23.title" = "Minimize";
-
-/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
-"24.title" = "Window";
-
-/* Class = "NSMenu"; title = "AMainMenu"; ObjectID = "29"; */
-"29.title" = "AMainMenu";
-
-/* Class = "NSMenuItem"; title = "MacPass"; ObjectID = "56"; */
-"56.title" = "MacPass";
-
-/* Class = "NSMenu"; title = "MacPass"; ObjectID = "57"; */
-"57.title" = "MacPass";
-
-/* Class = "NSMenuItem"; title = "About MacPass"; ObjectID = "58"; */
-"58.title" = "About MacPass";
-
-/* Class = "NSMenuItem"; title = "Open…"; ObjectID = "72"; */
-"72.title" = "Open…";
-
-/* Class = "NSMenuItem"; title = "Close"; ObjectID = "73"; */
-"73.title" = "Close";
-
-/* Class = "NSMenuItem"; title = "Save…"; ObjectID = "75"; */
-"75.title" = "Save…";
-
-/* Class = "NSMenu"; title = "File"; ObjectID = "81"; */
-"81.title" = "File";
-
-/* Class = "NSMenuItem"; title = "New Database"; ObjectID = "82"; */
-"82.title" = "New Database";
-
-/* Class = "NSMenuItem"; title = "File"; ObjectID = "83"; */
-"83.title" = "File";
-
-/* Class = "NSMenuItem"; title = "Revert to Saved"; ObjectID = "112"; */
-"112.title" = "Revert to Saved";
-
-/* Class = "NSMenuItem"; title = "Open Recent"; ObjectID = "124"; */
-"124.title" = "Open Recent";
-
-/* Class = "NSMenu"; title = "Open Recent"; ObjectID = "125"; */
-"125.title" = "Open Recent";
-
-/* Class = "NSMenuItem"; title = "Clear Menu"; ObjectID = "126"; */
-"126.title" = "Clear Menu";
-
-/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "129"; */
-"129.title" = "Preferences…";
-
-/* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */
-"130.title" = "Services";
-
-/* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
-"131.title" = "Services";
-
-/* Class = "NSMenuItem"; title = "Hide MacPass"; ObjectID = "134"; */
-"134.title" = "Hide MacPass";
-
-/* Class = "NSMenuItem"; title = "Quit MacPass"; ObjectID = "136"; */
-"136.title" = "Quit MacPass";
-
-/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
-"145.title" = "Hide Others";
-
-/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
-"150.title" = "Show All";
-
-/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "197"; */
-"197.title" = "Copy";
-
-/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "198"; */
-"198.title" = "Select All";
-
-/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "199"; */
-"199.title" = "Cut";
-
-/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "202"; */
-"202.title" = "Delete";
-
-/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "203"; */
-"203.title" = "Paste";
-
-/* Class = "NSMenu"; title = "Edit"; ObjectID = "205"; */
-"205.title" = "Edit";
-
-/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "207"; */
-"207.title" = "Undo";
-
-/* Class = "NSMenuItem"; title = "Find…"; ObjectID = "209"; */
-"209.title" = "Find…";
-
-/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "215"; */
-"215.title" = "Redo";
-
-/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "217"; */
-"217.title" = "Edit";
-
-/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "239"; */
-"239.title" = "Zoom";
-
-/* Class = "NSMenuItem"; title = "View"; ObjectID = "295"; */
-"295.title" = "View";
-
-/* Class = "NSMenu"; title = "View"; ObjectID = "296"; */
-"296.title" = "View";
-
-/* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "297"; */
-"297.title" = "Show Toolbar";
-
-/* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "298"; */
-"298.title" = "Customize Toolbar…";
-
-/* Class = "NSMenuItem"; title = "Help"; ObjectID = "490"; */
-"490.title" = "Help";
-
-/* Class = "NSMenu"; title = "Help"; ObjectID = "491"; */
-"491.title" = "Help";
-
-/* Class = "NSMenuItem"; title = "MacPass Help"; ObjectID = "492"; */
-"492.title" = "MacPass Help";
-
-/* Class = "NSMenuItem"; title = "Toggle Inspector"; ObjectID = "1181"; */
-"1181.title" = "Toggle Inspector";
-
-/* Class = "NSMenuItem"; title = "Show Password Generator"; ObjectID = "1200"; */
-"1200.title" = "Show Password Generator";
-
-/* Class = "NSMenuItem"; title = "Change Master Password…"; ObjectID = "1203"; */
-"1203.title" = "Change Master Password…";
-
-/* Class = "NSMenuItem"; title = "Database Settings…"; ObjectID = "1231"; */
-"1231.title" = "Database Settings…";
-
-/* Class = "NSMenuItem"; title = "Save As…"; ObjectID = "1243"; */
-"1243.title" = "Save As…";
-
-/* Class = "NSMenuItem"; title = "XML…"; ObjectID = "1259"; */
-"1259.title" = "XML…";
-
-/* Class = "NSMenuItem"; title = "Lock"; ObjectID = "1261"; */
-"1261.title" = "Lock";
-
-/* Class = "NSMenuItem"; title = "Import"; ObjectID = "aTb-sW-nUd"; */
-"aTb-sW-nUd.title" = "Import";
-
-/* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "aVO-9F-Lwc"; */
-"aVO-9F-Lwc.title" = "Quicklook";
-
-/* Class = "NSMenuItem"; title = "Focus Groups"; ObjectID = "HxM-dV-LIH"; */
-"HxM-dV-LIH.title" = "Focus Groups";
-
-/* Class = "NSMenuItem"; title = "Save a Copy…"; ObjectID = "i24-Gn-j9c"; */
-"i24-Gn-j9c.title" = "Save a Copy…";
-
-/* Class = "NSMenuItem"; title = "Fix Autotype…"; ObjectID = "nx7-Vf-LiD"; */
-"nx7-Vf-LiD.title" = "Fix Autotype…";
-
-/* Class = "NSMenu"; title = "Export"; ObjectID = "p8h-Fg-h1O"; */
-"p8h-Fg-h1O.title" = "Export";
-
-/* Class = "NSMenuItem"; title = "XML…"; ObjectID = "rW0-r1-QYL"; */
-"rW0-r1-QYL.title" = "XML…";
-
-/* Class = "NSMenu"; title = "Item"; ObjectID = "Ttt-tR-emo"; */
-"Ttt-tR-emo.title" = "Item";
-
-/* Class = "NSMenuItem"; title = "Export"; ObjectID = "tz9-yK-pOf"; */
-"tz9-yK-pOf.title" = "Export";
-
-/* Class = "NSMenuItem"; title = "Focus Inspector"; ObjectID = "Zje-Me-5c8"; */
-"Zje-Me-5c8.title" = "Focus Inspector";
-
-/* Class = "NSMenuItem"; title = "Check for Updates…"; ObjectID = "zMO-8r-g5v"; */
-"zMO-8r-g5v.title" = "Check for Updates…";
-
-/* Class = "NSMenuItem"; title = "Merge With…"; ObjectID = "zvE-0h-UxI"; */
-"zvE-0h-UxI.title" = "Merge With…";
-
diff --git a/MacPass/en.lproj/OpenPanelAccessoryView.strings b/MacPass/en.lproj/OpenPanelAccessoryView.strings
deleted file mode 100644
index fc2b6fec..00000000
--- a/MacPass/en.lproj/OpenPanelAccessoryView.strings
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Class = "NSButtonCell"; title = "Show hidden files"; ObjectID = "FfY-KA-8IC"; */
-"FfY-KA-8IC.title" = "Show hidden files";
-
-/* Class = "NSButtonCell"; title = "Allow all files"; ObjectID = "tvV-1s-Be3"; */
-"tvV-1s-Be3.title" = "Allow all files";
-
diff --git a/MacPass/en.lproj/PasswordCreatorView.strings b/MacPass/en.lproj/PasswordCreatorView.strings
deleted file mode 100644
index 07c47bdb..00000000
--- a/MacPass/en.lproj/PasswordCreatorView.strings
+++ /dev/null
@@ -1,45 +0,0 @@
-/* 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" = "Character options";
-
-/* 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";
-
-/* Class = "NSButtonCell"; title = "Use default only for selected entry"; ObjectID = "cfZ-5F-Nge"; */
-"cfZ-5F-Nge.title" = "Use default only for selected entry";
-
-/* Class = "NSButtonCell"; title = "Set Default"; ObjectID = "Wvs-Md-Ob8"; */
-"Wvs-Md-Ob8.title" = "Set Default";
-
diff --git a/MacPass/en.lproj/PasswordEditWindow.strings b/MacPass/en.lproj/PasswordEditWindow.strings
deleted file mode 100644
index 76a18782..00000000
--- a/MacPass/en.lproj/PasswordEditWindow.strings
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Class = "NSWindow"; title = "Change Password"; ObjectID = "1"; */
-"1.title" = "Change Password";
-
-/* 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/PasswordInputView.strings b/MacPass/en.lproj/PasswordInputView.strings
deleted file mode 100644
index d8a7a3fc..00000000
--- a/MacPass/en.lproj/PasswordInputView.strings
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Class = "NSButtonCell"; title = "Unlock"; ObjectID = "3"; */
-"3.title" = "Unlock";
-
-/* Class = "NSTextFieldCell"; title = "Keyfile"; ObjectID = "18"; */
-"18.title" = "Keyfile";
-
-/* Class = "NSTextFieldCell"; title = "Wrong password!"; ObjectID = "269"; */
-"269.title" = "Wrong password!";
-
-/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter Password"; ObjectID = "339"; */
-"339.placeholderString" = "Enter Password";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "erj-mR-UyO"; */
-"erj-mR-UyO.title" = "Cancel";
-
-/* Class = "NSButtonCell"; title = "Password"; ObjectID = "IU9-5u-jn9"; */
-"IU9-5u-jn9.title" = "Password";
-
diff --git a/MacPass/en.lproj/PickcharsView.strings b/MacPass/en.lproj/PickcharsView.strings
deleted file mode 100644
index ccbcc0be..00000000
--- a/MacPass/en.lproj/PickcharsView.strings
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Class = "NSButtonCell"; title = "Submit"; ObjectID = "8vP-Ka-vsA"; */
-"8vP-Ka-vsA.title" = "Submit";
-
-/* Class = "NSButtonCell"; title = "Reset"; ObjectID = "Emo-pg-Mfe"; */
-"Emo-pg-Mfe.title" = "Reset";
-
-/* Class = "NSTextFieldCell"; title = "StatusLabel"; ObjectID = "M3h-q8-FLO"; */
-"M3h-q8-FLO.title" = "StatusLabel";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "pUG-4c-rTt"; */
-"pUG-4c-rTt.title" = "Text Cell";
-
-/* Class = "NSTextFieldCell"; title = "MessageLabel"; ObjectID = "sHz-kg-YJQ"; */
-"sHz-kg-YJQ.title" = "MessageLabel";
-
-/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "v3T-2f-yWm"; */
-"v3T-2f-yWm.title" = "Table View Cell";
-
diff --git a/MacPass/en.lproj/PickfieldView.strings b/MacPass/en.lproj/PickfieldView.strings
deleted file mode 100644
index c629f33a..00000000
--- a/MacPass/en.lproj/PickfieldView.strings
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Class = "NSTableColumn"; headerCell.title = "Field"; ObjectID = "0H9-DW-Jyj"; */
-"0H9-DW-Jyj.headerCell.title" = "Field";
-
-/* Class = "NSButtonCell"; title = "Select"; ObjectID = "6Wi-9i-Tcb"; */
-"6Wi-9i-Tcb.title" = "Select";
-
-/* Class = "NSTextFieldCell"; title = "Please pick a field value to be inserted"; ObjectID = "aJS-22-6Va"; */
-"aJS-22-6Va.title" = "Please pick a field value to be inserted";
-
-/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "e8U-mE-mZh"; */
-"e8U-mE-mZh.title" = "Table View Cell";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "fil-tT-GXX"; */
-"fil-tT-GXX.title" = "Text Cell";
-
-/* Class = "NSTextFieldCell"; title = "Header View Cell"; ObjectID = "kTy-VO-Xlg"; */
-"kTy-VO-Xlg.title" = "Header View Cell";
-
-/* Class = "NSTableColumn"; headerCell.title = "Value"; ObjectID = "rVo-ud-5fs"; */
-"rVo-ud-5fs.headerCell.title" = "Value";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "z1F-Bi-PBg"; */
-"z1F-Bi-PBg.title" = "Text Cell";
-
diff --git a/MacPass/en.lproj/PluginDataView.strings b/MacPass/en.lproj/PluginDataView.strings
deleted file mode 100644
index 6ea66b5e..00000000
--- a/MacPass/en.lproj/PluginDataView.strings
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Class = "NSButtonCell"; title = "Remove All"; ObjectID = "6hH-Hc-gf4"; */
-"6hH-Hc-gf4.title" = "Remove All";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "bG1-Sb-Xyp"; */
-"bG1-Sb-Xyp.title" = "Text Cell";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "MaV-TP-92X"; */
-"MaV-TP-92X.placeholderString" = "Title";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "mLw-O5-6D3"; */
-"mLw-O5-6D3.placeholderString" = "Value";
-
-/* Class = "NSTextFieldCell"; title = "Plugin data"; ObjectID = "unO-bO-8v0"; */
-"unO-bO-8v0.title" = "Plugin data";
-
diff --git a/MacPass/en.lproj/PluginPreferences.strings b/MacPass/en.lproj/PluginPreferences.strings
deleted file mode 100644
index dcb14790..00000000
--- a/MacPass/en.lproj/PluginPreferences.strings
+++ /dev/null
@@ -1,27 +0,0 @@
-
-/* Class = "NSTextFieldCell"; title = "If enabled, Plugins without proper signatures will be allowed to load. Keep in mind, that Plugins have full access to your data! Changes take affect on restart."; ObjectID = "2bX-8S-9XM"; */
-"2bX-8S-9XM.title" = "If enabled, Plugins without proper signatures will be allowed to load. Keep in mind, that Plugins have full access to your data! Changes take affect on restart.";
-
-/* Class = "NSButtonCell"; title = "Load unsecure Plugins"; ObjectID = "C4B-6z-ZqX"; */
-"C4B-6z-ZqX.title" = "Load unsecure Plugins";
-
-/* Class = "NSTextFieldCell"; title = "Plugin Settings Info"; ObjectID = "OOr-SW-jZb"; */
-"OOr-SW-jZb.title" = "Plugin Settings Info";
-
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "STt-PQ-Szr"; */
-"STt-PQ-Szr.title" = "Text Cell";
-
-/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "fug-79-n9g"; */
-"fug-79-n9g.title" = "Table View Cell";
-
-/* Class = "NSButtonCell"; title = "Browse Available Plugins…"; ObjectID = "sqO-8H-n1y"; */
-"sqO-8H-n1y.title" = "Browse Available Plugins…";
-
-/* Class = "NSBox"; title = "Box"; ObjectID = "vBs-Ga-aq0"; */
-"vBs-Ga-aq0.title" = "Box";
-
-/* Class = "NSButtonCell"; title = "Force loading of incompatible Plugins"; ObjectID = "yak-fS-jtA"; */
-"yak-fS-jtA.title" = "Force loading of incompatible Plugins";
-
-/* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "yuK-qH-jxx"; */
-"yuK-qH-jxx.title" = "Label";
diff --git a/MacPass/en.lproj/PluginRepositoryBrowserView.strings b/MacPass/en.lproj/PluginRepositoryBrowserView.strings
deleted file mode 100644
index c80539ab..00000000
--- a/MacPass/en.lproj/PluginRepositoryBrowserView.strings
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Class = "NSButtonCell"; title = "Refresh"; ObjectID = "NZw-nO-lZ3"; */
-"NZw-nO-lZ3.title" = "Refresh";
-
-/* Class = "NSTableColumn"; headerCell.title = "Plugin"; ObjectID = "Nzo-rR-Hfx"; */
-"Nzo-rR-Hfx.headerCell.title" = "Plugin";
-
-/* Class = "NSTableColumn"; headerCell.title = "Status"; ObjectID = "g1Q-BS-vCR"; */
-"g1Q-BS-vCR.headerCell.title" = "Status";
-
-/* Class = "NSTableColumn"; headerCell.title = "Latest Version"; ObjectID = "hFg-AD-SqD"; */
-"hFg-AD-SqD.headerCell.title" = "Latest Version";
-
-/* Class = "NSButtonCell"; title = "Done"; ObjectID = "j9a-fn-Pye"; */
-"j9a-fn-Pye.title" = "Done";
-
-/* Class = "NSTextFieldCell"; title = "Last updated:"; ObjectID = "ntD-sJ-NRw"; */
-"ntD-sJ-NRw.title" = "Last updated:";
diff --git a/MacPass/en.lproj/ReferenceBuilderView.strings b/MacPass/en.lproj/ReferenceBuilderView.strings
deleted file mode 100644
index ab32c3a3..00000000
--- a/MacPass/en.lproj/ReferenceBuilderView.strings
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Class = "NSTextFieldCell"; title = "Match"; ObjectID = "9ce-da-syF"; */
-"9ce-da-syF.title" = "Match";
-
-/* Class = "NSMenuItem"; title = "Get"; ObjectID = "142-bE-IMZ"; */
-"142-bE-IMZ.title" = "Get";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Reference"; ObjectID = "dr9-x8-kKk"; */
-"dr9-x8-kKk.placeholderString" = "Reference";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Value"; ObjectID = "fNP-ye-2bD"; */
-"fNP-ye-2bD.placeholderString" = "Value";
-
-/* Class = "NSTextFieldCell"; title = "Reference String"; ObjectID = "gik-Ha-hRd"; */
-"gik-Ha-hRd.title" = "Reference String";
-
-/* Class = "NSTextFieldCell"; title = "Key"; ObjectID = "K1t-OZ-ACe"; */
-"K1t-OZ-ACe.title" = "Key";
-
-/* Class = "NSButtonCell"; title = "Use"; ObjectID = "Kqx-qm-nMG"; */
-"Kqx-qm-nMG.title" = "Use";
-
-/* Class = "NSTextFieldCell"; title = "Reference"; ObjectID = "r1V-VE-ngy"; */
-"r1V-VE-ngy.title" = "Reference";
-
-/* Class = "NSMenuItem"; title = "Matching"; ObjectID = "yT1-XL-k6a"; */
-"yT1-XL-k6a.title" = "Matching";
-
diff --git a/MacPass/en.lproj/SavePanelAccessoryView.strings b/MacPass/en.lproj/SavePanelAccessoryView.strings
deleted file mode 100644
index dde82e3f..00000000
--- a/MacPass/en.lproj/SavePanelAccessoryView.strings
+++ /dev/null
@@ -1,15 +0,0 @@
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "4"; */
-"4.title" = "OtherViews";
-
-/* Class = "NSMenuItem"; title = "KeePass 1 (KDB)"; ObjectID = "5"; */
-"5.title" = "KeePass 1 (KDB)";
-
-/* Class = "NSMenuItem"; title = "KeePass 2 (KDBX)"; ObjectID = "6"; */
-"6.title" = "KeePass 2 (KDBX)";
-
-/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "12"; */
-"12.title" = "Format:";
-
-/* Class = "NSTextFieldCell"; title = "Not all Information inside your current database can be stored with this format."; ObjectID = "52"; */
-"52.title" = "Not all Information inside your current database can be stored with this format.";
diff --git a/MacPass/en.lproj/UpdatePreferences.strings b/MacPass/en.lproj/UpdatePreferences.strings
deleted file mode 100644
index e6a1601d..00000000
--- a/MacPass/en.lproj/UpdatePreferences.strings
+++ /dev/null
@@ -1,21 +0,0 @@
-/* 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 = "NSMenuItem"; title = "every Day"; ObjectID = "o9E-hk-H1T"; */
-"o9E-hk-H1T.title" = "every Day";
-
-/* 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";
-
diff --git a/MacPass/en.lproj/WelcomeView.strings b/MacPass/en.lproj/WelcomeView.strings
deleted file mode 100644
index 92e48994..00000000
--- a/MacPass/en.lproj/WelcomeView.strings
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Class = "NSTextFieldCell"; title = "Welcome to MacPass"; ObjectID = "24"; */
-"24.title" = "Welcome to MacPass";
-
-/* Class = "NSButtonCell"; title = "Open Database…"; ObjectID = "44"; */
-"44.title" = "Open Database…";
-
-/* Class = "NSButtonCell"; title = "Create new Database"; ObjectID = "48"; */
-"48.title" = "Create new Database";
-
-/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "70"; */
-"70.title" = "Cancel";
-
diff --git a/MacPass/en.lproj/WorkflowPreferences.strings b/MacPass/en.lproj/WorkflowPreferences.strings
deleted file mode 100644
index a5af44ad..00000000
--- a/MacPass/en.lproj/WorkflowPreferences.strings
+++ /dev/null
@@ -1,54 +0,0 @@
-
-/* 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 = "NSButtonCell"; title = "Hide application after copying to clipboard "; ObjectID = "1Vr-nY-Ogv"; */
-"1Vr-nY-Ogv.title" = "Hide application after copying to clipboard ";
-
-/* Class = "NSMenuItem"; title = "Default Browser"; ObjectID = "7YX-EA-9KA"; */
-"7YX-EA-9KA.title" = "Default Browser";
-
-/* Class = "NSBox"; title = "Clipboard"; ObjectID = "Kff-Xp-hAT"; */
-"Kff-Xp-hAT.title" = "Clipboard";
-
-/* Class = "NSButtonCell"; title = "Update password for new entries"; ObjectID = "RaM-t2-DVR"; */
-"RaM-t2-DVR.title" = "Update password for new entries";
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "XgO-Tj-QjO"; */
-"XgO-Tj-QjO.title" = "OtherViews";
-
-/* Class = "NSBox"; title = "Templates"; ObjectID = "Xvt-tP-TbR"; */
-"Xvt-tP-TbR.title" = "Templates";
-
-/* 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/es.lproj/Localizable.stringsdict b/MacPass/es.lproj/Localizable.stringsdict
index e0d9317f..e15d340a 100644
--- a/MacPass/es.lproj/Localizable.stringsdict
+++ b/MacPass/es.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>Todos los caracteres seleccionados</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
diff --git a/MacPass/fr.lproj/Localizable.stringsdict b/MacPass/fr.lproj/Localizable.stringsdict
index 82879e2f..ba5b773c 100644
--- a/MacPass/fr.lproj/Localizable.stringsdict
+++ b/MacPass/fr.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>Tous les caractères ont été choisis</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
@@ -31,7 +31,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>ld</string>
 			<key>one</key>
-			<string>Dupliquer l'entrée</string>
+			<string>Dupliquer l&apos;entrée</string>
 			<key>other</key>
 			<string>Dupliquer les entrées</string>
 			<key>zero</key>
diff --git a/MacPass/nl.lproj/Localizable.stringsdict b/MacPass/nl.lproj/Localizable.stringsdict
index 173f77b6..440b6eee 100644
--- a/MacPass/nl.lproj/Localizable.stringsdict
+++ b/MacPass/nl.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>Alle tekens gekozen</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
diff --git a/MacPass/pl.lproj/Localizable.stringsdict b/MacPass/pl.lproj/Localizable.stringsdict
index 041de5fb..f79ae1b8 100644
--- a/MacPass/pl.lproj/Localizable.stringsdict
+++ b/MacPass/pl.lproj/Localizable.stringsdict
@@ -24,7 +24,7 @@
 			<string>Wybrano wszystkie znaki</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@wpisów@</string>
diff --git a/MacPass/ru.lproj/Localizable.stringsdict b/MacPass/ru.lproj/Localizable.stringsdict
index ada74a9c..70f08165 100644
--- a/MacPass/ru.lproj/Localizable.stringsdict
+++ b/MacPass/ru.lproj/Localizable.stringsdict
@@ -24,7 +24,7 @@
 			<string>Выбраны все символы</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>
diff --git a/MacPass/sv-SE.lproj/Localizable.stringsdict b/MacPass/sv-SE.lproj/Localizable.stringsdict
index 184de942..9fd3b244 100644
--- a/MacPass/sv-SE.lproj/Localizable.stringsdict
+++ b/MacPass/sv-SE.lproj/Localizable.stringsdict
@@ -20,7 +20,7 @@
 			<string>Alla tecken valda</string>
 		</dict>
 	</dict>
-	<key>DUPLICATE_ENTRIES_%ld</key>
+	<key>DUPLICATE_ENTRIES_ACTION_NAME</key>
 	<dict>
 		<key>NSStringLocalizedFormatKey</key>
 		<string>%#@entries@</string>