aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main.cpp11
-rw-r--r--release/ts/qt_de.qm (renamed from release/ts/qt_linux_de.qm)bin325046 -> 325046 bytes
-rwxr-xr-x[-rw-r--r--]release/ts/qt_es.qm (renamed from release/ts/qt_linux_es.qm)bin82411 -> 82411 bytes
-rwxr-xr-x[-rw-r--r--]release/ts/qt_fr.qm (renamed from release/ts/qt_linux_fr.qm)bin148544 -> 148544 bytes
-rwxr-xr-x[-rw-r--r--]release/ts/qt_pt.qm (renamed from release/ts/qt_linux_pt.qm)bin70321 -> 70321 bytes
-rwxr-xr-x[-rw-r--r--]release/ts/qt_ru.qm (renamed from release/ts/qt_linux_ru.qm)bin285986 -> 285986 bytes
-rwxr-xr-xrelease/ts/qt_windows_de.qmbin325046 -> 0 bytes
-rwxr-xr-xrelease/ts/qt_windows_es.qmbin82411 -> 0 bytes
-rwxr-xr-xrelease/ts/qt_windows_fr.qmbin148544 -> 0 bytes
-rwxr-xr-xrelease/ts/qt_windows_pt.qmbin70321 -> 0 bytes
-rwxr-xr-xrelease/ts/qt_windows_ru.qmbin285986 -> 0 bytes
11 files changed, 2 insertions, 9 deletions
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_linux_de.qm b/release/ts/qt_de.qm
index 113bbcc..113bbcc 100644
--- a/release/ts/qt_linux_de.qm
+++ b/release/ts/qt_de.qm
Binary files differ
diff --git a/release/ts/qt_linux_es.qm b/release/ts/qt_es.qm
index 5191160..5191160 100644..100755
--- a/release/ts/qt_linux_es.qm
+++ b/release/ts/qt_es.qm
Binary files differ
diff --git a/release/ts/qt_linux_fr.qm b/release/ts/qt_fr.qm
index 5553086..5553086 100644..100755
--- a/release/ts/qt_linux_fr.qm
+++ b/release/ts/qt_fr.qm
Binary files differ
diff --git a/release/ts/qt_linux_pt.qm b/release/ts/qt_pt.qm
index fc92511..fc92511 100644..100755
--- a/release/ts/qt_linux_pt.qm
+++ b/release/ts/qt_pt.qm
Binary files differ
diff --git a/release/ts/qt_linux_ru.qm b/release/ts/qt_ru.qm
index a8c517e..a8c517e 100644..100755
--- a/release/ts/qt_linux_ru.qm
+++ b/release/ts/qt_ru.qm
Binary files differ
diff --git a/release/ts/qt_windows_de.qm b/release/ts/qt_windows_de.qm
deleted file mode 100755
index 113bbcc..0000000
--- a/release/ts/qt_windows_de.qm
+++ /dev/null
Binary files differ
diff --git a/release/ts/qt_windows_es.qm b/release/ts/qt_windows_es.qm
deleted file mode 100755
index 5191160..0000000
--- a/release/ts/qt_windows_es.qm
+++ /dev/null
Binary files differ
diff --git a/release/ts/qt_windows_fr.qm b/release/ts/qt_windows_fr.qm
deleted file mode 100755
index 5553086..0000000
--- a/release/ts/qt_windows_fr.qm
+++ /dev/null
Binary files differ
diff --git a/release/ts/qt_windows_pt.qm b/release/ts/qt_windows_pt.qm
deleted file mode 100755
index fc92511..0000000
--- a/release/ts/qt_windows_pt.qm
+++ /dev/null
Binary files differ
diff --git a/release/ts/qt_windows_ru.qm b/release/ts/qt_windows_ru.qm
deleted file mode 100755
index a8c517e..0000000
--- a/release/ts/qt_windows_ru.qm
+++ /dev/null
Binary files differ