diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 1f5d8a31..d4466603 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -96,7 +96,6 @@
 		4C3B42871F935316007B04FD /* MPDayCountFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3B42861F935316007B04FD /* MPDayCountFormatter.m */; };
 		4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */; };
 		4C3C4EAF18D7039300153127 /* MPValueTransformerHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3C4EAE18D7039300153127 /* MPValueTransformerHelper.m */; };
-		4C3FFD9E16DAF60600DF9186 /* ContextBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* ContextBar.xib */; };
 		4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */; };
 		4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */; };
 		4C45FB1D178E09ED0010007D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77E36615B84A240093A587 /* Cocoa.framework */; };
@@ -140,6 +139,7 @@
 		4C6B7C7D18BE7EB0001D5D77 /* MPDocument+History.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6B7C7C18BE7EB0001D5D77 /* MPDocument+History.m */; };
 		4C6BC6601A36717E00BDDF3D /* MPDatabaseSearch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6BC65F1A36717E00BDDF3D /* MPDatabaseSearch.m */; };
 		4C6D1D25178579570014C5A5 /* 48_FolderTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */; };
+		4C6DCC451FA2457900C8AD3F /* ContextBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C6DCC471FA2457900C8AD3F /* ContextBar.xib */; };
 		4C6F228919A4A7F90012310C /* MPAutotypeClear.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6F228819A4A7F90012310C /* MPAutotypeClear.m */; };
 		4C6F228C19A4AA700012310C /* MPAutotypeDelay.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6F228B19A4AA700012310C /* MPAutotypeDelay.m */; };
 		4C701CBC178618A000581B88 /* 12_RemoteTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */; };
@@ -418,7 +418,6 @@
 		4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarDelegate.m; sourceTree = "<group>"; };
 		4C3C4EAD18D7039300153127 /* MPValueTransformerHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPValueTransformerHelper.h; sourceTree = "<group>"; };
 		4C3C4EAE18D7039300153127 /* MPValueTransformerHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPValueTransformerHelper.m; sourceTree = "<group>"; };
-		4C3FFD9D16DAF60600DF9186 /* ContextBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ContextBar.xib; sourceTree = "<group>"; };
 		4C4161021F50333B003BC0AF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/DatabaseSettingsWindow.strings; sourceTree = "<group>"; };
 		4C4161031F50333B003BC0AF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/PasswordEditWindow.strings; sourceTree = "<group>"; };
 		4C4161041F50333B003BC0AF /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/GeneralSettings.strings; sourceTree = "<group>"; };
@@ -522,6 +521,16 @@
 		4C6B7C7C18BE7EB0001D5D77 /* MPDocument+History.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "MPDocument+History.m"; sourceTree = "<group>"; };
 		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>"; };
+		4C6DCC511FA2458000C8AD3F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/ContextBar.strings; sourceTree = "<group>"; };
+		4C6DCC531FA2458100C8AD3F /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/ContextBar.strings; sourceTree = "<group>"; };
+		4C6DCC551FA2458200C8AD3F /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/ContextBar.strings; sourceTree = "<group>"; };
+		4C6DCC571FA2458200C8AD3F /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/ContextBar.strings; sourceTree = "<group>"; };
+		4C6DCC591FA2458300C8AD3F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/ContextBar.strings; sourceTree = "<group>"; };
 		4C6F228719A4A7F90012310C /* MPAutotypeClear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAutotypeClear.h; sourceTree = "<group>"; };
 		4C6F228819A4A7F90012310C /* MPAutotypeClear.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAutotypeClear.m; sourceTree = "<group>"; };
 		4C6F228A19A4AA700012310C /* MPAutotypeDelay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAutotypeDelay.h; sourceTree = "<group>"; };
@@ -1393,7 +1402,7 @@
 				6021FE7918E15FF300C3BC51 /* DatePickingView.xib */,
 				4C1E9883185F71A800943563 /* MPContextBarViewController.h */,
 				4C1E9884185F71A800943563 /* MPContextBarViewController.m */,
-				4C3FFD9D16DAF60600DF9186 /* ContextBar.xib */,
+				4C6DCC471FA2457900C8AD3F /* ContextBar.xib */,
 				4C26C34818D8D5A300CF1A1C /* MPPreviewViewController.h */,
 				4C26C34918D8D5A300CF1A1C /* MPPreviewViewController.m */,
 				4C26C34A18D8D5A300CF1A1C /* PreviewView.xib */,
@@ -1681,7 +1690,7 @@
 				4C3826B31AD04D8E007D7D67 /* 38_SambaUnmountTemplate.pdf in Resources */,
 				4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */,
 				4C6AEF031A04400E00CA2420 /* OpenPanelAccessoryView.xib in Resources */,
-				4C3FFD9E16DAF60600DF9186 /* ContextBar.xib in Resources */,
+				4C6DCC451FA2457900C8AD3F /* ContextBar.xib in Resources */,
 				4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */,
 				4C3826B61AD04D8E007D7D67 /* 41_VectorTemplate.pdf in Resources */,
 				4C17F105184E630200E85625 /* 14_BatteryTemplate.pdf in Resources */,
@@ -1950,6 +1959,23 @@
 			name = KPKLocalizable.strings;
 			sourceTree = "<group>";
 		};
+		4C6DCC471FA2457900C8AD3F /* ContextBar.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				4C6DCC461FA2457900C8AD3F /* Base */,
+				4C6DCC491FA2457C00C8AD3F /* en */,
+				4C6DCC4B1FA2457D00C8AD3F /* de */,
+				4C6DCC4D1FA2457E00C8AD3F /* fr */,
+				4C6DCC4F1FA2457F00C8AD3F /* zh-Hans */,
+				4C6DCC511FA2458000C8AD3F /* nl */,
+				4C6DCC531FA2458100C8AD3F /* ru */,
+				4C6DCC551FA2458200C8AD3F /* it */,
+				4C6DCC571FA2458200C8AD3F /* pl */,
+				4C6DCC591FA2458300C8AD3F /* es */,
+			);
+			name = ContextBar.xib;
+			sourceTree = "<group>";
+		};
 		4C7155DA1A10DB6D00979307 /* IconSelection.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/MacPass/ContextBar.xib b/MacPass/Base.lproj/ContextBar.xib
similarity index 98%
rename from MacPass/ContextBar.xib
rename to MacPass/Base.lproj/ContextBar.xib
index 7d3aadac..abfc710e 100644
--- a/MacPass/ContextBar.xib
+++ b/MacPass/Base.lproj/ContextBar.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12120"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -156,7 +156,7 @@
                                             <action selector="emptyTrash:" target="-1" id="uIZ-CN-kXB"/>
                                         </connections>
                                     </button>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rf3-f0-SSx">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rf3-f0-SSx">
                                         <rect key="frame" x="20" y="7" width="41" height="17"/>
                                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Trash" id="8P1-Rp-sF4">
                                             <font key="font" metaFont="systemBold"/>
@@ -213,7 +213,7 @@
                                             <action selector="revertToHistoryEntry:" target="-1" id="n70-c5-0JJ"/>
                                         </connections>
                                     </button>
-                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hMK-l1-qew">
+                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hMK-l1-qew">
                                         <rect key="frame" x="20" y="7" width="52" height="17"/>
                                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="History" id="ER3-Ic-v0N">
                                             <font key="font" metaFont="systemBold"/>
diff --git a/MacPass/de.lproj/ContextBar.strings b/MacPass/de.lproj/ContextBar.strings
new file mode 100644
index 00000000..035c4309
--- /dev/null
+++ b/MacPass/de.lproj/ContextBar.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
+"7.title" = "Search:";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
+"53D-ne-nv6.title" = "Title";
+
+/* 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 = "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 = "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 = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
+"cpr-p6-YAY.title" = "Item 2";
+
+/* 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 = "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 = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
+"wC4-fF-dLW.title" = "OtherViews";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
+"z4I-cp-nhf.label" = "History";
diff --git a/MacPass/en.lproj/ContextBar.strings b/MacPass/en.lproj/ContextBar.strings
new file mode 100644
index 00000000..035c4309
--- /dev/null
+++ b/MacPass/en.lproj/ContextBar.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
+"7.title" = "Search:";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
+"53D-ne-nv6.title" = "Title";
+
+/* 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 = "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 = "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 = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
+"cpr-p6-YAY.title" = "Item 2";
+
+/* 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 = "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 = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
+"wC4-fF-dLW.title" = "OtherViews";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
+"z4I-cp-nhf.label" = "History";
diff --git a/MacPass/es.lproj/ContextBar.strings b/MacPass/es.lproj/ContextBar.strings
new file mode 100644
index 00000000..035c4309
--- /dev/null
+++ b/MacPass/es.lproj/ContextBar.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
+"7.title" = "Search:";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
+"53D-ne-nv6.title" = "Title";
+
+/* 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 = "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 = "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 = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
+"cpr-p6-YAY.title" = "Item 2";
+
+/* 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 = "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 = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
+"wC4-fF-dLW.title" = "OtherViews";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
+"z4I-cp-nhf.label" = "History";
diff --git a/MacPass/fr.lproj/ContextBar.strings b/MacPass/fr.lproj/ContextBar.strings
new file mode 100644
index 00000000..035c4309
--- /dev/null
+++ b/MacPass/fr.lproj/ContextBar.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
+"7.title" = "Search:";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
+"53D-ne-nv6.title" = "Title";
+
+/* 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 = "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 = "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 = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
+"cpr-p6-YAY.title" = "Item 2";
+
+/* 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 = "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 = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
+"wC4-fF-dLW.title" = "OtherViews";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
+"z4I-cp-nhf.label" = "History";
diff --git a/MacPass/it.lproj/ContextBar.strings b/MacPass/it.lproj/ContextBar.strings
new file mode 100644
index 00000000..035c4309
--- /dev/null
+++ b/MacPass/it.lproj/ContextBar.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
+"7.title" = "Search:";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
+"53D-ne-nv6.title" = "Title";
+
+/* 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 = "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 = "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 = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
+"cpr-p6-YAY.title" = "Item 2";
+
+/* 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 = "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 = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
+"wC4-fF-dLW.title" = "OtherViews";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
+"z4I-cp-nhf.label" = "History";
diff --git a/MacPass/nl.lproj/ContextBar.strings b/MacPass/nl.lproj/ContextBar.strings
new file mode 100644
index 00000000..035c4309
--- /dev/null
+++ b/MacPass/nl.lproj/ContextBar.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
+"7.title" = "Search:";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
+"53D-ne-nv6.title" = "Title";
+
+/* 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 = "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 = "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 = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
+"cpr-p6-YAY.title" = "Item 2";
+
+/* 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 = "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 = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
+"wC4-fF-dLW.title" = "OtherViews";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
+"z4I-cp-nhf.label" = "History";
diff --git a/MacPass/pl.lproj/ContextBar.strings b/MacPass/pl.lproj/ContextBar.strings
new file mode 100644
index 00000000..035c4309
--- /dev/null
+++ b/MacPass/pl.lproj/ContextBar.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
+"7.title" = "Search:";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
+"53D-ne-nv6.title" = "Title";
+
+/* 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 = "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 = "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 = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
+"cpr-p6-YAY.title" = "Item 2";
+
+/* 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 = "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 = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
+"wC4-fF-dLW.title" = "OtherViews";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
+"z4I-cp-nhf.label" = "History";
diff --git a/MacPass/ru.lproj/ContextBar.strings b/MacPass/ru.lproj/ContextBar.strings
new file mode 100644
index 00000000..035c4309
--- /dev/null
+++ b/MacPass/ru.lproj/ContextBar.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
+"7.title" = "Search:";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
+"53D-ne-nv6.title" = "Title";
+
+/* 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 = "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 = "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 = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
+"cpr-p6-YAY.title" = "Item 2";
+
+/* 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 = "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 = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
+"wC4-fF-dLW.title" = "OtherViews";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
+"z4I-cp-nhf.label" = "History";
diff --git a/MacPass/zh-Hans.lproj/ContextBar.strings b/MacPass/zh-Hans.lproj/ContextBar.strings
new file mode 100644
index 00000000..035c4309
--- /dev/null
+++ b/MacPass/zh-Hans.lproj/ContextBar.strings
@@ -0,0 +1,54 @@
+
+/* Class = "NSTextFieldCell"; title = "Search:"; ObjectID = "7"; */
+"7.title" = "Search:";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "53D-ne-nv6"; */
+"53D-ne-nv6.title" = "Title";
+
+/* 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 = "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 = "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 = "NSMenuItem"; title = "Item 2"; ObjectID = "cpr-p6-YAY"; */
+"cpr-p6-YAY.title" = "Item 2";
+
+/* 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 = "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 = "NSMenu"; title = "OtherViews"; ObjectID = "wC4-fF-dLW"; */
+"wC4-fF-dLW.title" = "OtherViews";
+
+/* Class = "NSTabViewItem"; label = "History"; ObjectID = "z4I-cp-nhf"; */
+"z4I-cp-nhf.label" = "History";