moved branch 0.3.2-1 to 0.3.3

git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.3@1084 34ebc366-c3a9-4b3c-9f84-69acf7962910

1 files changed, 13 insertions, 3 deletions

diff --git a/main.cpp b/main.cpp
index 19f29cd..60a30ac 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,12 +33,15 @@ int main(int argc, char *argv[])
     // get application path
     QString appPath = qApp->applicationDirPath();
 
-    app.setApplicationVersion("0.3.2");
+    app.setApplicationVersion("0.3.3");
     app.setApplicationName("gpg4usb");
 
     // dont show icons in menus
     app.setAttribute(Qt::AA_DontShowIconsInMenus);
 
+    // unicode in source
+    QTextCodec::setCodecForTr(QTextCodec::codecForName("utf-8"));
+
     // set environment variables
     // TODO:
     //   - unsetenv on windows?
@@ -89,6 +92,13 @@ 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);
@@ -101,8 +111,8 @@ int main(int argc, char *argv[])
         translator.load("ts/gpg4usb_" +  lang, appPath);
         app.installTranslator(&translator);
 
-        // set qt translations
-        translator2.load("ts/qt_" + lang, appPath);
+        // make shortcuts system and language independent
+        translator2.load(qtTransPrefix + lang, appPath);
         app.installTranslator(&translator2);
 
         MainWindow window;