summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2016-03-10 18:21:48 -0800
committerSteve Kondik <steve@cyngn.com>2016-03-10 18:21:48 -0800
commit786e26561308551523f089481e385c20dcbaaa75 (patch)
tree2a8f4d129ead910e2963d4ba8433d4ed14de17cc
parent321806c81168bb2d7d43d28b046ddc6e46a735e5 (diff)
parentca086947d0ee669bd807472d626b9a752d0e6c2e (diff)
downloadandroid_packages_apps_BasicSmsReceiver-786e26561308551523f089481e385c20dcbaaa75.tar.gz
android_packages_apps_BasicSmsReceiver-786e26561308551523f089481e385c20dcbaaa75.tar.bz2
android_packages_apps_BasicSmsReceiver-786e26561308551523f089481e385c20dcbaaa75.zip
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/BasicSmsReceiver into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
-rw-r--r--res/values-fa/strings.xml2
-rw-r--r--res/values-kk-rKZ/strings.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ad7ade5..d1853aa 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/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-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 4968a47..363aee3 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/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>