diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
similarity index 100%
rename from res/values-az-rAZ/strings.xml
rename to res/values-az/strings.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-be/strings.xml
similarity index 78%
copy from res/values-mn-rMN/strings.xml
copy to res/values-be/strings.xml
index d9b00e5..0679f92 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-be/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_app_name" msgid="3641211328012514267">"Энгийн зурвас хүлээн авагч"</string>
-    <string name="sms_message_from_format" msgid="7163240046237558485">"<xliff:g id="USERNAME">%1$s</xliff:g> ирүүлсэн зурвас"</string>
-    <string name="sms_done_button" msgid="4063239029747798890">"Дууссан"</string>
+    <string name="sms_app_name" msgid="3641211328012514267">"Просты прыёмнік паведамленняў"</string>
+    <string name="sms_message_from_format" msgid="7163240046237558485">"Паведамленне ад карыстальнiка <xliff:g id="USERNAME">%1$s</xliff:g>"</string>
+    <string name="sms_done_button" msgid="4063239029747798890">"Гатова"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml
similarity index 100%
rename from res/values-bn-rBD/strings.xml
rename to res/values-bn/strings.xml
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 7f2566e..d08dbf6 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -18,5 +18,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="sms_app_name" msgid="3641211328012514267">"Enkel beskedmodtager"</string>
     <string name="sms_message_from_format" msgid="7163240046237558485">"Meddelelse fra <xliff:g id="USERNAME">%1$s</xliff:g>"</string>
-    <string name="sms_done_button" msgid="4063239029747798890">"Færdig"</string>
+    <string name="sms_done_button" msgid="4063239029747798890">"Udfør"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
similarity index 100%
rename from res/values-et-rEE/strings.xml
rename to res/values-et/strings.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
similarity index 100%
rename from res/values-eu-rES/strings.xml
rename to res/values-eu/strings.xml
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
similarity index 100%
rename from res/values-gl-rES/strings.xml
rename to res/values-gl/strings.xml
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml
similarity index 100%
rename from res/values-gu-rIN/strings.xml
rename to res/values-gu/strings.xml
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml
similarity index 97%
rename from res/values-hy-rAM/strings.xml
rename to res/values-hy/strings.xml
index 79892ae..6bbeb3e 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy/strings.xml
@@ -18,5 +18,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="sms_app_name" msgid="3641211328012514267">"Պարզ հաղորդագրության ընդունիչ"</string>
     <string name="sms_message_from_format" msgid="7163240046237558485">"Հաղորդագրություն <xliff:g id="USERNAME">%1$s</xliff:g>-ից"</string>
-    <string name="sms_done_button" msgid="4063239029747798890">"Կատարված է"</string>
+    <string name="sms_done_button" msgid="4063239029747798890">"Պատրաստ է"</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml
similarity index 100%
rename from res/values-is-rIS/strings.xml
rename to res/values-is/strings.xml
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml
similarity index 100%
rename from res/values-ka-rGE/strings.xml
rename to res/values-ka/strings.xml
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml
similarity index 100%
rename from res/values-kk-rKZ/strings.xml
rename to res/values-kk/strings.xml
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml
similarity index 100%
rename from res/values-km-rKH/strings.xml
rename to res/values-km/strings.xml
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml
similarity index 100%
rename from res/values-kn-rIN/strings.xml
rename to res/values-kn/strings.xml
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml
similarity index 100%
rename from res/values-ky-rKG/strings.xml
rename to res/values-ky/strings.xml
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml
similarity index 100%
rename from res/values-lo-rLA/strings.xml
rename to res/values-lo/strings.xml
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml
similarity index 100%
rename from res/values-mk-rMK/strings.xml
rename to res/values-mk/strings.xml
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml
similarity index 100%
rename from res/values-ml-rIN/strings.xml
rename to res/values-ml/strings.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml
similarity index 93%
rename from res/values-mn-rMN/strings.xml
rename to res/values-mn/strings.xml
index d9b00e5..c0eea0a 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sms_app_name" msgid="3641211328012514267">"Энгийн зурвас хүлээн авагч"</string>
-    <string name="sms_message_from_format" msgid="7163240046237558485">"<xliff:g id="USERNAME">%1$s</xliff:g> ирүүлсэн зурвас"</string>
+    <string name="sms_app_name" msgid="3641211328012514267">"Энгийн мессэж хүлээн авагч"</string>
+    <string name="sms_message_from_format" msgid="7163240046237558485">"<xliff:g id="USERNAME">%1$s</xliff:g> ирүүлсэн мессэж"</string>
     <string name="sms_done_button" msgid="4063239029747798890">"Дууссан"</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml
similarity index 100%
rename from res/values-mr-rIN/strings.xml
rename to res/values-mr/strings.xml
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml
similarity index 100%
rename from res/values-ms-rMY/strings.xml
rename to res/values-ms/strings.xml
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml
similarity index 100%
rename from res/values-my-rMM/strings.xml
rename to res/values-my/strings.xml
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml
similarity index 100%
rename from res/values-ne-rNP/strings.xml
rename to res/values-ne/strings.xml
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml
similarity index 100%
rename from res/values-pa-rIN/strings.xml
rename to res/values-pa/strings.xml
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml
similarity index 100%
rename from res/values-si-rLK/strings.xml
rename to res/values-si/strings.xml
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml
similarity index 100%
rename from res/values-sq-rAL/strings.xml
rename to res/values-sq/strings.xml
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml
similarity index 100%
rename from res/values-ta-rIN/strings.xml
rename to res/values-ta/strings.xml
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml
similarity index 100%
rename from res/values-te-rIN/strings.xml
rename to res/values-te/strings.xml
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml
similarity index 100%
rename from res/values-ur-rPK/strings.xml
rename to res/values-ur/strings.xml
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml
similarity index 100%
rename from res/values-uz-rUZ/strings.xml
rename to res/values-uz/strings.xml