diff --git a/core/res/res/values-az-rAZ-watch/strings.xml b/core/res/res/values-az-watch/strings.xml
similarity index 100%
rename from core/res/res/values-az-rAZ-watch/strings.xml
rename to core/res/res/values-az-watch/strings.xml
diff --git a/core/res/res/values-az-rAZ-watch/styles_material.xml b/core/res/res/values-az-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-az-rAZ-watch/styles_material.xml
rename to core/res/res/values-az-watch/styles_material.xml
diff --git a/core/res/res/values-az-rAZ/strings.xml b/core/res/res/values-az/strings.xml
similarity index 100%
rename from core/res/res/values-az-rAZ/strings.xml
rename to core/res/res/values-az/strings.xml
diff --git a/core/res/res/values-be-rBY-watch/strings.xml b/core/res/res/values-be-watch/strings.xml
similarity index 100%
rename from core/res/res/values-be-rBY-watch/strings.xml
rename to core/res/res/values-be-watch/strings.xml
diff --git a/core/res/res/values-be-rBY-watch/styles_material.xml b/core/res/res/values-be-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-be-rBY-watch/styles_material.xml
rename to core/res/res/values-be-watch/styles_material.xml
diff --git a/core/res/res/values-be-rBY/strings.xml b/core/res/res/values-be/strings.xml
similarity index 100%
rename from core/res/res/values-be-rBY/strings.xml
rename to core/res/res/values-be/strings.xml
diff --git a/core/res/res/values-bn-rBD-watch/strings.xml b/core/res/res/values-bn-watch/strings.xml
similarity index 100%
rename from core/res/res/values-bn-rBD-watch/strings.xml
rename to core/res/res/values-bn-watch/strings.xml
diff --git a/core/res/res/values-bn-rBD-watch/styles_material.xml b/core/res/res/values-bn-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-bn-rBD-watch/styles_material.xml
rename to core/res/res/values-bn-watch/styles_material.xml
diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn/strings.xml
similarity index 100%
rename from core/res/res/values-bn-rBD/strings.xml
rename to core/res/res/values-bn/strings.xml
diff --git a/core/res/res/values-bs-rBA-watch/strings.xml b/core/res/res/values-bs-watch/strings.xml
similarity index 100%
rename from core/res/res/values-bs-rBA-watch/strings.xml
rename to core/res/res/values-bs-watch/strings.xml
diff --git a/core/res/res/values-bs-rBA-watch/styles_material.xml b/core/res/res/values-bs-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-bs-rBA-watch/styles_material.xml
rename to core/res/res/values-bs-watch/styles_material.xml
diff --git a/core/res/res/values-bs-rBA/strings.xml b/core/res/res/values-bs/strings.xml
similarity index 100%
rename from core/res/res/values-bs-rBA/strings.xml
rename to core/res/res/values-bs/strings.xml
diff --git a/core/res/res/values-et-rEE-watch/strings.xml b/core/res/res/values-et-watch/strings.xml
similarity index 100%
rename from core/res/res/values-et-rEE-watch/strings.xml
rename to core/res/res/values-et-watch/strings.xml
diff --git a/core/res/res/values-et-rEE-watch/styles_material.xml b/core/res/res/values-et-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-et-rEE-watch/styles_material.xml
rename to core/res/res/values-et-watch/styles_material.xml
diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et/strings.xml
similarity index 100%
rename from core/res/res/values-et-rEE/strings.xml
rename to core/res/res/values-et/strings.xml
diff --git a/core/res/res/values-eu-rES-watch/strings.xml b/core/res/res/values-eu-watch/strings.xml
similarity index 100%
rename from core/res/res/values-eu-rES-watch/strings.xml
rename to core/res/res/values-eu-watch/strings.xml
diff --git a/core/res/res/values-eu-rES-watch/styles_material.xml b/core/res/res/values-eu-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-eu-rES-watch/styles_material.xml
rename to core/res/res/values-eu-watch/styles_material.xml
diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu/strings.xml
similarity index 100%
rename from core/res/res/values-eu-rES/strings.xml
rename to core/res/res/values-eu/strings.xml
diff --git a/core/res/res/values-gl-rES-watch/strings.xml b/core/res/res/values-gl-watch/strings.xml
similarity index 100%
rename from core/res/res/values-gl-rES-watch/strings.xml
rename to core/res/res/values-gl-watch/strings.xml
diff --git a/core/res/res/values-gl-rES-watch/styles_material.xml b/core/res/res/values-gl-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-gl-rES-watch/styles_material.xml
rename to core/res/res/values-gl-watch/styles_material.xml
diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl/strings.xml
similarity index 100%
rename from core/res/res/values-gl-rES/strings.xml
rename to core/res/res/values-gl/strings.xml
diff --git a/core/res/res/values-gu-rIN-watch/strings.xml b/core/res/res/values-gu-watch/strings.xml
similarity index 100%
rename from core/res/res/values-gu-rIN-watch/strings.xml
rename to core/res/res/values-gu-watch/strings.xml
diff --git a/core/res/res/values-gu-rIN-watch/styles_material.xml b/core/res/res/values-gu-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-gu-rIN-watch/styles_material.xml
rename to core/res/res/values-gu-watch/styles_material.xml
diff --git a/core/res/res/values-gu-rIN/strings.xml b/core/res/res/values-gu/strings.xml
similarity index 100%
rename from core/res/res/values-gu-rIN/strings.xml
rename to core/res/res/values-gu/strings.xml
diff --git a/core/res/res/values-hy-rAM-watch/strings.xml b/core/res/res/values-hy-watch/strings.xml
similarity index 100%
rename from core/res/res/values-hy-rAM-watch/strings.xml
rename to core/res/res/values-hy-watch/strings.xml
diff --git a/core/res/res/values-hy-rAM-watch/styles_material.xml b/core/res/res/values-hy-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-hy-rAM-watch/styles_material.xml
rename to core/res/res/values-hy-watch/styles_material.xml
diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy/strings.xml
similarity index 100%
rename from core/res/res/values-hy-rAM/strings.xml
rename to core/res/res/values-hy/strings.xml
diff --git a/core/res/res/values-is-rIS-watch/strings.xml b/core/res/res/values-is-watch/strings.xml
similarity index 100%
rename from core/res/res/values-is-rIS-watch/strings.xml
rename to core/res/res/values-is-watch/strings.xml
diff --git a/core/res/res/values-is-rIS-watch/styles_material.xml b/core/res/res/values-is-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-is-rIS-watch/styles_material.xml
rename to core/res/res/values-is-watch/styles_material.xml
diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is/strings.xml
similarity index 100%
rename from core/res/res/values-is-rIS/strings.xml
rename to core/res/res/values-is/strings.xml
diff --git a/core/res/res/values-ka-rGE-watch/strings.xml b/core/res/res/values-ka-watch/strings.xml
similarity index 100%
rename from core/res/res/values-ka-rGE-watch/strings.xml
rename to core/res/res/values-ka-watch/strings.xml
diff --git a/core/res/res/values-ka-rGE-watch/styles_material.xml b/core/res/res/values-ka-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-ka-rGE-watch/styles_material.xml
rename to core/res/res/values-ka-watch/styles_material.xml
diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka/strings.xml
similarity index 100%
rename from core/res/res/values-ka-rGE/strings.xml
rename to core/res/res/values-ka/strings.xml
diff --git a/core/res/res/values-kk-rKZ-watch/strings.xml b/core/res/res/values-kk-watch/strings.xml
similarity index 100%
rename from core/res/res/values-kk-rKZ-watch/strings.xml
rename to core/res/res/values-kk-watch/strings.xml
diff --git a/core/res/res/values-kk-rKZ-watch/styles_material.xml b/core/res/res/values-kk-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-kk-rKZ-watch/styles_material.xml
rename to core/res/res/values-kk-watch/styles_material.xml
diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk/strings.xml
similarity index 100%
rename from core/res/res/values-kk-rKZ/strings.xml
rename to core/res/res/values-kk/strings.xml
diff --git a/core/res/res/values-km-rKH-watch/strings.xml b/core/res/res/values-km-watch/strings.xml
similarity index 100%
rename from core/res/res/values-km-rKH-watch/strings.xml
rename to core/res/res/values-km-watch/strings.xml
diff --git a/core/res/res/values-km-rKH-watch/styles_material.xml b/core/res/res/values-km-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-km-rKH-watch/styles_material.xml
rename to core/res/res/values-km-watch/styles_material.xml
diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km/strings.xml
similarity index 100%
rename from core/res/res/values-km-rKH/strings.xml
rename to core/res/res/values-km/strings.xml
diff --git a/core/res/res/values-kn-rIN-watch/strings.xml b/core/res/res/values-kn-watch/strings.xml
similarity index 100%
rename from core/res/res/values-kn-rIN-watch/strings.xml
rename to core/res/res/values-kn-watch/strings.xml
diff --git a/core/res/res/values-kn-rIN-watch/styles_material.xml b/core/res/res/values-kn-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-kn-rIN-watch/styles_material.xml
rename to core/res/res/values-kn-watch/styles_material.xml
diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn/strings.xml
similarity index 100%
rename from core/res/res/values-kn-rIN/strings.xml
rename to core/res/res/values-kn/strings.xml
diff --git a/core/res/res/values-ky-rKG-watch/strings.xml b/core/res/res/values-ky-watch/strings.xml
similarity index 100%
rename from core/res/res/values-ky-rKG-watch/strings.xml
rename to core/res/res/values-ky-watch/strings.xml
diff --git a/core/res/res/values-ky-rKG-watch/styles_material.xml b/core/res/res/values-ky-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-ky-rKG-watch/styles_material.xml
rename to core/res/res/values-ky-watch/styles_material.xml
diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky/strings.xml
similarity index 100%
rename from core/res/res/values-ky-rKG/strings.xml
rename to core/res/res/values-ky/strings.xml
diff --git a/core/res/res/values-lo-rLA-watch/strings.xml b/core/res/res/values-lo-watch/strings.xml
similarity index 100%
rename from core/res/res/values-lo-rLA-watch/strings.xml
rename to core/res/res/values-lo-watch/strings.xml
diff --git a/core/res/res/values-lo-rLA-watch/styles_material.xml b/core/res/res/values-lo-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-lo-rLA-watch/styles_material.xml
rename to core/res/res/values-lo-watch/styles_material.xml
diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo/strings.xml
similarity index 100%
rename from core/res/res/values-lo-rLA/strings.xml
rename to core/res/res/values-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc160-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc160-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc160-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc160-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc160-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc160-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc160-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc160-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc160-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc160-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc160-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc160-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc160-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc160-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc160-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc160-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc160-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc160-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc160-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc160-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc160-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc160-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc160-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc160-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc160-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc160-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc160-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc160-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc160-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc160-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc160-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc160-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc160-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc160-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc160-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc160-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc160-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc160-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc160-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc160-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc160-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc160-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc160-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc160-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc160-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc160-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc160-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc160-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc160-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc160-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc160-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc160-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc160-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc160-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc160-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc160-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc160-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc160-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc160-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc160-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc160-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc160-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc200-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc200-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc200-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc200-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc200-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc200-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc200-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc200-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc200-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc200-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc200-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc200-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc200-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc200-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc200-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc200-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc200-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc200-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc200-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc200-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc200-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc200-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc200-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc200-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc200-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc200-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc200-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc200-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc200-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc200-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc200-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc200-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc200-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc200-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc200-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc200-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc200-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc200-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc200-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc200-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc200-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc200-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc200-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc200-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc200-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc200-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc200-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc200-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc200-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc200-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc200-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc200-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc200-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc200-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc200-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc200-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc210-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc210-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc210-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc210-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc210-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc210-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc210-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc210-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc210-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc210-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc210-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc210-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc210-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc210-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc210-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc210-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc210-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc210-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc210-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc210-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc210-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc210-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc210-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc210-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc210-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc210-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc210-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc210-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc210-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc210-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc210-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc210-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc210-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc210-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc210-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc210-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc210-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc210-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc210-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc210-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc210-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc210-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc210-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc210-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc210-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc210-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc210-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc210-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc210-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc210-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc210-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc210-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc210-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc210-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc210-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc210-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc220-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc220-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc220-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc220-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc220-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc220-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc220-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc220-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc220-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc220-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc220-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc220-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc220-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc220-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc220-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc220-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc220-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc220-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc220-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc220-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc220-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc220-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc220-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc220-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc220-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc220-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc220-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc220-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc220-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc220-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc220-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc220-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc220-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc220-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc220-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc220-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc220-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc220-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc220-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc220-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc220-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc220-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc220-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc220-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc220-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc220-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc220-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc220-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc220-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc220-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc220-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc220-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc220-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc220-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc220-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc220-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc230-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc230-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc230-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc230-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc230-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc230-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc230-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc230-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc230-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc230-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc230-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc230-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc230-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc230-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc230-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc230-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc230-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc230-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc230-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc230-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc230-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc230-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc230-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc230-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc230-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc230-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc230-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc230-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc230-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc230-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc230-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc230-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc230-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc230-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc230-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc230-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc230-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc230-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc230-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc230-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc230-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc230-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc230-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc230-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc230-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc230-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc230-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc230-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc230-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc230-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc230-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc230-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc230-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc230-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc230-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc230-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc240-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc240-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc240-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc240-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc240-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc240-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc240-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc240-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc240-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc240-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc240-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc240-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc240-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc240-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc240-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc240-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc240-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc240-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc240-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc240-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc240-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc240-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc240-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc240-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc240-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc240-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc240-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc240-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc240-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc240-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc240-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc240-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc240-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc240-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc240-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc240-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc240-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc240-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc240-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc240-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc240-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc240-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc240-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc240-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc240-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc240-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc240-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc240-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc240-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc240-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc240-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc240-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc240-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc240-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc240-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc240-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc250-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc250-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc250-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc250-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc250-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc250-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc250-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc250-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc250-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc250-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc250-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc250-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc250-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc250-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc250-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc250-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc250-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc250-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc250-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc250-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc250-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc250-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc250-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc250-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc250-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc250-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc250-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc250-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc250-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc250-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc250-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc250-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc250-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc250-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc250-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc250-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc250-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc250-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc250-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc250-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc250-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc250-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc250-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc250-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc250-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc250-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc250-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc250-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc250-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc250-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc250-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc250-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc250-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc250-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc250-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc250-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc260-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc260-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc260-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc260-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc260-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc260-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc260-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc260-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc260-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc260-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc260-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc260-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc260-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc260-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc260-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc260-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc260-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc260-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc260-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc260-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc260-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc260-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc260-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc260-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc260-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc260-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc260-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc260-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc260-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc260-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc260-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc260-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc260-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc260-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc260-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc260-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc260-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc260-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc260-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc260-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc260-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc260-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc260-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc260-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc260-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc260-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc260-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc260-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc260-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc260-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc260-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc260-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc260-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc260-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc260-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc260-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc260-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc260-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc260-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc260-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc260-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc260-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc270-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc270-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc270-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc270-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc270-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc270-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc270-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc270-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc270-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc270-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc270-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc270-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc270-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc270-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc270-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc270-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc270-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc270-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc270-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc270-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc270-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc270-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc270-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc270-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc270-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc270-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc270-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc270-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc270-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc270-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc270-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc270-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc270-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc270-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc270-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc270-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc270-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc270-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc270-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc270-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc270-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc270-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc270-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc270-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc270-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc270-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc270-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc270-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc270-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc270-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc270-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc270-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc270-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc270-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc270-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc270-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc310-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc310-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc310-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc310-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc310-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc310-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc310-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc310-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc310-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc310-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc310-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc310-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc310-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc310-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc310-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc310-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc310-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc310-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc310-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc310-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc310-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc310-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc310-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc310-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc310-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc310-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc310-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc310-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc310-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc310-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc310-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc310-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc310-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc310-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc310-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc310-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc310-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc310-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc310-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc310-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc310-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc310-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc310-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc310-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc310-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc310-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc310-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc310-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc310-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc310-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc310-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc310-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc310-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc310-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc310-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc310-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc490-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc490-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc490-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc490-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc490-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc490-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc490-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc490-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc490-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc490-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc490-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc490-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc490-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc490-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc490-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc490-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc490-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc490-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc490-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc490-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc490-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc490-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc490-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc490-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc490-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc490-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc490-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc490-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc490-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc490-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc490-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc490-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc490-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc490-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc490-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc490-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc490-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc490-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc490-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc490-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc490-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc490-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc490-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc490-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc490-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc490-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc490-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc490-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc490-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc490-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc490-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc490-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc490-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc490-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc490-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc490-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc660-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc660-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc660-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc660-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc660-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc660-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc660-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc660-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc660-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc660-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc660-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc660-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc660-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc660-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc660-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc660-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc660-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc660-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc660-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc660-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc660-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc660-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc660-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc660-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc660-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc660-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc660-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc660-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc660-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc660-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc660-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc660-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc660-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc660-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc660-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc660-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc660-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc660-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc660-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc660-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc660-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc660-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc660-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc660-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc660-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc660-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc660-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc660-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc660-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc660-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc660-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc660-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc660-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc660-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc660-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc660-uz/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-az-rAZ/strings.xml b/core/res/res/values-mcc310-mnc800-az/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-az-rAZ/strings.xml
rename to core/res/res/values-mcc310-mnc800-az/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc800-be/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-be-rBY/strings.xml
rename to core/res/res/values-mcc310-mnc800-be/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-bn-rBD/strings.xml b/core/res/res/values-mcc310-mnc800-bn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-bn-rBD/strings.xml
rename to core/res/res/values-mcc310-mnc800-bn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc800-bs/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-bs-rBA/strings.xml
rename to core/res/res/values-mcc310-mnc800-bs/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-et-rEE/strings.xml b/core/res/res/values-mcc310-mnc800-et/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-et-rEE/strings.xml
rename to core/res/res/values-mcc310-mnc800-et/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-eu-rES/strings.xml b/core/res/res/values-mcc310-mnc800-eu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-eu-rES/strings.xml
rename to core/res/res/values-mcc310-mnc800-eu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-gl-rES/strings.xml b/core/res/res/values-mcc310-mnc800-gl/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-gl-rES/strings.xml
rename to core/res/res/values-mcc310-mnc800-gl/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-gu-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-gu/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-gu-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc800-gu/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-hy-rAM/strings.xml b/core/res/res/values-mcc310-mnc800-hy/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-hy-rAM/strings.xml
rename to core/res/res/values-mcc310-mnc800-hy/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-is-rIS/strings.xml b/core/res/res/values-mcc310-mnc800-is/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-is-rIS/strings.xml
rename to core/res/res/values-mcc310-mnc800-is/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-ka-rGE/strings.xml b/core/res/res/values-mcc310-mnc800-ka/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-ka-rGE/strings.xml
rename to core/res/res/values-mcc310-mnc800-ka/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-kk-rKZ/strings.xml b/core/res/res/values-mcc310-mnc800-kk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-kk-rKZ/strings.xml
rename to core/res/res/values-mcc310-mnc800-kk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-km-rKH/strings.xml b/core/res/res/values-mcc310-mnc800-km/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-km-rKH/strings.xml
rename to core/res/res/values-mcc310-mnc800-km/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-kn-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-kn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-kn-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc800-kn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-ky-rKG/strings.xml b/core/res/res/values-mcc310-mnc800-ky/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-ky-rKG/strings.xml
rename to core/res/res/values-mcc310-mnc800-ky/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-lo-rLA/strings.xml b/core/res/res/values-mcc310-mnc800-lo/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-lo-rLA/strings.xml
rename to core/res/res/values-mcc310-mnc800-lo/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-mk-rMK/strings.xml b/core/res/res/values-mcc310-mnc800-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-mk-rMK/strings.xml
rename to core/res/res/values-mcc310-mnc800-mk/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-ml-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-ml/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-ml-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc800-ml/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-mn-rMN/strings.xml b/core/res/res/values-mcc310-mnc800-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-mn-rMN/strings.xml
rename to core/res/res/values-mcc310-mnc800-mn/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-mr-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-mr-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc800-mr/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-ms-rMY/strings.xml b/core/res/res/values-mcc310-mnc800-ms/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-ms-rMY/strings.xml
rename to core/res/res/values-mcc310-mnc800-ms/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-my-rMM/strings.xml b/core/res/res/values-mcc310-mnc800-my/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-my-rMM/strings.xml
rename to core/res/res/values-mcc310-mnc800-my/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-ne-rNP/strings.xml b/core/res/res/values-mcc310-mnc800-ne/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-ne-rNP/strings.xml
rename to core/res/res/values-mcc310-mnc800-ne/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-pa-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-pa/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-pa-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc800-pa/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-si-rLK/strings.xml b/core/res/res/values-mcc310-mnc800-si/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-si-rLK/strings.xml
rename to core/res/res/values-mcc310-mnc800-si/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-sq-rAL/strings.xml b/core/res/res/values-mcc310-mnc800-sq/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-sq-rAL/strings.xml
rename to core/res/res/values-mcc310-mnc800-sq/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-ta-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-ta/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-ta-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc800-ta/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-te-rIN/strings.xml b/core/res/res/values-mcc310-mnc800-te/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-te-rIN/strings.xml
rename to core/res/res/values-mcc310-mnc800-te/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-ur-rPK/strings.xml b/core/res/res/values-mcc310-mnc800-ur/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-ur-rPK/strings.xml
rename to core/res/res/values-mcc310-mnc800-ur/strings.xml
diff --git a/core/res/res/values-mcc310-mnc800-uz-rUZ/strings.xml b/core/res/res/values-mcc310-mnc800-uz/strings.xml
similarity index 100%
rename from core/res/res/values-mcc310-mnc800-uz-rUZ/strings.xml
rename to core/res/res/values-mcc310-mnc800-uz/strings.xml
diff --git a/core/res/res/values-mk-rMK-watch/strings.xml b/core/res/res/values-mk-watch/strings.xml
similarity index 100%
rename from core/res/res/values-mk-rMK-watch/strings.xml
rename to core/res/res/values-mk-watch/strings.xml
diff --git a/core/res/res/values-mk-rMK-watch/styles_material.xml b/core/res/res/values-mk-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-mk-rMK-watch/styles_material.xml
rename to core/res/res/values-mk-watch/styles_material.xml
diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk/strings.xml
similarity index 100%
rename from core/res/res/values-mk-rMK/strings.xml
rename to core/res/res/values-mk/strings.xml
diff --git a/core/res/res/values-ml-rIN-watch/strings.xml b/core/res/res/values-ml-watch/strings.xml
similarity index 100%
rename from core/res/res/values-ml-rIN-watch/strings.xml
rename to core/res/res/values-ml-watch/strings.xml
diff --git a/core/res/res/values-ml-rIN-watch/styles_material.xml b/core/res/res/values-ml-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-ml-rIN-watch/styles_material.xml
rename to core/res/res/values-ml-watch/styles_material.xml
diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml/strings.xml
similarity index 100%
rename from core/res/res/values-ml-rIN/strings.xml
rename to core/res/res/values-ml/strings.xml
diff --git a/core/res/res/values-mn-rMN-watch/strings.xml b/core/res/res/values-mn-watch/strings.xml
similarity index 100%
rename from core/res/res/values-mn-rMN-watch/strings.xml
rename to core/res/res/values-mn-watch/strings.xml
diff --git a/core/res/res/values-mn-rMN-watch/styles_material.xml b/core/res/res/values-mn-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-mn-rMN-watch/styles_material.xml
rename to core/res/res/values-mn-watch/styles_material.xml
diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn/strings.xml
similarity index 100%
rename from core/res/res/values-mn-rMN/strings.xml
rename to core/res/res/values-mn/strings.xml
diff --git a/core/res/res/values-mr-rIN-watch/strings.xml b/core/res/res/values-mr-watch/strings.xml
similarity index 100%
rename from core/res/res/values-mr-rIN-watch/strings.xml
rename to core/res/res/values-mr-watch/strings.xml
diff --git a/core/res/res/values-mr-rIN-watch/styles_material.xml b/core/res/res/values-mr-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-mr-rIN-watch/styles_material.xml
rename to core/res/res/values-mr-watch/styles_material.xml
diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr/strings.xml
similarity index 100%
rename from core/res/res/values-mr-rIN/strings.xml
rename to core/res/res/values-mr/strings.xml
diff --git a/core/res/res/values-ms-rMY-watch/strings.xml b/core/res/res/values-ms-watch/strings.xml
similarity index 100%
rename from core/res/res/values-ms-rMY-watch/strings.xml
rename to core/res/res/values-ms-watch/strings.xml
diff --git a/core/res/res/values-ms-rMY-watch/styles_material.xml b/core/res/res/values-ms-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-ms-rMY-watch/styles_material.xml
rename to core/res/res/values-ms-watch/styles_material.xml
diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms/strings.xml
similarity index 100%
rename from core/res/res/values-ms-rMY/strings.xml
rename to core/res/res/values-ms/strings.xml
diff --git a/core/res/res/values-my-rMM-watch/strings.xml b/core/res/res/values-my-watch/strings.xml
similarity index 100%
rename from core/res/res/values-my-rMM-watch/strings.xml
rename to core/res/res/values-my-watch/strings.xml
diff --git a/core/res/res/values-my-rMM-watch/styles_material.xml b/core/res/res/values-my-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-my-rMM-watch/styles_material.xml
rename to core/res/res/values-my-watch/styles_material.xml
diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my/strings.xml
similarity index 100%
rename from core/res/res/values-my-rMM/strings.xml
rename to core/res/res/values-my/strings.xml
diff --git a/core/res/res/values-ne-rNP-watch/strings.xml b/core/res/res/values-ne-watch/strings.xml
similarity index 100%
rename from core/res/res/values-ne-rNP-watch/strings.xml
rename to core/res/res/values-ne-watch/strings.xml
diff --git a/core/res/res/values-ne-rNP-watch/styles_material.xml b/core/res/res/values-ne-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-ne-rNP-watch/styles_material.xml
rename to core/res/res/values-ne-watch/styles_material.xml
diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne/strings.xml
similarity index 100%
rename from core/res/res/values-ne-rNP/strings.xml
rename to core/res/res/values-ne/strings.xml
diff --git a/core/res/res/values-pa-rIN-watch/strings.xml b/core/res/res/values-pa-watch/strings.xml
similarity index 100%
rename from core/res/res/values-pa-rIN-watch/strings.xml
rename to core/res/res/values-pa-watch/strings.xml
diff --git a/core/res/res/values-pa-rIN-watch/styles_material.xml b/core/res/res/values-pa-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-pa-rIN-watch/styles_material.xml
rename to core/res/res/values-pa-watch/styles_material.xml
diff --git a/core/res/res/values-pa-rIN/strings.xml b/core/res/res/values-pa/strings.xml
similarity index 100%
rename from core/res/res/values-pa-rIN/strings.xml
rename to core/res/res/values-pa/strings.xml
diff --git a/core/res/res/values-si-rLK-watch/strings.xml b/core/res/res/values-si-watch/strings.xml
similarity index 100%
rename from core/res/res/values-si-rLK-watch/strings.xml
rename to core/res/res/values-si-watch/strings.xml
diff --git a/core/res/res/values-si-rLK-watch/styles_material.xml b/core/res/res/values-si-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-si-rLK-watch/styles_material.xml
rename to core/res/res/values-si-watch/styles_material.xml
diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si/strings.xml
similarity index 100%
rename from core/res/res/values-si-rLK/strings.xml
rename to core/res/res/values-si/strings.xml
diff --git a/core/res/res/values-sq-rAL-watch/strings.xml b/core/res/res/values-sq-watch/strings.xml
similarity index 100%
rename from core/res/res/values-sq-rAL-watch/strings.xml
rename to core/res/res/values-sq-watch/strings.xml
diff --git a/core/res/res/values-sq-rAL-watch/styles_material.xml b/core/res/res/values-sq-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-sq-rAL-watch/styles_material.xml
rename to core/res/res/values-sq-watch/styles_material.xml
diff --git a/core/res/res/values-sq-rAL/strings.xml b/core/res/res/values-sq/strings.xml
similarity index 100%
rename from core/res/res/values-sq-rAL/strings.xml
rename to core/res/res/values-sq/strings.xml
diff --git a/core/res/res/values-ta-rIN-watch/strings.xml b/core/res/res/values-ta-watch/strings.xml
similarity index 100%
rename from core/res/res/values-ta-rIN-watch/strings.xml
rename to core/res/res/values-ta-watch/strings.xml
diff --git a/core/res/res/values-ta-rIN-watch/styles_material.xml b/core/res/res/values-ta-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-ta-rIN-watch/styles_material.xml
rename to core/res/res/values-ta-watch/styles_material.xml
diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta/strings.xml
similarity index 100%
rename from core/res/res/values-ta-rIN/strings.xml
rename to core/res/res/values-ta/strings.xml
diff --git a/core/res/res/values-te-rIN-watch/strings.xml b/core/res/res/values-te-watch/strings.xml
similarity index 100%
rename from core/res/res/values-te-rIN-watch/strings.xml
rename to core/res/res/values-te-watch/strings.xml
diff --git a/core/res/res/values-te-rIN-watch/styles_material.xml b/core/res/res/values-te-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-te-rIN-watch/styles_material.xml
rename to core/res/res/values-te-watch/styles_material.xml
diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te/strings.xml
similarity index 100%
rename from core/res/res/values-te-rIN/strings.xml
rename to core/res/res/values-te/strings.xml
diff --git a/core/res/res/values-ur-rPK-watch/strings.xml b/core/res/res/values-ur-watch/strings.xml
similarity index 100%
rename from core/res/res/values-ur-rPK-watch/strings.xml
rename to core/res/res/values-ur-watch/strings.xml
diff --git a/core/res/res/values-ur-rPK-watch/styles_material.xml b/core/res/res/values-ur-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-ur-rPK-watch/styles_material.xml
rename to core/res/res/values-ur-watch/styles_material.xml
diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur/strings.xml
similarity index 100%
rename from core/res/res/values-ur-rPK/strings.xml
rename to core/res/res/values-ur/strings.xml
diff --git a/core/res/res/values-uz-rUZ-watch/strings.xml b/core/res/res/values-uz-watch/strings.xml
similarity index 100%
rename from core/res/res/values-uz-rUZ-watch/strings.xml
rename to core/res/res/values-uz-watch/strings.xml
diff --git a/core/res/res/values-uz-rUZ-watch/styles_material.xml b/core/res/res/values-uz-watch/styles_material.xml
similarity index 100%
rename from core/res/res/values-uz-rUZ-watch/styles_material.xml
rename to core/res/res/values-uz-watch/styles_material.xml
diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz/strings.xml
similarity index 100%
rename from core/res/res/values-uz-rUZ/strings.xml
rename to core/res/res/values-uz/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-az-rAZ/strings.xml b/packages/BackupRestoreConfirmation/res/values-az/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-az-rAZ/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-az/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-be-rBY/strings.xml b/packages/BackupRestoreConfirmation/res/values-be/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-be-rBY/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-be/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-bn-rBD/strings.xml b/packages/BackupRestoreConfirmation/res/values-bn/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-bn-rBD/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-bn/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-bs-rBA/strings.xml b/packages/BackupRestoreConfirmation/res/values-bs/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-bs-rBA/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-bs/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-et-rEE/strings.xml b/packages/BackupRestoreConfirmation/res/values-et/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-et-rEE/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-et/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-eu-rES/strings.xml b/packages/BackupRestoreConfirmation/res/values-eu/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-eu-rES/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-eu/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-gl-rES/strings.xml b/packages/BackupRestoreConfirmation/res/values-gl/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-gl-rES/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-gl/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-gu-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-gu/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-gu-rIN/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-gu/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-hy-rAM/strings.xml b/packages/BackupRestoreConfirmation/res/values-hy/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-hy-rAM/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-hy/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-is-rIS/strings.xml b/packages/BackupRestoreConfirmation/res/values-is/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-is-rIS/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-is/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-ka-rGE/strings.xml b/packages/BackupRestoreConfirmation/res/values-ka/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-ka-rGE/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-ka/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-kk-rKZ/strings.xml b/packages/BackupRestoreConfirmation/res/values-kk/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-kk-rKZ/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-kk/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-km-rKH/strings.xml b/packages/BackupRestoreConfirmation/res/values-km/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-km-rKH/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-km/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-kn-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-kn/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-kn-rIN/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-kn/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-ky-rKG/strings.xml b/packages/BackupRestoreConfirmation/res/values-ky/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-ky-rKG/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-ky/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-lo-rLA/strings.xml b/packages/BackupRestoreConfirmation/res/values-lo/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-lo-rLA/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-lo/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-mk-rMK/strings.xml b/packages/BackupRestoreConfirmation/res/values-mk/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-mk-rMK/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-mk/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-ml-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-ml/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-ml-rIN/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-ml/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-mn-rMN/strings.xml b/packages/BackupRestoreConfirmation/res/values-mn/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-mn-rMN/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-mn/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-mr-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-mr/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-mr-rIN/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-mr/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-ms-rMY/strings.xml b/packages/BackupRestoreConfirmation/res/values-ms/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-ms-rMY/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-ms/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml b/packages/BackupRestoreConfirmation/res/values-my/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-my-rMM/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-my/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-ne-rNP/strings.xml b/packages/BackupRestoreConfirmation/res/values-ne/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-ne-rNP/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-ne/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-pa-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-pa/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-pa-rIN/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-pa/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-si-rLK/strings.xml b/packages/BackupRestoreConfirmation/res/values-si/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-si-rLK/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-si/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-sq-rAL/strings.xml b/packages/BackupRestoreConfirmation/res/values-sq/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-sq-rAL/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-sq/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-ta-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-ta/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-ta-rIN/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-ta/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-te-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-te/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-te-rIN/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-te/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-ur-rPK/strings.xml b/packages/BackupRestoreConfirmation/res/values-ur/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-ur-rPK/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-ur/strings.xml
diff --git a/packages/BackupRestoreConfirmation/res/values-uz-rUZ/strings.xml b/packages/BackupRestoreConfirmation/res/values-uz/strings.xml
similarity index 100%
rename from packages/BackupRestoreConfirmation/res/values-uz-rUZ/strings.xml
rename to packages/BackupRestoreConfirmation/res/values-uz/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-az-rAZ/strings.xml b/packages/CaptivePortalLogin/res/values-az/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-az-rAZ/strings.xml
rename to packages/CaptivePortalLogin/res/values-az/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-be-rBY/strings.xml b/packages/CaptivePortalLogin/res/values-be/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-be-rBY/strings.xml
rename to packages/CaptivePortalLogin/res/values-be/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml b/packages/CaptivePortalLogin/res/values-bn/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml
rename to packages/CaptivePortalLogin/res/values-bn/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-bs-rBA/strings.xml b/packages/CaptivePortalLogin/res/values-bs/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-bs-rBA/strings.xml
rename to packages/CaptivePortalLogin/res/values-bs/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-et-rEE/strings.xml b/packages/CaptivePortalLogin/res/values-et/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-et-rEE/strings.xml
rename to packages/CaptivePortalLogin/res/values-et/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-eu-rES/strings.xml b/packages/CaptivePortalLogin/res/values-eu/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-eu-rES/strings.xml
rename to packages/CaptivePortalLogin/res/values-eu/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-gl-rES/strings.xml b/packages/CaptivePortalLogin/res/values-gl/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-gl-rES/strings.xml
rename to packages/CaptivePortalLogin/res/values-gl/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-gu-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-gu/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-gu-rIN/strings.xml
rename to packages/CaptivePortalLogin/res/values-gu/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-hy-rAM/strings.xml b/packages/CaptivePortalLogin/res/values-hy/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-hy-rAM/strings.xml
rename to packages/CaptivePortalLogin/res/values-hy/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-is-rIS/strings.xml b/packages/CaptivePortalLogin/res/values-is/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-is-rIS/strings.xml
rename to packages/CaptivePortalLogin/res/values-is/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-ka-rGE/strings.xml b/packages/CaptivePortalLogin/res/values-ka/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-ka-rGE/strings.xml
rename to packages/CaptivePortalLogin/res/values-ka/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-kk-rKZ/strings.xml b/packages/CaptivePortalLogin/res/values-kk/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-kk-rKZ/strings.xml
rename to packages/CaptivePortalLogin/res/values-kk/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-km-rKH/strings.xml b/packages/CaptivePortalLogin/res/values-km/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-km-rKH/strings.xml
rename to packages/CaptivePortalLogin/res/values-km/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-kn-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-kn/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-kn-rIN/strings.xml
rename to packages/CaptivePortalLogin/res/values-kn/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-ky-rKG/strings.xml b/packages/CaptivePortalLogin/res/values-ky/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-ky-rKG/strings.xml
rename to packages/CaptivePortalLogin/res/values-ky/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-lo-rLA/strings.xml b/packages/CaptivePortalLogin/res/values-lo/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-lo-rLA/strings.xml
rename to packages/CaptivePortalLogin/res/values-lo/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-mk-rMK/strings.xml b/packages/CaptivePortalLogin/res/values-mk/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-mk-rMK/strings.xml
rename to packages/CaptivePortalLogin/res/values-mk/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-ml-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-ml/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-ml-rIN/strings.xml
rename to packages/CaptivePortalLogin/res/values-ml/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-mn-rMN/strings.xml b/packages/CaptivePortalLogin/res/values-mn/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-mn-rMN/strings.xml
rename to packages/CaptivePortalLogin/res/values-mn/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-mr-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-mr/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-mr-rIN/strings.xml
rename to packages/CaptivePortalLogin/res/values-mr/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-ms-rMY/strings.xml b/packages/CaptivePortalLogin/res/values-ms/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-ms-rMY/strings.xml
rename to packages/CaptivePortalLogin/res/values-ms/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml b/packages/CaptivePortalLogin/res/values-my/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-my-rMM/strings.xml
rename to packages/CaptivePortalLogin/res/values-my/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-ne-rNP/strings.xml b/packages/CaptivePortalLogin/res/values-ne/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-ne-rNP/strings.xml
rename to packages/CaptivePortalLogin/res/values-ne/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-pa-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-pa/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-pa-rIN/strings.xml
rename to packages/CaptivePortalLogin/res/values-pa/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-si-rLK/strings.xml b/packages/CaptivePortalLogin/res/values-si/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-si-rLK/strings.xml
rename to packages/CaptivePortalLogin/res/values-si/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-sq-rAL/strings.xml b/packages/CaptivePortalLogin/res/values-sq/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-sq-rAL/strings.xml
rename to packages/CaptivePortalLogin/res/values-sq/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-ta-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-ta/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-ta-rIN/strings.xml
rename to packages/CaptivePortalLogin/res/values-ta/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-te-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-te/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-te-rIN/strings.xml
rename to packages/CaptivePortalLogin/res/values-te/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-ur-rPK/strings.xml b/packages/CaptivePortalLogin/res/values-ur/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-ur-rPK/strings.xml
rename to packages/CaptivePortalLogin/res/values-ur/strings.xml
diff --git a/packages/CaptivePortalLogin/res/values-uz-rUZ/strings.xml b/packages/CaptivePortalLogin/res/values-uz/strings.xml
similarity index 100%
rename from packages/CaptivePortalLogin/res/values-uz-rUZ/strings.xml
rename to packages/CaptivePortalLogin/res/values-uz/strings.xml
diff --git a/packages/DefaultContainerService/res/values-az-rAZ/strings.xml b/packages/DefaultContainerService/res/values-az/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-az-rAZ/strings.xml
rename to packages/DefaultContainerService/res/values-az/strings.xml
diff --git a/packages/DefaultContainerService/res/values-be-rBY/strings.xml b/packages/DefaultContainerService/res/values-be/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-be-rBY/strings.xml
rename to packages/DefaultContainerService/res/values-be/strings.xml
diff --git a/packages/DefaultContainerService/res/values-bn-rBD/strings.xml b/packages/DefaultContainerService/res/values-bn/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-bn-rBD/strings.xml
rename to packages/DefaultContainerService/res/values-bn/strings.xml
diff --git a/packages/DefaultContainerService/res/values-bs-rBA/strings.xml b/packages/DefaultContainerService/res/values-bs/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-bs-rBA/strings.xml
rename to packages/DefaultContainerService/res/values-bs/strings.xml
diff --git a/packages/DefaultContainerService/res/values-et-rEE/strings.xml b/packages/DefaultContainerService/res/values-et/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-et-rEE/strings.xml
rename to packages/DefaultContainerService/res/values-et/strings.xml
diff --git a/packages/DefaultContainerService/res/values-eu-rES/strings.xml b/packages/DefaultContainerService/res/values-eu/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-eu-rES/strings.xml
rename to packages/DefaultContainerService/res/values-eu/strings.xml
diff --git a/packages/DefaultContainerService/res/values-gl-rES/strings.xml b/packages/DefaultContainerService/res/values-gl/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-gl-rES/strings.xml
rename to packages/DefaultContainerService/res/values-gl/strings.xml
diff --git a/packages/DefaultContainerService/res/values-gu-rIN/strings.xml b/packages/DefaultContainerService/res/values-gu/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-gu-rIN/strings.xml
rename to packages/DefaultContainerService/res/values-gu/strings.xml
diff --git a/packages/DefaultContainerService/res/values-hy-rAM/strings.xml b/packages/DefaultContainerService/res/values-hy/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-hy-rAM/strings.xml
rename to packages/DefaultContainerService/res/values-hy/strings.xml
diff --git a/packages/DefaultContainerService/res/values-is-rIS/strings.xml b/packages/DefaultContainerService/res/values-is/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-is-rIS/strings.xml
rename to packages/DefaultContainerService/res/values-is/strings.xml
diff --git a/packages/DefaultContainerService/res/values-ka-rGE/strings.xml b/packages/DefaultContainerService/res/values-ka/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-ka-rGE/strings.xml
rename to packages/DefaultContainerService/res/values-ka/strings.xml
diff --git a/packages/DefaultContainerService/res/values-kk-rKZ/strings.xml b/packages/DefaultContainerService/res/values-kk-rKZ/strings.xml
deleted file mode 100644
index 216d715..0000000
--- a/packages/DefaultContainerService/res/values-kk-rKZ/strings.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="service_name" msgid="4841491635055379553">"Package Access Helper"</string>
-</resources>
diff --git a/packages/DefaultContainerService/res/values-ka-rGE/strings.xml b/packages/DefaultContainerService/res/values-kk/strings.xml
similarity index 100%
copy from packages/DefaultContainerService/res/values-ka-rGE/strings.xml
copy to packages/DefaultContainerService/res/values-kk/strings.xml
diff --git a/packages/DefaultContainerService/res/values-km-rKH/strings.xml b/packages/DefaultContainerService/res/values-km/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-km-rKH/strings.xml
rename to packages/DefaultContainerService/res/values-km/strings.xml
diff --git a/packages/DefaultContainerService/res/values-kn-rIN/strings.xml b/packages/DefaultContainerService/res/values-kn/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-kn-rIN/strings.xml
rename to packages/DefaultContainerService/res/values-kn/strings.xml
diff --git a/packages/DefaultContainerService/res/values-ky-rKG/strings.xml b/packages/DefaultContainerService/res/values-ky/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-ky-rKG/strings.xml
rename to packages/DefaultContainerService/res/values-ky/strings.xml
diff --git a/packages/DefaultContainerService/res/values-lo-rLA/strings.xml b/packages/DefaultContainerService/res/values-lo/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-lo-rLA/strings.xml
rename to packages/DefaultContainerService/res/values-lo/strings.xml
diff --git a/packages/DefaultContainerService/res/values-mk-rMK/strings.xml b/packages/DefaultContainerService/res/values-mk/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-mk-rMK/strings.xml
rename to packages/DefaultContainerService/res/values-mk/strings.xml
diff --git a/packages/DefaultContainerService/res/values-ml-rIN/strings.xml b/packages/DefaultContainerService/res/values-ml/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-ml-rIN/strings.xml
rename to packages/DefaultContainerService/res/values-ml/strings.xml
diff --git a/packages/DefaultContainerService/res/values-mn-rMN/strings.xml b/packages/DefaultContainerService/res/values-mn/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-mn-rMN/strings.xml
rename to packages/DefaultContainerService/res/values-mn/strings.xml
diff --git a/packages/DefaultContainerService/res/values-mr-rIN/strings.xml b/packages/DefaultContainerService/res/values-mr/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-mr-rIN/strings.xml
rename to packages/DefaultContainerService/res/values-mr/strings.xml
diff --git a/packages/DefaultContainerService/res/values-ms-rMY/strings.xml b/packages/DefaultContainerService/res/values-ms/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-ms-rMY/strings.xml
rename to packages/DefaultContainerService/res/values-ms/strings.xml
diff --git a/packages/DefaultContainerService/res/values-my-rMM/strings.xml b/packages/DefaultContainerService/res/values-my/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-my-rMM/strings.xml
rename to packages/DefaultContainerService/res/values-my/strings.xml
diff --git a/packages/DefaultContainerService/res/values-ne-rNP/strings.xml b/packages/DefaultContainerService/res/values-ne/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-ne-rNP/strings.xml
rename to packages/DefaultContainerService/res/values-ne/strings.xml
diff --git a/packages/DefaultContainerService/res/values-pa-rIN/strings.xml b/packages/DefaultContainerService/res/values-pa/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-pa-rIN/strings.xml
rename to packages/DefaultContainerService/res/values-pa/strings.xml
diff --git a/packages/DefaultContainerService/res/values-si-rLK/strings.xml b/packages/DefaultContainerService/res/values-si/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-si-rLK/strings.xml
rename to packages/DefaultContainerService/res/values-si/strings.xml
diff --git a/packages/DefaultContainerService/res/values-sq-rAL/strings.xml b/packages/DefaultContainerService/res/values-sq/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-sq-rAL/strings.xml
rename to packages/DefaultContainerService/res/values-sq/strings.xml
diff --git a/packages/DefaultContainerService/res/values-ta-rIN/strings.xml b/packages/DefaultContainerService/res/values-ta/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-ta-rIN/strings.xml
rename to packages/DefaultContainerService/res/values-ta/strings.xml
diff --git a/packages/DefaultContainerService/res/values-te-rIN/strings.xml b/packages/DefaultContainerService/res/values-te/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-te-rIN/strings.xml
rename to packages/DefaultContainerService/res/values-te/strings.xml
diff --git a/packages/DefaultContainerService/res/values-ur-rPK/strings.xml b/packages/DefaultContainerService/res/values-ur/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-ur-rPK/strings.xml
rename to packages/DefaultContainerService/res/values-ur/strings.xml
diff --git a/packages/DefaultContainerService/res/values-uz-rUZ/strings.xml b/packages/DefaultContainerService/res/values-uz/strings.xml
similarity index 100%
rename from packages/DefaultContainerService/res/values-uz-rUZ/strings.xml
rename to packages/DefaultContainerService/res/values-uz/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml b/packages/ExternalStorageProvider/res/values-az/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml
rename to packages/ExternalStorageProvider/res/values-az/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-be-rBY/strings.xml b/packages/ExternalStorageProvider/res/values-be/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-be-rBY/strings.xml
rename to packages/ExternalStorageProvider/res/values-be/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-bn-rBD/strings.xml b/packages/ExternalStorageProvider/res/values-bn/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-bn-rBD/strings.xml
rename to packages/ExternalStorageProvider/res/values-bn/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-bs-rBA/strings.xml b/packages/ExternalStorageProvider/res/values-bs/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-bs-rBA/strings.xml
rename to packages/ExternalStorageProvider/res/values-bs/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-et-rEE/strings.xml b/packages/ExternalStorageProvider/res/values-et/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-et-rEE/strings.xml
rename to packages/ExternalStorageProvider/res/values-et/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-eu-rES/strings.xml b/packages/ExternalStorageProvider/res/values-eu/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-eu-rES/strings.xml
rename to packages/ExternalStorageProvider/res/values-eu/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-gl-rES/strings.xml b/packages/ExternalStorageProvider/res/values-gl/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-gl-rES/strings.xml
rename to packages/ExternalStorageProvider/res/values-gl/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-gu-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-gu/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-gu-rIN/strings.xml
rename to packages/ExternalStorageProvider/res/values-gu/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-hy-rAM/strings.xml b/packages/ExternalStorageProvider/res/values-hy/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-hy-rAM/strings.xml
rename to packages/ExternalStorageProvider/res/values-hy/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-is-rIS/strings.xml b/packages/ExternalStorageProvider/res/values-is/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-is-rIS/strings.xml
rename to packages/ExternalStorageProvider/res/values-is/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-ka-rGE/strings.xml b/packages/ExternalStorageProvider/res/values-ka/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-ka-rGE/strings.xml
rename to packages/ExternalStorageProvider/res/values-ka/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-kk-rKZ/strings.xml b/packages/ExternalStorageProvider/res/values-kk/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-kk-rKZ/strings.xml
rename to packages/ExternalStorageProvider/res/values-kk/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-km-rKH/strings.xml b/packages/ExternalStorageProvider/res/values-km/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-km-rKH/strings.xml
rename to packages/ExternalStorageProvider/res/values-km/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-kn-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-kn/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-kn-rIN/strings.xml
rename to packages/ExternalStorageProvider/res/values-kn/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-ky-rKG/strings.xml b/packages/ExternalStorageProvider/res/values-ky/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-ky-rKG/strings.xml
rename to packages/ExternalStorageProvider/res/values-ky/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-lo-rLA/strings.xml b/packages/ExternalStorageProvider/res/values-lo/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-lo-rLA/strings.xml
rename to packages/ExternalStorageProvider/res/values-lo/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-mk-rMK/strings.xml b/packages/ExternalStorageProvider/res/values-mk/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-mk-rMK/strings.xml
rename to packages/ExternalStorageProvider/res/values-mk/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-ml/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml
rename to packages/ExternalStorageProvider/res/values-ml/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-mn-rMN/strings.xml b/packages/ExternalStorageProvider/res/values-mn/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-mn-rMN/strings.xml
rename to packages/ExternalStorageProvider/res/values-mn/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-mr-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-mr/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-mr-rIN/strings.xml
rename to packages/ExternalStorageProvider/res/values-mr/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-ms-rMY/strings.xml b/packages/ExternalStorageProvider/res/values-ms/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-ms-rMY/strings.xml
rename to packages/ExternalStorageProvider/res/values-ms/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-my-rMM/strings.xml b/packages/ExternalStorageProvider/res/values-my/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-my-rMM/strings.xml
rename to packages/ExternalStorageProvider/res/values-my/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-ne-rNP/strings.xml b/packages/ExternalStorageProvider/res/values-ne/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-ne-rNP/strings.xml
rename to packages/ExternalStorageProvider/res/values-ne/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-pa-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-pa/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-pa-rIN/strings.xml
rename to packages/ExternalStorageProvider/res/values-pa/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-si-rLK/strings.xml b/packages/ExternalStorageProvider/res/values-si/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-si-rLK/strings.xml
rename to packages/ExternalStorageProvider/res/values-si/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-sq-rAL/strings.xml b/packages/ExternalStorageProvider/res/values-sq/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-sq-rAL/strings.xml
rename to packages/ExternalStorageProvider/res/values-sq/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-ta-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-ta/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-ta-rIN/strings.xml
rename to packages/ExternalStorageProvider/res/values-ta/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-te-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-te/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-te-rIN/strings.xml
rename to packages/ExternalStorageProvider/res/values-te/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-ur-rPK/strings.xml b/packages/ExternalStorageProvider/res/values-ur/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-ur-rPK/strings.xml
rename to packages/ExternalStorageProvider/res/values-ur/strings.xml
diff --git a/packages/ExternalStorageProvider/res/values-uz-rUZ/strings.xml b/packages/ExternalStorageProvider/res/values-uz/strings.xml
similarity index 100%
rename from packages/ExternalStorageProvider/res/values-uz-rUZ/strings.xml
rename to packages/ExternalStorageProvider/res/values-uz/strings.xml
diff --git a/packages/FusedLocation/res/values-az-rAZ/strings.xml b/packages/FusedLocation/res/values-az/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-az-rAZ/strings.xml
rename to packages/FusedLocation/res/values-az/strings.xml
diff --git a/packages/FusedLocation/res/values-be-rBY/strings.xml b/packages/FusedLocation/res/values-be/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-be-rBY/strings.xml
rename to packages/FusedLocation/res/values-be/strings.xml
diff --git a/packages/FusedLocation/res/values-bn-rBD/strings.xml b/packages/FusedLocation/res/values-bn/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-bn-rBD/strings.xml
rename to packages/FusedLocation/res/values-bn/strings.xml
diff --git a/packages/FusedLocation/res/values-bs-rBA/strings.xml b/packages/FusedLocation/res/values-bs/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-bs-rBA/strings.xml
rename to packages/FusedLocation/res/values-bs/strings.xml
diff --git a/packages/FusedLocation/res/values-et-rEE/strings.xml b/packages/FusedLocation/res/values-et/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-et-rEE/strings.xml
rename to packages/FusedLocation/res/values-et/strings.xml
diff --git a/packages/FusedLocation/res/values-eu-rES/strings.xml b/packages/FusedLocation/res/values-eu/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-eu-rES/strings.xml
rename to packages/FusedLocation/res/values-eu/strings.xml
diff --git a/packages/FusedLocation/res/values-gl-rES/strings.xml b/packages/FusedLocation/res/values-gl/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-gl-rES/strings.xml
rename to packages/FusedLocation/res/values-gl/strings.xml
diff --git a/packages/FusedLocation/res/values-gu-rIN/strings.xml b/packages/FusedLocation/res/values-gu/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-gu-rIN/strings.xml
rename to packages/FusedLocation/res/values-gu/strings.xml
diff --git a/packages/FusedLocation/res/values-hy-rAM/strings.xml b/packages/FusedLocation/res/values-hy/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-hy-rAM/strings.xml
rename to packages/FusedLocation/res/values-hy/strings.xml
diff --git a/packages/FusedLocation/res/values-is-rIS/strings.xml b/packages/FusedLocation/res/values-is/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-is-rIS/strings.xml
rename to packages/FusedLocation/res/values-is/strings.xml
diff --git a/packages/FusedLocation/res/values-ka-rGE/strings.xml b/packages/FusedLocation/res/values-ka/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-ka-rGE/strings.xml
rename to packages/FusedLocation/res/values-ka/strings.xml
diff --git a/packages/FusedLocation/res/values-kk-rKZ/strings.xml b/packages/FusedLocation/res/values-kk/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-kk-rKZ/strings.xml
rename to packages/FusedLocation/res/values-kk/strings.xml
diff --git a/packages/FusedLocation/res/values-km-rKH/strings.xml b/packages/FusedLocation/res/values-km/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-km-rKH/strings.xml
rename to packages/FusedLocation/res/values-km/strings.xml
diff --git a/packages/FusedLocation/res/values-kn-rIN/strings.xml b/packages/FusedLocation/res/values-kn/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-kn-rIN/strings.xml
rename to packages/FusedLocation/res/values-kn/strings.xml
diff --git a/packages/FusedLocation/res/values-ky-rKG/strings.xml b/packages/FusedLocation/res/values-ky/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-ky-rKG/strings.xml
rename to packages/FusedLocation/res/values-ky/strings.xml
diff --git a/packages/FusedLocation/res/values-lo-rLA/strings.xml b/packages/FusedLocation/res/values-lo/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-lo-rLA/strings.xml
rename to packages/FusedLocation/res/values-lo/strings.xml
diff --git a/packages/FusedLocation/res/values-mk-rMK/strings.xml b/packages/FusedLocation/res/values-mk/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-mk-rMK/strings.xml
rename to packages/FusedLocation/res/values-mk/strings.xml
diff --git a/packages/FusedLocation/res/values-ml-rIN/strings.xml b/packages/FusedLocation/res/values-ml/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-ml-rIN/strings.xml
rename to packages/FusedLocation/res/values-ml/strings.xml
diff --git a/packages/FusedLocation/res/values-mn-rMN/strings.xml b/packages/FusedLocation/res/values-mn/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-mn-rMN/strings.xml
rename to packages/FusedLocation/res/values-mn/strings.xml
diff --git a/packages/FusedLocation/res/values-mr-rIN/strings.xml b/packages/FusedLocation/res/values-mr/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-mr-rIN/strings.xml
rename to packages/FusedLocation/res/values-mr/strings.xml
diff --git a/packages/FusedLocation/res/values-ms-rMY/strings.xml b/packages/FusedLocation/res/values-ms/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-ms-rMY/strings.xml
rename to packages/FusedLocation/res/values-ms/strings.xml
diff --git a/packages/FusedLocation/res/values-my-rMM/strings.xml b/packages/FusedLocation/res/values-my/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-my-rMM/strings.xml
rename to packages/FusedLocation/res/values-my/strings.xml
diff --git a/packages/FusedLocation/res/values-ne-rNP/strings.xml b/packages/FusedLocation/res/values-ne/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-ne-rNP/strings.xml
rename to packages/FusedLocation/res/values-ne/strings.xml
diff --git a/packages/FusedLocation/res/values-pa-rIN/strings.xml b/packages/FusedLocation/res/values-pa/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-pa-rIN/strings.xml
rename to packages/FusedLocation/res/values-pa/strings.xml
diff --git a/packages/FusedLocation/res/values-si-rLK/strings.xml b/packages/FusedLocation/res/values-si/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-si-rLK/strings.xml
rename to packages/FusedLocation/res/values-si/strings.xml
diff --git a/packages/FusedLocation/res/values-sq-rAL/strings.xml b/packages/FusedLocation/res/values-sq/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-sq-rAL/strings.xml
rename to packages/FusedLocation/res/values-sq/strings.xml
diff --git a/packages/FusedLocation/res/values-ta-rIN/strings.xml b/packages/FusedLocation/res/values-ta/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-ta-rIN/strings.xml
rename to packages/FusedLocation/res/values-ta/strings.xml
diff --git a/packages/FusedLocation/res/values-te-rIN/strings.xml b/packages/FusedLocation/res/values-te/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-te-rIN/strings.xml
rename to packages/FusedLocation/res/values-te/strings.xml
diff --git a/packages/FusedLocation/res/values-ur-rPK/strings.xml b/packages/FusedLocation/res/values-ur/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-ur-rPK/strings.xml
rename to packages/FusedLocation/res/values-ur/strings.xml
diff --git a/packages/FusedLocation/res/values-uz-rUZ/strings.xml b/packages/FusedLocation/res/values-uz/strings.xml
similarity index 100%
rename from packages/FusedLocation/res/values-uz-rUZ/strings.xml
rename to packages/FusedLocation/res/values-uz/strings.xml
diff --git a/packages/InputDevices/res/values-az-rAZ/strings.xml b/packages/InputDevices/res/values-az/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-az-rAZ/strings.xml
rename to packages/InputDevices/res/values-az/strings.xml
diff --git a/packages/InputDevices/res/values-be-rBY/strings.xml b/packages/InputDevices/res/values-be/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-be-rBY/strings.xml
rename to packages/InputDevices/res/values-be/strings.xml
diff --git a/packages/InputDevices/res/values-bn-rBD/strings.xml b/packages/InputDevices/res/values-bn/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-bn-rBD/strings.xml
rename to packages/InputDevices/res/values-bn/strings.xml
diff --git a/packages/InputDevices/res/values-bs-rBA/strings.xml b/packages/InputDevices/res/values-bs/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-bs-rBA/strings.xml
rename to packages/InputDevices/res/values-bs/strings.xml
diff --git a/packages/InputDevices/res/values-et-rEE/strings.xml b/packages/InputDevices/res/values-et/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-et-rEE/strings.xml
rename to packages/InputDevices/res/values-et/strings.xml
diff --git a/packages/InputDevices/res/values-eu-rES/strings.xml b/packages/InputDevices/res/values-eu/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-eu-rES/strings.xml
rename to packages/InputDevices/res/values-eu/strings.xml
diff --git a/packages/InputDevices/res/values-gl-rES/strings.xml b/packages/InputDevices/res/values-gl/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-gl-rES/strings.xml
rename to packages/InputDevices/res/values-gl/strings.xml
diff --git a/packages/InputDevices/res/values-gu-rIN/strings.xml b/packages/InputDevices/res/values-gu/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-gu-rIN/strings.xml
rename to packages/InputDevices/res/values-gu/strings.xml
diff --git a/packages/InputDevices/res/values-hy-rAM/strings.xml b/packages/InputDevices/res/values-hy/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-hy-rAM/strings.xml
rename to packages/InputDevices/res/values-hy/strings.xml
diff --git a/packages/InputDevices/res/values-is-rIS/strings.xml b/packages/InputDevices/res/values-is/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-is-rIS/strings.xml
rename to packages/InputDevices/res/values-is/strings.xml
diff --git a/packages/InputDevices/res/values-ka-rGE/strings.xml b/packages/InputDevices/res/values-ka/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-ka-rGE/strings.xml
rename to packages/InputDevices/res/values-ka/strings.xml
diff --git a/packages/InputDevices/res/values-kk-rKZ/strings.xml b/packages/InputDevices/res/values-kk/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-kk-rKZ/strings.xml
rename to packages/InputDevices/res/values-kk/strings.xml
diff --git a/packages/InputDevices/res/values-km-rKH/strings.xml b/packages/InputDevices/res/values-km/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-km-rKH/strings.xml
rename to packages/InputDevices/res/values-km/strings.xml
diff --git a/packages/InputDevices/res/values-kn-rIN/strings.xml b/packages/InputDevices/res/values-kn/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-kn-rIN/strings.xml
rename to packages/InputDevices/res/values-kn/strings.xml
diff --git a/packages/InputDevices/res/values-ky-rKG/strings.xml b/packages/InputDevices/res/values-ky/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-ky-rKG/strings.xml
rename to packages/InputDevices/res/values-ky/strings.xml
diff --git a/packages/InputDevices/res/values-lo-rLA/strings.xml b/packages/InputDevices/res/values-lo/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-lo-rLA/strings.xml
rename to packages/InputDevices/res/values-lo/strings.xml
diff --git a/packages/InputDevices/res/values-mk-rMK/strings.xml b/packages/InputDevices/res/values-mk/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-mk-rMK/strings.xml
rename to packages/InputDevices/res/values-mk/strings.xml
diff --git a/packages/InputDevices/res/values-ml-rIN/strings.xml b/packages/InputDevices/res/values-ml/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-ml-rIN/strings.xml
rename to packages/InputDevices/res/values-ml/strings.xml
diff --git a/packages/InputDevices/res/values-mn-rMN/strings.xml b/packages/InputDevices/res/values-mn/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-mn-rMN/strings.xml
rename to packages/InputDevices/res/values-mn/strings.xml
diff --git a/packages/InputDevices/res/values-mr-rIN/strings.xml b/packages/InputDevices/res/values-mr/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-mr-rIN/strings.xml
rename to packages/InputDevices/res/values-mr/strings.xml
diff --git a/packages/InputDevices/res/values-ms-rMY/strings.xml b/packages/InputDevices/res/values-ms/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-ms-rMY/strings.xml
rename to packages/InputDevices/res/values-ms/strings.xml
diff --git a/packages/InputDevices/res/values-my-rMM/strings.xml b/packages/InputDevices/res/values-my/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-my-rMM/strings.xml
rename to packages/InputDevices/res/values-my/strings.xml
diff --git a/packages/InputDevices/res/values-ne-rNP/strings.xml b/packages/InputDevices/res/values-ne/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-ne-rNP/strings.xml
rename to packages/InputDevices/res/values-ne/strings.xml
diff --git a/packages/InputDevices/res/values-pa-rIN/strings.xml b/packages/InputDevices/res/values-pa/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-pa-rIN/strings.xml
rename to packages/InputDevices/res/values-pa/strings.xml
diff --git a/packages/InputDevices/res/values-si-rLK/strings.xml b/packages/InputDevices/res/values-si/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-si-rLK/strings.xml
rename to packages/InputDevices/res/values-si/strings.xml
diff --git a/packages/InputDevices/res/values-sq-rAL/strings.xml b/packages/InputDevices/res/values-sq/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-sq-rAL/strings.xml
rename to packages/InputDevices/res/values-sq/strings.xml
diff --git a/packages/InputDevices/res/values-ta-rIN/strings.xml b/packages/InputDevices/res/values-ta/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-ta-rIN/strings.xml
rename to packages/InputDevices/res/values-ta/strings.xml
diff --git a/packages/InputDevices/res/values-te-rIN/strings.xml b/packages/InputDevices/res/values-te/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-te-rIN/strings.xml
rename to packages/InputDevices/res/values-te/strings.xml
diff --git a/packages/InputDevices/res/values-ur-rPK/strings.xml b/packages/InputDevices/res/values-ur/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-ur-rPK/strings.xml
rename to packages/InputDevices/res/values-ur/strings.xml
diff --git a/packages/InputDevices/res/values-uz-rUZ/strings.xml b/packages/InputDevices/res/values-uz/strings.xml
similarity index 100%
rename from packages/InputDevices/res/values-uz-rUZ/strings.xml
rename to packages/InputDevices/res/values-uz/strings.xml
diff --git a/packages/Keyguard/res/values-az-rAZ/strings.xml b/packages/Keyguard/res/values-az/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-az-rAZ/strings.xml
rename to packages/Keyguard/res/values-az/strings.xml
diff --git a/packages/Keyguard/res/values-be-rBY/strings.xml b/packages/Keyguard/res/values-be/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-be-rBY/strings.xml
rename to packages/Keyguard/res/values-be/strings.xml
diff --git a/packages/Keyguard/res/values-bn-rBD/strings.xml b/packages/Keyguard/res/values-bn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-bn-rBD/strings.xml
rename to packages/Keyguard/res/values-bn/strings.xml
diff --git a/packages/Keyguard/res/values-bs-rBA/strings.xml b/packages/Keyguard/res/values-bs/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-bs-rBA/strings.xml
rename to packages/Keyguard/res/values-bs/strings.xml
diff --git a/packages/Keyguard/res/values-et-rEE/strings.xml b/packages/Keyguard/res/values-et/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-et-rEE/strings.xml
rename to packages/Keyguard/res/values-et/strings.xml
diff --git a/packages/Keyguard/res/values-eu-rES/strings.xml b/packages/Keyguard/res/values-eu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-eu-rES/strings.xml
rename to packages/Keyguard/res/values-eu/strings.xml
diff --git a/packages/Keyguard/res/values-gl-rES/strings.xml b/packages/Keyguard/res/values-gl/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-gl-rES/strings.xml
rename to packages/Keyguard/res/values-gl/strings.xml
diff --git a/packages/Keyguard/res/values-gu-rIN/strings.xml b/packages/Keyguard/res/values-gu/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-gu-rIN/strings.xml
rename to packages/Keyguard/res/values-gu/strings.xml
diff --git a/packages/Keyguard/res/values-hy-rAM/strings.xml b/packages/Keyguard/res/values-hy/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-hy-rAM/strings.xml
rename to packages/Keyguard/res/values-hy/strings.xml
diff --git a/packages/Keyguard/res/values-is-rIS/strings.xml b/packages/Keyguard/res/values-is/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-is-rIS/strings.xml
rename to packages/Keyguard/res/values-is/strings.xml
diff --git a/packages/Keyguard/res/values-ka-rGE/strings.xml b/packages/Keyguard/res/values-ka/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ka-rGE/strings.xml
rename to packages/Keyguard/res/values-ka/strings.xml
diff --git a/packages/Keyguard/res/values-kk-rKZ/strings.xml b/packages/Keyguard/res/values-kk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-kk-rKZ/strings.xml
rename to packages/Keyguard/res/values-kk/strings.xml
diff --git a/packages/Keyguard/res/values-km-rKH/strings.xml b/packages/Keyguard/res/values-km/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-km-rKH/strings.xml
rename to packages/Keyguard/res/values-km/strings.xml
diff --git a/packages/Keyguard/res/values-kn-rIN/strings.xml b/packages/Keyguard/res/values-kn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-kn-rIN/strings.xml
rename to packages/Keyguard/res/values-kn/strings.xml
diff --git a/packages/Keyguard/res/values-ky-rKG/strings.xml b/packages/Keyguard/res/values-ky/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ky-rKG/strings.xml
rename to packages/Keyguard/res/values-ky/strings.xml
diff --git a/packages/Keyguard/res/values-lo-rLA/strings.xml b/packages/Keyguard/res/values-lo/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-lo-rLA/strings.xml
rename to packages/Keyguard/res/values-lo/strings.xml
diff --git a/packages/Keyguard/res/values-mk-rMK/strings.xml b/packages/Keyguard/res/values-mk/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-mk-rMK/strings.xml
rename to packages/Keyguard/res/values-mk/strings.xml
diff --git a/packages/Keyguard/res/values-ml-rIN/strings.xml b/packages/Keyguard/res/values-ml/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ml-rIN/strings.xml
rename to packages/Keyguard/res/values-ml/strings.xml
diff --git a/packages/Keyguard/res/values-mn-rMN/strings.xml b/packages/Keyguard/res/values-mn/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-mn-rMN/strings.xml
rename to packages/Keyguard/res/values-mn/strings.xml
diff --git a/packages/Keyguard/res/values-mr-rIN/strings.xml b/packages/Keyguard/res/values-mr/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-mr-rIN/strings.xml
rename to packages/Keyguard/res/values-mr/strings.xml
diff --git a/packages/Keyguard/res/values-ms-rMY/strings.xml b/packages/Keyguard/res/values-ms/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ms-rMY/strings.xml
rename to packages/Keyguard/res/values-ms/strings.xml
diff --git a/packages/Keyguard/res/values-my-rMM/dimens.xml b/packages/Keyguard/res/values-my/dimens.xml
similarity index 100%
rename from packages/Keyguard/res/values-my-rMM/dimens.xml
rename to packages/Keyguard/res/values-my/dimens.xml
diff --git a/packages/Keyguard/res/values-my-rMM/strings.xml b/packages/Keyguard/res/values-my/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-my-rMM/strings.xml
rename to packages/Keyguard/res/values-my/strings.xml
diff --git a/packages/Keyguard/res/values-ne-rNP/strings.xml b/packages/Keyguard/res/values-ne/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ne-rNP/strings.xml
rename to packages/Keyguard/res/values-ne/strings.xml
diff --git a/packages/Keyguard/res/values-pa-rIN/strings.xml b/packages/Keyguard/res/values-pa/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-pa-rIN/strings.xml
rename to packages/Keyguard/res/values-pa/strings.xml
diff --git a/packages/Keyguard/res/values-si-rLK/strings.xml b/packages/Keyguard/res/values-si/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-si-rLK/strings.xml
rename to packages/Keyguard/res/values-si/strings.xml
diff --git a/packages/Keyguard/res/values-sq-rAL/strings.xml b/packages/Keyguard/res/values-sq/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-sq-rAL/strings.xml
rename to packages/Keyguard/res/values-sq/strings.xml
diff --git a/packages/Keyguard/res/values-ta-rIN/strings.xml b/packages/Keyguard/res/values-ta/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ta-rIN/strings.xml
rename to packages/Keyguard/res/values-ta/strings.xml
diff --git a/packages/Keyguard/res/values-te-rIN/strings.xml b/packages/Keyguard/res/values-te/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-te-rIN/strings.xml
rename to packages/Keyguard/res/values-te/strings.xml
diff --git a/packages/Keyguard/res/values-ur-rPK/strings.xml b/packages/Keyguard/res/values-ur/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-ur-rPK/strings.xml
rename to packages/Keyguard/res/values-ur/strings.xml
diff --git a/packages/Keyguard/res/values-uz-rUZ/strings.xml b/packages/Keyguard/res/values-uz/strings.xml
similarity index 100%
rename from packages/Keyguard/res/values-uz-rUZ/strings.xml
rename to packages/Keyguard/res/values-uz/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-az-rAZ/strings.xml b/packages/MtpDocumentsProvider/res/values-az/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-az-rAZ/strings.xml
rename to packages/MtpDocumentsProvider/res/values-az/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-be-rBY/strings.xml b/packages/MtpDocumentsProvider/res/values-be/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-be-rBY/strings.xml
rename to packages/MtpDocumentsProvider/res/values-be/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-bn-rBD/strings.xml b/packages/MtpDocumentsProvider/res/values-bn/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-bn-rBD/strings.xml
rename to packages/MtpDocumentsProvider/res/values-bn/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-bs-rBA/strings.xml b/packages/MtpDocumentsProvider/res/values-bs/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-bs-rBA/strings.xml
rename to packages/MtpDocumentsProvider/res/values-bs/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-et-rEE/strings.xml b/packages/MtpDocumentsProvider/res/values-et/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-et-rEE/strings.xml
rename to packages/MtpDocumentsProvider/res/values-et/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-eu-rES/strings.xml b/packages/MtpDocumentsProvider/res/values-eu/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-eu-rES/strings.xml
rename to packages/MtpDocumentsProvider/res/values-eu/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-gl-rES/strings.xml b/packages/MtpDocumentsProvider/res/values-gl/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-gl-rES/strings.xml
rename to packages/MtpDocumentsProvider/res/values-gl/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-gu-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-gu/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-gu-rIN/strings.xml
rename to packages/MtpDocumentsProvider/res/values-gu/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-hy-rAM/strings.xml b/packages/MtpDocumentsProvider/res/values-hy/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-hy-rAM/strings.xml
rename to packages/MtpDocumentsProvider/res/values-hy/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-is-rIS/strings.xml b/packages/MtpDocumentsProvider/res/values-is/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-is-rIS/strings.xml
rename to packages/MtpDocumentsProvider/res/values-is/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-ka-rGE/strings.xml b/packages/MtpDocumentsProvider/res/values-ka/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-ka-rGE/strings.xml
rename to packages/MtpDocumentsProvider/res/values-ka/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-kk-rKZ/strings.xml b/packages/MtpDocumentsProvider/res/values-kk/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-kk-rKZ/strings.xml
rename to packages/MtpDocumentsProvider/res/values-kk/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-km-rKH/strings.xml b/packages/MtpDocumentsProvider/res/values-km/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-km-rKH/strings.xml
rename to packages/MtpDocumentsProvider/res/values-km/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-kn-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-kn/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-kn-rIN/strings.xml
rename to packages/MtpDocumentsProvider/res/values-kn/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-ky-rKG/strings.xml b/packages/MtpDocumentsProvider/res/values-ky/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-ky-rKG/strings.xml
rename to packages/MtpDocumentsProvider/res/values-ky/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-lo-rLA/strings.xml b/packages/MtpDocumentsProvider/res/values-lo/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-lo-rLA/strings.xml
rename to packages/MtpDocumentsProvider/res/values-lo/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-mk-rMK/strings.xml b/packages/MtpDocumentsProvider/res/values-mk/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-mk-rMK/strings.xml
rename to packages/MtpDocumentsProvider/res/values-mk/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-ml-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-ml/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-ml-rIN/strings.xml
rename to packages/MtpDocumentsProvider/res/values-ml/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-mn-rMN/strings.xml b/packages/MtpDocumentsProvider/res/values-mn/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-mn-rMN/strings.xml
rename to packages/MtpDocumentsProvider/res/values-mn/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-mr-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-mr/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-mr-rIN/strings.xml
rename to packages/MtpDocumentsProvider/res/values-mr/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-ms-rMY/strings.xml b/packages/MtpDocumentsProvider/res/values-ms/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-ms-rMY/strings.xml
rename to packages/MtpDocumentsProvider/res/values-ms/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-my-rMM/strings.xml b/packages/MtpDocumentsProvider/res/values-my/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-my-rMM/strings.xml
rename to packages/MtpDocumentsProvider/res/values-my/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-ne-rNP/strings.xml b/packages/MtpDocumentsProvider/res/values-ne/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-ne-rNP/strings.xml
rename to packages/MtpDocumentsProvider/res/values-ne/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-pa-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-pa/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-pa-rIN/strings.xml
rename to packages/MtpDocumentsProvider/res/values-pa/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-si-rLK/strings.xml b/packages/MtpDocumentsProvider/res/values-si/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-si-rLK/strings.xml
rename to packages/MtpDocumentsProvider/res/values-si/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-sq-rAL/strings.xml b/packages/MtpDocumentsProvider/res/values-sq/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-sq-rAL/strings.xml
rename to packages/MtpDocumentsProvider/res/values-sq/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-ta-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-ta/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-ta-rIN/strings.xml
rename to packages/MtpDocumentsProvider/res/values-ta/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-te-rIN/strings.xml b/packages/MtpDocumentsProvider/res/values-te/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-te-rIN/strings.xml
rename to packages/MtpDocumentsProvider/res/values-te/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-ur-rPK/strings.xml b/packages/MtpDocumentsProvider/res/values-ur/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-ur-rPK/strings.xml
rename to packages/MtpDocumentsProvider/res/values-ur/strings.xml
diff --git a/packages/MtpDocumentsProvider/res/values-uz-rUZ/strings.xml b/packages/MtpDocumentsProvider/res/values-uz/strings.xml
similarity index 100%
rename from packages/MtpDocumentsProvider/res/values-uz-rUZ/strings.xml
rename to packages/MtpDocumentsProvider/res/values-uz/strings.xml
diff --git a/packages/PrintSpooler/res/values-az-rAZ/strings.xml b/packages/PrintSpooler/res/values-az/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-az-rAZ/strings.xml
rename to packages/PrintSpooler/res/values-az/strings.xml
diff --git a/packages/PrintSpooler/res/values-be-rBY/strings.xml b/packages/PrintSpooler/res/values-be/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-be-rBY/strings.xml
rename to packages/PrintSpooler/res/values-be/strings.xml
diff --git a/packages/PrintSpooler/res/values-bn-rBD/strings.xml b/packages/PrintSpooler/res/values-bn/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-bn-rBD/strings.xml
rename to packages/PrintSpooler/res/values-bn/strings.xml
diff --git a/packages/PrintSpooler/res/values-bs-rBA/strings.xml b/packages/PrintSpooler/res/values-bs/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-bs-rBA/strings.xml
rename to packages/PrintSpooler/res/values-bs/strings.xml
diff --git a/packages/PrintSpooler/res/values-et-rEE/strings.xml b/packages/PrintSpooler/res/values-et/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-et-rEE/strings.xml
rename to packages/PrintSpooler/res/values-et/strings.xml
diff --git a/packages/PrintSpooler/res/values-eu-rES/strings.xml b/packages/PrintSpooler/res/values-eu/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-eu-rES/strings.xml
rename to packages/PrintSpooler/res/values-eu/strings.xml
diff --git a/packages/PrintSpooler/res/values-gl-rES/strings.xml b/packages/PrintSpooler/res/values-gl/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-gl-rES/strings.xml
rename to packages/PrintSpooler/res/values-gl/strings.xml
diff --git a/packages/PrintSpooler/res/values-gu-rIN/strings.xml b/packages/PrintSpooler/res/values-gu/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-gu-rIN/strings.xml
rename to packages/PrintSpooler/res/values-gu/strings.xml
diff --git a/packages/PrintSpooler/res/values-hy-rAM/strings.xml b/packages/PrintSpooler/res/values-hy/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-hy-rAM/strings.xml
rename to packages/PrintSpooler/res/values-hy/strings.xml
diff --git a/packages/PrintSpooler/res/values-is-rIS/strings.xml b/packages/PrintSpooler/res/values-is/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-is-rIS/strings.xml
rename to packages/PrintSpooler/res/values-is/strings.xml
diff --git a/packages/PrintSpooler/res/values-ka-rGE/strings.xml b/packages/PrintSpooler/res/values-ka/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-ka-rGE/strings.xml
rename to packages/PrintSpooler/res/values-ka/strings.xml
diff --git a/packages/PrintSpooler/res/values-kk-rKZ/strings.xml b/packages/PrintSpooler/res/values-kk/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-kk-rKZ/strings.xml
rename to packages/PrintSpooler/res/values-kk/strings.xml
diff --git a/packages/PrintSpooler/res/values-km-rKH/strings.xml b/packages/PrintSpooler/res/values-km/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-km-rKH/strings.xml
rename to packages/PrintSpooler/res/values-km/strings.xml
diff --git a/packages/PrintSpooler/res/values-kn-rIN/strings.xml b/packages/PrintSpooler/res/values-kn/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-kn-rIN/strings.xml
rename to packages/PrintSpooler/res/values-kn/strings.xml
diff --git a/packages/PrintSpooler/res/values-ky-rKG/strings.xml b/packages/PrintSpooler/res/values-ky/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-ky-rKG/strings.xml
rename to packages/PrintSpooler/res/values-ky/strings.xml
diff --git a/packages/PrintSpooler/res/values-lo-rLA/strings.xml b/packages/PrintSpooler/res/values-lo/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-lo-rLA/strings.xml
rename to packages/PrintSpooler/res/values-lo/strings.xml
diff --git a/packages/PrintSpooler/res/values-mk-rMK/strings.xml b/packages/PrintSpooler/res/values-mk/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-mk-rMK/strings.xml
rename to packages/PrintSpooler/res/values-mk/strings.xml
diff --git a/packages/PrintSpooler/res/values-ml-rIN/strings.xml b/packages/PrintSpooler/res/values-ml/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-ml-rIN/strings.xml
rename to packages/PrintSpooler/res/values-ml/strings.xml
diff --git a/packages/PrintSpooler/res/values-mn-rMN/strings.xml b/packages/PrintSpooler/res/values-mn/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-mn-rMN/strings.xml
rename to packages/PrintSpooler/res/values-mn/strings.xml
diff --git a/packages/PrintSpooler/res/values-mr-rIN/strings.xml b/packages/PrintSpooler/res/values-mr/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-mr-rIN/strings.xml
rename to packages/PrintSpooler/res/values-mr/strings.xml
diff --git a/packages/PrintSpooler/res/values-ms-rMY/strings.xml b/packages/PrintSpooler/res/values-ms/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-ms-rMY/strings.xml
rename to packages/PrintSpooler/res/values-ms/strings.xml
diff --git a/packages/PrintSpooler/res/values-my-rMM/strings.xml b/packages/PrintSpooler/res/values-my/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-my-rMM/strings.xml
rename to packages/PrintSpooler/res/values-my/strings.xml
diff --git a/packages/PrintSpooler/res/values-ne-rNP/strings.xml b/packages/PrintSpooler/res/values-ne/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-ne-rNP/strings.xml
rename to packages/PrintSpooler/res/values-ne/strings.xml
diff --git a/packages/PrintSpooler/res/values-pa-rIN/strings.xml b/packages/PrintSpooler/res/values-pa/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-pa-rIN/strings.xml
rename to packages/PrintSpooler/res/values-pa/strings.xml
diff --git a/packages/PrintSpooler/res/values-si-rLK/strings.xml b/packages/PrintSpooler/res/values-si/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-si-rLK/strings.xml
rename to packages/PrintSpooler/res/values-si/strings.xml
diff --git a/packages/PrintSpooler/res/values-sq-rAL/strings.xml b/packages/PrintSpooler/res/values-sq/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-sq-rAL/strings.xml
rename to packages/PrintSpooler/res/values-sq/strings.xml
diff --git a/packages/PrintSpooler/res/values-ta-rIN/strings.xml b/packages/PrintSpooler/res/values-ta/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-ta-rIN/strings.xml
rename to packages/PrintSpooler/res/values-ta/strings.xml
diff --git a/packages/PrintSpooler/res/values-te-rIN/strings.xml b/packages/PrintSpooler/res/values-te/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-te-rIN/strings.xml
rename to packages/PrintSpooler/res/values-te/strings.xml
diff --git a/packages/PrintSpooler/res/values-ur-rPK/strings.xml b/packages/PrintSpooler/res/values-ur/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-ur-rPK/strings.xml
rename to packages/PrintSpooler/res/values-ur/strings.xml
diff --git a/packages/PrintSpooler/res/values-uz-rUZ/strings.xml b/packages/PrintSpooler/res/values-uz/strings.xml
similarity index 100%
rename from packages/PrintSpooler/res/values-uz-rUZ/strings.xml
rename to packages/PrintSpooler/res/values-uz/strings.xml
diff --git a/packages/SettingsLib/res/values-az-rAZ/arrays.xml b/packages/SettingsLib/res/values-az/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-az-rAZ/arrays.xml
rename to packages/SettingsLib/res/values-az/arrays.xml
diff --git a/packages/SettingsLib/res/values-az-rAZ/strings.xml b/packages/SettingsLib/res/values-az/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-az-rAZ/strings.xml
rename to packages/SettingsLib/res/values-az/strings.xml
diff --git a/packages/SettingsLib/res/values-be-rBY/arrays.xml b/packages/SettingsLib/res/values-be/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-be-rBY/arrays.xml
rename to packages/SettingsLib/res/values-be/arrays.xml
diff --git a/packages/SettingsLib/res/values-be-rBY/strings.xml b/packages/SettingsLib/res/values-be/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-be-rBY/strings.xml
rename to packages/SettingsLib/res/values-be/strings.xml
diff --git a/packages/SettingsLib/res/values-bn-rBD/arrays.xml b/packages/SettingsLib/res/values-bn/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-bn-rBD/arrays.xml
rename to packages/SettingsLib/res/values-bn/arrays.xml
diff --git a/packages/SettingsLib/res/values-bn-rBD/strings.xml b/packages/SettingsLib/res/values-bn/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-bn-rBD/strings.xml
rename to packages/SettingsLib/res/values-bn/strings.xml
diff --git a/packages/SettingsLib/res/values-bs-rBA/arrays.xml b/packages/SettingsLib/res/values-bs/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-bs-rBA/arrays.xml
rename to packages/SettingsLib/res/values-bs/arrays.xml
diff --git a/packages/SettingsLib/res/values-bs-rBA/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-bs-rBA/strings.xml
rename to packages/SettingsLib/res/values-bs/strings.xml
diff --git a/packages/SettingsLib/res/values-et-rEE/arrays.xml b/packages/SettingsLib/res/values-et/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-et-rEE/arrays.xml
rename to packages/SettingsLib/res/values-et/arrays.xml
diff --git a/packages/SettingsLib/res/values-et-rEE/strings.xml b/packages/SettingsLib/res/values-et/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-et-rEE/strings.xml
rename to packages/SettingsLib/res/values-et/strings.xml
diff --git a/packages/SettingsLib/res/values-eu-rES/arrays.xml b/packages/SettingsLib/res/values-eu/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-eu-rES/arrays.xml
rename to packages/SettingsLib/res/values-eu/arrays.xml
diff --git a/packages/SettingsLib/res/values-eu-rES/strings.xml b/packages/SettingsLib/res/values-eu/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-eu-rES/strings.xml
rename to packages/SettingsLib/res/values-eu/strings.xml
diff --git a/packages/SettingsLib/res/values-gl-rES/arrays.xml b/packages/SettingsLib/res/values-gl/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-gl-rES/arrays.xml
rename to packages/SettingsLib/res/values-gl/arrays.xml
diff --git a/packages/SettingsLib/res/values-gl-rES/strings.xml b/packages/SettingsLib/res/values-gl/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-gl-rES/strings.xml
rename to packages/SettingsLib/res/values-gl/strings.xml
diff --git a/packages/SettingsLib/res/values-gu-rIN/arrays.xml b/packages/SettingsLib/res/values-gu/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-gu-rIN/arrays.xml
rename to packages/SettingsLib/res/values-gu/arrays.xml
diff --git a/packages/SettingsLib/res/values-gu-rIN/strings.xml b/packages/SettingsLib/res/values-gu/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-gu-rIN/strings.xml
rename to packages/SettingsLib/res/values-gu/strings.xml
diff --git a/packages/SettingsLib/res/values-hy-rAM/arrays.xml b/packages/SettingsLib/res/values-hy/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-hy-rAM/arrays.xml
rename to packages/SettingsLib/res/values-hy/arrays.xml
diff --git a/packages/SettingsLib/res/values-hy-rAM/strings.xml b/packages/SettingsLib/res/values-hy/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-hy-rAM/strings.xml
rename to packages/SettingsLib/res/values-hy/strings.xml
diff --git a/packages/SettingsLib/res/values-is-rIS/arrays.xml b/packages/SettingsLib/res/values-is/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-is-rIS/arrays.xml
rename to packages/SettingsLib/res/values-is/arrays.xml
diff --git a/packages/SettingsLib/res/values-is-rIS/strings.xml b/packages/SettingsLib/res/values-is/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-is-rIS/strings.xml
rename to packages/SettingsLib/res/values-is/strings.xml
diff --git a/packages/SettingsLib/res/values-ka-rGE/arrays.xml b/packages/SettingsLib/res/values-ka/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ka-rGE/arrays.xml
rename to packages/SettingsLib/res/values-ka/arrays.xml
diff --git a/packages/SettingsLib/res/values-ka-rGE/strings.xml b/packages/SettingsLib/res/values-ka/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ka-rGE/strings.xml
rename to packages/SettingsLib/res/values-ka/strings.xml
diff --git a/packages/SettingsLib/res/values-kk-rKZ/arrays.xml b/packages/SettingsLib/res/values-kk/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-kk-rKZ/arrays.xml
rename to packages/SettingsLib/res/values-kk/arrays.xml
diff --git a/packages/SettingsLib/res/values-kk-rKZ/strings.xml b/packages/SettingsLib/res/values-kk/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-kk-rKZ/strings.xml
rename to packages/SettingsLib/res/values-kk/strings.xml
diff --git a/packages/SettingsLib/res/values-km-rKH/arrays.xml b/packages/SettingsLib/res/values-km/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-km-rKH/arrays.xml
rename to packages/SettingsLib/res/values-km/arrays.xml
diff --git a/packages/SettingsLib/res/values-km-rKH/strings.xml b/packages/SettingsLib/res/values-km/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-km-rKH/strings.xml
rename to packages/SettingsLib/res/values-km/strings.xml
diff --git a/packages/SettingsLib/res/values-kn-rIN/arrays.xml b/packages/SettingsLib/res/values-kn/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-kn-rIN/arrays.xml
rename to packages/SettingsLib/res/values-kn/arrays.xml
diff --git a/packages/SettingsLib/res/values-kn-rIN/strings.xml b/packages/SettingsLib/res/values-kn/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-kn-rIN/strings.xml
rename to packages/SettingsLib/res/values-kn/strings.xml
diff --git a/packages/SettingsLib/res/values-ky-rKG/arrays.xml b/packages/SettingsLib/res/values-ky/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ky-rKG/arrays.xml
rename to packages/SettingsLib/res/values-ky/arrays.xml
diff --git a/packages/SettingsLib/res/values-ky-rKG/strings.xml b/packages/SettingsLib/res/values-ky/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ky-rKG/strings.xml
rename to packages/SettingsLib/res/values-ky/strings.xml
diff --git a/packages/SettingsLib/res/values-lo-rLA/arrays.xml b/packages/SettingsLib/res/values-lo/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-lo-rLA/arrays.xml
rename to packages/SettingsLib/res/values-lo/arrays.xml
diff --git a/packages/SettingsLib/res/values-lo-rLA/strings.xml b/packages/SettingsLib/res/values-lo/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-lo-rLA/strings.xml
rename to packages/SettingsLib/res/values-lo/strings.xml
diff --git a/packages/SettingsLib/res/values-mk-rMK/arrays.xml b/packages/SettingsLib/res/values-mk/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-mk-rMK/arrays.xml
rename to packages/SettingsLib/res/values-mk/arrays.xml
diff --git a/packages/SettingsLib/res/values-mk-rMK/strings.xml b/packages/SettingsLib/res/values-mk/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-mk-rMK/strings.xml
rename to packages/SettingsLib/res/values-mk/strings.xml
diff --git a/packages/SettingsLib/res/values-ml-rIN/arrays.xml b/packages/SettingsLib/res/values-ml/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ml-rIN/arrays.xml
rename to packages/SettingsLib/res/values-ml/arrays.xml
diff --git a/packages/SettingsLib/res/values-ml-rIN/strings.xml b/packages/SettingsLib/res/values-ml/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ml-rIN/strings.xml
rename to packages/SettingsLib/res/values-ml/strings.xml
diff --git a/packages/SettingsLib/res/values-mn-rMN/arrays.xml b/packages/SettingsLib/res/values-mn/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-mn-rMN/arrays.xml
rename to packages/SettingsLib/res/values-mn/arrays.xml
diff --git a/packages/SettingsLib/res/values-mn-rMN/strings.xml b/packages/SettingsLib/res/values-mn/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-mn-rMN/strings.xml
rename to packages/SettingsLib/res/values-mn/strings.xml
diff --git a/packages/SettingsLib/res/values-mr-rIN/arrays.xml b/packages/SettingsLib/res/values-mr/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-mr-rIN/arrays.xml
rename to packages/SettingsLib/res/values-mr/arrays.xml
diff --git a/packages/SettingsLib/res/values-mr-rIN/strings.xml b/packages/SettingsLib/res/values-mr/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-mr-rIN/strings.xml
rename to packages/SettingsLib/res/values-mr/strings.xml
diff --git a/packages/SettingsLib/res/values-ms-rMY/arrays.xml b/packages/SettingsLib/res/values-ms/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ms-rMY/arrays.xml
rename to packages/SettingsLib/res/values-ms/arrays.xml
diff --git a/packages/SettingsLib/res/values-ms-rMY/strings.xml b/packages/SettingsLib/res/values-ms/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ms-rMY/strings.xml
rename to packages/SettingsLib/res/values-ms/strings.xml
diff --git a/packages/SettingsLib/res/values-my-rMM/arrays.xml b/packages/SettingsLib/res/values-my/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-my-rMM/arrays.xml
rename to packages/SettingsLib/res/values-my/arrays.xml
diff --git a/packages/SettingsLib/res/values-my-rMM/strings.xml b/packages/SettingsLib/res/values-my/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-my-rMM/strings.xml
rename to packages/SettingsLib/res/values-my/strings.xml
diff --git a/packages/SettingsLib/res/values-ne-rNP/arrays.xml b/packages/SettingsLib/res/values-ne/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ne-rNP/arrays.xml
rename to packages/SettingsLib/res/values-ne/arrays.xml
diff --git a/packages/SettingsLib/res/values-ne-rNP/strings.xml b/packages/SettingsLib/res/values-ne/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ne-rNP/strings.xml
rename to packages/SettingsLib/res/values-ne/strings.xml
diff --git a/packages/SettingsLib/res/values-pa-rIN/arrays.xml b/packages/SettingsLib/res/values-pa/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-pa-rIN/arrays.xml
rename to packages/SettingsLib/res/values-pa/arrays.xml
diff --git a/packages/SettingsLib/res/values-pa-rIN/strings.xml b/packages/SettingsLib/res/values-pa/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-pa-rIN/strings.xml
rename to packages/SettingsLib/res/values-pa/strings.xml
diff --git a/packages/SettingsLib/res/values-si-rLK/arrays.xml b/packages/SettingsLib/res/values-si/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-si-rLK/arrays.xml
rename to packages/SettingsLib/res/values-si/arrays.xml
diff --git a/packages/SettingsLib/res/values-si-rLK/strings.xml b/packages/SettingsLib/res/values-si/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-si-rLK/strings.xml
rename to packages/SettingsLib/res/values-si/strings.xml
diff --git a/packages/SettingsLib/res/values-sq-rAL/arrays.xml b/packages/SettingsLib/res/values-sq/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-sq-rAL/arrays.xml
rename to packages/SettingsLib/res/values-sq/arrays.xml
diff --git a/packages/SettingsLib/res/values-sq-rAL/strings.xml b/packages/SettingsLib/res/values-sq/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-sq-rAL/strings.xml
rename to packages/SettingsLib/res/values-sq/strings.xml
diff --git a/packages/SettingsLib/res/values-ta-rIN/arrays.xml b/packages/SettingsLib/res/values-ta/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ta-rIN/arrays.xml
rename to packages/SettingsLib/res/values-ta/arrays.xml
diff --git a/packages/SettingsLib/res/values-ta-rIN/strings.xml b/packages/SettingsLib/res/values-ta/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ta-rIN/strings.xml
rename to packages/SettingsLib/res/values-ta/strings.xml
diff --git a/packages/SettingsLib/res/values-te-rIN/arrays.xml b/packages/SettingsLib/res/values-te/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-te-rIN/arrays.xml
rename to packages/SettingsLib/res/values-te/arrays.xml
diff --git a/packages/SettingsLib/res/values-te-rIN/strings.xml b/packages/SettingsLib/res/values-te/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-te-rIN/strings.xml
rename to packages/SettingsLib/res/values-te/strings.xml
diff --git a/packages/SettingsLib/res/values-ur-rPK/arrays.xml b/packages/SettingsLib/res/values-ur/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ur-rPK/arrays.xml
rename to packages/SettingsLib/res/values-ur/arrays.xml
diff --git a/packages/SettingsLib/res/values-ur-rPK/strings.xml b/packages/SettingsLib/res/values-ur/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-ur-rPK/strings.xml
rename to packages/SettingsLib/res/values-ur/strings.xml
diff --git a/packages/SettingsLib/res/values-uz-rUZ/arrays.xml b/packages/SettingsLib/res/values-uz/arrays.xml
similarity index 100%
rename from packages/SettingsLib/res/values-uz-rUZ/arrays.xml
rename to packages/SettingsLib/res/values-uz/arrays.xml
diff --git a/packages/SettingsLib/res/values-uz-rUZ/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml
similarity index 100%
rename from packages/SettingsLib/res/values-uz-rUZ/strings.xml
rename to packages/SettingsLib/res/values-uz/strings.xml
diff --git a/packages/SettingsProvider/res/values-az-rAZ/defaults.xml b/packages/SettingsProvider/res/values-az/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-az-rAZ/defaults.xml
rename to packages/SettingsProvider/res/values-az/defaults.xml
diff --git a/packages/SettingsProvider/res/values-az-rAZ/strings.xml b/packages/SettingsProvider/res/values-az/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-az-rAZ/strings.xml
rename to packages/SettingsProvider/res/values-az/strings.xml
diff --git a/packages/SettingsProvider/res/values-be-rBY/defaults.xml b/packages/SettingsProvider/res/values-be/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-be-rBY/defaults.xml
rename to packages/SettingsProvider/res/values-be/defaults.xml
diff --git a/packages/SettingsProvider/res/values-be-rBY/strings.xml b/packages/SettingsProvider/res/values-be/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-be-rBY/strings.xml
rename to packages/SettingsProvider/res/values-be/strings.xml
diff --git a/packages/SettingsProvider/res/values-bn-rBD/defaults.xml b/packages/SettingsProvider/res/values-bn-rBD/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-bn-rBD/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-be-rBY/defaults.xml b/packages/SettingsProvider/res/values-bn/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-be-rBY/defaults.xml
copy to packages/SettingsProvider/res/values-bn/defaults.xml
diff --git a/packages/SettingsProvider/res/values-bn-rBD/strings.xml b/packages/SettingsProvider/res/values-bn/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-bn-rBD/strings.xml
rename to packages/SettingsProvider/res/values-bn/strings.xml
diff --git a/packages/SettingsProvider/res/values-bs-rBA/defaults.xml b/packages/SettingsProvider/res/values-bs-rBA/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-bs-rBA/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-be-rBY/defaults.xml b/packages/SettingsProvider/res/values-bs/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-be-rBY/defaults.xml
copy to packages/SettingsProvider/res/values-bs/defaults.xml
diff --git a/packages/SettingsProvider/res/values-bs-rBA/strings.xml b/packages/SettingsProvider/res/values-bs/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-bs-rBA/strings.xml
rename to packages/SettingsProvider/res/values-bs/strings.xml
diff --git a/packages/SettingsProvider/res/values-et-rEE/defaults.xml b/packages/SettingsProvider/res/values-et/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-et-rEE/defaults.xml
rename to packages/SettingsProvider/res/values-et/defaults.xml
diff --git a/packages/SettingsProvider/res/values-et-rEE/strings.xml b/packages/SettingsProvider/res/values-et/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-et-rEE/strings.xml
rename to packages/SettingsProvider/res/values-et/strings.xml
diff --git a/packages/SettingsProvider/res/values-eu-rES/defaults.xml b/packages/SettingsProvider/res/values-eu/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-eu-rES/defaults.xml
rename to packages/SettingsProvider/res/values-eu/defaults.xml
diff --git a/packages/SettingsProvider/res/values-eu-rES/strings.xml b/packages/SettingsProvider/res/values-eu/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-eu-rES/strings.xml
rename to packages/SettingsProvider/res/values-eu/strings.xml
diff --git a/packages/SettingsProvider/res/values-gl-rES/defaults.xml b/packages/SettingsProvider/res/values-gl/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-gl-rES/defaults.xml
rename to packages/SettingsProvider/res/values-gl/defaults.xml
diff --git a/packages/SettingsProvider/res/values-gl-rES/strings.xml b/packages/SettingsProvider/res/values-gl/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-gl-rES/strings.xml
rename to packages/SettingsProvider/res/values-gl/strings.xml
diff --git a/packages/SettingsProvider/res/values-gu-rIN/defaults.xml b/packages/SettingsProvider/res/values-gu-rIN/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-gu-rIN/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-gl-rES/defaults.xml b/packages/SettingsProvider/res/values-gu/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-gl-rES/defaults.xml
copy to packages/SettingsProvider/res/values-gu/defaults.xml
diff --git a/packages/SettingsProvider/res/values-gu-rIN/strings.xml b/packages/SettingsProvider/res/values-gu/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-gu-rIN/strings.xml
rename to packages/SettingsProvider/res/values-gu/strings.xml
diff --git a/packages/SettingsProvider/res/values-hy-rAM/defaults.xml b/packages/SettingsProvider/res/values-hy/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-hy-rAM/defaults.xml
rename to packages/SettingsProvider/res/values-hy/defaults.xml
diff --git a/packages/SettingsProvider/res/values-hy-rAM/strings.xml b/packages/SettingsProvider/res/values-hy/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-hy-rAM/strings.xml
rename to packages/SettingsProvider/res/values-hy/strings.xml
diff --git a/packages/SettingsProvider/res/values-is-rIS/defaults.xml b/packages/SettingsProvider/res/values-is/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-is-rIS/defaults.xml
rename to packages/SettingsProvider/res/values-is/defaults.xml
diff --git a/packages/SettingsProvider/res/values-is-rIS/strings.xml b/packages/SettingsProvider/res/values-is/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-is-rIS/strings.xml
rename to packages/SettingsProvider/res/values-is/strings.xml
diff --git a/packages/SettingsProvider/res/values-ka-rGE/defaults.xml b/packages/SettingsProvider/res/values-ka/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ka-rGE/defaults.xml
rename to packages/SettingsProvider/res/values-ka/defaults.xml
diff --git a/packages/SettingsProvider/res/values-ka-rGE/strings.xml b/packages/SettingsProvider/res/values-ka/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ka-rGE/strings.xml
rename to packages/SettingsProvider/res/values-ka/strings.xml
diff --git a/packages/SettingsProvider/res/values-kk-rKZ/defaults.xml b/packages/SettingsProvider/res/values-kk-rKZ/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-kk-rKZ/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-ka-rGE/defaults.xml b/packages/SettingsProvider/res/values-kk/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-ka-rGE/defaults.xml
copy to packages/SettingsProvider/res/values-kk/defaults.xml
diff --git a/packages/SettingsProvider/res/values-kk-rKZ/strings.xml b/packages/SettingsProvider/res/values-kk/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-kk-rKZ/strings.xml
rename to packages/SettingsProvider/res/values-kk/strings.xml
diff --git a/packages/SettingsProvider/res/values-km-rKH/defaults.xml b/packages/SettingsProvider/res/values-km-rKH/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-km-rKH/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-ka-rGE/defaults.xml b/packages/SettingsProvider/res/values-km/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-ka-rGE/defaults.xml
copy to packages/SettingsProvider/res/values-km/defaults.xml
diff --git a/packages/SettingsProvider/res/values-km-rKH/strings.xml b/packages/SettingsProvider/res/values-km/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-km-rKH/strings.xml
rename to packages/SettingsProvider/res/values-km/strings.xml
diff --git a/packages/SettingsProvider/res/values-kn-rIN/defaults.xml b/packages/SettingsProvider/res/values-kn-rIN/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-kn-rIN/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-ka-rGE/defaults.xml b/packages/SettingsProvider/res/values-kn/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-ka-rGE/defaults.xml
copy to packages/SettingsProvider/res/values-kn/defaults.xml
diff --git a/packages/SettingsProvider/res/values-kn-rIN/strings.xml b/packages/SettingsProvider/res/values-kn/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-kn-rIN/strings.xml
rename to packages/SettingsProvider/res/values-kn/strings.xml
diff --git a/packages/SettingsProvider/res/values-ky-rKG/defaults.xml b/packages/SettingsProvider/res/values-ky-rKG/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-ky-rKG/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-ka-rGE/defaults.xml b/packages/SettingsProvider/res/values-ky/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-ka-rGE/defaults.xml
copy to packages/SettingsProvider/res/values-ky/defaults.xml
diff --git a/packages/SettingsProvider/res/values-ky-rKG/strings.xml b/packages/SettingsProvider/res/values-ky/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ky-rKG/strings.xml
rename to packages/SettingsProvider/res/values-ky/strings.xml
diff --git a/packages/SettingsProvider/res/values-lo-rLA/defaults.xml b/packages/SettingsProvider/res/values-lo/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-lo-rLA/defaults.xml
rename to packages/SettingsProvider/res/values-lo/defaults.xml
diff --git a/packages/SettingsProvider/res/values-lo-rLA/strings.xml b/packages/SettingsProvider/res/values-lo/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-lo-rLA/strings.xml
rename to packages/SettingsProvider/res/values-lo/strings.xml
diff --git a/packages/SettingsProvider/res/values-mk-rMK/defaults.xml b/packages/SettingsProvider/res/values-mk/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-mk-rMK/defaults.xml
rename to packages/SettingsProvider/res/values-mk/defaults.xml
diff --git a/packages/SettingsProvider/res/values-mk-rMK/strings.xml b/packages/SettingsProvider/res/values-mk/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-mk-rMK/strings.xml
rename to packages/SettingsProvider/res/values-mk/strings.xml
diff --git a/packages/SettingsProvider/res/values-ml-rIN/defaults.xml b/packages/SettingsProvider/res/values-ml-rIN/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-ml-rIN/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-mk-rMK/defaults.xml b/packages/SettingsProvider/res/values-ml/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-mk-rMK/defaults.xml
copy to packages/SettingsProvider/res/values-ml/defaults.xml
diff --git a/packages/SettingsProvider/res/values-ml-rIN/strings.xml b/packages/SettingsProvider/res/values-ml/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ml-rIN/strings.xml
rename to packages/SettingsProvider/res/values-ml/strings.xml
diff --git a/packages/SettingsProvider/res/values-mn-rMN/defaults.xml b/packages/SettingsProvider/res/values-mn-rMN/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-mn-rMN/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-mk-rMK/defaults.xml b/packages/SettingsProvider/res/values-mn/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-mk-rMK/defaults.xml
copy to packages/SettingsProvider/res/values-mn/defaults.xml
diff --git a/packages/SettingsProvider/res/values-mn-rMN/strings.xml b/packages/SettingsProvider/res/values-mn/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-mn-rMN/strings.xml
rename to packages/SettingsProvider/res/values-mn/strings.xml
diff --git a/packages/SettingsProvider/res/values-mr-rIN/defaults.xml b/packages/SettingsProvider/res/values-mr-rIN/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-mr-rIN/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-mk-rMK/defaults.xml b/packages/SettingsProvider/res/values-mr/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-mk-rMK/defaults.xml
copy to packages/SettingsProvider/res/values-mr/defaults.xml
diff --git a/packages/SettingsProvider/res/values-mr-rIN/strings.xml b/packages/SettingsProvider/res/values-mr/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-mr-rIN/strings.xml
rename to packages/SettingsProvider/res/values-mr/strings.xml
diff --git a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-mk-rMK/defaults.xml b/packages/SettingsProvider/res/values-ms/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-mk-rMK/defaults.xml
copy to packages/SettingsProvider/res/values-ms/defaults.xml
diff --git a/packages/SettingsProvider/res/values-ms-rMY/strings.xml b/packages/SettingsProvider/res/values-ms/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ms-rMY/strings.xml
rename to packages/SettingsProvider/res/values-ms/strings.xml
diff --git a/packages/SettingsProvider/res/values-my-rMM/defaults.xml b/packages/SettingsProvider/res/values-my-rMM/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-my-rMM/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-mk-rMK/defaults.xml b/packages/SettingsProvider/res/values-my/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-mk-rMK/defaults.xml
copy to packages/SettingsProvider/res/values-my/defaults.xml
diff --git a/packages/SettingsProvider/res/values-my-rMM/strings.xml b/packages/SettingsProvider/res/values-my/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-my-rMM/strings.xml
rename to packages/SettingsProvider/res/values-my/strings.xml
diff --git a/packages/SettingsProvider/res/values-ne-rNP/defaults.xml b/packages/SettingsProvider/res/values-ne/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ne-rNP/defaults.xml
rename to packages/SettingsProvider/res/values-ne/defaults.xml
diff --git a/packages/SettingsProvider/res/values-ne-rNP/strings.xml b/packages/SettingsProvider/res/values-ne/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ne-rNP/strings.xml
rename to packages/SettingsProvider/res/values-ne/strings.xml
diff --git a/packages/SettingsProvider/res/values-pa-rIN/defaults.xml b/packages/SettingsProvider/res/values-pa/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-pa-rIN/defaults.xml
rename to packages/SettingsProvider/res/values-pa/defaults.xml
diff --git a/packages/SettingsProvider/res/values-pa-rIN/strings.xml b/packages/SettingsProvider/res/values-pa/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-pa-rIN/strings.xml
rename to packages/SettingsProvider/res/values-pa/strings.xml
diff --git a/packages/SettingsProvider/res/values-si-rLK/defaults.xml b/packages/SettingsProvider/res/values-si/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-si-rLK/defaults.xml
rename to packages/SettingsProvider/res/values-si/defaults.xml
diff --git a/packages/SettingsProvider/res/values-si-rLK/strings.xml b/packages/SettingsProvider/res/values-si/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-si-rLK/strings.xml
rename to packages/SettingsProvider/res/values-si/strings.xml
diff --git a/packages/SettingsProvider/res/values-sq-rAL/defaults.xml b/packages/SettingsProvider/res/values-sq-rAL/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-sq-rAL/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-si-rLK/defaults.xml b/packages/SettingsProvider/res/values-sq/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-si-rLK/defaults.xml
copy to packages/SettingsProvider/res/values-sq/defaults.xml
diff --git a/packages/SettingsProvider/res/values-sq-rAL/strings.xml b/packages/SettingsProvider/res/values-sq/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-sq-rAL/strings.xml
rename to packages/SettingsProvider/res/values-sq/strings.xml
diff --git a/packages/SettingsProvider/res/values-ta-rIN/defaults.xml b/packages/SettingsProvider/res/values-ta/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ta-rIN/defaults.xml
rename to packages/SettingsProvider/res/values-ta/defaults.xml
diff --git a/packages/SettingsProvider/res/values-ta-rIN/strings.xml b/packages/SettingsProvider/res/values-ta/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ta-rIN/strings.xml
rename to packages/SettingsProvider/res/values-ta/strings.xml
diff --git a/packages/SettingsProvider/res/values-te-rIN/defaults.xml b/packages/SettingsProvider/res/values-te-rIN/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-te-rIN/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-ta-rIN/defaults.xml b/packages/SettingsProvider/res/values-te/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-ta-rIN/defaults.xml
copy to packages/SettingsProvider/res/values-te/defaults.xml
diff --git a/packages/SettingsProvider/res/values-te-rIN/strings.xml b/packages/SettingsProvider/res/values-te/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-te-rIN/strings.xml
rename to packages/SettingsProvider/res/values-te/strings.xml
diff --git a/packages/SettingsProvider/res/values-ur-rPK/defaults.xml b/packages/SettingsProvider/res/values-ur/defaults.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ur-rPK/defaults.xml
rename to packages/SettingsProvider/res/values-ur/defaults.xml
diff --git a/packages/SettingsProvider/res/values-ur-rPK/strings.xml b/packages/SettingsProvider/res/values-ur/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-ur-rPK/strings.xml
rename to packages/SettingsProvider/res/values-ur/strings.xml
diff --git a/packages/SettingsProvider/res/values-uz-rUZ/defaults.xml b/packages/SettingsProvider/res/values-uz-rUZ/defaults.xml
deleted file mode 100644
index 4a87a12..0000000
--- a/packages/SettingsProvider/res/values-uz-rUZ/defaults.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2009, 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="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
-    <string name="def_nfc_payment_component" msgid="5861297439873026958"></string>
-</resources>
diff --git a/packages/SettingsProvider/res/values-ur-rPK/defaults.xml b/packages/SettingsProvider/res/values-uz/defaults.xml
similarity index 100%
copy from packages/SettingsProvider/res/values-ur-rPK/defaults.xml
copy to packages/SettingsProvider/res/values-uz/defaults.xml
diff --git a/packages/SettingsProvider/res/values-uz-rUZ/strings.xml b/packages/SettingsProvider/res/values-uz/strings.xml
similarity index 100%
rename from packages/SettingsProvider/res/values-uz-rUZ/strings.xml
rename to packages/SettingsProvider/res/values-uz/strings.xml
diff --git a/packages/Shell/res/values-az-rAZ/strings.xml b/packages/Shell/res/values-az/strings.xml
similarity index 100%
rename from packages/Shell/res/values-az-rAZ/strings.xml
rename to packages/Shell/res/values-az/strings.xml
diff --git a/packages/Shell/res/values-be-rBY/strings.xml b/packages/Shell/res/values-be/strings.xml
similarity index 100%
rename from packages/Shell/res/values-be-rBY/strings.xml
rename to packages/Shell/res/values-be/strings.xml
diff --git a/packages/Shell/res/values-bn-rBD/strings.xml b/packages/Shell/res/values-bn/strings.xml
similarity index 100%
rename from packages/Shell/res/values-bn-rBD/strings.xml
rename to packages/Shell/res/values-bn/strings.xml
diff --git a/packages/Shell/res/values-bs-rBA/strings.xml b/packages/Shell/res/values-bs/strings.xml
similarity index 100%
rename from packages/Shell/res/values-bs-rBA/strings.xml
rename to packages/Shell/res/values-bs/strings.xml
diff --git a/packages/Shell/res/values-et-rEE/strings.xml b/packages/Shell/res/values-et/strings.xml
similarity index 100%
rename from packages/Shell/res/values-et-rEE/strings.xml
rename to packages/Shell/res/values-et/strings.xml
diff --git a/packages/Shell/res/values-eu-rES/strings.xml b/packages/Shell/res/values-eu/strings.xml
similarity index 100%
rename from packages/Shell/res/values-eu-rES/strings.xml
rename to packages/Shell/res/values-eu/strings.xml
diff --git a/packages/Shell/res/values-gl-rES/strings.xml b/packages/Shell/res/values-gl/strings.xml
similarity index 100%
rename from packages/Shell/res/values-gl-rES/strings.xml
rename to packages/Shell/res/values-gl/strings.xml
diff --git a/packages/Shell/res/values-gu-rIN/strings.xml b/packages/Shell/res/values-gu/strings.xml
similarity index 100%
rename from packages/Shell/res/values-gu-rIN/strings.xml
rename to packages/Shell/res/values-gu/strings.xml
diff --git a/packages/Shell/res/values-hy-rAM/strings.xml b/packages/Shell/res/values-hy/strings.xml
similarity index 100%
rename from packages/Shell/res/values-hy-rAM/strings.xml
rename to packages/Shell/res/values-hy/strings.xml
diff --git a/packages/Shell/res/values-is-rIS/strings.xml b/packages/Shell/res/values-is/strings.xml
similarity index 100%
rename from packages/Shell/res/values-is-rIS/strings.xml
rename to packages/Shell/res/values-is/strings.xml
diff --git a/packages/Shell/res/values-ka-rGE/strings.xml b/packages/Shell/res/values-ka/strings.xml
similarity index 100%
rename from packages/Shell/res/values-ka-rGE/strings.xml
rename to packages/Shell/res/values-ka/strings.xml
diff --git a/packages/Shell/res/values-kk-rKZ/strings.xml b/packages/Shell/res/values-kk/strings.xml
similarity index 100%
rename from packages/Shell/res/values-kk-rKZ/strings.xml
rename to packages/Shell/res/values-kk/strings.xml
diff --git a/packages/Shell/res/values-km-rKH/strings.xml b/packages/Shell/res/values-km/strings.xml
similarity index 100%
rename from packages/Shell/res/values-km-rKH/strings.xml
rename to packages/Shell/res/values-km/strings.xml
diff --git a/packages/Shell/res/values-kn-rIN/strings.xml b/packages/Shell/res/values-kn/strings.xml
similarity index 100%
rename from packages/Shell/res/values-kn-rIN/strings.xml
rename to packages/Shell/res/values-kn/strings.xml
diff --git a/packages/Shell/res/values-ky-rKG/strings.xml b/packages/Shell/res/values-ky/strings.xml
similarity index 100%
rename from packages/Shell/res/values-ky-rKG/strings.xml
rename to packages/Shell/res/values-ky/strings.xml
diff --git a/packages/Shell/res/values-lo-rLA/strings.xml b/packages/Shell/res/values-lo/strings.xml
similarity index 100%
rename from packages/Shell/res/values-lo-rLA/strings.xml
rename to packages/Shell/res/values-lo/strings.xml
diff --git a/packages/Shell/res/values-mk-rMK/strings.xml b/packages/Shell/res/values-mk/strings.xml
similarity index 100%
rename from packages/Shell/res/values-mk-rMK/strings.xml
rename to packages/Shell/res/values-mk/strings.xml
diff --git a/packages/Shell/res/values-ml-rIN/strings.xml b/packages/Shell/res/values-ml/strings.xml
similarity index 100%
rename from packages/Shell/res/values-ml-rIN/strings.xml
rename to packages/Shell/res/values-ml/strings.xml
diff --git a/packages/Shell/res/values-mn-rMN/strings.xml b/packages/Shell/res/values-mn/strings.xml
similarity index 100%
rename from packages/Shell/res/values-mn-rMN/strings.xml
rename to packages/Shell/res/values-mn/strings.xml
diff --git a/packages/Shell/res/values-mr-rIN/strings.xml b/packages/Shell/res/values-mr/strings.xml
similarity index 100%
rename from packages/Shell/res/values-mr-rIN/strings.xml
rename to packages/Shell/res/values-mr/strings.xml
diff --git a/packages/Shell/res/values-ms-rMY/strings.xml b/packages/Shell/res/values-ms/strings.xml
similarity index 100%
rename from packages/Shell/res/values-ms-rMY/strings.xml
rename to packages/Shell/res/values-ms/strings.xml
diff --git a/packages/Shell/res/values-my-rMM/strings.xml b/packages/Shell/res/values-my/strings.xml
similarity index 100%
rename from packages/Shell/res/values-my-rMM/strings.xml
rename to packages/Shell/res/values-my/strings.xml
diff --git a/packages/Shell/res/values-ne-rNP/strings.xml b/packages/Shell/res/values-ne/strings.xml
similarity index 100%
rename from packages/Shell/res/values-ne-rNP/strings.xml
rename to packages/Shell/res/values-ne/strings.xml
diff --git a/packages/Shell/res/values-pa-rIN/strings.xml b/packages/Shell/res/values-pa/strings.xml
similarity index 100%
rename from packages/Shell/res/values-pa-rIN/strings.xml
rename to packages/Shell/res/values-pa/strings.xml
diff --git a/packages/Shell/res/values-si-rLK/strings.xml b/packages/Shell/res/values-si/strings.xml
similarity index 100%
rename from packages/Shell/res/values-si-rLK/strings.xml
rename to packages/Shell/res/values-si/strings.xml
diff --git a/packages/Shell/res/values-sq-rAL/strings.xml b/packages/Shell/res/values-sq/strings.xml
similarity index 100%
rename from packages/Shell/res/values-sq-rAL/strings.xml
rename to packages/Shell/res/values-sq/strings.xml
diff --git a/packages/Shell/res/values-ta-rIN/strings.xml b/packages/Shell/res/values-ta/strings.xml
similarity index 100%
rename from packages/Shell/res/values-ta-rIN/strings.xml
rename to packages/Shell/res/values-ta/strings.xml
diff --git a/packages/Shell/res/values-te-rIN/strings.xml b/packages/Shell/res/values-te/strings.xml
similarity index 100%
rename from packages/Shell/res/values-te-rIN/strings.xml
rename to packages/Shell/res/values-te/strings.xml
diff --git a/packages/Shell/res/values-ur-rPK/strings.xml b/packages/Shell/res/values-ur/strings.xml
similarity index 100%
rename from packages/Shell/res/values-ur-rPK/strings.xml
rename to packages/Shell/res/values-ur/strings.xml
diff --git a/packages/Shell/res/values-uz-rUZ/strings.xml b/packages/Shell/res/values-uz/strings.xml
similarity index 100%
rename from packages/Shell/res/values-uz-rUZ/strings.xml
rename to packages/Shell/res/values-uz/strings.xml
diff --git a/packages/SystemUI/res/values-az-rAZ-land/strings.xml b/packages/SystemUI/res/values-az-rAZ-land/strings.xml
deleted file mode 100644
index 8eb6978..0000000
--- a/packages/SystemUI/res/values-az-rAZ-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"Hazırda ekran landşaft orientasiyasında kilidlənib."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-az-rAZ/config.xml b/packages/SystemUI/res/values-az/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-az-rAZ/config.xml
rename to packages/SystemUI/res/values-az/config.xml
diff --git a/packages/SystemUI/res/values-az-rAZ/strings.xml b/packages/SystemUI/res/values-az/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-az-rAZ/strings.xml
rename to packages/SystemUI/res/values-az/strings.xml
diff --git a/packages/SystemUI/res/values-az-rAZ/strings_car.xml b/packages/SystemUI/res/values-az/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-az-rAZ/strings_car.xml
rename to packages/SystemUI/res/values-az/strings_car.xml
diff --git a/packages/SystemUI/res/values-az-rAZ/strings_tv.xml b/packages/SystemUI/res/values-az/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-az-rAZ/strings_tv.xml
rename to packages/SystemUI/res/values-az/strings_tv.xml
diff --git a/packages/SystemUI/res/values-be-rBY-land/strings.xml b/packages/SystemUI/res/values-be-rBY-land/strings.xml
deleted file mode 100644
index 9b0cf06..0000000
--- a/packages/SystemUI/res/values-be-rBY-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"Цяпер экран заблакаваны ў альбомнай арыентацыі."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-be-rBY/config.xml b/packages/SystemUI/res/values-be/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-be-rBY/config.xml
rename to packages/SystemUI/res/values-be/config.xml
diff --git a/packages/SystemUI/res/values-be-rBY/strings.xml b/packages/SystemUI/res/values-be/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-be-rBY/strings.xml
rename to packages/SystemUI/res/values-be/strings.xml
diff --git a/packages/SystemUI/res/values-be-rBY/strings_car.xml b/packages/SystemUI/res/values-be/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-be-rBY/strings_car.xml
rename to packages/SystemUI/res/values-be/strings_car.xml
diff --git a/packages/SystemUI/res/values-be-rBY/strings_tv.xml b/packages/SystemUI/res/values-be/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-be-rBY/strings_tv.xml
rename to packages/SystemUI/res/values-be/strings_tv.xml
diff --git a/packages/SystemUI/res/values-bn-rBD-land/strings.xml b/packages/SystemUI/res/values-bn-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-bn-rBD-land/strings.xml
rename to packages/SystemUI/res/values-bn-land/strings.xml
diff --git a/packages/SystemUI/res/values-bn-rWB-land/strings.xml b/packages/SystemUI/res/values-bn-rWB-land/strings.xml
deleted file mode 100644
index ac873fa..0000000
--- a/packages/SystemUI/res/values-bn-rWB-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"এখন ভূদৃশ্য সজ্জাতে স্ক্রীণ লক করা হয়েছে৷"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-bn-rBD/config.xml b/packages/SystemUI/res/values-bn/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-bn-rBD/config.xml
rename to packages/SystemUI/res/values-bn/config.xml
diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-bn-rBD/strings.xml
rename to packages/SystemUI/res/values-bn/strings.xml
diff --git a/packages/SystemUI/res/values-bn-rBD/strings_car.xml b/packages/SystemUI/res/values-bn/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-bn-rBD/strings_car.xml
rename to packages/SystemUI/res/values-bn/strings_car.xml
diff --git a/packages/SystemUI/res/values-bn-rBD/strings_tv.xml b/packages/SystemUI/res/values-bn/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-bn-rBD/strings_tv.xml
rename to packages/SystemUI/res/values-bn/strings_tv.xml
diff --git a/packages/SystemUI/res/values-bs-rBA-land/strings.xml b/packages/SystemUI/res/values-bs-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-bs-rBA-land/strings.xml
rename to packages/SystemUI/res/values-bs-land/strings.xml
diff --git a/packages/SystemUI/res/values-bs-rBA/config.xml b/packages/SystemUI/res/values-bs/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-bs-rBA/config.xml
rename to packages/SystemUI/res/values-bs/config.xml
diff --git a/packages/SystemUI/res/values-bs-rBA/strings.xml b/packages/SystemUI/res/values-bs/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-bs-rBA/strings.xml
rename to packages/SystemUI/res/values-bs/strings.xml
diff --git a/packages/SystemUI/res/values-bs-rBA/strings_car.xml b/packages/SystemUI/res/values-bs/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-bs-rBA/strings_car.xml
rename to packages/SystemUI/res/values-bs/strings_car.xml
diff --git a/packages/SystemUI/res/values-bs-rBA/strings_tv.xml b/packages/SystemUI/res/values-bs/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-bs-rBA/strings_tv.xml
rename to packages/SystemUI/res/values-bs/strings_tv.xml
diff --git a/packages/SystemUI/res/values-et-rEE-land/strings.xml b/packages/SystemUI/res/values-et-rEE-land/strings.xml
deleted file mode 100644
index 77b0ce1..0000000
--- a/packages/SystemUI/res/values-et-rEE-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"Ekraan on nüüd lukustatud horisontaalasendisse."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-et-rEE/config.xml b/packages/SystemUI/res/values-et/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-et-rEE/config.xml
rename to packages/SystemUI/res/values-et/config.xml
diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-et-rEE/strings.xml
rename to packages/SystemUI/res/values-et/strings.xml
diff --git a/packages/SystemUI/res/values-et-rEE/strings_car.xml b/packages/SystemUI/res/values-et/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-et-rEE/strings_car.xml
rename to packages/SystemUI/res/values-et/strings_car.xml
diff --git a/packages/SystemUI/res/values-et-rEE/strings_tv.xml b/packages/SystemUI/res/values-et/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-et-rEE/strings_tv.xml
rename to packages/SystemUI/res/values-et/strings_tv.xml
diff --git a/packages/SystemUI/res/values-eu-rES-land/strings.xml b/packages/SystemUI/res/values-eu-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-eu-rES-land/strings.xml
rename to packages/SystemUI/res/values-eu-land/strings.xml
diff --git a/packages/SystemUI/res/values-eu-rPV-land/strings.xml b/packages/SystemUI/res/values-eu-rPV-land/strings.xml
deleted file mode 100644
index c8640c7..0000000
--- a/packages/SystemUI/res/values-eu-rPV-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"Pantaila horizontalki blokeatuta dago."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-eu-rES/config.xml b/packages/SystemUI/res/values-eu/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-eu-rES/config.xml
rename to packages/SystemUI/res/values-eu/config.xml
diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-eu-rES/strings.xml
rename to packages/SystemUI/res/values-eu/strings.xml
diff --git a/packages/SystemUI/res/values-eu-rES/strings_car.xml b/packages/SystemUI/res/values-eu/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-eu-rES/strings_car.xml
rename to packages/SystemUI/res/values-eu/strings_car.xml
diff --git a/packages/SystemUI/res/values-eu-rES/strings_tv.xml b/packages/SystemUI/res/values-eu/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-eu-rES/strings_tv.xml
rename to packages/SystemUI/res/values-eu/strings_tv.xml
diff --git a/packages/SystemUI/res/values-gl-rES-land/strings.xml b/packages/SystemUI/res/values-gl-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-gl-rES-land/strings.xml
rename to packages/SystemUI/res/values-gl-land/strings.xml
diff --git a/packages/SystemUI/res/values-gl-rGA-land/strings.xml b/packages/SystemUI/res/values-gl-rGA-land/strings.xml
deleted file mode 100644
index f0b7507..0000000
--- a/packages/SystemUI/res/values-gl-rGA-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"Agora a pantalla está bloqueada en orientación horizontal."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-gl-rES/config.xml b/packages/SystemUI/res/values-gl/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-gl-rES/config.xml
rename to packages/SystemUI/res/values-gl/config.xml
diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-gl-rES/strings.xml
rename to packages/SystemUI/res/values-gl/strings.xml
diff --git a/packages/SystemUI/res/values-gl-rES/strings_car.xml b/packages/SystemUI/res/values-gl/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-gl-rES/strings_car.xml
rename to packages/SystemUI/res/values-gl/strings_car.xml
diff --git a/packages/SystemUI/res/values-gl-rES/strings_tv.xml b/packages/SystemUI/res/values-gl/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-gl-rES/strings_tv.xml
rename to packages/SystemUI/res/values-gl/strings_tv.xml
diff --git a/packages/SystemUI/res/values-gu-rIN-land/strings.xml b/packages/SystemUI/res/values-gu-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-gu-rIN-land/strings.xml
rename to packages/SystemUI/res/values-gu-land/strings.xml
diff --git a/packages/SystemUI/res/values-gu-rIN/config.xml b/packages/SystemUI/res/values-gu/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-gu-rIN/config.xml
rename to packages/SystemUI/res/values-gu/config.xml
diff --git a/packages/SystemUI/res/values-gu-rIN/strings.xml b/packages/SystemUI/res/values-gu/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-gu-rIN/strings.xml
rename to packages/SystemUI/res/values-gu/strings.xml
diff --git a/packages/SystemUI/res/values-gu-rIN/strings_car.xml b/packages/SystemUI/res/values-gu/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-gu-rIN/strings_car.xml
rename to packages/SystemUI/res/values-gu/strings_car.xml
diff --git a/packages/SystemUI/res/values-gu-rIN/strings_tv.xml b/packages/SystemUI/res/values-gu/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-gu-rIN/strings_tv.xml
rename to packages/SystemUI/res/values-gu/strings_tv.xml
diff --git a/packages/SystemUI/res/values-hy-rAM-land/strings.xml b/packages/SystemUI/res/values-hy-rAM-land/strings.xml
deleted file mode 100644
index 7c0535c..0000000
--- a/packages/SystemUI/res/values-hy-rAM-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"Էկրանն այժմ կողպված է հորիզոնական դիրքավորման մեջ:"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-hy-rAM/config.xml b/packages/SystemUI/res/values-hy/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-hy-rAM/config.xml
rename to packages/SystemUI/res/values-hy/config.xml
diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-hy-rAM/strings.xml
rename to packages/SystemUI/res/values-hy/strings.xml
diff --git a/packages/SystemUI/res/values-hy-rAM/strings_car.xml b/packages/SystemUI/res/values-hy/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-hy-rAM/strings_car.xml
rename to packages/SystemUI/res/values-hy/strings_car.xml
diff --git a/packages/SystemUI/res/values-hy-rAM/strings_tv.xml b/packages/SystemUI/res/values-hy/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-hy-rAM/strings_tv.xml
rename to packages/SystemUI/res/values-hy/strings_tv.xml
diff --git a/packages/SystemUI/res/values-is-rIS-land/strings.xml b/packages/SystemUI/res/values-is-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-is-rIS-land/strings.xml
rename to packages/SystemUI/res/values-is-land/strings.xml
diff --git a/packages/SystemUI/res/values-is-rIS/config.xml b/packages/SystemUI/res/values-is/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-is-rIS/config.xml
rename to packages/SystemUI/res/values-is/config.xml
diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-is-rIS/strings.xml
rename to packages/SystemUI/res/values-is/strings.xml
diff --git a/packages/SystemUI/res/values-is-rIS/strings_car.xml b/packages/SystemUI/res/values-is/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-is-rIS/strings_car.xml
rename to packages/SystemUI/res/values-is/strings_car.xml
diff --git a/packages/SystemUI/res/values-is-rIS/strings_tv.xml b/packages/SystemUI/res/values-is/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-is-rIS/strings_tv.xml
rename to packages/SystemUI/res/values-is/strings_tv.xml
diff --git a/packages/SystemUI/res/values-ka-rGE-land/strings.xml b/packages/SystemUI/res/values-ka-rGE-land/strings.xml
deleted file mode 100644
index 3f20938..0000000
--- a/packages/SystemUI/res/values-ka-rGE-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"ეკრანი ამჟამად დაბლოკილია თარაზულ ორიენტაციაში"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ka-rGE/config.xml b/packages/SystemUI/res/values-ka/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-ka-rGE/config.xml
rename to packages/SystemUI/res/values-ka/config.xml
diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ka-rGE/strings.xml
rename to packages/SystemUI/res/values-ka/strings.xml
diff --git a/packages/SystemUI/res/values-ka-rGE/strings_car.xml b/packages/SystemUI/res/values-ka/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-ka-rGE/strings_car.xml
rename to packages/SystemUI/res/values-ka/strings_car.xml
diff --git a/packages/SystemUI/res/values-ka-rGE/strings_tv.xml b/packages/SystemUI/res/values-ka/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-ka-rGE/strings_tv.xml
rename to packages/SystemUI/res/values-ka/strings_tv.xml
diff --git a/packages/SystemUI/res/values-kk-rKZ-land/strings.xml b/packages/SystemUI/res/values-kk-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-kk-rKZ-land/strings.xml
rename to packages/SystemUI/res/values-kk-land/strings.xml
diff --git a/packages/SystemUI/res/values-kk-rKZ/config.xml b/packages/SystemUI/res/values-kk/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-kk-rKZ/config.xml
rename to packages/SystemUI/res/values-kk/config.xml
diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-kk-rKZ/strings.xml
rename to packages/SystemUI/res/values-kk/strings.xml
diff --git a/packages/SystemUI/res/values-kk-rKZ/strings_car.xml b/packages/SystemUI/res/values-kk/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-kk-rKZ/strings_car.xml
rename to packages/SystemUI/res/values-kk/strings_car.xml
diff --git a/packages/SystemUI/res/values-kk-rKZ/strings_tv.xml b/packages/SystemUI/res/values-kk/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-kk-rKZ/strings_tv.xml
rename to packages/SystemUI/res/values-kk/strings_tv.xml
diff --git a/packages/SystemUI/res/values-km-rKH-land/strings.xml b/packages/SystemUI/res/values-km-rKH-land/strings.xml
deleted file mode 100644
index f148cc3..0000000
--- a/packages/SystemUI/res/values-km-rKH-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"ឥឡូវ​អេក្រង់​​ជាប់​សោ​ក្នុង​ទិស​ផ្ដេក។"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-km-rKH/config.xml b/packages/SystemUI/res/values-km/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-km-rKH/config.xml
rename to packages/SystemUI/res/values-km/config.xml
diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-km-rKH/strings.xml
rename to packages/SystemUI/res/values-km/strings.xml
diff --git a/packages/SystemUI/res/values-km-rKH/strings_car.xml b/packages/SystemUI/res/values-km/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-km-rKH/strings_car.xml
rename to packages/SystemUI/res/values-km/strings_car.xml
diff --git a/packages/SystemUI/res/values-km-rKH/strings_tv.xml b/packages/SystemUI/res/values-km/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-km-rKH/strings_tv.xml
rename to packages/SystemUI/res/values-km/strings_tv.xml
diff --git a/packages/SystemUI/res/values-kn-rIN-land/strings.xml b/packages/SystemUI/res/values-kn-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-kn-rIN-land/strings.xml
rename to packages/SystemUI/res/values-kn-land/strings.xml
diff --git a/packages/SystemUI/res/values-kn-rKA-land/strings.xml b/packages/SystemUI/res/values-kn-rKA-land/strings.xml
deleted file mode 100644
index 640389f..0000000
--- a/packages/SystemUI/res/values-kn-rKA-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"ಪರದೆಯು ಇದೀಗ ಲ್ಯಾಂಡ್‌ಸ್ಕೇಪ್ ಒರಿಯಂಟೇಶನ್‌ನಲ್ಲಿ ಲಾಕ್ ಆಗಿದೆ."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-kn-rIN/config.xml b/packages/SystemUI/res/values-kn/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-kn-rIN/config.xml
rename to packages/SystemUI/res/values-kn/config.xml
diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-kn-rIN/strings.xml
rename to packages/SystemUI/res/values-kn/strings.xml
diff --git a/packages/SystemUI/res/values-kn-rIN/strings_car.xml b/packages/SystemUI/res/values-kn/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-kn-rIN/strings_car.xml
rename to packages/SystemUI/res/values-kn/strings_car.xml
diff --git a/packages/SystemUI/res/values-kn-rIN/strings_tv.xml b/packages/SystemUI/res/values-kn/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-kn-rIN/strings_tv.xml
rename to packages/SystemUI/res/values-kn/strings_tv.xml
diff --git a/packages/SystemUI/res/values-ky-rKG-land/strings.xml b/packages/SystemUI/res/values-ky-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ky-rKG-land/strings.xml
rename to packages/SystemUI/res/values-ky-land/strings.xml
diff --git a/packages/SystemUI/res/values-ky-rKG/config.xml b/packages/SystemUI/res/values-ky/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-ky-rKG/config.xml
rename to packages/SystemUI/res/values-ky/config.xml
diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ky-rKG/strings.xml
rename to packages/SystemUI/res/values-ky/strings.xml
diff --git a/packages/SystemUI/res/values-ky-rKG/strings_car.xml b/packages/SystemUI/res/values-ky/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-ky-rKG/strings_car.xml
rename to packages/SystemUI/res/values-ky/strings_car.xml
diff --git a/packages/SystemUI/res/values-ky-rKG/strings_tv.xml b/packages/SystemUI/res/values-ky/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-ky-rKG/strings_tv.xml
rename to packages/SystemUI/res/values-ky/strings_tv.xml
diff --git a/packages/SystemUI/res/values-lo-rLA-land/strings.xml b/packages/SystemUI/res/values-lo-rLA-land/strings.xml
deleted file mode 100644
index a838a15..0000000
--- a/packages/SystemUI/res/values-lo-rLA-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"ໜ້າຈໍຕອນນີ້ຖືກລັອກໄວ້ໃນແບບລວງນອນ."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-lo-rLA/config.xml b/packages/SystemUI/res/values-lo/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-lo-rLA/config.xml
rename to packages/SystemUI/res/values-lo/config.xml
diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-lo-rLA/strings.xml
rename to packages/SystemUI/res/values-lo/strings.xml
diff --git a/packages/SystemUI/res/values-lo-rLA/strings_car.xml b/packages/SystemUI/res/values-lo/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-lo-rLA/strings_car.xml
rename to packages/SystemUI/res/values-lo/strings_car.xml
diff --git a/packages/SystemUI/res/values-lo-rLA/strings_tv.xml b/packages/SystemUI/res/values-lo/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-lo-rLA/strings_tv.xml
rename to packages/SystemUI/res/values-lo/strings_tv.xml
diff --git a/packages/SystemUI/res/values-mk-rMK-land/strings.xml b/packages/SystemUI/res/values-mk-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-mk-rMK-land/strings.xml
rename to packages/SystemUI/res/values-mk-land/strings.xml
diff --git a/packages/SystemUI/res/values-mk-rMK/config.xml b/packages/SystemUI/res/values-mk/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-mk-rMK/config.xml
rename to packages/SystemUI/res/values-mk/config.xml
diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-mk-rMK/strings.xml
rename to packages/SystemUI/res/values-mk/strings.xml
diff --git a/packages/SystemUI/res/values-mk-rMK/strings_car.xml b/packages/SystemUI/res/values-mk/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-mk-rMK/strings_car.xml
rename to packages/SystemUI/res/values-mk/strings_car.xml
diff --git a/packages/SystemUI/res/values-mk-rMK/strings_tv.xml b/packages/SystemUI/res/values-mk/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-mk-rMK/strings_tv.xml
rename to packages/SystemUI/res/values-mk/strings_tv.xml
diff --git a/packages/SystemUI/res/values-ml-rIN-land/strings.xml b/packages/SystemUI/res/values-ml-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ml-rIN-land/strings.xml
rename to packages/SystemUI/res/values-ml-land/strings.xml
diff --git a/packages/SystemUI/res/values-ml-rKL-land/strings.xml b/packages/SystemUI/res/values-ml-rKL-land/strings.xml
deleted file mode 100644
index 97338ee..0000000
--- a/packages/SystemUI/res/values-ml-rKL-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"ലാൻഡ്‌സ്‌കേപ്പ് ഓറിയന്റേഷനിൽ സ്ക്രീൻ ലോക്കുചെയ്‌തു."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ml-rIN/config.xml b/packages/SystemUI/res/values-ml/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-ml-rIN/config.xml
rename to packages/SystemUI/res/values-ml/config.xml
diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ml-rIN/strings.xml
rename to packages/SystemUI/res/values-ml/strings.xml
diff --git a/packages/SystemUI/res/values-ml-rIN/strings_car.xml b/packages/SystemUI/res/values-ml/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-ml-rIN/strings_car.xml
rename to packages/SystemUI/res/values-ml/strings_car.xml
diff --git a/packages/SystemUI/res/values-ml-rIN/strings_tv.xml b/packages/SystemUI/res/values-ml/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-ml-rIN/strings_tv.xml
rename to packages/SystemUI/res/values-ml/strings_tv.xml
diff --git a/packages/SystemUI/res/values-mn-rMN-land/strings.xml b/packages/SystemUI/res/values-mn-rMN-land/strings.xml
deleted file mode 100644
index ec4616f..0000000
--- a/packages/SystemUI/res/values-mn-rMN-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"Дэлгэц хэвтээ чиглэлд түгжигдсэн."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-mn-rMN/config.xml b/packages/SystemUI/res/values-mn/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-mn-rMN/config.xml
rename to packages/SystemUI/res/values-mn/config.xml
diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-mn-rMN/strings.xml
rename to packages/SystemUI/res/values-mn/strings.xml
diff --git a/packages/SystemUI/res/values-mn-rMN/strings_car.xml b/packages/SystemUI/res/values-mn/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-mn-rMN/strings_car.xml
rename to packages/SystemUI/res/values-mn/strings_car.xml
diff --git a/packages/SystemUI/res/values-mn-rMN/strings_tv.xml b/packages/SystemUI/res/values-mn/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-mn-rMN/strings_tv.xml
rename to packages/SystemUI/res/values-mn/strings_tv.xml
diff --git a/packages/SystemUI/res/values-mr-rIN-land/strings.xml b/packages/SystemUI/res/values-mr-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-mr-rIN-land/strings.xml
rename to packages/SystemUI/res/values-mr-land/strings.xml
diff --git a/packages/SystemUI/res/values-mr-rMH-land/strings.xml b/packages/SystemUI/res/values-mr-rMH-land/strings.xml
deleted file mode 100644
index fd3ba77..0000000
--- a/packages/SystemUI/res/values-mr-rMH-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"स्‍क्रीन आता भूदृश्य अभिमुखतेत लॉक केली आहे."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-mr-rIN/config.xml b/packages/SystemUI/res/values-mr/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-mr-rIN/config.xml
rename to packages/SystemUI/res/values-mr/config.xml
diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-mr-rIN/strings.xml
rename to packages/SystemUI/res/values-mr/strings.xml
diff --git a/packages/SystemUI/res/values-mr-rIN/strings_car.xml b/packages/SystemUI/res/values-mr/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-mr-rIN/strings_car.xml
rename to packages/SystemUI/res/values-mr/strings_car.xml
diff --git a/packages/SystemUI/res/values-mr-rIN/strings_tv.xml b/packages/SystemUI/res/values-mr/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-mr-rIN/strings_tv.xml
rename to packages/SystemUI/res/values-mr/strings_tv.xml
diff --git a/packages/SystemUI/res/values-ms-rMY-land/strings.xml b/packages/SystemUI/res/values-ms-rMY-land/strings.xml
deleted file mode 100644
index 175b0fa..0000000
--- a/packages/SystemUI/res/values-ms-rMY-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"Skrin kini dikunci dalam orientasi landskap."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ms-rMY/config.xml b/packages/SystemUI/res/values-ms/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-ms-rMY/config.xml
rename to packages/SystemUI/res/values-ms/config.xml
diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ms-rMY/strings.xml
rename to packages/SystemUI/res/values-ms/strings.xml
diff --git a/packages/SystemUI/res/values-ms-rMY/strings_car.xml b/packages/SystemUI/res/values-ms/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-ms-rMY/strings_car.xml
rename to packages/SystemUI/res/values-ms/strings_car.xml
diff --git a/packages/SystemUI/res/values-ms-rMY/strings_tv.xml b/packages/SystemUI/res/values-ms/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-ms-rMY/strings_tv.xml
rename to packages/SystemUI/res/values-ms/strings_tv.xml
diff --git a/packages/SystemUI/res/values-my-rMM-land/strings.xml b/packages/SystemUI/res/values-my-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-my-rMM-land/strings.xml
rename to packages/SystemUI/res/values-my-land/strings.xml
diff --git a/packages/SystemUI/res/values-my-rMM/config.xml b/packages/SystemUI/res/values-my/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-my-rMM/config.xml
rename to packages/SystemUI/res/values-my/config.xml
diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-my-rMM/strings.xml
rename to packages/SystemUI/res/values-my/strings.xml
diff --git a/packages/SystemUI/res/values-my-rMM/strings_car.xml b/packages/SystemUI/res/values-my/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-my-rMM/strings_car.xml
rename to packages/SystemUI/res/values-my/strings_car.xml
diff --git a/packages/SystemUI/res/values-my-rMM/strings_tv.xml b/packages/SystemUI/res/values-my/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-my-rMM/strings_tv.xml
rename to packages/SystemUI/res/values-my/strings_tv.xml
diff --git a/packages/SystemUI/res/values-ne-rNP-land/strings.xml b/packages/SystemUI/res/values-ne-rNP-land/strings.xml
deleted file mode 100644
index 8d5286e..0000000
--- a/packages/SystemUI/res/values-ne-rNP-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"स्क्रिन अहिले ल्यान्डस्केप अवस्थामा बन्द छ।"</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ne-rNP/config.xml b/packages/SystemUI/res/values-ne/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-ne-rNP/config.xml
rename to packages/SystemUI/res/values-ne/config.xml
diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ne-rNP/strings.xml
rename to packages/SystemUI/res/values-ne/strings.xml
diff --git a/packages/SystemUI/res/values-ne-rNP/strings_car.xml b/packages/SystemUI/res/values-ne/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-ne-rNP/strings_car.xml
rename to packages/SystemUI/res/values-ne/strings_car.xml
diff --git a/packages/SystemUI/res/values-ne-rNP/strings_tv.xml b/packages/SystemUI/res/values-ne/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-ne-rNP/strings_tv.xml
rename to packages/SystemUI/res/values-ne/strings_tv.xml
diff --git a/packages/SystemUI/res/values-pa-rIN-land/strings.xml b/packages/SystemUI/res/values-pa-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-pa-rIN-land/strings.xml
rename to packages/SystemUI/res/values-pa-land/strings.xml
diff --git a/packages/SystemUI/res/values-pa-rIN/config.xml b/packages/SystemUI/res/values-pa/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-pa-rIN/config.xml
rename to packages/SystemUI/res/values-pa/config.xml
diff --git a/packages/SystemUI/res/values-pa-rIN/strings.xml b/packages/SystemUI/res/values-pa/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-pa-rIN/strings.xml
rename to packages/SystemUI/res/values-pa/strings.xml
diff --git a/packages/SystemUI/res/values-pa-rIN/strings_car.xml b/packages/SystemUI/res/values-pa/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-pa-rIN/strings_car.xml
rename to packages/SystemUI/res/values-pa/strings_car.xml
diff --git a/packages/SystemUI/res/values-pa-rIN/strings_tv.xml b/packages/SystemUI/res/values-pa/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-pa-rIN/strings_tv.xml
rename to packages/SystemUI/res/values-pa/strings_tv.xml
diff --git a/packages/SystemUI/res/values-pt-rBR-land/strings.xml b/packages/SystemUI/res/values-pt-rBR-land/strings.xml
deleted file mode 100644
index 7b04e7e..0000000
--- a/packages/SystemUI/res/values-pt-rBR-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"A tela está bloqueada na orientação cenário."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-si-rLK-land/strings.xml b/packages/SystemUI/res/values-si-rLK-land/strings.xml
deleted file mode 100644
index b5aba2a..0000000
--- a/packages/SystemUI/res/values-si-rLK-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"තිරය දැන් තිරස් දිශානතිය අගුළු දමා ඇත."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-si-rLK/config.xml b/packages/SystemUI/res/values-si/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-si-rLK/config.xml
rename to packages/SystemUI/res/values-si/config.xml
diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-si-rLK/strings.xml
rename to packages/SystemUI/res/values-si/strings.xml
diff --git a/packages/SystemUI/res/values-si-rLK/strings_car.xml b/packages/SystemUI/res/values-si/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-si-rLK/strings_car.xml
rename to packages/SystemUI/res/values-si/strings_car.xml
diff --git a/packages/SystemUI/res/values-si-rLK/strings_tv.xml b/packages/SystemUI/res/values-si/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-si-rLK/strings_tv.xml
rename to packages/SystemUI/res/values-si/strings_tv.xml
diff --git a/packages/SystemUI/res/values-sq-rAL-land/strings.xml b/packages/SystemUI/res/values-sq-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-sq-rAL-land/strings.xml
rename to packages/SystemUI/res/values-sq-land/strings.xml
diff --git a/packages/SystemUI/res/values-sq-rAL/config.xml b/packages/SystemUI/res/values-sq/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-sq-rAL/config.xml
rename to packages/SystemUI/res/values-sq/config.xml
diff --git a/packages/SystemUI/res/values-sq-rAL/strings.xml b/packages/SystemUI/res/values-sq/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-sq-rAL/strings.xml
rename to packages/SystemUI/res/values-sq/strings.xml
diff --git a/packages/SystemUI/res/values-sq-rAL/strings_car.xml b/packages/SystemUI/res/values-sq/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-sq-rAL/strings_car.xml
rename to packages/SystemUI/res/values-sq/strings_car.xml
diff --git a/packages/SystemUI/res/values-sq-rAL/strings_tv.xml b/packages/SystemUI/res/values-sq/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-sq-rAL/strings_tv.xml
rename to packages/SystemUI/res/values-sq/strings_tv.xml
diff --git a/packages/SystemUI/res/values-ta-rIN-land/strings.xml b/packages/SystemUI/res/values-ta-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ta-rIN-land/strings.xml
rename to packages/SystemUI/res/values-ta-land/strings.xml
diff --git a/packages/SystemUI/res/values-ta-rTN-land/strings.xml b/packages/SystemUI/res/values-ta-rTN-land/strings.xml
deleted file mode 100644
index 6ad7229..0000000
--- a/packages/SystemUI/res/values-ta-rTN-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"தற்போது திரை நிலைபரப்பு திசையமைப்பில் பூட்டப்பட்டுள்ளது."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/config.xml b/packages/SystemUI/res/values-ta/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-ta-rIN/config.xml
rename to packages/SystemUI/res/values-ta/config.xml
diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ta-rIN/strings.xml
rename to packages/SystemUI/res/values-ta/strings.xml
diff --git a/packages/SystemUI/res/values-ta-rIN/strings_car.xml b/packages/SystemUI/res/values-ta/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-ta-rIN/strings_car.xml
rename to packages/SystemUI/res/values-ta/strings_car.xml
diff --git a/packages/SystemUI/res/values-ta-rIN/strings_tv.xml b/packages/SystemUI/res/values-ta/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-ta-rIN/strings_tv.xml
rename to packages/SystemUI/res/values-ta/strings_tv.xml
diff --git a/packages/SystemUI/res/values-te-rAP-land/strings.xml b/packages/SystemUI/res/values-te-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-te-rAP-land/strings.xml
rename to packages/SystemUI/res/values-te-land/strings.xml
diff --git a/packages/SystemUI/res/values-te-rIN-land/strings.xml b/packages/SystemUI/res/values-te-rIN-land/strings.xml
deleted file mode 100644
index cc9de13..0000000
--- a/packages/SystemUI/res/values-te-rIN-land/strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/**
- * Copyright (c) 2010, 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="toast_rotation_locked" msgid="7609673011431556092">"స్క్రీన్ ఇప్పుడు ల్యాండ్‌స్కేప్ దృగ్విన్యాసంలో లాక్ చేయబడింది."</string>
-</resources>
diff --git a/packages/SystemUI/res/values-te-rIN/config.xml b/packages/SystemUI/res/values-te/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-te-rIN/config.xml
rename to packages/SystemUI/res/values-te/config.xml
diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-te-rIN/strings.xml
rename to packages/SystemUI/res/values-te/strings.xml
diff --git a/packages/SystemUI/res/values-te-rIN/strings_car.xml b/packages/SystemUI/res/values-te/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-te-rIN/strings_car.xml
rename to packages/SystemUI/res/values-te/strings_car.xml
diff --git a/packages/SystemUI/res/values-te-rIN/strings_tv.xml b/packages/SystemUI/res/values-te/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-te-rIN/strings_tv.xml
rename to packages/SystemUI/res/values-te/strings_tv.xml
diff --git a/packages/SystemUI/res/values-ur-rPK-land/strings.xml b/packages/SystemUI/res/values-ur-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ur-rPK-land/strings.xml
rename to packages/SystemUI/res/values-ur-land/strings.xml
diff --git a/packages/SystemUI/res/values-ur-rPK/config.xml b/packages/SystemUI/res/values-ur/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-ur-rPK/config.xml
rename to packages/SystemUI/res/values-ur/config.xml
diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-ur-rPK/strings.xml
rename to packages/SystemUI/res/values-ur/strings.xml
diff --git a/packages/SystemUI/res/values-ur-rPK/strings_car.xml b/packages/SystemUI/res/values-ur/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-ur-rPK/strings_car.xml
rename to packages/SystemUI/res/values-ur/strings_car.xml
diff --git a/packages/SystemUI/res/values-ur-rPK/strings_tv.xml b/packages/SystemUI/res/values-ur/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-ur-rPK/strings_tv.xml
rename to packages/SystemUI/res/values-ur/strings_tv.xml
diff --git a/packages/SystemUI/res/values-uz-rUZ-land/strings.xml b/packages/SystemUI/res/values-uz-land/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-uz-rUZ-land/strings.xml
rename to packages/SystemUI/res/values-uz-land/strings.xml
diff --git a/packages/SystemUI/res/values-uz-rUZ/config.xml b/packages/SystemUI/res/values-uz/config.xml
similarity index 100%
rename from packages/SystemUI/res/values-uz-rUZ/config.xml
rename to packages/SystemUI/res/values-uz/config.xml
diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz/strings.xml
similarity index 100%
rename from packages/SystemUI/res/values-uz-rUZ/strings.xml
rename to packages/SystemUI/res/values-uz/strings.xml
diff --git a/packages/SystemUI/res/values-uz-rUZ/strings_car.xml b/packages/SystemUI/res/values-uz/strings_car.xml
similarity index 100%
rename from packages/SystemUI/res/values-uz-rUZ/strings_car.xml
rename to packages/SystemUI/res/values-uz/strings_car.xml
diff --git a/packages/SystemUI/res/values-uz-rUZ/strings_tv.xml b/packages/SystemUI/res/values-uz/strings_tv.xml
similarity index 100%
rename from packages/SystemUI/res/values-uz-rUZ/strings_tv.xml
rename to packages/SystemUI/res/values-uz/strings_tv.xml
diff --git a/packages/VpnDialogs/res/values-az-rAZ/strings.xml b/packages/VpnDialogs/res/values-az/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-az-rAZ/strings.xml
rename to packages/VpnDialogs/res/values-az/strings.xml
diff --git a/packages/VpnDialogs/res/values-be-rBY/strings.xml b/packages/VpnDialogs/res/values-be/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-be-rBY/strings.xml
rename to packages/VpnDialogs/res/values-be/strings.xml
diff --git a/packages/VpnDialogs/res/values-bn-rBD/strings.xml b/packages/VpnDialogs/res/values-bn/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-bn-rBD/strings.xml
rename to packages/VpnDialogs/res/values-bn/strings.xml
diff --git a/packages/VpnDialogs/res/values-bs-rBA/strings.xml b/packages/VpnDialogs/res/values-bs/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-bs-rBA/strings.xml
rename to packages/VpnDialogs/res/values-bs/strings.xml
diff --git a/packages/VpnDialogs/res/values-et-rEE/strings.xml b/packages/VpnDialogs/res/values-et/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-et-rEE/strings.xml
rename to packages/VpnDialogs/res/values-et/strings.xml
diff --git a/packages/VpnDialogs/res/values-eu-rES/strings.xml b/packages/VpnDialogs/res/values-eu/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-eu-rES/strings.xml
rename to packages/VpnDialogs/res/values-eu/strings.xml
diff --git a/packages/VpnDialogs/res/values-gl-rES/strings.xml b/packages/VpnDialogs/res/values-gl/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-gl-rES/strings.xml
rename to packages/VpnDialogs/res/values-gl/strings.xml
diff --git a/packages/VpnDialogs/res/values-gu-rIN/strings.xml b/packages/VpnDialogs/res/values-gu/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-gu-rIN/strings.xml
rename to packages/VpnDialogs/res/values-gu/strings.xml
diff --git a/packages/VpnDialogs/res/values-hy-rAM/strings.xml b/packages/VpnDialogs/res/values-hy/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-hy-rAM/strings.xml
rename to packages/VpnDialogs/res/values-hy/strings.xml
diff --git a/packages/VpnDialogs/res/values-is-rIS/strings.xml b/packages/VpnDialogs/res/values-is/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-is-rIS/strings.xml
rename to packages/VpnDialogs/res/values-is/strings.xml
diff --git a/packages/VpnDialogs/res/values-ka-rGE/strings.xml b/packages/VpnDialogs/res/values-ka/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-ka-rGE/strings.xml
rename to packages/VpnDialogs/res/values-ka/strings.xml
diff --git a/packages/VpnDialogs/res/values-kk-rKZ/strings.xml b/packages/VpnDialogs/res/values-kk/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-kk-rKZ/strings.xml
rename to packages/VpnDialogs/res/values-kk/strings.xml
diff --git a/packages/VpnDialogs/res/values-km-rKH/strings.xml b/packages/VpnDialogs/res/values-km/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-km-rKH/strings.xml
rename to packages/VpnDialogs/res/values-km/strings.xml
diff --git a/packages/VpnDialogs/res/values-kn-rIN/strings.xml b/packages/VpnDialogs/res/values-kn/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-kn-rIN/strings.xml
rename to packages/VpnDialogs/res/values-kn/strings.xml
diff --git a/packages/VpnDialogs/res/values-ky-rKG/strings.xml b/packages/VpnDialogs/res/values-ky/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-ky-rKG/strings.xml
rename to packages/VpnDialogs/res/values-ky/strings.xml
diff --git a/packages/VpnDialogs/res/values-lo-rLA/strings.xml b/packages/VpnDialogs/res/values-lo/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-lo-rLA/strings.xml
rename to packages/VpnDialogs/res/values-lo/strings.xml
diff --git a/packages/VpnDialogs/res/values-mk-rMK/strings.xml b/packages/VpnDialogs/res/values-mk/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-mk-rMK/strings.xml
rename to packages/VpnDialogs/res/values-mk/strings.xml
diff --git a/packages/VpnDialogs/res/values-ml-rIN/strings.xml b/packages/VpnDialogs/res/values-ml/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-ml-rIN/strings.xml
rename to packages/VpnDialogs/res/values-ml/strings.xml
diff --git a/packages/VpnDialogs/res/values-mn-rMN/strings.xml b/packages/VpnDialogs/res/values-mn/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-mn-rMN/strings.xml
rename to packages/VpnDialogs/res/values-mn/strings.xml
diff --git a/packages/VpnDialogs/res/values-mr-rIN/strings.xml b/packages/VpnDialogs/res/values-mr/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-mr-rIN/strings.xml
rename to packages/VpnDialogs/res/values-mr/strings.xml
diff --git a/packages/VpnDialogs/res/values-ms-rMY/strings.xml b/packages/VpnDialogs/res/values-ms/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-ms-rMY/strings.xml
rename to packages/VpnDialogs/res/values-ms/strings.xml
diff --git a/packages/VpnDialogs/res/values-my-rMM/strings.xml b/packages/VpnDialogs/res/values-my/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-my-rMM/strings.xml
rename to packages/VpnDialogs/res/values-my/strings.xml
diff --git a/packages/VpnDialogs/res/values-ne-rNP/strings.xml b/packages/VpnDialogs/res/values-ne/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-ne-rNP/strings.xml
rename to packages/VpnDialogs/res/values-ne/strings.xml
diff --git a/packages/VpnDialogs/res/values-pa-rIN/strings.xml b/packages/VpnDialogs/res/values-pa/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-pa-rIN/strings.xml
rename to packages/VpnDialogs/res/values-pa/strings.xml
diff --git a/packages/VpnDialogs/res/values-si-rLK/strings.xml b/packages/VpnDialogs/res/values-si/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-si-rLK/strings.xml
rename to packages/VpnDialogs/res/values-si/strings.xml
diff --git a/packages/VpnDialogs/res/values-sq-rAL/strings.xml b/packages/VpnDialogs/res/values-sq/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-sq-rAL/strings.xml
rename to packages/VpnDialogs/res/values-sq/strings.xml
diff --git a/packages/VpnDialogs/res/values-ta-rIN/strings.xml b/packages/VpnDialogs/res/values-ta/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-ta-rIN/strings.xml
rename to packages/VpnDialogs/res/values-ta/strings.xml
diff --git a/packages/VpnDialogs/res/values-te-rIN/strings.xml b/packages/VpnDialogs/res/values-te/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-te-rIN/strings.xml
rename to packages/VpnDialogs/res/values-te/strings.xml
diff --git a/packages/VpnDialogs/res/values-ur-rPK/strings.xml b/packages/VpnDialogs/res/values-ur/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-ur-rPK/strings.xml
rename to packages/VpnDialogs/res/values-ur/strings.xml
diff --git a/packages/VpnDialogs/res/values-uz-rUZ/strings.xml b/packages/VpnDialogs/res/values-uz/strings.xml
similarity index 100%
rename from packages/VpnDialogs/res/values-uz-rUZ/strings.xml
rename to packages/VpnDialogs/res/values-uz/strings.xml
diff --git a/packages/WallpaperCropper/res/values-et-rEE/strings.xml b/packages/WallpaperCropper/res/values-et/strings.xml
similarity index 100%
rename from packages/WallpaperCropper/res/values-et-rEE/strings.xml
rename to packages/WallpaperCropper/res/values-et/strings.xml
diff --git a/packages/WallpaperCropper/res/values-hy-rAM/strings.xml b/packages/WallpaperCropper/res/values-hy/strings.xml
similarity index 100%
rename from packages/WallpaperCropper/res/values-hy-rAM/strings.xml
rename to packages/WallpaperCropper/res/values-hy/strings.xml
diff --git a/packages/WallpaperCropper/res/values-ka-rGE/strings.xml b/packages/WallpaperCropper/res/values-ka/strings.xml
similarity index 100%
rename from packages/WallpaperCropper/res/values-ka-rGE/strings.xml
rename to packages/WallpaperCropper/res/values-ka/strings.xml
diff --git a/packages/WallpaperCropper/res/values-km-rKH/strings.xml b/packages/WallpaperCropper/res/values-km/strings.xml
similarity index 100%
rename from packages/WallpaperCropper/res/values-km-rKH/strings.xml
rename to packages/WallpaperCropper/res/values-km/strings.xml
diff --git a/packages/WallpaperCropper/res/values-lo-rLA/strings.xml b/packages/WallpaperCropper/res/values-lo/strings.xml
similarity index 100%
rename from packages/WallpaperCropper/res/values-lo-rLA/strings.xml
rename to packages/WallpaperCropper/res/values-lo/strings.xml
diff --git a/packages/WallpaperCropper/res/values-mn-rMN/strings.xml b/packages/WallpaperCropper/res/values-mn/strings.xml
similarity index 100%
rename from packages/WallpaperCropper/res/values-mn-rMN/strings.xml
rename to packages/WallpaperCropper/res/values-mn/strings.xml
diff --git a/packages/WallpaperCropper/res/values-ms-rMY/strings.xml b/packages/WallpaperCropper/res/values-ms/strings.xml
similarity index 100%
rename from packages/WallpaperCropper/res/values-ms-rMY/strings.xml
rename to packages/WallpaperCropper/res/values-ms/strings.xml