3 files changed, 9 insertions, 10 deletions

diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index b493168699..4a9c471951 100644
--- a/rbutil/rbutilqt/base/systeminfo.cpp
+++ b/rbutil/rbutilqt/base/systeminfo.cpp
@@ -143,16 +143,16 @@ QStringList SystemInfo::platforms(enum SystemInfo::PlatformType type, QString va
     return result;
 }
 
-QStringList SystemInfo::languages()
+QMap<QString, QString> SystemInfo::languages(void)
 {
     ensureSystemInfoExists();
 
-    QStringList result;
+    QMap<QString, QString> result;
     systemInfos->beginGroup("languages");
     QStringList a = systemInfos->childKeys();
     for(int i = 0; i < a.size(); i++)
     {
-        result.append(systemInfos->value(a.at(i), "null").toString());
+        result.insert(a.at(i), systemInfos->value(a.at(i), "null").toString());
     }
     systemInfos->endGroup();
     return result;
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
index 214e423a51..f5e0eae6ef 100644
--- a/rbutil/rbutilqt/base/systeminfo.h
+++ b/rbutil/rbutilqt/base/systeminfo.h
@@ -34,7 +34,7 @@ class SystemInfo : public QObject
             MapError,
             MapIncompatible,
         };
-            
+
         //! All system settings
         enum SystemInfos {
             ManualUrl,
@@ -78,14 +78,14 @@ class SystemInfo : public QObject
         //! return a list of all platforms (rbutil internal names)
         static QStringList platforms(enum PlatformType type = PlatformAll,
                                      QString variant="");
-        //! returns a list of all languages
-        static QStringList languages(void);
+        //! returns a map of all languages
+        static QMap<QString, QString> languages(void);
         //! returns a map of usb-ids and their targets
         static QMap<int, QString> usbIdMap(enum MapType);
         //! get a value from system settings
         static QVariant value(enum SystemInfos info);
         //! get a value from system settings for a named platform.
-        static QVariant platformValue(QString platform, enum SystemInfos info);    
+        static QVariant platformValue(QString platform, enum SystemInfos info);
 
     private:
         //! you shouldnt call this, its a fully static calls
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp
index b149e1d786..2cc95cd4aa 100644
--- a/rbutil/rbutilqt/base/ttssapi.cpp
+++ b/rbutil/rbutilqt/base/ttssapi.cpp
@@ -38,11 +38,10 @@ TTSBase::Capabilities TTSSapi::capabilities()
 void TTSSapi::generateSettings()
 {
     // language
-    QStringList languages = SystemInfo::languages();
-    languages.sort();
+    QMap<QString, QString> languages = SystemInfo::languages();
     EncTtsSetting* setting =new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST,
         tr("Language:"),RbSettings::subValue("sapi",RbSettings::TtsLanguage),
-        languages);
+        languages.values());
     connect(setting,SIGNAL(dataChanged()),this,SLOT(updateVoiceList()));
     insertSetting(eLANGUAGE,setting);
     // voice