diff --git a/MacPass/Base.lproj/WelcomeView.xib b/MacPass/Base.lproj/WelcomeView.xib
index f17ffd5c..3563c2ea 100644
--- a/MacPass/Base.lproj/WelcomeView.xib
+++ b/MacPass/Base.lproj/WelcomeView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -154,11 +154,11 @@
                             <constraints>
                                 <constraint firstAttribute="width" constant="200" id="R0Z-La-Y3C"/>
                             </constraints>
-                            <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="bRy-ef-e76">
+                            <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="bRy-ef-e76">
                                 <rect key="frame" x="1" y="303" width="135" height="16"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>
-                            <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="2e9-uR-dY7">
+                            <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="2e9-uR-dY7">
                                 <rect key="frame" x="224" y="17" width="15" height="102"/>
                                 <autoresizingMask key="autoresizingMask"/>
                             </scroller>
diff --git a/MacPass/SavePanelAccessoryView.xib b/MacPass/SavePanelAccessoryView.xib
index 02620afa..317ab82a 100644
--- a/MacPass/SavePanelAccessoryView.xib
+++ b/MacPass/SavePanelAccessoryView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -20,7 +20,7 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2">
-                    <rect key="frame" x="180" y="53" width="148" height="26"/>
+                    <rect key="frame" x="179" y="53" width="149" height="25"/>
                     <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="3">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="menu"/>
@@ -33,7 +33,7 @@
                     </popUpButtonCell>
                 </popUpButton>
                 <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="11">
-                    <rect key="frame" x="125" y="58" width="51" height="17"/>
+                    <rect key="frame" x="124" y="58" width="51" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Format:" id="12">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -41,7 +41,7 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="249" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="358" translatesAutoresizingMaskIntoConstraints="NO" id="51">
-                    <rect key="frame" x="125" y="20" width="363" height="28"/>
+                    <rect key="frame" x="124" y="20" width="364" height="28"/>
                     <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Not all Information inside your current database can be stored with this format." id="52">
                         <font key="font" metaFont="smallSystem"/>
                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -61,7 +61,7 @@
                 <constraint firstItem="51" firstAttribute="top" secondItem="2" secondAttribute="bottom" constant="8" symbolic="YES" id="101"/>
                 <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="51" secondAttribute="bottom" constant="20" symbolic="YES" id="103"/>
             </constraints>
-            <point key="canvasLocation" x="-36" y="-32"/>
+            <point key="canvasLocation" x="31" y="-47"/>
         </customView>
     </objects>
 </document>
diff --git a/MacPass/de.lproj/IntegrationSettings.strings b/MacPass/de.lproj/IntegrationSettings.strings
index f1ba02be..857b8826 100644
--- a/MacPass/de.lproj/IntegrationSettings.strings
+++ b/MacPass/de.lproj/IntegrationSettings.strings
@@ -16,7 +16,7 @@
 /* Class = "NSTextFieldCell"; title = "Shortcut is missing Key"; ObjectID = "Lxp-wI-yQy"; */
 "Lxp-wI-yQy.title" = "Der Kurzbefehl ist unvollständig";
 
-/* Class = "NSButtonCell"; title = "Open Preference…"; ObjectID = "NP0-R3-m6n"; */
+/* Class = "NSButtonCell"; title = "Open Preferences…"; ObjectID = "NP0-R3-m6n"; */
 "NP0-R3-m6n.title" = "Systemeinstellungen öffnen…";
 
 /* Class = "NSBox"; title = "Autotype"; ObjectID = "P9N-HM-wER"; */
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 07927384..d6d48dad 100644
--- a/MacPass/de.lproj/Localizable.strings
+++ b/MacPass/de.lproj/Localizable.strings
@@ -43,8 +43,17 @@
 /* Alert message displayed when Autotype performs self check and lacks accessibilty permissions */
 "ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_MESSAGE_TEXT" = "MacPass kann Autotype nicht ausführen.";
 
-/* Checkbox in dialog to set the selection as default file change strategy! */
-"ALERT_AUTOTYPE_MISSING_ACCESSIBILTY_PERMISSIONS_SUPPRESS_WARNING" = "Diesen Warnhinweis nicht mehr anzeigen.";
+/* Button in dialog to leave plugin ds disabled and continiue! */
+"ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_BUTTON_OK" = "OK";
+
+/* Button in dialog to open plugin preferences pane! */
+"ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_BUTTON_OPEN_PREFERENCES" = "Plugin-Einstellungen öffnen …";
+
+/* Informative text of the alert displayed when plugins where disabled due to incompatibilty */
+"ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_INFORMATIVE_TEXT" = "Es wurden Plugins deaktiviert, da sie nicht kompatibel mit dieser Version von MacPass sind. Bitte öffnen Sie die Plugin-Einstellungen für mehr Informationen.";
+
+/* Message text of the alert displayed when plugins where disabled due to incompatibilty */
+"ALERT_INCOMPATIBLE_PLUGINS_ENCOUNTERED_MESSAGE" = "Es wurden inkompatible Plugins gefunden.";
 
 /* Alert informative text when plugins or their settings change and require a restart */
 "ALERT_INFORMATIVE_TEXT_PLUGINS_CHANGED_SUGGEST_RESTART" = "Änderungen zu den globalen Einstellungen von Plugins treten erst nach einem Neustart in Kraft. Soll MacPass jetzt neu gestartet werden?";
@@ -129,6 +138,9 @@
 /* Menu item in the database outline context menu to change the trash group */
 "CHANGE_TRASH_GROUP" = "Papierkorb-Gruppe ändern";
 
+/* Button title in the key file selection dialog for selecting a key */
+"CHOOSE_FILE_BUTTON_TITLE" = "Öffnen";
+
 /* Clear Autotype Button */
 "CLEAR_AUTOTYPE" = "Autotype Löschen";
 
@@ -482,6 +494,18 @@
 /* Window displayed to the user to pick an amout of characters */
 "PICKFIELD_WINDOW_TITLE" = "Wert auswählen";
 
+/* Label for the button when a download is in progress! */
+"PLUGIN_BROWSER_ACTION_DOWNLOAD_IN_PROGRESS" = "Wird heruntergeladen…";
+
+/* Label for the button when a download did not succeed */
+"PLUGIN_BROWSER_ACTION_RETRY_FAILED_DOWNLOAD" = "Fehler. Erneut herunterladen.";
+
+/* Label for the button to show a downloaded file */
+"PLUGIN_BROWSER_ACTION_SHOW_DOWNLOADED_FILE" = "Im Finder anzeigen …";
+
+/* Button to download the Plugin */
+"PLUGIN_BROWSER_DOWNLOAD_PLUGIN_BUTTON" = "Herunterladen";
+
 /* Status for an up-to-date plugin in the plugin browser */
 "PLUGIN_BROWSER_LATEST_VERSION_INSTALLED" = "Aktuelle Version ist installiert";
 
diff --git a/MacPass/de.lproj/PasswordCreatorView.strings b/MacPass/de.lproj/PasswordCreatorView.strings
index ffba1294..3e39f8c3 100644
--- a/MacPass/de.lproj/PasswordCreatorView.strings
+++ b/MacPass/de.lproj/PasswordCreatorView.strings
@@ -4,7 +4,7 @@
 /* Class = "NSTextFieldCell"; title = "Length:"; ObjectID = "179"; */
 "179.title" = "Länge:";
 
-/* Class = "NSBox"; title = "Allowed Characters"; ObjectID = "332"; */
+/* Class = "NSBox"; title = "Character options"; ObjectID = "332"; */
 "332.title" = "Zugelassene Zeichen";
 
 /* Class = "NSButtonCell"; title = "A-Z"; ObjectID = "453"; */
@@ -40,6 +40,9 @@
 /* Class = "NSButtonCell"; title = "Use default only for selected entry"; ObjectID = "cfZ-5F-Nge"; */
 "cfZ-5F-Nge.title" = "Als Standard für den ausgewählten Eintrag festlegen";
 
+/* Class = "NSButtonCell"; title = "Use characters from every group"; ObjectID = "CMc-Uh-Fo5"; */
+"CMc-Uh-Fo5.title" = "Mindestens ein Zeichen aus jeder Gruppe";
+
 /* Class = "NSButtonCell"; title = "Set Default"; ObjectID = "Wvs-Md-Ob8"; */
 "Wvs-Md-Ob8.title" = "Als Standard festelegen";
 
diff --git a/MacPass/de.lproj/PluginPreferences.strings b/MacPass/de.lproj/PluginPreferences.strings
index 79149633..385b15b1 100644
--- a/MacPass/de.lproj/PluginPreferences.strings
+++ b/MacPass/de.lproj/PluginPreferences.strings
@@ -10,7 +10,7 @@
 /* Class = "NSTextFieldCell"; title = "Plugin Settings Info"; ObjectID = "OOr-SW-jZb"; */
 "OOr-SW-jZb.title" = "Informationen zu Plugin-Einstellungen";
 
-/* Class = "NSButtonCell"; title = "Browse Plugins…"; ObjectID = "sqO-8H-n1y"; */
+/* Class = "NSButtonCell"; title = "Browse Available Plugins…"; ObjectID = "sqO-8H-n1y"; */
 "sqO-8H-n1y.title" = "Plugins durchsuchen …";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "STt-PQ-Szr"; */