Index: main.cpp
===================================================================
diff -u -r563e34706a5c39070a603725bc021fcdc3424cac -ra522e6aa7a36ac696a9a956200e89d838f319e25
--- main.cpp	(.../main.cpp)	(revision 563e34706a5c39070a603725bc021fcdc3424cac)
+++ main.cpp	(.../main.cpp)	(revision a522e6aa7a36ac696a9a956200e89d838f319e25)
@@ -32,7 +32,6 @@
 #include <QDebug>
 #include <QString>
 #include <QApplication>
-#include <QTranslator>
 #include <QFont>
 #include <QCommandLineParser>
 #include <QDateTime>
@@ -54,12 +53,15 @@
 #include "WifiInterface.h"
 #include "BluetoothInterface.h"
 #include "CloudSyncController.h"
+//AMIR
+#include "Settings.h"
 
 #include "Threads.h"
 
 // kernel
 #include <signal.h>
 
+
 /*!
  * \brief   signalhandler
  * \details When application terminates it quits gracefully.
@@ -547,12 +549,12 @@
     // Storage::FileHandler::copyFolder(QString(Storage::USB_Mount_Point) + "Instructions", QString(Storage::Settings_Path()));
 
     //! - Translation initialization
-    QTranslator translator;
-    bool trLoaded = translator.load(QLocale(), app.applicationName(), QLatin1String("_"), QLatin1String(":/translations"));
-    if (trLoaded) {
-        app.installTranslator(&translator);
-    }
+    //! AMIR
+    //!
+        Storage::Settings settings;
+        settings.loadTranslation();
 
+
     //! - Initializing required thread types
     Threads::registerTypes();