commit 267d77f8655aa728c511fcdc754725ac36df8ac6
author Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:34:30 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:34:30 2015 -0800
tree f5c89c24dfb1cf41e31d4c5f9cd4c1dd28cc7232
parent c9e6f08e591b76490c465a7ebbdbb72159bfa8af
parent fab9ee32088a966773aae14ec368e731113da5a2

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Import translations. DO NOT MERGE

Change-Id: I0c40fbcd408e9fefdc3b79f9f6f3e7a9c595169f

res/values-fa/strings.xml

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d1853aa..ad7ade5 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>