From 0643bd985e74bfb81f285975b7c515e094803432 Mon Sep 17 00:00:00 2001
From: Alex Borisov <alex@alexborisov.org>
Date: Fri, 13 Mar 2015 15:32:29 +0000
Subject: [PATCH 1/3] Fixed typo in settings>integrations

---
 MacPass/Base.lproj/IntegrationSettings.xib | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/MacPass/Base.lproj/IntegrationSettings.xib b/MacPass/Base.lproj/IntegrationSettings.xib
index e37de59e..a4b05ac3 100644
--- a/MacPass/Base.lproj/IntegrationSettings.xib
+++ b/MacPass/Base.lproj/IntegrationSettings.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6254" systemVersion="13F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="14C1510" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6254"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPIntegrationSettingsController">
@@ -30,7 +30,7 @@
                         <rect key="frame" x="1" y="1" width="364" height="38"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="2">
+                            <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2">
                                 <rect key="frame" x="16" y="12" width="187" height="18"/>
                                 <buttonCell key="cell" type="check" title="Enable KeePassHttp server" bezelStyle="regularSquare" imagePosition="left" lineBreakMode="truncatingMiddle" state="on" inset="2" id="3">
                                     <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -64,7 +64,7 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="tik-Ar-FJg">
+                            <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tik-Ar-FJg">
                                 <rect key="frame" x="16" y="175" width="168" 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"/>
@@ -79,7 +79,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="f5q-EW-RHf">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f5q-EW-RHf">
                                 <rect key="frame" x="174" y="152" 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"/>
@@ -94,21 +94,21 @@
                                     <font key="font" metaFont="system"/>
                                 </buttonCell>
                             </button>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="TiO-ah-BlR">
+                            <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TiO-ah-BlR">
                                 <rect key="frame" x="16" y="99" width="179" height="18"/>
                                 <buttonCell key="cell" type="check" title="Inlcude Host for matches" bezelStyle="regularSquare" imagePosition="left" enabled="NO" 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 misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9MH-jx-GpG">
                                 <rect key="frame" x="16" y="79" width="179" height="18"/>
                                 <buttonCell key="cell" type="check" title="Inlcude Tags for matches" bezelStyle="regularSquare" imagePosition="left" enabled="NO" 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" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VK8-z4-2ci">
                                 <rect key="frame" x="16" y="53" width="126" 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"/>
@@ -158,16 +158,16 @@
                         <rect key="frame" x="1" y="1" width="364" height="79"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="LNw-5t-TS4">
+                            <button misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LNw-5t-TS4">
                                 <rect key="frame" x="16" y="53" width="183" height="18"/>
                                 <buttonCell key="cell" type="check" title="Enable Quicklook Preview" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="ERs-ct-Eyx">
                                     <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="V6l-R9-hIj">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="V6l-R9-hIj">
                                 <rect key="frame" x="16" y="19" width="322" height="28"/>
-                                <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="If enabled attached files will be copied to a tempoary location for preview and deleted after the preview is closed." id="WmI-IB-Aso">
+                                <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="If enabled attached files will be copied to a temporary location for preview and deleted after the preview is closed." id="WmI-IB-Aso">
                                     <font key="font" metaFont="smallSystem"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>

From 9d09f249f136e73205e37d7677dd92cd21d708de Mon Sep 17 00:00:00 2001
From: binarious <bieder.martin@googlemail.com>
Date: Fri, 20 Mar 2015 09:31:10 +0100
Subject: [PATCH 2/3] Corrected the German translation

The word `fokussieren` had a missing s.
---
 MacPass/de.lproj/MainMenu.strings | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MacPass/de.lproj/MainMenu.strings b/MacPass/de.lproj/MainMenu.strings
index d75f24ef..07397728 100644
--- a/MacPass/de.lproj/MainMenu.strings
+++ b/MacPass/de.lproj/MainMenu.strings
@@ -150,13 +150,13 @@
 "1261.title" = "Verschließen";
 
 /* Class = "NSMenuItem"; title = "Focus Entries"; ObjectID = "2VP-vB-IeX"; */
-"2VP-vB-IeX.title" = "Einträge fokusieren";
+"2VP-vB-IeX.title" = "Einträge fokussieren";
 
 /* Class = "NSMenuItem"; title = "Focus Groups"; ObjectID = "HxM-dV-LIH"; */
-"HxM-dV-LIH.title" = "Gruppen fokusieren";
+"HxM-dV-LIH.title" = "Gruppen fokussieren";
 
 /* Class = "NSMenuItem"; title = "Focus Inspector"; ObjectID = "Zje-Me-5c8"; */
-"Zje-Me-5c8.title" = "Inspektor fokusieren";
+"Zje-Me-5c8.title" = "Inspektor fokussieren";
 
 /* Class = "NSMenuItem"; title = "Quicklook"; ObjectID = "aVO-9F-Lwc"; */
 "aVO-9F-Lwc.title" = "Quicklook";

From f2637354b39ea8572688c789a214bdbaad6ccc78 Mon Sep 17 00:00:00 2001
From: Benjamin Steinwender <b@stbe.at>
Date: Fri, 3 Apr 2015 07:16:41 +0200
Subject: [PATCH 3/3] updated German translation

---
 MacPass/de.lproj/KPKLocalizable.strings |   6 +++---
 MacPass/de.lproj/Localizable.strings    | Bin 12650 -> 12650 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/MacPass/de.lproj/KPKLocalizable.strings b/MacPass/de.lproj/KPKLocalizable.strings
index 84b93060..81031291 100644
--- a/MacPass/de.lproj/KPKLocalizable.strings
+++ b/MacPass/de.lproj/KPKLocalizable.strings
@@ -27,10 +27,10 @@
 "ERROR_UNSUPPORTED_KDBX_RANDOM_STREAM" = "Format des Zufallsdatemstrom wird nicht unterstützt";
 "ERROR_INTEGRITY_CHECK_FAILED" = "Die Integrität der Datei konnte nicht sichergestellt werden";
 "ERROR_PASSWORD_OR_KEYFILE_WRONG" = "Falsche Password und/oder die Schlüsseldatei";
-"ERROR_KEEPASSFILE_ELEMENT_MISSING" = "Datenbank-XML enthält keine KeePassFile-Elementen";
+"ERROR_KEEPASSFILE_ELEMENT_MISSING" = "Datenbank-XML enthält keine KeePassFile-Elemente";
 "ERROR_ROOT_ELEMENT_MISSING" = "Datenbank-XML enthält kein Root-Elementen";
-"ERROR_GROUP_ELEMENT_MISSING" = "Datenbank-XML enthält keine Group-Elementen";
-"ERROR_HEADER_HASH_MISSMATCH" = "Fehlerhafte Datei: Header Hash stimmt nicht mit Daten überein.";
+"ERROR_GROUP_ELEMENT_MISSING" = "Datenbank-XML enthält keine Group-Elemente";
+"ERROR_HEADER_HASH_MISSMATCH" = "Fehlerhafte Datei: Header-Hash stimmt nicht mit Daten überein.";
 "ERROR_XML_KEYFILE_WITHOUT_KEY_ELEMENT" = "Schlüssel-XML-Datei enhält kein Key-Element";
 "ERROR_XML_KEYFILE_WITHOUT_DATA_ELEMENT" = "Schlüssel-XML-Datei enhält kein Data-Element";
 "ERROR_XML_KEYFILE_DATA_PARSING_ERROR" = "Daten des Schlüssels nicht lesbar";
\ No newline at end of file
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 09ceb16fb6b76b40ded1eb4caeb6f789238e36bf..4dfd036df8d5133d8a27b982a64588633cba64fc 100644
GIT binary patch
delta 34
qcmaEr^eSnCfik1+<U~&4&2Gv;ER4FFXR1GEnf!!VX!8V}TPy(MB@D3u

delta 32
ocmaEr^eSnCfik1Q<U~$k#?;Nu%E2s*3Y({^KWEw8p!13a0KvZtZ2$lO