# # # patch "src/main.cpp" # from [e36e3f6a9adf493840944a11b718bf25abe079de] # to [c9a04259af7dc123b9b3a9ade1bd3fa977c856f7] # ============================================================ --- src/main.cpp e36e3f6a9adf493840944a11b718bf25abe079de +++ src/main.cpp c9a04259af7dc123b9b3a9ade1bd3fa977c856f7 @@ -48,20 +48,31 @@ int main(int argc, char** argv) // install our own message handler to catch debug messages, warnings, etc. qInstallMsgHandler(guitoneMsgHandler); - // try to find a suitable locale and setup translations QString locale = QLocale::system().name(); - QTranslator translator; + + // load the default Qt translations + QTranslator qtTranslator; + if (!qtTranslator.load("qt_" + locale)) + { + W(QString("Couldn't load qt translation for %1 - using default") + .arg(locale)); + } + + // try to load the application's translation + QTranslator appTranslator; QString transFileName("guitone_" + locale); - if (!translator.load(transFileName, ":/i18n")) + if (!appTranslator.load(transFileName, ":/i18n")) { - W(QString("Couldn't load translation file for %1 - using default") + W(QString("Couldn't load app translation for %1 - using default") .arg(locale)); } Guitone app(argc, argv); - app.installTranslator(&translator); + app.installTranslator(&appTranslator); + app.installTranslator(&qtTranslator); + if (!app.init()) return 1; return app.exec();