diff --git a/java/Android.mk b/java/Android.mk
index b84b347..154f3a2 100644
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -26,7 +26,12 @@
 LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-        android-common inputmethod-common android-support-v4 jsr305 latinime-common
+        android-common inputmethod-common jsr305 latinime-common
+
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+        android-support-v4
+
+LOCAL_USE_AAPT2 := true
 
 # Do not compress dictionary files to mmap dict data runtime
 LOCAL_AAPT_FLAGS := -0 .dict
diff --git a/java/res/values-az-rAZ/bools.xml b/java/res/values-az/bools.xml
similarity index 100%
rename from java/res/values-az-rAZ/bools.xml
rename to java/res/values-az/bools.xml
diff --git a/java/res/values-az-rAZ/strings-action-keys.xml b/java/res/values-az/strings-action-keys.xml
similarity index 100%
rename from java/res/values-az-rAZ/strings-action-keys.xml
rename to java/res/values-az/strings-action-keys.xml
diff --git a/java/res/values-az-rAZ/strings-appname.xml b/java/res/values-az/strings-appname.xml
similarity index 100%
rename from java/res/values-az-rAZ/strings-appname.xml
rename to java/res/values-az/strings-appname.xml
diff --git a/java/res/values-az-rAZ/strings-config-important-notice.xml b/java/res/values-az/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-az-rAZ/strings-config-important-notice.xml
rename to java/res/values-az/strings-config-important-notice.xml
diff --git a/java/res/values-az-rAZ/strings-emoji-descriptions.xml b/java/res/values-az/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-az-rAZ/strings-emoji-descriptions.xml
rename to java/res/values-az/strings-emoji-descriptions.xml
diff --git a/java/res/values-az-rAZ/strings-letter-descriptions.xml b/java/res/values-az/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-az-rAZ/strings-letter-descriptions.xml
rename to java/res/values-az/strings-letter-descriptions.xml
diff --git a/java/res/values-az-rAZ/strings-talkback-descriptions.xml b/java/res/values-az/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-az-rAZ/strings-talkback-descriptions.xml
rename to java/res/values-az/strings-talkback-descriptions.xml
diff --git a/java/res/values-az-rAZ/strings.xml b/java/res/values-az/strings.xml
similarity index 100%
rename from java/res/values-az-rAZ/strings.xml
rename to java/res/values-az/strings.xml
diff --git a/java/res/values-b+sr+Latn/strings-emoji-descriptions.xml b/java/res/values-b+sr+Latn/strings-emoji-descriptions.xml
index 0c0dc36..6737372 100644
--- a/java/res/values-b+sr+Latn/strings-emoji-descriptions.xml
+++ b/java/res/values-b+sr+Latn/strings-emoji-descriptions.xml
@@ -651,7 +651,7 @@
     <string name="spoken_emoji_1F449" msgid="4764447975177805991">"Spoljni deo bele šake sa kažiprstom nadesno"</string>
     <string name="spoken_emoji_1F44A" msgid="7197417095486424841">"Pesnica"</string>
     <string name="spoken_emoji_1F44B" msgid="1975968945250833117">"Ruka koja maše"</string>
-    <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Znak rukom „U redu“"</string>
+    <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Znak rukom „Potvrdi“"</string>
     <string name="spoken_emoji_1F44D" msgid="6182553970602667815">"Palac okrenut nagore"</string>
     <string name="spoken_emoji_1F44E" msgid="8030851867365111809">"Palac okrenut nadole"</string>
     <string name="spoken_emoji_1F44F" msgid="5148753662268213389">"Tapšanje"</string>
diff --git a/java/res/values-b+sr+Latn/strings.xml b/java/res/values-b+sr+Latn/strings.xml
index e072371..279f79c 100644
--- a/java/res/values-b+sr+Latn/strings.xml
+++ b/java/res/values-b+sr+Latn/strings.xml
@@ -86,13 +86,13 @@
     <string name="gesture_space_aware" msgid="2078291600664682496">"Pokret za fraze"</string>
     <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Unosite razmake tokom pokreta prelaskom do tastera za razmak"</string>
     <string name="voice_input" msgid="3583258583521397548">"Taster za glasovni unos"</string>
-    <string name="voice_input_disabled_summary" msgid="8141750303464726129">"Nijedan metod glasovnog unosa nije omogućen. Proverite Podešavanja jezika i unosa."</string>
+    <string name="voice_input_disabled_summary" msgid="6323489602945135165">"Nijedan metod glasovnog unosa nije omogućen. Proverite Podešavanja jezika i unosa."</string>
     <string name="configure_input_method" msgid="373356270290742459">"Konfigurisanje metoda unosa"</string>
     <string name="language_selection_title" msgid="3666971864764478269">"Jezici"</string>
     <string name="help_and_feedback" msgid="5328219371839879161">"Pomoć i povratne informacije"</string>
     <string name="select_language" msgid="5709487854987078367">"Jezici"</string>
-    <string name="hint_add_to_dictionary" msgid="573678656946085380">"Ponovo dodirnite da biste sačuvali"</string>
-    <string name="hint_add_to_dictionary_without_word" msgid="3040385779511255101">"Dodirnite ovde da biste sačuvali"</string>
+    <string name="hint_add_to_dictionary" msgid="2645988432867033007">"Dodirnite ponovo da biste sačuvali"</string>
+    <string name="hint_add_to_dictionary_without_word" msgid="6710206006427574423">"Dodirnite ovde da biste sačuvali"</string>
     <string name="has_dictionary" msgid="6071847973466625007">"Rečnik je dostupan"</string>
     <string name="keyboard_layout" msgid="8451164783510487501">"Tema tastature"</string>
     <string name="switch_accounts" msgid="3321216593719006162">"Promenite nalog"</string>
@@ -146,8 +146,8 @@
     <string name="setup_next_action" msgid="371821437915144603">"Sledeći korak"</string>
     <string name="setup_steps_title" msgid="6400373034871816182">"Podešavanje aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
     <string name="setup_step1_title" msgid="3147967630253462315">"Omogućite aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
-    <string name="setup_step1_instruction" msgid="2578631936624637241">"Potvrdite aplikaciju „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“ u Podešavanjima jezika i unosa. Tako joj odobravate pokretanje na uređaju."</string>
-    <string name="setup_step1_finished_instruction" msgid="10761482004957994">"Aplikacija <xliff:g id="APPLICATION_NAME">%s</xliff:g> je već omogućena u Podešavanjima jezika i unosa tako da je ovaj korak gotov. Pređimo na sledeći!"</string>
+    <string name="setup_step1_instruction" msgid="4295448056733329661">"Potvrdite aplikaciju „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“ u Podešavanjima jezika i unosa. Tako joj odobravate pokretanje na uređaju."</string>
+    <string name="setup_step1_finished_instruction" msgid="8701441895377434947">"Aplikacija <xliff:g id="APPLICATION_NAME">%s</xliff:g> je već omogućena u Podešavanjima jezika i unosa, pa je ovaj korak gotov. Pređimo na sledeći!"</string>
     <string name="setup_step1_action" msgid="4366513534999901728">"Omogući u Podešavanjima"</string>
     <string name="setup_step2_title" msgid="6860725447906690594">"Prebacite na <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
     <string name="setup_step2_instruction" msgid="9141481964870023336">"Zatim izaberite „<xliff:g id="APPLICATION_NAME">%s</xliff:g>“ kao aktivni metod unosa teksta."</string>
@@ -183,7 +183,7 @@
     <string name="install_dict" msgid="180852772562189365">"Instaliraj"</string>
     <string name="cancel_download_dict" msgid="7843340278507019303">"Otkaži"</string>
     <string name="delete_dict" msgid="756853268088330054">"Izbriši"</string>
-    <string name="should_download_over_metered_prompt" msgid="1583881200688185508">"Dostupan je rečnik za izabrani jezik na mobilnom uređaju.&lt;br/&gt; Preporučujemo vam da &lt;b&gt;preuzmete&lt;/b&gt; rečnik za <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> da biste poboljšali doživljaj kucanja.&lt;br/&gt; &lt;br/&gt; Preuzimanje može da traje minut ili dva preko 3G mreže. Troškovi će možda biti naplaćeni ako nemate &lt;b&gt;pretplatnički paket bez ograničenja&lt;/b&gt;.&lt;br/&gt; Ako niste sigurni koji pretplatnički paket imate, preporučujemo vam da pronađete Wi-Fi vezu da biste automatski započeli preuzimanje.&lt;br/&gt; &lt;br/&gt; Savet: Rečnike možete da preuzimate i uklanjate ako odete na &lt;b&gt;Jezik i unos&lt;/b&gt; u meniju &lt;b&gt;Podešavanja&lt;/b&gt; na mobilnom uređaju."</string>
+    <string name="should_download_over_metered_prompt" msgid="6737084685073734292">"Dostupan je rečnik za izabrani jezik na mobilnom uređaju.&lt;br/&gt; Preporučujemo vam da &lt;b&gt;preuzmete&lt;/b&gt; rečnik za <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> da biste poboljšali doživljaj kucanja.&lt;br/&gt; &lt;br/&gt; Preuzimanje može da traje minut ili dva preko 3G mreže. Troškovi će možda biti naplaćeni ako nemate &lt;b&gt;pretplatnički paket bez ograničenja&lt;/b&gt;.&lt;br/&gt; Ako niste sigurni koji pretplatnički paket imate, preporučujemo vam da pronađete Wi-Fi vezu da biste automatski započeli preuzimanje.&lt;br/&gt; &lt;br/&gt; Savet: Rečnike možete da preuzimate i uklanjate ako odete na &lt;b&gt;Jezik i unos&lt;/b&gt; u meniju &lt;b&gt;Podešavanja&lt;/b&gt; na mobilnom uređaju."</string>
     <string name="download_over_metered" msgid="1643065851159409546">"Preuzmi odmah (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g> MB)"</string>
     <string name="do_not_download_over_metered" msgid="2176209579313941583">"Preuzmi preko Wi-Fi-ja"</string>
     <string name="dict_available_notification_title" msgid="4583842811218581658">"Dostupan je rečnik za <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
@@ -204,7 +204,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="3765774633869590352">"Izmena reči"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="6812255903472456302">"Izmeni"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="8142932447689461181">"Izbriši"</string>
-    <string name="user_dict_settings_empty_text" msgid="558499587532668203">"Nemate nijednu reč u korisničkom rečniku. Dodajte reč dodirom na dugme Dodaj (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="6889278304342592383">"Nemate nijednu reč u korisničkom rečniku. Da biste dodali reč, dodirnite dugme Dodaj (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="8276126583216298886">"Za sve jezike"</string>
     <string name="user_dict_settings_more_languages" msgid="7131268499685180461">"Još jezika..."</string>
     <string name="user_dict_settings_delete" msgid="110413335187193859">"Izbriši"</string>
diff --git a/java/res/values-be-rBY/strings-action-keys.xml b/java/res/values-be-rBY/strings-action-keys.xml
deleted file mode 100644
index 91416c8..0000000
--- a/java/res/values-be-rBY/strings-action-keys.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2013, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="label_go_key" msgid="1635148082137219148">"Пачаць"</string>
-    <string name="label_next_key" msgid="362972844525672568">"Далей"</string>
-    <string name="label_previous_key" msgid="1211868118071386787">"Назад"</string>
-    <string name="label_done_key" msgid="2441578748772529288">"Гатова"</string>
-    <string name="label_send_key" msgid="2815056534433717444">"Адправіць"</string>
-    <string name="label_pause_key" msgid="181098308428035340">"Паўза"</string>
-    <string name="label_wait_key" msgid="6402152600878093134">"Чакае"</string>
-</resources>
diff --git a/java/res/values-be-rBY/bools.xml b/java/res/values-be/bools.xml
similarity index 100%
rename from java/res/values-be-rBY/bools.xml
rename to java/res/values-be/bools.xml
diff --git a/java/res/values-be/strings-action-keys.xml b/java/res/values-be/strings-action-keys.xml
new file mode 100644
index 0000000..3022d77
--- /dev/null
+++ b/java/res/values-be/strings-action-keys.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"Пачаць"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"Далей"</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"Назад"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"Гатова"</string>
+    <string name="label_send_key" msgid="482252074224462163">"Адпр."</string>
+    <!-- no translation found for label_search_key (7965186050435796642) -->
+    <skip />
+    <string name="label_pause_key" msgid="2225922926459730642">"Паўза"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"Чакаць"</string>
+</resources>
diff --git a/java/res/values-be/strings-appname.xml b/java/res/values-be/strings-appname.xml
new file mode 100644
index 0000000..2f9593b
--- /dev/null
+++ b/java/res/values-be/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Клавіятура Android (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Iнструмент праверкi правапiсу для Android (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Налады клавіятуры Android (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Налады інструмента праверкі правапісу для Android (AOSP)"</string>
+</resources>
diff --git a/java/res/values-be/strings-config-important-notice.xml b/java/res/values-be/strings-config-important-notice.xml
new file mode 100644
index 0000000..0a4c613
--- /dev/null
+++ b/java/res/values-be/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"Запам. паведамл. і даныя, якія вы ўводзіце, для паляпшэння прапаноў"</string>
+</resources>
diff --git a/java/res/values-be/strings-talkback-descriptions.xml b/java/res/values-be/strings-talkback-descriptions.xml
new file mode 100644
index 0000000..aa019ed
--- /dev/null
+++ b/java/res/values-be/strings-talkback-descriptions.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="spoken_use_headphones" msgid="4313642710742229868">"Каб праслухаць паролi, падключыце гарнiтуру."</string>
+    <string name="spoken_current_text_is" msgid="4240549866156675799">"Бягучы тэкст – %s"</string>
+    <string name="spoken_no_text_entered" msgid="1711276837961785646">"Тэкст не ўведзены"</string>
+    <string name="spoken_auto_correct" msgid="8989324692167993804">"Націснуўшы <xliff:g id="KEY_NAME">%1$s</xliff:g>, вы паправіце <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> на <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+    <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"Націснуўшы <xliff:g id="KEY_NAME">%1$s</xliff:g>, вы выканаеце аўтакарэкцыю"</string>
+    <string name="spoken_empty_suggestion" msgid="4250215619373459752">"Няма прапаноў"</string>
+    <!-- no translation found for spoken_description_unknown (5139930082759824442) -->
+    <skip />
+    <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+    <string name="spoken_description_symbols_shift" msgid="3483198879916435717">"Больш сімвалаў"</string>
+    <string name="spoken_description_shift_shifted" msgid="3122704922642232605">"Shift"</string>
+    <string name="spoken_description_symbols_shift_shifted" msgid="5179175466878186081">"Сімвалы"</string>
+    <string name="spoken_description_caps_lock" msgid="1224851412185975036">"Shift"</string>
+    <string name="spoken_description_delete" msgid="3878902286264983302">"Delete"</string>
+    <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Сімвалы"</string>
+    <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Літары"</string>
+    <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Лічбы"</string>
+    <string name="spoken_description_settings" msgid="7281251004003143204">"Налады"</string>
+    <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+    <string name="spoken_description_space" msgid="5908716896642059145">"Прабел"</string>
+    <string name="spoken_description_mic" msgid="6153138783813452464">"Галасавы ўвод"</string>
+    <string name="spoken_description_emoji" msgid="7990051553008088470">"Эмодзі"</string>
+    <string name="spoken_description_return" msgid="3183692287397645708">"Вярнуцца"</string>
+    <string name="spoken_description_search" msgid="5099937658231911288">"Пошук"</string>
+    <string name="spoken_description_dot" msgid="5644176501632325560">"Маркер спіса"</string>
+    <string name="spoken_description_language_switch" msgid="6818666779313544553">"Пераключыць мову"</string>
+    <string name="spoken_description_action_next" msgid="431761808119616962">"Далей"</string>
+    <string name="spoken_description_action_previous" msgid="2919072174697865110">"Назад"</string>
+    <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift уключаны"</string>
+    <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps Lock уключаны"</string>
+    <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Рэжым сімвалаў"</string>
+    <string name="spoken_description_mode_symbol_shift" msgid="4305607977537665389">"Рэжым з большай колькасцю сімвалаў"</string>
+    <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Рэжым лiтар"</string>
+    <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Рэжым тэлефона"</string>
+    <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Рэжым тэлефонных сімвалаў"</string>
+    <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Клавіятура схавана"</string>
+    <string name="announce_keyboard_mode" msgid="6698257917367823205">"Паказваецца клавіятура <xliff:g id="KEYBOARD_MODE">%s</xliff:g>"</string>
+    <string name="keyboard_mode_date" msgid="6597407244976713364">"дата"</string>
+    <string name="keyboard_mode_date_time" msgid="3642804408726668808">"дата i час"</string>
+    <string name="keyboard_mode_email" msgid="1239682082047693644">"электронная пошта"</string>
+    <string name="keyboard_mode_im" msgid="3812086215529493501">"абмен паведамленнямі"</string>
+    <string name="keyboard_mode_number" msgid="5395042245837996809">"лічбы"</string>
+    <string name="keyboard_mode_phone" msgid="2486230278064523665">"нумары тэлефонаў"</string>
+    <string name="keyboard_mode_text" msgid="9138789594969187494">"тэкст"</string>
+    <string name="keyboard_mode_time" msgid="8558297845514402675">"час"</string>
+    <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+    <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Апошнія"</string>
+    <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Людзі"</string>
+    <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Аб\'екты"</string>
+    <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Прырода"</string>
+    <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Месцы"</string>
+    <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Сімвалы"</string>
+    <string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"Сцяжкі"</string>
+    <string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"Смайлікі і людзі"</string>
+    <string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"Жывёлы і прырода"</string>
+    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Ежа і напоі"</string>
+    <string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"Падарожжы і месцы"</string>
+    <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"Дзейнасць"</string>
+    <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Эматыконы"</string>
+    <!-- no translation found for spoken_description_upper_case (4904835255229433916) -->
+    <skip />
+    <!-- no translation found for spoken_letter_0049 (4743162182646977944) -->
+    <skip />
+    <!-- no translation found for spoken_letter_0130 (4766619646231612274) -->
+    <skip />
+    <!-- no translation found for spoken_symbol_unknown (717298227061173706) -->
+    <skip />
+    <!-- no translation found for spoken_emoji_unknown (5981009928135394306) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_2D_21_20 (2410905667389534573) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_2D_24_20 (2481260475945560438) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_42_2D_29_20 (1063205250387128068) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_4F_20 (532695091593447238) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_2D_2A_20 (5612342617244114291) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_2D_5B_20 (2223507987759905920) -->
+    <skip />
+    <!-- no translation found for spoken_open_more_keys_keyboard (6832897688371903747) -->
+    <skip />
+    <!-- no translation found for spoken_close_more_keys_keyboard (3524914657934712026) -->
+    <skip />
+    <!-- no translation found for spoken_open_more_suggestions (4231720702882969760) -->
+    <skip />
+    <!-- no translation found for spoken_close_more_suggestions (9118455416075032839) -->
+    <skip />
+</resources>
diff --git a/java/res/values-be/strings.xml b/java/res/values-be/strings.xml
new file mode 100644
index 0000000..628f62e
--- /dev/null
+++ b/java/res/values-be/strings.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_input_options" msgid="3909945612939668554">"Параметры ўводу"</string>
+    <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Шукаць імёны кантактаў"</string>
+    <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Модуль праверкі правапісу выкарыстоўвае запісы са спісу кантактаў"</string>
+    <string name="vibrate_on_keypress" msgid="5258079494276955460">"Вібрацыя пры націску клавіш"</string>
+    <string name="sound_on_keypress" msgid="6093592297198243644">"Гук пры націску"</string>
+    <string name="popup_on_keypress" msgid="123894815723512944">"Па націску на клавішы ўсплывае акно"</string>
+    <string name="settings_screen_preferences" msgid="2696713156722014624">"Параметры"</string>
+    <string name="settings_screen_accounts" msgid="2786418968536696670">"Улік. запісы і прыватнасць"</string>
+    <string name="settings_screen_appearance" msgid="7358046399111611615">"Знешні выгляд і раскладкі"</string>
+    <string name="settings_screen_gesture" msgid="8826372746901183556">"Жэставы набор"</string>
+    <string name="settings_screen_correction" msgid="1616818407747682955">"Выпраўленне тэксту"</string>
+    <string name="settings_screen_advanced" msgid="7472408607625972994">"Дадатковыя"</string>
+    <string name="settings_screen_theme" msgid="2137262503543943871">"Тэма"</string>
+    <string name="enable_split_keyboard" msgid="4177264923999493614">"Уключыць раздзеленую клавіятуру"</string>
+    <string name="cloud_sync_title" msgid="8579271074443847055">"Сінхранізацыя Клавіятуры Google"</string>
+    <string name="cloud_sync_summary" msgid="7684887161145650857">"Сінхранізацыя ўключана"</string>
+    <string name="cloud_sync_summary_disabled" msgid="4553338970382825796">"Сінхранізацыя вашага асабістага слоўніка на розных прыладах"</string>
+    <string name="sync_now_title" msgid="3088838136743277721">"Сінхранiзаваць"</string>
+    <string name="clear_sync_data_title" msgid="8582001557037069154">"Выдаліць даныя воблака"</string>
+    <string name="clear_sync_data_summary" msgid="993477139012576584">"Вашы сінхранізаваныя даныя будуць выдалены з Google"</string>
+    <string name="clear_sync_data_confirmation" msgid="2811931135574727678">"Вашы сінхранізав. даныя будуць выдалены з воблака. Вы ўпэўненыя?"</string>
+    <string name="clear_sync_data_ok" msgid="613104067705915132">"Выдаліць"</string>
+    <string name="cloud_sync_cancel" msgid="5877481252150919037">"Скасаваць"</string>
+    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Ваш асабісты слоўнік будзе сінхранізаваны з серверамі Google, дзе для яго будуць стварацца рэзервовыя копіі. Можа збірацца статыстычная інфармацыя аб частаце ўжывання слоў. Гэта робіцца, каб дапамагчы палепшыць нашы прадукты. Збор і выкарыстанне ўсёй інфармацыі будзе адпавядаць "<a href="https://www.google.com/policies/privacy">"Палітыцы прыватнасці Googlе"</a>"."</string>
+    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Дад. улік. запіс Google для гэтай прылады, каб укл. гэту функцыю"</string>
+    <string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"Сінхранізацыя недаступная для прылад з улік. запісамі Google Apps for Business"</string>
+    <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Перакл. да інш. спос. ув."</string>
+    <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Кнопка пераключэння мовы звязана i з iншымi спосабамi ўводу"</string>
+    <string name="show_language_switch_key" msgid="5915478828318774384">"Кнопка пераключэння мовы"</string>
+    <string name="show_language_switch_key_summary" msgid="7343403647474265713">"Паказваць, калі ўключана некалькі моў ўводу"</string>
+    <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Затрым. скр. падк. клав."</string>
+    <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Няма затрымкі"</string>
+    <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Па змаўчанні"</string>
+    <string name="abbreviation_unit_milliseconds" msgid="8700286094028323363">"<xliff:g id="MILLISECONDS">%s</xliff:g> мс"</string>
+    <string name="settings_system_default" msgid="6268225104743331821">"Стандартныя сістэмныя"</string>
+    <string name="use_contacts_dict" msgid="4435317977804180815">"Падказваць імёны кантактаў"</string>
+    <string name="use_contacts_dict_summary" msgid="6599983334507879959">"Выкарыстоўваць імёны са спісу кантактаў для прапаноў і выпраўл."</string>
+    <string name="use_personalized_dicts" msgid="5167396352105467626">"Персанальныя прапановы"</string>
+    <string name="enable_metrics_logging" msgid="5506372337118822837">"Палепшыць <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="use_double_space_period" msgid="8781529969425082860">"Падвойны iнтэрвал"</string>
+    <string name="use_double_space_period_summary" msgid="6532892187247952799">"Падвойнае нацiсканне на прабел ўстаўляе iнтэрвал з наступным прабелам"</string>
+    <string name="auto_cap" msgid="1719746674854628252">"Аўтаматычна рабіць літары вялікімі"</string>
+    <string name="auto_cap_summary" msgid="7934452761022946874">"Пісаць з загалоўнай літары першае слова ў кожным сказе"</string>
+    <string name="edit_personal_dictionary" msgid="3996910038952940420">"Асабісты слоўнік"</string>
+    <string name="configure_dictionaries_title" msgid="4238652338556902049">"Дадатковыя слоўнікі"</string>
+    <string name="main_dictionary" msgid="4798763781818361168">"Асноўны слоўнік"</string>
+    <string name="prefs_show_suggestions" msgid="8026799663445531637">"Паказваць прапановы выпраўлення"</string>
+    <string name="prefs_show_suggestions_summary" msgid="1583132279498502825">"Паказваць прапанаваныя словы падчас набору тэксту"</string>
+    <string name="prefs_block_potentially_offensive_title" msgid="5078480071057408934">"Блакіраваць абразлівыя словы"</string>
+    <string name="prefs_block_potentially_offensive_summary" msgid="2371835479734991364">"Не прапануйце патэнцыяльна абразлівых слоў"</string>
+    <string name="auto_correction" msgid="7630720885194996950">"Аўтавыпраўленне"</string>
+    <string name="auto_correction_summary" msgid="5625751551134658006">"Прабелы і пунктуацыйныя знакі дазваляюць аўтаматычна выпраўляць памылкова ўведзеныя словы"</string>
+    <string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"Адключаны"</string>
+    <string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Сціплы"</string>
+    <string name="auto_correction_threshold_mode_aggressive" msgid="7319007299148899623">"Агрэсіўна"</string>
+    <string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"Вельмі агрэсіўна"</string>
+    <string name="bigram_prediction" msgid="1084449187723948550">"Падказкi для наступнага слова"</string>
+    <string name="bigram_prediction_summary" msgid="3896362682751109677">"Выкарыстоўваць папярэдняе слова, каб атрымлiваць падказкi"</string>
+    <string name="gesture_input" msgid="826951152254563827">"Уключыць набор жэстамі"</string>
+    <string name="gesture_input_summary" msgid="9180350639305731231">"Уводзьце слова, перасоўваючы палец па літарах"</string>
+    <string name="gesture_preview_trail" msgid="3802333369335722221">"Паказаць след жэста"</string>
+    <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Дынамічны плаваючы прагляд"</string>
+    <string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Праглядаць прапанаванае слова падчас жэсту"</string>
+    <string name="gesture_space_aware" msgid="2078291600664682496">"Жэст фразы"</string>
+    <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Уводзьце прабелы паміж жэстамі, праводзячы па клавішы прабелу"</string>
+    <string name="voice_input" msgid="3583258583521397548">"Ключ галасавога ўводу"</string>
+    <string name="voice_input_disabled_summary" msgid="6323489602945135165">"Не ўключана ніводнага спосабу галасавога ўводу. Праверце налады параметра \"Мовы і ўвод\"."</string>
+    <string name="configure_input_method" msgid="373356270290742459">"Налада метадаў уводу"</string>
+    <string name="language_selection_title" msgid="3666971864764478269">"Мовы"</string>
+    <string name="help_and_feedback" msgid="5328219371839879161">"Даведка і водгукі"</string>
+    <string name="select_language" msgid="5709487854987078367">"Мовы"</string>
+    <string name="hint_add_to_dictionary" msgid="2645988432867033007">"Дакраніцеся зноў, каб захаваць"</string>
+    <string name="hint_add_to_dictionary_without_word" msgid="6710206006427574423">"Дакраніцеся тут, каб захаваць"</string>
+    <string name="has_dictionary" msgid="6071847973466625007">"Слоўнік даступны"</string>
+    <string name="keyboard_layout" msgid="8451164783510487501">"Тэма клавіятуры"</string>
+    <string name="switch_accounts" msgid="3321216593719006162">"Пераключ. на iншы ўлiк. запіс"</string>
+    <string name="no_accounts_selected" msgid="2073821619103904330">"Уліковыя запісы не выбраны"</string>
+    <string name="account_selected" msgid="2846876462199625974">"Зараз выкарыстоўваецца <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="account_select_ok" msgid="9141195141763227797">"ОК"</string>
+    <string name="account_select_cancel" msgid="5181012062618504340">"Скасаваць"</string>
+    <string name="account_select_sign_out" msgid="3299651159390187933">"Выйсці"</string>
+    <string name="account_select_title" msgid="6279711684772922649">"Выберыце ўліковы запіс для выкарыстання"</string>
+    <string name="subtype_en_GB" msgid="88170601942311355">"англійская (Вялікабрытанія)"</string>
+    <string name="subtype_en_US" msgid="6160452336634534239">"англійская (ЗША)"</string>
+    <string name="subtype_es_US" msgid="5583145191430180200">"iспанская (ЗША)"</string>
+    <string name="subtype_hi_ZZ" msgid="8860448146262798623">"Хінгліш"</string>
+    <string name="subtype_sr_ZZ" msgid="9059219552986034343">"Сербская (лацініца)"</string>
+    <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"англійская (Вялікабрытанія) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"англійская (ЗША) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_with_layout_es_US" msgid="510930471167541338">"іспанская (ЗША) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_with_layout_hi_ZZ" msgid="6827402953860547044">"Хінгліш (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_with_layout_sr_ZZ" msgid="2859024772719772407">"Сербская (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (традыцыйная)"</string>
+    <string name="subtype_generic_compact" msgid="3353673321203202922">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (кампактная)"</string>
+    <string name="subtype_no_language" msgid="7137390094240139495">"Мова не выбрана (лацініца)"</string>
+    <string name="subtype_no_language_qwerty" msgid="244337630616742604">"Лацініца (QWERTY)"</string>
+    <string name="subtype_no_language_qwertz" msgid="443066912507547976">"Лацініца (QWERTZ)"</string>
+    <string name="subtype_no_language_azerty" msgid="8144348527575640087">"Лацініца (AZERTY)"</string>
+    <string name="subtype_no_language_dvorak" msgid="1564494667584718094">"Лацініца (Дворак)"</string>
+    <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Лацініца (Colemak)"</string>
+    <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Лацініца (ПК)"</string>
+    <string name="subtype_emoji" msgid="7483586578074549196">"Эмодзі"</string>
+    <string name="keyboard_theme" msgid="4909551808526178852">"Тэма клавіятуры"</string>
+    <string name="custom_input_styles_title" msgid="8429952441821251512">"Карыстальніцкія стылі ўводу"</string>
+    <string name="add_style" msgid="6163126614514489951">"Дадаць стыль"</string>
+    <string name="add" msgid="8299699805688017798">"Дадаць"</string>
+    <string name="remove" msgid="4486081658752944606">"Выдаліць"</string>
+    <string name="save" msgid="7646738597196767214">"Захаваць"</string>
+    <string name="subtype_locale" msgid="8576443440738143764">"Мова"</string>
+    <string name="keyboard_layout_set" msgid="4309233698194565609">"Раскладка"</string>
+    <string name="custom_input_style_note_message" msgid="8826731320846363423">"Карыстальніцкі метад уводу павінен быць уключаны, перш чым пачаць выкарыстоўваць яго. Жадаеце ўключыць яго зараз?"</string>
+    <string name="enable" msgid="5031294444630523247">"Уключыць"</string>
+    <string name="not_now" msgid="6172462888202790482">"Не цяпер"</string>
+    <string name="custom_input_style_already_exists" msgid="8008728952215449707">"Такі метад уводу ўжо існуе: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
+    <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Працягласць вібрацыі пры націску клавіш"</string>
+    <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Гучнасць гуку пры націску клавіш"</string>
+    <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"Затрымка доўгага націску клавішы"</string>
+    <string name="prefs_enable_emoji_alt_physical_key" msgid="5963640002335470112">"Эмодзі для фізічнай клавіятуры"</string>
+    <string name="prefs_enable_emoji_alt_physical_key_summary" msgid="5259484820941627827">"Фізічная клавіша Alt паказвае ўсе даступныя эмодзі"</string>
+    <string name="button_default" msgid="3988017840431881491">"Па змаўчанні"</string>
+    <string name="setup_welcome_title" msgid="6112821709832031715">"Вітаем у прыкладанні <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_welcome_additional_description" msgid="8150252008545768953">"з уводам жэстамі"</string>
+    <string name="setup_start_action" msgid="8936036460897347708">"Пачаць"</string>
+    <string name="setup_next_action" msgid="371821437915144603">"Далей"</string>
+    <string name="setup_steps_title" msgid="6400373034871816182">"Наладка прыкладання <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_step1_title" msgid="3147967630253462315">"Уключыць прыкладанне <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_step1_instruction" msgid="4295448056733329661">"Праверце праграму \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" у сваіх наладах параметра \"Мовы і ўвод\". Гэта дазволіць ёй працаваць на вашай прыладзе."</string>
+    <string name="setup_step1_finished_instruction" msgid="8701441895377434947">"Праграма \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" ужо ўключана ў вашых наладах параметра \"Мовы і ўвод\", так што гэты крок зроблены. Пераходзім да наступнага!"</string>
+    <string name="setup_step1_action" msgid="4366513534999901728">"Уключыць у наладах"</string>
+    <string name="setup_step2_title" msgid="6860725447906690594">"Пераключыцца на прыкладанне <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
+    <string name="setup_step2_instruction" msgid="9141481964870023336">"Выберыце \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" як актыўны метад уводу тэксту."</string>
+    <string name="setup_step2_action" msgid="1660330307159824337">"Пераключэнне метадаў уводу"</string>
+    <string name="setup_step3_title" msgid="3154757183631490281">"Усё гатова!"</string>
+    <string name="setup_step3_instruction" msgid="8025981829605426000">"Цяпер вы можаце ўводзіць ўсе свае любімыя прыкладанні з iмем <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
+    <string name="setup_step3_action" msgid="600879797256942259">"Наладка дадатковых моў"</string>
+    <string name="setup_finish_action" msgid="276559243409465389">"Гатова"</string>
+    <string name="show_setup_wizard_icon" msgid="5008028590593710830">"Паказаць значок прыкладання"</string>
+    <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"Паказаць значок прыкладання ў панэлi запуску"</string>
+    <string name="app_name" msgid="6320102637491234792">"Пастаўшчык слоўніка"</string>
+    <string name="dictionary_provider_name" msgid="3027315045397363079">"Пастаўшчык слоўніка"</string>
+    <string name="dictionary_service_name" msgid="6237472350693511448">"Слоўнік"</string>
+    <string name="download_description" msgid="6014835283119198591">"Інфармацыя абнаўлення слоўніка"</string>
+    <string name="dictionary_settings_title" msgid="8091417676045693313">"Дадатковыя слоўнікі"</string>
+    <string name="dictionary_install_over_metered_network_prompt" msgid="3587517870006332980">"Даступны слоўнік"</string>
+    <string name="dictionary_settings_summary" msgid="5305694987799824349">"Налады для слоўнікаў"</string>
+    <string name="user_dictionaries" msgid="3582332055892252845">"Карыстальніцкія слоўнікі"</string>
+    <string name="default_user_dict_pref_name" msgid="1625055720489280530">"Карыстацкі слоўнік"</string>
+    <string name="dictionary_available" msgid="4728975345815214218">"Даступны слоўнік"</string>
+    <string name="dictionary_downloading" msgid="2982650524622620983">"Спампоўваецца зараз"</string>
+    <string name="dictionary_installed" msgid="8081558343559342962">"Усталявана"</string>
+    <string name="dictionary_disabled" msgid="8950383219564621762">"Усталявана, адключана"</string>
+    <string name="cannot_connect_to_dict_service" msgid="9216933695765732398">"Праблема падключэння да слоўніка"</string>
+    <string name="no_dictionaries_available" msgid="8039920716566132611">"Слоўнікаў няма"</string>
+    <string name="check_for_updates_now" msgid="8087688440916388581">"Абнавіць"</string>
+    <string name="last_update" msgid="730467549913588780">"Апошняе абнаўленне"</string>
+    <string name="message_updating" msgid="4457761393932375219">"Праверка наяўнасці абнаўленняў"</string>
+    <string name="message_loading" msgid="5638680861387748936">"Загрузка…"</string>
+    <string name="main_dict_description" msgid="3072821352793492143">"Асноўны слоўнік"</string>
+    <string name="cancel" msgid="6830980399865683324">"Скасаваць"</string>
+    <string name="go_to_settings" msgid="3876892339342569259">"Налады"</string>
+    <string name="install_dict" msgid="180852772562189365">"Усталяваць"</string>
+    <string name="cancel_download_dict" msgid="7843340278507019303">"Скасаваць"</string>
+    <string name="delete_dict" msgid="756853268088330054">"Выдаліць"</string>
+    <string name="should_download_over_metered_prompt" msgid="6737084685073734292">"Для выбранай мовы на вашай мабільнай прыладзе даступны слоўнік.&lt;br/&gt; Мы рэкамендуем &lt;b&gt;спампаваць&lt;/b&gt; слоўнік для наступнай мовы: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>, каб палегчыць увод.&lt;br/&gt; &lt;br/&gt; Спампоўка па 3G можа заняць хвіліну ці дзве. Калі ў вас няма &lt;b&gt;безлімітнага тарыфнага плана&lt;/b&gt;.&lt;br/&gt;, можа быць спагнана аплата. Калі вы не ўпэўненыя, які ў вас тарыфны план, мы рэкамендуем знайсці падключэнне па Wi-Fi, каб пачаць аўтаматычную спампоўку.&lt;br/&gt; &lt;br/&gt; Парада: вы можаце спампоўваць і выдаляць слоўнікі, перайшоўшы ў параметр \"&lt;b&gt;Мовы і ўвод&lt;/b&gt;\" у меню &lt;b&gt;Налады&lt;/b&gt; вашай мабільнай прылады."</string>
+    <string name="download_over_metered" msgid="1643065851159409546">"Спампаваць зараз (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>МБ)"</string>
+    <string name="do_not_download_over_metered" msgid="2176209579313941583">"Спампаваць праз Wi-Fi"</string>
+    <string name="dict_available_notification_title" msgid="4583842811218581658">"Слоўнік даступны для наступнай мовы: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
+    <string name="dict_available_notification_description" msgid="1075194169443163487">"Нацiснiце, каб прагледзець i спампаваць"</string>
+    <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Спампоўка: прапановы для наступнай мовы: <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> хутка будуць гатовыя."</string>
+    <string name="version_text" msgid="2715354215568469385">"Версія <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
+    <string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Дадаць"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Дадаць у слоўнік"</string>
+    <string name="user_dict_settings_add_screen_title" msgid="5818914331629278758">"Выраз"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="5671682004887093112">"Дадатковыя параметры"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2716586567241724126">"Асн. параметры"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="4703129507388332950">"OК"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="6665558053408962865">"Слова:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="3094731590655523777">"Гарачая клавіша:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="4738643440987277705">"Мова:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="4902434148985906707">"Увядзіце слова"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="2265453012555060178">"Неабавязковая гарачая клавіша"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="3765774633869590352">"Рэдагаваць слова"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="6812255903472456302">"Рэдагаваць"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="8142932447689461181">"Выдаліць"</string>
+    <string name="user_dict_settings_empty_text" msgid="6889278304342592383">"У карыстальніцкім слоўніку няма ніводнага слова. Каб дадаць слова, дакраніце да кнопкі \"Дадаць\" (+)."</string>
+    <string name="user_dict_settings_all_languages" msgid="8276126583216298886">"Для ўсіх моў"</string>
+    <string name="user_dict_settings_more_languages" msgid="7131268499685180461">"Іншыя мовы..."</string>
+    <string name="user_dict_settings_delete" msgid="110413335187193859">"Выдаліць"</string>
+    <string name="user_dict_fast_scroll_alphabet" msgid="5431919401558285473">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+</resources>
diff --git a/java/res/values-bn-rBD/strings-action-keys.xml b/java/res/values-bn/strings-action-keys.xml
similarity index 100%
rename from java/res/values-bn-rBD/strings-action-keys.xml
rename to java/res/values-bn/strings-action-keys.xml
diff --git a/java/res/values-bn-rBD/strings-appname.xml b/java/res/values-bn/strings-appname.xml
similarity index 100%
rename from java/res/values-bn-rBD/strings-appname.xml
rename to java/res/values-bn/strings-appname.xml
diff --git a/java/res/values-bn-rBD/strings-config-important-notice.xml b/java/res/values-bn/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-bn-rBD/strings-config-important-notice.xml
rename to java/res/values-bn/strings-config-important-notice.xml
diff --git a/java/res/values-bn-rBD/strings-emoji-descriptions.xml b/java/res/values-bn/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-bn-rBD/strings-emoji-descriptions.xml
rename to java/res/values-bn/strings-emoji-descriptions.xml
diff --git a/java/res/values-bn-rBD/strings-letter-descriptions.xml b/java/res/values-bn/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-bn-rBD/strings-letter-descriptions.xml
rename to java/res/values-bn/strings-letter-descriptions.xml
diff --git a/java/res/values-bn-rBD/strings-talkback-descriptions.xml b/java/res/values-bn/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-bn-rBD/strings-talkback-descriptions.xml
rename to java/res/values-bn/strings-talkback-descriptions.xml
diff --git a/java/res/values-bn-rBD/strings.xml b/java/res/values-bn/strings.xml
similarity index 100%
rename from java/res/values-bn-rBD/strings.xml
rename to java/res/values-bn/strings.xml
diff --git a/java/res/values-bs/strings-action-keys.xml b/java/res/values-bs/strings-action-keys.xml
new file mode 100644
index 0000000..df3c80a
--- /dev/null
+++ b/java/res/values-bs/strings-action-keys.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="label_go_key" msgid="4033615332628671065">"Kreni"</string>
+    <string name="label_next_key" msgid="5586407279258592635">"Naprijed"</string>
+    <string name="label_previous_key" msgid="1421141755779895275">"Nazad"</string>
+    <string name="label_done_key" msgid="7564866296502630852">"Gotovo"</string>
+    <string name="label_send_key" msgid="482252074224462163">"Pošalji"</string>
+    <!-- no translation found for label_search_key (7965186050435796642) -->
+    <skip />
+    <string name="label_pause_key" msgid="2225922926459730642">"Pauza"</string>
+    <string name="label_wait_key" msgid="5891247853595466039">"Sačekaj"</string>
+</resources>
diff --git a/java/res/values-bs/strings-appname.xml b/java/res/values-bs/strings-appname.xml
new file mode 100644
index 0000000..6a345b5
--- /dev/null
+++ b/java/res/values-bs/strings-appname.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_name" msgid="5940510615957428904">"Android tastatura (AOSP)"</string>
+    <string name="spell_checker_service_name" msgid="1254221805440242662">"Android provjera pravopisa (AOSP)"</string>
+    <string name="english_ime_settings" msgid="5760361067176802794">"Android postavke tastature (AOSP)"</string>
+    <string name="android_spell_checker_settings" msgid="6123949487832861885">"Postavke za Android provjeru pravopisa (AOSP)"</string>
+</resources>
diff --git a/java/res/values-bs/strings-config-important-notice.xml b/java/res/values-bs/strings-config-important-notice.xml
new file mode 100644
index 0000000..b5043c9
--- /dev/null
+++ b/java/res/values-bs/strings-config-important-notice.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="use_personalized_dicts_summary" msgid="590432261305469627">"Uči iz komunikacija i otkucanih podataka radi boljih prijedloga"</string>
+</resources>
diff --git a/java/res/values-bs/strings-talkback-descriptions.xml b/java/res/values-bs/strings-talkback-descriptions.xml
new file mode 100644
index 0000000..fdaaf6d
--- /dev/null
+++ b/java/res/values-bs/strings-talkback-descriptions.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="spoken_use_headphones" msgid="4313642710742229868">"Plug in a headset to hear password keys spoken aloud."</string>
+    <string name="spoken_current_text_is" msgid="4240549866156675799">"Current text is %s"</string>
+    <string name="spoken_no_text_entered" msgid="1711276837961785646">"No text entered"</string>
+    <string name="spoken_auto_correct" msgid="8989324692167993804">"<xliff:g id="KEY_NAME">%1$s</xliff:g> corrects <xliff:g id="ORIGINAL_WORD">%2$s</xliff:g> to <xliff:g id="CORRECTED_WORD">%3$s</xliff:g>"</string>
+    <string name="spoken_auto_correct_obscured" msgid="7769449372355268412">"<xliff:g id="KEY_NAME">%1$s</xliff:g> performs auto-correction"</string>
+    <string name="spoken_empty_suggestion" msgid="4250215619373459752">"No suggestion"</string>
+    <!-- no translation found for spoken_description_unknown (5139930082759824442) -->
+    <skip />
+    <string name="spoken_description_shift" msgid="7209798151676638728">"Shift"</string>
+    <string name="spoken_description_symbols_shift" msgid="3483198879916435717">"More symbols"</string>
+    <string name="spoken_description_shift_shifted" msgid="3122704922642232605">"Shift"</string>
+    <string name="spoken_description_symbols_shift_shifted" msgid="5179175466878186081">"Symbols"</string>
+    <string name="spoken_description_caps_lock" msgid="1224851412185975036">"Shift"</string>
+    <string name="spoken_description_delete" msgid="3878902286264983302">"Delete"</string>
+    <string name="spoken_description_to_symbol" msgid="8244903740201126590">"Symbols"</string>
+    <string name="spoken_description_to_alpha" msgid="4081215210530031950">"Letters"</string>
+    <string name="spoken_description_to_numeric" msgid="4560261331530795682">"Numbers"</string>
+    <string name="spoken_description_settings" msgid="7281251004003143204">"Settings"</string>
+    <string name="spoken_description_tab" msgid="8210782459446866716">"Tab"</string>
+    <string name="spoken_description_space" msgid="5908716896642059145">"Space"</string>
+    <string name="spoken_description_mic" msgid="6153138783813452464">"Voice input"</string>
+    <string name="spoken_description_emoji" msgid="7990051553008088470">"Emoji"</string>
+    <string name="spoken_description_return" msgid="3183692287397645708">"Return"</string>
+    <string name="spoken_description_search" msgid="5099937658231911288">"Search"</string>
+    <string name="spoken_description_dot" msgid="5644176501632325560">"Dot"</string>
+    <string name="spoken_description_language_switch" msgid="6818666779313544553">"Switch language"</string>
+    <string name="spoken_description_action_next" msgid="431761808119616962">"Naprijed"</string>
+    <string name="spoken_description_action_previous" msgid="2919072174697865110">"Previous"</string>
+    <string name="spoken_description_shiftmode_on" msgid="5107180516341258979">"Shift enabled"</string>
+    <string name="spoken_description_shiftmode_locked" msgid="7307477738053606881">"Caps lock enabled"</string>
+    <string name="spoken_description_mode_symbol" msgid="111186851131446691">"Symbols mode"</string>
+    <string name="spoken_description_mode_symbol_shift" msgid="4305607977537665389">"More symbols mode"</string>
+    <string name="spoken_description_mode_alpha" msgid="4676004119618778911">"Letters mode"</string>
+    <string name="spoken_description_mode_phone" msgid="2061220553756692903">"Phone mode"</string>
+    <string name="spoken_description_mode_phone_shift" msgid="7879963803547701090">"Phone symbols mode"</string>
+    <string name="announce_keyboard_hidden" msgid="2313574218950517779">"Keyboard hidden"</string>
+    <string name="announce_keyboard_mode" msgid="6698257917367823205">"Showing <xliff:g id="KEYBOARD_MODE">%s</xliff:g> keyboard"</string>
+    <string name="keyboard_mode_date" msgid="6597407244976713364">"Datum"</string>
+    <string name="keyboard_mode_date_time" msgid="3642804408726668808">"datum i vrijeme"</string>
+    <string name="keyboard_mode_email" msgid="1239682082047693644">"e-pošta"</string>
+    <string name="keyboard_mode_im" msgid="3812086215529493501">"poruke"</string>
+    <string name="keyboard_mode_number" msgid="5395042245837996809">"broj"</string>
+    <string name="keyboard_mode_phone" msgid="2486230278064523665">"telefon"</string>
+    <string name="keyboard_mode_text" msgid="9138789594969187494">"Pošalji tekstualnu poruku"</string>
+    <string name="keyboard_mode_time" msgid="8558297845514402675">"vrijeme"</string>
+    <string name="keyboard_mode_url" msgid="8072011652949962550">"URL"</string>
+    <string name="spoken_descrption_emoji_category_recents" msgid="4185344945205590692">"Nedavni"</string>
+    <string name="spoken_descrption_emoji_category_people" msgid="8414196269847492817">"Ljudi"</string>
+    <string name="spoken_descrption_emoji_category_objects" msgid="6116297906606195278">"Predmeti"</string>
+    <string name="spoken_descrption_emoji_category_nature" msgid="5018340512472354640">"Priroda"</string>
+    <string name="spoken_descrption_emoji_category_places" msgid="1163315840948545317">"Mjesta"</string>
+    <string name="spoken_descrption_emoji_category_symbols" msgid="474680659024880601">"Simboli"</string>
+    <string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"Zastave"</string>
+    <string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"Smješko i ljudi"</string>
+    <string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"Životinje i priroda"</string>
+    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Hrana i piće"</string>
+    <string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"Putovanje i mjesta"</string>
+    <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"Aktivnost"</string>
+    <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emotikoni"</string>
+    <!-- no translation found for spoken_description_upper_case (4904835255229433916) -->
+    <skip />
+    <!-- no translation found for spoken_letter_0049 (4743162182646977944) -->
+    <skip />
+    <!-- no translation found for spoken_letter_0130 (4766619646231612274) -->
+    <skip />
+    <!-- no translation found for spoken_symbol_unknown (717298227061173706) -->
+    <skip />
+    <!-- no translation found for spoken_emoji_unknown (5981009928135394306) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_2D_21_20 (2410905667389534573) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_2D_24_20 (2481260475945560438) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_42_2D_29_20 (1063205250387128068) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_4F_20 (532695091593447238) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_2D_2A_20 (5612342617244114291) -->
+    <skip />
+    <!-- no translation found for spoken_emoticon_3A_2D_5B_20 (2223507987759905920) -->
+    <skip />
+    <!-- no translation found for spoken_open_more_keys_keyboard (6832897688371903747) -->
+    <skip />
+    <!-- no translation found for spoken_close_more_keys_keyboard (3524914657934712026) -->
+    <skip />
+    <!-- no translation found for spoken_open_more_suggestions (4231720702882969760) -->
+    <skip />
+    <!-- no translation found for spoken_close_more_suggestions (9118455416075032839) -->
+    <skip />
+</resources>
diff --git a/java/res/values-bs/strings.xml b/java/res/values-bs/strings.xml
new file mode 100644
index 0000000..79f676a
--- /dev/null
+++ b/java/res/values-bs/strings.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="english_ime_input_options" msgid="3909945612939668554">"Mogućnosti unosa"</string>
+    <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Pogledajte u imena kontakata"</string>
+    <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Alat za provjeru pravopisa koristi upise iz vaše liste kontakata"</string>
+    <string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibracija pri pritisku na tipku"</string>
+    <string name="sound_on_keypress" msgid="6093592297198243644">"Zvuk pri pritisku tipke"</string>
+    <string name="popup_on_keypress" msgid="123894815723512944">"Iskačuči prozor pri pritisku na tipku"</string>
+    <string name="settings_screen_preferences" msgid="2696713156722014624">"Karakteristike"</string>
+    <string name="settings_screen_accounts" msgid="2786418968536696670">"Računi i privatnost"</string>
+    <string name="settings_screen_appearance" msgid="7358046399111611615">"Izgled i rasporedi tipki"</string>
+    <string name="settings_screen_gesture" msgid="8826372746901183556">"Kucanje pokretima"</string>
+    <string name="settings_screen_correction" msgid="1616818407747682955">"Ispravka teksta"</string>
+    <string name="settings_screen_advanced" msgid="7472408607625972994">"Napredno"</string>
+    <string name="settings_screen_theme" msgid="2137262503543943871">"Tema"</string>
+    <string name="enable_split_keyboard" msgid="4177264923999493614">"Omogući podijeljenu tastaturu"</string>
+    <string name="cloud_sync_title" msgid="8579271074443847055">"Sinhronizacija Google tastature"</string>
+    <string name="cloud_sync_summary" msgid="7684887161145650857">"Sinhronizacija je uključena"</string>
+    <string name="cloud_sync_summary_disabled" msgid="4553338970382825796">"Sinhronizirajte vlastiti rječnik na svim uređajima"</string>
+    <string name="sync_now_title" msgid="3088838136743277721">"Sinhroniziraj sada"</string>
+    <string name="clear_sync_data_title" msgid="8582001557037069154">"Obriši podatke iz oblaka"</string>
+    <string name="clear_sync_data_summary" msgid="993477139012576584">"Briše vaše sinhronizirane podatke s Googlea"</string>
+    <string name="clear_sync_data_confirmation" msgid="2811931135574727678">"Vaši snihronizirani podaci bit će izbrisani iz oblaka. Sigurno?"</string>
+    <string name="clear_sync_data_ok" msgid="613104067705915132">"Izbriši"</string>
+    <string name="cloud_sync_cancel" msgid="5877481252150919037">"Otkaži"</string>
+    <string name="cloud_sync_opt_in_text" msgid="9176039655776298248">"Vaš lični rječnik bit će sinhroniziran i sigurno pohranjen na Google servere. Moguće je da će se prikupljati statističke informacije o učestalosti riječi, u cilju poboljšanja naših proizvoda. Prikupljanje i upotreba svih informacija bit će u skladu s "<a href="https://www.google.com/policies/privacy">"Googleovim pravilima o privatnosti"</a>"."</string>
+    <string name="add_account_to_enable_sync" msgid="7836932571852055265">"Dodajte Google račun u ovaj uređaj da biste omogućili tu funkciju"</string>
+    <string name="cloud_sync_summary_disabled_work_profile" msgid="1381770407303129164">"Sinhronizacija nije moguća na uređajima s Google aplikacijama za poslovne račune"</string>
+    <string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Prebacite na druge načine unosa"</string>
+    <string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Tipka za prebacivanje između jezika obuhvata i druge načine unosa"</string>
+    <string name="show_language_switch_key" msgid="5915478828318774384">"Tipka za zamjenu jezika"</string>
+    <string name="show_language_switch_key_summary" msgid="7343403647474265713">"Prikaži kada su omogućeni jezici za višestruki unos"</string>
+    <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Odgoda odbijanja tipke"</string>
+    <string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Bez odgode"</string>
+    <string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Zadano"</string>
+    <string name="abbreviation_unit_milliseconds" msgid="8700286094028323363">"<xliff:g id="MILLISECONDS">%s</xliff:g>ms"</string>
+    <string name="settings_system_default" msgid="6268225104743331821">"Sistemski zadano"</string>
+    <string name="use_contacts_dict" msgid="4435317977804180815">"Predloži imena kontakata"</string>
+    <string name="use_contacts_dict_summary" msgid="6599983334507879959">"Za prijedloge i ispravke koristi imena iz Kontakata"</string>
+    <string name="use_personalized_dicts" msgid="5167396352105467626">"Prilagođeni prijedlozi"</string>
+    <string name="enable_metrics_logging" msgid="5506372337118822837">"Poboljšaj <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="use_double_space_period" msgid="8781529969425082860">"Dvostruki razmak daje tačku"</string>
+    <string name="use_double_space_period_summary" msgid="6532892187247952799">"Dvostruki dodir na razmaknicu stavlja tačku i razmak"</string>
+    <string name="auto_cap" msgid="1719746674854628252">"Automatsko veliko slovo"</string>
+    <string name="auto_cap_summary" msgid="7934452761022946874">"Piši velikim slovom prvu riječ svake rečenice."</string>
+    <string name="edit_personal_dictionary" msgid="3996910038952940420">"Lični rječnik"</string>
+    <string name="configure_dictionaries_title" msgid="4238652338556902049">"Dodatni rječnici"</string>
+    <string name="main_dictionary" msgid="4798763781818361168">"Glavni rječnik"</string>
+    <string name="prefs_show_suggestions" msgid="8026799663445531637">"Prikaži prijedloge za ispravak"</string>
+    <string name="prefs_show_suggestions_summary" msgid="1583132279498502825">"Prikaži predložene riječi prilikom kucanja"</string>
+    <string name="prefs_block_potentially_offensive_title" msgid="5078480071057408934">"Blokiraj uvrjedljive riječi"</string>
+    <string name="prefs_block_potentially_offensive_summary" msgid="2371835479734991364">"Ne predlaži potencijalno uvrjedljive riječi"</string>
+    <string name="auto_correction" msgid="7630720885194996950">"Automatsko ispravljanje"</string>
+    <string name="auto_correction_summary" msgid="5625751551134658006">"Automatsko ispravljanje grešaka nakon razmaka i interpunkcije"</string>
+    <string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"Isključeno"</string>
+    <string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Srednje"</string>
+    <string name="auto_correction_threshold_mode_aggressive" msgid="7319007299148899623">"Napadno"</string>
+    <string name="auto_correction_threshold_mode_very_aggressive" msgid="1853309024129480416">"Veoma napadno"</string>
+    <string name="bigram_prediction" msgid="1084449187723948550">"Prijedlozi za sljedeću riječ"</string>
+    <string name="bigram_prediction_summary" msgid="3896362682751109677">"Prilikom odlučivanja koristi prethodno"</string>
+    <string name="gesture_input" msgid="826951152254563827">"Omogućite kucanje pokretima"</string>
+    <string name="gesture_input_summary" msgid="9180350639305731231">"Unesite riječ klizanjem prstom preko slova"</string>
+    <string name="gesture_preview_trail" msgid="3802333369335722221">"Prikaži trag pokreta"</string>
+    <string name="gesture_floating_preview_text" msgid="4443240334739381053">"Pregled dinamičkim lebdenjem"</string>
+    <string name="gesture_floating_preview_text_summary" msgid="4472696213996203533">"Pogledajte predloženu riječ prilikom pravljenja pokreta."</string>
+    <string name="gesture_space_aware" msgid="2078291600664682496">"Pokret za fraze"</string>
+    <string name="gesture_space_aware_summary" msgid="4371385818348528538">"Klizanjem na tipku za razmak umetni razmake tokom pokreta"</string>
+    <string name="voice_input" msgid="3583258583521397548">"Tipka za govorni unos"</string>
+    <string name="voice_input_disabled_summary" msgid="6323489602945135165">"Nisu omogućeni načini za glasovni unos. Provjerite postavke sekcije Jezici i unos."</string>
+    <string name="configure_input_method" msgid="373356270290742459">"Konfiguriraj načine unosa"</string>
+    <string name="language_selection_title" msgid="3666971864764478269">"Jezici"</string>
+    <string name="help_and_feedback" msgid="5328219371839879161">"Pomoć i povratne informacije"</string>
+    <string name="select_language" msgid="5709487854987078367">"Jezici"</string>
+    <string name="hint_add_to_dictionary" msgid="2645988432867033007">"Dodirnite ponovo da biste sačuvali"</string>
+    <string name="hint_add_to_dictionary_without_word" msgid="6710206006427574423">"Dodirnite ovdje da biste sačuvali"</string>
+    <string name="has_dictionary" msgid="6071847973466625007">"Rječnik je dostupan"</string>
+    <string name="keyboard_layout" msgid="8451164783510487501">"Tema tastature"</string>
+    <string name="switch_accounts" msgid="3321216593719006162">"Prebacite se na račun"</string>
+    <string name="no_accounts_selected" msgid="2073821619103904330">"Nije odabran račun"</string>
+    <string name="account_selected" msgid="2846876462199625974">"Trenutno koristite račun <xliff:g id="EMAIL_ADDRESS">%1$s</xliff:g>"</string>
+    <string name="account_select_ok" msgid="9141195141763227797">"Uredu"</string>
+    <string name="account_select_cancel" msgid="5181012062618504340">"Otkaži"</string>
+    <string name="account_select_sign_out" msgid="3299651159390187933">"Odjavi me"</string>
+    <string name="account_select_title" msgid="6279711684772922649">"Odaberite račun koji ćete koristiti"</string>
+    <string name="subtype_en_GB" msgid="88170601942311355">"engleski (UK)"</string>
+    <string name="subtype_en_US" msgid="6160452336634534239">"engleski (SAD)"</string>
+    <string name="subtype_es_US" msgid="5583145191430180200">"španski (SAD)"</string>
+    <string name="subtype_hi_ZZ" msgid="8860448146262798623">"Hindu engleski"</string>
+    <string name="subtype_sr_ZZ" msgid="9059219552986034343">"Srpski (latinica)"</string>
+    <string name="subtype_with_layout_en_GB" msgid="1931018968641592304">"Engleski (UK) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_with_layout_en_US" msgid="8809311287529805422">"Engleski (SAD) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_with_layout_es_US" msgid="510930471167541338">"Španski (SAD) (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_with_layout_hi_ZZ" msgid="6827402953860547044">"Hindu engleski (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_with_layout_sr_ZZ" msgid="2859024772719772407">"Srpski (<xliff:g id="KEYBOARD_LAYOUT">%s</xliff:g>)"</string>
+    <string name="subtype_generic_traditional" msgid="8584594350973800586">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (tradicionalan)"</string>
+    <string name="subtype_generic_compact" msgid="3353673321203202922">"<xliff:g id="LANGUAGE_NAME">%s</xliff:g> (kompaktan)"</string>
+    <string name="subtype_no_language" msgid="7137390094240139495">"Nema jezika (abeceda)"</string>
+    <string name="subtype_no_language_qwerty" msgid="244337630616742604">"Abeceda (QWERTY)"</string>
+    <string name="subtype_no_language_qwertz" msgid="443066912507547976">"Abeceda (QWERTZ)"</string>
+    <string name="subtype_no_language_azerty" msgid="8144348527575640087">"Abeceda (AZERTY)"</string>
+    <string name="subtype_no_language_dvorak" msgid="1564494667584718094">"Abeceda (Dvorak)"</string>
+    <string name="subtype_no_language_colemak" msgid="5837418400010302623">"Abeceda (Colemak)"</string>
+    <string name="subtype_no_language_pcqwerty" msgid="5354918232046200018">"Abeceda (PC)"</string>
+    <string name="subtype_emoji" msgid="7483586578074549196">"Emoji"</string>
+    <string name="keyboard_theme" msgid="4909551808526178852">"Tema tastature"</string>
+    <string name="custom_input_styles_title" msgid="8429952441821251512">"Prilagođeni stilovi unosa"</string>
+    <string name="add_style" msgid="6163126614514489951">"Dodaj stil"</string>
+    <string name="add" msgid="8299699805688017798">"Dodaj"</string>
+    <string name="remove" msgid="4486081658752944606">"Ukloni"</string>
+    <string name="save" msgid="7646738597196767214">"Sačuvaj"</string>
+    <string name="subtype_locale" msgid="8576443440738143764">"Jezik"</string>
+    <string name="keyboard_layout_set" msgid="4309233698194565609">"Raspored tipki"</string>
+    <string name="custom_input_style_note_message" msgid="8826731320846363423">"Prije nego što počnete koristiti prilagođeni stil unosa, trebate ga omogućiti. Želite li ga sada omogućiti?"</string>
+    <string name="enable" msgid="5031294444630523247">"Omogući"</string>
+    <string name="not_now" msgid="6172462888202790482">"Ne sada"</string>
+    <string name="custom_input_style_already_exists" msgid="8008728952215449707">"Već postoji isti stil unosa: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
+    <string name="prefs_keypress_vibration_duration_settings" msgid="7918341459947439226">"Trajanje vibracije pritisnute tipke"</string>
+    <string name="prefs_keypress_sound_volume_settings" msgid="6027007337036891623">"Jačina zvuka pritisnute tipke"</string>
+    <string name="prefs_key_longpress_timeout_settings" msgid="6102240298932897873">"Odgoda dugog pritiska tipke"</string>
+    <string name="prefs_enable_emoji_alt_physical_key" msgid="5963640002335470112">"Emoji za fizičku tastaturu"</string>
+    <string name="prefs_enable_emoji_alt_physical_key_summary" msgid="5259484820941627827">"Tipka Alt na fizičkoj tastaturi aktivira paletu za emoji"</string>
+    <string name="button_default" msgid="3988017840431881491">"Zadano"</string>
+    <string name="setup_welcome_title" msgid="6112821709832031715">"Dobrodošli u aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_welcome_additional_description" msgid="8150252008545768953">"s kucanjem pokretima"</string>
+    <string name="setup_start_action" msgid="8936036460897347708">"Započnite"</string>
+    <string name="setup_next_action" msgid="371821437915144603">"Sljedeći korak"</string>
+    <string name="setup_steps_title" msgid="6400373034871816182">"Postavljanje aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_step1_title" msgid="3147967630253462315">"Omogući aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_step1_instruction" msgid="4295448056733329661">"Označite aplikaciju \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" u postavkama sekcije Jezici i unos. Na taj način ćete joj dozvoliti da se pokrene na vašem uređaju."</string>
+    <string name="setup_step1_finished_instruction" msgid="8701441895377434947">"Aplikacija <xliff:g id="APPLICATION_NAME">%s</xliff:g> je već omogućena u vašim postavkama sekcije Jezici i unos, tako da je ovaj korak završen. Pređite na sljedeći!"</string>
+    <string name="setup_step1_action" msgid="4366513534999901728">"Omogući u Postavkama"</string>
+    <string name="setup_step2_title" msgid="6860725447906690594">"Prebacite se na aplikaciju <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+    <string name="setup_step2_instruction" msgid="9141481964870023336">"Zatim odaberite aplikaciju \"<xliff:g id="APPLICATION_NAME">%s</xliff:g>\" kao vaš aktivni način unosa teksta."</string>
+    <string name="setup_step2_action" msgid="1660330307159824337">"Zamijeni načine unosa"</string>
+    <string name="setup_step3_title" msgid="3154757183631490281">"Odlično, sve je spremno!"</string>
+    <string name="setup_step3_instruction" msgid="8025981829605426000">"Sada možete kucati u svim omiljenim aplikacijama pomoću aplikacije <xliff:g id="APPLICATION_NAME">%s</xliff:g>."</string>
+    <string name="setup_step3_action" msgid="600879797256942259">"Konfiguriraj dodatne jezike"</string>
+    <string name="setup_finish_action" msgid="276559243409465389">"Završeno"</string>
+    <string name="show_setup_wizard_icon" msgid="5008028590593710830">"Prikaži ikonu aplikacije"</string>
+    <string name="show_setup_wizard_icon_summary" msgid="4119998322536880213">"Prikaži ikonu aplikacije na pokretaču"</string>
+    <string name="app_name" msgid="6320102637491234792">"Pružalac usluge rječnika"</string>
+    <string name="dictionary_provider_name" msgid="3027315045397363079">"Pružalac usluge rječnika"</string>
+    <string name="dictionary_service_name" msgid="6237472350693511448">"Usluga rječnika"</string>
+    <string name="download_description" msgid="6014835283119198591">"Informacije o ažuriranju rječnika"</string>
+    <string name="dictionary_settings_title" msgid="8091417676045693313">"Dodatni rječnici"</string>
+    <string name="dictionary_install_over_metered_network_prompt" msgid="3587517870006332980">"Rječnik je dostupan"</string>
+    <string name="dictionary_settings_summary" msgid="5305694987799824349">"Postavke za rječnik"</string>
+    <string name="user_dictionaries" msgid="3582332055892252845">"Korisnički rječnici"</string>
+    <string name="default_user_dict_pref_name" msgid="1625055720489280530">"Korisnikov rječnik"</string>
+    <string name="dictionary_available" msgid="4728975345815214218">"Rječnik je dostupan"</string>
+    <string name="dictionary_downloading" msgid="2982650524622620983">"Trenutno se preuzima"</string>
+    <string name="dictionary_installed" msgid="8081558343559342962">"Instalirano"</string>
+    <string name="dictionary_disabled" msgid="8950383219564621762">"Instaliran, onemogućen"</string>
+    <string name="cannot_connect_to_dict_service" msgid="9216933695765732398">"Problem prilikom povezivanja na uslugu rječnika"</string>
+    <string name="no_dictionaries_available" msgid="8039920716566132611">"Nema dostupnih rječnika"</string>
+    <string name="check_for_updates_now" msgid="8087688440916388581">"Osvježi"</string>
+    <string name="last_update" msgid="730467549913588780">"Posljednji put ažurirano"</string>
+    <string name="message_updating" msgid="4457761393932375219">"Provjera ažuriranja"</string>
+    <string name="message_loading" msgid="5638680861387748936">"Učitavanje..."</string>
+    <string name="main_dict_description" msgid="3072821352793492143">"Glavni rječnik"</string>
+    <string name="cancel" msgid="6830980399865683324">"Otkaži"</string>
+    <string name="go_to_settings" msgid="3876892339342569259">"Postavke"</string>
+    <string name="install_dict" msgid="180852772562189365">"Instaliraj"</string>
+    <string name="cancel_download_dict" msgid="7843340278507019303">"Otkaži"</string>
+    <string name="delete_dict" msgid="756853268088330054">"Izbriši"</string>
+    <string name="should_download_over_metered_prompt" msgid="6737084685073734292">"Za odabrani jezik na vašem uređaju postoji dostupan rječnik.&lt;br/&gt; Predlažemo da &lt;b&gt;preuzmete&lt;/b&gt; rječnik za <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> kako biste poboljšali svoje iskustvo tipkanja.&lt;br/&gt; &lt;br/&gt; Preuzimanje putem 3G mreže može potrajati minut-dva. Mogući su troškovi ukoliko nemate &lt;b&gt;paket s neograničenim prijenosom podataka&lt;/b&gt;.&lt;br/&gt; Ako ne znate koji paket za prijenos podataka imate, preporučujemo da pronađete Wi-Fi mrežu kako biste počeli automatsko preuzimanje.&lt;br/&gt; &lt;br/&gt; Savjet: Rječnike možete preuzimati i uklanjati ako odete na &lt;b&gt;Jezici i unos&lt;/b&gt; u meniju &lt;b&gt;Postavke&lt;/b&gt; na vašem mobilnom uređaju."</string>
+    <string name="download_over_metered" msgid="1643065851159409546">"Preuzmi odmah (<xliff:g id="SIZE_IN_MEGABYTES">%1$.1f</xliff:g>MB)"</string>
+    <string name="do_not_download_over_metered" msgid="2176209579313941583">"Preuzmi putem Wi-Fi mreže"</string>
+    <string name="dict_available_notification_title" msgid="4583842811218581658">"Rječnik je dostupan za <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g>"</string>
+    <string name="dict_available_notification_description" msgid="1075194169443163487">"Pritisnite za pregled i preuzimanje"</string>
+    <string name="toast_downloading_suggestions" msgid="6128155879830851739">"Preuzimanje: prijedlozi za <xliff:g id="LANGUAGE_NAME">%1$s</xliff:g> bit će uskoro spremni."</string>
+    <string name="version_text" msgid="2715354215568469385">"Verzija <xliff:g id="VERSION_NUMBER">%1$s</xliff:g>"</string>
+    <string name="user_dict_settings_add_menu_title" msgid="1254195365689387076">"Dodaj"</string>
+    <string name="user_dict_settings_add_dialog_title" msgid="4096700390211748168">"Dodaj u rječnik"</string>
+    <string name="user_dict_settings_add_screen_title" msgid="5818914331629278758">"Fraza"</string>
+    <string name="user_dict_settings_add_dialog_more_options" msgid="5671682004887093112">"Više opcija"</string>
+    <string name="user_dict_settings_add_dialog_less_options" msgid="2716586567241724126">"Manje opcija"</string>
+    <string name="user_dict_settings_add_dialog_confirm" msgid="4703129507388332950">"Uredu"</string>
+    <string name="user_dict_settings_add_word_option_name" msgid="6665558053408962865">"Riječ:"</string>
+    <string name="user_dict_settings_add_shortcut_option_name" msgid="3094731590655523777">"Prečica:"</string>
+    <string name="user_dict_settings_add_locale_option_name" msgid="4738643440987277705">"Jezik:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="4902434148985906707">"Unesite riječ"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="2265453012555060178">"Opcionalna prečica"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="3765774633869590352">"Izmijeni riječ"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="6812255903472456302">"Uredi"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="8142932447689461181">"Izbriši"</string>
+    <string name="user_dict_settings_empty_text" msgid="6889278304342592383">"Nemate nijednu riječ u korisničkom rječniku. Za dodavanje riječi, dodirnite dugme Dodaj (+)"</string>
+    <string name="user_dict_settings_all_languages" msgid="8276126583216298886">"Za sve jezike"</string>
+    <string name="user_dict_settings_more_languages" msgid="7131268499685180461">"Više jezika…"</string>
+    <string name="user_dict_settings_delete" msgid="110413335187193859">"Izbriši"</string>
+    <string name="user_dict_fast_scroll_alphabet" msgid="5431919401558285473">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+</resources>
diff --git a/java/res/values-el/strings-talkback-descriptions.xml b/java/res/values-el/strings-talkback-descriptions.xml
index 9208236..8e35271 100644
--- a/java/res/values-el/strings-talkback-descriptions.xml
+++ b/java/res/values-el/strings-talkback-descriptions.xml
@@ -74,7 +74,7 @@
     <string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"Επισημάνσεις"</string>
     <string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"Εικονίδια smiley και άτομα"</string>
     <string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"Ζώα και φύση"</string>
-    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Φαγητό &amp; ποτό"</string>
+    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Ποτό και φαγητό"</string>
     <string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"Ταξίδια και μέρη"</string>
     <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"Δραστηριότητα"</string>
     <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Emoticon"</string>
diff --git a/java/res/values-et-rEE/bools.xml b/java/res/values-et/bools.xml
similarity index 100%
rename from java/res/values-et-rEE/bools.xml
rename to java/res/values-et/bools.xml
diff --git a/java/res/values-et-rEE/strings-action-keys.xml b/java/res/values-et/strings-action-keys.xml
similarity index 100%
rename from java/res/values-et-rEE/strings-action-keys.xml
rename to java/res/values-et/strings-action-keys.xml
diff --git a/java/res/values-et-rEE/strings-appname.xml b/java/res/values-et/strings-appname.xml
similarity index 100%
rename from java/res/values-et-rEE/strings-appname.xml
rename to java/res/values-et/strings-appname.xml
diff --git a/java/res/values-et-rEE/strings-config-important-notice.xml b/java/res/values-et/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-et-rEE/strings-config-important-notice.xml
rename to java/res/values-et/strings-config-important-notice.xml
diff --git a/java/res/values-et-rEE/strings-emoji-descriptions.xml b/java/res/values-et/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-et-rEE/strings-emoji-descriptions.xml
rename to java/res/values-et/strings-emoji-descriptions.xml
diff --git a/java/res/values-et-rEE/strings-letter-descriptions.xml b/java/res/values-et/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-et-rEE/strings-letter-descriptions.xml
rename to java/res/values-et/strings-letter-descriptions.xml
diff --git a/java/res/values-et-rEE/strings-talkback-descriptions.xml b/java/res/values-et/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-et-rEE/strings-talkback-descriptions.xml
rename to java/res/values-et/strings-talkback-descriptions.xml
diff --git a/java/res/values-et-rEE/strings.xml b/java/res/values-et/strings.xml
similarity index 100%
rename from java/res/values-et-rEE/strings.xml
rename to java/res/values-et/strings.xml
diff --git a/java/res/values-eu-rES/bools.xml b/java/res/values-eu/bools.xml
similarity index 100%
rename from java/res/values-eu-rES/bools.xml
rename to java/res/values-eu/bools.xml
diff --git a/java/res/values-eu-rES/strings-action-keys.xml b/java/res/values-eu/strings-action-keys.xml
similarity index 100%
rename from java/res/values-eu-rES/strings-action-keys.xml
rename to java/res/values-eu/strings-action-keys.xml
diff --git a/java/res/values-eu-rES/strings-appname.xml b/java/res/values-eu/strings-appname.xml
similarity index 100%
rename from java/res/values-eu-rES/strings-appname.xml
rename to java/res/values-eu/strings-appname.xml
diff --git a/java/res/values-eu-rES/strings-config-important-notice.xml b/java/res/values-eu/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-eu-rES/strings-config-important-notice.xml
rename to java/res/values-eu/strings-config-important-notice.xml
diff --git a/java/res/values-eu-rES/strings-emoji-descriptions.xml b/java/res/values-eu/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-eu-rES/strings-emoji-descriptions.xml
rename to java/res/values-eu/strings-emoji-descriptions.xml
diff --git a/java/res/values-eu-rES/strings-letter-descriptions.xml b/java/res/values-eu/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-eu-rES/strings-letter-descriptions.xml
rename to java/res/values-eu/strings-letter-descriptions.xml
diff --git a/java/res/values-eu-rES/strings-talkback-descriptions.xml b/java/res/values-eu/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-eu-rES/strings-talkback-descriptions.xml
rename to java/res/values-eu/strings-talkback-descriptions.xml
diff --git a/java/res/values-eu-rES/strings.xml b/java/res/values-eu/strings.xml
similarity index 100%
rename from java/res/values-eu-rES/strings.xml
rename to java/res/values-eu/strings.xml
diff --git a/java/res/values-gl-rES/bools.xml b/java/res/values-gl/bools.xml
similarity index 100%
rename from java/res/values-gl-rES/bools.xml
rename to java/res/values-gl/bools.xml
diff --git a/java/res/values-gl-rES/strings-action-keys.xml b/java/res/values-gl/strings-action-keys.xml
similarity index 100%
rename from java/res/values-gl-rES/strings-action-keys.xml
rename to java/res/values-gl/strings-action-keys.xml
diff --git a/java/res/values-gl-rES/strings-appname.xml b/java/res/values-gl/strings-appname.xml
similarity index 100%
rename from java/res/values-gl-rES/strings-appname.xml
rename to java/res/values-gl/strings-appname.xml
diff --git a/java/res/values-gl-rES/strings-config-important-notice.xml b/java/res/values-gl/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-gl-rES/strings-config-important-notice.xml
rename to java/res/values-gl/strings-config-important-notice.xml
diff --git a/java/res/values-gl-rES/strings-emoji-descriptions.xml b/java/res/values-gl/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-gl-rES/strings-emoji-descriptions.xml
rename to java/res/values-gl/strings-emoji-descriptions.xml
diff --git a/java/res/values-gl-rES/strings-letter-descriptions.xml b/java/res/values-gl/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-gl-rES/strings-letter-descriptions.xml
rename to java/res/values-gl/strings-letter-descriptions.xml
diff --git a/java/res/values-gl-rES/strings-talkback-descriptions.xml b/java/res/values-gl/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-gl-rES/strings-talkback-descriptions.xml
rename to java/res/values-gl/strings-talkback-descriptions.xml
diff --git a/java/res/values-gl-rES/strings.xml b/java/res/values-gl/strings.xml
similarity index 100%
rename from java/res/values-gl-rES/strings.xml
rename to java/res/values-gl/strings.xml
diff --git a/java/res/values-gu-rIN/strings-action-keys.xml b/java/res/values-gu/strings-action-keys.xml
similarity index 100%
rename from java/res/values-gu-rIN/strings-action-keys.xml
rename to java/res/values-gu/strings-action-keys.xml
diff --git a/java/res/values-gu-rIN/strings-appname.xml b/java/res/values-gu/strings-appname.xml
similarity index 100%
rename from java/res/values-gu-rIN/strings-appname.xml
rename to java/res/values-gu/strings-appname.xml
diff --git a/java/res/values-gu-rIN/strings-config-important-notice.xml b/java/res/values-gu/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-gu-rIN/strings-config-important-notice.xml
rename to java/res/values-gu/strings-config-important-notice.xml
diff --git a/java/res/values-gu-rIN/strings-emoji-descriptions.xml b/java/res/values-gu/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-gu-rIN/strings-emoji-descriptions.xml
rename to java/res/values-gu/strings-emoji-descriptions.xml
diff --git a/java/res/values-gu-rIN/strings-letter-descriptions.xml b/java/res/values-gu/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-gu-rIN/strings-letter-descriptions.xml
rename to java/res/values-gu/strings-letter-descriptions.xml
diff --git a/java/res/values-gu-rIN/strings-talkback-descriptions.xml b/java/res/values-gu/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-gu-rIN/strings-talkback-descriptions.xml
rename to java/res/values-gu/strings-talkback-descriptions.xml
diff --git a/java/res/values-gu-rIN/strings.xml b/java/res/values-gu/strings.xml
similarity index 100%
rename from java/res/values-gu-rIN/strings.xml
rename to java/res/values-gu/strings.xml
diff --git a/java/res/values-hy-rAM/bools.xml b/java/res/values-hy/bools.xml
similarity index 100%
rename from java/res/values-hy-rAM/bools.xml
rename to java/res/values-hy/bools.xml
diff --git a/java/res/values-hy-rAM/donottranslate-config-spacing-and-punctuations.xml b/java/res/values-hy/donottranslate-config-spacing-and-punctuations.xml
similarity index 100%
rename from java/res/values-hy-rAM/donottranslate-config-spacing-and-punctuations.xml
rename to java/res/values-hy/donottranslate-config-spacing-and-punctuations.xml
diff --git a/java/res/values-hy-rAM/strings-action-keys.xml b/java/res/values-hy/strings-action-keys.xml
similarity index 100%
rename from java/res/values-hy-rAM/strings-action-keys.xml
rename to java/res/values-hy/strings-action-keys.xml
diff --git a/java/res/values-hy-rAM/strings-appname.xml b/java/res/values-hy/strings-appname.xml
similarity index 100%
rename from java/res/values-hy-rAM/strings-appname.xml
rename to java/res/values-hy/strings-appname.xml
diff --git a/java/res/values-hy-rAM/strings-config-important-notice.xml b/java/res/values-hy/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-hy-rAM/strings-config-important-notice.xml
rename to java/res/values-hy/strings-config-important-notice.xml
diff --git a/java/res/values-hy-rAM/strings-emoji-descriptions.xml b/java/res/values-hy/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-hy-rAM/strings-emoji-descriptions.xml
rename to java/res/values-hy/strings-emoji-descriptions.xml
diff --git a/java/res/values-hy-rAM/strings-letter-descriptions.xml b/java/res/values-hy/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-hy-rAM/strings-letter-descriptions.xml
rename to java/res/values-hy/strings-letter-descriptions.xml
diff --git a/java/res/values-hy-rAM/strings-talkback-descriptions.xml b/java/res/values-hy/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-hy-rAM/strings-talkback-descriptions.xml
rename to java/res/values-hy/strings-talkback-descriptions.xml
diff --git a/java/res/values-hy-rAM/strings.xml b/java/res/values-hy/strings.xml
similarity index 100%
rename from java/res/values-hy-rAM/strings.xml
rename to java/res/values-hy/strings.xml
diff --git a/java/res/values-is-rIS/bools.xml b/java/res/values-is/bools.xml
similarity index 100%
rename from java/res/values-is-rIS/bools.xml
rename to java/res/values-is/bools.xml
diff --git a/java/res/values-is-rIS/strings-action-keys.xml b/java/res/values-is/strings-action-keys.xml
similarity index 100%
rename from java/res/values-is-rIS/strings-action-keys.xml
rename to java/res/values-is/strings-action-keys.xml
diff --git a/java/res/values-is-rIS/strings-appname.xml b/java/res/values-is/strings-appname.xml
similarity index 100%
rename from java/res/values-is-rIS/strings-appname.xml
rename to java/res/values-is/strings-appname.xml
diff --git a/java/res/values-is-rIS/strings-config-important-notice.xml b/java/res/values-is/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-is-rIS/strings-config-important-notice.xml
rename to java/res/values-is/strings-config-important-notice.xml
diff --git a/java/res/values-is-rIS/strings-emoji-descriptions.xml b/java/res/values-is/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-is-rIS/strings-emoji-descriptions.xml
rename to java/res/values-is/strings-emoji-descriptions.xml
diff --git a/java/res/values-is-rIS/strings-letter-descriptions.xml b/java/res/values-is/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-is-rIS/strings-letter-descriptions.xml
rename to java/res/values-is/strings-letter-descriptions.xml
diff --git a/java/res/values-is-rIS/strings-talkback-descriptions.xml b/java/res/values-is/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-is-rIS/strings-talkback-descriptions.xml
rename to java/res/values-is/strings-talkback-descriptions.xml
diff --git a/java/res/values-is-rIS/strings.xml b/java/res/values-is/strings.xml
similarity index 100%
rename from java/res/values-is-rIS/strings.xml
rename to java/res/values-is/strings.xml
diff --git a/java/res/values-ka-rGE/bools.xml b/java/res/values-ka/bools.xml
similarity index 100%
rename from java/res/values-ka-rGE/bools.xml
rename to java/res/values-ka/bools.xml
diff --git a/java/res/values-ka-rGE/strings-action-keys.xml b/java/res/values-ka/strings-action-keys.xml
similarity index 100%
rename from java/res/values-ka-rGE/strings-action-keys.xml
rename to java/res/values-ka/strings-action-keys.xml
diff --git a/java/res/values-ka-rGE/strings-appname.xml b/java/res/values-ka/strings-appname.xml
similarity index 100%
rename from java/res/values-ka-rGE/strings-appname.xml
rename to java/res/values-ka/strings-appname.xml
diff --git a/java/res/values-ka-rGE/strings-config-important-notice.xml b/java/res/values-ka/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-ka-rGE/strings-config-important-notice.xml
rename to java/res/values-ka/strings-config-important-notice.xml
diff --git a/java/res/values-ka-rGE/strings-emoji-descriptions.xml b/java/res/values-ka/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-ka-rGE/strings-emoji-descriptions.xml
rename to java/res/values-ka/strings-emoji-descriptions.xml
diff --git a/java/res/values-ka-rGE/strings-letter-descriptions.xml b/java/res/values-ka/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-ka-rGE/strings-letter-descriptions.xml
rename to java/res/values-ka/strings-letter-descriptions.xml
diff --git a/java/res/values-ka-rGE/strings-talkback-descriptions.xml b/java/res/values-ka/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-ka-rGE/strings-talkback-descriptions.xml
rename to java/res/values-ka/strings-talkback-descriptions.xml
diff --git a/java/res/values-ka-rGE/strings.xml b/java/res/values-ka/strings.xml
similarity index 100%
rename from java/res/values-ka-rGE/strings.xml
rename to java/res/values-ka/strings.xml
diff --git a/java/res/values-kk-rKZ/bools.xml b/java/res/values-kk/bools.xml
similarity index 100%
rename from java/res/values-kk-rKZ/bools.xml
rename to java/res/values-kk/bools.xml
diff --git a/java/res/values-kk-rKZ/strings-action-keys.xml b/java/res/values-kk/strings-action-keys.xml
similarity index 100%
rename from java/res/values-kk-rKZ/strings-action-keys.xml
rename to java/res/values-kk/strings-action-keys.xml
diff --git a/java/res/values-kk-rKZ/strings-appname.xml b/java/res/values-kk/strings-appname.xml
similarity index 100%
rename from java/res/values-kk-rKZ/strings-appname.xml
rename to java/res/values-kk/strings-appname.xml
diff --git a/java/res/values-kk-rKZ/strings-config-important-notice.xml b/java/res/values-kk/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-kk-rKZ/strings-config-important-notice.xml
rename to java/res/values-kk/strings-config-important-notice.xml
diff --git a/java/res/values-kk-rKZ/strings-emoji-descriptions.xml b/java/res/values-kk/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-kk-rKZ/strings-emoji-descriptions.xml
rename to java/res/values-kk/strings-emoji-descriptions.xml
diff --git a/java/res/values-kk-rKZ/strings-letter-descriptions.xml b/java/res/values-kk/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-kk-rKZ/strings-letter-descriptions.xml
rename to java/res/values-kk/strings-letter-descriptions.xml
diff --git a/java/res/values-kk-rKZ/strings-talkback-descriptions.xml b/java/res/values-kk/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-kk-rKZ/strings-talkback-descriptions.xml
rename to java/res/values-kk/strings-talkback-descriptions.xml
diff --git a/java/res/values-kk-rKZ/strings.xml b/java/res/values-kk/strings.xml
similarity index 100%
rename from java/res/values-kk-rKZ/strings.xml
rename to java/res/values-kk/strings.xml
diff --git a/java/res/values-km-rKH/bools.xml b/java/res/values-km/bools.xml
similarity index 100%
rename from java/res/values-km-rKH/bools.xml
rename to java/res/values-km/bools.xml
diff --git a/java/res/values-km-rKH/donottranslate-config-spacing-and-punctuations.xml b/java/res/values-km/donottranslate-config-spacing-and-punctuations.xml
similarity index 100%
rename from java/res/values-km-rKH/donottranslate-config-spacing-and-punctuations.xml
rename to java/res/values-km/donottranslate-config-spacing-and-punctuations.xml
diff --git a/java/res/values-km-rKH/strings-action-keys.xml b/java/res/values-km/strings-action-keys.xml
similarity index 100%
rename from java/res/values-km-rKH/strings-action-keys.xml
rename to java/res/values-km/strings-action-keys.xml
diff --git a/java/res/values-km-rKH/strings-appname.xml b/java/res/values-km/strings-appname.xml
similarity index 100%
rename from java/res/values-km-rKH/strings-appname.xml
rename to java/res/values-km/strings-appname.xml
diff --git a/java/res/values-km-rKH/strings-config-important-notice.xml b/java/res/values-km/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-km-rKH/strings-config-important-notice.xml
rename to java/res/values-km/strings-config-important-notice.xml
diff --git a/java/res/values-km-rKH/strings-emoji-descriptions.xml b/java/res/values-km/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-km-rKH/strings-emoji-descriptions.xml
rename to java/res/values-km/strings-emoji-descriptions.xml
diff --git a/java/res/values-km-rKH/strings-letter-descriptions.xml b/java/res/values-km/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-km-rKH/strings-letter-descriptions.xml
rename to java/res/values-km/strings-letter-descriptions.xml
diff --git a/java/res/values-km-rKH/strings-talkback-descriptions.xml b/java/res/values-km/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-km-rKH/strings-talkback-descriptions.xml
rename to java/res/values-km/strings-talkback-descriptions.xml
diff --git a/java/res/values-km-rKH/strings.xml b/java/res/values-km/strings.xml
similarity index 100%
rename from java/res/values-km-rKH/strings.xml
rename to java/res/values-km/strings.xml
diff --git a/java/res/values-kn-rIN/bools.xml b/java/res/values-kn/bools.xml
similarity index 100%
rename from java/res/values-kn-rIN/bools.xml
rename to java/res/values-kn/bools.xml
diff --git a/java/res/values-kn-rIN/strings-action-keys.xml b/java/res/values-kn/strings-action-keys.xml
similarity index 100%
rename from java/res/values-kn-rIN/strings-action-keys.xml
rename to java/res/values-kn/strings-action-keys.xml
diff --git a/java/res/values-kn-rIN/strings-appname.xml b/java/res/values-kn/strings-appname.xml
similarity index 100%
rename from java/res/values-kn-rIN/strings-appname.xml
rename to java/res/values-kn/strings-appname.xml
diff --git a/java/res/values-kn-rIN/strings-config-important-notice.xml b/java/res/values-kn/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-kn-rIN/strings-config-important-notice.xml
rename to java/res/values-kn/strings-config-important-notice.xml
diff --git a/java/res/values-kn-rIN/strings-emoji-descriptions.xml b/java/res/values-kn/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-kn-rIN/strings-emoji-descriptions.xml
rename to java/res/values-kn/strings-emoji-descriptions.xml
diff --git a/java/res/values-kn-rIN/strings-letter-descriptions.xml b/java/res/values-kn/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-kn-rIN/strings-letter-descriptions.xml
rename to java/res/values-kn/strings-letter-descriptions.xml
diff --git a/java/res/values-kn-rIN/strings-talkback-descriptions.xml b/java/res/values-kn/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-kn-rIN/strings-talkback-descriptions.xml
rename to java/res/values-kn/strings-talkback-descriptions.xml
diff --git a/java/res/values-kn-rIN/strings.xml b/java/res/values-kn/strings.xml
similarity index 100%
rename from java/res/values-kn-rIN/strings.xml
rename to java/res/values-kn/strings.xml
diff --git a/java/res/values-ky-rKG/bools.xml b/java/res/values-ky/bools.xml
similarity index 100%
rename from java/res/values-ky-rKG/bools.xml
rename to java/res/values-ky/bools.xml
diff --git a/java/res/values-ky-rKG/strings-action-keys.xml b/java/res/values-ky/strings-action-keys.xml
similarity index 100%
rename from java/res/values-ky-rKG/strings-action-keys.xml
rename to java/res/values-ky/strings-action-keys.xml
diff --git a/java/res/values-ky-rKG/strings-appname.xml b/java/res/values-ky/strings-appname.xml
similarity index 100%
rename from java/res/values-ky-rKG/strings-appname.xml
rename to java/res/values-ky/strings-appname.xml
diff --git a/java/res/values-ky-rKG/strings-config-important-notice.xml b/java/res/values-ky/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-ky-rKG/strings-config-important-notice.xml
rename to java/res/values-ky/strings-config-important-notice.xml
diff --git a/java/res/values-ky-rKG/strings-emoji-descriptions.xml b/java/res/values-ky/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-ky-rKG/strings-emoji-descriptions.xml
rename to java/res/values-ky/strings-emoji-descriptions.xml
diff --git a/java/res/values-ky-rKG/strings-letter-descriptions.xml b/java/res/values-ky/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-ky-rKG/strings-letter-descriptions.xml
rename to java/res/values-ky/strings-letter-descriptions.xml
diff --git a/java/res/values-ky-rKG/strings-talkback-descriptions.xml b/java/res/values-ky/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-ky-rKG/strings-talkback-descriptions.xml
rename to java/res/values-ky/strings-talkback-descriptions.xml
diff --git a/java/res/values-ky-rKG/strings.xml b/java/res/values-ky/strings.xml
similarity index 100%
rename from java/res/values-ky-rKG/strings.xml
rename to java/res/values-ky/strings.xml
diff --git a/java/res/values-lo-rLA/bools.xml b/java/res/values-lo/bools.xml
similarity index 100%
rename from java/res/values-lo-rLA/bools.xml
rename to java/res/values-lo/bools.xml
diff --git a/java/res/values-lo-rLA/donottranslate-config-spacing-and-punctuations.xml b/java/res/values-lo/donottranslate-config-spacing-and-punctuations.xml
similarity index 100%
rename from java/res/values-lo-rLA/donottranslate-config-spacing-and-punctuations.xml
rename to java/res/values-lo/donottranslate-config-spacing-and-punctuations.xml
diff --git a/java/res/values-lo-rLA/strings-action-keys.xml b/java/res/values-lo/strings-action-keys.xml
similarity index 100%
rename from java/res/values-lo-rLA/strings-action-keys.xml
rename to java/res/values-lo/strings-action-keys.xml
diff --git a/java/res/values-lo-rLA/strings-appname.xml b/java/res/values-lo/strings-appname.xml
similarity index 100%
rename from java/res/values-lo-rLA/strings-appname.xml
rename to java/res/values-lo/strings-appname.xml
diff --git a/java/res/values-lo-rLA/strings-config-important-notice.xml b/java/res/values-lo/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-lo-rLA/strings-config-important-notice.xml
rename to java/res/values-lo/strings-config-important-notice.xml
diff --git a/java/res/values-lo-rLA/strings-emoji-descriptions.xml b/java/res/values-lo/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-lo-rLA/strings-emoji-descriptions.xml
rename to java/res/values-lo/strings-emoji-descriptions.xml
diff --git a/java/res/values-lo-rLA/strings-letter-descriptions.xml b/java/res/values-lo/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-lo-rLA/strings-letter-descriptions.xml
rename to java/res/values-lo/strings-letter-descriptions.xml
diff --git a/java/res/values-lo-rLA/strings-talkback-descriptions.xml b/java/res/values-lo/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-lo-rLA/strings-talkback-descriptions.xml
rename to java/res/values-lo/strings-talkback-descriptions.xml
diff --git a/java/res/values-lo-rLA/strings.xml b/java/res/values-lo/strings.xml
similarity index 100%
rename from java/res/values-lo-rLA/strings.xml
rename to java/res/values-lo/strings.xml
diff --git a/java/res/values-mk-rMK/bools.xml b/java/res/values-mk/bools.xml
similarity index 100%
rename from java/res/values-mk-rMK/bools.xml
rename to java/res/values-mk/bools.xml
diff --git a/java/res/values-mk-rMK/strings-action-keys.xml b/java/res/values-mk/strings-action-keys.xml
similarity index 100%
rename from java/res/values-mk-rMK/strings-action-keys.xml
rename to java/res/values-mk/strings-action-keys.xml
diff --git a/java/res/values-mk-rMK/strings-appname.xml b/java/res/values-mk/strings-appname.xml
similarity index 100%
rename from java/res/values-mk-rMK/strings-appname.xml
rename to java/res/values-mk/strings-appname.xml
diff --git a/java/res/values-mk-rMK/strings-config-important-notice.xml b/java/res/values-mk/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-mk-rMK/strings-config-important-notice.xml
rename to java/res/values-mk/strings-config-important-notice.xml
diff --git a/java/res/values-mk-rMK/strings-emoji-descriptions.xml b/java/res/values-mk/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-mk-rMK/strings-emoji-descriptions.xml
rename to java/res/values-mk/strings-emoji-descriptions.xml
diff --git a/java/res/values-mk-rMK/strings-letter-descriptions.xml b/java/res/values-mk/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-mk-rMK/strings-letter-descriptions.xml
rename to java/res/values-mk/strings-letter-descriptions.xml
diff --git a/java/res/values-mk-rMK/strings-talkback-descriptions.xml b/java/res/values-mk/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-mk-rMK/strings-talkback-descriptions.xml
rename to java/res/values-mk/strings-talkback-descriptions.xml
diff --git a/java/res/values-mk-rMK/strings.xml b/java/res/values-mk/strings.xml
similarity index 100%
rename from java/res/values-mk-rMK/strings.xml
rename to java/res/values-mk/strings.xml
diff --git a/java/res/values-ml-rIN/bools.xml b/java/res/values-ml/bools.xml
similarity index 100%
rename from java/res/values-ml-rIN/bools.xml
rename to java/res/values-ml/bools.xml
diff --git a/java/res/values-ml-rIN/strings-action-keys.xml b/java/res/values-ml/strings-action-keys.xml
similarity index 100%
rename from java/res/values-ml-rIN/strings-action-keys.xml
rename to java/res/values-ml/strings-action-keys.xml
diff --git a/java/res/values-ml-rIN/strings-appname.xml b/java/res/values-ml/strings-appname.xml
similarity index 100%
rename from java/res/values-ml-rIN/strings-appname.xml
rename to java/res/values-ml/strings-appname.xml
diff --git a/java/res/values-ml-rIN/strings-config-important-notice.xml b/java/res/values-ml/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-ml-rIN/strings-config-important-notice.xml
rename to java/res/values-ml/strings-config-important-notice.xml
diff --git a/java/res/values-ml-rIN/strings-emoji-descriptions.xml b/java/res/values-ml/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-ml-rIN/strings-emoji-descriptions.xml
rename to java/res/values-ml/strings-emoji-descriptions.xml
diff --git a/java/res/values-ml-rIN/strings-letter-descriptions.xml b/java/res/values-ml/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-ml-rIN/strings-letter-descriptions.xml
rename to java/res/values-ml/strings-letter-descriptions.xml
diff --git a/java/res/values-ml-rIN/strings-talkback-descriptions.xml b/java/res/values-ml/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-ml-rIN/strings-talkback-descriptions.xml
rename to java/res/values-ml/strings-talkback-descriptions.xml
diff --git a/java/res/values-ml-rIN/strings.xml b/java/res/values-ml/strings.xml
similarity index 100%
rename from java/res/values-ml-rIN/strings.xml
rename to java/res/values-ml/strings.xml
diff --git a/java/res/values-mn-rMN/bools.xml b/java/res/values-mn/bools.xml
similarity index 100%
rename from java/res/values-mn-rMN/bools.xml
rename to java/res/values-mn/bools.xml
diff --git a/java/res/values-mn-rMN/strings-action-keys.xml b/java/res/values-mn/strings-action-keys.xml
similarity index 100%
rename from java/res/values-mn-rMN/strings-action-keys.xml
rename to java/res/values-mn/strings-action-keys.xml
diff --git a/java/res/values-mn-rMN/strings-appname.xml b/java/res/values-mn/strings-appname.xml
similarity index 100%
rename from java/res/values-mn-rMN/strings-appname.xml
rename to java/res/values-mn/strings-appname.xml
diff --git a/java/res/values-mn-rMN/strings-config-important-notice.xml b/java/res/values-mn/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-mn-rMN/strings-config-important-notice.xml
rename to java/res/values-mn/strings-config-important-notice.xml
diff --git a/java/res/values-mn-rMN/strings-emoji-descriptions.xml b/java/res/values-mn/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-mn-rMN/strings-emoji-descriptions.xml
rename to java/res/values-mn/strings-emoji-descriptions.xml
diff --git a/java/res/values-mn-rMN/strings-letter-descriptions.xml b/java/res/values-mn/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-mn-rMN/strings-letter-descriptions.xml
rename to java/res/values-mn/strings-letter-descriptions.xml
diff --git a/java/res/values-mn-rMN/strings-talkback-descriptions.xml b/java/res/values-mn/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-mn-rMN/strings-talkback-descriptions.xml
rename to java/res/values-mn/strings-talkback-descriptions.xml
diff --git a/java/res/values-mn-rMN/strings.xml b/java/res/values-mn/strings.xml
similarity index 100%
rename from java/res/values-mn-rMN/strings.xml
rename to java/res/values-mn/strings.xml
diff --git a/java/res/values-mr-rIN/bools.xml b/java/res/values-mr/bools.xml
similarity index 100%
rename from java/res/values-mr-rIN/bools.xml
rename to java/res/values-mr/bools.xml
diff --git a/java/res/values-mr-rIN/strings-action-keys.xml b/java/res/values-mr/strings-action-keys.xml
similarity index 100%
rename from java/res/values-mr-rIN/strings-action-keys.xml
rename to java/res/values-mr/strings-action-keys.xml
diff --git a/java/res/values-mr-rIN/strings-appname.xml b/java/res/values-mr/strings-appname.xml
similarity index 100%
rename from java/res/values-mr-rIN/strings-appname.xml
rename to java/res/values-mr/strings-appname.xml
diff --git a/java/res/values-mr-rIN/strings-config-important-notice.xml b/java/res/values-mr/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-mr-rIN/strings-config-important-notice.xml
rename to java/res/values-mr/strings-config-important-notice.xml
diff --git a/java/res/values-mr-rIN/strings-emoji-descriptions.xml b/java/res/values-mr/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-mr-rIN/strings-emoji-descriptions.xml
rename to java/res/values-mr/strings-emoji-descriptions.xml
diff --git a/java/res/values-mr-rIN/strings-letter-descriptions.xml b/java/res/values-mr/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-mr-rIN/strings-letter-descriptions.xml
rename to java/res/values-mr/strings-letter-descriptions.xml
diff --git a/java/res/values-mr-rIN/strings-talkback-descriptions.xml b/java/res/values-mr/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-mr-rIN/strings-talkback-descriptions.xml
rename to java/res/values-mr/strings-talkback-descriptions.xml
diff --git a/java/res/values-mr-rIN/strings.xml b/java/res/values-mr/strings.xml
similarity index 100%
rename from java/res/values-mr-rIN/strings.xml
rename to java/res/values-mr/strings.xml
diff --git a/java/res/values-ms-rMY/bools.xml b/java/res/values-ms/bools.xml
similarity index 100%
rename from java/res/values-ms-rMY/bools.xml
rename to java/res/values-ms/bools.xml
diff --git a/java/res/values-ms-rMY/strings-action-keys.xml b/java/res/values-ms/strings-action-keys.xml
similarity index 100%
rename from java/res/values-ms-rMY/strings-action-keys.xml
rename to java/res/values-ms/strings-action-keys.xml
diff --git a/java/res/values-ms-rMY/strings-appname.xml b/java/res/values-ms/strings-appname.xml
similarity index 100%
rename from java/res/values-ms-rMY/strings-appname.xml
rename to java/res/values-ms/strings-appname.xml
diff --git a/java/res/values-ms-rMY/strings-config-important-notice.xml b/java/res/values-ms/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-ms-rMY/strings-config-important-notice.xml
rename to java/res/values-ms/strings-config-important-notice.xml
diff --git a/java/res/values-ms-rMY/strings-emoji-descriptions.xml b/java/res/values-ms/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-ms-rMY/strings-emoji-descriptions.xml
rename to java/res/values-ms/strings-emoji-descriptions.xml
diff --git a/java/res/values-ms-rMY/strings-letter-descriptions.xml b/java/res/values-ms/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-ms-rMY/strings-letter-descriptions.xml
rename to java/res/values-ms/strings-letter-descriptions.xml
diff --git a/java/res/values-ms-rMY/strings-talkback-descriptions.xml b/java/res/values-ms/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-ms-rMY/strings-talkback-descriptions.xml
rename to java/res/values-ms/strings-talkback-descriptions.xml
diff --git a/java/res/values-ms-rMY/strings.xml b/java/res/values-ms/strings.xml
similarity index 100%
rename from java/res/values-ms-rMY/strings.xml
rename to java/res/values-ms/strings.xml
diff --git a/java/res/values-my-rMM/strings-action-keys.xml b/java/res/values-my/strings-action-keys.xml
similarity index 100%
rename from java/res/values-my-rMM/strings-action-keys.xml
rename to java/res/values-my/strings-action-keys.xml
diff --git a/java/res/values-my-rMM/strings-appname.xml b/java/res/values-my/strings-appname.xml
similarity index 100%
rename from java/res/values-my-rMM/strings-appname.xml
rename to java/res/values-my/strings-appname.xml
diff --git a/java/res/values-my-rMM/strings-config-important-notice.xml b/java/res/values-my/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-my-rMM/strings-config-important-notice.xml
rename to java/res/values-my/strings-config-important-notice.xml
diff --git a/java/res/values-my-rMM/strings-emoji-descriptions.xml b/java/res/values-my/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-my-rMM/strings-emoji-descriptions.xml
rename to java/res/values-my/strings-emoji-descriptions.xml
diff --git a/java/res/values-my-rMM/strings-letter-descriptions.xml b/java/res/values-my/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-my-rMM/strings-letter-descriptions.xml
rename to java/res/values-my/strings-letter-descriptions.xml
diff --git a/java/res/values-my-rMM/strings-talkback-descriptions.xml b/java/res/values-my/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-my-rMM/strings-talkback-descriptions.xml
rename to java/res/values-my/strings-talkback-descriptions.xml
diff --git a/java/res/values-my-rMM/strings.xml b/java/res/values-my/strings.xml
similarity index 100%
rename from java/res/values-my-rMM/strings.xml
rename to java/res/values-my/strings.xml
diff --git a/java/res/values-ne-rNP/bools.xml b/java/res/values-ne/bools.xml
similarity index 100%
rename from java/res/values-ne-rNP/bools.xml
rename to java/res/values-ne/bools.xml
diff --git a/java/res/values-ne-rNP/strings-action-keys.xml b/java/res/values-ne/strings-action-keys.xml
similarity index 100%
rename from java/res/values-ne-rNP/strings-action-keys.xml
rename to java/res/values-ne/strings-action-keys.xml
diff --git a/java/res/values-ne-rNP/strings-appname.xml b/java/res/values-ne/strings-appname.xml
similarity index 100%
rename from java/res/values-ne-rNP/strings-appname.xml
rename to java/res/values-ne/strings-appname.xml
diff --git a/java/res/values-ne-rNP/strings-config-important-notice.xml b/java/res/values-ne/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-ne-rNP/strings-config-important-notice.xml
rename to java/res/values-ne/strings-config-important-notice.xml
diff --git a/java/res/values-ne-rNP/strings-emoji-descriptions.xml b/java/res/values-ne/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-ne-rNP/strings-emoji-descriptions.xml
rename to java/res/values-ne/strings-emoji-descriptions.xml
diff --git a/java/res/values-ne-rNP/strings-letter-descriptions.xml b/java/res/values-ne/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-ne-rNP/strings-letter-descriptions.xml
rename to java/res/values-ne/strings-letter-descriptions.xml
diff --git a/java/res/values-ne-rNP/strings-talkback-descriptions.xml b/java/res/values-ne/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-ne-rNP/strings-talkback-descriptions.xml
rename to java/res/values-ne/strings-talkback-descriptions.xml
diff --git a/java/res/values-ne-rNP/strings.xml b/java/res/values-ne/strings.xml
similarity index 100%
rename from java/res/values-ne-rNP/strings.xml
rename to java/res/values-ne/strings.xml
diff --git a/java/res/values-pa-rIN/strings-action-keys.xml b/java/res/values-pa/strings-action-keys.xml
similarity index 100%
rename from java/res/values-pa-rIN/strings-action-keys.xml
rename to java/res/values-pa/strings-action-keys.xml
diff --git a/java/res/values-pa-rIN/strings-appname.xml b/java/res/values-pa/strings-appname.xml
similarity index 100%
rename from java/res/values-pa-rIN/strings-appname.xml
rename to java/res/values-pa/strings-appname.xml
diff --git a/java/res/values-pa-rIN/strings-config-important-notice.xml b/java/res/values-pa/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-pa-rIN/strings-config-important-notice.xml
rename to java/res/values-pa/strings-config-important-notice.xml
diff --git a/java/res/values-pa-rIN/strings-emoji-descriptions.xml b/java/res/values-pa/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-pa-rIN/strings-emoji-descriptions.xml
rename to java/res/values-pa/strings-emoji-descriptions.xml
diff --git a/java/res/values-pa-rIN/strings-letter-descriptions.xml b/java/res/values-pa/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-pa-rIN/strings-letter-descriptions.xml
rename to java/res/values-pa/strings-letter-descriptions.xml
diff --git a/java/res/values-pa-rIN/strings-talkback-descriptions.xml b/java/res/values-pa/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-pa-rIN/strings-talkback-descriptions.xml
rename to java/res/values-pa/strings-talkback-descriptions.xml
diff --git a/java/res/values-pa-rIN/strings.xml b/java/res/values-pa/strings.xml
similarity index 100%
rename from java/res/values-pa-rIN/strings.xml
rename to java/res/values-pa/strings.xml
diff --git a/java/res/values-si-rLK/strings-action-keys.xml b/java/res/values-si/strings-action-keys.xml
similarity index 100%
rename from java/res/values-si-rLK/strings-action-keys.xml
rename to java/res/values-si/strings-action-keys.xml
diff --git a/java/res/values-si-rLK/strings-appname.xml b/java/res/values-si/strings-appname.xml
similarity index 100%
rename from java/res/values-si-rLK/strings-appname.xml
rename to java/res/values-si/strings-appname.xml
diff --git a/java/res/values-si-rLK/strings-config-important-notice.xml b/java/res/values-si/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-si-rLK/strings-config-important-notice.xml
rename to java/res/values-si/strings-config-important-notice.xml
diff --git a/java/res/values-si-rLK/strings-emoji-descriptions.xml b/java/res/values-si/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-si-rLK/strings-emoji-descriptions.xml
rename to java/res/values-si/strings-emoji-descriptions.xml
diff --git a/java/res/values-si-rLK/strings-letter-descriptions.xml b/java/res/values-si/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-si-rLK/strings-letter-descriptions.xml
rename to java/res/values-si/strings-letter-descriptions.xml
diff --git a/java/res/values-si-rLK/strings-talkback-descriptions.xml b/java/res/values-si/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-si-rLK/strings-talkback-descriptions.xml
rename to java/res/values-si/strings-talkback-descriptions.xml
diff --git a/java/res/values-si-rLK/strings.xml b/java/res/values-si/strings.xml
similarity index 100%
rename from java/res/values-si-rLK/strings.xml
rename to java/res/values-si/strings.xml
diff --git a/java/res/values-sq-rAL/strings-action-keys.xml b/java/res/values-sq/strings-action-keys.xml
similarity index 100%
rename from java/res/values-sq-rAL/strings-action-keys.xml
rename to java/res/values-sq/strings-action-keys.xml
diff --git a/java/res/values-sq-rAL/strings-appname.xml b/java/res/values-sq/strings-appname.xml
similarity index 100%
rename from java/res/values-sq-rAL/strings-appname.xml
rename to java/res/values-sq/strings-appname.xml
diff --git a/java/res/values-sq-rAL/strings-config-important-notice.xml b/java/res/values-sq/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-sq-rAL/strings-config-important-notice.xml
rename to java/res/values-sq/strings-config-important-notice.xml
diff --git a/java/res/values-sq-rAL/strings-emoji-descriptions.xml b/java/res/values-sq/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-sq-rAL/strings-emoji-descriptions.xml
rename to java/res/values-sq/strings-emoji-descriptions.xml
diff --git a/java/res/values-sq-rAL/strings-letter-descriptions.xml b/java/res/values-sq/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-sq-rAL/strings-letter-descriptions.xml
rename to java/res/values-sq/strings-letter-descriptions.xml
diff --git a/java/res/values-sq-rAL/strings-talkback-descriptions.xml b/java/res/values-sq/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-sq-rAL/strings-talkback-descriptions.xml
rename to java/res/values-sq/strings-talkback-descriptions.xml
diff --git a/java/res/values-sq-rAL/strings.xml b/java/res/values-sq/strings.xml
similarity index 100%
rename from java/res/values-sq-rAL/strings.xml
rename to java/res/values-sq/strings.xml
diff --git a/java/res/values-ta-rIN/bools.xml b/java/res/values-ta/bools.xml
similarity index 100%
rename from java/res/values-ta-rIN/bools.xml
rename to java/res/values-ta/bools.xml
diff --git a/java/res/values-ta-rIN/strings-action-keys.xml b/java/res/values-ta/strings-action-keys.xml
similarity index 100%
rename from java/res/values-ta-rIN/strings-action-keys.xml
rename to java/res/values-ta/strings-action-keys.xml
diff --git a/java/res/values-ta-rIN/strings-appname.xml b/java/res/values-ta/strings-appname.xml
similarity index 100%
rename from java/res/values-ta-rIN/strings-appname.xml
rename to java/res/values-ta/strings-appname.xml
diff --git a/java/res/values-ta-rIN/strings-config-important-notice.xml b/java/res/values-ta/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-ta-rIN/strings-config-important-notice.xml
rename to java/res/values-ta/strings-config-important-notice.xml
diff --git a/java/res/values-ta-rIN/strings-emoji-descriptions.xml b/java/res/values-ta/strings-emoji-descriptions.xml
similarity index 99%
rename from java/res/values-ta-rIN/strings-emoji-descriptions.xml
rename to java/res/values-ta/strings-emoji-descriptions.xml
index b33b9d3..a0f682b 100644
--- a/java/res/values-ta-rIN/strings-emoji-descriptions.xml
+++ b/java/res/values-ta/strings-emoji-descriptions.xml
@@ -537,7 +537,7 @@
     <string name="spoken_emoji_1F3E3" msgid="6177606081825094184">"ஜாப்பனீஸ் அஞ்சல் அலுவலகம்"</string>
     <string name="spoken_emoji_1F3E4" msgid="717377871070970293">"ஐரோப்பிய அஞ்சல் அலுவலகம்"</string>
     <string name="spoken_emoji_1F3E5" msgid="1350532500431776780">"மருத்துவமனை"</string>
-    <string name="spoken_emoji_1F3E6" msgid="342132788513806214">"பேங்க்"</string>
+    <string name="spoken_emoji_1F3E6" msgid="342132788513806214">"வங்கி"</string>
     <string name="spoken_emoji_1F3E7" msgid="6322352038284944265">"தன்னியக்கக் காசளிப்பு எந்திரம்"</string>
     <string name="spoken_emoji_1F3E8" msgid="5864918444350599907">"ஹோட்டல்"</string>
     <string name="spoken_emoji_1F3E9" msgid="7830416185375326938">"காதலர்களுக்கான ஹோட்டல்"</string>
diff --git a/java/res/values-ta-rIN/strings-letter-descriptions.xml b/java/res/values-ta/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-ta-rIN/strings-letter-descriptions.xml
rename to java/res/values-ta/strings-letter-descriptions.xml
diff --git a/java/res/values-ta-rIN/strings-talkback-descriptions.xml b/java/res/values-ta/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-ta-rIN/strings-talkback-descriptions.xml
rename to java/res/values-ta/strings-talkback-descriptions.xml
diff --git a/java/res/values-ta-rIN/strings.xml b/java/res/values-ta/strings.xml
similarity index 100%
rename from java/res/values-ta-rIN/strings.xml
rename to java/res/values-ta/strings.xml
diff --git a/java/res/values-te-rIN/bools.xml b/java/res/values-te/bools.xml
similarity index 100%
rename from java/res/values-te-rIN/bools.xml
rename to java/res/values-te/bools.xml
diff --git a/java/res/values-te-rIN/strings-action-keys.xml b/java/res/values-te/strings-action-keys.xml
similarity index 100%
rename from java/res/values-te-rIN/strings-action-keys.xml
rename to java/res/values-te/strings-action-keys.xml
diff --git a/java/res/values-te-rIN/strings-appname.xml b/java/res/values-te/strings-appname.xml
similarity index 100%
rename from java/res/values-te-rIN/strings-appname.xml
rename to java/res/values-te/strings-appname.xml
diff --git a/java/res/values-te-rIN/strings-config-important-notice.xml b/java/res/values-te/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-te-rIN/strings-config-important-notice.xml
rename to java/res/values-te/strings-config-important-notice.xml
diff --git a/java/res/values-te-rIN/strings-emoji-descriptions.xml b/java/res/values-te/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-te-rIN/strings-emoji-descriptions.xml
rename to java/res/values-te/strings-emoji-descriptions.xml
diff --git a/java/res/values-te-rIN/strings-letter-descriptions.xml b/java/res/values-te/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-te-rIN/strings-letter-descriptions.xml
rename to java/res/values-te/strings-letter-descriptions.xml
diff --git a/java/res/values-te-rIN/strings-talkback-descriptions.xml b/java/res/values-te/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-te-rIN/strings-talkback-descriptions.xml
rename to java/res/values-te/strings-talkback-descriptions.xml
diff --git a/java/res/values-te-rIN/strings.xml b/java/res/values-te/strings.xml
similarity index 100%
rename from java/res/values-te-rIN/strings.xml
rename to java/res/values-te/strings.xml
diff --git a/java/res/values-ur-rPK/strings-action-keys.xml b/java/res/values-ur/strings-action-keys.xml
similarity index 100%
rename from java/res/values-ur-rPK/strings-action-keys.xml
rename to java/res/values-ur/strings-action-keys.xml
diff --git a/java/res/values-ur-rPK/strings-appname.xml b/java/res/values-ur/strings-appname.xml
similarity index 100%
rename from java/res/values-ur-rPK/strings-appname.xml
rename to java/res/values-ur/strings-appname.xml
diff --git a/java/res/values-ur-rPK/strings-config-important-notice.xml b/java/res/values-ur/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-ur-rPK/strings-config-important-notice.xml
rename to java/res/values-ur/strings-config-important-notice.xml
diff --git a/java/res/values-ur-rPK/strings-emoji-descriptions.xml b/java/res/values-ur/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-ur-rPK/strings-emoji-descriptions.xml
rename to java/res/values-ur/strings-emoji-descriptions.xml
diff --git a/java/res/values-ur-rPK/strings-letter-descriptions.xml b/java/res/values-ur/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-ur-rPK/strings-letter-descriptions.xml
rename to java/res/values-ur/strings-letter-descriptions.xml
diff --git a/java/res/values-ur-rPK/strings-talkback-descriptions.xml b/java/res/values-ur/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-ur-rPK/strings-talkback-descriptions.xml
rename to java/res/values-ur/strings-talkback-descriptions.xml
diff --git a/java/res/values-ur-rPK/strings.xml b/java/res/values-ur/strings.xml
similarity index 100%
rename from java/res/values-ur-rPK/strings.xml
rename to java/res/values-ur/strings.xml
diff --git a/java/res/values-uz-rUZ/strings-action-keys.xml b/java/res/values-uz/strings-action-keys.xml
similarity index 100%
rename from java/res/values-uz-rUZ/strings-action-keys.xml
rename to java/res/values-uz/strings-action-keys.xml
diff --git a/java/res/values-uz-rUZ/strings-appname.xml b/java/res/values-uz/strings-appname.xml
similarity index 100%
rename from java/res/values-uz-rUZ/strings-appname.xml
rename to java/res/values-uz/strings-appname.xml
diff --git a/java/res/values-uz-rUZ/strings-config-important-notice.xml b/java/res/values-uz/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-uz-rUZ/strings-config-important-notice.xml
rename to java/res/values-uz/strings-config-important-notice.xml
diff --git a/java/res/values-uz-rUZ/strings-emoji-descriptions.xml b/java/res/values-uz/strings-emoji-descriptions.xml
similarity index 100%
rename from java/res/values-uz-rUZ/strings-emoji-descriptions.xml
rename to java/res/values-uz/strings-emoji-descriptions.xml
diff --git a/java/res/values-uz-rUZ/strings-letter-descriptions.xml b/java/res/values-uz/strings-letter-descriptions.xml
similarity index 100%
rename from java/res/values-uz-rUZ/strings-letter-descriptions.xml
rename to java/res/values-uz/strings-letter-descriptions.xml
diff --git a/java/res/values-uz-rUZ/strings-talkback-descriptions.xml b/java/res/values-uz/strings-talkback-descriptions.xml
similarity index 98%
rename from java/res/values-uz-rUZ/strings-talkback-descriptions.xml
rename to java/res/values-uz/strings-talkback-descriptions.xml
index d6eb3c8..4f6907c 100644
--- a/java/res/values-uz-rUZ/strings-talkback-descriptions.xml
+++ b/java/res/values-uz/strings-talkback-descriptions.xml
@@ -74,7 +74,7 @@
     <string name="spoken_descrption_emoji_category_flags" msgid="5971573825866381472">"Bayroqchalar"</string>
     <string name="spoken_descrption_emoji_category_eight_smiley_people" msgid="5682663819532433464">"Kulgichlar va odamlar"</string>
     <string name="spoken_descrption_emoji_category_eight_animals_nature" msgid="5844950234883716704">"Hayvonot va tabiat"</string>
-    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Taom va ichimliklar"</string>
+    <string name="spoken_descrption_emoji_category_eight_food_drink" msgid="6196944764485349650">"Taom va ichimlik"</string>
     <string name="spoken_descrption_emoji_category_eight_travel_places" msgid="3834085499381434611">"Sayohat va joylar"</string>
     <string name="spoken_descrption_emoji_category_eight_activity" msgid="4795281669042975993">"Harakat"</string>
     <string name="spoken_descrption_emoji_category_emoticons" msgid="456737544787823539">"Kulgichlar"</string>
diff --git a/java/res/values-uz-rUZ/strings.xml b/java/res/values-uz/strings.xml
similarity index 100%
rename from java/res/values-uz-rUZ/strings.xml
rename to java/res/values-uz/strings.xml
diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
index b0072ee..442ab3e 100644
--- a/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
+++ b/java/src/com/android/inputmethod/accessibility/AccessibilityUtils.java
@@ -39,9 +39,9 @@
 
 public final class AccessibilityUtils {
     private static final String TAG = AccessibilityUtils.class.getSimpleName();
-    private static final String CLASS = AccessibilityUtils.class.getClass().getName();
+    private static final String CLASS = AccessibilityUtils.class.getName();
     private static final String PACKAGE =
-            AccessibilityUtils.class.getClass().getPackage().getName();
+            AccessibilityUtils.class.getPackage().getName();
 
     private static final AccessibilityUtils sInstance = new AccessibilityUtils();
 
diff --git a/tests/Android.mk b/tests/Android.mk
index b290a51..998c1de 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -26,7 +26,7 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     android-support-test \
-    mockito-target
+    mockito-target-minus-junit4
 
 LOCAL_JAVA_LIBRARIES := android.test.mock.sdk legacy-android-test
 
diff --git a/tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-az/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-az/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-be-rBY/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-be/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-be-rBY/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-be/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-et-rEE/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-et/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-et-rEE/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-et/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-eu-rES/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-eu/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-eu-rES/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-eu/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-gl-rES/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-gl/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-gl-rES/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-gl/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-ka-rGE/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ka/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-ka-rGE/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-ka/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-km-rKH/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-km/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-km-rKH/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-km/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-kn-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-kn/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-kn-rIN/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-kn/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-lo-rLA/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-lo/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-lo-rLA/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-lo/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-ml-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ml/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-ml-rIN/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-ml/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-mn-rMN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-mn-rMN/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-mr-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mr/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-mr-rIN/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-mr/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-my/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-my/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ne/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-ne/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-si-rLK/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-si/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-si-rLK/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-si/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-te-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-te/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-te-rIN/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-te/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-uz-rUZ/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-uz/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-uz-rUZ/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-uz/donottranslate-more-keys.xml