Support voice variants and ages.

android/res/values-af/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak TTS-instellings"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Verstek toonhoogte"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Stemgeslag"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Spraaktempo-vermenigvuldiger"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Installeer tans stemdata..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak is nie as jou verstek teks-na-spraak-enjin opgestel nie."</string>

android/res/values-am/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak TTS ቅንብሮች"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"ነባሪ የድምጽ መውጣት/መውረድ"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"የድምጽ ጾታ"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"የንግግር መጠን ማባዣ"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"የድምጽ ውሂብ በመጫን ላይ…"</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak እንደነባሪ የጽሑፍ-ወደ-ንግግር ፕሮግራም ሆኖ አልተቀመጠም። አሁን ማስቀመጥ ትፈልጋለህ?"</string>

android/res/values-ar/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"إعدادات eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"المستوى الافتراضي"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"جنس الصوت"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"مضاعف معدل الكلام"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"جارٍ تثبيت البيانات الصوتية…"</string>
   <string name="set_default_message" msgid="651325122612558377">"لم يتم تعيين eSpeak كمحرك افتراضي لتحويل النص إلى كلام. هل تريد تعيينه الآن؟"</string>

android/res/values-bg/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Настройки за eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Височина по подразбиране"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Пол на гласа"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Множител на скоростта на говора"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Гласовите данни се инсталират..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Не сте задали eSpeak като машината си по подразбиране за синтезиран говор."</string>

android/res/values-ca/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Configuració d\'eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"To predeterminat"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Gènere de veu"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplicador de velocitat de la veu"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"S\'estan instal·lant les dades de veu..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak no s\'ha definit com a motor de text a veu predeterminat."</string>

android/res/values-cs/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Nastavení modulu eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Výchozí výška hlasu"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Pohlaví"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplikátor rychlosti řeči"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Instalace hlasových dat..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Aplikace eSpeak není nastavena jako váš výchozí modul pro převod textu na řeč."</string>

android/res/values-da/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak-indstillinger for TTT"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Standard tonehøjde"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Stemmens køn:"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Talehastighedsmultiplikator"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Installerer stemmedata..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak er ikke angivet som din standard tekst-til-tale-maskine."</string>

android/res/values-de/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak TTS-Einstellungen"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Standard-Tonlage"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Geschlecht der Stimme"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplikationsfaktor für Sprechgeschwindigkeit"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Sprachdaten werden installiert..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak ist nicht als Ihre Standard-Text-in-Sprache-Funktion festgelegt."</string>

android/res/values-el/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Ρυθμίσεις eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Προεπιλεγμένος τόνος"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Φύλο φωνής"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Πολλαπλασιαστής ρυθμού ομιλίας"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Εγκατάσταση δεδομένων φωνής..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Το eSpeak δεν έχει οριστεί ως η προεπιλεγμένη μηχανή μετατροπής κειμένου σε λόγο."</string>

android/res/values-en-rGB/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak TTS Settings"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Pitch"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Voice gender"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Speech rate"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Installing voice data…"</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak is not set as your default text-to-speech engine."</string>

android/res/values-es-rUS/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Configuración de texto a voz de eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Tono predeterminado"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Género de la voz"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplicador de la velocidad de la voz"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Instalando los datos de voz..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak no se definió como tu motor de texto a voz predeterminado."</string>

android/res/values-es/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Ajustes de síntesis de voz de eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Tono predeterminado"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Sexo de la voz"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplicador de velocidad de voz"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Instalando archivos de datos de voz..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak no se ha establecido como tu motor de síntesis de voz predeterminado."</string>

android/res/values-fa/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"تنظیمات eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"زیر و بمی پیش‌فرض"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"جنسیت صدا"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"تقویت‌کننده سرعت گفتگو"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"در حال نصب داده‌های صوتی..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak اکنون بعنوان موتور پیش‌فرض نوشتار به گفتار شما تنظیم شده است. می‌خواهید اکنون آن را تنظیم کنید؟"</string>

android/res/values-fi/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak TTS -asetukset"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Oletusäänenkorkeus"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Äänen sukupuoli"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Puheen nopeuskerroin"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Asennetaan äänitietoja..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeakia ei ole asetettu tekstistä puheeksi -oletusmoottoriksi."</string>

android/res/values-fr/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Paramètres de synthèse vocale eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Tonalité par défaut"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Sexe de la voix"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplicateur de la cadence"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Installation des données vocales en cours…"</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak n\'est pas votre moteur de synthèse vocale par défaut."</string>

android/res/values-hi/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak TTS सेटिंग"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"डिफ़ॉल्‍ट पिच"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"ध्‍वनि का लिंग"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"वाक् दर गुणक"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"ध्‍वनि डेटा इंस्टॉल किया जा रहा है…"</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak आपके डिफ़ॉल्‍ट पाठ-से-वाक् इंजन के रूप में सेट नहीं है. क्‍या आप इसे अभी सेट करना चाहते हैं?"</string>

android/res/values-hr/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"TTS postavke programa eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Zadana postavka visine tona"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Spol glasa"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplikator brzine govora"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Instaliranje glasovnih podataka..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Program eSpeak nije postavljen kao vaš zadani alat za pretvaranje teksta u govor."</string>

android/res/values-hu/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak -- A szövegfelismerő beállításai"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Alapértelmezett hangszín"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Szövegfelolvasó neme"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Beszédsebesség gyorsítása"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Hangadatok telepítése..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Nem az eSpeak az alapértelmezett szövegfelolvasó motor."</string>

android/res/values-in/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Setelan eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Tinggi nada default"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Gender suara"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Pengganda laju wicara"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Memasang data suara..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak tidak disetel sebagai mesin text-to-speech default Anda."</string>

android/res/values-it/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Impostazioni di sintesi vocale eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Tono predefinito"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Sesso voce"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Moltiplicatore di velocità voce"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Installazione dati vocali..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak non è impostato come motore di sintesi vocale predefinito."</string>

android/res/values-iw/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"הגדרות eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"ברירת מחדל לגובה צליל"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"מין הקול"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"מכפיל קצב דיבור"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"מתקין נתוני קול..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak אינו מוגדר כמנוע ברירת המחדל שלך לתכונת טקסט לדיבור. האם אתה רוצה להגדיר אותו כעת?"</string>

android/res/values-ja/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeakテキスト読み上げ設定"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"デフォルトの声の高さ"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"声の性別"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"音声速度"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"音声データをインストールしています..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeakはデフォルトのテキスト読み上げエンジンに設定されていません。"</string>

android/res/values-ko/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak TTS 설정"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"기본 피치"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"음성 성별"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"음성 배속 비율"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"음성 데이터 설치 중..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak가 기본 TTS 엔진으로 설정되지 않았습니다."</string>

android/res/values-lt/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"„eSpeak“ TĮK nustatymai"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Numatytasis garso aukštis"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Balso lytis"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Kalbos rodiklio koeficientas"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Diegiami balso duomenys..."</string>
   <string name="set_default_message" msgid="651325122612558377">"„eSpeak“ nenustatytas kaip numatytasis teksto į kalbą variklis."</string>

android/res/values-lv/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak teksta pārveidošanas runā iestatījumi"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Balss noklusējuma augstums"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Balss īpašnieka dzimums"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Runas ātruma reizinātājs"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Notiek balss datu instalēšana..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Programma eSpeak nav iestatīta kā noklusējuma programma teksta pārveidošanai runā."</string>

android/res/values-ms/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Tetapan TTS eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Nada lalai"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Jantina suara"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Pengganda kadar ucapan"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Memasang data suara..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak tidak ditetapkan sebagai enjin teks-ke-pertuturan lalai anda."</string>

android/res/values-nb/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Innstillinger for eSpeak tekst-til-tale"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Standard tonehøyde"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Kjønn for stemmen"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplikator for talehastighet"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Installerer taledata …"</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak er ikke angitt som standardmotor for tekst-til-tale."</string>

android/res/values-nl/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak-instellingen voor tekst-naar-spraak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Standaard toonhoogte"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Geslacht van stem"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplier voor spreeksnelheid"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Spraakgegevens installeren..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak is niet ingesteld als uw standaardengine voor tekst-naar-spraak."</string>

android/res/values-pl/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Ustawienia zamiany tekstu na mowę eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Domyślny ton"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Rodzaj głosu"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Mnożnik szybkości mowy"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Instalowanie danych głosowych..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak nie jest ustawiony jako domyślny mechanizm odczytywania tekstu."</string>

android/res/values-pt-rPT/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Definições do eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Tom predefinido"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Género da voz"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplicador da taxa de voz"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"A instalar dados de voz..."</string>
   <string name="set_default_message" msgid="651325122612558377">"O eSpeak não está definido como o motor de síntese de voz predefinido."</string>

android/res/values-pt/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Configurações de TTS do eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Frequência padrão do som"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Gênero para a voz"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplicador da taxa de fala"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Instalando dados de voz..."</string>
   <string name="set_default_message" msgid="651325122612558377">"O eSpeak não está definido como seu mecanismo padrão de conversão de texto em voz."</string>

android/res/values-ro/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Setări TTS eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Înălţime prestabilită"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Genul vocii"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplicator al ritmului vorbirii"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Se instalează datele vocale..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak nu este setat ca motor prestabilit de transformare a textului în vorbire."</string>

android/res/values-ru/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Настройки eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Тон по умолчанию"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Параметры голоса"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Скорость речи"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Загрузка голосовых данных..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Установить eSpeak в качестве синтезатора речи по умолчанию?"</string>

android/res/values-sk/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Nastavenia modulu eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Predvolená výška hlasu"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Pohlavie"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Násobok rýchlosti reči"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Prebieha inštalácia hlasových dát..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Aplikácia eSpeak nie je nastavená ako predvolený nástroj na prevod textu na reč."</string>

android/res/values-sl/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Nastavitve pretvorbe besedila v govor v mehanizmu eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Privzeta višina tona"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Spol glasu:"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Množitelj hitrosti govora"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Namestitev glasovnih podatkov ..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Mehanizem eSpeak ni nastavljen kot privzeti za pretvorbo besedila v govor."</string>

android/res/values-sr/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak TTS подешавања"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Подразумевани ниво"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Пол гласа"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Множилац брзине говора"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Инсталирање гласовних података..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak није подешен као подразумевани механизам за пребацивање текста у говор."</string>

android/res/values-sv/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"TTS-inställningar för eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Standardinställning för tonhöjd"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Kön på den som talar:"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplikator för talhastighet"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Installerar röstdata ..."</string>
   <string name="set_default_message" msgid="651325122612558377">"Du har inte angett eSpeak som din standardmotor för text-till-tal."</string>

android/res/values-sw/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Mipangilio ya eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Sauti chaguo-msingi"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Jinsia ya sauti"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Kizidisha kiwango cha usemi"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Inasakinisha data ya sauti..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak haijawekwa kama injini yako msingi ya maandishi-hadi-usemi."</string>

android/res/values-th/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"การตั้งค่า TTS ของ eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"ระดับเสียงเริ่มต้น"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"เพศของเสียง"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"ตัวคูณความเร็วการพูด"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"กำลังติดตั้งข้อมูลเสียง..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak ไม่ได้ถูกกำหนดให้เป็นเครื่องมืออ่านออกเสียงข้อความเริ่มต้นของคุณ คุณต้องการกำหนดเดี๋ยวนี้หรือไม่"</string>

android/res/values-tl/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Mga Setting sa TTS ng eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Default na pitch"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Kasarian ng boses"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Multiplier ng rate ng pananalita"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Ini-install ang data ng boses…"</string>
   <string name="set_default_message" msgid="651325122612558377">"Hindi nakatakda ang eSpeak bilang iyong default na text-to-speech engine."</string>

android/res/values-tr/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak TTS Ayarları"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Varsayılan ses kalınlığı"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Sesin cinsiyeti"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Konuşma hızı çarpanı"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Ses verileri yükleniyor..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak varsayılan metin konuşma motorunuz olarak ayarlanmadı."</string>

android/res/values-uk/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Налаштування TTS eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Висота звуку за умовчанням"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Стать за голосом"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Коефіцієнт темпу мовлення"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Встановлення голосових даних..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak не встановлено як систему синтезу мовлення за умовчанням."</string>

android/res/values-vi/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Cài đặt chuyển văn bản thành giọng nói eSpeak"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Độ cao thấp mặc định"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Giới tính của giọng nói"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Bội số tốc độ đọc"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Đang cài đặt dữ liệu thoại…"</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak chưa được thiết lập làm công cụ chuyển văn bản thành giọng nói mặc định của bạn."</string>

android/res/values-zh-rCN/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak 文字转语音 (TTS) 设置"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"默认声调"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"语音性别"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"语速倍数"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"正在安装语音数据..."</string>
   <string name="set_default_message" msgid="651325122612558377">"未将 eSpeak 设置为文字转语音的默认引擎。"</string>

android/res/values-zh-rTW/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"eSpeak 文字轉語音設定"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"預設音調"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"語音性別"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"語音速率調節係數"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"正在安裝語音資料..."</string>
   <string name="set_default_message" msgid="651325122612558377">"eSpeak 尚未設為您的預設文字轉語音引擎。"</string>

android/res/values-zu/strings.xml

@@ -2,7 +2,6 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="tts_settings_label" msgid="2696301846672491410">"Izilungiselelo ze-eSpeak TTS"</string>
   <string name="setting_default_pitch" msgid="2063082697363767286">"Izinga lezwi olithola likhona"</string>
-  <string name="setting_default_gender" msgid="8721577045178419807">"Ubulili bezwi"</string>
   <string name="setting_default_rate" msgid="3255750767876184606">"Okuphindaphinda ukushesha kwenkulumo"</string>
   <string name="installing_voice_data" msgid="1199950160686799120">"Ifaka idatha yezwi"</string>
   <string name="set_default_message" msgid="651325122612558377">"I-eSpeak ayisethwanga njengenjini yombhalo-uya-enkulumweni oyithola ikhona."</string>

android/res/values/donottranslate.xml

@@ -1,9 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string-array name="default_gender_values">
-        <item>1</item>
-        <item>2</item>
+    <string-array name="default_variant_values">
+        <item>male</item>
+        <item>m1</item>
+        <item>m2</item>
+        <item>m3</item>
+        <item>m4</item>
+        <item>m5</item>
+        <item>m6</item>
+        <item>m7</item>
+        <item>female</item>
+        <item>f1</item>
+        <item>f2</item>
+        <item>f3</item>
+        <item>f4</item>
+        <item>f5</item>
+        <item>klatt</item>
+        <item>klatt2</item>
+        <item>klatt3</item>
+        <item>klatt4</item>
+        <item>croak</item>
+        <item>whisper</item>
+        <item>whisperf</item>
+        <item>male-young</item>
+        <item>female-young</item>
+        <item>male-old</item>
+        <item>female-old</item>
     </string-array>
 
 </resources>

android/res/values/strings.xml

@@ -15,11 +15,6 @@
         Description: Title for the preference that controls default voice pitch.
     -->
   <string name="setting_default_pitch">Pitch</string>
-  <!--
-        Source: Preference title.
-        Description: Title for the preference that controls default voice gender.
-    -->
-  <string name="setting_default_gender">Voice gender</string>
   <!--
         Source: Preference title.
         Description: Title for the preference that controls default speech rate.
@@ -96,16 +91,35 @@
     -->
   <string name="sample_text">This is a sample of text spoken in <xliff:g>%s</xliff:g></string>
   <!--
-        Source: Pitch preference labels.
-        Description: Labels for possible pitch values.
-    -->
-  <!--
-        Source: Gender preference labels.
-        Description: Labels for possible gender values.
+        Source: Variant preference labels.
+        Description: Labels for possible voice variant/gender/age values.
     -->
-  <string-array name="default_gender_entries">
+  <string-array name="default_variant_entries">
     <item>Male</item>
+    <item>Male (Variant 1)</item>
+    <item>Male (Variant 2)</item>
+    <item>Male (Variant 3)</item>
+    <item>Male (Variant 4)</item>
+    <item>Male (Variant 5)</item>
+    <item>Male (Variant 6)</item>
+    <item>Male (Variant 7)</item>
     <item>Female</item>
+    <item>Female (Variant 1)</item>
+    <item>Female (Variant 2)</item>
+    <item>Female (Variant 3)</item>
+    <item>Female (Variant 4)</item>
+    <item>Female (Variant 5)</item>
+    <item>Klatt (Variant 1)</item>
+    <item>Klatt (Variant 2)</item>
+    <item>Klatt (Variant 3)</item>
+    <item>Klatt (Variant 4)</item>
+    <item>Croak (Male)</item>
+    <item>Whisper (Male)</item>
+    <item>Whisper (Female)</item>
+    <item>Young (Male)</item>
+    <item>Young (Female)</item>
+    <item>Old (Male)</item>
+    <item>Old (Female)</item>
   </string-array>
   <!--
         Source: Rate preference labels.
@@ -121,4 +135,5 @@
   <string name="formatter_percentage">%s%%</string>
   <string name="resetToDefault">Set to default</string>
   <string name="espeak_pitch_range">Pitch variation</string>
+  <string name="espeak_variant">Voice variant</string>
 </resources>

android/res/xml/preferences.xml

@@ -3,10 +3,10 @@
 
     <ListPreference
         android:defaultValue="1"
-        android:entries="@array/default_gender_entries"
-        android:entryValues="@array/default_gender_values"
-        android:key="default_gender"
+        android:entries="@array/default_variant_entries"
+        android:entryValues="@array/default_variant_values"
+        android:key="espeak_variant"
         android:summary="%s"
-        android:title="@string/setting_default_gender" />
+        android:title="@string/espeak_variant" />
 
 </PreferenceScreen>

android/src/com/reecedunn/espeak/SpeechSynthesis.java

@@ -173,13 +173,13 @@ public class SpeechSynthesis {
         return voices;
     }
 
-    public void setVoice(Voice voice, String variant, int gender, int age) {
+    public void setVoice(Voice voice, VoiceVariant variant) {
         // NOTE: espeak_SetVoiceByProperties does not support specifying the
         // voice variant (e.g. klatt), but espeak_SetVoiceByName does.
-        if (variant == null) {
-            nativeSetVoiceByProperties(voice.name, gender, age);
+        if (variant.variant == null) {
+            nativeSetVoiceByProperties(voice.name, variant.gender, variant.age);
         } else {
-            nativeSetVoiceByName(voice.identifier + "+" + variant);
+            nativeSetVoiceByName(voice.identifier + "+" + variant.variant);
         }
     }
 
@@ -345,6 +345,59 @@ public class SpeechSynthesis {
         void onSynthDataComplete();
     }
 
+    public static class VoiceVariant {
+        public final String variant;
+        public final int gender;
+        public final int age;
+
+        protected VoiceVariant(String variant, int age) {
+            if (variant.equals("male")) {
+                this.variant = null;
+                this.gender = GENDER_MALE;
+            } else if (variant.equals("female")) {
+                this.variant = null;
+                this.gender = GENDER_FEMALE;
+            } else {
+                this.variant = variant;
+                this.gender = GENDER_UNSPECIFIED;
+            }
+            this.age = age;
+        }
+
+        @Override
+        public String toString() {
+            final String ret;
+            if (gender == GENDER_MALE) {
+                ret = "male";
+            } else if (gender == GENDER_FEMALE) {
+                ret = "female";
+            } else {
+                ret = variant;
+            }
+            if (age == AGE_YOUNG) {
+                return ret + "-young";
+            } else if (age == AGE_OLD) {
+                return ret + "-old";
+            }
+            return ret;
+        }
+    }
+
+    public static VoiceVariant parseVoiceVariant(String value) {
+        String[] parts = value.split("-");
+        int age = AGE_ANY;
+        switch (parts.length) {
+        case 1: // variant
+            break;
+        case 2: // variant-age
+            age = parts[1].equals("young") ? AGE_YOUNG : AGE_OLD;
+            break;
+        default:
+            return null;
+        }
+        return new VoiceVariant(parts[0], age);
+    }
+
     public class Voice {
         public final String name;
         public final String identifier;

android/src/com/reecedunn/espeak/TtsService.java

@@ -196,24 +196,36 @@ public class TtsService extends TextToSpeechService {
         if (text == null)
             return;
 
-        final int gender = getPreferenceValue("default_gender", 0);
-        final Bundle params = request.getParams();
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        final String variantString = prefs.getString("espeak_variant", null);
+        final SpeechSynthesis.VoiceVariant variant;
+        if (variantString == null) {
+            final int gender = getPreferenceValue(prefs, "default_gender", SpeechSynthesis.GENDER_MALE);
+            if (gender == SpeechSynthesis.GENDER_FEMALE) {
+                variant = SpeechSynthesis.parseVoiceVariant("default-female");
+            } else {
+                variant = SpeechSynthesis.parseVoiceVariant("default-male");
+            }
+        } else {
+            variant = SpeechSynthesis.parseVoiceVariant(variantString);
+        }
 
-        int rate = getPreferenceValue("espeak_rate", Integer.MIN_VALUE);
+        int rate = getPreferenceValue(prefs, "espeak_rate", Integer.MIN_VALUE);
         if (rate == Integer.MIN_VALUE) {
             // Try the old eyes-free setting:
-            rate = (getPreferenceValue("default_rate", 100) / 100) * mEngine.Rate.getDefaultValue();
+            rate = (getPreferenceValue(prefs, "default_rate", 100) / 100) * mEngine.Rate.getDefaultValue();
         }
 
-        int pitch = getPreferenceValue("espeak_pitch", Integer.MIN_VALUE);
+        int pitch = getPreferenceValue(prefs, "espeak_pitch", Integer.MIN_VALUE);
         if (pitch == Integer.MIN_VALUE) {
             // Try the old eyes-free setting:
-            pitch = getPreferenceValue("default_pitch", 100) / 2;
+            pitch = getPreferenceValue(prefs, "default_pitch", 100) / 2;
         }
 
         if (DEBUG) {
             Log.i(TAG, "Received synthesis request: {language=\"" + mMatchingVoice.name + "\"}");
 
+            final Bundle params = request.getParams();
             for (String key : params.keySet()) {
                 Log.v(TAG,
                         "Synthesis request contained param {" + key + ", " + params.get(key) + "}");
@@ -231,16 +243,15 @@ public class TtsService extends TextToSpeechService {
         mCallback.start(mEngine.getSampleRate(), mEngine.getAudioFormat(),
                 mEngine.getChannelCount());
 
-        mEngine.setVoice(mMatchingVoice, null, gender, SpeechSynthesis.AGE_ANY);
+        mEngine.setVoice(mMatchingVoice, variant);
         mEngine.Rate.setValue(rate, request.getSpeechRate());
         mEngine.Pitch.setValue(pitch, request.getPitch());
-        mEngine.PitchRange.setValue(getPreferenceValue("espeak_pitch_range", mEngine.PitchRange.getDefaultValue()));
-        mEngine.Volume.setValue(getPreferenceValue("espeak_volume", mEngine.Volume.getDefaultValue()));
+        mEngine.PitchRange.setValue(getPreferenceValue(prefs, "espeak_pitch_range", mEngine.PitchRange.getDefaultValue()));
+        mEngine.Volume.setValue(getPreferenceValue(prefs, "espeak_volume", mEngine.Volume.getDefaultValue()));
         mEngine.synthesize(text, text.startsWith("<speak"));
     }
 
-    private int getPreferenceValue(String preference, int defaultValue) {
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+    private int getPreferenceValue(SharedPreferences prefs, String preference, int defaultValue) {
         final String prefString = prefs.getString(preference, null);
         if (prefString == null) {
             return defaultValue;

android/src/com/reecedunn/espeak/TtsSettingsActivity.java

@@ -57,10 +57,14 @@ public class TtsSettingsActivity extends PreferenceActivity {
             editor.putString("espeak_rate", Integer.toString(rateValue));
         }
 
-        String gender = prefs.getString("default_gender", "0");
-        if (gender.equals("0")) {
-            // Convert the "Default" value to "Male":
-            editor.putString("default_gender", "1");
+        String variant = prefs.getString("espeak_variant", null);
+        if (variant == null) {
+            String gender = prefs.getString("default_gender", "0");
+            if (gender.equals("2")) {
+                editor.putString("espeak_variant", "female");
+            } else {
+                editor.putString("espeak_variant", "male");
+            }
         }
 
         editor.commit();