From acbb5605f42384454e1dcfd1b367107fc0340f42 Mon Sep 17 00:00:00 2001
From: michael starke <michael.starke@hicknhack-software.com>
Date: Fri, 11 Dec 2015 18:21:27 +0100
Subject: [PATCH] Fixed localization errors

Signed-off-by: michael starke <michael.starke@hicknhack-software.com>
---
 MacPass/Base.lproj/PluginSettings.xib     |  16 ++--------------
 MacPass/MPDocument.m                      |   4 ++--
 MacPass/de.lproj/Localizable.strings      | Bin 14092 -> 14294 bytes
 MacPass/en.lproj/Localizable.strings      | Bin 13254 -> 13286 bytes
 MacPass/fr.lproj/Localizable.strings      | Bin 14022 -> 13972 bytes
 MacPass/nl.lproj/Localizable.strings      | Bin 13898 -> 13848 bytes
 MacPass/zh-Hans.lproj/Localizable.strings | Bin 11378 -> 11328 bytes
 7 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/MacPass/Base.lproj/PluginSettings.xib b/MacPass/Base.lproj/PluginSettings.xib
index 80c5509e..3658c8b1 100644
--- a/MacPass/Base.lproj/PluginSettings.xib
+++ b/MacPass/Base.lproj/PluginSettings.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="9060" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9531"/>
         <capability name="box content view" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
@@ -24,15 +24,12 @@
                     <view key="contentView" id="tD5-Na-7XI">
                         <rect key="frame" x="1" y="1" width="326" height="340"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <animations/>
                     </view>
-                    <animations/>
                     <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                     <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                 </box>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="CqP-oK-S8k">
                     <rect key="frame" x="18" y="398" width="159" height="18"/>
-                    <animations/>
                     <buttonCell key="cell" type="check" title="Load unsecure Plugins" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="C4B-6z-ZqX">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
@@ -40,7 +37,6 @@
                 </button>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="aoG-FD-ds8">
                     <rect key="frame" x="18" y="364" width="484" height="28"/>
-                    <animations/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="2bX-8S-9XM">
                         <font key="font" metaFont="smallSystem"/>
                         <string key="title">If enabled, only properly signed Plugins will be loaded. Keep in mind, that Plugins have full access to your data! Changes take affect on restart.</string>
@@ -57,7 +53,6 @@
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowSizeStyle="automatic" viewBased="YES" id="Ocu-C0-03d">
                                 <rect key="frame" x="0.0" y="0.0" width="148" height="0.0"/>
                                 <autoresizingMask key="autoresizingMask"/>
-                                <animations/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
@@ -81,7 +76,6 @@
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="q1P-PD-0LW">
                                                         <rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
-                                                        <animations/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="fug-79-n9g">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -89,7 +83,6 @@
                                                         </textFieldCell>
                                                     </textField>
                                                 </subviews>
-                                                <animations/>
                                                 <connections>
                                                     <outlet property="textField" destination="q1P-PD-0LW" id="yB7-Uf-IIx"/>
                                                 </connections>
@@ -99,23 +92,19 @@
                                 </tableColumns>
                             </tableView>
                         </subviews>
-                        <animations/>
                         <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </clipView>
                     <constraints>
                         <constraint firstAttribute="width" constant="150" id="ZpW-Bc-fSx"/>
                         <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="150" id="eXb-yq-O8y"/>
                     </constraints>
-                    <animations/>
                     <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="UK5-gt-5o5">
                         <rect key="frame" x="1" y="133" width="148" height="16"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <animations/>
                     </scroller>
                     <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="oqL-7I-4H1">
                         <rect key="frame" x="224" y="17" width="15" height="102"/>
                         <autoresizingMask key="autoresizingMask"/>
-                        <animations/>
                     </scroller>
                 </scrollView>
             </subviews>
@@ -133,7 +122,6 @@
                 <constraint firstItem="vBs-Ga-aq0" firstAttribute="leading" secondItem="fCk-fL-jU8" secondAttribute="trailing" constant="8" id="xNu-Sj-xQO"/>
                 <constraint firstItem="aoG-FD-ds8" firstAttribute="top" secondItem="CqP-oK-S8k" secondAttribute="bottom" constant="8" symbolic="YES" id="zSW-h3-BrT"/>
             </constraints>
-            <animations/>
             <point key="canvasLocation" x="-629" y="119"/>
         </customView>
     </objects>
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 132ecf18..b1a712c4 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -272,8 +272,8 @@ NSString *const MPDocumentGroupKey                        = @"MPDocumentGroupKey
     alert.alertStyle = NSWarningAlertStyle;
     alert.messageText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_MESSAGE_TEXT", @"Message displayed when an open file was changed from another application");
     alert.informativeText = NSLocalizedString(@"FILE_CHANGED_BY_OTHERS_INFO_TEXT", @"Informative text displayed when the file was change form another application");
-    [alert addButtonWithTitle:NSLocalizedString(@"IGNORE", @"Ignore the changes to an open file!")];
-    [alert addButtonWithTitle:NSLocalizedString(@"REOPEN", @"Reopen the file!")];
+    [alert addButtonWithTitle:NSLocalizedString(@"KEEP_MINE", @"Ignore the changes to an open file!")];
+    [alert addButtonWithTitle:NSLocalizedString(@"LOAD_CHANGES", @"Reopen the file!")];
     [alert beginSheetModalForWindow:self.windowForSheet completionHandler:^(NSModalResponse returnCode) {
       if(returnCode == NSAlertSecondButtonReturn) {
         [self revertDocumentToSaved:nil];
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 67f7d023406fcfd956033fcd823f8f53ae04573a..e6c458f52845c6ec67215c2fabcab5adbb51997a 100644
GIT binary patch
delta 1128
zcmb`Gy>1gh6on5G6%rDn2W?!Ya6&<aC~UF`7Wq>Q5>%1FcD%ytwblWLYF~gZFM^bJ
z;R#aZ0a8)$otZ4y#E1rsc6RREduPr)_srMH_u|{*X0@k*W{jRrSS9K!!<uT$&KGw2
z?9DY|HDT2YbAdnFL!!qaZ;o$9#0O#><<p!yRH;JwO>Uvna8?=Ysiqa_8A&}H8G*iJ
zT^qWmhPKtwu2LQAg<h(qeeGavVYl^;`9QDPPj#d&)*h=aqZOi#@uhmp+~CCLd<`<Q
z0Cg+eHo!_$&GiX{{owe_T<Q`Kwo4$bk@gHQ8-PlHGohXWPksZ~83}O%oiYE5y;!?B
z`NdkrL4VTbfOttH{1$2djkAubeP}*_zQ5DuPF@3PNcDqIYXX&SSfp^7!Pr8399{Q4
z@)<RA2!93oC^;jqLdYuOeTkb8X}74xf#Ml+MphoI32RHv<mbeXLPpMRY)6FP5-e!L
zFf6Og%^az!kNu(dI7&VvZ!Yz{jYduxu{Qq`qE3i&o1y~zLYCF<w$@U9g&0#E2AOsc
za$3u>VzEQ&YIHR?L#r7u`ej+R_2w2l!x{t6HCv#o;SKeq7FvAw9~Ut1qKj5|Zi~;a
cdw&1nqhyi78szU1)^zcpxq0{E>S^Q7PhZ2v8~^|S

delta 409
zcmcbX-;=jNPH*!hBPEu}9Yz|qz6_}h#Xy+IkPc?)Feos%G86$}J`fiJd5H{p3@Jc5
z9LOpHvNM4=9mv;W(4XwjB|iCsk;&vG#%hyejMb!FfpR54bBciS0YLR2lgq&-rA+qb
zk_M{fnS9DvLpBJgrT~Z&fvPc89@LPWY-D0)>j%`S091!!4p0Q-G6jZgp#DmRG@yHO
zfGh=|O{GA!1wdXVke@R7xJkZ0NM#Dx7b#$~@_;1B#$2$?$qX4lHq3wM=4FEQfqYvA
mR0A><WTy4x52hl@gw0i)Y-whz>W$_`EM_t&ZeDGs%?JRRjaw4{

diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index 1c0499973ce6f328b02df3cd489ca74e7a8ecca9..aec2752956176a1a7432596b7b73ae450fd510c4 100644
GIT binary patch
delta 132
zcmX?>{w#fih@P}JgDVgQFvK(XGI%oh0oh6n3JkVDtTfqEPm^7NA(0`EA!YJoUG>RD
zdMTDZ4E_v`3@$+R&I}$vmLG#VP){&I7lRK&K2T2z(1c`$46yEWhE$*l|Mf&!^%=An
P6ebIb3U4;hpT+_JA1E4&

delta 150
zcmaEsek^^1h@Pn@gFAyCgFizMgDZm)g93vs5GyfwGNd!)G2}B8F{A?d$qX3`i9mij
zkXOv0!=Nx(Ur%##n_h}LNS8lD0Fd-U(j5d;m(NfDB=dl}OMtpTrlc`sGUNbRia?dt
V3|vsC&!7b~Pf%2NbAbLd766b=8m0gM

diff --git a/MacPass/fr.lproj/Localizable.strings b/MacPass/fr.lproj/Localizable.strings
index 31e19592ffd49b3adedfb75e44b332dbcdb1a247..124b0048e577819ec971496bceeffff7df0c46ec 100644
GIT binary patch
delta 124
zcmX?>J0*7mlcBCRgDVgQFvK(XGI%oh0oh6n3JkVDti*sJH#yNT+17`_pTUvA1*pTB
Y!2`(hV{ixR3P#e0TZQ#zMx&!F0CK1l;s5{u

delta 160
zcmbP|dn|VYlcBsPgFAyCgFizMgDZm)g93vs5GyfwGNd!)G2}B8O-?iv*3|)uc{8K}
zVF8ep%uvcu1ca$T6(vA^8IV=PP|T1CRG-J7I9cB?*%oA)KSKbJ^g}W=2&gh2Xa-29
f0#I)Tkfp$o2Gp4YWGMnwS~GAlaBV(sc$5VIx4a$@

diff --git a/MacPass/nl.lproj/Localizable.strings b/MacPass/nl.lproj/Localizable.strings
index f29c4357bb1c8f401b237adab4d7f7bdd12c0bf0..02bf37d159be45e7ec5751f9695e439f9b2a08cb 100644
GIT binary patch
delta 124
zcmX?=Gb3k%i-E2;gDVgQFvK(XGI%oh0oh6n3JkVDti*sJH+iu^vaJt;KZ7HK3s8qM
Yg9ni1$KVds6^x`0w+idc&W7x)0HqZa?f?J)

delta 174
zcmbP{b1G+pi$T06gFAyCgFizMgDZm)g93vs5GyfwGNd!)G2}B8F{A?d$qX3`i9mij
zkXOv00~GNFvQilez;dNPRUmbF3?)E*8IV;3RFw(ToyVX!xzHfl7G$<RLjaKUL$V_X
ms4^dD21us@P;Um1rNEE|)R_ZhDFRhmGjK6*Z5A|SX9WO>FCSI_

diff --git a/MacPass/zh-Hans.lproj/Localizable.strings b/MacPass/zh-Hans.lproj/Localizable.strings
index 367252a7cbce3275c63fb99e83ec3f718d0f0e1b..51b11556a8119ad395b021979b909640f8a8275e 100644
GIT binary patch
delta 124
zcmewqaUf#D4s~5`23H^qV2Ee%W$<M11G1GE6c}uQScw5cZnC&WvaJt;KZ7HK3s8qM
Zg9ni1$KVds6^x`0w+idc+ckDG0|3P47773W

delta 174
zcmX>Q@hM`%4)u6X26qNO27iVi23H0p1_cINAXZ}VWJqVoW5{PHVn_w@lNmA?5`p}5
zAg`D~2PonVWTi3`faOYoszB=U7)pTrG9ar6s45evJC8we@>BI>TaelQ3;{sW56O-o
mpvrup86cesK)o42mI6Z>P-hO1r3h4M&A`RLwYgPeH!}bWfFW@J