Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp	(revision 66586)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp	(revision 66587)
@@ -51,5 +51,4 @@
 {
     /* default settings */
-    languageId  = QString::null;
     maxGuestRes = QString::null;
     remapScancodes = QString::null;
@@ -60,5 +59,4 @@
 VBoxGlobalSettingsData::VBoxGlobalSettingsData (const VBoxGlobalSettingsData &that)
 {
-    languageId  = that.languageId;
     maxGuestRes = that.maxGuestRes;
     remapScancodes = that.remapScancodes;
@@ -74,6 +72,5 @@
 {
     return this == &that ||
-        (languageId  == that.languageId &&
-         maxGuestRes == that.maxGuestRes &&
+        (maxGuestRes == that.maxGuestRes &&
          remapScancodes == that.remapScancodes &&
          proxySettings == that.proxySettings &&
@@ -88,7 +85,4 @@
  */
 
-/* Defined in VBoxGlobal.cpp */
-extern const char *gVBoxLangIDRegExp;
-
 static struct
 {
@@ -100,5 +94,4 @@
 gPropertyMap[] =
 {
-    { "GUI/LanguageID",                            "languageId",              gVBoxLangIDRegExp, true },
     { "GUI/MaxGuestResolution",                    "maxGuestRes",             "\\d*[1-9]\\d*,\\d*[1-9]\\d*|any|auto", true },
     { "GUI/RemapScancodes",                        "remapScancodes",          "(\\d+=\\d+,)*\\d+=\\d+", true },
Index: /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h	(revision 66586)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h	(revision 66587)
@@ -37,5 +37,4 @@
 private:
 
-    QString languageId;
     QString maxGuestRes;
     QString remapScancodes;
@@ -51,5 +50,4 @@
 {
     Q_OBJECT
-    Q_PROPERTY (QString languageId READ languageId WRITE setLanguageId)
     Q_PROPERTY (QString maxGuestRes READ maxGuestRes WRITE setMaxGuestRes)
     Q_PROPERTY (QString remapScancodes READ remapScancodes WRITE setRemapScancodes)
@@ -69,10 +67,4 @@
 
     // Properties
-
-    QString languageId() const { return data()->languageId; }
-    void setLanguageId (const QString &aLanguageId)
-    {
-        mData()->languageId = aLanguageId;
-    }
 
     QString maxGuestRes() const { return data()->maxGuestRes; }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 66586)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 66587)
@@ -27,5 +27,4 @@
 
 /* General: */
-const char* UIExtraDataDefs::GUI_LanguageId = "GUI/LanguageID";
 const char* UIExtraDataDefs::GUI_EventHandlingType = "GUI/EventHandlingType";
 
@@ -48,4 +47,7 @@
 const char* UIExtraDataDefs::GUI_RestrictedGlobalSettingsPages = "GUI/RestrictedGlobalSettingsPages";
 const char* UIExtraDataDefs::GUI_RestrictedMachineSettingsPages = "GUI/RestrictedMachineSettingsPages";
+
+/* Settings: Language: */
+const char* UIExtraDataDefs::GUI_LanguageID = "GUI/LanguageID";
 
 /* Settings: Display: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 66586)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 66587)
@@ -32,7 +32,4 @@
     /** @name General
       * @{ */
-        /** VBox language ID. */
-        extern const char* GUI_LanguageId;
-
         /** Holds event handling type. */
         extern const char* GUI_EventHandlingType;
@@ -71,4 +68,10 @@
         /** Holds restricted Machine Settings pages. */
         extern const char* GUI_RestrictedMachineSettingsPages;
+    /** @} */
+
+    /** @name Settings: Language
+      * @{ */
+        /** Holds GUI language ID. */
+        extern const char* GUI_LanguageID;
     /** @} */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 66586)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 66587)
@@ -1947,5 +1947,4 @@
     return QStringList()
            << QString()
-           << GUI_LanguageId
            << GUI_EventHandlingType
            << GUI_SuppressMessages << GUI_InvertMessageOption
@@ -1954,4 +1953,5 @@
 #endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
            << GUI_RestrictedGlobalSettingsPages << GUI_RestrictedMachineSettingsPages
+           << GUI_LanguageID
            << GUI_ActivateHoveredMachineWindow
            << GUI_Input_SelectorShortcuts << GUI_Input_MachineShortcuts
@@ -2337,4 +2337,16 @@
 }
 
+QString UIExtraDataManager::languageId()
+{
+    /* Load language ID: */
+    return extraDataString(GUI_LanguageID);
+}
+
+void UIExtraDataManager::setLanguageId(const QString &strLanguageId)
+{
+    /* Save language ID: */
+    setExtraDataString(GUI_LanguageID, strLanguageId);
+}
+
 bool UIExtraDataManager::activateHoveredMachineWindow()
 {
@@ -4051,5 +4063,5 @@
         {
             /* Language changed? */
-            if (strKey == GUI_LanguageId)
+            if (strKey == GUI_LanguageID)
                 emit sigLanguageChange(extraDataString(strKey));
             /* Selector UI shortcut changed? */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 66586)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 66587)
@@ -186,4 +186,12 @@
         /** Returns restricted machine settings pages. */
         QList<MachineSettingsPageType> restrictedMachineSettingsPages(const QString &strID);
+    /** @} */
+
+    /** @name Settings: Language
+      * @{ */
+        /** Returns the GUI language ID. */
+        QString languageId();
+        /** Defines the GUI @a strLanguageId. */
+        void setLanguageId(const QString &strLanguageId);
     /** @} */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 66586)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 66587)
@@ -4129,5 +4129,5 @@
 
     /* Load translation based on the user settings: */
-    QString sLanguageId = gset.languageId();
+    QString sLanguageId = gEDataManager->languageId();
     if (!sLanguageId.isNull())
         loadLanguage (sLanguageId);
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp	(revision 66586)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp	(revision 66587)
@@ -28,5 +28,5 @@
 /* GUI includes: */
 # include "UIGlobalSettingsLanguage.h"
-# include "VBoxGlobalSettings.h"
+# include "UIExtraDataManager.h"
 # include "VBoxGlobal.h"
 
@@ -231,5 +231,5 @@
 
     /* Gather old language data: */
-    oldLanguageData.m_strLanguageId = m_settings.languageId();
+    oldLanguageData.m_strLanguageId = gEDataManager->languageId();
 
     /* Cache old language data: */
@@ -274,5 +274,5 @@
         /* Save new language data from the cache: */
         if (m_pCache->data().m_strLanguageId != m_pCache->base().m_strLanguageId)
-            m_settings.setLanguageId(m_pCache->data().m_strLanguageId);
+            gEDataManager->setLanguageId(m_pCache->data().m_strLanguageId);
     }