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-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-rBY/strings-action-keys.xml b/java/res/values-be/strings-action-keys.xml
similarity index 100%
rename from java/res/values-be-rBY/strings-action-keys.xml
rename to java/res/values-be/strings-action-keys.xml
diff --git a/java/res/values-be-rBY/strings-appname.xml b/java/res/values-be/strings-appname.xml
similarity index 100%
rename from java/res/values-be-rBY/strings-appname.xml
rename to java/res/values-be/strings-appname.xml
diff --git a/java/res/values-be-rBY/strings-config-important-notice.xml b/java/res/values-be/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-be-rBY/strings-config-important-notice.xml
rename to java/res/values-be/strings-config-important-notice.xml
diff --git a/java/res/values-be-rBY/strings-talkback-descriptions.xml b/java/res/values-be/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-be-rBY/strings-talkback-descriptions.xml
rename to java/res/values-be/strings-talkback-descriptions.xml
diff --git a/java/res/values-be-rBY/strings.xml b/java/res/values-be/strings.xml
similarity index 100%
rename from java/res/values-be-rBY/strings.xml
rename to java/res/values-be/strings.xml
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-rBA/strings-action-keys.xml b/java/res/values-bs/strings-action-keys.xml
similarity index 100%
rename from java/res/values-bs-rBA/strings-action-keys.xml
rename to java/res/values-bs/strings-action-keys.xml
diff --git a/java/res/values-bs-rBA/strings-appname.xml b/java/res/values-bs/strings-appname.xml
similarity index 100%
rename from java/res/values-bs-rBA/strings-appname.xml
rename to java/res/values-bs/strings-appname.xml
diff --git a/java/res/values-bs-rBA/strings-config-important-notice.xml b/java/res/values-bs/strings-config-important-notice.xml
similarity index 100%
rename from java/res/values-bs-rBA/strings-config-important-notice.xml
rename to java/res/values-bs/strings-config-important-notice.xml
diff --git a/java/res/values-bs-rBA/strings-talkback-descriptions.xml b/java/res/values-bs/strings-talkback-descriptions.xml
similarity index 100%
rename from java/res/values-bs-rBA/strings-talkback-descriptions.xml
rename to java/res/values-bs/strings-talkback-descriptions.xml
diff --git a/java/res/values-bs-rBA/strings.xml b/java/res/values-bs/strings.xml
similarity index 100%
rename from java/res/values-bs-rBA/strings.xml
rename to java/res/values-bs/strings.xml
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 100%
rename from java/res/values-ta-rIN/strings-emoji-descriptions.xml
rename to java/res/values-ta/strings-emoji-descriptions.xml
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 100%
rename from java/res/values-uz-rUZ/strings-talkback-descriptions.xml
rename to java/res/values-uz/strings-talkback-descriptions.xml
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/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