diff --git a/src/QGCApplication.cc b/src/QGCApplication.cc
index 5508783295e012fec306ad07c47ca1e1d3292c0d..44a5498a15435fcb63461b2e785cc7b128491be7 100644
--- a/src/QGCApplication.cc
+++ b/src/QGCApplication.cc
@@ -114,7 +114,7 @@
 
 #include "QGCMapEngine.h"
 
-QGCApplication* QGCApplication::_app = NULL;
+QGCApplication* QGCApplication::_app = nullptr;
 
 const char* QGCApplication::_deleteAllSettingsKey           = "DeleteAllSettingsNextBoot";
 const char* QGCApplication::_settingsVersionKey             = "SettingsVersion";
@@ -150,7 +150,7 @@ static QObject* kmlFileHelperSingletonFactory(QQmlEngine*, QJSEngine*)
 QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
 #ifdef __mobile__
     : QGuiApplication       (argc, argv)
-    , _qmlAppEngine         (NULL)
+    , _qmlAppEngine         (nullptr)
 #else
     : QApplication          (argc, argv)
 #endif
@@ -161,11 +161,24 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
 #ifdef QT_DEBUG
     , _testHighDPI          (false)
 #endif
-    , _toolbox              (NULL)
+    , _toolbox              (nullptr)
     , _bluetoothAvailable   (false)
 {
     _app = this;
 
+
+    QLocale locale = QLocale::system();
+    //-- Some forced locales for testing
+    //QLocale locale = QLocale(QLocale::German);
+    //QLocale locale = QLocale(QLocale::French);
+    //QLocale locale = QLocale(QLocale::Chinese);
+#if defined (__macos__)
+    locale = QLocale(locale.name());
+#endif
+    //-- Our localization
+    if(_QGCTranslator.load(locale, "qgc_", "", ":/localization"))
+        _app->installTranslator(&_QGCTranslator);
+
     // This prevents usage of QQuickWidget to fail since it doesn't support native widget siblings
 #ifndef __android__
     setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
@@ -222,12 +235,12 @@ QGCApplication::QGCApplication(int &argc, char* argv[], bool unitTesting)
     QString loggingOptions;
 
     CmdLineOpt_t rgCmdLineOptions[] = {
-        { "--clear-settings",   &fClearSettingsOptions, NULL },
+        { "--clear-settings",   &fClearSettingsOptions, nullptr },
         { "--logging",          &logging,               &loggingOptions },
-        { "--fake-mobile",      &_fakeMobile,           NULL },
-        { "--log-output",       &_logOutput,            NULL },
+        { "--fake-mobile",      &_fakeMobile,           nullptr },
+        { "--log-output",       &_logOutput,            nullptr },
     #ifdef QT_DEBUG
-        { "--test-high-dpi",    &_testHighDPI,          NULL },
+        { "--test-high-dpi",    &_testHighDPI,          nullptr },
     #endif
         // Add additional command line option flags here
     };
@@ -344,7 +357,7 @@ void QGCApplication::_shutdown(void)
 QGCApplication::~QGCApplication()
 {
     // Place shutdown code in _shutdown
-    _app = NULL;
+    _app = nullptr;
 }
 
 void QGCApplication::_initCommon(void)
@@ -648,10 +661,10 @@ QObject* QGCApplication::_rootQmlObject()
         return mainWindow->rootQmlObject();
     } else if (runningUnitTests()){
         // Unit test can run without a main window
-        return NULL;
+        return nullptr;
     } else {
         qWarning() << "Why is MainWindow missing?";
-        return NULL;
+        return nullptr;
     }
 #endif
 }
diff --git a/src/QGCApplication.h b/src/QGCApplication.h
index 0c098f13fe3bd7b8b4cbd173a1df301fe1bdba0e..a78c6ea97a15ef57a818121a72856febf292c7a3 100644
--- a/src/QGCApplication.h
+++ b/src/QGCApplication.h
@@ -177,6 +177,8 @@ private:
 
     QGCToolbox* _toolbox;
 
+    QTranslator _QGCTranslator;
+
     bool _bluetoothAvailable;
 
     static const char* _settingsVersionKey;             ///< Settings key which hold settings version