From 6594c63c9925f07d851cfe99fa8366fb92ddeaae Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mateusz=20P=C3=B3=C5=82rola?= <mateusz.polrola@comarch.pl>
Date: Tue, 7 Sep 2010 11:31:46 +0200
Subject: [PATCH] some changes in translations

---
 data/gui.qrc                             |    4 ++--
 data/translations/dict_en.qm             |  Bin 23 -> 0 bytes
 data/translations/dict_pl.qm             |  Bin 4881 -> 0 bytes
 src/mdictionary/gui/main.cpp             |   38 ++++++++++++++++--------------
 src/mdictionary/mdictionary.pro          |    4 ++--
 src/plugins/google/GooglePlugin.cpp      |    4 ++--
 src/plugins/google/google.pro            |    4 ++--
 src/plugins/google/google.qrc            |    4 ++--
 src/plugins/google/translations/en_EN.qm |  Bin 23 -> 0 bytes
 src/plugins/google/translations/pl_PL.qm |  Bin 1020 -> 1001 bytes
 src/plugins/xdxf/XdxfDialog.cpp          |    2 +-
 src/plugins/xdxf/translations/en_EN.qm   |  Bin 134 -> 0 bytes
 src/plugins/xdxf/translations/pl_PL.qm   |  Bin 4158 -> 3473 bytes
 src/plugins/xdxf/xdxf.pro                |    4 ++--
 src/plugins/xdxf/xdxf.qrc                |    4 ++--
 src/plugins/xdxf/xdxfplugin.cpp          |    4 ++--
 16 files changed, 37 insertions(+), 35 deletions(-)
 delete mode 100644 data/translations/dict_en.qm
 delete mode 100644 data/translations/dict_pl.qm
 delete mode 100644 src/plugins/google/translations/en_EN.qm
 delete mode 100644 src/plugins/xdxf/translations/en_EN.qm

diff --git a/data/gui.qrc b/data/gui.qrc
index 65aa8e7..03cab88 100644
--- a/data/gui.qrc
+++ b/data/gui.qrc
@@ -7,10 +7,10 @@
         <file>icons/48x48/edit-select-all.png</file>
         <file>icons/16x16/staron.png</file>
         <file>icons/16x16/staroff.png</file>
-        <file>translations/dict_pl.qm</file>
-        <file>translations/dict_en.qm</file>
         <file>config/mdictionary.config</file>
         <file>xsl/style.css</file>
         <file>xsl/xsl.xsl</file>
+        <file>translations/en_US.qm</file>
+        <file>translations/pl_PL.qm</file>
     </qresource>
 </RCC>
diff --git a/data/translations/dict_en.qm b/data/translations/dict_en.qm
deleted file mode 100644
index 9dad8dffceb9623e88f8b96d9cd0caf25574c6fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23
fcmcE7ks@*G{hX<16=n7(EZlpygMop8iIEWihQJ9+

diff --git a/data/translations/dict_pl.qm b/data/translations/dict_pl.qm
deleted file mode 100644
index 47e96e85ba4fffb7fd6971d282dd9440e08b7b5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4881
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

diff --git a/src/mdictionary/gui/main.cpp b/src/mdictionary/gui/main.cpp
index efdf082..2982155 100644
--- a/src/mdictionary/gui/main.cpp
+++ b/src/mdictionary/gui/main.cpp
@@ -54,6 +54,25 @@ QStringList parseParameters(int argc, char *argv[]) {
     return result;
 }
 
+void retranslate() {
+    QString locale = QLocale::system().name();
+
+    QTranslator translator;
+    QTranslator qtTranslator;
+
+    qtTranslator.load("qt_" + locale,
+    QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    QCoreApplication::installTranslator(&qtTranslator);
+
+    qDebug()<<locale;
+    if(!translator.load(":/translations/" + locale)) {
+        translator.load(":/translations/en_US");
+
+    }
+
+    QCoreApplication::installTranslator(&translator);
+}
+
 int main(int argc, char *argv[]) {
     QApplication a(argc, argv);
     QApplication::setOrganizationName("Comarch S.A.");
@@ -67,24 +86,7 @@ int main(int argc, char *argv[]) {
     qRegisterMetaType<Notify>("Notify");
     qRegisterMetaType<Notify::NotifyType>("Notify::NotifyType");
 
-    QString locale = QLocale::system().name();
-
-    QTranslator qtTranslator;
-    qtTranslator.load("qt_" + locale,
-    QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-
-    a.installTranslator(&qtTranslator);
-
-    QTranslator mdictionaryTranslator;
-
-    if(locale == "pl_PL")
-        mdictionaryTranslator.load(":/translations/dict_pl");
-
-    else
-
-       mdictionaryTranslator.load(":/translations/dict_en");
-
-    a.installTranslator(&mdictionaryTranslator);
+    retranslate();
 
     Backbone backbone;
     MainWindow w(&backbone);
diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index cd5fd50..afa7f87 100644
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -59,8 +59,8 @@ HEADERS += gui/MainWindow.h \
 
 RESOURCES += ../../data/gui.qrc
 
-TRANSLATIONS += dict_pl.ts \
-                dict_en.ts
+TRANSLATIONS += pl_PL.ts \
+                en_US.ts
 
 target.path = $$BIN_DIR
 INSTALLS += target
diff --git a/src/plugins/google/GooglePlugin.cpp b/src/plugins/google/GooglePlugin.cpp
index 20df8aa..95ae0e4 100644
--- a/src/plugins/google/GooglePlugin.cpp
+++ b/src/plugins/google/GooglePlugin.cpp
@@ -51,8 +51,8 @@ void GooglePlugin::retranslate() {
 
     QTranslator *translator = new QTranslator(this);
 
-    if(!translator->load(":/translations/" + locale)) {
-        translator->load(":/translations/en_EN");
+    if(!translator->load(":/google/translations/" + locale)) {
+        translator->load(":/google/translations/en_US");
     }
     QCoreApplication::installTranslator(translator);
 }
diff --git a/src/plugins/google/google.pro b/src/plugins/google/google.pro
index 85aec3b..48633dc 100644
--- a/src/plugins/google/google.pro
+++ b/src/plugins/google/google.pro
@@ -18,8 +18,8 @@ HEADERS += \
     GoogleDictDialog.h \
     GoogleDialog.h
 
-TRANSLATIONS += dict_google_pl.ts \
-                dict_google_en.ts
+TRANSLATIONS += pl_PL.ts \
+                en_US.ts
 
 RESOURCES += \
     google.qrc
diff --git a/src/plugins/google/google.qrc b/src/plugins/google/google.qrc
index 47a4287..473e92a 100644
--- a/src/plugins/google/google.qrc
+++ b/src/plugins/google/google.qrc
@@ -1,6 +1,6 @@
 <RCC>
-    <qresource prefix="/">
-        <file>translations/en_EN.qm</file>
+    <qresource prefix="/google">
         <file>translations/pl_PL.qm</file>
+        <file>translations/en_US.qm</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/google/translations/en_EN.qm b/src/plugins/google/translations/en_EN.qm
deleted file mode 100644
index 9dad8dffceb9623e88f8b96d9cd0caf25574c6fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23
fcmcE7ks@*G{hX<16=n7(EZlpygMop8iIEWihQJ9+

diff --git a/src/plugins/google/translations/pl_PL.qm b/src/plugins/google/translations/pl_PL.qm
index 24a516ffa59cc262cd283751a411e17a32a7cd0f..a546bd7b42beb5e3448d4ac3457bae61827b5cfd 100644
GIT binary patch
delta 409
zcmeyv{*rxyv_As_1M8*(3=B-!48GI2fIL0s_u+{^{tT9z2|#g%C|0w{%0Rv}ha;;V
zkbceS9v}=9Z|4nde+Q&L@cTzgF)%Pb$Yfw(E|^@wsKCzSo}ZtdlREh}qqHEaTTy<l
z6+2KNLR8Hh%67?2%*jt@WCqF_F@!P{Gn6nSGL$o9GNdx(0m(!L1%?8K9EMVcbRaK}
zp>(nVlem%?#B_y#oYM5nJcZ!Yl9J54^kQTyvY1}hqgnAE2snWDFt7o!6hyC;0>r40
zqQt!7oWzp+A_XoaV~|{@#1I8^O##pq#SB$ISCwMA6>d0haAH}if^abwcWq==<3n}V
X#H<_q9Y7axF*5!aVPg5K!zBy=<^gIi

delta 464
zcmaFK{)c^nbO<9K1M8*(3=GVE45}cS;Rb{6G%f}PMi=Jy;fX*#1Ix_>pg3a%ha;;V
zkQ>YyabFn7U(3_bwU~i{=|691`#T`bo(VLhnHi`;X>vTH^kgOG9cCaN2ZJ9&B7+r!
z0tb-8zy`#u3L*Jc3hY3Zh<kp1dQNI^YDr0EUV5=hW@1i$I^)DF1%5P{i4#>Zg{14*
z+=}vZ@fihn4nrtIF+&N^5#<b-45<uxKr)d*fx(?29|+SKau`zKPUD9-NCD;|+>Qj9
zJUNc>UL2ZBp?&~KOEE+NEh+$7SIkfaw6KaH7i@JNLnYiop5Vl?RE6Y>#Ju#>Vl1{z
aKF6e{irtD1pcPz<jQ>TLSpMp82?GEQvUh_3

diff --git a/src/plugins/xdxf/XdxfDialog.cpp b/src/plugins/xdxf/XdxfDialog.cpp
index 04bf67d..5ef8d24 100644
--- a/src/plugins/xdxf/XdxfDialog.cpp
+++ b/src/plugins/xdxf/XdxfDialog.cpp
@@ -104,7 +104,7 @@ void XdxfDialog::initializeUI() {
     #endif
 
     cacheLayout = new QHBoxLayout;
-    cacheCheckBox = new QCheckBox(tr("Optimize for quicker searches"));
+    cacheCheckBox = new QCheckBox(tr("Optimize"));
     cacheCheckBox->setToolTip(cacheToolTip);
     cacheLayout->addWidget(cacheCheckBox);
     #ifdef Q_WS_MAEMO_5
diff --git a/src/plugins/xdxf/translations/en_EN.qm b/src/plugins/xdxf/translations/en_EN.qm
deleted file mode 100644
index 900f71678adc36c355111d16b61fba965160a91d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmcE7ks@*G{hX<16=n7(EZlq7iGhKEgJ+4@OCZgV3B<9?KthN?l_8HofuWcol_8lS
zAIMGt35#F~GZb?GB^cO%m`62Fp*S@;KQBe2Sd$$nAQ+KSk>;G3oROKA?vk09lb_Dm
K0TgCpWCQ?znH|Ic

diff --git a/src/plugins/xdxf/translations/pl_PL.qm b/src/plugins/xdxf/translations/pl_PL.qm
index 8ab7e05924a0741585fa4eeb8c78b926da15d3d1..a9dec1f90fc2071dd0fb02d0bf6ce982d799c205 100644
GIT binary patch
delta 718
zcmZ8dOK1~O6g@99lbL3cjMz{FQ63b6iy{=I3qgb$YqM#KW1&*P4#^}Ln@q-LrfRAE
zpo_Y*4obW5vnb+1u-J{F6v09lx+pFRr5hI&tP6LdE~MVku`xb)yz}n8=bU@*GN0Xl
zD>eB6IK2R{IY`f51M&#c)2;M=#igS+0dXiYxMBd2c_DdVgX&g<WpNRZ+J!gcvq0>#
zxM%GLpgQ7Q_7&wNao)Z|^@qfbA<`4ROC3JxNdwZSwHH8Ck9KT+B%Ut!Pu&2D7?l^h
zOfqVf*Pl!P$_eG=ghzx&%629RG(BzlQX-;!PknHAi-f<$&)j}UM#tj|E!&`z;H%e3
zSWA?YDasp3eJ>3ZZ`QVwWFTC#=rgkvW6zls8^~WN_-`W@)ZZv$8Rcrxuc(K^%wzRP
zh#cWuh~5j+lmApRfh@bx0}CcN98{5q0h?aV29XQmY#hV%a>`JYYRdE*hDW%@Iw^LU
z>Vt@(1Or6rrn;=M$sNNjajVAds>^GpD^nt{W(B`Hp6>j=ix%{fwu`H%PzQm>7<pXW
z)l_;N*Q!`!=3kwHe_njo)*!P(r%vcAdqvAW#_NQ$iEOxsb}652pi*=D(2p8CmZ8ZE
znkPp)v4f6wB@?<kVmaK%<xJbH)phSnt6EP(j{9CT6MCK0(jgkv^boCUr~aU&gL0p!
R%>=t)Y$p{Ff40S%e*wESwCDf;

delta 699
zcmbOzy-#6+Nc{%}2KOZl42&}vST`MDVBm9LP-|2M(w7+uO*$DEm?I%HcLh`QkwgXt
zrd+1uvppFYSY|_LUI}JC*_%N9Czub{Ok`l-IL0Dy;U@zFrw_{v&pkkKR+gE0Q-S&n
zAT(DB%gqF!J>0IWW|M*T)bj+gncaR0)Tqz)C>kii^^`rdp@o5gp^W|7nmPssHffIC
zb)`TH^&m9Qa*mfSd<+ci-JI_-b}}%q?uXEP#oY6!Jpo#Do+oJ10-(jVJWIr00?lFI
z&ERMNn!A)QSP1A*&i9!N4E(ChKnW2BRff$>j2jp^`65y((tPq0Qzma`ibvu}Gn*js
zdYB`Tc(0fnk$AzZXOMU^*;0^rZtTYe{DVu1G7A(Elao{PN{SV@Cd+WRASs!^5sct%
zHsTCmnXJUD%PRzOS8!@cNoHPp@#GL@V@VVdm(0YR{B%Z;Uo<AqVAjy#0J0d^fLPEa
zGr1%)KQFPUQXwrfC)G-U9Vm*TdGc!(H8cx=o<I}vX7fZ70eTHh1ef>Fl%;Z@TL<(s
dnwl3JuF5Emg!-@p=y)zh#{VKrEPr*lgaJma&_n<L

diff --git a/src/plugins/xdxf/xdxf.pro b/src/plugins/xdxf/xdxf.pro
index f8dc5db..d609a39 100644
--- a/src/plugins/xdxf/xdxf.pro
+++ b/src/plugins/xdxf/xdxf.pro
@@ -24,8 +24,8 @@ HEADERS += \
 RESOURCES += \
     xdxf.qrc
 
-TRANSLATIONS += dict_xdxf_pl.ts \
-                dict_xdxf_en.ts
+TRANSLATIONS += pl_PL.ts \
+                en_US.ts
     
 unix {
   INSTALLS += dicts plugin-icon
diff --git a/src/plugins/xdxf/xdxf.qrc b/src/plugins/xdxf/xdxf.qrc
index 47a4287..0642344 100644
--- a/src/plugins/xdxf/xdxf.qrc
+++ b/src/plugins/xdxf/xdxf.qrc
@@ -1,6 +1,6 @@
 <RCC>
-    <qresource prefix="/">
-        <file>translations/en_EN.qm</file>
+    <qresource prefix="/xdxf">
         <file>translations/pl_PL.qm</file>
+        <file>translations/en_US.qm</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/xdxf/xdxfplugin.cpp b/src/plugins/xdxf/xdxfplugin.cpp
index a3a7846..8751e42 100644
--- a/src/plugins/xdxf/xdxfplugin.cpp
+++ b/src/plugins/xdxf/xdxfplugin.cpp
@@ -55,8 +55,8 @@ void XdxfPlugin::retranslate() {
 
     QTranslator *translator = new QTranslator(this);
 
-    if(!translator->load(":/translations/" + locale)) {
-        translator->load(":/translations/en_EN");
+    if(!translator->load(":/xdxf/translations/" + locale)) {
+        translator->load(":/xdxf/translations/en_US");
     }
     QCoreApplication::installTranslator(translator);
 }
-- 
1.7.9.5