From 7abc2ef2e8f33ca21e9d2f7813e91f9873a3c92a Mon Sep 17 00:00:00 2001 From: Nils Achtergarde Date: Sat, 30 Dec 2017 21:23:00 +0100 Subject: recommit of 7555c48dc990cbfb0f78bbda4e1bbb368fd52ac7 (only use one qt translation file per language ) --- main.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 60a30ac..019466b 100644 --- a/main.cpp +++ b/main.cpp @@ -93,12 +93,6 @@ int main(int argc, char *argv[]) QTranslator translator, translator2; int return_from_event_loop_code; -#ifdef _WIN32 - QString qtTransPrefix = "ts/qt_windows_"; -#else - QString qtTransPrefix = "ts/qt_linux_"; -#endif - do { app.removeTranslator(&translator); app.removeTranslator(&translator2); @@ -111,8 +105,8 @@ int main(int argc, char *argv[]) translator.load("ts/gpg4usb_" + lang, appPath); app.installTranslator(&translator); - // make shortcuts system and language independent - translator2.load(qtTransPrefix + lang, appPath); + // set qt translations + translator2.load("ts/qt_" + lang, appPath); app.installTranslator(&translator2); MainWindow window; -- cgit v1.2.3