commit c76ec49716ac755a3eb6dc6a0c2896d4c1c7713c
author Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:28:47 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:28:47 2015 -0800
tree 638dffc993d5540d45d1831eb1a0c05a9ea3be3c
parent 96cf989ae48f6f4383b9c76a9d29205363aba8cc
parent 3315c12c2ece901185f3df833ad055f261b47a1e

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: I5902c0196fdf7c5c775ab841bb99104a78d1905e

res/values-fa/strings.xml

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index cf29490..896895e 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -17,7 +17,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="done_label" msgid="7007948707597430919">"انجام شد"</string>
+    <string name="done_label" msgid="7007948707597430919">"تمام"</string>
     <string name="hour_picker_description" msgid="7586639618712934060">"لغزنده دایره‌ای ساعت"</string>
     <string name="minute_picker_description" msgid="6024811202872705251">"لغزنده دایره‌ای دقیقه"</string>
     <string name="select_hours" msgid="7651068754188418859">"انتخاب ساعت"</string>