Index: sources/view/settings/VLocalization.cpp
===================================================================
diff -u -ra522e6aa7a36ac696a9a956200e89d838f319e25 -rd9b9df9b23da89b4c27f4672ff6e7f570adcc48a
--- sources/view/settings/VLocalization.cpp	(.../VLocalization.cpp)	(revision a522e6aa7a36ac696a9a956200e89d838f319e25)
+++ sources/view/settings/VLocalization.cpp	(.../VLocalization.cpp)	(revision d9b9df9b23da89b4c27f4672ff6e7f570adcc48a)
@@ -35,27 +35,21 @@
 
 void View::VLocalization::doAdjustment(quint8 vLanguageIndex)
 {
-    Storage::Settings settings;
+    QString mLocale   = _localeMap  .value(vLanguageIndex);
+    QString mLanguage = _languageMap.value(vLanguageIndex);
 
-    QString mLocale   = "";
-    QString mLanguage = "";
+    if ( Storage::Settings::save("Localization", "Locale"     , mLocale   , Storage::Settings::Category_Enum::eConfigurationsLocale )  ) goto lErr;
+    if ( Storage::Settings::save("Localization", "Language"   , mLanguage , Storage::Settings::Category_Enum::eConfigurationsLocale )  ) goto lErr;
 
-    mLocale = _localeMap.value(vLanguageIndex);
-    if ( settings.saveSystem("Localization", "Locale", mLocale   )  ) goto lErr;
-
-    mLanguage = _languageMap.value(vLanguageIndex);
-    if ( settings.saveSystem("Localization", "Language", mLanguage )  ) goto lErr;
-
     // FIXME: Notify UI with a message for success
 
-    keyboardAcronym( _keyboardLocaleMap.value(vLanguageIndex) );
-    qDebug() << __FUNCTION__ << ":" << __LINE__ << ":" << "------------------keyboardAcronym:" << keyboardAcronym();
+    //NOTE: We do not have other keyboards implemented for any language other than en_UK, en_US
+    // keyboardLocale( _keyboardLocaleMap.value(vLanguageIndex) );
 
     return;
 
 lErr:
     LOG_DEBUG("Unsuccessfull configuration value storage for Language");
-
 }
 
 /*!
@@ -65,7 +59,7 @@
  */
 void View::VLocalization::onActionReceive(const SettingsData &)
 {
-    QString mCategory = Storage::Settings_Category_SettingsSystem;
+    QString mCategory = Storage::Settings_Category_Locale;
     QString mLanguage = "";
 
     mLanguage = _Settings.value(mCategory, "Localization", "Language").toString();
@@ -78,6 +72,5 @@
 lErr:
     LOG_DEBUG("incorrect configuration value for Language");
     // FIXME: Notify UI with a message
-
 }