diff --git a/MacPass/Base.lproj/DatabaseSettingsWindow.xib b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
index 98cd57b3..4992e117 100644
--- a/MacPass/Base.lproj/DatabaseSettingsWindow.xib
+++ b/MacPass/Base.lproj/DatabaseSettingsWindow.xib
@@ -52,11 +52,11 @@
             <rect key="contentRect" x="196" y="240" width="500" height="335"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="458" height="388"/>
+                <rect key="frame" x="0.0" y="0.0" width="553" height="484"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="288">
-                        <rect key="frame" x="385" y="13" width="59" height="32"/>
+                        <rect key="frame" x="480" y="13" width="59" height="32"/>
                         <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="289">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -69,7 +69,7 @@ DQ
                         </connections>
                     </button>
                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="956">
-                        <rect key="frame" x="303" y="13" width="82" height="32"/>
+                        <rect key="frame" x="398" y="13" width="82" height="32"/>
                         <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="957">
                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                             <font key="font" metaFont="system"/>
@@ -82,7 +82,7 @@ Gw
                         </connections>
                     </button>
                     <tabView translatesAutoresizingMaskIntoConstraints="NO" id="357">
-                        <rect key="frame" x="13" y="41" width="432" height="341"/>
+                        <rect key="frame" x="13" y="41" width="527" height="437"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="General" identifier="1" id="358">
@@ -213,11 +213,11 @@ Gw
                             </tabViewItem>
                             <tabViewItem label="Security" identifier="" id="370">
                                 <view key="view" id="371">
-                                    <rect key="frame" x="10" y="33" width="412" height="295"/>
+                                    <rect key="frame" x="10" y="33" width="454" height="243"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3ek-Rg-w82">
-                                            <rect key="frame" x="129" y="251" width="155" height="26"/>
+                                            <rect key="frame" x="150" y="199" width="155" height="26"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="F8Y-Uw-4mL"/>
                                             </constraints>
@@ -228,7 +228,7 @@ Gw
                                             </popUpButtonCell>
                                         </popUpButton>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vH7-5a-52C">
-                                            <rect key="frame" x="52" y="258" width="73" height="17"/>
+                                            <rect key="frame" x="73" y="206" width="73" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Encryption:" id="gxY-UL-bEG">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -236,20 +236,20 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <box title="Key derivation" translatesAutoresizingMaskIntoConstraints="NO" id="pbl-Mb-r8V">
-                                            <rect key="frame" x="17" y="16" width="378" height="230"/>
+                                            <rect key="frame" x="17" y="16" width="420" height="178"/>
                                             <view key="contentView" id="hkT-SX-Te1">
-                                                <rect key="frame" x="2" y="2" width="374" height="213"/>
+                                                <rect key="frame" x="2" y="2" width="416" height="161"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="P98-Cu-Tha">
-                                                        <rect key="frame" x="211" y="18" width="143" height="25"/>
+                                                        <rect key="frame" x="253" y="18" width="143" height="25"/>
                                                         <buttonCell key="cell" type="roundTextured" title="Generate Parameters" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PoI-Er-Y8P">
                                                             <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="system"/>
                                                         </buttonCell>
                                                     </button>
                                                     <tabView drawsBackground="NO" type="noTabsNoBorder" translatesAutoresizingMaskIntoConstraints="NO" id="2MY-PW-kzL">
-                                                        <rect key="frame" x="13" y="50" width="348" height="114"/>
+                                                        <rect key="frame" x="13" y="50" width="390" height="62"/>
                                                         <font key="font" metaFont="system"/>
                                                         <tabViewItems>
                                                             <tabViewItem label="Aes" identifier="1" id="ft1-pl-lpO">
@@ -393,24 +393,18 @@ Gw
                                                         </tabViewItems>
                                                     </tabView>
                                                     <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2cq-R3-Ksh">
-                                                        <rect key="frame" x="110" y="169" width="155" height="26"/>
-                                                        <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="3TG-ij-Je3" id="Pb9-YV-rYe">
+                                                        <rect key="frame" x="131" y="117" width="155" height="26"/>
+                                                        <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="Pb9-YV-rYe">
                                                             <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                             <font key="font" metaFont="menu"/>
-                                                            <menu key="menu" id="Xkn-e7-Cia">
-                                                                <items>
-                                                                    <menuItem title="Item 1" state="on" id="3TG-ij-Je3"/>
-                                                                    <menuItem title="Item 2" id="Y2i-7g-NOb"/>
-                                                                    <menuItem title="Item 3" id="vdQ-cw-Uvk"/>
-                                                                </items>
-                                                            </menu>
+                                                            <menu key="menu" id="Xkn-e7-Cia"/>
                                                         </popUpButtonCell>
                                                         <connections>
                                                             <action selector="selectKeyDerivation:" target="-2" id="aAv-dN-8bG"/>
                                                         </connections>
                                                     </popUpButton>
                                                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4el-r1-iRL">
-                                                        <rect key="frame" x="43" y="175" width="63" height="17"/>
+                                                        <rect key="frame" x="64" y="124" width="63" height="17"/>
                                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Algorithm" id="GVd-KH-pHc">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -544,17 +538,11 @@ Gw
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1738">
-                                            <rect key="frame" x="184" y="152" width="76" height="26"/>
-                                            <popUpButtonCell key="cell" type="push" title="Item 1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="1741" id="1739">
+                                            <rect key="frame" x="184" y="152" width="37" height="26"/>
+                                            <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="1739">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
-                                                <menu key="menu" title="OtherViews" id="1740">
-                                                    <items>
-                                                        <menuItem title="Item 1" state="on" id="1741"/>
-                                                        <menuItem title="Item 2" id="1742"/>
-                                                        <menuItem title="Item 3" id="1743"/>
-                                                    </items>
-                                                </menu>
+                                                <menu key="menu" title="OtherViews" id="1740"/>
                                             </popUpButtonCell>
                                         </popUpButton>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="19r-LE-7X5">
@@ -601,7 +589,7 @@ Gw
                                             <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="7Hw-Qf-zWf"/>
                                         </stepper>
                                         <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1584">
-                                            <rect key="frame" x="75" y="158" width="105" height="17"/>
+                                            <rect key="frame" x="75" y="159" width="105" height="17"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Template Group:" id="1588">
                                                 <font key="font" metaFont="system"/>
                                                 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -740,7 +728,7 @@ Gw
                     <constraint firstItem="956" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="2" secondAttribute="leading" constant="20" symbolic="YES" id="Yla-YR-bgz"/>
                 </constraints>
             </view>
-            <point key="canvasLocation" x="-1314" y="-536"/>
+            <point key="canvasLocation" x="-1200" y="-504"/>
         </window>
     </objects>
 </document>
diff --git a/MacPass/de.lproj/DatabaseSettingsWindow.strings b/MacPass/de.lproj/DatabaseSettingsWindow.strings
index 44ac683a..0b9ba884 100644
--- a/MacPass/de.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/de.lproj/DatabaseSettingsWindow.strings
@@ -2,13 +2,13 @@
 "1.title" = "Fenster";
 
 /* Class = "NSTextFieldCell"; title = "Threads"; ObjectID = "2QI-ne-N5d"; */
-"2QI-ne-N5d.title" = "Threads";
+"2QI-ne-N5d.title" = "ThreadsThreads";
 
 /* Class = "NSTextFieldCell"; title = "Iterations"; ObjectID = "2ZA-Gc-JdZ"; */
-"2ZA-Gc-JdZ.title" = "Wiederholungen";
+"2ZA-Gc-JdZ.title" = "WiederholungenWiederholungen";
 
 /* Class = "NSTextFieldCell"; title = "Enforce key change"; ObjectID = "5QH-N1-FHK"; */
-"5QH-N1-FHK.title" = "Erzwingen der Änderung des Schlüssels alle";
+"5QH-N1-FHK.title" = "Erzwingen der Änderung des SchlüsselsErzwingen der Änderung des Schlüssels";
 
 /* Class = "NSTabViewItem"; label = "Argon2"; ObjectID = "6qB-sH-9FI"; */
 "6qB-sH-9FI.label" = "Argon 2";
@@ -20,7 +20,7 @@
 "257.title" = "Beschreibung:";
 
 /* Class = "NSButtonCell"; title = "OK"; ObjectID = "289"; */
-"289.title" = "OK";
+"289.title" = "Ok";
 
 /* Class = "NSTabViewItem"; label = "General"; ObjectID = "358"; */
 "358.label" = "Allgemein";
@@ -31,21 +31,6 @@
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
 "370.label" = "Sicherheit";
 
-/* (No Comment) */
-"464.title" = "Titel schützen";
-
-/* (No Comment) */
-"477.title" = "Benutzername schützen";
-
-/* (No Comment) */
-"505.title" = "Passwort schützen";
-
-/* (No Comment) */
-"510.title" = "Link schützen";
-
-/* (No Comment) */
-"514.title" = "Notizen schützen";
-
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
 "532.title" = "Eintragsversionen aktivieren";
 
@@ -116,7 +101,7 @@
 "PoI-Er-Y8P.title" = "Parameter bestimmen";
 
 /* Class = "NSTextFieldCell"; title = "Recommend key change"; ObjectID = "Xib-Fn-sqx"; */
-"Xib-Fn-sqx.title" = "Empfehlung zur Änderung des Schlüssels alle";
+"Xib-Fn-sqx.title" = "Empfehlung zur Änderung des Schlüssels";
 
 /* Class = "NSTabViewItem"; label = "Aes"; ObjectID = "ft1-pl-lpO"; */
 "ft1-pl-lpO.label" = "AES";
@@ -128,7 +113,7 @@
 "iRY-If-Kwn.title" = "Speicher";
 
 /* Class = "NSTextFieldCell"; title = "Recylebin Group:"; ObjectID = "kI5-Kp-byE"; */
-"kI5-Kp-byE.title" = "Mülleimergruppe";
+"kI5-Kp-byE.title" = "Papierkorb:";
 
 /* Class = "NSButtonCell"; title = "Force key change once after unlocking"; ObjectID = "pA1-aL-KjT"; */
 "pA1-aL-KjT.title" = "Änderung des Schlüssels einmal nach dem Entsperren erzwingen";
diff --git a/MacPass/en.lproj/DatabaseSettingsWindow.strings b/MacPass/en.lproj/DatabaseSettingsWindow.strings
index 28d21eb7..76fb9ce5 100644
--- a/MacPass/en.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/en.lproj/DatabaseSettingsWindow.strings
@@ -20,21 +20,6 @@
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
 "370.label" = "Security";
 
-/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
-"464.title" = "Protect Title";
-
-/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
-"477.title" = "Protect Username";
-
-/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
-"505.title" = "Protect Password";
-
-/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
-"510.title" = "Protect URL";
-
-/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
-"514.title" = "Protect Notes";
-
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
 "532.title" = "Enable Entry History";
 
@@ -83,14 +68,5 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OtherViews";
 
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
-"1741.title" = "Item 1";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
-"1742.title" = "Item 2";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
-"1743.title" = "Item 3";
-
 /* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
 "1775.title" = "Benchmark";
diff --git a/MacPass/es.lproj/DatabaseSettingsWindow.strings b/MacPass/es.lproj/DatabaseSettingsWindow.strings
index 1e5aeb20..1e6d8728 100644
--- a/MacPass/es.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/es.lproj/DatabaseSettingsWindow.strings
@@ -20,21 +20,6 @@
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
 "370.label" = "Seguridad";
 
-/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
-"464.title" = "Proteger Título";
-
-/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
-"477.title" = "Proteger Nombre de Usuario";
-
-/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
-"505.title" = "Proteger Contraseña";
-
-/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
-"510.title" = "Proteger URL";
-
-/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
-"514.title" = "Proteger Notas";
-
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
 "532.title" = "Habilitar Consulta de Historial";
 
@@ -83,14 +68,5 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "Otras Vistas";
 
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
-"1741.title" = "Elemento 1";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
-"1742.title" = "Elemento 2";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
-"1743.title" = "Elemento 3";
-
 /* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
 "1775.title" = "Referencia";
diff --git a/MacPass/fr.lproj/DatabaseSettingsWindow.strings b/MacPass/fr.lproj/DatabaseSettingsWindow.strings
index 561c9efe..27a50b25 100644
--- a/MacPass/fr.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/fr.lproj/DatabaseSettingsWindow.strings
@@ -20,21 +20,6 @@
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
 "370.label" = "Sécurité";
 
-/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
-"464.title" = "Protéger le titre";
-
-/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
-"477.title" = "Protéger le nom d'utilisateur";
-
-/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
-"505.title" = "Protéger le mot de passe";
-
-/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
-"510.title" = "Protéger l'URL";
-
-/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
-"514.title" = "Protéger les notes";
-
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
 "532.title" = "Activer l'historique des entrées";
 
@@ -83,15 +68,6 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OtherViews";
 
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
-"1741.title" = "Item 1";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
-"1742.title" = "Item 2";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
-"1743.title" = "Item 3";
-
 /* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
 "1775.title" = "Benchmark";
 
diff --git a/MacPass/it.lproj/DatabaseSettingsWindow.strings b/MacPass/it.lproj/DatabaseSettingsWindow.strings
index d4ac0482..4f641ab1 100644
--- a/MacPass/it.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/it.lproj/DatabaseSettingsWindow.strings
@@ -23,18 +23,6 @@
 /* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
 "464.title" = "Proteggi Titolo";
 
-/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
-"477.title" = "Proteggi Nome Utente";
-
-/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
-"505.title" = "Proteggi Password";
-
-/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
-"510.title" = "Proteggi URL";
-
-/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
-"514.title" = "Proteggi Note";
-
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
 "532.title" = "Abilita Cronologia Elementi";
 
@@ -83,15 +71,6 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OtherViews";
 
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
-"1741.title" = "Elemento 1";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
-"1742.title" = "Elemento 2";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
-"1743.title" = "Elemento 3";
-
 /* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
 "1775.title" = "Benchmark";
 
diff --git a/MacPass/nl.lproj/DatabaseSettingsWindow.strings b/MacPass/nl.lproj/DatabaseSettingsWindow.strings
index fa7b246e..6bb897e8 100644
--- a/MacPass/nl.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/nl.lproj/DatabaseSettingsWindow.strings
@@ -20,21 +20,6 @@
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
 "370.label" = "Beveiliging";
 
-/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
-"464.title" = "Bescherm Titel";
-
-/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
-"477.title" = "Bescherm Gebruikersnaam";
-
-/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
-"505.title" = "Bescherm Wachtwoord";
-
-/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
-"510.title" = "Bescherm URL";
-
-/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
-"514.title" = "Bescherm Notities";
-
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
 "532.title" = "Activeer Input Geschiedenis";
 
@@ -83,14 +68,5 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OverigeViews";
 
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
-"1741.title" = "Item 1";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
-"1742.title" = "Item 2";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
-"1743.title" = "Item 3";
-
 /* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
 "1775.title" = "Benchmark";
diff --git a/MacPass/pl.lproj/DatabaseSettingsWindow.strings b/MacPass/pl.lproj/DatabaseSettingsWindow.strings
index c27af29b..876136e0 100644
--- a/MacPass/pl.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/pl.lproj/DatabaseSettingsWindow.strings
@@ -20,21 +20,6 @@
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
 "370.label" = "Bezpieczeństwo";
 
-/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
-"464.title" = "Chroń nazwę";
-
-/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
-"477.title" = "Chroń nazwę użytkownika";
-
-/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
-"505.title" = "Chroń hasło";
-
-/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
-"510.title" = "Chroń link";
-
-/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
-"514.title" = "Chroń notatki";
-
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
 "532.title" = "Włącz historię wpisu";
 
@@ -83,15 +68,6 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OtherViews";
 
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
-"1741.title" = "Item 1";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
-"1742.title" = "Item 2";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
-"1743.title" = "Item 3";
-
 /* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
 "1775.title" = "Benchmark";
 
diff --git a/MacPass/ru.lproj/DatabaseSettingsWindow.strings b/MacPass/ru.lproj/DatabaseSettingsWindow.strings
index 7ecb3529..d1d8dcb0 100644
--- a/MacPass/ru.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/ru.lproj/DatabaseSettingsWindow.strings
@@ -20,21 +20,6 @@
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
 "370.label" = "Безопасность";
 
-/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
-"464.title" = "Защитить Заголовок";
-
-/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
-"477.title" = "Защитить Имя пользователя";
-
-/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
-"505.title" = "Защитить Пароль";
-
-/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
-"510.title" = "Защитить URL";
-
-/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
-"514.title" = "Защитить Заметки";
-
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
 "532.title" = "Включить Историю Записи";
 
@@ -83,15 +68,6 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OtherViews";
 
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
-"1741.title" = "Элемент 1";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
-"1742.title" = "Элемент 2";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
-"1743.title" = "Элемент 3";
-
 /* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
 "1775.title" = "Тест";
 
diff --git a/MacPass/zh-Hans.lproj/DatabaseSettingsWindow.strings b/MacPass/zh-Hans.lproj/DatabaseSettingsWindow.strings
index 627025c3..1f710827 100644
--- a/MacPass/zh-Hans.lproj/DatabaseSettingsWindow.strings
+++ b/MacPass/zh-Hans.lproj/DatabaseSettingsWindow.strings
@@ -20,21 +20,6 @@
 /* Class = "NSTabViewItem"; label = "Security"; ObjectID = "370"; */
 "370.label" = "安全";
 
-/* Class = "NSButtonCell"; title = "Protect Title"; ObjectID = "464"; */
-"464.title" = "保护标题";
-
-/* Class = "NSButtonCell"; title = "Protect Username"; ObjectID = "477"; */
-"477.title" = "保护用户名";
-
-/* Class = "NSButtonCell"; title = "Protect Password"; ObjectID = "505"; */
-"505.title" = "保护密码";
-
-/* Class = "NSButtonCell"; title = "Protect URL"; ObjectID = "510"; */
-"510.title" = "保护 URL";
-
-/* Class = "NSButtonCell"; title = "Protect Notes"; ObjectID = "514"; */
-"514.title" = "保护注释";
-
 /* Class = "NSButtonCell"; title = "Enable Entry History"; ObjectID = "532"; */
 "532.title" = "使用项目历史";
 
@@ -83,14 +68,5 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1740"; */
 "1740.title" = "OtherViews";
 
-/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "1741"; */
-"1741.title" = "Item 1";
-
-/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "1742"; */
-"1742.title" = "Item 2";
-
-/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "1743"; */
-"1743.title" = "Item 3";
-
 /* Class = "NSButtonCell"; title = "Benchmark"; ObjectID = "1775"; */
 "1775.title" = "测试";