Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Tag into cm-13.0staging/cm-13.0+r22

Android 6.0.1 release 22

4 files changed, 4 insertions, 4 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index dd15a02..b6fb5d6 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -26,6 +26,6 @@
     <string name="action_call" msgid="6226253647953184035">"Volat kontakt <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="empty_tag_prompt" msgid="4206394383309956030">"Tento štítek je prázdný."</string>
     <string name="import_vcard" msgid="5104299047930666528">"Importovat ^1"</string>
-    <string name="mime_display_name" msgid="5926357152623764485">"Data ze štítku NFC"</string>
+    <string name="mime_display_name" msgid="5926357152623764485">"Data z tagu NFC"</string>
     <string name="vcard_title" msgid="7122634780732426007">"Kontaktní údaje uživatele ^1"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0a1d156..01fedd3 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -21,7 +21,7 @@
     <string name="title_existing_tag" msgid="5656560272594190244">"نشان"</string>
     <string name="tag_unknown" msgid="2897956823877728783">"نوع نشان ناشناس"</string>
     <string name="tag_empty" msgid="3726529819932095782">"نشان خالی"</string>
-    <string name="button_done" msgid="7048822758098308158">"تمام"</string>
+    <string name="button_done" msgid="7048822758098308158">"انجام شد"</string>
     <string name="action_text" msgid="577417996159152923">"ارسال متن به <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="action_call" msgid="6226253647953184035">"تماس با <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="empty_tag_prompt" msgid="4206394383309956030">"این نشان خالی است."</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 917a1c6..d73c058 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -21,7 +21,7 @@
     <string name="title_existing_tag" msgid="5656560272594190244">"Айдар"</string>
     <string name="tag_unknown" msgid="2897956823877728783">"Белгісіз айдар түрі"</string>
     <string name="tag_empty" msgid="3726529819932095782">"Айдар бос"</string>
-    <string name="button_done" msgid="7048822758098308158">"Дайын"</string>
+    <string name="button_done" msgid="7048822758098308158">"Орындалды"</string>
     <string name="action_text" msgid="577417996159152923">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> нөміріне мәтін жіберу"</string>
     <string name="action_call" msgid="6226253647953184035">"<xliff:g id="PHONE_NUMBER">%s</xliff:g> нөміріне қоңырау шалу"</string>
     <string name="empty_tag_prompt" msgid="4206394383309956030">"Бұл айдар бос."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f61f036..ac9fd09 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -22,7 +22,7 @@
     <string name="tag_unknown" msgid="2897956823877728783">"Tip de etichetă necunoscut"</string>
     <string name="tag_empty" msgid="3726529819932095782">"Etichetă goală"</string>
     <string name="button_done" msgid="7048822758098308158">"Terminat"</string>
-    <string name="action_text" msgid="577417996159152923">"Trimiteți mesaj la <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="action_text" msgid="577417996159152923">"Trimiteţi mesaj la <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="action_call" msgid="6226253647953184035">"Apelaţi <xliff:g id="PHONE_NUMBER">%s</xliff:g>"</string>
     <string name="empty_tag_prompt" msgid="4206394383309956030">"Această etichetă este goală."</string>
     <string name="import_vcard" msgid="5104299047930666528">"Importaţi ^1"</string>