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

Android 6.0.1 release 22

3 files changed, 10 insertions, 10 deletions

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ad14fd80..5aa61ea7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -60,7 +60,7 @@
     <string name="sms_work_mobile" msgid="8426872094268475047">"ارسال پیامک به تلفن همراه محل کار"</string>
     <string name="sms_work_pager" msgid="499303540738557836">"ارسال پیامک به پی‌جوی محل کار"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"ارسال پیامک به <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="sms_mms" msgid="4887206338311086612">"‏ارسال پیامک به MMS"</string>
+    <string name="sms_mms" msgid="4887206338311086612">"ارسال پیامک به خدمات پیام چندرسانه‌ای"</string>
     <string name="description_video_call" msgid="4907306403398614909">"برقراری تماس ویدیویی"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"فهرست مکرر تماس‌گرفته‌شده پاک شود؟"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"فهرست افرادی را که مکرر با آن‌ها تماس گرفته‌اید در برنامه‌های «مخاطبین» و «تلفن» پاک خواهید کرد و برنامه‌های ایمیل مجبور می‌شوند که تنظیمات برگزیده آدرس‌دهی شما را از اول یاد بگیرند."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 44aea48d..7bd24ca8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -130,10 +130,10 @@
     <string name="postal_region" msgid="1695206048198921115">"Stat"</string>
     <string name="postal_postcode" msgid="6542806670034753265">"Cod poştal"</string>
     <string name="postal_country" msgid="3988452247038791892">"Țară"</string>
-    <string name="map_home" msgid="1221397355014741634">"Vizualizaţi adresa de domiciliu"</string>
-    <string name="map_work" msgid="9015981646907637207">"Vizualizaţi adresa de serviciu"</string>
-    <string name="map_other" msgid="55098598855607997">"Vizualizaţi adresa poştală"</string>
-    <string name="map_custom" msgid="4943554530347163288">"Vizualizaţi adresa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
+    <string name="map_home" msgid="1221397355014741634">"Vizualizați adresa de domiciliu"</string>
+    <string name="map_work" msgid="9015981646907637207">"Vizualizați adresa de serviciu"</string>
+    <string name="map_other" msgid="55098598855607997">"Vizualizați adresa poştală"</string>
+    <string name="map_custom" msgid="4943554530347163288">"Vizualizați adresa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="chat_aim" msgid="6479001490307452172">"Conversaţi prin AIM"</string>
     <string name="chat_msn" msgid="627481952525245054">"Conversaţi prin Windows Live"</string>
     <string name="chat_yahoo" msgid="5542489454092719897">"Conversaţi prin Yahoo"</string>
@@ -143,7 +143,7 @@
     <string name="chat_icq" msgid="7538190395602030726">"Conversaţi prin ICQ"</string>
     <string name="chat_jabber" msgid="4525546665986350869">"Conversaţi prin Jabber"</string>
     <string name="chat" msgid="6297650784873558837">"Conversaţi prin chat"</string>
-    <string name="description_minus_button" msgid="2142439445814730827">"ştergeţi"</string>
+    <string name="description_minus_button" msgid="2142439445814730827">"ștergeți"</string>
     <string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"Extindeţi sau restrângeți câmpurile pentru nume"</string>
     <string name="list_filter_all_accounts" msgid="4265359896628915784">"Toată agenda"</string>
     <string name="list_filter_all_starred" msgid="9060325494254507806">"Cu stea"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5d923013..555b7080 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -160,7 +160,7 @@
     <string name="listAllContactsInAccount" msgid="755499980092808715">"<xliff:g id="NAME">%s</xliff:g> 中的联系人"</string>
     <string name="listCustomView" msgid="1915154113477432033">"自定义视图中的联系人"</string>
     <string name="listSingleContact" msgid="8525131203887307088">"单个联系人"</string>
-    <string name="dialog_new_contact_account" msgid="4107520273478326011">"在以下帐户中创建联系人："</string>
+    <string name="dialog_new_contact_account" msgid="4107520273478326011">"在以下帐号中创建联系人："</string>
     <string name="import_from_sim" msgid="4749894687871835873">"从 SIM 卡导入"</string>
     <string name="import_from_sim_summary" msgid="2306434118233541675">"从 SIM 卡“<xliff:g id="SIM_NAME">^1</xliff:g>” - <xliff:g id="SIM_NUMBER">^2</xliff:g> 导入"</string>
     <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"从 SIM 卡“<xliff:g id="SIM_NAME">%1$s</xliff:g>”导入"</string>
@@ -240,16 +240,16 @@
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g>中没有联系人"</string>
     <string name="menu_clear_frequents" msgid="8492322695770647639">"清除常用联系人"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"选择SIM卡"</string>
-    <string name="menu_accounts" msgid="795417468541517082">"帐户"</string>
+    <string name="menu_accounts" msgid="795417468541517082">"帐号"</string>
     <string name="menu_import_export" msgid="6446229463809981669">"导入/导出"</string>
     <string name="contact_status_update_attribution" msgid="8419168578670128134">"来源：<xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g>，来源：<xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"停止搜索"</string>
     <string name="description_clear_search" msgid="3893511425518852086">"清除搜索内容"</string>
     <string name="settings_contact_display_options_title" msgid="1020420603072835628">"联系人显示选项"</string>
-    <string name="select_account_dialog_title" msgid="5509088895267310568">"帐户"</string>
+    <string name="select_account_dialog_title" msgid="5509088895267310568">"帐号"</string>
     <string name="set_default_account" msgid="3865970860434642695">"一律使用这张卡进行通话"</string>
-    <string name="select_phone_account_for_calls" msgid="933905607702811164">"用于外拨电话的帐户"</string>
+    <string name="select_phone_account_for_calls" msgid="933905607702811164">"用于外拨电话的帐号"</string>
     <string name="call_with_a_note" msgid="8453800473226831257">"拨打电话时发送记事"</string>
     <string name="call_subject_hint" msgid="2270115162050853866">"输入可在拨打电话时发送的记事…"</string>
     <string name="send_and_call_button" msgid="7459507823002185202">"发送记事并拨打电话"</string>