diff --git a/android/res/values-af/strings.xml b/android/res/values-af/strings.xml index 4729dc33..be25e5fc 100644 --- a/android/res/values-af/strings.xml +++ b/android/res/values-af/strings.xml @@ -19,7 +19,6 @@ "Jammer, eSpeak kon nie laai nie." "Hierdie is \'n voorbeeld van gesproke teks in %s" - "Verstek" "Manlik" "Vroulik" diff --git a/android/res/values-am/strings.xml b/android/res/values-am/strings.xml index 50467fc0..39dab13f 100644 --- a/android/res/values-am/strings.xml +++ b/android/res/values-am/strings.xml @@ -19,7 +19,6 @@ "ይቅርታ eSpeak መጫን አልቻለም።" "ይሄ በ%s ላይ የተነገረ ጽሑፍ ናሙና ነው።" - "ነባሪ" "ወንድ" "ሴት" diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml index c3363d1c..b24d0515 100644 --- a/android/res/values-ar/strings.xml +++ b/android/res/values-ar/strings.xml @@ -19,7 +19,6 @@ "عذرًا، أخفق تحميل eSpeak." "هذه عينة من النص الذي تم نطقه في %s" - "الافتراضي" "ذكر" "أنثى" diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml index 5bf65bb8..692fbc41 100644 --- a/android/res/values-bg/strings.xml +++ b/android/res/values-bg/strings.xml @@ -19,7 +19,6 @@ "За съжаление зареждането на eSpeak не бе успешно." "Това е откъс от изговорен текст на %s" - "По подразбиране" "Мъжки" "Женски" diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml index a3fbd7a6..f6587bac 100644 --- a/android/res/values-ca/strings.xml +++ b/android/res/values-ca/strings.xml @@ -19,7 +19,6 @@ "No s\'ha pogut carregar eSpeak." "Aquesta és una mostra de text dit en veu alta en %s" - "Predeterminat" "Home" "Dona" diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml index 77434cd6..134b11c7 100644 --- a/android/res/values-cs/strings.xml +++ b/android/res/values-cs/strings.xml @@ -19,7 +19,6 @@ "Je nám líto, aplikaci eSpeak se nepodařilo načíst." "Toto je ukázkový text namluvený v jazyce %s" - "Výchozí" "Mužský" "Ženský" diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index 4acbc4b4..4c1ca5e5 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -19,7 +19,6 @@ "Vi beklager, men eSpeak kunne ikke indlæses." "Dette er et eksempel på talt tekst på %s" - "Standard" "Mand" "Kvinde" diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml index 23b91a27..9fb40660 100644 --- a/android/res/values-de/strings.xml +++ b/android/res/values-de/strings.xml @@ -19,7 +19,6 @@ "eSpeak konnte leider nicht geladen werden." "Dies ist ein Beispieltext auf %s." - "Standard" "Männlich" "Weiblich" diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml index 54d3c243..5aa9f584 100644 --- a/android/res/values-el/strings.xml +++ b/android/res/values-el/strings.xml @@ -19,7 +19,6 @@ "Λυπούμαστε, η φόρτωση του eSpeak απέτυχε." "Αυτό είναι ένα δείγμα κειμένου που εκφέρεται στα %s" - "Προεπιλογή" "Άντρας" "Γυναίκα" diff --git a/android/res/values-en-rGB/strings.xml b/android/res/values-en-rGB/strings.xml index 58ab5029..1f618aa5 100644 --- a/android/res/values-en-rGB/strings.xml +++ b/android/res/values-en-rGB/strings.xml @@ -19,7 +19,6 @@ "Sorry, eSpeak failed to load." "This is a sample of text spoken in %s" - "Default" "Male" "Female" diff --git a/android/res/values-es-rUS/strings.xml b/android/res/values-es-rUS/strings.xml index 00748b79..d7a8b373 100644 --- a/android/res/values-es-rUS/strings.xml +++ b/android/res/values-es-rUS/strings.xml @@ -19,7 +19,6 @@ "Se produjo un error al cargar eSpeak." "Este es un ejemplo de texto hablado en %s." - "Predeterminado" "Masculino" "Femenino" diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml index f7f7d4b0..3fa36bdb 100644 --- a/android/res/values-es/strings.xml +++ b/android/res/values-es/strings.xml @@ -19,7 +19,6 @@ "Error al cargar eSpeak" "Esto es un ejemplo de texto hablado en %s." - "Predeterminado" "Hombre" "Mujer" diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml index 04c758fa..850d26f8 100644 --- a/android/res/values-fa/strings.xml +++ b/android/res/values-fa/strings.xml @@ -19,7 +19,6 @@ "متأسفیم، eSpeak بارگیری نشد." "این یک نمونه از نوشتار گفته شده در %s است" - "پیش‌‏فرض" "مذکر" "مؤنث" diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml index 563a7bd4..48917a24 100644 --- a/android/res/values-fi/strings.xml +++ b/android/res/values-fi/strings.xml @@ -19,7 +19,6 @@ "eSpeakin lataaminen epäonnistui." "Tämä on näyte kielellä %s puhutusta tekstistä" - "Oletus" "Mies" "Nainen" diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml index 59ff82d8..9e771889 100644 --- a/android/res/values-fr/strings.xml +++ b/android/res/values-fr/strings.xml @@ -19,7 +19,6 @@ "Échec du chargement d\'eSpeak." "Voici un exemple de texte énoncé en %s." - "Par défaut" "Homme" "Femme" diff --git a/android/res/values-hi/strings.xml b/android/res/values-hi/strings.xml index 41ec2a72..34bb7040 100644 --- a/android/res/values-hi/strings.xml +++ b/android/res/values-hi/strings.xml @@ -19,7 +19,6 @@ "क्षमा करें, eSpeak प्रारंभ होने में विफल हुआ." "यह %s में बोले गए पाठ का नमूना है" - "डिफ़ॉल्ट" "पुरुष" "महिला" diff --git a/android/res/values-hr/strings.xml b/android/res/values-hr/strings.xml index 6233f062..504e6d43 100644 --- a/android/res/values-hr/strings.xml +++ b/android/res/values-hr/strings.xml @@ -19,7 +19,6 @@ "Žao nam je, ali učitavanje programa eSpeak nije uspjelo." "Ovo je primjer teksta izgovorenog na %s" - "Zadano" "Muško" "Ženski" diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml index 8bcd5ebf..e55e7533 100644 --- a/android/res/values-hu/strings.xml +++ b/android/res/values-hu/strings.xml @@ -19,7 +19,6 @@ "Sajnos az eSpeak nem töltődött be." "Ez egy %s nyelven felolvasott szöveg mintája." - "Alapértelmezett" "Férfi" "Nő" diff --git a/android/res/values-in/strings.xml b/android/res/values-in/strings.xml index b20eb147..ee253c2e 100644 --- a/android/res/values-in/strings.xml +++ b/android/res/values-in/strings.xml @@ -19,7 +19,6 @@ "Maaf, eSpeak gagal dimuat." "Ini adalah contoh teks yang diucapkan di %s" - "Default" "Pria" "Wanita" diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml index 204f5633..d8bd1e71 100644 --- a/android/res/values-it/strings.xml +++ b/android/res/values-it/strings.xml @@ -19,7 +19,6 @@ "Spiacenti, caricamento di eSpeak non riuscito." "Questo è un esempio di testo parlato in %s" - "Predefinito" "Uomo" "Donna" diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml index c70919ce..de8b1fe1 100644 --- a/android/res/values-iw/strings.xml +++ b/android/res/values-iw/strings.xml @@ -19,7 +19,6 @@ "מצטערים. טעינת eSpeak נכשלה." "זוהי דוגמה לקריאת טקסט ב-%s" - "ברירת מחדל" "זכר" "נקבה" diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml index 16cd8ee5..c21e9350 100644 --- a/android/res/values-ja/strings.xml +++ b/android/res/values-ja/strings.xml @@ -19,7 +19,6 @@ "eSpeakを読み込めませんでした。" "%sで話すテキストサンプルです。" - "デフォルト" "男性" "女性" diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml index 6a116b58..034d3fcc 100644 --- a/android/res/values-ko/strings.xml +++ b/android/res/values-ko/strings.xml @@ -19,7 +19,6 @@ "죄송합니다, eSpeak를 로드하지 못했습니다." "%s로 읽은 텍스트 샘플입니다." - "기본값" "남성" "여성" diff --git a/android/res/values-lt/strings.xml b/android/res/values-lt/strings.xml index 05cff17c..1f990868 100644 --- a/android/res/values-lt/strings.xml +++ b/android/res/values-lt/strings.xml @@ -19,7 +19,6 @@ "Apgailestaujame, bet nepavyko įkelti „eSpeak“." "Tai teksto, sakomo %s, pavyzdys" - "Numatytasis" "Vyras" "Moteris" diff --git a/android/res/values-lv/strings.xml b/android/res/values-lv/strings.xml index 3f280be7..28003895 100644 --- a/android/res/values-lv/strings.xml +++ b/android/res/values-lv/strings.xml @@ -19,7 +19,6 @@ "Diemžēl programmu eSpeak neizdevās ielādēt." "Šis ir izrunāta teksta paraugs šādā valodā: %s." - "Noklusējums" "Vīrietis" "Sieviete" diff --git a/android/res/values-ms/strings.xml b/android/res/values-ms/strings.xml index d469ba8a..4ed57666 100644 --- a/android/res/values-ms/strings.xml +++ b/android/res/values-ms/strings.xml @@ -19,7 +19,6 @@ "Maaf, eSpeak gagal dimuatkan." "Ini adalah sampel teks yang dilafazkan dalam %s" - "Lalai" "Lelaki" "Perempuan" diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml index aa658772..543488da 100644 --- a/android/res/values-nb/strings.xml +++ b/android/res/values-nb/strings.xml @@ -19,7 +19,6 @@ "Beklager, eSpeak ble ikke lastet inn." "Dette er et teksteksempel lest opp på %s" - "Standard" "Mann" "Kvinne" diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml index 6b140fe0..4e0b6230 100644 --- a/android/res/values-nl/strings.xml +++ b/android/res/values-nl/strings.xml @@ -19,7 +19,6 @@ "eSpeak kan niet worden geladen." "Dit is een voorbeeld van tekst die is uitgesproken in het %s" - "Standaard" "Man" "Vrouw" diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml index 124817b0..28af89d3 100644 --- a/android/res/values-pl/strings.xml +++ b/android/res/values-pl/strings.xml @@ -19,7 +19,6 @@ "Przepraszamy, załadowanie eSpeak nie powiodło się." "To jest przykład tekstu mówionego przy ustawieniu %s" - "Domyślny" "Mężczyzna" "Kobieta" diff --git a/android/res/values-pt-rPT/strings.xml b/android/res/values-pt-rPT/strings.xml index 77369310..60f26445 100644 --- a/android/res/values-pt-rPT/strings.xml +++ b/android/res/values-pt-rPT/strings.xml @@ -19,7 +19,6 @@ "Ocorreu uma falha ao carregar o eSpeak." "Este é um exemplo de texto falado em %s" - "Predefinição" "Masculina" "Feminina" diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml index f658b2d2..bc7a75e9 100644 --- a/android/res/values-pt/strings.xml +++ b/android/res/values-pt/strings.xml @@ -19,7 +19,6 @@ "Falha ao carregar o eSpeak." "Este é um exemplo de texto falado em %s" - "Padrão" "Masculino" "Feminino" diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml index 02e94ded..8209a844 100644 --- a/android/res/values-ro/strings.xml +++ b/android/res/values-ro/strings.xml @@ -19,7 +19,6 @@ "Ne pare rău, dar eSpeak nu s-a putut încărca." "Aceasta este o mostră de text vorbit în %s" - "Prestabilit" "Masculin" "Feminin" diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml index 6d35fa69..d8486e5e 100644 --- a/android/res/values-ru/strings.xml +++ b/android/res/values-ru/strings.xml @@ -19,7 +19,6 @@ "Не удалось загрузить eSpeak." "Так синтезатор речи озвучивает %s текст" - "По умолчанию" "Мужской" "Женский" diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml index 0e0bf948..d5a964b6 100644 --- a/android/res/values-sk/strings.xml +++ b/android/res/values-sk/strings.xml @@ -19,7 +19,6 @@ "Je nám ľúto, aplikáciu eSpeak sa nepodarilo načítať." "Toto je ukážkový text nahovorený v jazyku %s" - "Predvolené" "Mužský" "Ženský" diff --git a/android/res/values-sl/strings.xml b/android/res/values-sl/strings.xml index 3df47ae8..57008b42 100644 --- a/android/res/values-sl/strings.xml +++ b/android/res/values-sl/strings.xml @@ -19,7 +19,6 @@ "Mehanizma eSpeak ni bilo mogoče naložiti." "To je vzorec besedila, izgovorjen v %s" - "Privzeto" "Moški" "Ženski" diff --git a/android/res/values-sr/strings.xml b/android/res/values-sr/strings.xml index 73ac292a..a1e1c2eb 100644 --- a/android/res/values-sr/strings.xml +++ b/android/res/values-sr/strings.xml @@ -19,7 +19,6 @@ "Жао нам је, eSpeak није учитан." "Ово је пример текста који је изговорен на језику %s" - "Подразумевано" "Мушки" "Женски" diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml index 166c5ad8..00c6eb31 100644 --- a/android/res/values-sv/strings.xml +++ b/android/res/values-sv/strings.xml @@ -19,7 +19,6 @@ "Det gick tyvärr inte att läsa in eSpeak." "Detta är ett textexempel som läses på %s" - "Standard" "Man" "Kvinna" diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml index a5248c02..ca6a70b4 100644 --- a/android/res/values-sw/strings.xml +++ b/android/res/values-sw/strings.xml @@ -19,7 +19,6 @@ "Samahani, eSpeak imeshindwa kupakia." "Hii ni sampuli ya maandishi yaliyonenwa katika %s" - "Chaguo msingi" "Mwanamume" "Mwanamke" diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml index f36d867f..229b226b 100644 --- a/android/res/values-th/strings.xml +++ b/android/res/values-th/strings.xml @@ -19,7 +19,6 @@ "ขออภัย eSpeak ไม่สามารถโหลด" "นี่เป็นตัวอย่างของข้อความที่พูดใน %s" - "ค่าเริ่มต้น" "ชาย" "หญิง" diff --git a/android/res/values-tl/strings.xml b/android/res/values-tl/strings.xml index a10ad1ea..a384199d 100644 --- a/android/res/values-tl/strings.xml +++ b/android/res/values-tl/strings.xml @@ -19,7 +19,6 @@ "Paumanhin, nabigong mag-load ang eSpeak." "Isa itong sample ng tekstong binibigkas sa %s" - "Default" "Lalaki" "Babae" diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml index 4d438e3a..12446705 100644 --- a/android/res/values-tr/strings.xml +++ b/android/res/values-tr/strings.xml @@ -19,7 +19,6 @@ "Maalesef eSpeak yüklenemedi." "Bu, %s dilinde seslendirilen örnek bir metindir" - "Varsayılan" "Erkek" "Kadın" diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml index 585eb8a4..824860a5 100644 --- a/android/res/values-uk/strings.xml +++ b/android/res/values-uk/strings.xml @@ -19,7 +19,6 @@ "Не вдалося завантажити eSpeak." "Це зразок тексту такою мовою: %s" - "За умовчанням" "Чоловіча" "Жіноча" diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml index 6cf17bb9..b4a52367 100644 --- a/android/res/values-vi/strings.xml +++ b/android/res/values-vi/strings.xml @@ -19,7 +19,6 @@ "Rất tiếc, eSpeak không thể tải." "Đây là mẫu văn bản được đọc bằng %s" - "Mặc định" "Nam" "Nữ" diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml index de3e482e..992278cd 100644 --- a/android/res/values-zh-rCN/strings.xml +++ b/android/res/values-zh-rCN/strings.xml @@ -19,7 +19,6 @@ "很抱歉,eSpeak 加载失败。" "正在朗读的是%s的语音示例" - "默认" "男" "女" diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml index 4bffc382..57021c49 100644 --- a/android/res/values-zh-rTW/strings.xml +++ b/android/res/values-zh-rTW/strings.xml @@ -19,7 +19,6 @@ "很抱歉,無法載入 eSpeak。" "這是「%s」的語音測試範例" - "預設" "男性" "女性" diff --git a/android/res/values-zu/strings.xml b/android/res/values-zu/strings.xml index 8c58bfc9..9f1b968b 100644 --- a/android/res/values-zu/strings.xml +++ b/android/res/values-zu/strings.xml @@ -19,7 +19,6 @@ "Uxolo, i-eSpeak yehlulekile ukulayisha." "Lena yisampula yombhalo okhulunywa kwi %s" - "Okuthola kukhona" "Owesilisa" "Owesifazane" diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml index 3031abfa..09a4100c 100644 --- a/android/res/values/donottranslate.xml +++ b/android/res/values/donottranslate.xml @@ -9,7 +9,6 @@ 500 - 0 1 2 diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 10ebadce..eeb4a756 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -104,7 +104,6 @@ Description: Labels for possible gender values. --> - Default Male Female diff --git a/android/res/xml/preferences.xml b/android/res/xml/preferences.xml index 5e90e69f..2cdddf4e 100644 --- a/android/res/xml/preferences.xml +++ b/android/res/xml/preferences.xml @@ -9,7 +9,7 @@ android:summary="%s" android:title="@string/setting_default_rate" /> = Build.VERSION_CODES.HONEYCOMB) { getFragmentManager().beginTransaction().replace( @@ -122,21 +143,6 @@ public class TtsSettingsActivity extends PreferenceActivity { return; } - // Migrate old eyes-free settings to the new settings: - - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - final SharedPreferences.Editor editor = prefs.edit(); - - String pitch = prefs.getString("espeak_pitch", null); - if (pitch == null) { - // Try the old eyes-free setting: - pitch = prefs.getString("default_pitch", "100"); - int pitchValue = Integer.parseInt(pitch) / 2; - editor.putString("espeak_pitch", Integer.toString(pitchValue)); - } - - editor.commit(); - // Bind eSpeak parameters to preference settings: SpeechSynthesis engine = new SpeechSynthesis(context, null);