From: Piotrek Date: Wed, 1 Sep 2010 12:57:55 +0000 (+0200) Subject: Polish translation complete X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=b67514e5c68a32ab05c5435f9f298422f70e07af;p=mdictionary Polish translation complete --- 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 0000000..900f716 Binary files /dev/null and b/data/translations/dict_en.qm differ diff --git a/data/translations/dict_pl.qm b/data/translations/dict_pl.qm new file mode 100644 index 0000000..fb43470 Binary files /dev/null and b/data/translations/dict_pl.qm differ diff --git a/mdictionary.pro b/mdictionary.pro index f741748..0b91f14 100644 --- a/mdictionary.pro +++ b/mdictionary.pro @@ -7,7 +7,7 @@ error("Use the qmake include with Qt4.4 or greater, on Debian that is qmake-qt4" QT += sql TEMPLATE = subdirs SUBDIRS = trunk -TRANSLATIONS += dict_pl.ts +TRANSLATIONS += dict_pl.ts dict_en.ts BINDIR = $$PREFIX/bin LIBDIR = $$PREFIX/lib/$${MDICT_APPNAME} diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro index aec27f2..b929c80 100644 --- a/trunk/src/base/base.pro +++ b/trunk/src/base/base.pro @@ -61,7 +61,9 @@ HEADERS += gui/MainWindow.h \ gui/TranslationTextEdit.h \ ../includes/AccentsNormalizer.h \ ../includes/DictDialog.h -RESOURCES += ../../../data/icons/gui.qrc +RESOURCES += \ + translations.qrc \ + ../../../data/gui.qrc unix { # VARIABLES isEmpty(PREFIX):PREFIX = /usr diff --git a/trunk/src/base/gui/AboutWidget.cpp b/trunk/src/base/gui/AboutWidget.cpp index 1e3be9d..7eea400 100644 --- a/trunk/src/base/gui/AboutWidget.cpp +++ b/trunk/src/base/gui/AboutWidget.cpp @@ -31,7 +31,7 @@ AboutWidget::AboutWidget(GUIInterface *parent): QDialog(parent) { QString infoNote, licenseNote, comarchNote; infoNote = "

mDictionary

"; - comarchNote = "
Meamo/Meego Mulitlingual Dictionary
"; + comarchNote = "
Meamo/Meego Multilingual Dictionary
"; comarchNote += "
Copyright 2006-2010, Comarch S.A.
"; comarchNote += "http://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; }