diff --git a/java/res/values-af/strings.xml b/java/res/values-af/strings.xml
index 20c66c7a7..a74822c9e 100644
--- a/java/res/values-af/strings.xml
+++ b/java/res/values-af/strings.xml
@@ -118,10 +118,8 @@
"Sleutelbordtema"
"Engels (VK)"
"Engels (VS)"
-
-
-
-
+ "Engels (VK) (%s)"
+ "Engels (VS) (%s)"
"Geen taal nie"
"Geen taal (QWERTY)"
"Geen taal nie (QWERTZ)"
diff --git a/java/res/values-am/strings.xml b/java/res/values-am/strings.xml
index 33fd6c6d6..32dedda37 100644
--- a/java/res/values-am/strings.xml
+++ b/java/res/values-am/strings.xml
@@ -118,10 +118,8 @@
"የቁልፍ ሰሌዳ ገጽታ"
"እንግሊዘኛ (የታላቋ ብሪታንያ)"
"እንግሊዘኛ (ዩ.ኤስ)"
-
-
-
-
+ "እንግሊዘኛ (ዩናይትድ ኪንግደም) (%s)"
+ "እንግሊዘኛ (አሜሪካ) (%s)"
"ምንም ቋንቋ"
"ቋንቋ አልባ (QWERTY)"
"ቋንቋ አልባ (QWERTZ)"
diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml
index 26aebc293..b525da397 100644
--- a/java/res/values-ar/strings.xml
+++ b/java/res/values-ar/strings.xml
@@ -118,10 +118,8 @@
"مظهر لوحة المفاتيح"
"الإنجليزية (المملكة المتحدة)"
"الإنجليزية (الولايات المتحدة)"
-
-
-
-
+ "الإنجليزية (المملكة المتحدة) (%s)"
+ "الإنجليزية (الولايات المتحدة) (%s)"
"بدون لغة"
"بدون لغة (QWERTY)"
"بدون لغة (QWERTZ)"
diff --git a/java/res/values-be/strings.xml b/java/res/values-be/strings.xml
index 95e9a4bac..d58437c20 100644
--- a/java/res/values-be/strings.xml
+++ b/java/res/values-be/strings.xml
@@ -118,10 +118,8 @@
"Тэма клавіятуры"
"Англійская (ЗК)"
"Англійская (ЗША)"
-
-
-
-
+ "Англійская (Вялікабрытанія) (%s)"
+ "Англійская (ЗША) (%s)"
"Мова не выбрана"
"Мова не выбрана (QWERTY)"
"Няма мовы (QWERTZ)"
diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml
index e45b88eda..bba08ee15 100644
--- a/java/res/values-bg/strings.xml
+++ b/java/res/values-bg/strings.xml
@@ -118,10 +118,8 @@
"Тема на клавиатурата"
"английски (Великобритания)"
"английски (САЩ)"
-
-
-
-
+ "английски (Великобр.) (%s)"
+ "английски (САЩ) (%s)"
"Без език"
"Без език („QWERTY“)"
"Без език (QWERTZ)"
diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml
index 726f3e3eb..167a6d5b7 100644
--- a/java/res/values-ca/strings.xml
+++ b/java/res/values-ca/strings.xml
@@ -118,10 +118,8 @@
"Tema del teclat"
"Anglès (Regne Unit)"
"Anglès (EUA)"
-
-
-
-
+ "Anglès (Regne Unit) (%s)"
+ "Anglès (Estats Units) (%s)"
"Cap idioma"
"Cap idioma (QWERTY)"
"Cap idioma (QWERTZ)"
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index 77a4ffa4c..8535fc1ab 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -118,10 +118,8 @@
"Motiv klávesnice"
"angličtina (Spojené království)"
"angličtina (USA)"
-
-
-
-
+ "angličtina (VB) (%s)"
+ "angličtina (USA) (%s)"
"Žádný jazyk"
"Žádný jazyk (QWERTY)"
"Žádný jazyk (QWERTZ)"
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index 8dd946613..c4649e296 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -118,10 +118,8 @@
"Tastaturtema"
"Engelsk (Storbritannien)"
"Engelsk (USA)"
-
-
-
-
+ "Engelsk (Storbritannien) (%s)"
+ "Engelsk (USA) (%s)"
"Intet sprog"
"Ingen sprog (QWERTY)"
"Intet sprog (QWERTZ)"
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index 3db95b15b..de26c325d 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -118,10 +118,8 @@
"Tastaturdesign"
"Englisch (Großbritannien)"
"Englisch (USA)"
-
-
-
-
+ "Englisch (GB) (%s)"
+ "Englisch (USA) (%s)"
"Keine Sprache"
"Keine Sprache (QWERTY)"
"Keine Sprache (QWERTZ)"
diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 01f18fc78..131cb4a67 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -118,10 +118,8 @@
"Θέμα πληκτρολογίου"
"Αγγλικά (Η.Β.)"
"Αγγλικά (Η.Π.Α)"
-
-
-
-
+ "Αγγλικά (ΗΒ) (%s)"
+ "Αγγλικά (ΗΠΑ) (%s)"
"Καμία γλώσσα"
"Καμία γλώσσα (QWERTY)"
"Καμία γλώσσα (QWERTZ)"
diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml
index 895e38868..2fd8b9b82 100644
--- a/java/res/values-en-rGB/strings.xml
+++ b/java/res/values-en-rGB/strings.xml
@@ -118,10 +118,8 @@
"Keyboard theme"
"English (UK)"
"English (US)"
-
-
-
-
+ "English (UK) (%s)"
+ "English (US) (%s)"
"No language"
"No language (QWERTY)"
"No language (QWERTZ)"
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index b271725c1..b998e9074 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -118,10 +118,8 @@
"Tema del teclado"
"Inglés (Reino Unido)"
"Inglés (EE.UU.)"
-
-
-
-
+ "Inglés (Reino Unido) (%s)"
+ "Inglés (EE.UU.) (%s)"
"Ningún idioma"
"Ningún idioma (QWERTY)"
"Sin idioma (QWERTZ)"
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index ef435ed94..488449960 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -118,10 +118,8 @@
"Tema de teclado"
"inglés (Reino Unido)"
"inglés (EE.UU.)"
-
-
-
-
+ "Inglés (Reino Unido) (%s)"
+ "Inglés (EE.UU.) (%s)"
"Ningún idioma"
"Ningún idioma (QWERTY)"
"Ningún idioma (QWERTZ)"
diff --git a/java/res/values-et/strings.xml b/java/res/values-et/strings.xml
index aee6407e7..1e1bba615 100644
--- a/java/res/values-et/strings.xml
+++ b/java/res/values-et/strings.xml
@@ -118,10 +118,8 @@
"Klaviatuuri teema"
"Inglise (UK)"
"Inglise (USA)"
-
-
-
-
+ "Inglise (UK) (%s)"
+ "Inglise (USA) (%s)"
"Keel puudub"
"Keel puudub (QWERTY)"
"Keel puudub (QWERTZ)"
diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml
index 5ba1cbf0f..9f8c915a6 100644
--- a/java/res/values-fa/strings.xml
+++ b/java/res/values-fa/strings.xml
@@ -122,10 +122,8 @@
"طرح زمینه صفحه کلید"
"انگیسی (UK)"
"انگیسی (US)"
-
-
-
-
+ "انگلیسی (انگلستان) ( %s )"
+ "انگلیسی (ایالات متحده) ( %s )"
"زبانی موجود نیست"
"هیچ کدام از زبانها (QWERTY)"
"هیچکدام از زبانها (QWERTZ)"
diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml
index a8eba545c..5ac436b1d 100644
--- a/java/res/values-fi/strings.xml
+++ b/java/res/values-fi/strings.xml
@@ -118,10 +118,8 @@
"Näppäimistöteema"
"englanti (Iso-Britannia)"
"englanti (Yhdysvallat)"
-
-
-
-
+ "englanti (Iso-Britannia) (%s)"
+ "englanti (USA) (%s)"
"Ei kieltä"
"Ei kieltä (QWERTY)"
"Ei kieltä (QWERTZ)"
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index e365b018f..3f559c00b 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -118,10 +118,8 @@
"Thème du clavier"
"Anglais (Royaume-Uni)"
"Anglais (États-Unis)"
-
-
-
-
+ "Anglais (Royaume-Uni) (%s)"
+ "Anglais (États-Unis) (%s)"
"Aucune langue"
"Pas de langue (QWERTY)"
"Aucune langue (QWERTZ)"
diff --git a/java/res/values-hi/strings.xml b/java/res/values-hi/strings.xml
index d6f0b665e..6cbdf5668 100644
--- a/java/res/values-hi/strings.xml
+++ b/java/res/values-hi/strings.xml
@@ -71,9 +71,9 @@
"पिछला"
"पूर्ण"
"भेजें"
- "ABC"
- "?123"
- "123"
+ "कखग"
+ "?१२३"
+ "१२३"
"रोकें"
"प्रतीक्षा करें"
"ज़ोर से बोली गई पासवर्ड कुंजियां सुनने के लिए हेडसेट प्लग इन करें."
@@ -118,10 +118,8 @@
"कीबोर्ड थीम"
"अंग्रेज़ी (यूके)"
"अंग्रेज़ी (यूएस)"
-
-
-
-
+ "अंग्रेज़ी (यूके) (%s)"
+ "अंग्रेज़ी (यूएस) (%s)"
"कोई भाषा नहीं"
"कोई भाषा नहीं (QWERTY)"
"कोई भाषा नहीं (QWERTZ)"
diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml
index 256fe0c9d..8116146bc 100644
--- a/java/res/values-hr/strings.xml
+++ b/java/res/values-hr/strings.xml
@@ -118,10 +118,8 @@
"Tema tipkovnice"
"Engleski (UK)"
"Engleski (SAD)"
-
-
-
-
+ "engleski (UK) (%s)"
+ "engleski (SAD) (%s)"
"Nema jezika"
"Nema jezika (QWERTY)"
"Nema jezika (QWERTZ)"
diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml
index f0f298cf8..9d0182c8d 100644
--- a/java/res/values-hu/strings.xml
+++ b/java/res/values-hu/strings.xml
@@ -118,10 +118,8 @@
"Billentyűzettéma"
"angol (brit)"
"angol (amerikai)"
-
-
-
-
+ "angol (brit) (%s)"
+ "angol (amerikai) (%s)"
"Nincs nyelv"
"Nincs nyelv (QWERTY)"
"Nincs nyelv (QWERTZ)"
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 48603f5de..c3d9ab134 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -118,10 +118,8 @@
"Tema della tastiera"
"Inglese (UK)"
"Inglese (USA)"
-
-
-
-
+ "Inglese (Regno Unito) (%s)"
+ "Inglese (Stati Uniti) (%s)"
"Nessuna lingua"
"Nessuna lingua (QWERTY)"
"Nessuna lingua (QWERTZ)"
diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml
index 6eb8d0fc9..6368f4c39 100644
--- a/java/res/values-iw/strings.xml
+++ b/java/res/values-iw/strings.xml
@@ -118,10 +118,8 @@
"עיצוב מקלדת"
"אנגלית (בריטניה)"
"אנגלית (ארה\"ב)"
-
-
-
-
+ "אנגלית (בריטניה) (%s)"
+ "אנגלית (ארה\"ב) (%s)"
"ללא שפה"
"אין שפה (QWERTY)"
"אין שפה (QWERTZ)"
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index fbe67de78..1d3678a80 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -68,7 +68,7 @@
"%s:保存しました"
"実行"
"次へ"
- "前"
+ "前へ"
"完了"
"送信"
"ABC"
diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml
index 49ac08f47..be6dd3a0c 100644
--- a/java/res/values-lt/strings.xml
+++ b/java/res/values-lt/strings.xml
@@ -118,10 +118,8 @@
"Klaviatūros tema"
"Anglų k. (JK)"
"Anglų k. (JAV)"
-
-
-
-
+ "Angliška (JK) (%s)"
+ "Angliška (JAV) (%s)"
"Kalbos nėra"
"Nėra kalbos (QWERTY)"
"Nėra kalbos (QWERTZ)"
diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml
index 07724588a..86cb128c0 100644
--- a/java/res/values-lv/strings.xml
+++ b/java/res/values-lv/strings.xml
@@ -118,10 +118,8 @@
"Tastatūras motīvs"
"Angļu valoda (Lielbritānija)"
"Angļu valoda (ASV)"
-
-
-
-
+ "Angļu (Lielbritānija) (%s)"
+ "Angļu (ASV) (%s)"
"Nav valodas"
"Nav valodas (QWERTY)"
"Nav valodas (QWERTZ)"
diff --git a/java/res/values-ms/strings.xml b/java/res/values-ms/strings.xml
index cd9a81876..e862f1ebb 100644
--- a/java/res/values-ms/strings.xml
+++ b/java/res/values-ms/strings.xml
@@ -118,10 +118,8 @@
"Tema papan kekunci"
"Bahasa Inggeris (UK)"
"Bahasa Inggeris (AS)"
-
-
-
-
+ "Bahasa Inggeris (UK) (%s)"
+ "Bahasa Inggeris (AS) (%s)"
"Tiada bahasa"
"Tiada bahasa (QWERTY)"
"Tiada bahasa (QWERTZ)"
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index 3a1aa4a9b..0c9a20a93 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -118,10 +118,8 @@
"Toetsenbordthema"
"Engels (GB)"
"Engels (VS)"
-
-
-
-
+ "Engels (VK) (%s)"
+ "Engels (VS) (%s)"
"Geen taal"
"Geen taal (QWERTY)"
"Geen taal (QWERTZ)"
diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index bda486570..9fd58504c 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -118,10 +118,8 @@
"Tema do teclado"
"Inglês (Reino Unido)"
"Inglês (EUA)"
-
-
-
-
+ "Inglês (Reino Unido) (%s)"
+ "Inglês (EUA) (%s)"
"Sem idioma"
"Nenhum idioma (QWERTY)"
"Nenhum idioma (QWERTZ)"
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index 7ccc8f4db..246da3439 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -118,10 +118,8 @@
"Тема клавиатуры"
"английский (Великобритания)"
"английский (США)"
-
-
-
-
+ "Английская (Великобр.) (%s)"
+ "Английская (США) (%s)"
"Язык не указан"
"Язык не указан (QWERTY)"
"Язык не задан (QWERTZ)"
diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml
index 1c5841d9b..9b5da7566 100644
--- a/java/res/values-sl/strings.xml
+++ b/java/res/values-sl/strings.xml
@@ -118,10 +118,8 @@
"Tema tipkovnice"
"angleščina (Združeno kraljestvo)"
"angleščina (ZDA)"
-
-
-
-
+ "Angleška (VB) (%s)"
+ "Angleška (ZDA) (%s)"
"Ni jezika"
"Ni jezika (QWERTY)"
"Ni jezika (QWERTZ)"
diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml
index 0578dcb9a..e87a947bf 100644
--- a/java/res/values-sw/strings.xml
+++ b/java/res/values-sw/strings.xml
@@ -118,10 +118,8 @@
"Maandhari ya kibodi"
"Kiingereza cha (Uingereza)"
"Kiingereza cha (Marekani)"
-
-
-
-
+ "Kiingereza (Uingereza) (%s)"
+ "Kiingereza (Marekani) (%s)"
"Hakuna lugha"
"Hakuna lugha (QWERTY)"
"Hakuna lugha (QWERTZ)"
diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml
index fb0d5e4d3..958eed356 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -118,10 +118,8 @@
"Tema ng keyboard"
"Ingles (UK)"
"Ingles (Estados Unidos)"
-
-
-
-
+ "Ingles (UK) (%s)"
+ "Ingles (US) (%s)"
"Walang wika"
"Walang wika (QWERTY)"
"Walang wika (QWERTZ)"
diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml
index abc586cd4..eff426b91 100644
--- a/java/res/values-vi/strings.xml
+++ b/java/res/values-vi/strings.xml
@@ -118,10 +118,8 @@
"Chủ đề bàn phím"
"Tiếng Anh (Anh)"
"Tiếng Anh (Mỹ)"
-
-
-
-
+ "Tiếng Anh (Anh) (%s)"
+ "Tiếng Anh (Mỹ) (%s)"
"Không có ngôn ngữ nào"
"Không có ngôn ngữ (QWERTY)"
"0 ngôn ngữ (QWERTZ)"
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index ee1c3f5b8..d0e1df0e2 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -118,10 +118,8 @@
"键盘主题"
"英语(英国)"
"英语(美国)"
-
-
-
-
+ "英语(英国)(%s)"
+ "英语(美国)(%s)"
"无语言"
"无语言(QWERTY 键盘)"
"无语言(QWERTZ 键盘)"
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index 25ba4c3eb..4371b431f 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -118,10 +118,8 @@
"鍵盤主題"
"英文 (英式)"
"英文 (美式)"
-
-
-
-
+ "英文 (英國) (%s)"
+ "英文 (美國) (%s)"
"無語言"
"無語言 (QWERTY)"
"無語言 (QWERTZ)"
diff --git a/java/res/values-zu/strings.xml b/java/res/values-zu/strings.xml
index edbde7a38..7b1ba1405 100644
--- a/java/res/values-zu/strings.xml
+++ b/java/res/values-zu/strings.xml
@@ -118,10 +118,8 @@
"Indikimba yekhibhodi"
"i-English(UK)"
"i-English (US)"
-
-
-
-
+ "I-English (UK) (%s)"
+ "I-English (US) (%s)"
"Akunalimi"
"Akunalimi (QWERTY)"
"Alukho ulimi (QWERTZ)"