diff --git a/android/res/values-af/strings.xml b/android/res/values-af/strings.xml
index e424276b..f4574696 100644
--- a/android/res/values-af/strings.xml
+++ b/android/res/values-af/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Laai tans, wag asseblief...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-am/strings.xml b/android/res/values-am/strings.xml
index dc68e5bb..1aaeeb09 100644
--- a/android/res/values-am/strings.xml
+++ b/android/res/values-am/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">በመጫን ላይ፣ እባክህ ጠብቅ…</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index 22abc7c2..9fd9845d 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">جارٍ التحميل، يُرجى الانتظار...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 27933e0e..d4346e88 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Зарежда се. Моля, изчакайте...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index f1b5b1d8..310998ee 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">S\'està carregant; espera...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index e6e3ea8a..537855f1 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Načítání, čekejte prosím...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 967fbb62..f17fb69e 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Indlæser. Vent et øjeblik...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index 0fe56869..64be1123 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Ladevorgang läuft. Bitte warten...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index c1b54161..72717cad 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Γίνεται φόρτωση. Περιμένετε...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-en-rGB/strings.xml b/android/res/values-en-rGB/strings.xml
index f740b108..642412a2 100644
--- a/android/res/values-en-rGB/strings.xml
+++ b/android/res/values-en-rGB/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Loading, please wait…</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-es-rUS/strings.xml b/android/res/values-es-rUS/strings.xml
index 965c8be3..eb762b0e 100644
--- a/android/res/values-es-rUS/strings.xml
+++ b/android/res/values-es-rUS/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
-  <string name="app_name" translatable="false">eSpeak</string>
   <!--Source: Activity title.
         Description: Title for the Settings activity.-->
   <string name="tts_settings_label">Config del sintetizador eSpeak</string>
@@ -41,7 +40,7 @@
   <string name="loading">Cargando. Espere por favor …</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <string-array name="default_variant_entries">
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index e5dc42f9..98e8b855 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
-  <string name="app_name" translatable="false">eSpeak</string>
   <!--Source: Activity title.
         Description: Title for the Settings activity.-->
   <string name="tts_settings_label">Config del sintetizador eSpeak</string>
@@ -41,7 +40,7 @@
   <string name="loading">Cargando. Espere por favor …</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <string-array name="default_variant_entries">
diff --git a/android/res/values-fa/strings.xml b/android/res/values-fa/strings.xml
index 1c0afabf..89385c85 100644
--- a/android/res/values-fa/strings.xml
+++ b/android/res/values-fa/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">در حال بارگیری، لطفاً صبر کنید...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 859f7e75..8dee42be 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
-  <string name="app_name" translatable="false">eSpeak</string>
   <!--Source: Activity title.
         Description: Title for the Settings activity.-->
   <string name="tts_settings_label">eSpeak TTS -asetukset</string>
@@ -41,7 +40,7 @@
   <string name="loading">Ladataan. Odota...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 80f2dd4f..abbbc823 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Chargement en cours, veuillez patienter…</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-hi/strings.xml b/android/res/values-hi/strings.xml
index b7da839c..5245ab79 100644
--- a/android/res/values-hi/strings.xml
+++ b/android/res/values-hi/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">लोड हो रहा है, कृपया प्रतीक्षा करें…</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-hr/strings.xml b/android/res/values-hr/strings.xml
index d275f073..deb240ca 100644
--- a/android/res/values-hr/strings.xml
+++ b/android/res/values-hr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Učitavanje. Pričekajte...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 606e5063..54d299a6 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Betöltés folyamatban -- kérjük, várjon...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index e691f979..eb679d8e 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
-  <string name="app_name" translatable="false">eSpeak</string>
   <!--Source: Activity title.
         Description: Title for the Settings activity.-->
   <string name="tts_settings_label">Impostazioni di sintesi vocale eSpeak</string>
@@ -41,7 +40,7 @@
   <string name="loading">Caricamento, attendere...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <string-array name="default_variant_entries">
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index b5a49ef8..359f79e9 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">טוען. המתן...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 930b684e..a856fcee 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">読み込んでいます。お待ちください...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index dcbae078..c2901d2b 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">로드 중... 잠시 기다려 주세요.</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-lt/strings.xml b/android/res/values-lt/strings.xml
index 68c06b28..c3b41693 100644
--- a/android/res/values-lt/strings.xml
+++ b/android/res/values-lt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Įkeliama, palaukite...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-lv/strings.xml b/android/res/values-lv/strings.xml
index f933bf3b..79243267 100644
--- a/android/res/values-lv/strings.xml
+++ b/android/res/values-lv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Notiek ielāde. Lūdzu, uzgaidiet...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-ms/strings.xml b/android/res/values-ms/strings.xml
index 965fcd5f..e919af86 100644
--- a/android/res/values-ms/strings.xml
+++ b/android/res/values-ms/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Memuatkan, sila tunggu...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-nb/strings.xml b/android/res/values-nb/strings.xml
index 91e3861d..2b3c99b5 100644
--- a/android/res/values-nb/strings.xml
+++ b/android/res/values-nb/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Laster inn – vent litt …</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index efc9a2d9..9277b854 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Laden, even geduld...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index fdbce999..ca38a428 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Wczytywanie. Czekaj...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-pt-rBR/strings.xml b/android/res/values-pt-rBR/strings.xml
index c91601ae..ee25f91b 100644
--- a/android/res/values-pt-rBR/strings.xml
+++ b/android/res/values-pt-rBR/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
-  <string name="app_name" translatable="false">eSpeak</string>
   <!--Source: Activity title.
         Description: Title for the Settings activity.-->
   <string name="tts_settings_label">Ajustes de TTS do eSpeak</string>
@@ -41,7 +40,7 @@
   <string name="loading">Carregando, por favor aguarde…</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <string-array name="default_variant_entries">
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index fb4b0558..ae3d7165 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">A carregar; aguarde...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-ro/strings.xml b/android/res/values-ro/strings.xml
index 6933bea6..54930b03 100644
--- a/android/res/values-ro/strings.xml
+++ b/android/res/values-ro/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Se încarcă, aşteptaţi...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 274abb0c..eea2dec7 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -1,8 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
-  <string name="app_name" translatable="false">eSpeak</string>
   <!--Source: Activity title.
         Description: Title for the Settings activity.-->
   <string name="tts_settings_label">Настройки eSpeak</string>
@@ -41,7 +40,7 @@
   <string name="loading">Загрузка...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <string-array name="default_variant_entries">
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 4c54e9a5..89206353 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Prebieha načítavanie, čakajte prosím...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-sl/strings.xml b/android/res/values-sl/strings.xml
index 9ab15e8b..9fd3357a 100644
--- a/android/res/values-sl/strings.xml
+++ b/android/res/values-sl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Nalaganje, počakajte trenutek ...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-sr/strings.xml b/android/res/values-sr/strings.xml
index 7da21b09..50cfe63b 100644
--- a/android/res/values-sr/strings.xml
+++ b/android/res/values-sr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Учитавање, сачекајте...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 237db0d8..48eb5113 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Läser in, vänta …</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-sw/strings.xml b/android/res/values-sw/strings.xml
index 0a14ce71..a6599a8d 100644
--- a/android/res/values-sw/strings.xml
+++ b/android/res/values-sw/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Inapakia, tafadhali subiri...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-th/strings.xml b/android/res/values-th/strings.xml
index 43aa483f..6b58e480 100644
--- a/android/res/values-th/strings.xml
+++ b/android/res/values-th/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">กำลังโหลด โปรดรอสักครู่...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-tl/strings.xml b/android/res/values-tl/strings.xml
index 4e85805b..a232d467 100644
--- a/android/res/values-tl/strings.xml
+++ b/android/res/values-tl/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Naglo-load, mangyaring maghintay...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index bf6965dd..5ebd23ac 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Yükleniyor, lütfen bekleyin...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-uk/strings.xml b/android/res/values-uk/strings.xml
index cd8c28d8..1f51fb3c 100644
--- a/android/res/values-uk/strings.xml
+++ b/android/res/values-uk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Триває завантаження. Зачекайте...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-vi/strings.xml b/android/res/values-vi/strings.xml
index ff8c86eb..9ce9c832 100644
--- a/android/res/values-vi/strings.xml
+++ b/android/res/values-vi/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Đang tải, vui lòng chờ…</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index f446f02e..4813bd60 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">正在加载，请稍候...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index 708f821e..4ae3fc7a 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">載入中，請稍候...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values-zu/strings.xml b/android/res/values-zu/strings.xml
index 91db3dc3..9d00238c 100644
--- a/android/res/values-zu/strings.xml
+++ b/android/res/values-zu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <resources>
   <!--Source: App icon label.
         Description: The name of the application.-->
@@ -40,7 +40,7 @@
   <string name="loading">Iyalayisha, ucelwa ukuthi ulinde...</string>
   <!--Source: Spoken aloud.
         Description: Sample text spoken aloud when the user is trying out a language.-->
-  <string name="sample_text"></string>
+  <string name="sample_text"/>
   <!--Source: Variant preference labels.
         Description: Labels for possible voice variant/gender/age values.-->
   <!--Source: Rate preference labels.
diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index 8a9b3575..bfe736aa 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+  <!--
+        Source: App icon label.
+        Description: The name of the application.
+    -->
+  <string name="app_name" translatable="false">eSpeak</string>
+    
     <string-array name="default_variant_values">
         <item>male</item>
         <item>m1</item>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index ca1d8717..8b919bfa 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!--
-        Source: App icon label.
-        Description: The name of the application.
-    -->
-  <string name="app_name" translatable="false">eSpeak</string>
   <!--
         Source: Activity title.
         Description: Title for the Settings activity.