From 548570d97cdbc0d181937d37752701a327a2de13 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Thu, 27 Sep 2018 14:23:37 +0200
Subject: [PATCH] Updated english localization

---
 MacPass/Base.lproj/IntegrationSettings.xib    |  32 ++--
 MacPass/Base.lproj/MainMenu.xib               |   8 +-
 MacPass/Base.lproj/PickfieldView.xib          |  12 +-
 MacPass/MPAppDelegate.m                       |   6 +-
 .../AutotypeCandidateSelectionView.strings    |   6 +-
 MacPass/en.lproj/ContextBar.strings           |  30 ++--
 .../en.lproj/DatabaseSettingsWindow.strings   |  32 ++--
 .../DuplicateEntryOptionsWindow.strings       |  20 +--
 MacPass/en.lproj/EntryInspectorView.strings   |  32 ++--
 MacPass/en.lproj/GeneralSettings.strings      |   9 +-
 MacPass/en.lproj/InfoPlist.strings            |  15 ++
 MacPass/en.lproj/InspectorView.strings        |   6 +-
 MacPass/en.lproj/IntegrationSettings.strings  |  28 ++--
 MacPass/en.lproj/Localizable.strings          |  66 +++++---
 MacPass/en.lproj/Localizable.stringsdict      | 148 ++++++++++++------
 MacPass/en.lproj/MainMenu.strings             |  28 ++--
 .../en.lproj/OpenPanelAccessoryView.strings   |   2 +-
 MacPass/en.lproj/PasswordCreatorView.strings  |   6 +-
 MacPass/en.lproj/PasswordEditWindow.strings   |   2 +-
 MacPass/en.lproj/PasswordInputView.strings    |   6 +-
 MacPass/en.lproj/PickfieldView.strings        |   2 +-
 MacPass/en.lproj/PluginDataView.strings       |   8 +-
 MacPass/en.lproj/PluginSettings.strings       |  12 +-
 MacPass/en.lproj/ReferenceBuilderView.strings |  12 +-
 MacPass/en.lproj/UpdateSettings.strings       |   6 +-
 MacPass/en.lproj/WorkflowSettings.strings     |  12 +-
 26 files changed, 309 insertions(+), 237 deletions(-)

diff --git a/MacPass/Base.lproj/IntegrationSettings.xib b/MacPass/Base.lproj/IntegrationSettings.xib
index 3adf0b8e..66b4bb37 100644
--- a/MacPass/Base.lproj/IntegrationSettings.xib
+++ b/MacPass/Base.lproj/IntegrationSettings.xib
@@ -37,16 +37,16 @@
                             <stackView orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="j52-9L-k7c">
                                 <rect key="frame" x="18" y="19" width="328" height="283"/>
                                 <beginningViews>
-                                    <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="328" translatesAutoresizingMaskIntoConstraints="NO" id="hMJ-Mo-xOM">
-                                        <rect key="frame" x="-2" y="227" width="332" height="56"/>
+                                    <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="328" translatesAutoresizingMaskIntoConstraints="NO" id="hMJ-Mo-xOM">
+                                        <rect key="frame" x="-2" y="227" width="331" height="56"/>
                                         <textFieldCell key="cell" controlSize="small" id="H37-ku-aTc">
                                             <font key="font" metaFont="smallSystem"/>
-                                            <string key="title">Autotype is not available, because MacPass does not have the right to control you computer. To enable Autotype, go to the Security and Privacy Preferences and add MacPass to the Accessibilty group. Changes require that you restart MacPass.</string>
+                                            <string key="title">Autotype is not available, because MacPass is not allowed to control your computer. To enable Autotype, go to the Security and Privacy Preferences and add MacPass to the Accessibilty group. Changes require a restart of MacPass.</string>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
                                     </textField>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jai-b6-Qv4">
+                                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jai-b6-Qv4">
                                         <rect key="frame" x="-6" y="191" width="153" height="32"/>
                                         <buttonCell key="cell" type="push" title="Open Preference…" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="NP0-R3-m6n">
                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -56,17 +56,17 @@
                                             <action selector="openAccessibiltyPreferences:" target="-2" id="GTg-6Z-6nd"/>
                                         </connections>
                                     </button>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="tik-Ar-FJg">
+                                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tik-Ar-FJg">
                                         <rect key="frame" x="-2" y="174" width="162" height="18"/>
                                         <buttonCell key="cell" type="check" title="Enable global Autotype" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="1qb-Rd-jYu">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
                                     </button>
-                                    <stackView orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="d6A-Vb-CMt">
+                                    <stackView orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="d6A-Vb-CMt">
                                         <rect key="frame" x="0.0" y="146" width="328" height="22"/>
                                         <beginningViews>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="buI-Wb-o3V">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="buI-Wb-o3V">
                                                 <rect key="frame" x="-2" y="3" width="57" height="17"/>
                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Shortcut" id="6oN-CH-T0O">
                                                     <font key="font" metaFont="system"/>
@@ -74,7 +74,7 @@
                                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Kvg-he-3c8" customClass="DDHotKeyTextField">
+                                            <textField verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Kvg-he-3c8" customClass="DDHotKeyTextField">
                                                 <rect key="frame" x="61" y="0.0" width="136" height="22"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="89" id="Mia-b8-HCZ"/>
@@ -85,7 +85,7 @@
                                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                 </textFieldCell>
                                             </textField>
-                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f5q-EW-RHf">
+                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f5q-EW-RHf">
                                                 <rect key="frame" x="203" y="4" width="127" height="14"/>
                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Shortcut is missing Key" id="Lxp-wI-yQy">
                                                     <font key="font" metaFont="smallSystem"/>
@@ -105,42 +105,42 @@
                                             <real value="3.4028234663852886e+38"/>
                                         </customSpacing>
                                     </stackView>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="DAX-V8-Say">
+                                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DAX-V8-Say">
                                         <rect key="frame" x="-2" y="122" width="208" height="18"/>
                                         <buttonCell key="cell" type="check" title="Include Entry Title for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="tmL-dT-D0G">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
                                     </button>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="8Wz-lo-AXG">
+                                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Wz-lo-AXG">
                                         <rect key="frame" x="-2" y="100" width="207" height="18"/>
                                         <buttonCell key="cell" type="check" title="Include Entry URL for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="TzR-00-Vp3">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
                                     </button>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="TiO-ah-BlR">
+                                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TiO-ah-BlR">
                                         <rect key="frame" x="-2" y="78" width="239" height="18"/>
                                         <buttonCell key="cell" type="check" title="Include Entry URL Host for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="B1D-j9-L8x">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
                                     </button>
-                                    <button translatesAutoresizingMaskIntoConstraints="NO" id="9MH-jx-GpG">
+                                    <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9MH-jx-GpG">
                                         <rect key="frame" x="-2" y="56" width="210" height="18"/>
                                         <buttonCell key="cell" type="check" title="Include Entry Tags for matches" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="rbu-G7-MT8">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
                                     </button>
-                                    <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VK8-z4-2ci">
+                                    <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VK8-z4-2ci">
                                         <rect key="frame" x="-2" y="34" width="123" height="18"/>
                                         <buttonCell key="cell" type="check" title="Interpret ⌃ as ⌘" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="QfO-yG-l3F">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                             <font key="font" metaFont="system"/>
                                         </buttonCell>
                                     </button>
-                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wbP-A9-jpw">
+                                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wbP-A9-jpw">
                                         <rect key="frame" x="-2" y="0.0" width="310" height="28"/>
                                         <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="If enabled, every {CONTROL} command will be sent as ⌘. Only disable this if you are sure you need to." id="QRy-CY-ENC">
                                             <font key="font" metaFont="smallSystem"/>
@@ -150,7 +150,7 @@
                                     </textField>
                                 </beginningViews>
                                 <visibilityPriorities>
-                                    <real value="1000"/>
+                                    <integer value="1000"/>
                                     <integer value="1000"/>
                                     <integer value="1000"/>
                                     <integer value="1000"/>
diff --git a/MacPass/Base.lproj/MainMenu.xib b/MacPass/Base.lproj/MainMenu.xib
index 7a56521f..4083822c 100644
--- a/MacPass/Base.lproj/MainMenu.xib
+++ b/MacPass/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -145,7 +145,7 @@
                             <menuItem isSeparatorItem="YES" id="79">
                                 <modifierMask key="keyEquivalentModifierMask" command="YES"/>
                             </menuItem>
-                            <menuItem title="Merge…" id="zvE-0h-UxI">
+                            <menuItem title="Merge With…" id="zvE-0h-UxI">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="mergeWithOther:" target="-1" id="OyM-CZ-TDD"/>
@@ -314,7 +314,7 @@ CA
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="1176"/>
-                            <menuItem title="Show Password Creator" keyEquivalent="p" id="1200">
+                            <menuItem title="Show Password Generator" keyEquivalent="p" id="1200">
                                 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
                                 <connections>
                                     <action selector="showPasswordCreator:" target="494" id="1202"/>
diff --git a/MacPass/Base.lproj/PickfieldView.xib b/MacPass/Base.lproj/PickfieldView.xib
index 04a55497..cc3fe14f 100644
--- a/MacPass/Base.lproj/PickfieldView.xib
+++ b/MacPass/Base.lproj/PickfieldView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -27,8 +27,8 @@
                     </textFieldCell>
                 </textField>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n1E-iQ-yd7">
-                    <rect key="frame" x="388" y="13" width="72" height="32"/>
-                    <buttonCell key="cell" type="push" title="Done" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6Wi-9i-Tcb">
+                    <rect key="frame" x="381" y="13" width="79" height="32"/>
+                    <buttonCell key="cell" type="push" title="Select" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6Wi-9i-Tcb">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
@@ -49,7 +49,7 @@
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
-                                    <tableColumn identifier="" width="118" minWidth="40" maxWidth="1000" id="0H9-DW-Jyj">
+                                    <tableColumn width="118" minWidth="40" maxWidth="1000" id="0H9-DW-Jyj">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Field">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@@ -100,7 +100,7 @@
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
-                                    <tableColumn identifier="" width="312" minWidth="40" maxWidth="1000" id="rVo-ud-5fs">
+                                    <tableColumn width="312" minWidth="40" maxWidth="1000" id="rVo-ud-5fs">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Value">
                                             <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
diff --git a/MacPass/MPAppDelegate.m b/MacPass/MPAppDelegate.m
index 9662ea8c..65b08d7d 100644
--- a/MacPass/MPAppDelegate.m
+++ b/MacPass/MPAppDelegate.m
@@ -265,9 +265,9 @@ NSString *const MPDidChangeStoredKeyFilesSettings = @"com.hicknhack.macpass.MPDi
 - (void)checkForUpdates:(id)sender {
 #if defined(DEBUG) || defined(NO_SPARKLE)
   NSAlert *alert = [[NSAlert alloc] init];
-  alert.messageText = NSLocalizedString(@"Updates are disabled!", @"Message text for disabled updates alert!");
-  alert.informativeText = [NSString stringWithFormat:@"Sparkle updates are disabled for this build of %@!", NSApp.applicationName];
-  [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Ok button")];
+  alert.messageText = NSLocalizedString(@"ALERT_UPDATES_DISABLED_MESSAGE_TEXT", @"Message text for disabled updates alert!");
+  alert.informativeText = [NSString stringWithFormat:@"ALERT_UPDATED_DISABLED_INFORMATIVE_TEXT_%@!", NSApp.applicationName];
+  [alert addButtonWithTitle:NSLocalizedString(@"OK", @"Ok Button to dismiss disabled updates alert")];
   [alert runModal];
 #else
   [[SUUpdater sharedUpdater] checkForUpdates:sender];
diff --git a/MacPass/en.lproj/AutotypeCandidateSelectionView.strings b/MacPass/en.lproj/AutotypeCandidateSelectionView.strings
index ef9436e6..67348f19 100644
--- a/MacPass/en.lproj/AutotypeCandidateSelectionView.strings
+++ b/MacPass/en.lproj/AutotypeCandidateSelectionView.strings
@@ -1,15 +1,15 @@
 /* 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 = "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 = "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
index 2c226205..fe2e757f 100644
--- a/MacPass/en.lproj/ContextBar.strings
+++ b/MacPass/en.lproj/ContextBar.strings
@@ -16,24 +16,12 @@
 /* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "CFk-71-NYQ"; */
 "CFk-71-NYQ.title" = "Item 3";
 
-/* Class = "NSTextFieldCell"; title = "History"; ObjectID = "ER3-Ic-v0N"; */
-"ER3-Ic-v0N.title" = "History";
-
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "LRm-iZ-XrA"; */
-"LRm-iZ-XrA.title" = "Item 1";
-
-/* Class = "NSButtonCell"; title = "Restore Entry"; ObjectID = "UTg-y9-4DN"; */
-"UTg-y9-4DN.title" = "Restore Entry";
-
-/* Class = "NSTabViewItem"; label = "Filter"; ObjectID = "Ud6-Nz-6PS"; */
-"Ud6-Nz-6PS.label" = "Filter";
-
-/* Class = "NSButtonCell"; title = "Everywhere"; ObjectID = "WMK-bb-ESj"; */
-"WMK-bb-ESj.title" = "Everywhere";
-
 /* 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";
 
@@ -43,15 +31,27 @@
 /* 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
index ad523d2b..235ca5b0 100644
--- a/MacPass/en.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/en.lproj/DatabaseSettingsWindow.strings
@@ -46,7 +46,7 @@
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "957"; */
 "957.title" = "Cancel";
 
-/* Class = "NSTextFieldCell"; title = "Maxium history size:"; ObjectID = "1269"; */
+/* Class = "NSTextFieldCell"; title = "Maximum history size:"; ObjectID = "1269"; */
 "1269.title" = "Maximum history size:";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1396"; */
@@ -73,27 +73,18 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OtherViews";
 
-/* 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 = "NSButtonCell"; title = "Recommend key change"; ObjectID = "CtU-Eq-dgy"; */
+"CtU-Eq-dgy.title" = "Recommend key change";
+
 /* Class = "NSTabViewItem"; label = "Aes"; ObjectID = "ft1-pl-lpO"; */
 "ft1-pl-lpO.label" = "Aes";
 
+/* Class = "NSTextFieldCell"; title = "Algorithm"; ObjectID = "GVd-KH-pHc"; */
+"GVd-KH-pHc.title" = "Algorithm";
+
 /* Class = "NSTextFieldCell"; title = "Encryption:"; ObjectID = "gxY-UL-bEG"; */
 "gxY-UL-bEG.title" = "Encryption:";
 
@@ -109,9 +100,18 @@
 /* Class = "NSBox"; title = "Key derivation"; ObjectID = "pbl-Mb-r8V"; */
 "pbl-Mb-r8V.title" = "Key derivation";
 
+/* 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 = "Rounds"; ObjectID = "uUQ-9s-M5E"; */
 "uUQ-9s-M5E.title" = "Rounds";
 
+/* Class = "NSTextFieldCell"; title = "Recommend key change"; ObjectID = "Xib-Fn-sqx"; */
+"Xib-Fn-sqx.title" = "Recommend key change";
+
 /* Class = "NSButtonCell"; title = "Force key change"; ObjectID = "z6u-YT-7LE"; */
 "z6u-YT-7LE.title" = "Force key change";
 
diff --git a/MacPass/en.lproj/DuplicateEntryOptionsWindow.strings b/MacPass/en.lproj/DuplicateEntryOptionsWindow.strings
index 8fcd0108..60afa4f6 100644
--- a/MacPass/en.lproj/DuplicateEntryOptionsWindow.strings
+++ b/MacPass/en.lproj/DuplicateEntryOptionsWindow.strings
@@ -1,17 +1,17 @@
-/* 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" = "Window";
-
-/* Class = "NSButtonCell"; title = "Duplicate Entry"; ObjectID = "WqI-qH-ARf"; */
-"WqI-qH-ARf.title" = "Duplicate Entry";
+/* 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 password instead of copying it"; ObjectID = "daA-QV-CDq"; */
-"daA-QV-CDq.title" = "Reference password instead of copying it";
+/* 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
index cd88d798..bfec3552 100644
--- a/MacPass/en.lproj/EntryInspectorView.strings
+++ b/MacPass/en.lproj/EntryInspectorView.strings
@@ -61,26 +61,14 @@
 /* Class = "NSSegmentedCell"; 238.ibShadowedLabels[2] = "Autotype"; ObjectID = "238"; */
 "238.ibShadowedLabels[2]" = "Autotype";
 
-/* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "NtM-y3-l4D"; */
-"NtM-y3-l4D.title" = "Quicklook";
-
-/* Class = "NSTextFieldCell"; placeholderString = "Custom Entry Sequence"; ObjectID = "R2X-Ex-c6q"; */
-"R2X-Ex-c6q.placeholderString" = "Custom Entry Sequence";
-
-/* Class = "NSTextFieldCell"; title = "Window Sequence"; ObjectID = "RQB-bR-MC0"; */
-"RQB-bR-MC0.title" = "Window Sequence";
-
-/* Class = "NSButtonCell"; title = "Show Plugin Data"; ObjectID = "X9y-K7-lix"; */
-"X9y-K7-lix.title" = "Show Plugin Data";
-
-/* Class = "NSTextFieldCell"; title = "Autotype Sequence"; ObjectID = "bQ5-0E-h3O"; */
-"bQ5-0E-h3O.title" = "Autotype Sequence";
+/* 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 = "NSMenuItem"; title = "Delete"; ObjectID = "bke-G2-oEf"; */
-"bke-G2-oEf.title" = "Delete";
+/* 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";
@@ -97,12 +85,24 @@
 /* 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/GeneralSettings.strings b/MacPass/en.lproj/GeneralSettings.strings
index 74967cf0..d4feb019 100644
--- a/MacPass/en.lproj/GeneralSettings.strings
+++ b/MacPass/en.lproj/GeneralSettings.strings
@@ -1,3 +1,6 @@
+/* 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";
 
@@ -52,12 +55,6 @@
 /* Class = "NSBox"; title = "File Handling"; ObjectID = "888"; */
 "888.title" = "File Handling";
 
-/* (No Comment) */
-"928.title" = "General";
-
-/* (No Comment) */
-"937.title" = "Double-click entry URL to Launch";
-
 /* 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.";
 
diff --git a/MacPass/en.lproj/InfoPlist.strings b/MacPass/en.lproj/InfoPlist.strings
index e65da53f..9b0fb6fe 100644
--- a/MacPass/en.lproj/InfoPlist.strings
+++ b/MacPass/en.lproj/InfoPlist.strings
@@ -1,3 +1,18 @@
+/* Bundle name */
+"CFBundleName" = "${PRODUCT_NAME}";
+
+/* (No Comment) */
+"KDB Database" = "KDB Database";
+
+/* (No Comment) */
+"KDBX Database" = "KDBX Database";
+
+/* (No Comment) */
+"MacPass Plugin" = "MacPass Plugin";
+
 /* (No Comment) */
 "NSHumanReadableCopyright" = "Copyright ©2012-2018 HicknHack Software GmbH. All rights reserved.";
 
+/* (No Comment) */
+"XML" = "XML";
+
diff --git a/MacPass/en.lproj/InspectorView.strings b/MacPass/en.lproj/InspectorView.strings
index 0e57d23b..400d63f6 100644
--- a/MacPass/en.lproj/InspectorView.strings
+++ b/MacPass/en.lproj/InspectorView.strings
@@ -13,12 +13,12 @@
 /* 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";
 
-/* Class = "NSTextFieldCell"; title = "Notes"; ObjectID = "hwn-UY-9Cr"; */
-"hwn-UY-9Cr.title" = "Notes";
-
diff --git a/MacPass/en.lproj/IntegrationSettings.strings b/MacPass/en.lproj/IntegrationSettings.strings
index 1f6bae64..032a8063 100644
--- a/MacPass/en.lproj/IntegrationSettings.strings
+++ b/MacPass/en.lproj/IntegrationSettings.strings
@@ -1,9 +1,6 @@
 /* Class = "NSButtonCell"; title = "Enable global Autotype"; ObjectID = "1qb-Rd-jYu"; */
 "1qb-Rd-jYu.title" = "Enable global Autotype";
 
-/* (No Comment) */
-"3.title" = "Enable KeePassHttp server";
-
 /* Class = "NSTextFieldCell"; title = "Shortcut"; ObjectID = "6oN-CH-T0O"; */
 "6oN-CH-T0O.title" = "Shortcut";
 
@@ -13,20 +10,29 @@
 /* Class = "NSButtonCell"; title = "Enable Quicklook Preview"; ObjectID = "ERs-ct-Eyx"; */
 "ERs-ct-Eyx.title" = "Enable Quicklook Preview";
 
-/* (No Comment) */
-"KbH-0Q-5Tw.title" = "Keepass HTTP";
+/* Class = "NSTextFieldCell"; title = "Autotype is not available, because MacPass is not allowed to control your computer. To enable Autotype, go to the Security and Privacy Preferences and add MacPass to the Accessibilty group. Changes require a restart of MacPass."; ObjectID = "H37-ku-aTc"; */
+"H37-ku-aTc.title" = "Autotype is not available, because MacPass is not allowed to control your computer. To enable Autotype, go to the Security and Privacy Preferences and add MacPass to the Accessibilty group. Changes require a restart of MacPass.";
 
 /* Class = "NSTextFieldCell"; title = "Shortcut is missing Key"; ObjectID = "Lxp-wI-yQy"; */
 "Lxp-wI-yQy.title" = "Shortcut is missing Key";
 
+/* Class = "NSButtonCell"; title = "Open Preference…"; ObjectID = "NP0-R3-m6n"; */
+"NP0-R3-m6n.title" = "Open Preference…";
+
 /* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
 "P9N-HM-wER.title" = "Autotype";
 
+/* Class = "NSButtonCell"; title = "Interpret ⌃ as ⌘"; ObjectID = "QfO-yG-l3F"; */
+"QfO-yG-l3F.title" = "Interpret ⌃ as ⌘";
+
 /* 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 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";
 
 /* Class = "NSButtonCell"; title = "Include Entry URL for matches"; ObjectID = "TzR-00-Vp3"; */
 "TzR-00-Vp3.title" = "Include Entry URL for matches";
@@ -35,11 +41,5 @@
 "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. This is a potential security risk!";
-
-/* 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";
+"WmI-IB-Aso.title" = "If enabled attached files will be copied to a temporary location for preview and deleted after the preview is closed.";
 
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index b1beaccc..01f19313 100644
--- a/MacPass/en.lproj/Localizable.strings
+++ b/MacPass/en.lproj/Localizable.strings
@@ -37,6 +37,19 @@
 /* Alert informative text to ask the user if he really want to uninstall the plugin */
 "ALERT_INFORMATIVE_TEXT_REALLY_UNINSTALL_PLUGIN" = "The Plugin will be moved to the Trash.";
 
+/* Button in dialog to cancel merge of KDB file changes! */
+"ALERT_MERGE_CANCEL" = "Cancel";
+
+/* Button in dialog to merge KDB changes into file! */
+"ALERT_MERGE_CONTINUE" = "Merge files!";
+
+/* Informative text displayed when merging KDB files */
+"ALERT_MERGE_KDB_FILE_INFO_TEXT" = "KDB databases do not contain enough information for a seamless merge. Entries will get merged and no data is lost. But due to groups only being matched by name, hence unexpected changes might occur. Such as moved entries will get moved back to their old group, or renamed groups will not get merged. Also deleted entries might reappear due to no information regarding deleted objects being stored. Are you sure you want to proceed?
+";
+
+/* Alert message warning user about KDB file merge */
+"ALERT_MERGE_KDB_FILE_MESSAGE" = "You're a merging KDB database";
+
 /* Alert message text when plugins or their settings change and require a restart */
 "ALERT_MESSAGE_PLUGINS_CHANGED_SUGGEST_RESTART" = "Plugin settings changed. Please restart.";
 
@@ -47,6 +60,9 @@
    Menu item to toggle display of attachment count column in entry table */
 "ATTACHMENTS" = "Attachments";
 
+/* Sucessfully merged external changes */
+"AUTO_MERGE_NOTIFICATION_TEXT" = "Auto merge successfull!";
+
 /* Menu item for automatic trash creation */
 "AUTOCREATE_TRASH_FOLDER" = "Create Automatically";
 
@@ -68,9 +84,6 @@
 /* Enable autotype menu item */
 "AUTOTYPE_YES" = "Enable Autotype";
 
-/* Sucessfully merged external changes */
-"AUTO_MERGE_NOTIFICATION_TEXT" = "Auto merge successfull!";
-
 /* Cancel */
 "CANCEL" = "Cancel";
 
@@ -87,15 +100,15 @@
 /* Menu item in the database outline context menu to change the trash group */
 "CHANGE_TRASH_GROUP" = "Change Trash Group";
 
-/* String displayed at dock badge when clipboard is about to be cleared */
-"CLEARING_PASTEBOARD" = "Cleared";
-
 /* Clear Autotype Button */
 "CLEAR_AUTOTYPE" = "Clear Autotype";
 
 /* Menu to clear recent searches */
 "CLEAR_RECENT_SEARCHES" = "Clear recent searches";
 
+/* String displayed at dock badge when clipboard is about to be cleared */
+"CLEARING_PASTEBOARD" = "Cleared";
+
 /* Field name that was copied to the pasteboard */
 "COPIED_FIELD_%@" = "Copied %@";
 
@@ -232,12 +245,6 @@
 /* The master key was changed by an external program! */
 "EXTERN_CHANGE_OF_MASTERKEY" = "Master key was changed by another program";
 
-/* Informative text displayed when the file was change from another application */
-"FILE_CHANGED_BY_OTHERS_INFO_TEXT" = "The database loaded is not the same as the one on disk. How do you want to move on?";
-
-/* Message displayed when an open file was changed from another application */
-"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT" = "The database file was modified!";
-
 /* External file change strategy option: ask what to do */
 "FILE_CHANGE_STRATEGY_ASK" = "Ask";
 
@@ -251,6 +258,12 @@
 /* External file change strategy option: Use the changed file and discard local changes */
 "FILE_CHANGE_STRATEGY_USE_OTHER" = "Load Changed Version and Discard Mine";
 
+/* Informative text displayed when the file was change from another application */
+"FILE_CHANGED_BY_OTHERS_INFO_TEXT" = "The database loaded is not the same as the one on disk. How do you want to move on?";
+
+/* Message displayed when an open file was changed from another application */
+"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT" = "The database file was modified!";
+
 /* Error while reopening last known documents */
 "FILE_OPEN_ERROR" = "Error opening file.";
 
@@ -316,6 +329,9 @@
 /* Action title for moving a group via drag and drop */
 "MOVE_GROUP" = "Move Group";
 
+/* Menu displayed as popup selection for search options when multiple items are selected */
+"MULTIPLE_FILTERS_ACTIVE_WITH_DOTS" = "Multiple…";
+
 /* Name for a newly created Database */
 "NEW_DATABASE" = "Database";
 
@@ -332,6 +348,15 @@
    Toolbar item new group */
 "NEW_GROUP" = "New Group";
 
+/* Expiration date format, when item does not expire */
+"NO_EXPIRE_DATE_SET" = "Never expires.";
+
+/* Menu item to reset the template groups */
+"NO_TEMPLATE_GROUP" = "No Templates";
+
+/* Menu item added to show that no templates are defined */
+"NO_TEMPLATES" = "No Templates found";
+
 /* Null placeholder for item input field
    Placeholder text for input fields if no entry or group is selected */
 "NONE" = "None";
@@ -342,15 +367,6 @@
    Notes reference item */
 "NOTES" = "Notes";
 
-/* Expiration date format, when item does not expire */
-"NO_EXPIRE_DATE_SET" = "Never expires.";
-
-/* Menu item added to show that no templates are defined */
-"NO_TEMPLATES" = "No Templates found";
-
-/* Menu item to reset the template groups */
-"NO_TEMPLATE_GROUP" = "No Templates";
-
 /* Ok button */
 "OK" = "OK";
 
@@ -510,7 +526,7 @@
 /* Message for the dialog to open a file for merge */
 "SELECT_FILE_TO_MERGE" = "Select file to merge";
 
-/* Menu displayed as popup selection for search options */
+/* Menu displayed as popup selection for search options if no filter is selected */
 "SELECT_FILTER_WITH_DOTS" = "Select…";
 
 /* Checkbox in dialog to set the selection as default file change strategy! */
@@ -556,6 +572,9 @@
 /* Update Settings Label */
 "UPDATE_SETTINGS" = "Updates";
 
+/* Message text for disabled updates alert! */
+"Updates are disabled!" = "Updates are disabled!";
+
 /* Menu item to toggle display of url column in entry table
    Submenu with options what to do with the URL of an entry
    Url column title
@@ -571,9 +590,6 @@
    UUID reference item */
 "UUID" = "UUID";
 
-/* Message text for disabled updates alert! */
-"Updates are disabled!" = "Updates are disabled!";
-
 /* No Key or Password */
 "WARNING_NO_PASSWORD_OR_KEYFILE" = "No password or keyfile supplied!";
 
diff --git a/MacPass/en.lproj/Localizable.stringsdict b/MacPass/en.lproj/Localizable.stringsdict
index d3155d61..e3db31f3 100644
--- a/MacPass/en.lproj/Localizable.stringsdict
+++ b/MacPass/en.lproj/Localizable.stringsdict
@@ -1,52 +1,96 @@
-{
-    "%ld_CHARACTERS_TO_PICK_REMAINING" =     {
-        NSStringLocalizedFormatKey = "%#@characters@";
-        characters =         {
-            NSStringFormatSpecTypeKey = NSStringPluralRuleType;
-            NSStringFormatValueTypeKey = ld;
-            one = "One character remaining";
-            other = "%ld characters remaining";
-            zero = "All characters picked";
-        };
-    };
-    "DUPLICATE_ENTRIES_%ld" =     {
-        NSStringLocalizedFormatKey = "%#@entries@";
-        entries =         {
-            NSStringFormatSpecTypeKey = NSStringPluralRuleType;
-            NSStringFormatValueTypeKey = ld;
-            one = "Duplicate Entry";
-            other = "Duplicate Entries";
-            zero = "Duplicate Entries";
-        };
-    };
-    "EVERY_%ld_DAYS" =     {
-        NSStringLocalizedFormatKey = "%#@days@";
-        days =         {
-            NSStringFormatSpecTypeKey = NSStringPluralRuleType;
-            NSStringFormatValueTypeKey = ld;
-            one = "every day";
-            other = "every %ld days";
-            zero = "after each unlock";
-        };
-    };
-    "PICKCHAR_INFO_MESSAGE_PICK_CHARACTERS_%ld" =     {
-        NSStringLocalizedFormatKey = "%#@characters@";
-        characters =         {
-            NSStringFormatSpecTypeKey = NSStringPluralRuleType;
-            NSStringFormatValueTypeKey = ld;
-            one = "Please pick a single character to use";
-            other = "Please pick %ld characters to use";
-            zero = "Please pick the characters to use";
-        };
-    };
-    "PICKED_%ld_CHARACTERS" =     {
-        NSStringLocalizedFormatKey = "%#@characters@";
-        characters =         {
-            NSStringFormatSpecTypeKey = NSStringPluralRuleType;
-            NSStringFormatValueTypeKey = ld;
-            one = "%ld character picked";
-            other = "%ld characters picked";
-            zero = "No characters picked";
-        };
-    };
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>%ld_CHARACTERS_TO_PICK_REMAINING</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@characters@</string>
+		<key>characters</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>one</key>
+			<string>One character remaining</string>
+			<key>other</key>
+			<string>%ld characters remaining</string>
+			<key>zero</key>
+			<string>All characters picked</string>
+		</dict>
+	</dict>
+	<key>DUPLICATE_ENTRIES_%ld</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@entries@</string>
+		<key>entries</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>one</key>
+			<string>Duplicate Entry</string>
+			<key>other</key>
+			<string>Duplicate Entries</string>
+			<key>zero</key>
+			<string>Duplicate Entries</string>
+		</dict>
+	</dict>
+	<key>EVERY_%ld_DAYS</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@days@</string>
+		<key>days</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>one</key>
+			<string>every day</string>
+			<key>other</key>
+			<string>every %ld days</string>
+			<key>zero</key>
+			<string>after each unlock</string>
+		</dict>
+	</dict>
+	<key>PICKCHAR_INFO_MESSAGE_PICK_CHARACTERS_%ld</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@characters@</string>
+		<key>characters</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>one</key>
+			<string>Please pick a single character to use</string>
+			<key>other</key>
+			<string>Please pick %ld characters to use</string>
+			<key>zero</key>
+			<string>Please pick the characters to use</string>
+		</dict>
+	</dict>
+	<key>PICKED_%ld_CHARACTERS</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>%#@characters@</string>
+		<key>characters</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+			<string>ld</string>
+			<key>one</key>
+			<string>%ld character picked</string>
+			<key>other</key>
+			<string>%ld characters picked</string>
+			<key>zero</key>
+			<string>No characters picked</string>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/MacPass/en.lproj/MainMenu.strings b/MacPass/en.lproj/MainMenu.strings
index 26e7dcc5..d98009fc 100644
--- a/MacPass/en.lproj/MainMenu.strings
+++ b/MacPass/en.lproj/MainMenu.strings
@@ -139,7 +139,7 @@
 /* Class = "NSMenuItem"; title = "Toggle Inspector"; ObjectID = "1181"; */
 "1181.title" = "Toggle Inspector";
 
-/* Class = "NSMenuItem"; title = "Show Password Creator"; ObjectID = "1200"; */
+/* Class = "NSMenuItem"; title = "Show Password Generator"; ObjectID = "1200"; */
 "1200.title" = "Show Password Generator";
 
 /* Class = "NSMenuItem"; title = "Change Master Password…"; ObjectID = "1203"; */
@@ -152,26 +152,20 @@
 "1243.title" = "Save As…";
 
 /* Class = "NSMenuItem"; title = "XML…"; ObjectID = "1259"; */
-"1259.title" = "Export As XML…";
+"1259.title" = "XML…";
 
 /* Class = "NSMenuItem"; title = "Lock"; ObjectID = "1261"; */
 "1261.title" = "Lock";
 
-/* Class = "NSMenuItem"; title = "Focus Groups"; ObjectID = "HxM-dV-LIH"; */
-"HxM-dV-LIH.title" = "Focus Groups";
-
-/* Class = "NSMenu"; title = "Item"; ObjectID = "Ttt-tR-emo"; */
-"Ttt-tR-emo.title" = "Item";
-
-/* Class = "NSMenuItem"; title = "Focus Inspector"; ObjectID = "Zje-Me-5c8"; */
-"Zje-Me-5c8.title" = "Focus Inspector";
-
 /* 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…";
 
@@ -182,14 +176,20 @@
 "p8h-Fg-h1O.title" = "Export";
 
 /* Class = "NSMenuItem"; title = "XML…"; ObjectID = "rW0-r1-QYL"; */
-"rW0-r1-QYL.title" = "Import XML…";
+"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…"; ObjectID = "zvE-0h-UxI"; */
-"zvE-0h-UxI.title" = "Merge…";
+/* 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
index 26287ddd..fc2b6fec 100644
--- a/MacPass/en.lproj/OpenPanelAccessoryView.strings
+++ b/MacPass/en.lproj/OpenPanelAccessoryView.strings
@@ -1,6 +1,6 @@
-
 /* 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
index 2a3d8e52..9da736b5 100644
--- a/MacPass/en.lproj/PasswordCreatorView.strings
+++ b/MacPass/en.lproj/PasswordCreatorView.strings
@@ -37,9 +37,9 @@
 /* Class = "NSTextFieldCell"; title = "25000 bit"; ObjectID = "653"; */
 "653.title" = "25000 bit";
 
-/* Class = "NSButtonCell"; title = "Set Default"; ObjectID = "Wvs-Md-Ob8"; */
-"Wvs-Md-Ob8.title" = "Set Default";
-
 /* 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
index 4ee35fad..76a18782 100644
--- a/MacPass/en.lproj/PasswordEditWindow.strings
+++ b/MacPass/en.lproj/PasswordEditWindow.strings
@@ -1,5 +1,5 @@
 /* Class = "NSWindow"; title = "Change Password"; ObjectID = "1"; */
-"1.title" = "Window";
+"1.title" = "Change Password";
 
 /* Class = "NSTextFieldCell"; title = "Missmatching Passwords"; ObjectID = "14"; */
 "14.title" = "Missmatching Passwords";
diff --git a/MacPass/en.lproj/PasswordInputView.strings b/MacPass/en.lproj/PasswordInputView.strings
index 3062f5d6..d8a7a3fc 100644
--- a/MacPass/en.lproj/PasswordInputView.strings
+++ b/MacPass/en.lproj/PasswordInputView.strings
@@ -10,9 +10,9 @@
 /* Class = "NSSecureTextFieldCell"; placeholderString = "Enter Password"; ObjectID = "339"; */
 "339.placeholderString" = "Enter Password";
 
-/* Class = "NSButtonCell"; title = "Password"; ObjectID = "IU9-5u-jn9"; */
-"IU9-5u-jn9.title" = "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/PickfieldView.strings b/MacPass/en.lproj/PickfieldView.strings
index 6e878c5e..c629f33a 100644
--- a/MacPass/en.lproj/PickfieldView.strings
+++ b/MacPass/en.lproj/PickfieldView.strings
@@ -1,7 +1,7 @@
 /* Class = "NSTableColumn"; headerCell.title = "Field"; ObjectID = "0H9-DW-Jyj"; */
 "0H9-DW-Jyj.headerCell.title" = "Field";
 
-/* Class = "NSButtonCell"; title = "Done"; ObjectID = "6Wi-9i-Tcb"; */
+/* 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"; */
diff --git a/MacPass/en.lproj/PluginDataView.strings b/MacPass/en.lproj/PluginDataView.strings
index 5e11637e..6ea66b5e 100644
--- a/MacPass/en.lproj/PluginDataView.strings
+++ b/MacPass/en.lproj/PluginDataView.strings
@@ -1,15 +1,15 @@
-
 /* Class = "NSButtonCell"; title = "Remove All"; ObjectID = "6hH-Hc-gf4"; */
 "6hH-Hc-gf4.title" = "Remove All";
 
-/* Class = "NSTextFieldCell"; placeholderString = "Title"; ObjectID = "MaV-TP-92X"; */
-"MaV-TP-92X.placeholderString" = "Title";
-
 /* 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/PluginSettings.strings b/MacPass/en.lproj/PluginSettings.strings
index 8a19eb79..12503880 100644
--- a/MacPass/en.lproj/PluginSettings.strings
+++ b/MacPass/en.lproj/PluginSettings.strings
@@ -4,18 +4,18 @@
 /* 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 = "NSTextFieldCell"; title = "Plugin Settings Info"; ObjectID = "OOr-SW-jZb"; */
+"OOr-SW-jZb.title" = "Plugin Settings Info";
+
 /* Class = "NSButtonCell"; title = "Browse Plugins…"; ObjectID = "sqO-8H-n1y"; */
 "sqO-8H-n1y.title" = "Browse Plugins…";
 
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "STt-PQ-Szr"; */
+"STt-PQ-Szr.title" = "Text Cell";
+
 /* Class = "NSBox"; title = "Box"; ObjectID = "vBs-Ga-aq0"; */
 "vBs-Ga-aq0.title" = "Box";
 
diff --git a/MacPass/en.lproj/ReferenceBuilderView.strings b/MacPass/en.lproj/ReferenceBuilderView.strings
index aa998f3a..ab32c3a3 100644
--- a/MacPass/en.lproj/ReferenceBuilderView.strings
+++ b/MacPass/en.lproj/ReferenceBuilderView.strings
@@ -4,12 +4,6 @@
 /* Class = "NSMenuItem"; title = "Get"; ObjectID = "142-bE-IMZ"; */
 "142-bE-IMZ.title" = "Get";
 
-/* 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"; placeholderString = "Reference"; ObjectID = "dr9-x8-kKk"; */
 "dr9-x8-kKk.placeholderString" = "Reference";
 
@@ -19,6 +13,12 @@
 /* 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";
 
diff --git a/MacPass/en.lproj/UpdateSettings.strings b/MacPass/en.lproj/UpdateSettings.strings
index 0b674a2d..e6a1601d 100644
--- a/MacPass/en.lproj/UpdateSettings.strings
+++ b/MacPass/en.lproj/UpdateSettings.strings
@@ -7,6 +7,9 @@
 /* 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";
 
@@ -16,6 +19,3 @@
 /* Class = "NSMenuItem"; title = "every Month"; ObjectID = "Uo3-kv-1ro"; */
 "Uo3-kv-1ro.title" = "every Month";
 
-/* Class = "NSMenuItem"; title = "every Day"; ObjectID = "o9E-hk-H1T"; */
-"o9E-hk-H1T.title" = "every Day";
-
diff --git a/MacPass/en.lproj/WorkflowSettings.strings b/MacPass/en.lproj/WorkflowSettings.strings
index e75de854..8ee4dc0e 100644
--- a/MacPass/en.lproj/WorkflowSettings.strings
+++ b/MacPass/en.lproj/WorkflowSettings.strings
@@ -28,21 +28,21 @@
 /* Class = "NSMenuItem"; title = "Opens Inspector"; ObjectID = "44"; */
 "44.title" = "Opens Inspector";
 
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gej-kA-GzQ"; */
+"gej-kA-GzQ.title" = "Item 2";
+
 /* Class = "NSButtonCell"; title = "Update password for new entries"; ObjectID = "RaM-t2-DVR"; */
 "RaM-t2-DVR.title" = "Update password for new entries";
 
+/* Class = "NSTextFieldCell"; title = "Open URLs in:"; ObjectID = "soD-wI-YOH"; */
+"soD-wI-YOH.title" = "Open URLs in:";
+
 /* 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";