From b9b9c320c7d6fd566271f3402a76e55356fec4f9 Mon Sep 17 00:00:00 2001 From: nils Date: Wed, 2 Jun 2010 22:46:59 +0000 Subject: shortcuts independent of language and os works now git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@343 34ebc366-c3a9-4b3c-9f84-69acf7962910 --- main.cpp | 11 ++++++++++- release/ts/qt_linux_de.qm | Bin 0 -> 181578 bytes release/ts/qt_linux_es.qm | Bin 0 -> 117693 bytes release/ts/qt_linux_fr.qm | Bin 0 -> 148544 bytes release/ts/qt_linux_pt.qm | Bin 0 -> 78828 bytes release/ts/qt_linux_ru.qm | Bin 0 -> 60815 bytes release/ts/qt_windows_de.qm | Bin 0 -> 181578 bytes release/ts/qt_windows_es.qm | Bin 0 -> 117693 bytes release/ts/qt_windows_fr.qm | Bin 0 -> 148544 bytes release/ts/qt_windows_pt.qm | Bin 0 -> 78828 bytes release/ts/qt_windows_ru.qm | Bin 0 -> 60815 bytes 11 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 release/ts/qt_linux_de.qm create mode 100644 release/ts/qt_linux_es.qm create mode 100644 release/ts/qt_linux_fr.qm create mode 100644 release/ts/qt_linux_pt.qm create mode 100644 release/ts/qt_linux_ru.qm create mode 100755 release/ts/qt_windows_de.qm create mode 100755 release/ts/qt_windows_es.qm create mode 100755 release/ts/qt_windows_fr.qm create mode 100755 release/ts/qt_windows_pt.qm create mode 100755 release/ts/qt_windows_ru.qm diff --git a/main.cpp b/main.cpp index 2bd8a6c..cf6f6ac 100644 --- a/main.cpp +++ b/main.cpp @@ -45,13 +45,22 @@ int main(int argc, char *argv[]) QSettings settings; QString lang = settings.value("int/lang", QLocale::system().name()).toString(); if (lang.isEmpty()) lang = QLocale::system().name(); - + //internationalize QTranslator translator; translator.load("ts/gpg4usb_" + lang, qApp->applicationDirPath()); app.installTranslator(&translator); + // make shortcuts system and language independent + QTranslator translator2; + #ifdef _WIN32 + translator2.load("ts/qt_windows_" + lang, qApp->applicationDirPath()); + #else + translator2.load("ts/qt_linux_" + lang, qApp->applicationDirPath()); + #endif + app.installTranslator(&translator2); + GpgWin *window = new GpgWin(); window->show(); diff --git a/release/ts/qt_linux_de.qm b/release/ts/qt_linux_de.qm new file mode 100644 index 0000000..a477e0d Binary files /dev/null and b/release/ts/qt_linux_de.qm differ diff --git a/release/ts/qt_linux_es.qm b/release/ts/qt_linux_es.qm new file mode 100644 index 0000000..0fa1226 Binary files /dev/null and b/release/ts/qt_linux_es.qm differ diff --git a/release/ts/qt_linux_fr.qm b/release/ts/qt_linux_fr.qm new file mode 100644 index 0000000..5553086 Binary files /dev/null and b/release/ts/qt_linux_fr.qm differ diff --git a/release/ts/qt_linux_pt.qm b/release/ts/qt_linux_pt.qm new file mode 100644 index 0000000..253a007 Binary files /dev/null and b/release/ts/qt_linux_pt.qm differ diff --git a/release/ts/qt_linux_ru.qm b/release/ts/qt_linux_ru.qm new file mode 100644 index 0000000..63b7b8b Binary files /dev/null and b/release/ts/qt_linux_ru.qm differ diff --git a/release/ts/qt_windows_de.qm b/release/ts/qt_windows_de.qm new file mode 100755 index 0000000..a477e0d Binary files /dev/null and b/release/ts/qt_windows_de.qm differ diff --git a/release/ts/qt_windows_es.qm b/release/ts/qt_windows_es.qm new file mode 100755 index 0000000..0fa1226 Binary files /dev/null and b/release/ts/qt_windows_es.qm differ diff --git a/release/ts/qt_windows_fr.qm b/release/ts/qt_windows_fr.qm new file mode 100755 index 0000000..5553086 Binary files /dev/null and b/release/ts/qt_windows_fr.qm differ diff --git a/release/ts/qt_windows_pt.qm b/release/ts/qt_windows_pt.qm new file mode 100755 index 0000000..253a007 Binary files /dev/null and b/release/ts/qt_windows_pt.qm differ diff --git a/release/ts/qt_windows_ru.qm b/release/ts/qt_windows_ru.qm new file mode 100755 index 0000000..63b7b8b Binary files /dev/null and b/release/ts/qt_windows_ru.qm differ -- cgit v1.2.3