Index: sources/ApplicationController.cpp
===================================================================
diff -u -rf8c7febe2e4131b8c7e68fd9849027ba8596dbc6 -ra522e6aa7a36ac696a9a956200e89d838f319e25
--- sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision f8c7febe2e4131b8c7e68fd9849027ba8596dbc6)
+++ sources/ApplicationController.cpp	(.../ApplicationController.cpp)	(revision a522e6aa7a36ac696a9a956200e89d838f319e25)
@@ -162,6 +162,12 @@
     connect(&_settingsWatcher, SIGNAL(finished        ()),
             this             ,   SLOT(onSettingsUpdate()));
 
+//    connect(&_settingsWatcher, SIGNAL(finished        ()),
+//            this             ,   SLOT(onLoadTranslation()));
+
+
+
+
     // Device Signal/Slots
     DEVICE_APP_INIT_CONNECTIONS_LIST
 
@@ -674,15 +680,11 @@
 
     /// in manufacturing or update mode the configurations must reside in /root/home
     /// therefore the settings can be initialized after POST.
-#ifdef LEAHI_DIGI_BOARD
-    initSettings();
-#else
 #ifdef BUILD_FOR_DESKTOP
     initSettings();
 #else
     if ( gEnableManufacturing || gEnableUpdating ) initSettings();
 #endif
-#endif
 }
 
 void ApplicationController::onQuitApplication()
@@ -777,3 +779,9 @@
     emit didPOSTPass        (_post.isDone(  ));                             // GuiController -> GuiView : didPOSTPass(bool)
 }
 
+void ApplicationController::onLoadTranslation()
+{
+    Storage::Settings settings;
+    settings.loadTranslation();
+}
+