Merge pull request #583 from laanwj/qt3

More Qt GUI updates
- Make USE_SSL qmake build flag actually work
- Improve mac experience, general UI improvements
- Add keyboard shortcut to switch between tabs

1 files changed, 9 insertions, 1 deletions

diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 60a9074204..c8e332419c 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -16,6 +16,7 @@
 #include <QLocale>
 #include <QTranslator>
 #include <QSplashScreen>
+#include <QLibraryInfo>
 
 // Need a global reference for the notifications to find the GUI
 BitcoinGUI *guiref;
@@ -119,9 +120,16 @@ int main(int argc, char *argv[])
 
     // Load language file for system locale
     QString locale = QLocale::system().name();
+    QTranslator qtTranslator;
+    qtTranslator.load(QLibraryInfo::location(QLibraryInfo::TranslationsPath) + "/qt_" + locale);
+    if (!qtTranslator.isEmpty())
+        app.installTranslator(&qtTranslator);
     QTranslator translator;
     translator.load(":/translations/"+locale);
-    app.installTranslator(&translator);
+    if (!translator.isEmpty())
+        app.installTranslator(&translator);
+
+    app.setApplicationName(QApplication::translate("main", "Bitcoin Qt"));
 
     QSplashScreen splash(QPixmap(":/images/splash"), 0);
     splash.show();