3 files changed, 10 insertions, 6 deletions

diff --git a/rbutil/rbutilqt/base/systeminfo.cpp b/rbutil/rbutilqt/base/systeminfo.cpp
index 1f7be72b1e..44bcf3c84d 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;
 }
 
-QMap<QString, QString> SystemInfo::languages(void)
+QMap<QString, QStringList> SystemInfo::languages(void)
 {
     ensureSystemInfoExists();
 
-    QMap<QString, QString> result;
+    QMap<QString, QStringList> result;
     systemInfos->beginGroup("languages");
     QStringList a = systemInfos->childKeys();
     for(int i = 0; i < a.size(); i++)
     {
-        result.insert(a.at(i), systemInfos->value(a.at(i), "null").toString());
+        result.insert(a.at(i), systemInfos->value(a.at(i), "null").toStringList());
     }
     systemInfos->endGroup();
     return result;
diff --git a/rbutil/rbutilqt/base/systeminfo.h b/rbutil/rbutilqt/base/systeminfo.h
index f8c31a9de3..420dbf3c80 100644
--- a/rbutil/rbutilqt/base/systeminfo.h
+++ b/rbutil/rbutilqt/base/systeminfo.h
@@ -79,7 +79,7 @@ class SystemInfo : public QObject
         static QStringList platforms(enum PlatformType type = PlatformAll,
                                      QString variant="");
         //! returns a map of all languages
-        static QMap<QString, QString> languages(void);
+        static QMap<QString, QStringList> languages(void);
         //! returns a map of usb-ids and their targets
         static QMap<int, QString> usbIdMap(enum MapType);
         //! get a value from system settings
diff --git a/rbutil/rbutilqt/base/ttssapi.cpp b/rbutil/rbutilqt/base/ttssapi.cpp
index 00c63550d3..09c1dd0588 100644
--- a/rbutil/rbutilqt/base/ttssapi.cpp
+++ b/rbutil/rbutilqt/base/ttssapi.cpp
@@ -38,10 +38,14 @@ TTSBase::Capabilities TTSSapi::capabilities()
 void TTSSapi::generateSettings()
 {
     // language
-    QMap<QString, QString> languages = SystemInfo::languages();
+    QMap<QString, QStringList> languages = SystemInfo::languages();
+    QStringList langs;
+    for(int i = 0; i < languages.values().size(); ++i) {
+        langs.append(languages.values().at(i).at(0));
+    }
     EncTtsSetting* setting =new EncTtsSetting(this,EncTtsSetting::eSTRINGLIST,
         tr("Language:"),RbSettings::subValue("sapi",RbSettings::TtsLanguage),
-        languages.values());
+        langs);
     connect(setting,SIGNAL(dataChanged()),this,SLOT(updateVoiceList()));
     insertSetting(eLANGUAGE,setting);
     // voice