From 7555c48dc990cbfb0f78bbda4e1bbb368fd52ac7 Mon Sep 17 00:00:00 2001 From: nils Date: Sun, 25 Mar 2012 12:11:29 +0000 Subject: only use one qt translation file per language (independend of windows and linux, since they equal) git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@863 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- main.cpp | 11 ++--------- release/ts/qt_de.qm | Bin 0 -> 325046 bytes release/ts/qt_es.qm | Bin 0 -> 82411 bytes release/ts/qt_fr.qm | Bin 0 -> 148544 bytes release/ts/qt_linux_de.qm | Bin 325046 -> 0 bytes release/ts/qt_linux_es.qm | Bin 82411 -> 0 bytes release/ts/qt_linux_fr.qm | Bin 148544 -> 0 bytes release/ts/qt_linux_pt.qm | Bin 70321 -> 0 bytes release/ts/qt_linux_ru.qm | Bin 285986 -> 0 bytes release/ts/qt_pt.qm | Bin 0 -> 70321 bytes release/ts/qt_ru.qm | Bin 0 -> 285986 bytes release/ts/qt_windows_de.qm | Bin 325046 -> 0 bytes release/ts/qt_windows_es.qm | Bin 82411 -> 0 bytes release/ts/qt_windows_fr.qm | Bin 148544 -> 0 bytes release/ts/qt_windows_pt.qm | Bin 70321 -> 0 bytes release/ts/qt_windows_ru.qm | Bin 285986 -> 0 bytes 16 files changed, 2 insertions(+), 9 deletions(-) create mode 100644 release/ts/qt_de.qm create mode 100755 release/ts/qt_es.qm create mode 100755 release/ts/qt_fr.qm delete mode 100644 release/ts/qt_linux_de.qm delete mode 100644 release/ts/qt_linux_es.qm delete mode 100644 release/ts/qt_linux_fr.qm delete mode 100644 release/ts/qt_linux_pt.qm delete mode 100644 release/ts/qt_linux_ru.qm create mode 100755 release/ts/qt_pt.qm create mode 100755 release/ts/qt_ru.qm delete mode 100755 release/ts/qt_windows_de.qm delete mode 100755 release/ts/qt_windows_es.qm delete mode 100755 release/ts/qt_windows_fr.qm delete mode 100755 release/ts/qt_windows_pt.qm delete mode 100755 release/ts/qt_windows_ru.qm diff --git a/main.cpp b/main.cpp index f9510c1..19f29cd 100644 --- a/main.cpp +++ b/main.cpp @@ -89,13 +89,6 @@ int main(int argc, char *argv[]) QSettings settings; 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); @@ -108,8 +101,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; diff --git a/release/ts/qt_de.qm b/release/ts/qt_de.qm new file mode 100644 index 0000000..113bbcc Binary files /dev/null and b/release/ts/qt_de.qm differ diff --git a/release/ts/qt_es.qm b/release/ts/qt_es.qm new file mode 100755 index 0000000..5191160 Binary files /dev/null and b/release/ts/qt_es.qm differ diff --git a/release/ts/qt_fr.qm b/release/ts/qt_fr.qm new file mode 100755 index 0000000..5553086 Binary files /dev/null and b/release/ts/qt_fr.qm differ diff --git a/release/ts/qt_linux_de.qm b/release/ts/qt_linux_de.qm deleted file mode 100644 index 113bbcc..0000000 Binary files a/release/ts/qt_linux_de.qm and /dev/null differ diff --git a/release/ts/qt_linux_es.qm b/release/ts/qt_linux_es.qm deleted file mode 100644 index 5191160..0000000 Binary files a/release/ts/qt_linux_es.qm and /dev/null differ diff --git a/release/ts/qt_linux_fr.qm b/release/ts/qt_linux_fr.qm deleted file mode 100644 index 5553086..0000000 Binary files a/release/ts/qt_linux_fr.qm and /dev/null differ diff --git a/release/ts/qt_linux_pt.qm b/release/ts/qt_linux_pt.qm deleted file mode 100644 index fc92511..0000000 Binary files a/release/ts/qt_linux_pt.qm and /dev/null differ diff --git a/release/ts/qt_linux_ru.qm b/release/ts/qt_linux_ru.qm deleted file mode 100644 index a8c517e..0000000 Binary files a/release/ts/qt_linux_ru.qm and /dev/null differ diff --git a/release/ts/qt_pt.qm b/release/ts/qt_pt.qm new file mode 100755 index 0000000..fc92511 Binary files /dev/null and b/release/ts/qt_pt.qm differ diff --git a/release/ts/qt_ru.qm b/release/ts/qt_ru.qm new file mode 100755 index 0000000..a8c517e Binary files /dev/null and b/release/ts/qt_ru.qm differ diff --git a/release/ts/qt_windows_de.qm b/release/ts/qt_windows_de.qm deleted file mode 100755 index 113bbcc..0000000 Binary files a/release/ts/qt_windows_de.qm and /dev/null differ diff --git a/release/ts/qt_windows_es.qm b/release/ts/qt_windows_es.qm deleted file mode 100755 index 5191160..0000000 Binary files a/release/ts/qt_windows_es.qm and /dev/null differ diff --git a/release/ts/qt_windows_fr.qm b/release/ts/qt_windows_fr.qm deleted file mode 100755 index 5553086..0000000 Binary files a/release/ts/qt_windows_fr.qm and /dev/null differ diff --git a/release/ts/qt_windows_pt.qm b/release/ts/qt_windows_pt.qm deleted file mode 100755 index fc92511..0000000 Binary files a/release/ts/qt_windows_pt.qm and /dev/null differ diff --git a/release/ts/qt_windows_ru.qm b/release/ts/qt_windows_ru.qm deleted file mode 100755 index a8c517e..0000000 Binary files a/release/ts/qt_windows_ru.qm and /dev/null differ -- cgit v1.2.3