Changeset 11437


Ignore:
Timestamp:
Nov 25, 2010, 3:00:25 AM (11 years ago)
Author:
charles
Message:

(trunk qt) #3766 "Qt client i18n improvements" -- committed patch from rb07

Location:
trunk/qt
Files:
1 added
4 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/qt/app.cc

    r11163 r11437  
    2424#include <QLibraryInfo>
    2525#include <QRect>
    26 #include <QTranslator>
    2726
    2827#include <libtransmission/transmission.h>
     
    9594
    9695    // install the qt translator
    97     QTranslator qtTranslator;
    9896    qtTranslator.load( "qt_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
    9997    installTranslator( &qtTranslator );
    10098
    10199    // install the transmission translator
    102     QTranslator appTranslator;
    103     appTranslator.load( QString(MY_READABLE_NAME) + "_" + QLocale::system().name() );
     100    appTranslator.load( QString(MY_CONFIG_NAME) + "_" + QLocale::system().name(), QCoreApplication::applicationDirPath() + "/translations" );
    104101    installTranslator( &appTranslator );
    105102
  • trunk/qt/app.h

    r11094 r11437  
    1717#include <QSet>
    1818#include <QTimer>
     19#include <QTranslator>
    1920
    2021#include "favicon.h"
     
    5253        QTimer mySessionTimer;
    5354        time_t myLastFullUpdateTime;
     55        QTranslator qtTranslator;
     56        QTranslator appTranslator;
    5457
    5558    private slots:
  • trunk/qt/prefs-dialog.cc

    r11379 r11437  
    281281        h->addWidget( w, 1 );
    282282        mySchedWidgets << w;
    283         QLabel * nd = new QLabel( "&to" );
     283        QLabel * nd = new QLabel( tr("&to") );
    284284        h->addWidget( nd );
    285285        mySchedWidgets << nd;
     
    437437    hig->addSectionTitle( tr( "Blocklist" ) );
    438438
    439     QWidget * l = checkBoxNew( "Enable &blocklist:", Prefs::BLOCKLIST_ENABLED );
     439    QWidget * l = checkBoxNew( tr("Enable &blocklist:"), Prefs::BLOCKLIST_ENABLED );
    440440    QWidget * e = lineEditNew( Prefs::BLOCKLIST_URL );
    441441    myBlockWidgets << e;
  • trunk/qt/qtr.pro

    r11435 r11437  
    2727win32:LIBS += -lidn -liconv -lwldap32 -liphlpapi
    2828
    29 TRANSLATIONS += transmission_en.ts transmission_es.ts transmission_pt_BR.ts transmission_ru.ts
     29TRANSLATIONS += translations/transmission_en.ts \
     30                translations/transmission_es.ts \
     31                translations/transmission_pt_BR.ts \
     32                translations/transmission_ru.ts
    3033
    3134FORMS += mainwin.ui
Note: See TracChangeset for help on using the changeset viewer.