diff --git a/gta5sync.pro b/gta5sync.pro index 86a90e6..2674394 100755 --- a/gta5sync.pro +++ b/gta5sync.pro @@ -99,7 +99,7 @@ FORMS += \ TRANSLATIONS += \ res/gta5sync_de.ts \ - lang/gta5sync_fr.ts \ + res/gta5sync_fr.ts \ lang/gta5sync_ru.ts RESOURCES += \ @@ -108,15 +108,11 @@ RESOURCES += \ DISTFILES += res/app.rc \ res/gta5sync.desktop \ res/gta5sync_de.ts \ - lang/gta5sync_fr.qm \ - lang/gta5sync_ru.qm \ - lang/qtbase_fr.qm \ + res/gta5sync_fr.ts \ lang/qtbase_ru.qm \ - lang/README.txt \ - lang/gta5sync_fr.ts \ lang/gta5sync_ru.ts \ - lang/qt_fr.qm \ - lang/qt_ru.qm + lang/qt_ru.qm \ + lang/README.txt INCLUDEPATH += ./uimod diff --git a/main.cpp b/main.cpp index dc4f4b9..0821841 100755 --- a/main.cpp +++ b/main.cpp @@ -227,6 +227,7 @@ int main(int argc, char *argv[]) // End external translate loading // Start internal translate loading QTranslator appTranslator; + trsf = false; if (language == "System" || language.trimmed() == "") { QString languageName = QLocale::system().name(); @@ -270,6 +271,7 @@ int main(int argc, char *argv[]) { appTranslator.load(":/tr/gta5sync_" + langList.at(0) + ".qm"); QLocale::setDefault(QLocale(langList.at(0))); + } } } diff --git a/res/app.qrc b/res/app.qrc index ed114dd..fe2c30d 100755 --- a/res/app.qrc +++ b/res/app.qrc @@ -3,6 +3,9 @@ gta5sync_de.qm qt_de.qm qtbase_de.qm + gta5sync_fr.qm + qt_fr.qm + qtbase_fr.qm savegame.png diff --git a/lang/gta5sync_fr.qm b/res/gta5sync_fr.qm similarity index 100% rename from lang/gta5sync_fr.qm rename to res/gta5sync_fr.qm diff --git a/lang/gta5sync_fr.ts b/res/gta5sync_fr.ts similarity index 100% rename from lang/gta5sync_fr.ts rename to res/gta5sync_fr.ts diff --git a/lang/qt_fr.qm b/res/qt_fr.qm similarity index 100% rename from lang/qt_fr.qm rename to res/qt_fr.qm diff --git a/lang/qtbase_fr.qm b/res/qtbase_fr.qm similarity index 100% rename from lang/qtbase_fr.qm rename to res/qtbase_fr.qm