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

This reverts commit 5c7a42d7b81e7d4d6e685d5a01f06fdc59497cb1, reversing
changes made to 8e7f84f5c4773f37b596ff4b5ba6189ecbe231e7.

Change-Id: I1bc97a3ab0899d58bebdf89a0b6f123b0b0a0be2

4 files changed, 4 insertions, 4 deletions

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b6fb5d6..dd15a02 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 z tagu NFC"</string>
+    <string name="mime_display_name" msgid="5926357152623764485">"Data ze štítku 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 01fedd3..0a1d156 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 d73c058..917a1c6 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 ac9fd09..f61f036 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>