From b67514e5c68a32ab05c5435f9f298422f70e07af Mon Sep 17 00:00:00 2001 From: Piotrek Date: Wed, 1 Sep 2010 14:57:55 +0200 Subject: [PATCH] Polish translation complete --- data/gui.qrc | 13 +++++++++++++ data/icons/gui.qrc | 10 ---------- data/translations/dict_en.qm | Bin 0 -> 134 bytes data/translations/dict_pl.qm | Bin 0 -> 8178 bytes mdictionary.pro | 2 +- trunk/src/base/base.pro | 4 +++- trunk/src/base/gui/AboutWidget.cpp | 2 +- trunk/src/base/gui/SettingsWidget.cpp | 2 +- trunk/src/base/gui/main.cpp | 17 +++++++++++++---- .../plugins/google/src/GoogleSettingsDialog.cpp | 4 ++-- trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp | 2 +- trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp | 2 +- trunk/src/plugins/xdxf/src/xdxfplugin.cpp | 16 ++++++++-------- 13 files changed, 44 insertions(+), 30 deletions(-) create mode 100644 data/gui.qrc delete mode 100644 data/icons/gui.qrc create mode 100644 data/translations/dict_en.qm create mode 100644 data/translations/dict_pl.qm diff --git a/data/gui.qrc b/data/gui.qrc new file mode 100644 index 0000000..9f227c5 --- /dev/null +++ b/data/gui.qrc @@ -0,0 +1,13 @@ + + + icons/logo/mdictionary.png + icons/96x96/staron.png + icons/96x96/staroff.png + icons/64x64/mdictionary.png + icons/48x48/edit-select-all.png + icons/16x16/staron.png + icons/16x16/staroff.png + translations/dict_pl.qm + translations/dict_en.qm + + diff --git a/data/icons/gui.qrc b/data/icons/gui.qrc deleted file mode 100644 index f181519..0000000 --- a/data/icons/gui.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - 48x48/edit-select-all.png - logo/mdictionary.png - 96x96/staroff.png - 96x96/staron.png - 16x16/staroff.png - 16x16/staron.png - - diff --git a/data/translations/dict_en.qm b/data/translations/dict_en.qm new file mode 100644 index 0000000000000000000000000000000000000000..900f71678adc36c355111d16b61fba965160a91d GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/data/translations/dict_pl.qm b/data/translations/dict_pl.qm new file mode 100644 index 0000000000000000000000000000000000000000..fb434707af070b5731ea6a46995d5d978a4b77f5 GIT binary patch literal 8178 zcmeHMZ-^Xc8Gkl+`zL#Qe{$I-m-N!UZF=z%!eJ%mLs|^EZ0?e9F(G#$m(&lL+nw8; z+}_M~X105Kgc>nwYg;60LTUYtPo#=SA^M^zmXFIN)IZw3yNN3-h|H68` z^U{G=h^#vYTa-$y7Oz$f8&Md(_^rE)wSs5CoaL>FRHcY zcx>})(32igYkXX-UH^>j{N104)?JOgcC!dOzYzP=BiOg^1GNskAG^8v1onF`e(dZy z=n;=!c`A#2{t&V5W^B3O%&L>kxzxqv_ z`^}CTTSU>R z?n2@$(ZEaHPaathTn_f!^;`HMaK2Aqq*Boh)Gq-t8|75|ctnid1WpGLk8lUzd=-89XvGHp%M%F!~nOa`A1LpV9 zByh7}x(S1W*riy&uuRQ1bO~RJ9Wu06f+i?S1^ns~L_uYSmCQ&q5|<`dX-2x$1i*rv zhEsR@>Tb(eqH2{zMKfLDTEbQ+J9<&ix_VCJJf*6;+gP=ug--0u66|!~2-a#*2AKxi zt5nxvut^6;gP*en&CKggyHgWhDEZdJRFJgMbik8o#>C%aO)b#smbck1B~w9}xae=u zISC8eNTsC`F2JeCsOM17eCfob?z)DVZx;l^bQ}=QNNF3e3S>|fP&YfezU#V4>C%8h zgqOTl2fxpVTZ9lQPSwcYhfAKyDmq$+fT;sDi!9Na0!8UY(~=b&5#BJp5ud?ubuw z*qwc)>Yau=?6(qGk8MyG8SeXd12Yi_a2vKQKoY#2sN za<+pq!HuWoH3P^QJQLXf{=kmsPsnV_%N(xfbQbq!8E`zw`)u`{pJ{5Fxe#D>i{Yt) z;RrYdsV%aaX@L=NFw`Xy;UbxCG2(n**WQ2rIwOu zDd{CR_%Rn2U(-hV-s3gB0DVn2(bq=#B@{Mni;tKqh8-#BC<4?YpEfeBfQ+m6iuwSP zs`Urq7>kk{g>APC=?fF-r%9Y&=7|Kp=E-N5k9tzMSQw^cJ7MBGX#xr}MVP?`EMAp0 zc#hBwC@DX4G2#OZd}^-H{k0=(-6VYQ#n$cEd=G;y^XHsemviRo1DhwcwPnHD(VWe zFvSk8Xm5tbBY<_UsnqrdcORTh{>uUHbnfHcl->%WvmwC^N(pOoh%hcBiowjt)gycC zu8?Aar-zxL)MgKkERa(Y4# zM7RtCY2;#AVs=`V4@LDA@~R&&&928E&vRa6%%c)GFs;r8D=1d-bqbzgsYbfa@l?nB z@T6-SB~ZVtZn}<04lB5MJYc9DF>l!l>+NEujA$z9#Ug*3vv{Z|@VtgMLLiHh)VFlV z7C+uu(^^{NYM8ds2rWRz1rWr#UTbB7j{$W!e%r_bN=VDSZ~5bjiah2@Jomalw>C}7 z2;{cNlQknE=T44B`KcD?@Iw8i8}Bhh4?;T;=*u4J72Negs*G#TB7XW%E&e$_*oWK< z-bGWEW09J{ajlA;zn?$ft0|pFsgQ<)+^Ns(S#BY^$Z4)N!)>EZ+^v#sqIPo{4Lukr zlOuRX!P&$P#FQ^F=Exr5`CSh4^;djZ-dxV~Nv@4YTNDy6T^(}mw6UAro@JjU#NsES8gghWoZyDFen?;0BmI=kF+r1#=QRgJQ* z*l<(l37~H48ZgHTDOvluS~MfKe}!s=MOM8YBPxA$?)81RL=oxyFfC5r5iOQN7u0Lp zGI|AqGEBu4_w9a;O>YJX5R8=UYFq__yrw&&J6Y5_9yL{OZY6)GdVj0^+q{%)CGtPt zs6!3=5I=r2CsdVb@0$CYULdJt~^u;r0Pe;7+M|pf7Z~*8d~Ah v=0$HSkvl~;TJ3*Ni+>I@Pb=NB2zu3t>s;85PjI7%L_SQf>iqZihttp://mdictionary.garage.maemo.org"; licenseNote = QString("

This program is free software: you can redistribute it and/or modify\n")+ diff --git a/trunk/src/base/gui/SettingsWidget.cpp b/trunk/src/base/gui/SettingsWidget.cpp index 15e3e40..ce21f4f 100644 --- a/trunk/src/base/gui/SettingsWidget.cpp +++ b/trunk/src/base/gui/SettingsWidget.cpp @@ -126,7 +126,7 @@ void SettingsWidget::hideEvent(QHideEvent *e) { if(settings && _save) { #else if(settings && _changed && - QMessageBox::question(this, "Save", "Do you want to save changes?", + QMessageBox::question(this, tr("Save"), tr("Do you want to save changes?"), QMessageBox::Save, QMessageBox::Cancel) == QMessageBox::Save) { #endif diff --git a/trunk/src/base/gui/main.cpp b/trunk/src/base/gui/main.cpp index ccad6f9..12a4625 100644 --- a/trunk/src/base/gui/main.cpp +++ b/trunk/src/base/gui/main.cpp @@ -56,7 +56,6 @@ int main(int argc, char *argv[]) { QApplication::setOrganizationDomain("comarch.com"); QApplication::setApplicationName("mDictionary"); - QStringList search = parseParameters(argc, argv); qRegisterMetaType("Translation*"); @@ -64,9 +63,19 @@ int main(int argc, char *argv[]) { qRegisterMetaType("Notify"); qRegisterMetaType("Notify::NotifyType"); - QTranslator translator; - translator.load("dict_pl"); - a.installTranslator(&translator); + QString locale = QLocale::system().name(); + + QTranslator qtTranslator; + qtTranslator.load("qt_" + QLocale::system().name(), + QLibraryInfo::location(QLibraryInfo::TranslationsPath)); + a.installTranslator(&qtTranslator); + + QTranslator myTranslator; + if(locale == "pl_PL") + myTranslator.load(":/translations/dict_pl"); + else + myTranslator.load(":/translations/dict_en"); + a.installTranslator(&myTranslator); Backbone backbone; MainWindow w(&backbone); diff --git a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp index 2a41818..0887429 100644 --- a/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp +++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp @@ -57,8 +57,8 @@ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent, langFromLabel = new QLabel(tr("From:")); langToLabel = new QLabel(tr(" To: ")); - connectInfoLabel = new QLabel(tr("Google plugin make use of internet " - "conection, so it may cost You.")); + connectInfoLabel = new QLabel(tr("Google plugin makes use of Internet " + "connection, so it may cost You.")); connectInfoLabel->setWordWrap(true); setWindowTitle(tr("Google Settings")); diff --git a/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp b/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp index f06f69c..3cf5bf3 100644 --- a/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp +++ b/trunk/src/plugins/xdxf/src/XdxfCachingDialog.cpp @@ -68,7 +68,7 @@ void XdxfCachingDialog::updateCachingProgress(int progress, int time) { int seconds = float((100 - progress)*time) / (5*1000); cachingLabel->setText(tr("Estimated time left: ") + - QString::number(seconds) + tr(" seconds")); + /*QString::number(seconds)*/ tr("%n second(s)", "", seconds)); if(progress >= 100) this->hide(); diff --git a/trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp b/trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp index c45f180..40104a1 100644 --- a/trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp +++ b/trunk/src/plugins/xdxf/src/XdxfSettingsDialog.cpp @@ -38,7 +38,7 @@ XdxfSettingsDialog::XdxfSettingsDialog(XdxfPlugin *plugin, QWidget *parent) : infoLabel = new QLabel(this); - infoLabel->setText(tr("Plugin type: ") + plugin->type() +"\n" + + infoLabel->setText(tr("Plugin: ") + plugin->type().toUpper() +"\n" + tr("From: ") + plugin->langFrom() + "\n" + tr("To: ") + plugin->langTo() + "\n" + tr("Description: ") + plugin->name()); diff --git a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp index 5573a56..f9a758d 100644 --- a/trunk/src/plugins/xdxf/src/xdxfplugin.cpp +++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp @@ -94,7 +94,7 @@ QList XdxfPlugin::searchWordListCache(QString word, int limit) { if(!db.open()) { qDebug() << "Database error" << db.lastError().text() << endl; Q_EMIT notify(Notify::Warning, QString(tr("Cache database cannot be " - "opened for %1 dictionary. Searching in xdxf file. " + "opened for %1 dictionary. Searching in XDXF file. " "You may want to recache.").arg(name()))); return searchWordListFile(word, limit); } @@ -149,7 +149,7 @@ QList XdxfPlugin::searchWordListFile(QString word, int limit) { if(!dictionaryFile.open(QFile::ReadOnly | QFile::Text)) { qDebug()<<"Error: could not open file"; Q_EMIT notify(Notify::Warning, - QString(tr("Xdxf file cannot be read for %1").arg(name()))); + QString(tr("XDXF file cannot be read for %1").arg(name()))); return translations.toList(); } @@ -204,7 +204,7 @@ QString XdxfPlugin::searchCache(QString key) { if(!db.open()) { qDebug() << "Database error" << db.lastError().text() << endl; Q_EMIT notify(Notify::Warning, QString(tr("Cache database cannot be " - "opened for %1 dictionary. Searching in xdxf file. " + "opened for %1 dictionary. Searching in XDXF file. " "You may want to recache.").arg(name()))); return searchFile(key); } @@ -229,7 +229,7 @@ QString XdxfPlugin::searchFile(QString key) { QString resultString(""); if(!dictionaryFile.open(QFile::ReadOnly | QFile::Text)) { Q_EMIT notify(Notify::Warning, - QString(tr("Xdxf file cannot be read for %1").arg(name()))); + QString(tr("XDXF file cannot be read for %1").arg(name()))); qDebug()<<"Error: could not open file"; return ""; } @@ -384,7 +384,7 @@ void XdxfPlugin::getDictionaryInfo() { QFile dictionaryFile(path); if(!dictionaryFile.open(QFile::ReadOnly | QFile::Text)) { Q_EMIT notify(Notify::Warning, - QString(tr("Xdxf file cannot be read dictionary"))); + QString(tr("XDXF dictionary cannot be read from file"))); qDebug()<<"Error: could not open file"; return; } @@ -424,7 +424,7 @@ int XdxfPlugin::countWords() { QFile dictionaryFile(path); if(!dictionaryFile.open(QFile::ReadOnly | QFile::Text)) { Q_EMIT notify(Notify::Warning, - QString(tr("Xdxf file cannot be read for %1 dictionary") + QString(tr("XDXF file cannot be read for %1 dictionary") .arg(name()))); qDebug()<<"Error: could not open file"; return -1; @@ -460,7 +460,7 @@ bool XdxfPlugin::makeCache(QString) { if (!dictionaryFile.open(QFile::ReadOnly | QFile::Text)) { Q_EMIT updateCachingProgress(100, 0); Q_EMIT notify(Notify::Warning, - QString(tr("Xdxf file cannot be read for %1 dictionary") + QString(tr("XDXF file cannot be read for %1 dictionary") .arg(name()))); return 0; } @@ -472,7 +472,7 @@ bool XdxfPlugin::makeCache(QString) { qDebug() << "Database error" << db.lastError().text() << endl; Q_EMIT updateCachingProgress(100, 0); Q_EMIT notify(Notify::Warning, QString(tr("Cache database cannot be " - "opened for %1 dictionary. Searching in xdxf file. " + "opened for %1 dictionary. Searching in XDXF file. " "You may want to recache.").arg(name()))); return false; } -- 1.7.9.5