Index: sources/storage/StorageGlobals.cpp
===================================================================
diff -u -rf724589acaa51725f5e5f8a746404d01804efbcf -rd9b9df9b23da89b4c27f4672ff6e7f570adcc48a
--- sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision f724589acaa51725f5e5f8a746404d01804efbcf)
+++ sources/storage/StorageGlobals.cpp	(.../StorageGlobals.cpp)	(revision d9b9df9b23da89b4c27f4672ff6e7f570adcc48a)
@@ -83,7 +83,23 @@
     const char *Settings_Path   () { return gUseRootHome ? Settings_Path_Init : ( ( gEnableManufacturing || gEnableUpdating ) ? ( settings_secured ? Settings_Path_Name: Settings_Path_Init ) : Settings_Path_Name ); }
           void  Settings_Secured() { settings_secured = true; }
 
+      const char *Configurations_Path() {
 #ifdef BUILD_FOR_TARGET
+          return QString(QCoreApplication::applicationDirPath() + "/").toLatin1().constData();
+#else
+          return "/home/denali/Desktop/";
+#endif
+      }
+
+      const char *Translations_Path() {
+#ifdef BUILD_FOR_TARGET
+          return QString(QCoreApplication::applicationDirPath() + "/").toLatin1().constData();
+#else
+          return "/home/denali/Projects/application/resources/";
+#endif
+      }
+
+#ifdef BUILD_FOR_TARGET
     //WARNING: This has to match with the crypt_setup.sh
     const char *Settings_Path_Init = "/home/root/.config/"; // this is the manufacturing or update setup and the user is root.
     const char *Settings_Path_Name = "/var/configurations/";
@@ -92,21 +108,25 @@
     const char *Settings_Path_Init = "/home/denali/Projects/application/resources/settings/";
     const char *Settings_Path_Name = "/home/denali/Projects/application/resources/settings/";
 #endif
-    const char *Settings_Category_Instructions           = "Instructions/Instructions";
-    const char *Settings_Category_InstructionsImagesLoc  = "%1/Instructions/";
-    const char *Settings_Category_ConfigurationsDataList = "Configurations/DataList"  ;
-    const char *Settings_Category_Alarms                 = "Alarms/Alarms"            ;
-    const char *Settings_Category_Events                 = "Alarms/Events"            ;
-    const char *Settings_Category_MessagesUnhandled      = "Messages/Unhandled"       ;
-    const char *Settings_Category_SettingsSystem         = "Settings/System"          ;
-    const char *Settings_Category_NoCANBus               = "Development/NoCANBus"     ;
-    const char *Settings_Category_GenericConfirm         = "Confirm/Confirm"          ;
-    const char *Settings_Key_Title                       = "Title"                    ;
-    const char *Settings_Key_Message                     = "Message"                  ;
-    const char *Settings_Key_ListTitle                   = "ListTitle"                ;
-    const char *Settings_Key_Confirm                     = "Confirm"                  ;
-    const char *Settings_Key_Cancel                      = "Cancel"                   ;
+    const char *Settings_Category_Instructions              = "Instructions/Instructions"   ;
+    const char *Settings_Category_InstructionsImagesLoc     = "%1/Instructions/"            ;
+    const char *Settings_Category_DataList                  = "Parameters/DataList"         ;
+    const char *Settings_Category_Alarms                    = "Alarms/Alarms"               ;
+    const char *Settings_Category_Events                    = "Alarms/Events"               ;
+    const char *Settings_Category_Rejects                   = "Alarms/Rejections"           ;
+    const char *Settings_Category_MessagesUnhandled         = "Messages/Unhandled"          ;
+    const char *Settings_Category_SettingsSystem            = "Settings/System"             ;
+    const char *Settings_Category_GenericConfirm            = "Confirm/Confirm"             ;
+    const char *Settings_Category_Translation               = "translations/translation"    ; // in qrc
+    const char *Settings_Category_Locale                    = "settings/locale"             ; // in app location
 
+    // common key.value pairs
+    const char *Settings_Key_Title                          = "Title"                       ;
+    const char *Settings_Key_Message                        = "Message"                     ;
+    const char *Settings_Key_ListTitle                      = "ListTitle"                   ;
+    const char *Settings_Key_Confirm                        = "Confirm"                     ;
+    const char *Settings_Key_Cancel                         = "Cancel"                      ;
+
     // CloudSync credentials
 #ifdef BUILD_FOR_TARGET
     const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/var/configurations/CloudSync/";