diff --git a/qt/app.cc b/qt/app.cc index 08c6cdd3a..9d6131fc7 100644 --- a/qt/app.cc +++ b/qt/app.cc @@ -23,7 +23,6 @@ #include #include #include -#include #include #include @@ -94,13 +93,11 @@ MyApp :: MyApp( int& argc, char ** argv ): setApplicationName( MY_CONFIG_NAME ); // install the qt translator - QTranslator qtTranslator; qtTranslator.load( "qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); installTranslator( &qtTranslator ); // install the transmission translator - QTranslator appTranslator; - appTranslator.load( QString(MY_READABLE_NAME) + "_" + QLocale::system().name() ); + appTranslator.load( QString(MY_CONFIG_NAME) + "_" + QLocale::system().name(), QCoreApplication::applicationDirPath() + "/translations" ); installTranslator( &appTranslator ); Formatter::initUnits( ); diff --git a/qt/app.h b/qt/app.h index 3e4df0d3d..c28efb4d1 100644 --- a/qt/app.h +++ b/qt/app.h @@ -16,6 +16,7 @@ #include #include #include +#include #include "favicon.h" @@ -51,6 +52,8 @@ class MyApp: public QApplication QTimer myStatsTimer; QTimer mySessionTimer; time_t myLastFullUpdateTime; + QTranslator qtTranslator; + QTranslator appTranslator; private slots: void consentGiven( ); diff --git a/qt/prefs-dialog.cc b/qt/prefs-dialog.cc index 7c73e0610..b0a5bfd01 100644 --- a/qt/prefs-dialog.cc +++ b/qt/prefs-dialog.cc @@ -280,7 +280,7 @@ PrefsDialog :: createSpeedTab( ) QWidget * w = timeEditNew( Prefs :: ALT_SPEED_LIMIT_TIME_BEGIN ); h->addWidget( w, 1 ); mySchedWidgets << w; - QLabel * nd = new QLabel( "&to" ); + QLabel * nd = new QLabel( tr("&to") ); h->addWidget( nd ); mySchedWidgets << nd; w = timeEditNew( Prefs :: ALT_SPEED_LIMIT_TIME_END ); @@ -436,7 +436,7 @@ PrefsDialog :: createPrivacyTab( ) hig->addSectionTitle( tr( "Blocklist" ) ); - QWidget * l = checkBoxNew( "Enable &blocklist:", Prefs::BLOCKLIST_ENABLED ); + QWidget * l = checkBoxNew( tr("Enable &blocklist:"), Prefs::BLOCKLIST_ENABLED ); QWidget * e = lineEditNew( Prefs::BLOCKLIST_URL ); myBlockWidgets << e; hig->addRow( l, e ); diff --git a/qt/qtr.pro b/qt/qtr.pro index 462422af9..b634a122b 100644 --- a/qt/qtr.pro +++ b/qt/qtr.pro @@ -26,7 +26,10 @@ win32:DEFINES += QT_DBUS win32:LIBS += -levent -lws2_32 -lintl win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi -TRANSLATIONS += transmission_en.ts transmission_es.ts transmission_pt_BR.ts transmission_ru.ts +TRANSLATIONS += translations/transmission_en.ts \ + translations/transmission_es.ts \ + translations/transmission_pt_BR.ts \ + translations/transmission_ru.ts FORMS += mainwin.ui RESOURCES += application.qrc diff --git a/qt/transmission_en.ts b/qt/translations/transmission_en.ts similarity index 100% rename from qt/transmission_en.ts rename to qt/translations/transmission_en.ts diff --git a/qt/transmission_es.ts b/qt/translations/transmission_es.ts similarity index 100% rename from qt/transmission_es.ts rename to qt/translations/transmission_es.ts diff --git a/qt/transmission_pt_BR.ts b/qt/translations/transmission_pt_BR.ts similarity index 100% rename from qt/transmission_pt_BR.ts rename to qt/translations/transmission_pt_BR.ts diff --git a/qt/transmission_ru.ts b/qt/translations/transmission_ru.ts similarity index 100% rename from qt/transmission_ru.ts rename to qt/translations/transmission_ru.ts