commit 3cf002256e2461b269bde1407b67ce0c50b6b1d2
author Bill Yi <byi@google.com> Tue Aug 02 14:27:44 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Aug 02 14:27:44 2016 +0000
tree 0c38205fbc2d3a5ec82c45309e754fd142f48a71
parent f0e7cf4e425c4df20bd2cf45e6774e4b442d7ab5
parent af3e869f55fee51b2168213faa0798820ba0554d

Merge "Import translations. DO NOT MERGE" into ub-contactsdialer-f-dev

res-common/values-fa/strings.xml

diff --git a/res-common/values-fa/strings.xml b/res-common/values-fa/strings.xml
index d68586d..3fc2fb4 100644
--- a/res-common/values-fa/strings.xml
+++ b/res-common/values-fa/strings.xml
@@ -168,7 +168,7 @@
     <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"وارد کردن <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string>
     <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"صادر کردن به <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="7450212880694781527">"وارد/صادرکردن کارت ویزیت لغو نمی‌شود"</string>
-    <string name="fail_reason_unknown" msgid="8541352164960008557">"خطای ناشناخته."</string>
+    <string name="fail_reason_unknown" msgid="8541352164960008557">"خطای ناشناس."</string>
     <string name="fail_reason_could_not_open_file" msgid="7041148341788958325">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" باز نشد: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="1231982631020480035">"صادر کننده راه‌اندازی نشد: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_no_exportable_contact" msgid="3717046989062541369">"هیچ مخاطب قابل صدوری موجود نیست."</string>

res-common/values-kk-rKZ/strings.xml

diff --git a/res-common/values-kk-rKZ/strings.xml b/res-common/values-kk-rKZ/strings.xml
index c2c64e1..c1d4132 100644
--- a/res-common/values-kk-rKZ/strings.xml
+++ b/res-common/values-kk-rKZ/strings.xml
@@ -159,7 +159,7 @@
     <string name="savingDisplayGroups" msgid="6863012138107446030">"Дисплей опцияларын сақтау…"</string>
     <string name="menu_done" msgid="32470053723443112">"Дайын"</string>
     <string name="menu_doNotSave" msgid="6012426160993364871">"Бас тарту"</string>
-    <string name="listCustomView" msgid="6028436654382131381">"Теңшелген көрініс"</string>
+    <string name="listCustomView" msgid="6028436654382131381">"Реттелген көрініс"</string>
     <string name="dialog_new_contact_account" msgid="32435918254518570">"Импортталған контактілерді келесіге сақтау:"</string>
     <string name="import_from_sim" msgid="4749894687871835873">"SIM картадан импорттау"</string>
     <string name="import_from_sim_summary" msgid="2306434118233541675">"<xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g> SIM картасынан импорттау"</string>
@@ -243,7 +243,7 @@
     <string name="menu_search" msgid="7464453023659824700">"Іздеу"</string>
     <string name="menu_contacts_filter" msgid="586356478145511794">"Көрсетілетін контактілер"</string>
     <string name="activity_title_contacts_filter" msgid="7689519428197855166">"Көрсетілетін контактілер"</string>
-    <string name="custom_list_filter" msgid="4075228878875354341">"Теңшелген көріністі анықтау"</string>
+    <string name="custom_list_filter" msgid="4075228878875354341">"Реттелген көріністі анықтау"</string>
     <string name="menu_custom_filter_save" msgid="6026814211328635312">"Сақтау"</string>
     <string name="hint_findContacts" msgid="5348098493767051775">"Контактілерді іздеу"</string>
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"Сүйіктілер"</string>