2 files changed, 36 insertions, 5 deletions

diff --git a/rbutil/rbutilqt/rbutil.ini b/rbutil/rbutilqt/rbutil.ini
index ea6a1a4cd4..4432344d0f 100644
--- a/rbutil/rbutilqt/rbutil.ini
+++ b/rbutil/rbutilqt/rbutil.ini
@@ -400,11 +400,15 @@ ttspreset02 = "espeak (user-adjusted)"
 ttspreset03 = "flite (default)"
 ttspreset04 = "flite (user-adjusted)"
 ttspreset05 = "sapi (default)"
+ttspreset06 = "sapi (user-adjusted)"
+ttspreset07 = "swift (default)"
+ttspreset08 = "swift (user-adjusted)"
+
 
 [ttspreset01]
 tts = "espeak"
 options = ""
-template = "\"%exe\" %options -w \"%wavfile\" \"%text\""
+template = "\"%exe\" \"%options\" -w \"%wavfile\" \"%text\""
 edit = false
 os = all
 needslanguagecfg = false 
@@ -412,7 +416,7 @@ needslanguagecfg = false
 [ttspreset02]
 tts = "espeak"
 options = ""
-template = "\"%exe\" %options -w \"%wavfile\" \"%text\""
+template = "\"%exe\" \"%options\" -w \"%wavfile\" \"%text\""
 edit = true
 os = all
 needslanguagecfg = false
@@ -420,7 +424,7 @@ needslanguagecfg = false
 [ttspreset03]
 tts = "flite"
 options = ""
-template = "\"%exe\" %options -o \"%wavfile\" \"%text\""
+template = "\"%exe\" \"%options\" -o \"%wavfile\" \"%text\""
 edit = false
 os = all
 needslanguagecfg = false
@@ -428,7 +432,7 @@ needslanguagecfg = false
 [ttspreset04]
 tts = "flite"
 options = ""
-template = "\"%exe\" %options -o \"%wavfile\" \"%text\""
+template = "\"%exe\" \"%options\" -o \"%wavfile\" \"%text\""
 edit = true
 os = all
 needslanguagecfg = false
@@ -436,7 +440,33 @@ needslanguagecfg = false
 [ttspreset05]
 tts = "sapi"
 options = ""
-template = "cscript //nologo \"%exe\" /language:english %options"
+template = "cscript //nologo \"%exe\" /language:%lang \"%options\""
 edit = false
 os = win32
 needslanguagecfg = true
+
+[ttspreset06]
+tts = "sapi"
+options = ""
+template = "cscript //nologo \"%exe\" /language:%lang \"%options\""
+edit = true
+os = win32
+needslanguagecfg = true
+
+[ttspreset07]
+tts = "swift"
+options = ""
+template = "\"%exe\" \"%options\" -o \"%wavfile\" \"%text\""
+edit = false
+os = all
+needslanguagecfg = false
+
+[ttspreset08]
+tts = "swift"
+options = ""
+template = "\"%exe\" \"%options\" -o \"%wavfile\" \"%text\""
+edit = true
+os = all
+needslanguagecfg = false
+
+
diff --git a/rbutil/rbutilqt/talkfile.cpp b/rbutil/rbutilqt/talkfile.cpp
index d3e3a24781..5b484079f9 100644
--- a/rbutil/rbutilqt/talkfile.cpp
+++ b/rbutil/rbutilqt/talkfile.cpp
@@ -190,6 +190,7 @@ bool TTSSapi::start()
     QString execstring = m_TTSTemplate;
     execstring.replace("%exe",m_TTSexec);
     execstring.replace("%options",m_TTSOpts);
+    execstring.replace("%lang",m_TTSLanguage);
     qDebug() << "init" << execstring; 
     voicescript = new QProcess(NULL);
     voicescript->start(execstring);