From 740e8a19276112c9edd71b6e2fe21503a50b3881 Mon Sep 17 00:00:00 2001 From: "Zane U. Ji" Date: Sat, 16 Nov 2019 16:09:13 +0800 Subject: [PATCH] Bug #228 Misleading translation when file was changed externally, may lead to data loss --- ChangeLog | 1 + po/de.gmo | Bin 21937 -> 21914 bytes po/de.po | 4 ++-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index db1a8fa..984b604 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ # Version number followed by the release date 1.2.1.5 + * Bug #228 Misleading translation when file was changed externally, may lead to data loss * Bug #227 Dead Link: Help > Forum * Bug #221 Patch for building with C++11 (Roger Leigh) + Added Mac port diff --git a/po/de.gmo b/po/de.gmo index 9c6dc119c3f19b6babc1645a98284e1e8817497b..578a7b402935498fc37985baf3f0afc9961f751f 100644 GIT binary patch delta 2737 zcmXZdeN5F=9LMoRE2&5t)R}duFy>d~mJSa)=;Io3}v|Np=w@E%wz%cEPpHEv! z*&oqXV}_B&hPxr`JV6h{NR%g zPg{rQ<8rUl=P~B`EMsDfG2euY*^F0_VN*KWnDICd`DbeQFMur=i|26?cHsp43A3>u z<1wYsn5j4e$6+<5VJ(irorT6Ri8S^xpa2fp2OX#dK0^g?8HYB&X!`v)76IvMAZ0nd<0AIQLIK~>Sg8h(ju@FoTv8byzDQ*i_4;yIj(w^1)d zKjB86g{oNqmBJEKEf=CP7DnBHt*BD%MQwZpRpJY%&#>Ei1D$*Zey5RxDdpS)tU_(n zYCVXm`AO6UXYKg6IGlbDD#bTYxBd<))&HOZFcofTCSx+)Y@}+Yyn^~GvfT{m1aF`= zI*i$P0#mUERr7w-{6SO=qbiLF;sjL9=c7)z7FDWEI1P8BeqkNMX#5oQ{`pGsuZS-* zpoo9Qbi9Kp7*pl`#>+&Vd?iv9^BhLuhp0>U5o*CNP=Q=QZFmc#u@|>tKZbGheD}at z9U3~(9n^w)l5M9=*(6cPx78r=c^0Mh=bX_!Q>gF099ssEMh|-Hc?TG8Mv1oP*jpj8m`)b<$SU z9XNowcm{QsezVUro4D#{eEh)xHN~ z@h*<XMYcp5YMbgCihaxLBkSv$e8E5{P|*2H=vv(9uKnRiL*u#)4UxKV=jT-q G#{3TqHBTM@ delta 2760 zcmYM#3rv+|9LMoTL4+e9dMxpRoP#$mJ9xMXq+C=$4FpkBH(MQrDHxoE&@@-?EVWHX z(`;>cscBg&TZ=hUGeefx7HnQ>!!>PQR@QQCx@o$l_Wk)jTU+b%JkR^S&-1@L2lpNs z(sg9W*YiA1^iX34a*c^L#$3xcrWyajA-H^|F{5xL@}F7H|1$AojKNEoh*$7gyoae6 zTVTv+%tJrU$C22C$@n^sz`X^=F=H5f%7OwoWgnbHZEyhOfXh+ut+VT4JAV(SvEGRj@JylOW^#oE9ry=&@FB)wWRZK&Xw=+~KAd6KYcYxW zOQ-|iu+O)m_B)KRcmfq@FDj7%oP>i8122QP=iGz*s8R({>!tV%F2yu#LRIR0`}_bZ zurAaA-RQ%M*1I^7xp$Vke-OtqFF^(7EN7sM>rt%;TeqSz>qPbHIF833Pyzgg3hWlD z8oWkMwBP!tYPj$HU40I{(;8aX3H6{m(aT2!TWZaGF z-7(aG{iyeEpfZata}Nw)74t=?#P*>o@;xTwWn765Fq895-5g_Ta0_POMfBq%)Cb9P z-N;K&J*z~Ob}6ctYfu&2jJgB6P^~(II`}lI#RI6jb;EiWoop6{&NC(*^YD3m8FkQ? z)|057pF8<24o<)_q-*BIa{8~x_OqZ2K0_V! z9j0P0CgC8e=dl%TCSFtzCt()OK=nL?%CH^Ps%V^5JOjn>P(S*vZ19c}pL}hpc)$?xD`+cbQuA+V&gUB^7kz6QU(gmo?97650 z1*yDa-n9z{aVQVILS@*6iu5E>9CHmvU|N-X>GDv&fqdx3K^|T*T@mEw}5!G&BQK%Bfqkd-7(SvhPx4RlAVigrE#QEleeK3eBZNwtClw&c5c`E7-WTOtOvGXQWY2QJ$;3F);F8lm8YQLBo zH}E7>i>9Ii&PQhkgE9uw@l{O6P7LE&)Qh>bZbeE^m8!<6xCC|ZCe&Zbov2K|K;40F zFa!Hhcj8XSb_^tmEPenP^QOF2lSva{t4BR0o1<*Pf))K|57)zG;1MNu)YB4 zmf3|0=o%`Zzi|vcL@&lKb2Cpt-KoL?1}fDu9E}aA4K|`~{oANt#dcJn9jHs!d9-oN zKfXX#c1Exu81&TE1nL@IYuwNnZVAi_wKWv^vV*~yfnZJ`E6*1U7Ukq;1he*Z6|H<5NdrMpECLWa6RhKPVxu+vP`RKX)pA$Ug Ttt}1hZN67R^+yj^-i!MWlp\n" "Language-Team: Thomas Wenzel \n" "Language: de\n" @@ -1309,7 +1309,7 @@ msgid "" "Do you want to proceed?" msgstr "" "Datei wurde von einer anderen Anwendung geändert.\n" -"Erneut laden?" +"Überschreiben?" #: ../src/xmlcopyeditor.cpp:4547 msgid "Confirmation"