Merge branch 'security-aosp-rvc-release' into int/11/fp3

* security-aosp-rvc-release:
  No longer export CallSubjectDialog

Change-Id: I0f2422ed50fab5c07ecf76655ab93e8316be98fd
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f4e5f6b..573c9e8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -516,7 +516,6 @@
             android:label="@string/sim_import_title"
             android:theme="@style/PeopleThemeAppCompat.FullScreenDialog.SimImportActivity"/>
 
-
         <service
             android:name=".vcard.VCardService"
             android:exported="false"/>
diff --git a/res/menu/people_options.xml b/res/menu/people_options.xml
index 5fb0f2e..18707e3 100644
--- a/res/menu/people_options.xml
+++ b/res/menu/people_options.xml
@@ -45,4 +45,9 @@
         android:title="@string/menu_joinAggregate"
         contacts:showAsAction="ifRoom"/>
 
+    <item
+        android:id="@+id/menu_select_all"
+        android:title="@string/menu_select_all"
+        contacts:showAsAction="never"/>
+
 </menu>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 499448d..8f981d6 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -190,7 +190,7 @@
     <string name="title_edit_group" msgid="4246193439931854759">"Uklonite kontakte"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Moj lokalni profil"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"Moj <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> profil"</string>
-    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Odvojte malo vremena da biste dodali nalog pomoću kog ćete napraviti rezervnu kopiju kontakata na Google-u."</string>
+    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Odvojite malo vremena da biste dodali nalog pomoću kog ćete napraviti rezervnu kopiju kontakata na Google-u."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"Novi kontakti će biti sačuvani na nalogu <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Izaberite podrazumevani nalog za nove kontakte:"</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Novi kontakt"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 926fe45..9082031 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -213,7 +213,7 @@
     <string name="about_card_title" msgid="6635849009952435700">"Інфармацыя"</string>
     <string name="toast_making_personal_copy" msgid="9053129410039312386">"Стварэнне асабістай копіі..."</string>
     <string name="date_time_set" msgid="8526160894146496334">"Задаць"</string>
-    <string name="header_im_entry" msgid="3581797653862294826">"Iмгненныя паведамленні"</string>
+    <string name="header_im_entry" msgid="3581797653862294826">"Чат"</string>
     <string name="header_organization_entry" msgid="7428066442988227441">"Арганізацыя"</string>
     <string name="header_nickname_entry" msgid="1110276804512795150">"Псеўданім"</string>
     <string name="header_note_entry" msgid="339680292368016788">"Нататка"</string>
@@ -325,9 +325,9 @@
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"Тэлефон"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"Электронная пошта"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"Адрас"</string>
-    <string name="imLabelsGroup" msgid="2113398976789806432">"ІМ"</string>
+    <string name="imLabelsGroup" msgid="2113398976789806432">"Чат"</string>
     <string name="organizationLabelsGroup" msgid="2342482097897299099">"Арганізацыя"</string>
-    <string name="relationLabelsGroup" msgid="8931615792208307291">"Сувязі"</string>
+    <string name="relationLabelsGroup" msgid="8931615792208307291">"Адносіны"</string>
     <string name="eventLabelsGroup" msgid="8625868552164376823">"Асаблівая дата"</string>
     <string name="sms" msgid="4246338112764847384">"Тэкставае паведамленне"</string>
     <string name="postal_address" msgid="5031809899673855074">"Адрас"</string>
@@ -466,7 +466,7 @@
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Адлюстроўваць кантакты"</string>
     <string name="custom_list_filter" msgid="2544327670202891979">"Наладзіць прагляд"</string>
     <string name="menu_custom_filter_save" msgid="2412959737200856930">"Захаваць"</string>
-    <string name="hint_findContacts" msgid="5554298639062659655">"Шукаць у кантактах"</string>
+    <string name="hint_findContacts" msgid="5554298639062659655">"Пошук кантактаў"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"Выбранае"</string>
     <string name="menu_import" msgid="2206768098740726906">"Імпартаваць"</string>
     <string name="menu_export" msgid="1217402092617629429">"Экспартаваць"</string>
@@ -513,7 +513,7 @@
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"Адхіліць"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"Сінхранізацыя ўліковага запісу адключана. Дакраніцеся, каб уключыць яе."</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"Уключыць аўтасінхранізацыю?"</string>
-    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Змены, якія вы зрабілі ва ўсіх праграмах і ўліковых запісах, не толькі ў Кантактах Google, будуць сінхранізоўвацца паміж вэб-інтэрфейсам і вашымі прыладамі."</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Змяненні, унесеныя вамі ў іншых праграмах і ўліковых запісах (не толькі ў Google Кантактах), будуць сінхранізавацца паміж вэб-інтэрфейсам і вашымі прыладамі."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Уключыць"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"Няма падключэння"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM-карта"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index fb2e8bc..f43d7c0 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -368,7 +368,7 @@
     <string name="announce_expanded_fields" msgid="8410808184164186871">"Prošireno"</string>
     <string name="announce_collapsed_fields" msgid="7611318715383228182">"Skupljeno"</string>
     <string name="list_filter_all_accounts" msgid="6173785387972096770">"Svi kontakti"</string>
-    <string name="list_filter_all_starred" msgid="2582865760150432568">"Označeno zvijezdom"</string>
+    <string name="list_filter_all_starred" msgid="2582865760150432568">"Označeno zvjezdicom"</string>
     <string name="list_filter_customize" msgid="2368900508906139537">"Prilagodi"</string>
     <string name="list_filter_single" msgid="6003845379327432129">"Kontakt"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"Svi drugi kontakti"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index cf32d11..3ec77e3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -503,9 +503,9 @@
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Activa"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"Sense connexió"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
-    <string name="show_more_content_description" msgid="6298277298495491712">"Mostra més"</string>
+    <string name="show_more_content_description" msgid="6298277298495491712">"Mostra\'n més"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"Importació de la targeta SIM completada"</string>
-    <string name="importing_sim_failed_title" msgid="1046154274170241788">"La importació ha fallat"</string>
+    <string name="importing_sim_failed_title" msgid="1046154274170241788">"Ha fallat la importació"</string>
     <string name="importing_sim_failed_message" msgid="55568522164349044">"No s\'han pogut importar els contactes de la targeta SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="7647907413920018595">"S\'estan important els contactes de la SIM"</string>
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Notificacions"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b24ddb4..4ffa806 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -163,7 +163,7 @@
     <string name="contact_directory_description" msgid="1773630547110881835">"Directorio <xliff:g id="TYPE">%1$s</xliff:g>"</string>
     <string name="activity_title_settings" msgid="4004290638426915162">"Ajustes"</string>
     <string name="menu_settings" msgid="3524924670246877187">"Ajustes"</string>
-    <string name="menu_help" msgid="287801702920372292">"Ayuda y sugerencias"</string>
+    <string name="menu_help" msgid="287801702920372292">"Ayuda y comentarios"</string>
     <string name="organization_company_and_title" msgid="7197631449041284518">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
     <string name="non_phone_caption" msgid="7343449684187013327">"Número de teléfono"</string>
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Añadir a contactos"</string>
@@ -471,11 +471,11 @@
     <string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
     <string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="about_build_version" msgid="5870642814752351712">"Versión de la compilación"</string>
-    <string name="about_open_source_licenses" msgid="1617836621315557445">"Licencias de código abierto"</string>
+    <string name="about_open_source_licenses" msgid="1617836621315557445">"Licencias de software libre"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Detalles de las licencias de software libre"</string>
     <string name="about_privacy_policy" msgid="4581488375200402678">"Política de Privacidad"</string>
-    <string name="about_terms_of_service" msgid="7419670771785057738">"Condiciones de Servicio"</string>
-    <string name="activity_title_licenses" msgid="6434398894019119709">"Licencias de código abierto"</string>
+    <string name="about_terms_of_service" msgid="7419670771785057738">"Términos del Servicio"</string>
+    <string name="activity_title_licenses" msgid="6434398894019119709">"Licencias de software libre"</string>
     <string name="url_open_error_toast" msgid="4885855620824048385">"No se ha podido abrir la URL."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"Se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"No se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 8579380..4967f6d 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -481,7 +481,7 @@
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"Ez da hautatu <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1768558141309418755">"Egin bideo-deia"</string>
     <string name="description_delete_contact" msgid="8110643050235441400">"Ezabatu"</string>
-    <string name="description_no_name_header" msgid="8596201864512339003">"Elipsia"</string>
+    <string name="description_no_name_header" msgid="8596201864512339003">"Etenpuntuak"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"Lasterbidea desgaitu egin da"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"Kendu da kontaktua"</string>
     <string name="sim_import_button_text" msgid="2845608246304396009">"Inportatu"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7085e52..624a4da 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -129,7 +129,7 @@
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"مخاطبی موجود نیست"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"\"<xliff:g id="EMAIL">%s</xliff:g>\" به مخاطبین افزوده شود؟"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"نام‌های مخاطبین شما"</string>
-    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"برای بازگشت به صفحه قبلی کلیک کنید"</string>
+    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"برای بازگشت به صفحه قبل کلیک کنید"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"افزودن شماره تلفن"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"افزودن ایمیل"</string>
     <string name="missing_app" msgid="5674389915738964148">"برنامه‌ای برای انجام این عملکرد یافت نشد."</string>
@@ -285,9 +285,9 @@
     <string name="sms_mms" msgid="7395133080765833725">"ارسال متن به فراپیام"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (پیام)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"برقراری تماس تصویری"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"فهرست تماس مکرر با مخاطب پاک شود؟"</string>
-    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"با این کار فهرست افرادی که بیشتر با آنها تماس گرفته‌اید در برنامه‌های «مخاطبین» و «تلفن» پاک می‌کنید و برنامه‌های ایمیل را وادار می‌کنید تنظیمات برگزیده مخاطبینتان را از اول یاد بگیرند."</string>
-    <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"در حال پاک کردن فهرست تماس مکرر..."</string>
+    <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"فهرست مخاطبین مکرر پاک شود؟"</string>
+    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"با این کار فهرست مخاطبین مکرر در برنامه‌های «مخاطبین» و «تلفن» پاک می‌کنید و برنامه‌های ایمیل را وادار می‌کنید اولویت‌های مخاطبینتان را از اول یاد بگیرند."</string>
+    <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"درحال پاک کردن فهرست مخاطبین مکرر…"</string>
     <string name="status_available" msgid="8081626460682959098">"در دسترس"</string>
     <string name="status_away" msgid="2677693194455091315">"غایب"</string>
     <string name="status_busy" msgid="2759339190187696727">"مشغول"</string>
@@ -297,7 +297,7 @@
     <string name="local_search_label" msgid="6692495405531144805">"همه مخاطبین"</string>
     <string name="description_quick_contact_for" msgid="6364906818231956042">"تماس سریع برای <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="7970183292521946492">"(بدون نام)"</string>
-    <string name="favoritesFrequentContacted" msgid="2885862854079966676">"اغلب تماس گرفته شده"</string>
+    <string name="favoritesFrequentContacted" msgid="2885862854079966676">"مخاطبین مکرر"</string>
     <string name="list_filter_phones" msgid="6839133198968393843">"همه مخاطبین دارای شماره تلفن"</string>
     <string name="list_filter_phones_work" msgid="5583425697781385616">"مخاطبین نمایه کاری"</string>
     <string name="view_updates_from_group" msgid="6233444629074835594">"مشاهده به‌روزرسانی‌ها"</string>
@@ -429,7 +429,7 @@
     <string name="caching_vcard_title" msgid="6333926052524937628">"در حال ذخیره در حافظهٔ پنهان"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"وارد کردن <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"‏صادر کردن به فایل ‎.vcf"</string>
-    <string name="display_options_sort_list_by" msgid="4333658089057400431">"مرتب‌سازی براساس"</string>
+    <string name="display_options_sort_list_by" msgid="4333658089057400431">"به‌ترتیب"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"تلفظ نام"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"همیشه نشان داده شود"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"اگر خالی است پنهان شود"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6bb5f56..928940b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -96,7 +96,7 @@
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"Yhteystieto lisättiin aloitusnäytölle."</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> lisättiin aloitusnäytölle."</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"Laitteella ei ole kuvia."</string>
-    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"Yhteyshenkilön valokuva"</string>
+    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"Yhteyshenkilön kuva"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"Oman luokituksen nimi"</string>
     <string name="removePhoto" msgid="1190099414600730001">"Poista kuva"</string>
     <string name="noContacts" msgid="3030512741779213810">"Yhteystietoluettelo on tyhjä."</string>
@@ -149,10 +149,10 @@
     <string name="video_chat" msgid="2477295971622477433">"Videokeskustelu"</string>
     <string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g>-osoite"</string>
     <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g>-tili"</string>
-    <string name="take_photo" msgid="820071555236547516">"Ota valokuva"</string>
+    <string name="take_photo" msgid="820071555236547516">"Ota kuva"</string>
     <string name="take_new_photo" msgid="4383091978116875778">"Ota uusi kuva"</string>
-    <string name="pick_photo" msgid="2050859661654812588">"Valitse valokuva"</string>
-    <string name="pick_new_photo" msgid="4218112182908240970">"Valitse uusi valokuva"</string>
+    <string name="pick_photo" msgid="2050859661654812588">"Valitse kuva"</string>
+    <string name="pick_new_photo" msgid="4218112182908240970">"Valitse uusi kuva"</string>
     <string name="search_results_searching" msgid="1373859095361975648">"Haetaan..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Päivämäärä"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Tunniste"</string>
@@ -217,9 +217,9 @@
     <string name="header_phone_entry" msgid="7092868248113091293">"Puhelin"</string>
     <string name="content_description_directions" msgid="860179347986211929">"reittiohjeet sijaintiin"</string>
     <string name="editor_more_fields" msgid="6158558083947445518">"Lisää kenttiä"</string>
-    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"Vaihda yhteystiedon valokuvaa"</string>
-    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"Lisää yhteystiedon valokuva"</string>
-    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"Yhteystiedon valokuva"</string>
+    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"Vaihda yhteystiedon kuvaa"</string>
+    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"Lisää yhteystiedon kuva"</string>
+    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"Yhteystiedon kuva"</string>
     <string name="editor_failed_to_load" msgid="2328074829787373644">"Muokkausnäkymän avaaminen epäonnistui."</string>
     <string name="editor_account_selector_title" msgid="3190515989740696043">"Tallennetaan tilille"</string>
     <string name="editor_account_selector_read_only_title" msgid="4870485850053962114">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> yhteystietoja ei voi muokata."</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 83ef3cf..7cc9320 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -29,7 +29,7 @@
     <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Créer un contact"</string>
     <string name="searchHint" msgid="1487501532610025473">"Rech. des contacts"</string>
     <string name="menu_addStar" msgid="4903812703386825130">"Ajouter aux favoris"</string>
-    <string name="menu_removeStar" msgid="3707373931808303701">"Supprimer des favoris"</string>
+    <string name="menu_removeStar" msgid="3707373931808303701">"Retirer des favoris"</string>
     <string name="description_action_menu_remove_star" msgid="4044390281910122890">"Supprimé des favoris"</string>
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"Ajouté aux favoris"</string>
     <string name="menu_editContact" msgid="5039663761025630208">"Modifier"</string>
@@ -37,7 +37,7 @@
     <string name="menu_change_photo" msgid="4911246106907208055">"Changer de photo"</string>
     <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"Créer un raccourci"</string>
     <string name="menu_splitAggregate" msgid="2062290275288905833">"Annuler la fusion"</string>
-    <string name="menu_editGroup" msgid="8706562583754054622">"Supprimer les contacts"</string>
+    <string name="menu_editGroup" msgid="8706562583754054622">"Retirer les contacts"</string>
     <string name="menu_renameGroup" msgid="2685886609399776475">"Renommer l\'étiquette"</string>
     <string name="menu_deleteGroup" msgid="1180215594530228294">"Supprimer l\'étiquette"</string>
     <string name="menu_addToGroup" msgid="5034813446697655310">"Ajouter un contact"</string>
@@ -183,7 +183,7 @@
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Annuler"</string>
     <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Supprimer les personnalisations?"</string>
     <string name="enter_contact_name" msgid="521859148893732679">"Rechercher dans les contacts"</string>
-    <string name="title_edit_group" msgid="4246193439931854759">"Supprimer les contacts"</string>
+    <string name="title_edit_group" msgid="4246193439931854759">"Retirer les contacts"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Mon profil local"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"Mon profil <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Prenez une minute pour ajouter un compte qui sauvegardera vos contacts sur Google."</string>
@@ -369,7 +369,7 @@
     <string name="list_filter_single" msgid="6003845379327432129">"contact"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"Tous les autres contacts"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"Tous les contacts"</string>
-    <string name="menu_sync_remove" msgid="7523335046562082188">"Supprimer le groupe de synchronisation"</string>
+    <string name="menu_sync_remove" msgid="7523335046562082188">"Retirer le groupe de synchronisation"</string>
     <string name="dialog_sync_add" msgid="8012361965908515959">"Ajouter groupe de synchronisation"</string>
     <string name="display_more_groups" msgid="8398232980355188133">"Autres groupes…"</string>
     <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"Le retrait du groupe \"<xliff:g id="GROUP">%s</xliff:g>\" de la synchronisation entraîne également le retrait des contacts n\'appartenant à aucun groupe."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 7ccb426..690f2e7 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -310,10 +310,10 @@
     <string name="name_prefix" msgid="8857117624713905211">"Forma de tratamento"</string>
     <string name="name_middle" msgid="7330498948136181042">"Segundo nome"</string>
     <string name="name_suffix" msgid="4502958221763936999">"Título académico ou profesional"</string>
-    <string name="name_phonetic" msgid="4746541275769990740">"Nome (pronuncia)"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"Nome (pronuncia)"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome (pronuncia)"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"Apelidos (pronuncia)"</string>
+    <string name="name_phonetic" msgid="4746541275769990740">"Nome (pronunciación)"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"Nome (pronunciación)"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome (pronunciación)"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"Apelidos (pronunciación)"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"Teléfono"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"Correo electrónico"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"Enderezo"</string>
@@ -430,7 +430,7 @@
     <string name="progress_notifier_message" msgid="8522060892889599746">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Exportar a ficheiro .vcf"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Ordenar por"</string>
-    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome (pronuncia)"</string>
+    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome (pronunciación)"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Mostrar sempre"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Ocultar se está baleiro"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Nome"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8f814ab..da6125c 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -32,7 +32,7 @@
     <string name="menu_removeStar" msgid="3707373931808303701">"મનપસંદમાંથી દૂર કરો"</string>
     <string name="description_action_menu_remove_star" msgid="4044390281910122890">"મનપસંદમાંથી દૂર કર્યું"</string>
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"મનપસંદમાં ઉમેર્યું"</string>
-    <string name="menu_editContact" msgid="5039663761025630208">"સંપાદન"</string>
+    <string name="menu_editContact" msgid="5039663761025630208">"ફેરફાર કરો"</string>
     <string name="menu_deleteContact" msgid="15161764025276217">"કાઢી નાખો"</string>
     <string name="menu_change_photo" msgid="4911246106907208055">"ફોટો બદલો"</string>
     <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"શૉર્ટકટ બનાવો"</string>
@@ -310,10 +310,10 @@
     <string name="name_prefix" msgid="8857117624713905211">"નામ ઉપસર્ગ"</string>
     <string name="name_middle" msgid="7330498948136181042">"પિતા/પતિનું નામ"</string>
     <string name="name_suffix" msgid="4502958221763936999">"નામ પ્રત્યય"</string>
-    <string name="name_phonetic" msgid="4746541275769990740">"ધ્વન્યાત્મક નામ"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"ધ્વન્યાત્મક નામ"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"ધ્વન્યાત્મક પિતા/પતિનું નામ"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"ધ્વન્યાત્મક અટક"</string>
+    <string name="name_phonetic" msgid="4746541275769990740">"ફોનેટિક નામ"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"ફોનેટિક નામ"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"ફોનેટિક પિતા/પતિનું નામ"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"ફોનેટિક અટક"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"ફોન"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"ઇમેઇલ"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"સરનામું"</string>
@@ -357,8 +357,8 @@
     <string name="description_minus_button" msgid="1305985971158054217">"કાઢી નાખો"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"વધુ નામ ફીલ્ડ્સ બતાવો"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"નામ ફીલ્ડ્સ સંકુચિત કરો"</string>
-    <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"વધુ ધ્વન્યાત્મક નામ ફીલ્ડ્સ બતાવો"</string>
-    <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"ધ્વન્યાત્મક નામ ફીલ્ડ્સ સંકુચિત કરો"</string>
+    <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"વધુ ફોનેટિક નામ ફીલ્ડ બતાવો"</string>
+    <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"ફોનેટિક નામ ફીલ્ડ સંકુચિત કરો"</string>
     <string name="expand_fields_description" msgid="8604448646798943909">"વિસ્તૃત કરો"</string>
     <string name="collapse_fields_description" msgid="3213872920491992960">"સંકુચિત કરો"</string>
     <string name="announce_expanded_fields" msgid="8410808184164186871">"વિસ્તૃત કર્યું"</string>
@@ -430,7 +430,7 @@
     <string name="progress_notifier_message" msgid="8522060892889599746">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> આયાત કરે છે: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">".vcf ફાઇલ પર નિકાસ કરો"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"આ પ્રમાણે સૉર્ટ કરો"</string>
-    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"ધ્વન્યાત્મક નામ"</string>
+    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"ફોનેટિક નામ"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"હંમેશા બતાવો"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"જો ખાલી હોય તો છુપાવો"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"નામ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d7d2d90..5c131ec 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -96,7 +96,7 @@
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"संपर्कों को होम स्क्रीन में जोड़ा गया."</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> को होम स्क्रीन में जोड़ा गया."</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"डिवाइस पर कोई चित्र उपलब्ध नहीं है."</string>
-    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"संपर्क का फ़ोटो"</string>
+    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"संपर्क की फ़ोटो"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"कस्टम लेबल नाम"</string>
     <string name="removePhoto" msgid="1190099414600730001">"फ़ोटो निकालें"</string>
     <string name="noContacts" msgid="3030512741779213810">"आपकी संपर्क सूची खाली है"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 94420ff..a3c6465 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -70,11 +70,11 @@
       <item quantity="other">Կոնտակտները ջնջվեցին</item>
     </plurals>
     <plurals name="contacts_count" formatted="false" msgid="8804860300387044572">
-      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> contacts</item>
+      <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> կոնտակտ</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> կոնտակտ</item>
     </plurals>
     <plurals name="contacts_count_with_account" formatted="false" msgid="1025146902085751375">
-      <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> contacts · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT_2">%1$d</xliff:g> կոնտակտ · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT_2">%1$d</xliff:g> կոնտակտ · <xliff:g id="ACCOUNT_3">%2$s</xliff:g></item>
     </plurals>
     <string name="title_from_google" msgid="2554633992366572820">"Google-ից"</string>
@@ -137,7 +137,7 @@
     <string name="menu_add_contact" msgid="5822356185421997656">"Ավելացնել կոնտակտներին"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Ավելացնել"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
-      <item quantity="one">Share contacts via</item>
+      <item quantity="one">Ուղարկել կոնտակտը հետևյալով՝</item>
       <item quantity="other">Ուղարկել կոնտակտները հետևյալով՝</item>
     </plurals>
     <string name="dialog_new_group_account" msgid="4326402875327788728">"Ընտրեք հաշիվը"</string>
@@ -201,7 +201,7 @@
     <string name="menu_export_database" msgid="1658249125751926885">"Արտահանել տվյալների շտեմարանի ֆայլերը"</string>
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Ստեղծել նոր կոնտակտ"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Տեսնել ավելին"</string>
-    <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Կոծկել"</string>
+    <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Ցույց տալ ավելի քիչ"</string>
     <string name="about_card_title" msgid="6635849009952435700">"Տեղեկատվություն"</string>
     <string name="toast_making_personal_copy" msgid="9053129410039312386">"Ստեղծվում է անձնական պատճենը..."</string>
     <string name="date_time_set" msgid="8526160894146496334">"Հաստատել"</string>
@@ -286,7 +286,7 @@
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Գրել SMS)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"Տեսազանգ սկսել"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Ջնջե՞լ հաճախակի հաղորդակցվողները"</string>
-    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Կոնտակտներ և Հեռախոս հավելվածներից կմաքրվի հաճախակի օգտագործվող կոնտակտների ցանկը, և էլփոստի հավելվածները զրոյից են սովորելու ձեր հաճախակի օգտագործվող կոնտակտները։"</string>
+    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Կոնտակտներ և Հեռախոս հավելվածներից կմաքրվի հաճախակի օգտագործվող կոնտակտների ցանկը, և էլփոստի հավելվածները զրոյից են սովորելու ձեր հաճախակի գործածվող կոնտակտները։"</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Մաքրվում է հաճախակի հաղորդակցվողները..."</string>
     <string name="status_available" msgid="8081626460682959098">"Հասանելի է"</string>
     <string name="status_away" msgid="2677693194455091315">"Տեղում չէ"</string>
@@ -379,11 +379,11 @@
     <string name="import_from_sim" msgid="7825280799813847991">"SIM քարտից"</string>
     <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"<xliff:g id="SIM_NAME">%1$s</xliff:g> SIM-ից"</string>
     <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="8737770002554878728">
-      <item quantity="one">%1$d contacts</item>
+      <item quantity="one">%1$d կոնտակտ</item>
       <item quantity="other">%1$d կոնտակտ</item>
     </plurals>
     <plurals name="import_from_sim_secondary_template" formatted="false" msgid="6698670511061586532">
-      <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> contacts • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+      <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> կոնտակտ • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> կոնտակտ • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
     </plurals>
     <string name="import_from_vcf_file" msgid="6776403212804361301">".vcf ֆայլից"</string>
@@ -393,13 +393,13 @@
     <string name="cancel_export_confirmation_message" msgid="370693160959236239">"Չեղարկե՞լ <xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումը"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"Հնարավոր չէ չեղարկել vCard-ի ներմուծումը/արտահանումը"</string>
     <string name="fail_reason_unknown" msgid="3721044979355043778">"Անհայտ սխալ:"</string>
-    <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"Հնարավոր չէ բացել \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\"-ը. պատճառը` <xliff:g id="EXACT_REASON">%2$s</xliff:g>:"</string>
+    <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"Հնարավոր չէ բացել \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\"-ը. պատճառը՝ <xliff:g id="EXACT_REASON">%2$s</xliff:g>:"</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"Հնարավոր չէ մեկնարկել արտահանողը. պատճառը` «<xliff:g id="EXACT_REASON">%s</xliff:g>»:"</string>
     <string name="fail_reason_no_exportable_contact" msgid="487925011719622851">"Արտահանելի կոնտակտ չկա:"</string>
     <string name="missing_required_permission" msgid="1308037728470791436">"Դուք անջատել եք անհրաժեշտ թույլտվությունը:"</string>
     <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"Արտահանման ընթացքում տեղի է ունեցել սխալ. պատճառը` «<xliff:g id="EXACT_REASON">%s</xliff:g>»:"</string>
     <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O սխալ"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"Հիշողությունը բավարար չէ: Հնարավոր է` ֆայլը չափազանց մեծ է:"</string>
+    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"Հիշողությունը բավարար չէ: Հնարավոր է՝ ֆայլը չափազանց մեծ է:"</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"Ձևաչափը չի աջակցվում:"</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումն ավարտվեց"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"Կոնտակտների արտահանումն ավարտվեց:"</string>
@@ -503,7 +503,7 @@
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Միացնել"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"Կապ չկա"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM քարտ"</string>
-    <string name="show_more_content_description" msgid="6298277298495491712">"Ցուցադրել ավելի շատ"</string>
+    <string name="show_more_content_description" msgid="6298277298495491712">"Ցույց տալ ավելին"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"SIM քարտի ներմուծումն ավարտվեց"</string>
     <string name="importing_sim_failed_title" msgid="1046154274170241788">"Ներմուծման սխալ"</string>
     <string name="importing_sim_failed_message" msgid="55568522164349044">"Չհաջողվեց կոնտակտներ ներմուծել SIM քարտից"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ab535aa..97c3b8d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -178,7 +178,7 @@
     <string name="set_default" msgid="3704074175618702225">"Setel sebagai default"</string>
     <string name="clear_default" msgid="2055883863621491533">"Hapus default"</string>
     <string name="toast_text_copied" msgid="845906090076228771">"Teks disalin"</string>
-    <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"Buang perubahan?"</string>
+    <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"Hapus perubahan?"</string>
     <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="8280294641821133477">"Buang"</string>
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Batal"</string>
     <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Hapus penyesuaian?"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a200960..191024d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -137,7 +137,7 @@
     <string name="search_settings_description" msgid="5630675648560839920">"השמות של אנשי הקשר"</string>
     <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"לחץ כדי לחזור אל המסך הקודם"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"הוספת מספר טלפון"</string>
-    <string name="quickcontact_add_email" msgid="1442894568471116797">"הוסף אימייל"</string>
+    <string name="quickcontact_add_email" msgid="1442894568471116797">"הוספת אימייל"</string>
     <string name="missing_app" msgid="5674389915738964148">"לא נמצאה אפליקציה שיכולה לטפל בפעולה זו."</string>
     <string name="menu_share" msgid="6343022811796001773">"שיתוף"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"הוספה לאנשי הקשר"</string>
@@ -514,7 +514,7 @@
     <string name="account_sync_off" msgid="6187683798342006021">"סנכרון החשבון מושבת. הקש כדי להפעיל אותו."</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"האם להשבית את הסנכרון האוטומטי?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"‏השינויים שתבצע בכל האפליקציות והחשבונות, לא רק באנשי הקשר מחשבון Google, יסונכרנו בין האינטרנט לבין המכשירים שלך."</string>
-    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"הפעל"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"הפעלה"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"אין חיבור"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"‏כרטיס SIM"</string>
     <string name="show_more_content_description" msgid="6298277298495491712">"הצג עוד"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 01adf4d..1dc5f32 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -295,7 +295,7 @@
     <string name="directory_search_label" msgid="2602118204885565153">"Каталог"</string>
     <string name="directory_search_label_work" msgid="2392128956332931231">"Жұмыс каталогы"</string>
     <string name="local_search_label" msgid="6692495405531144805">"Барлық контактілер"</string>
-    <string name="description_quick_contact_for" msgid="6364906818231956042">"<xliff:g id="NAME">%1$s</xliff:g> үшін жылдам байланыс"</string>
+    <string name="description_quick_contact_for" msgid="6364906818231956042">"Жылдам контакт: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="7970183292521946492">"(Атаусыз)"</string>
     <string name="favoritesFrequentContacted" msgid="2885862854079966676">"Жиі хабарласатындар"</string>
     <string name="list_filter_phones" msgid="6839133198968393843">"Телефон нөмірі бар барлық контактілер"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 56672d6..b829a34 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -168,7 +168,7 @@
     <string name="non_phone_caption" msgid="7343449684187013327">"Телефон номери"</string>
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Байланыштарга кошуу"</string>
     <string name="non_phone_close" msgid="2792373584950696532">"Жабуу"</string>
-    <string name="date_year_toggle" msgid="8930759990426623823">"Жылы көрсөтүлсүн"</string>
+    <string name="date_year_toggle" msgid="8930759990426623823">"Жылы көрүнсүн"</string>
     <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"Аккаунт кошуу"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"Импорттоо"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"Жаңысын түзүү..."</string>
@@ -431,7 +431,7 @@
     <string name="export_to_vcf_file" msgid="3096479544575798192">".vcf файлына өткөрүп берүү"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Төмөнкү боюнча иргөө"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Аттын транскрипциясы"</string>
-    <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Ар дайым көрсөтүлсүн"</string>
+    <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Ар дайым көрүнсүн"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Жок болсо жашырылсын"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Аты"</string>
     <string name="display_options_sort_by_family_name" msgid="1282763552330910876">"Фамилиясы"</string>
@@ -454,7 +454,7 @@
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Көрсөтүлүүчү байланыштар"</string>
     <string name="custom_list_filter" msgid="2544327670202891979">"Тандап көрсөтүү"</string>
     <string name="menu_custom_filter_save" msgid="2412959737200856930">"Сактоо"</string>
-    <string name="hint_findContacts" msgid="5554298639062659655">"Байланыштарды издеңиз"</string>
+    <string name="hint_findContacts" msgid="5554298639062659655">"Байланыштарды издөө"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"Cүйүктүүлөр"</string>
     <string name="menu_import" msgid="2206768098740726906">"Өткөрүп алуу"</string>
     <string name="menu_export" msgid="1217402092617629429">"Өткөрүп берүү"</string>
@@ -463,7 +463,7 @@
     <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<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="683765774264585732">"издөөнү токтотуу"</string>
     <string name="description_clear_search" msgid="1852934085825794095">"Изделип жаткан нерсени өчүрүү"</string>
-    <string name="select_account_dialog_title" msgid="5047523441152129207">"Каттоо эсеби"</string>
+    <string name="select_account_dialog_title" msgid="5047523441152129207">"Аккаунт"</string>
     <string name="set_default_account" msgid="9194321110211682396">"Чалууларда ар дайым бул колдонулсун"</string>
     <string name="call_with_a_note" msgid="2463785820399287281">"Кыска жазуу менен чалуу"</string>
     <string name="call_subject_hint" msgid="7056652101889538157">"Чалуу менен жөнөтүлө турган кыска жазууну териңиз…"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 33ea7a6..c082cb3 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -106,11 +106,11 @@
     <string name="contactSavedNamedToast" msgid="3067050290584834386">"Контактот <xliff:g id="DISPLAY_NAME">%s</xliff:g> е зачуван"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"Контактот е зачуван"</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"Контактите се раздвоени"</string>
-    <string name="contactSavedErrorToast" msgid="3213619905154956918">"Не можеше да се зачуваат промените на контактот"</string>
-    <string name="contactUnlinkErrorToast" msgid="7289356996668886841">"Не можеше да се прекине врската со контактот"</string>
-    <string name="contactJoinErrorToast" msgid="1222155997933362787">"Не можеше да се поврзе контактот"</string>
+    <string name="contactSavedErrorToast" msgid="3213619905154956918">"Не може да се зачуваат промените на контактот"</string>
+    <string name="contactUnlinkErrorToast" msgid="7289356996668886841">"Не може да се прекине врската со контактот"</string>
+    <string name="contactJoinErrorToast" msgid="1222155997933362787">"Не може да се поврзе контактот"</string>
     <string name="contactGenericErrorToast" msgid="5689457475864876100">"Грешка при зачувување на контактот"</string>
-    <string name="contactPhotoSavedErrorToast" msgid="8568460180541397272">"Не можеше да се зачуваат промените на фотографијата на контактот"</string>
+    <string name="contactPhotoSavedErrorToast" msgid="8568460180541397272">"Не може да се зачуваат промените на фотографијата на контактот"</string>
     <string name="groupLoadErrorToast" msgid="4141488223976370583">"Етикетата не успеа да се вчита"</string>
     <string name="groupDeletedToast" msgid="7774363940327847515">"Етикетата е избришана"</string>
     <string name="groupCreatedToast" msgid="1685148819468403239">"Етикетата е создадена"</string>
@@ -118,7 +118,7 @@
     <string name="groupUpdatedToast" msgid="3381549467345607379">"Етикетата е ажурирана"</string>
     <string name="groupMembersRemovedToast" msgid="8019566066934628011">"Отстрането од етикетата"</string>
     <string name="groupMembersAddedToast" msgid="1939782548900157287">"Додадено на етикетата"</string>
-    <string name="groupSavedErrorToast" msgid="8456912862816145318">"Не можеше да се зачуваат промените на етикетата"</string>
+    <string name="groupSavedErrorToast" msgid="8456912862816145318">"Не може да се зачуваат промените на етикетата"</string>
     <string name="groupExistsErrorMessage" msgid="912222525098791136">"Етикетата веќе постои"</string>
     <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"Некои од контактите немаат е-пошта."</string>
     <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"Некои од контактите немаат телефонски број."</string>
@@ -393,8 +393,8 @@
     <string name="cancel_export_confirmation_message" msgid="370693160959236239">"Да се откаже извозот на <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"Не може да се откаже увоз/извоз на vCard"</string>
     <string name="fail_reason_unknown" msgid="3721044979355043778">"Непозната грешка."</string>
-    <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"„<xliff:g id="FILE_NAME">%1$s</xliff:g>“ не можеше да се отвори: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"Не можеше да се вклучи извозникот: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
+    <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"„<xliff:g id="FILE_NAME">%1$s</xliff:g>“ не може да се отвори: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
+    <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"Не може да се вклучи извозникот: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
     <string name="fail_reason_no_exportable_contact" msgid="487925011719622851">"Нема контакт на кој може да се изврши извоз."</string>
     <string name="missing_required_permission" msgid="1308037728470791436">"Оневозможивте потребна дозвола."</string>
     <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"Настанаи грешка при извоз: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
@@ -408,13 +408,13 @@
     <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">"Извозот на <xliff:g id="FILENAME">%s</xliff:g> е откажан."</string>
     <string name="exporting_contact_list_title" msgid="6599904516394311592">"Се врши извоз на податоци за контакт"</string>
     <string name="exporting_contact_list_message" msgid="6253904938452184387">"Во моментов се врши извоз на податоците за контакт."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="4394169679142311379">"Не можеше да добие информации за базата на податоци."</string>
+    <string name="composer_failed_to_get_database_infomation" msgid="4394169679142311379">"Не може да добие информации за базата на податоци."</string>
     <string name="composer_has_no_exportable_contact" msgid="473911071832548562">"Нема контакти за извезување."</string>
     <string name="composer_not_initialized" msgid="3861391548605450184">"Композиторот на vCard не започна правилно."</string>
     <string name="exporting_contact_failed_title" msgid="9003659313161289860">"Не е можен извоз"</string>
     <string name="exporting_contact_failed_message" msgid="9198720310560773485">"Извозот на податоците за контакт не се изврши.\nПричина: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
     <string name="importing_vcard_description" msgid="6982207216746936735">"Се врши увоз на <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="1230432142768184978">"Не можеше да прочита податоци од vCard"</string>
+    <string name="reading_vcard_failed_title" msgid="1230432142768184978">"Не може да прочита податоци од vCard"</string>
     <string name="importing_vcard_finished_title" msgid="2274644947000264322">"Заврши увозот на vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"Увезувањето на <xliff:g id="FILENAME">%s</xliff:g> е откажано"</string>
     <string name="vcard_import_will_start_message" msgid="4514702035621833178">"Ќе се изврши увоз на <xliff:g id="FILENAME">%s</xliff:g> наскоро."</string>
@@ -424,7 +424,7 @@
     <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"Барањето за извоз на vCard беше одбиено. Обидете се повторно подоцна."</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"контакт"</string>
     <string name="caching_vcard_message" msgid="1879339732783666517">"Се кешираат vCard(s) во локалната привремена меморија. Реалниот увоз ќе започне наскоро."</string>
-    <string name="vcard_import_failed" msgid="37313715326741013">"Не можеше да се изврши увоз на vCard."</string>
+    <string name="vcard_import_failed" msgid="37313715326741013">"Не може да се изврши увоз на vCard."</string>
     <string name="nfc_vcard_file_name" msgid="2113518216329123152">"Контакт од NFC"</string>
     <string name="caching_vcard_title" msgid="6333926052524937628">"Кеширање"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"Се врши увоз на <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
@@ -506,7 +506,7 @@
     <string name="show_more_content_description" msgid="6298277298495491712">"Прикажи повеќе"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"Увезувањето на SIM-картичката заврши"</string>
     <string name="importing_sim_failed_title" msgid="1046154274170241788">"Увезувањето не успеа"</string>
-    <string name="importing_sim_failed_message" msgid="55568522164349044">"Не можеше да се увезат контакти од SIM-картичката"</string>
+    <string name="importing_sim_failed_message" msgid="55568522164349044">"Не може да се увезат контакти од SIM-картичката"</string>
     <string name="importing_sim_in_progress_title" msgid="7647907413920018595">"Се увезува SIM"</string>
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Известувања"</string>
     <string name="yes_button" msgid="1120514817091581293">"Да"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index fdf3b01..603d7bd 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -311,9 +311,9 @@
     <string name="name_middle" msgid="7330498948136181042">"മിഡിൽ നെയിം"</string>
     <string name="name_suffix" msgid="4502958221763936999">"പേരിന്റെ സഫിക്‌സ്"</string>
     <string name="name_phonetic" msgid="4746541275769990740">"ഉച്ചാരണപ്രകാരമുള്ള പേര്"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"ഫസ്റ്റ് നെയിം"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"ഉച്ചാരണപ്രകാരമുള്ള ഫസ്റ്റ് നെയിം"</string>
     <string name="name_phonetic_middle" msgid="6528822054594516485">"ഉച്ചാരണപ്രകാരമുള്ള മിഡിൽ നെയിം"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"പേരിന്റെ അവസാന ഭാഗം"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"ഉച്ചാരണപ്രകാരമുള്ള ലാസ്റ്റ് നെയിം"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"ഫോണ്‍"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"ഇമെയില്‍"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"വിലാസം"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 937d078..c1fdab5 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -21,7 +21,7 @@
     <string name="shortcut_add_contact" msgid="7949342235528657981">"Харилцагч нэмэх"</string>
     <string name="shortcutContact" msgid="8009736387364461511">"Харилцагч"</string>
     <string name="shortcutDialContact" msgid="155367248069127153">"Шууд залгах"</string>
-    <string name="shortcutMessageContact" msgid="9123517151981679277">"Шууд зурвас"</string>
+    <string name="shortcutMessageContact" msgid="9123517151981679277">"Шууд мессеж"</string>
     <string name="shortcutActivityTitle" msgid="5407832911005090417">"Харилцагч сонгох"</string>
     <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Харилцагчид нэмэх"</string>
     <string name="contactPickerActivityTitle" msgid="1842634991247618890">"Харилцагч сонгоно уу"</string>
@@ -123,7 +123,7 @@
     <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"Зарим харилцагчид имэйл хаяггүй байна."</string>
     <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"Зарим харилцагчид утасны дугааргүй байна."</string>
     <string name="menu_sendEmailOption" msgid="8600335923636486825">"Имэйл илгээх"</string>
-    <string name="menu_sendMessageOption" msgid="8051852013078110910">"Зурвас илгээх"</string>
+    <string name="menu_sendMessageOption" msgid="8051852013078110910">"Мессеж илгээх"</string>
     <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"Харилцагчдыг сонгоно уу"</string>
     <string name="send_to_selection" msgid="3655197947726443720">"Илгээх"</string>
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"Харилцагч байхгүй"</string>
@@ -209,7 +209,7 @@
     <string name="header_organization_entry" msgid="7428066442988227441">"Байгууллага"</string>
     <string name="header_nickname_entry" msgid="1110276804512795150">"Хоч"</string>
     <string name="header_note_entry" msgid="339680292368016788">"Тэмдэглэл"</string>
-    <string name="header_website_entry" msgid="3618691707215428785">"Вэбсайт"</string>
+    <string name="header_website_entry" msgid="3618691707215428785">"Вебсайт"</string>
     <string name="header_event_entry" msgid="70962228694476731">"Үйл явдал"</string>
     <string name="header_relation_entry" msgid="993618132732521944">"Хамаарал"</string>
     <string name="header_name_entry" msgid="2516776099121101578">"Нэр"</string>
@@ -263,27 +263,27 @@
     <string name="call_mms" msgid="1760746475672950386">"MMS рүү залгах"</string>
     <string name="call_by_shortcut" msgid="5707329943368933423">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Залгах)"</string>
     <string name="sms_custom" msgid="3684453744622817362">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> руу мессеж бичих"</string>
-    <string name="sms_home" msgid="6132392861245316613">"Гэрийн утас руу зурвас илгээх"</string>
-    <string name="sms_mobile" msgid="433949735070334192">"Гар утас руу зурвас илгээх"</string>
-    <string name="sms_work" msgid="7784676780449153911">"Ажил руу зурвас илгээх"</string>
-    <string name="sms_fax_work" msgid="8239716828120939345">"Ажлын факс руу зурвас илгээх"</string>
-    <string name="sms_fax_home" msgid="6887675360794775735">"Гэрийн факс руу зурвас илгээх"</string>
-    <string name="sms_pager" msgid="1052540072760129272">"Пейжер рүү зурвас илгээх"</string>
-    <string name="sms_other" msgid="3584200156296349098">"Зурвас илгээх"</string>
-    <string name="sms_callback" msgid="6932315941997609031">"Дуудлага авах зурвас илгээх"</string>
-    <string name="sms_car" msgid="6051606941547979352">"Машин руу зурвас илгээх"</string>
-    <string name="sms_company_main" msgid="4801585186677340070">"Компанийн үндсэн дугаар руу зурвас илгээх"</string>
-    <string name="sms_isdn" msgid="8093269429091061478">"ISDN рүү зурвас илгээх"</string>
-    <string name="sms_main" msgid="624730854551629076">"Үндсэн дугаар руу зурвас илгээх"</string>
-    <string name="sms_other_fax" msgid="8272996838482574564">"Факс руу зурвас илгээх"</string>
-    <string name="sms_radio" msgid="3703466526430351408">"Радио руу зурвас илгээх"</string>
-    <string name="sms_telex" msgid="5926595248188984691">"Телекс рүү зурвас илгээх"</string>
-    <string name="sms_tty_tdd" msgid="5517202384458721064">"TTY/TDD рүү зурвас илгээх"</string>
-    <string name="sms_work_mobile" msgid="1170012557483816931">"Ажлын гар утас руу зурвас илгээх"</string>
-    <string name="sms_work_pager" msgid="8827367747655005608">"Ажлын пейжэр рүү зурвас илгээх"</string>
-    <string name="sms_assistant" msgid="245045451580096547">"<xliff:g id="ASSISTANT">%s</xliff:g> руу зурвас бичих"</string>
-    <string name="sms_mms" msgid="7395133080765833725">"MMS руу зурвас илгээх"</string>
-    <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Зурвас)"</string>
+    <string name="sms_home" msgid="6132392861245316613">"Гэрийн утас руу мессеж илгээх"</string>
+    <string name="sms_mobile" msgid="433949735070334192">"Гар утас руу мессеж илгээх"</string>
+    <string name="sms_work" msgid="7784676780449153911">"Ажил руу мессеж илгээх"</string>
+    <string name="sms_fax_work" msgid="8239716828120939345">"Ажлын факс руу мессеж илгээх"</string>
+    <string name="sms_fax_home" msgid="6887675360794775735">"Гэрийн факс руу мессеж илгээх"</string>
+    <string name="sms_pager" msgid="1052540072760129272">"Пейжер рүү мессеж илгээх"</string>
+    <string name="sms_other" msgid="3584200156296349098">"Мессеж илгээх"</string>
+    <string name="sms_callback" msgid="6932315941997609031">"Дуудлага авах мессеж илгээх"</string>
+    <string name="sms_car" msgid="6051606941547979352">"Машин руу мессеж илгээх"</string>
+    <string name="sms_company_main" msgid="4801585186677340070">"Компанийн үндсэн дугаар руу мессеж илгээх"</string>
+    <string name="sms_isdn" msgid="8093269429091061478">"ISDN рүү мессеж илгээх"</string>
+    <string name="sms_main" msgid="624730854551629076">"Үндсэн дугаар руу мессеж илгээх"</string>
+    <string name="sms_other_fax" msgid="8272996838482574564">"Факс руу мессеж илгээх"</string>
+    <string name="sms_radio" msgid="3703466526430351408">"Радио руу мессеж илгээх"</string>
+    <string name="sms_telex" msgid="5926595248188984691">"Телекс рүү мессеж илгээх"</string>
+    <string name="sms_tty_tdd" msgid="5517202384458721064">"TTY/TDD рүү мессеж илгээх"</string>
+    <string name="sms_work_mobile" msgid="1170012557483816931">"Ажлын гар утас руу мессеж илгээх"</string>
+    <string name="sms_work_pager" msgid="8827367747655005608">"Ажлын пейжэр рүү мессеж илгээх"</string>
+    <string name="sms_assistant" msgid="245045451580096547">"<xliff:g id="ASSISTANT">%s</xliff:g> руу мессеж бичих"</string>
+    <string name="sms_mms" msgid="7395133080765833725">"MMS руу мессеж илгээх"</string>
+    <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Мессеж)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"Видео дуудлага хийх"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгах уу?"</string>
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Та Харилцагч болон Утас апп-ууд дахь байнга холбоо барьсан харилцагчдын жагсаалтыг устгаж, ингэснээрээ имэйл апп-уудыг таны имэйл хаяглах хандлагыг бүр эхнээс нь суралцахад хүргэнэ."</string>
@@ -302,7 +302,7 @@
     <string name="list_filter_phones_work" msgid="5583425697781385616">"Ажлын профайлын харилцагч"</string>
     <string name="view_updates_from_group" msgid="6233444629074835594">"Шинэчлэлтүүдийг харах"</string>
     <string name="account_phone" msgid="8044426231251817556">"Төхөөрөмж"</string>
-    <string name="account_sim" msgid="3200457113308694663">"СИМ"</string>
+    <string name="account_sim" msgid="3200457113308694663">"SIM"</string>
     <string name="nameLabelsGroup" msgid="513809148312046843">"Нэр"</string>
     <string name="nicknameLabelsGroup" msgid="794390116782033956">"Хоч"</string>
     <string name="name_given" msgid="3883661251894628431">"Өөрийн нэр"</string>
@@ -321,14 +321,14 @@
     <string name="organizationLabelsGroup" msgid="2342482097897299099">"Байгууллага"</string>
     <string name="relationLabelsGroup" msgid="8931615792208307291">"Хамаарал"</string>
     <string name="eventLabelsGroup" msgid="8625868552164376823">"Баярт өдөр"</string>
-    <string name="sms" msgid="4246338112764847384">"Зурвас"</string>
+    <string name="sms" msgid="4246338112764847384">"Мессеж"</string>
     <string name="postal_address" msgid="5031809899673855074">"Хаяг"</string>
     <string name="ghostData_company" msgid="3873500610390675876">"Компани"</string>
     <string name="ghostData_title" msgid="8584897460662904533">"Гарчиг"</string>
     <string name="label_notes" msgid="7134226125644463585">"Тэмдэглэл"</string>
     <string name="label_custom_field" msgid="4160584225306364924">"Тусгай"</string>
     <string name="label_sip_address" msgid="8876347942587537552">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="114754928100220315">"Вэбсайт"</string>
+    <string name="websiteLabelsGroup" msgid="114754928100220315">"Вебсайт"</string>
     <string name="groupsLabel" msgid="5622154133880646122">"Шошгууд"</string>
     <string name="email_home" msgid="1102791500866910269">"Гэрийн имэйл рүү"</string>
     <string name="email_mobile" msgid="6461172430397598705">"Гар утас руу имэйлдэх"</string>
@@ -452,7 +452,7 @@
     <string name="no_contact_to_share" msgid="6285287228557175749">"Хуваалцах харилцагчид байхгүй байна."</string>
     <string name="menu_contacts_filter" msgid="5854584270038139275">"Харуулах харилцагчид"</string>
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Харуулах харилцагчид"</string>
-    <string name="custom_list_filter" msgid="2544327670202891979">"Харагдацыг тааруулах"</string>
+    <string name="custom_list_filter" msgid="2544327670202891979">"Харагдцыг тааруулах"</string>
     <string name="menu_custom_filter_save" msgid="2412959737200856930">"Хадгалах"</string>
     <string name="hint_findContacts" msgid="5554298639062659655">"Харилцагч хайх"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"Таалагддаг"</string>
@@ -499,7 +499,7 @@
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"Хаах"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"Автомат синк идэвхгүй байна. Идэвхжүүлэх бол товшино уу."</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"Автомат синкийг асаах уу?"</string>
-    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Google Харилцагч төдийгүй бүх апп болон бүртгэлд таны оруулсан өөрчлөлтийг вэб болон таны бусад төхөөрөмжүүд хооронд шинэчилж байх болно."</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Google Харилцагч төдийгүй бүх апп болон бүртгэлд таны оруулсан өөрчлөлтийг веб болон таны бусад төхөөрөмжүүд хооронд шинэчилж байх болно."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Идэвхжүүлэх"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"Холболт байхгүй"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index a017629..51d59cb 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -198,7 +198,7 @@
     <string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"दुवा रद्द करा"</string>
     <string name="add_account" msgid="3071396624500839020">"खाते जोडा"</string>
     <string name="add_new_account" msgid="573368229646104110">"नवीन खाते जोडा"</string>
-    <string name="menu_export_database" msgid="1658249125751926885">"डेटाबेस फाईल एक्सपोर्ट करा"</string>
+    <string name="menu_export_database" msgid="1658249125751926885">"डेटाबेस फाइल एक्सपोर्ट करा"</string>
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"नवीन संपर्क तयार करा"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"अधिक पहा"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"कमी पहा"</string>
@@ -369,10 +369,10 @@
     <string name="list_filter_single" msgid="6003845379327432129">"संपर्क"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"इतर सर्व संपर्क"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"सर्व संपर्क"</string>
-    <string name="menu_sync_remove" msgid="7523335046562082188">"संकालन समूह काढून टाका"</string>
-    <string name="dialog_sync_add" msgid="8012361965908515959">"संकालन गट जोडा"</string>
+    <string name="menu_sync_remove" msgid="7523335046562082188">"सिंक समूह काढून टाका"</string>
+    <string name="dialog_sync_add" msgid="8012361965908515959">"सिंक गट जोडा"</string>
     <string name="display_more_groups" msgid="8398232980355188133">"अधिक गट..."</string>
-    <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"संकालन करा मधून \"<xliff:g id="GROUP">%s</xliff:g>\" हटविल्‍याने संकालन करा मधून कोणत्‍याही गटबद्ध न केलेल्‍या संपर्कांना देखील हटवेल."</string>
+    <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"सिंक करा मधून \"<xliff:g id="GROUP">%s</xliff:g>\" हटविल्‍याने सिंक करा मधून कोणत्‍याही गटबद्ध न केलेल्‍या संपर्कांना देखील हटवेल."</string>
     <string name="savingDisplayGroups" msgid="6779839417901711381">"प्रदर्शन पर्याय सेव्ह करत आहे…"</string>
     <string name="listCustomView" msgid="5782275477737032610">"सानुकूलित दृश्य"</string>
     <string name="dialog_new_contact_account" msgid="5652018124788855057">"इंपोर्ट केलेले संपर्क यावर सेव्ह करा:"</string>
@@ -386,7 +386,7 @@
       <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> संपर्क • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
       <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> संपर्क • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
     </plurals>
-    <string name="import_from_vcf_file" msgid="6776403212804361301">".vcf फाईल"</string>
+    <string name="import_from_vcf_file" msgid="6776403212804361301">".vcf फाइल"</string>
     <string name="nothing_to_import_message" msgid="2594519620375509783">"इंपोर्ट करण्यासाठी काहीही नाही"</string>
     <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"vCard मधून संपर्क इंपोर्ट करायचे?"</string>
     <string name="cancel_import_confirmation_message" msgid="1007412828398265611">"<xliff:g id="FILENAME">%s</xliff:g> चे इंपोर्ट रद्द करायचे?"</string>
@@ -394,12 +394,12 @@
     <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"vCard इंपोर्ट/एक्सपोर्ट रद्द करू शकल नाही"</string>
     <string name="fail_reason_unknown" msgid="3721044979355043778">"अज्ञात एरर."</string>
     <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"\"<xliff:g id="FILE_NAME">%1$s</xliff:g>\" उघडू शकलो नाही: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"निर्यातकर्ता प्रारंभ करू शकला नाही: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
+    <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"निर्यातकर्ता सुरू करू शकला नाही: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_no_exportable_contact" msgid="487925011719622851">"कोणताही एक्सपोर्ट करण्‍यायोग्‍य संपर्क नाही."</string>
     <string name="missing_required_permission" msgid="1308037728470791436">"तुम्ही आवश्‍यक असलेली एक परवानगी अक्षम केली आहे."</string>
     <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"एक्सपोर्ट दरम्‍यान एरर आलीt: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O एरर"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"पुरेशी मेमरी नाही. फाईल कदाचित खूप मोठी असू शकते."</string>
+    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"पुरेशी मेमरी नाही. फाइल कदाचित खूप मोठी असू शकते."</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"स्वरूपन समर्थित नाही."</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g> एक्सपोर्ट करणे समाप्त झाले."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"संपर्क इंपोर्ट करणे समाप्त झाले"</string>
@@ -410,7 +410,7 @@
     <string name="exporting_contact_list_message" msgid="6253904938452184387">"संपर्क डेटा एक्सपोर्ट केला जात आहे."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="4394169679142311379">"डेटाबेस माहिती मिळवू शकलो नाही."</string>
     <string name="composer_has_no_exportable_contact" msgid="473911071832548562">"कोणतेही एक्सपोर्ट करण्यायोग्य संपर्क नाहीत."</string>
-    <string name="composer_not_initialized" msgid="3861391548605450184">"vCard रचनाकाराने योग्‍यरित्‍या प्रारंभ केला नाही."</string>
+    <string name="composer_not_initialized" msgid="3861391548605450184">"vCard रचनाकाराने योग्‍यरित्‍या सुरू केला नाही."</string>
     <string name="exporting_contact_failed_title" msgid="9003659313161289860">"एक्सपोर्ट करू शकलो नाही"</string>
     <string name="exporting_contact_failed_message" msgid="9198720310560773485">"संपर्क डेटा एक्सपोर्ट केला नाही.\nकारण: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
     <string name="importing_vcard_description" msgid="6982207216746936735">"<xliff:g id="NAME">%s</xliff:g> इंपोर्ट करत आहे"</string>
@@ -418,12 +418,12 @@
     <string name="importing_vcard_finished_title" msgid="2274644947000264322">"vCard <xliff:g id="FILENAME">%s</xliff:g> इंपोर्ट करणे समाप्त झाले"</string>
     <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"<xliff:g id="FILENAME">%s</xliff:g> इंपोर्ट करणे रद्द झाले"</string>
     <string name="vcard_import_will_start_message" msgid="4514702035621833178">"<xliff:g id="FILENAME">%s</xliff:g> लवकरच इंपोर्ट केली जाईल."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"फाईल लवकरच इंपोर्ट केली जाईल."</string>
+    <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"फाइल लवकरच इंपोर्ट केली जाईल."</string>
     <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"vCard इंपोर्ट विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="contacts_export_will_start_message" msgid="6428126265599715944">"संपर्क लवकरच एक्सपोर्ट केले जातील."</string>
     <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"vCard एक्सपोर्ट विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"संपर्क"</string>
-    <string name="caching_vcard_message" msgid="1879339732783666517">"स्‍थानिक तात्‍पुरत्‍या संचयनावर vCard(s) कॅशे    करत आहे. वास्‍तविक इंपोर्ट लवकरच प्रारंभ होईल."</string>
+    <string name="caching_vcard_message" msgid="1879339732783666517">"स्‍थानिक तात्‍पुरत्‍या संचयनावर vCard(s) कॅशे    करत आहे. वास्‍तविक इंपोर्ट लवकरच सुरू होईल."</string>
     <string name="vcard_import_failed" msgid="37313715326741013">"vCard इंपोर्ट करू शकलो नाही."</string>
     <string name="nfc_vcard_file_name" msgid="2113518216329123152">"NFC वर संपर्क प्राप्त केला"</string>
     <string name="caching_vcard_title" msgid="6333926052524937628">"कॅशे    करत आहे"</string>
@@ -495,10 +495,10 @@
     <string name="sim_import_failed_toast" msgid="358117391138073786">"सिम संपर्क इंपोर्ट करण्यात अयशस्वी"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"सिम वरून इंपोर्ट करा"</string>
     <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"रद्द करा"</string>
-    <string name="auto_sync_off" msgid="7039314601316227882">"स्वयं-संकालन बंद आहे. सुरू करण्यासाठी टॅप करा."</string>
+    <string name="auto_sync_off" msgid="7039314601316227882">"स्वयं-सिंक बंद आहे. सुरू करण्यासाठी टॅप करा."</string>
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"डिसमिस करा"</string>
-    <string name="account_sync_off" msgid="6187683798342006021">"स्वयं-संकालन बंद आहे. सुरू करण्यासाठी टॅप करा."</string>
-    <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"स्वयं-संकालन सुरू करायचे?"</string>
+    <string name="account_sync_off" msgid="6187683798342006021">"स्वयं-सिंक बंद आहे. सुरू करण्यासाठी टॅप करा."</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"स्वयं-सिंक सुरू करायचे?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"फक्त संपर्कांमध्ये नाही, तर तुम्ही सर्व अ‍ॅप्स आणि खात्यांमध्ये करता ते बदल, वेब आणि आपल्या अन्य डिव्हाइसेस दरम्यान अपडेट ठेवले जातील."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"सुरू करा"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"कोणतेही कनेक्शन नाही"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 9271460..ad3238a 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -129,7 +129,7 @@
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"အဆက်အသွယ်များမရှိ"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"\"<xliff:g id="EMAIL">%s</xliff:g>\" ကို လိပ်စာထဲ ထည့်မလား?"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"အဆက်အသွယ်များ၏နာမည်များ"</string>
-    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"ယခင် မျက်နှာပြင်သို့ ပြန်ရန် ကလစ်ပါ"</string>
+    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"ယခင် မျက်နှာပြင်သို့ ပြန်ရန် န"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"ဖုန်းနံပါတ် ထည့်ရန်"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"အီးမေးလ် ထည့်ရန်"</string>
     <string name="missing_app" msgid="5674389915738964148">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်မည့် အက်ပ်မရှိပါ။"</string>
@@ -459,8 +459,8 @@
     <string name="menu_import" msgid="2206768098740726906">"ထည့်သွင်းရန်"</string>
     <string name="menu_export" msgid="1217402092617629429">"ထုတ်ယူရန်"</string>
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"ပိတ်ဆို့နံပါတ်များ"</string>
-    <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> မှတဆင့်"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="SOURCE">%2$s</xliff:g> မှတဆင့်"</string>
+    <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> မှတစ်ဆင့်"</string>
+    <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<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="683765774264585732">"ရှာဖွေမှုရပ်ရန်"</string>
     <string name="description_clear_search" msgid="1852934085825794095">"ရှာဖွေမှုကို ရှင်းပါ"</string>
     <string name="select_account_dialog_title" msgid="5047523441152129207">"အကောင့်"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index b67e0e2..27dec42 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -34,7 +34,7 @@
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"मनपर्नेमा थपियो"</string>
     <string name="menu_editContact" msgid="5039663761025630208">"सम्पादन गर्नुहोस्"</string>
     <string name="menu_deleteContact" msgid="15161764025276217">"मेट्नुहोस्"</string>
-    <string name="menu_change_photo" msgid="4911246106907208055">"तस्बिर परिवर्तन गर्नुहोस्"</string>
+    <string name="menu_change_photo" msgid="4911246106907208055">"फोटो परिवर्तन गर्नुहोस्"</string>
     <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"सर्टकट सिर्जना गर्नुहोस्"</string>
     <string name="menu_splitAggregate" msgid="2062290275288905833">"अनलिंक"</string>
     <string name="menu_editGroup" msgid="8706562583754054622">"सम्पर्कहरू हटाउनुहोस्"</string>
@@ -95,10 +95,10 @@
     <string name="invalidContactMessage" msgid="6204402264821083362">"सम्पर्क उपलब्ध छैन।"</string>
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"सम्पर्क गृह स्क्रिनमा थपियो।"</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> गृह स्क्रिनमा थपियो।"</string>
-    <string name="photoPickerNotFoundText" msgid="6535222297923110991">"यन्त्रमा कुनै पनि तस्बिरहरू उपलब्ध छैनन्।"</string>
-    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"सम्पर्क तस्बिर"</string>
+    <string name="photoPickerNotFoundText" msgid="6535222297923110991">"यन्त्रमा कुनै पनि फोटोहरू उपलब्ध छैनन्।"</string>
+    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"सम्पर्क फोटो"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"आफू अनुकूल पारिएको लेबलको नाम"</string>
-    <string name="removePhoto" msgid="1190099414600730001">"तस्बिर मेट्नुहोस्"</string>
+    <string name="removePhoto" msgid="1190099414600730001">"फोटो मेट्नुहोस्"</string>
     <string name="noContacts" msgid="3030512741779213810">"तपाईंको सम्पर्क ठेगानाहरूको सूची खाली छ"</string>
     <string name="emptyGroup" msgid="8598261660865081152">"यो लेबल अन्तर्गत कुनै सम्पर्कहरू छैनन्"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"यस खातामा कुनै सम्पर्क ठेगानाहरू छैनन्"</string>
@@ -149,10 +149,10 @@
     <string name="video_chat" msgid="2477295971622477433">"भिडियो च्याट"</string>
     <string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g> सम्पर्क"</string>
     <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g> खाता"</string>
-    <string name="take_photo" msgid="820071555236547516">"तस्बिर लिनुहोस्"</string>
-    <string name="take_new_photo" msgid="4383091978116875778">"नयाँ तस्बिर खिच्नुहोस्"</string>
-    <string name="pick_photo" msgid="2050859661654812588">"तस्बिर छान्नुहोस्"</string>
-    <string name="pick_new_photo" msgid="4218112182908240970">"नयाँ तस्बिर चयन गर्नुहोस्"</string>
+    <string name="take_photo" msgid="820071555236547516">"फोटो लिनुहोस्"</string>
+    <string name="take_new_photo" msgid="4383091978116875778">"नयाँ फोटो खिच्नुहोस्"</string>
+    <string name="pick_photo" msgid="2050859661654812588">"फोटो छान्नुहोस्"</string>
+    <string name="pick_new_photo" msgid="4218112182908240970">"नयाँ फोटो चयन गर्नुहोस्"</string>
     <string name="search_results_searching" msgid="1373859095361975648">"खोजी कार्य गर्दै..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"मिति"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"लेबल"</string>
@@ -217,9 +217,9 @@
     <string name="header_phone_entry" msgid="7092868248113091293">"फोन"</string>
     <string name="content_description_directions" msgid="860179347986211929">"स्थानको लागि निर्देशनहरू"</string>
     <string name="editor_more_fields" msgid="6158558083947445518">"थप क्षेत्रहरू"</string>
-    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"सम्पर्कको तस्बिर बदल्नुहोस्"</string>
-    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"सम्पर्कको तस्बिर थप्नुहोस्"</string>
-    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"सम्पर्कको तस्बिर"</string>
+    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"सम्पर्कको फोटो बदल्नुहोस्"</string>
+    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"सम्पर्कको फोटो थप्नुहोस्"</string>
+    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"सम्पर्कको फोटो"</string>
     <string name="editor_failed_to_load" msgid="2328074829787373644">"सम्पादक खोल्न सकिएन।"</string>
     <string name="editor_account_selector_title" msgid="3190515989740696043">"यसमा सुरक्षित गरिँदै"</string>
     <string name="editor_account_selector_read_only_title" msgid="4870485850053962114">"<xliff:g id="ACCOUNT">%s</xliff:g> को सम्पर्क सम्बन्धी जानकारी सम्पादन गर्न मिल्दैन"</string>
@@ -286,7 +286,7 @@
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (सन्देश पठाउनुहोस्)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"भिडियो कल बनाउनुहोस्"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"प्रायः सम्पर्क गरिएकाहरूलाई हटाउने हो?"</string>
-    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"तपाईंले सम्पर्कहरू र फोन एपहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल अनुप्रयोगहरूलाई दबाब दिनुहुनेछ।"</string>
+    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"तपाईंले सम्पर्कहरू र फोन एपहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल एपहरूलाई दबाब दिनुहुनेछ।"</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"प्रायः सम्पर्क गरिएकाहरूलाई हटाउँदै...."</string>
     <string name="status_available" msgid="8081626460682959098">"उपलब्ध"</string>
     <string name="status_away" msgid="2677693194455091315">"टाढा"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6478cf2..7e5242d 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -241,7 +241,7 @@
     <string name="hamburger_feature_highlight_body" msgid="782935036630531528">"Organiseer je contacten op een overzichtelijke en nuttige manier"</string>
     <string name="undo" msgid="2446931036220975026">"Ongedaan maken"</string>
     <string name="call_custom" msgid="2844900154492073207">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> bellen"</string>
-    <string name="call_home" msgid="2443904771140750492">"Bellen naar huis"</string>
+    <string name="call_home" msgid="2443904771140750492">"Thuis bellen"</string>
     <string name="call_mobile" msgid="6504312789160309832">"Bellen naar mobiel"</string>
     <string name="call_work" msgid="2414313348547560346">"Bellen naar werk"</string>
     <string name="call_fax_work" msgid="5026843006300760797">"Bellen naar fax werk"</string>
@@ -341,7 +341,7 @@
     <string name="postal_region" msgid="6130239447563491435">"Staat"</string>
     <string name="postal_postcode" msgid="33077708757232659">"Postcode"</string>
     <string name="postal_country" msgid="6642804283917549861">"Land"</string>
-    <string name="map_home" msgid="2169053372466501148">"Thuisadres weergeven"</string>
+    <string name="map_home" msgid="2169053372466501148">"Woonadres weergeven"</string>
     <string name="map_work" msgid="8296916987749726461">"Werkadres weergeven"</string>
     <string name="map_other" msgid="4009931029322619674">"Adres weergeven"</string>
     <string name="map_custom" msgid="7797812861927817335">"Adres voor <xliff:g id="CUSTOM_LABEL">%s</xliff:g> bekijken"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index f014165..8650ac8 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -156,7 +156,7 @@
     <string name="search_results_searching" msgid="1373859095361975648">"ସର୍ଚ୍ଚ କରାଯାଉଛି…"</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"ତାରିଖ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"ଲେବଲ୍"</string>
-    <string name="cancel_button_content_description" msgid="7407595608883650004">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="cancel_button_content_description" msgid="7407595608883650004">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="back_arrow_content_description" msgid="6727142616775523605">"ପଛକୁ ଫେରନ୍ତୁ"</string>
     <string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"ବନ୍ଦ କରନ୍ତୁ"</string>
     <string name="aggregation_suggestion_edit_dialog_message" msgid="4339333746086996062">"ଚୟନିତ ଯୋଗାଯୋଗ ଏଡିଟ୍ କରିବା ପାଇଁ ସ୍ୱିଚ୍ କରିବେ? ଏପର୍ଯ୍ୟନ୍ତ ଆପଣ ଦେଇଥିବା ସୂଚନାକୁ କପୀ କରାଯିବ।"</string>
@@ -180,7 +180,7 @@
     <string name="toast_text_copied" msgid="845906090076228771">"ଟେକ୍ସଟ୍ କପୀ କରାଗଲା"</string>
     <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"ପରିବର୍ତ୍ତନଗୁଡ଼ିକୁ ଖାରଜ କରିବେ?"</string>
     <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="8280294641821133477">"ଖାରଜ କରନ୍ତୁ"</string>
-    <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"କଷ୍ଟମାଇ‍ଜ୍‍ କରିବା ଖାରଜ କରିବେ?"</string>
     <string name="enter_contact_name" msgid="521859148893732679">"ଯୋଗାଯୋଗଙ୍କୁ ଖୋଜନ୍ତୁ"</string>
     <string name="title_edit_group" msgid="4246193439931854759">"ଯୋଗାଯୋଗଙ୍କୁ କାଢ଼ିଦିଅନ୍ତୁ"</string>
@@ -224,7 +224,7 @@
     <string name="editor_account_selector_title" msgid="3190515989740696043">"ଏଥିରେ ସେଭ୍‌ କରୁଛି"</string>
     <string name="editor_account_selector_read_only_title" msgid="4870485850053962114">"<xliff:g id="ACCOUNT">%s</xliff:g>ର ଯୋଗାଯୋଗ ସୂଚନାକୁ ଏଡିଟ୍ କରିହେବ ନାହିଁ"</string>
     <string name="quickcontact_suggestion_link_button" msgid="3485212664301802371">"ଯୋଗାଯୋଗଙ୍କ ସହ ଲିଙ୍କ କରନ୍ତୁ"</string>
-    <string name="quickcontact_suggestion_cancel_button" msgid="8851156850681440055">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="quickcontact_suggestion_cancel_button" msgid="8851156850681440055">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="suggestion_card_this_contact_title" msgid="8851257599121989253">"ଏହି ଯୋଗାଯୋଗ"</string>
     <string name="suggestion_card_duplicates_title" msgid="2623890874933696454">"ସମ୍ଭାବ୍ୟ ନକଲ"</string>
     <string name="suggestion_card_help_message" msgid="8367379652312412794">"ଏହି ଯୋଗାଯୋଗଗୁଡ଼ିକ ସମାନ ବ୍ୟକ୍ତିଙ୍କର ହୋଇଥାଇପାରେ। ଆପଣ ଏହାକୁ ଗୋଟିଏ ଯୋଗାଯୋଗ ରୂପେ ଏକାସଙ୍ଗେ ଲିଙ୍କ୍ କରିପାରିବେ।"</string>
@@ -494,7 +494,7 @@
     </plurals>
     <string name="sim_import_failed_toast" msgid="358117391138073786">"SIMରେ ଥିବା ଯୋଗାଯୋଗ ଇମ୍ପୋର୍ଟ କରିହେଲା ନାହିଁ"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"SIMରୁ ଇମ୍ପୋର୍ଟ କରନ୍ତୁ"</string>
-    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"କ୍ୟାନ୍ସଲ୍‍ କରନ୍ତୁ"</string>
+    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"ବାତିଲ୍‍ କରନ୍ତୁ"</string>
     <string name="auto_sync_off" msgid="7039314601316227882">"ଅଟୋ-ସିଙ୍କ ବନ୍ଦ ଅଛି। ଚାଲୁ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"ଖାରଜ କରନ୍ତୁ"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"ଆକାଉଣ୍ଟ ସିଙ୍କ ବନ୍ଦ ଅଛି। ଚାଲୁ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index bd025e5..f5dcd99 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -26,7 +26,7 @@
     <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Adăugați pentru persoană"</string>
     <string name="contactPickerActivityTitle" msgid="1842634991247618890">"Alegeți o persoană de contact"</string>
     <string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"Selectați"</string>
-    <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Creați o intrare nouă"</string>
+    <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Contact nou"</string>
     <string name="searchHint" msgid="1487501532610025473">"Căutați în Agendă"</string>
     <string name="menu_addStar" msgid="4903812703386825130">"Adăugați la lista de favorite"</string>
     <string name="menu_removeStar" msgid="3707373931808303701">"Eliminați din lista de favorite"</string>
@@ -193,7 +193,7 @@
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Adăugați un cont în care se va face backup pentru agenda dvs. în Google."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"Persoanele noi de contact vor fi salvate în <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Alegeți un cont prestabilit pentru persoanele de contact noi:"</string>
-    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Creați intrare nouă"</string>
+    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Contact nou"</string>
     <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Editați intrarea"</string>
     <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Numai vizualizare"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"Alegeți persoana de contact pentru a o edita"</string>
@@ -203,7 +203,7 @@
     <string name="add_account" msgid="3071396624500839020">"Adăugați un cont"</string>
     <string name="add_new_account" msgid="573368229646104110">"Adăugați un cont nou"</string>
     <string name="menu_export_database" msgid="1658249125751926885">"Exportați fișierele bazei de date"</string>
-    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Creați o intrare nouă"</string>
+    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Contact nou"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Mai multe detalii"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Mai puține detalii"</string>
     <string name="about_card_title" msgid="6635849009952435700">"Despre"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d8806f3..3e22d5c 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -431,9 +431,9 @@
     <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"Importovanie súboru <xliff:g id="FILENAME">%s</xliff:g> bolo zrušené"</string>
     <string name="vcard_import_will_start_message" msgid="4514702035621833178">"Vizitka <xliff:g id="FILENAME">%s</xliff:g> bude čoskoro importovaná."</string>
     <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"Súbor bude čoskoro importovaný."</string>
-    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"Žiadosť o import vizitky vCard bola odmietnutá. Skúste to znova neskôr."</string>
+    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"Žiadosť o import vizitky vCard bola odmietnutá. Skúste to neskôr."</string>
     <string name="contacts_export_will_start_message" msgid="6428126265599715944">"Kontakty budú čoskoro exportované"</string>
-    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"Žiadosť o export vizitky bola odmietnutá. Skúste to znova neskôr."</string>
+    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"Žiadosť o export vizitky bola odmietnutá. Skúste to neskôr."</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"kontakt"</string>
     <string name="caching_vcard_message" msgid="1879339732783666517">"Prebieha načítavanie vizitiek vCard do vyrovnávacej pamäte miestneho dočasného úložiska. Samotné importovanie začne o chvíľu."</string>
     <string name="vcard_import_failed" msgid="37313715326741013">"Vizitku vCard sa nepodarilo importovať."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 0d1af6d..1438160 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -190,7 +190,7 @@
     <string name="title_edit_group" msgid="4246193439931854759">"Уклоните контакте"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Мој локални профил"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"Мој <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> профил"</string>
-    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Одвојте мало времена да бисте додали налог помоћу ког ћете направити резервну копију контаката на Google-у."</string>
+    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Одвојите мало времена да бисте додали налог помоћу ког ћете направити резервну копију контаката на Google-у."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"Нови контакти ће бити сачувани на налогу <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Изаберите подразумевани налог за нове контакте:"</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Нови контакт"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 35014bc..b6ff4ea 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -92,7 +92,7 @@
     <string name="multipleContactDeleteConfirmation" msgid="2970218685653877287">"Kufuta anwani hii kutafuta maelezo kwenye akaunti nyingi."</string>
     <string name="deleteConfirmation" msgid="3727809366015979585">"Je, ungependa kufuta anwani hii?"</string>
     <string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"Futa"</string>
-    <string name="invalidContactMessage" msgid="6204402264821083362">"Mwasiliani hayupo."</string>
+    <string name="invalidContactMessage" msgid="6204402264821083362">"Anwani haipo."</string>
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"Anwani imeongezwa kwenye Skrini ya kwanza."</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> imeongezwa kwenye Skrini ya kwanza."</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"Hakuna picha inayopatikana kwenye kifaa."</string>
@@ -412,7 +412,7 @@
     <string name="composer_has_no_exportable_contact" msgid="473911071832548562">"Hakuna anwani zinazoweza kuhamishwa."</string>
     <string name="composer_not_initialized" msgid="3861391548605450184">"Kitunzi cha vCard hakikuanza vizuri."</string>
     <string name="exporting_contact_failed_title" msgid="9003659313161289860">"Imeshindwa kuhamisha"</string>
-    <string name="exporting_contact_failed_message" msgid="9198720310560773485">"Data ya mwasiliani haikuhamishwa.\nSababu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
+    <string name="exporting_contact_failed_message" msgid="9198720310560773485">"Data ya anwani halikuhamishwa.\nSababu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
     <string name="importing_vcard_description" msgid="6982207216746936735">"Inaingiza <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="reading_vcard_failed_title" msgid="1230432142768184978">"Haikuweza kusoma data ya vKadi"</string>
     <string name="importing_vcard_finished_title" msgid="2274644947000264322">"Imemaliza kuleta vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
@@ -448,7 +448,7 @@
     <string name="share_contacts_failure" msgid="1348777470180064086">"Imeshindwa kushiriki anwani."</string>
     <string name="dialog_export" msgid="3497435010655060068">"Hamisha anwani"</string>
     <string name="dialog_import" msgid="4590232235052756593">"Leta anwani kutoka kwenye"</string>
-    <string name="share_error" msgid="4854612167186185739">"Mwasiliani huyu hawezi kushirikishwa."</string>
+    <string name="share_error" msgid="4854612167186185739">"Anwani hii haiwezi kushirikiwa."</string>
     <string name="no_contact_to_share" msgid="6285287228557175749">"Hakuna anwani za kushiriki."</string>
     <string name="menu_contacts_filter" msgid="5854584270038139275">"Anwani za kuonyesha"</string>
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Anwani za kuonyesha"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 52259b3..9b1a9de 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -499,7 +499,7 @@
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"తీసివేస్తుంది"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"ఖాతా సమకాలీకరణ ఆఫ్‌లో ఉంది. ఆన్ చేయడానికి నొక్కండి."</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"స్వీయ సమకాలీకరణను ఆన్ చేయాలా?"</string>
-    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"మీరు కేవలం పరిచయాలకు చేసే మార్పులే కాకుండా అన్ని అనువర్తనాలు మరియు ఖాతాలకు చేసే మార్పులు వెబ్ మరియు మీ పరికరాల మధ్య ఎప్పటికప్పుడు నవీకృతంగా ఉంచబడతాయి."</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"మీరు కేవలం పరిచయాలకు చేసే మార్పులే కాకుండా అన్ని యాప్‌లు మరియు ఖాతాలకు చేసే మార్పులు వెబ్ మరియు మీ పరికరాల మధ్య ఎప్పటికప్పుడు నవీకృతంగా ఉంచబడతాయి."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"ఆన్ చేయండి"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"కనెక్షన్ లేదు"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 921b145..fceeec3 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="8908212014470937609">"Kontaktlar"</string>
     <string name="contactsList" msgid="4456188358262700898">"Kontaktlar"</string>
-    <string name="shortcut_add_contact" msgid="7949342235528657981">"Kontakt saqlash"</string>
+    <string name="shortcut_add_contact" msgid="7949342235528657981">"Kontakt kiritish"</string>
     <string name="shortcutContact" msgid="8009736387364461511">"Kontakt"</string>
     <string name="shortcutDialContact" msgid="155367248069127153">"Tezkor chaqiruv"</string>
     <string name="shortcutMessageContact" msgid="9123517151981679277">"Tezkor SMS"</string>
@@ -40,7 +40,7 @@
     <string name="menu_editGroup" msgid="8706562583754054622">"Kontaktlarni olib tashlash"</string>
     <string name="menu_renameGroup" msgid="2685886609399776475">"Yorliqni qayta nomlash"</string>
     <string name="menu_deleteGroup" msgid="1180215594530228294">"Yorliqni o‘chirib tashlash"</string>
-    <string name="menu_addToGroup" msgid="5034813446697655310">"Kontakt saqlash"</string>
+    <string name="menu_addToGroup" msgid="5034813446697655310">"Kontakt kiritish"</string>
     <string name="menu_selectForGroup" msgid="6386553337569514850">"Kontaktlarni tanlash"</string>
     <string name="menu_addContactsToGroup" msgid="4549318978482280577">"Kontakt qo‘shish"</string>
     <string name="menu_removeFromGroup" msgid="8753799091967887958">"Yorliqni olib tashlash"</string>
@@ -163,7 +163,7 @@
     <string name="contact_directory_description" msgid="1773630547110881835">"Direktoriya <xliff:g id="TYPE">%1$s</xliff:g>"</string>
     <string name="activity_title_settings" msgid="4004290638426915162">"Sozlamalar"</string>
     <string name="menu_settings" msgid="3524924670246877187">"Sozlamalar"</string>
-    <string name="menu_help" msgid="287801702920372292">"Yordam va fikr-mulohaza"</string>
+    <string name="menu_help" msgid="287801702920372292">"Yordam/fikr-mulohaza"</string>
     <string name="organization_company_and_title" msgid="7197631449041284518">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
     <string name="non_phone_caption" msgid="7343449684187013327">"Telefon raqami"</string>
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Kontaktlarga saqlash"</string>
@@ -296,7 +296,7 @@
     <string name="directory_search_label_work" msgid="2392128956332931231">"Ishchi katalogi"</string>
     <string name="local_search_label" msgid="6692495405531144805">"Barcha kontaktlar"</string>
     <string name="description_quick_contact_for" msgid="6364906818231956042">"Tezkor chaqiruv, kontakt: <xliff:g id="NAME">%1$s</xliff:g>"</string>
-    <string name="missing_name" msgid="7970183292521946492">"(Ismi yo‘q)"</string>
+    <string name="missing_name" msgid="7970183292521946492">"(Ismsiz)"</string>
     <string name="favoritesFrequentContacted" msgid="2885862854079966676">"Tez-tez aloqa qilingan kontaktlar"</string>
     <string name="list_filter_phones" msgid="6839133198968393843">"Telefon raqamiga ega kontaktlar"</string>
     <string name="list_filter_phones_work" msgid="5583425697781385616">"Ishchi profili kontaktlari"</string>
@@ -310,10 +310,10 @@
     <string name="name_prefix" msgid="8857117624713905211">"Murojaat shakli"</string>
     <string name="name_middle" msgid="7330498948136181042">"Otasining ismi"</string>
     <string name="name_suffix" msgid="4502958221763936999">"Martabasi/unvoni"</string>
-    <string name="name_phonetic" msgid="4746541275769990740">"Ism talaffuzi"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"Ism talaffuzi"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"Otasining ismi talaffuzi"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"Familiya talaffuzi"</string>
+    <string name="name_phonetic" msgid="4746541275769990740">"Ism transkripsiyasi"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"Ism transkripsiyasi"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"Otasining ismi transkripsiyasi"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"Familiya transkripsiyasi"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"Telefon"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"Email"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"Manzil"</string>
@@ -430,7 +430,7 @@
     <string name="progress_notifier_message" msgid="8522060892889599746">"Import qilinmoqda: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> – <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"VCF faylga eksport qilish"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Saralash"</string>
-    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Ism talaffuzi"</string>
+    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Ism transkripsiyasi"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Har doim ko‘rsatish"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Bo‘sh maydonni berkitish"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Ismi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5394ead..e980543 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -174,7 +174,7 @@
     <string name="create_group_item_label" msgid="921929508079162463">"Tạo mới…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"Bạn muốn xóa nhãn \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\"? (Danh bạ sẽ không bị xóa.)"</string>
     <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"Nhập tên liên hệ trước khi liên kết với liên hệ khác."</string>
-    <string name="copy_text" msgid="6835250673373028909">"Sao chép vào khay nhớ tạm"</string>
+    <string name="copy_text" msgid="6835250673373028909">"Sao chép vào bảng nhớ tạm"</string>
     <string name="set_default" msgid="3704074175618702225">"Đặt mặc định"</string>
     <string name="clear_default" msgid="2055883863621491533">"Xóa mặc định"</string>
     <string name="toast_text_copied" msgid="845906090076228771">"Đã sao chép văn bản"</string>
@@ -201,7 +201,7 @@
     <string name="menu_export_database" msgid="1658249125751926885">"Xuất các tệp cơ sở dữ liệu"</string>
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Tạo người liên hệ mới"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Xem thêm"</string>
-    <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Xem bớt"</string>
+    <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Ẩn bớt"</string>
     <string name="about_card_title" msgid="6635849009952435700">"Giới thiệu"</string>
     <string name="toast_making_personal_copy" msgid="9053129410039312386">"Đang tạo bản sao cá nhân..."</string>
     <string name="date_time_set" msgid="8526160894146496334">"Đặt"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cbc7e81..00d4d75 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -92,6 +92,7 @@
     <string name="multipleContactDeleteConfirmation" msgid="2970218685653877287">"删除此联系人也将删除多个帐号中的相关详细信息。"</string>
     <string name="deleteConfirmation" msgid="3727809366015979585">"要删除此联系人吗?"</string>
     <string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"删除"</string>
+    <string name="delete_contacts_title">删除联系人</string>
     <string name="invalidContactMessage" msgid="6204402264821083362">"该联系人不存在。"</string>
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"已将该联系人添加到主屏幕。"</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"已将<xliff:g id="NAME">%s</xliff:g>添加到主屏幕。"</string>
@@ -135,6 +136,7 @@
     <string name="missing_app" msgid="5674389915738964148">"未找到可处理此操作的应用。"</string>
     <string name="menu_share" msgid="6343022811796001773">"分享"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"添加到通讯录"</string>
+    <string name="menu_select_all">全选</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"添加"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
       <item quantity="other">通过以下应用分享联系人</item>
@@ -163,6 +165,7 @@
     <string name="contact_directory_description" msgid="1773630547110881835">"目录类型:<xliff:g id="TYPE">%1$s</xliff:g>"</string>
     <string name="activity_title_settings" msgid="4004290638426915162">"设置"</string>
     <string name="menu_settings" msgid="3524924670246877187">"设置"</string>
+    <string name="menu_sim_contacts">"SIM卡联系人"</string>
     <string name="menu_help" msgid="287801702920372292">"帮助和反馈"</string>
     <string name="organization_company_and_title" msgid="7197631449041284518">"<xliff:g id="COMPANY_0">%2$s</xliff:g>,<xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
     <string name="non_phone_caption" msgid="7343449684187013327">"电话号码"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 20d17ea..e22d44c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -312,7 +312,7 @@
     <string name="name_suffix" msgid="4502958221763936999">"姓名後稱謂"</string>
     <string name="name_phonetic" msgid="4746541275769990740">"姓名拼音"</string>
     <string name="name_phonetic_given" msgid="425534279190047812">"名字拼音"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"中間名 (拼音)"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"中間名拼音"</string>
     <string name="name_phonetic_family" msgid="1690852801039809448">"姓氏拼音"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"電話"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"電子郵件"</string>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index a4b8b4b..751d667 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -25,6 +25,9 @@
     <!-- For ContactMultiDeletionInteraction -->
     <item type="id" name="dialog_delete_multiple_contact_loader_id" />
 
+    <!-- For ContactMultiShareInteraction -->
+    <item type="id" name="dialog_share_multiple_contact_loader_id" />
+
     <!-- For PhoneNumberInteraction -->
     <item type="id" name="dialog_phone_number_call_disambiguation"/>
 
@@ -71,6 +74,9 @@
     <!-- Menu ID for Settings menu -->
     <item type="id" name="nav_settings" />
 
+    <!-- Menu ID for SIM contacts menu -->
+    <item type="id" name="nav_sim_contacts" />
+
     <!-- Menu ID for help & feedback  menu -->
     <item type="id" name="nav_help" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 56c4aaa..96a5731 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -232,6 +232,9 @@
     <!-- Positive button text of confirmation dialog contents after users selects to delete a Writable contact. [CHAR LIMIT=30] -->
     <string name="deleteConfirmation_positive_button">Delete</string>
 
+    <!-- Deleting dialog, shown after users selects to delete multiple contacts writable contacts. [CHAR LIMIT=NONE]  -->
+    <string name="delete_contacts_title">Deleting contacts</string>
+
     <!-- Message displayed in a toast when you try to view the details of a contact that
          for some reason doesn't exist anymore. [CHAR LIMIT=NONE]-->
     <string name="invalidContactMessage">The contact doesn\'t exist.</string>
@@ -366,6 +369,9 @@
     <!-- The menu item to share the currently viewed contact [CHAR LIMIT=30] -->
     <string name="menu_share">Share</string>
 
+    <!-- The menu item to select all contacts -->
+    <string name="menu_select_all">Select all</string>
+
     <!-- The menu item to add the the currently viewed contact to your contacts [CHAR LIMIT=30] -->
     <string name="menu_add_contact">Add to contacts</string>
 
@@ -449,6 +455,9 @@
     <!-- Menu item for the settings activity [CHAR LIMIT=64] -->
     <string name="menu_settings" msgid="377929915873428211">Settings</string>
 
+    <!-- Menu item for the sim contacts-->
+    <string name="menu_sim_contacts">SIM contacts</string>
+
     <!-- Menu item for invoking contextual Help & Feedback [CHAR LIMIT=64] -->
     <string name="menu_help">Help &amp; feedback</string>
 
@@ -1533,4 +1542,4 @@
     <!-- Text of Negative Button in dialog -->
     <string name="no_button">No</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/src/com/android/contacts/ContactPhotoManager.java b/src/com/android/contacts/ContactPhotoManager.java
index e5f808d..4e1afaa 100644
--- a/src/com/android/contacts/ContactPhotoManager.java
+++ b/src/com/android/contacts/ContactPhotoManager.java
@@ -473,7 +473,6 @@
         loadThumbnail(view, photoId, darkTheme, isCircular, defaultImageRequest, DEFAULT_AVATAR);
     }
 
-
     /**
      * Load photo into the supplied image view. If the photo is already cached,
      * it is displayed immediately. Otherwise a request is sent to load the photo
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
old mode 100755
new mode 100644
index 9f25726..4372488
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -166,6 +166,9 @@
     public static final int RESULT_UNKNOWN = 0;
     public static final int RESULT_SUCCESS = 1;
     public static final int RESULT_FAILURE = 2;
+    public static final int CONTACTS_DELETE_STARTED = 0;
+    public static final int CONTACTS_DELETE_INCREMENT = 1;
+    public static final int CONTACTS_DELETE_COMPLETE = 2;
 
     private static final HashSet<String> ALLOWED_DATA_COLUMNS = Sets.newHashSet(
         Data.MIMETYPE,
@@ -561,7 +564,7 @@
                     // removed if all information was removed, we need to do a special query to
                     // get the lookup URI for the profile contact (if it still exists).
                     Cursor c = resolver.query(Profile.CONTENT_URI,
-                            new String[] {Contacts._ID, Contacts.LOOKUP_KEY},
+                            new String[]{Contacts._ID, Contacts.LOOKUP_KEY},
                             null, null, null);
                     if (c == null) {
                         continue;
@@ -577,7 +580,7 @@
                     }
                 } else {
                     final Uri rawContactUri = ContentUris.withAppendedId(RawContacts.CONTENT_URI,
-                                    rawContactId);
+                            rawContactId);
                     lookupUri = RawContacts.getContactLookupUri(resolver, rawContactUri);
                 }
                 if (lookupUri != null && Log.isLoggable(TAG, Log.VERBOSE)) {
@@ -1183,10 +1186,19 @@
      */
     public static Intent createDeleteMultipleContactsIntent(Context context,
             long[] contactIds, final String[] names) {
+        return createDeleteMultipleContactsIntent(context, contactIds, names, /* receiver = */null);
+    }
+
+    /**
+     * Creates an intent that can be sent to this service to delete multiple contacts.
+     */
+    public static Intent createDeleteMultipleContactsIntent(Context context,
+            long[] contactIds, final String[] names, ResultReceiver receiver) {
         Intent serviceIntent = new Intent(context, ContactSaveService.class);
         serviceIntent.setAction(ContactSaveService.ACTION_DELETE_MULTIPLE_CONTACTS);
         serviceIntent.putExtra(ContactSaveService.EXTRA_CONTACT_IDS, contactIds);
         serviceIntent.putExtra(ContactSaveService.EXTRA_DISPLAY_NAME_ARRAY, names);
+        serviceIntent.putExtra(ContactSaveService.EXTRA_RESULT_RECEIVER, receiver);
         return serviceIntent;
     }
 
@@ -1206,9 +1218,13 @@
             Log.e(TAG, "Invalid arguments for deleteMultipleContacts request");
             return;
         }
+        final ResultReceiver receiver = intent.getParcelableExtra(
+                ContactSaveService.EXTRA_RESULT_RECEIVER);
+        notifyActionProgress(CONTACTS_DELETE_STARTED, receiver);
         for (long contactId : contactIds) {
             final Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId);
             getContentResolver().delete(contactUri, null, null);
+            notifyActionProgress(CONTACTS_DELETE_INCREMENT, receiver);
         }
         final String[] names = intent.getStringArrayExtra(
                 ContactSaveService.EXTRA_DISPLAY_NAME_ARRAY);
@@ -1227,6 +1243,7 @@
                     R.string.contacts_deleted_many_named_toast, (Object[]) names);
         }
 
+        notifyActionProgress(CONTACTS_DELETE_COMPLETE, receiver);
         mMainHandler.post(new Runnable() {
             @Override
             public void run() {
@@ -1236,6 +1253,12 @@
         });
     }
 
+    private void notifyActionProgress(int state, ResultReceiver receiver){
+        if (receiver != null) {
+            receiver.send(state, new Bundle());
+        }
+    }
+
     /**
      * Creates an intent that can be sent to this service to split a contact into it's constituent
      * pieces. This will set the raw contact ids to {@link AggregationExceptions#TYPE_AUTOMATIC} so
diff --git a/src/com/android/contacts/ShortcutIntentBuilder.java b/src/com/android/contacts/ShortcutIntentBuilder.java
index 5ea6b7e..22d0f9c 100644
--- a/src/com/android/contacts/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/ShortcutIntentBuilder.java
@@ -157,7 +157,6 @@
         protected String mLookupKey;
         protected byte[] mBitmapData;
         protected long mPhotoId;
-
         public LoadingAsyncTask(Uri uri) {
             mUri = uri;
         }
@@ -193,6 +192,7 @@
     }
 
     private final class ContactLoadingAsyncTask extends LoadingAsyncTask {
+
         public ContactLoadingAsyncTask(Uri uri) {
             super(uri);
         }
diff --git a/src/com/android/contacts/SimImportFragment.java b/src/com/android/contacts/SimImportFragment.java
index cee1b1a..0039f2b 100644
--- a/src/com/android/contacts/SimImportFragment.java
+++ b/src/com/android/contacts/SimImportFragment.java
@@ -438,6 +438,8 @@
                 return contact.getPhone();
             } else if (contact.hasEmails()) {
                 return contact.getEmails()[0];
+            } else if(contact.hasAnrs()) {
+                return contact.getAnrs()[0];
             } else {
                 // This isn't really possible because we skip empty SIM contacts during loading
                 return "";
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 243ec00..84924ae 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -736,7 +736,7 @@
             fragment.updateStatus(mProviderStatus);
         }
         if (!transaction.isEmpty()) {
-            transaction.commit();
+            transaction.commitAllowingStateLoss();
             fragmentManager.executePendingTransactions();
         }
 
@@ -1195,6 +1195,16 @@
     }
 
     @Override
+    public void onLaunchSimContactsManagement() {
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                startActivity(ImplicitIntentsUtil.getIntentForSimContactsManagement());
+            }
+        }, DRAWER_CLOSE_DELAY);
+    }
+
+    @Override
     public void onGroupViewSelected(GroupListItem groupListItem) {
         onGroupMenuItemClicked(groupListItem.getGroupId());
     }
diff --git a/src/com/android/contacts/database/SimContactDaoImpl.java b/src/com/android/contacts/database/SimContactDaoImpl.java
index 5ba6bd5..36ad9f2 100644
--- a/src/com/android/contacts/database/SimContactDaoImpl.java
+++ b/src/com/android/contacts/database/SimContactDaoImpl.java
@@ -82,6 +82,7 @@
     public static String NAME = "name";
     public static String NUMBER = "number";
     public static String EMAILS = "emails";
+    public static String ANRS = "anrs";
 
     private final Context mContext;
     private final ContentResolver mResolver;
@@ -292,7 +293,7 @@
         final int colName = cursor.getColumnIndex(NAME);
         final int colNumber = cursor.getColumnIndex(NUMBER);
         final int colEmails = cursor.getColumnIndex(EMAILS);
-
+        final int colAnrs = cursor.getColumnIndex(ANRS);
         final ArrayList<SimContact> result = new ArrayList<>();
 
         while (cursor.moveToNext()) {
@@ -300,10 +301,14 @@
             final String name = cursor.getString(colName);
             final String number = cursor.getString(colNumber);
             final String emails = cursor.getString(colEmails);
-
-            final SimContact contact = new SimContact(id, name, number, parseEmails(emails));
+            String anrs = "";
+            if (colAnrs >=0 )
+                anrs = cursor.getString(colAnrs);
+            final SimContact contact = new SimContact(id, name, number, parseEmails(emails),
+                    parseAnrs(anrs));
             // Only include contact if it has some useful data
-            if (contact.hasName() || contact.hasPhone() || contact.hasEmails()) {
+            if (contact.hasName() || contact.hasPhone() || contact.hasEmails()
+                    || contact.hasAnrs()) {
                 result.add(contact);
             }
         }
@@ -396,6 +401,10 @@
         return !TextUtils.isEmpty(emails) ? emails.split(",") : null;
     }
 
+    private String[] parseAnrs(String anrs) {
+        return !TextUtils.isEmpty(anrs) ? anrs.split(":") : null;
+    }
+
     private boolean hasTelephony() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
     }
diff --git a/src/com/android/contacts/drawer/DrawerAdapter.java b/src/com/android/contacts/drawer/DrawerAdapter.java
index b5a1ea7..4631c16 100644
--- a/src/com/android/contacts/drawer/DrawerAdapter.java
+++ b/src/com/android/contacts/drawer/DrawerAdapter.java
@@ -33,6 +33,7 @@
 import com.android.contacts.model.account.AccountDisplayInfo;
 import com.android.contacts.model.account.AccountDisplayInfoFactory;
 import com.android.contacts.util.SharedPreferenceUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contactsbind.HelpUtils;
 import com.android.contactsbind.ObjectFactory;
 
@@ -115,6 +116,11 @@
         mMiscItems.add(new DividerItem());
         mMiscItems.add(new MiscItem(R.id.nav_settings, R.string.menu_settings,
                 R.drawable.quantum_ic_settings_vd_theme_24));
+        if (ImplicitIntentsUtil.checkIntentIfExists(mActivity,
+                ImplicitIntentsUtil.getIntentForSimContactsManagement())) {
+            mMiscItems.add(new MiscItem(R.id.nav_sim_contacts, R.string.menu_sim_contacts,
+                    R.drawable.quantum_ic_sim_card_vd_theme_24));
+        }
         if (HelpUtils.isHelpAndFeedbackAvailable()) {
             mMiscItems.add(new MiscItem(R.id.nav_help, R.string.menu_help,
                     R.drawable.quantum_ic_help_vd_theme_24));
@@ -283,6 +289,11 @@
         final ImageView icon = (ImageView) result.findViewById(R.id.icon);
         icon.setScaleType(ImageView.ScaleType.FIT_CENTER);
         icon.setImageDrawable(displayableAccount.getIcon());
+        if (account.accountName != null) {
+            textView.setText(account.accountName);
+        }else {
+            textView.setText(displayableAccount.getNameLabel());
+        }
 
         result.setTag(account);
         result.setActivated(activated);
diff --git a/src/com/android/contacts/drawer/DrawerFragment.java b/src/com/android/contacts/drawer/DrawerFragment.java
index 485513a..bcd1856 100644
--- a/src/com/android/contacts/drawer/DrawerFragment.java
+++ b/src/com/android/contacts/drawer/DrawerFragment.java
@@ -256,6 +256,8 @@
                 mListener.onCreateLabelButtonClicked();
             } else if (viewId == R.id.nav_settings) {
                 mListener.onOpenSettings();
+            } else if (viewId ==  R.id.nav_sim_contacts) {
+                mListener.onLaunchSimContactsManagement();
             } else if (viewId == R.id.nav_help) {
                 mListener.onLaunchHelpFeedback();
             } else {
@@ -313,6 +315,7 @@
         void onCreateLabelButtonClicked();
         void onOpenSettings();
         void onLaunchHelpFeedback();
+        void onLaunchSimContactsManagement();
     }
 
     private class WindowInsetsListener implements View.OnApplyWindowInsetsListener {
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
old mode 100755
new mode 100644
diff --git a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
index 47b76a5..b9c4023 100644
--- a/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
+++ b/src/com/android/contacts/interactions/ContactMultiDeletionInteraction.java
@@ -18,14 +18,19 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.LoaderManager.LoaderCallbacks;
+import android.os.Handler;
+import android.support.v4.os.ResultReceiver;
 import android.content.Context;
 import android.content.CursorLoader;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnDismissListener;
 import android.content.Loader;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.ContactsContract.RawContacts;
@@ -82,6 +87,7 @@
     private TreeSet<Long> mContactIds;
     private Context mContext;
     private AlertDialog mDialog;
+    private ProgressDialog mProgressDialog;
     private MultiContactDeleteListener mListener;
 
     /**
@@ -125,6 +131,12 @@
             mDialog.dismiss();
             mDialog = null;
         }
+
+        if (mProgressDialog != null && mProgressDialog.isShowing()) {
+            mProgressDialog.setOnDismissListener(null);
+            mProgressDialog.dismiss();
+            mProgressDialog = null;
+        }
     }
 
     public void setContactIds(TreeSet<Long> contactIds) {
@@ -165,19 +177,17 @@
     public Loader<Cursor> onCreateLoader(int id, Bundle args) {
         final TreeSet<Long> contactIds = (TreeSet<Long>) args.getSerializable(ARG_CONTACT_IDS);
         final Object[] parameterObject = contactIds.toArray();
-        final String[] parameters = new String[contactIds.size()];
 
-        final StringBuilder builder = new StringBuilder();
+        final StringBuilder builder = new StringBuilder(RawContacts.CONTACT_ID + " in (");
         for (int i = 0; i < contactIds.size(); i++) {
-            parameters[i] = String.valueOf(parameterObject[i]);
-            builder.append(RawContacts.CONTACT_ID + " =?");
-            if (i == contactIds.size() -1) {
-                break;
+            if (i > 0){
+                builder.append(",");
             }
-            builder.append(" OR ");
+            builder.append(String.valueOf(parameterObject[i]));
         }
+        builder.append(")");
         return new CursorLoader(mContext, RawContacts.CONTENT_URI, RAW_CONTACT_PROJECTION,
-                builder.toString(), parameters, null);
+                builder.toString(), null, null);
     }
 
     @Override
@@ -310,13 +320,66 @@
         }
     }
 
+    private void showProgressDialog(){
+        CharSequence title = getString(R.string.delete_contacts_title);
+
+        mProgressDialog = new ProgressDialog(mContext);
+        mProgressDialog.setTitle(title);
+        mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+        mProgressDialog.setProgress(0);
+        mProgressDialog.setMax(mContactIds.size());
+        mProgressDialog.setCancelable(false);
+        mProgressDialog.setOnDismissListener(new OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
+                mProgressDialog = null;
+            }
+        });
+        mProgressDialog.show();
+        lockScreen();
+    }
+
     protected void doDeleteContact(long[] contactIds, final String[] names) {
+        ResultReceiver receiver = new ResultReceiver(new Handler()){
+            @Override
+            protected void onReceiveResult(int resultCode, Bundle resultData) {
+                super.onReceiveResult(resultCode, resultData);
+                switch (resultCode){
+                    case ContactSaveService.CONTACTS_DELETE_STARTED:
+                        showProgressDialog();
+                        break;
+                    case ContactSaveService.CONTACTS_DELETE_INCREMENT:
+                        if (mProgressDialog != null){
+                            mProgressDialog.incrementProgressBy(1);
+                        }
+                        break;
+                    case ContactSaveService.CONTACTS_DELETE_COMPLETE:
+                        if (mProgressDialog != null){
+                            mProgressDialog.dismiss();
+                            mProgressDialog = null;
+                        }
+                        break;
+                }
+            }
+        };
+
         mContext.startService(ContactSaveService.createDeleteMultipleContactsIntent(mContext,
-                contactIds, names));
+                contactIds, names, receiver));
         mListener.onDeletionFinished();
     }
 
     public void setListener(MultiContactDeleteListener listener) {
         mListener = listener;
     }
+
+    private void lockScreen(){
+        Configuration configuration = getActivity().getResources().getConfiguration();
+        int ori = configuration.orientation;
+        if (ori == configuration.ORIENTATION_LANDSCAPE) {
+            getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        } else if (ori == configuration.ORIENTATION_PORTRAIT) {
+            getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+        }
+    }
 }
diff --git a/src/com/android/contacts/interactions/ContactMultiShareInteraction.java b/src/com/android/contacts/interactions/ContactMultiShareInteraction.java
new file mode 100644
index 0000000..559a2e2
--- /dev/null
+++ b/src/com/android/contacts/interactions/ContactMultiShareInteraction.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+     * Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above
+       copyright notice, this list of conditions and the following
+       disclaimer in the documentation and/or other materials provided
+       with the distribution.
+     * Neither the name of The Linux Foundation nor the names of its
+       contributors may be used to endorse or promote products derived
+       from this software without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.contacts.interactions;
+
+import android.content.Intent;
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.LoaderManager.LoaderCallbacks;
+import android.provider.ContactsContract;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.ContentUris;
+import android.content.AsyncTaskLoader;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnDismissListener;
+import android.content.DialogInterface.OnClickListener;
+import android.content.Loader;
+import android.net.Uri;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Toast;
+
+import com.android.contacts.ContactSaveService;
+import com.android.contacts.R;
+
+import java.util.List;
+import java.util.TreeSet;
+/**
+ * An interaction invoked to share multiple contacts.
+ */
+public class ContactMultiShareInteraction extends Fragment
+        implements LoaderCallbacks<String> {
+
+    private static final int ACTIVITY_REQUEST_CODE_SHARE = 0;
+
+    private static final String FRAGMENT_TAG = "shareMultipleContacts";
+    private static final String TAG = "ContactMultiShare";
+    private static final String KEY_ACTIVE = "active";
+    private static final String KEY_CONTACTS_IDS = "contactIds";
+    public static final String ARG_CONTACT_IDS = "contactIds";
+
+    private boolean mIsLoaderActive;
+    private TreeSet<Long> mContactIds;
+    private Context mContext;
+    private static ProgressDialog mProgressDialog;
+
+    /**
+     * Starts the interaction.
+     *
+     * @param hostFragment the fragment within which to start the interaction
+     * @param contactIds the IDs of contacts to be shared
+     * @return the newly created interaction
+     */
+    public static ContactMultiShareInteraction start(
+            Fragment hostFragment, TreeSet<Long> contactIds) {
+        if (contactIds == null) {
+            return null;
+        }
+
+        final FragmentManager fragmentManager = hostFragment.getFragmentManager();
+        ContactMultiShareInteraction fragment =
+                (ContactMultiShareInteraction) fragmentManager.findFragmentByTag(FRAGMENT_TAG);
+        if (fragment == null) {
+            fragment = new ContactMultiShareInteraction();
+            fragment.setContactIds(contactIds);
+            fragmentManager.beginTransaction().add(fragment, FRAGMENT_TAG)
+                    .commitAllowingStateLoss();
+        } else {
+            fragment.setContactIds(contactIds);
+        }
+        return fragment;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mContext = activity;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (mProgressDialog != null && mProgressDialog.isShowing()) {
+            mProgressDialog.setOnDismissListener(null);
+            mProgressDialog.dismiss();
+            mProgressDialog = null;
+        }
+    }
+
+    public void setContactIds(TreeSet<Long> contactIds) {
+        mContactIds = contactIds;
+        mIsLoaderActive = true;
+        if (isStarted()) {
+            Bundle args = new Bundle();
+            args.putSerializable(ARG_CONTACT_IDS, mContactIds);
+            getLoaderManager().restartLoader(R.id.dialog_share_multiple_contact_loader_id,
+                    args, this);
+            showDialog();
+        }
+    }
+
+    private boolean isStarted() {
+        return isAdded();
+    }
+
+    @Override
+    public void onStart() {
+        if (mIsLoaderActive) {
+            Bundle args = new Bundle();
+            args.putSerializable(ARG_CONTACT_IDS, mContactIds);
+            getLoaderManager().initLoader(
+                    R.id.dialog_share_multiple_contact_loader_id, args, this);
+            showDialog();
+        }
+        super.onStart();
+    }
+
+    @Override
+    public Loader<String> onCreateLoader(int id, Bundle args) {
+        final TreeSet<Long> contactIds = (TreeSet<Long>) args.getSerializable(ARG_CONTACT_IDS);
+        return new ShareContactsLoader(mContext, contactIds);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<String> loader, String uriList) {
+        if (mProgressDialog != null){
+            mProgressDialog.dismiss();
+            mProgressDialog = null;
+        }
+
+        if (!mIsLoaderActive) {
+            return;
+        }
+
+        if (TextUtils.isEmpty(uriList)) {
+            Log.e(TAG, "Failed to load contacts");
+            return;
+        }
+
+        final Uri uri = Uri.withAppendedPath(
+                ContactsContract.Contacts.CONTENT_MULTI_VCARD_URI,
+                Uri.encode(uriList));
+        final Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType(ContactsContract.Contacts.CONTENT_VCARD_TYPE);
+        intent.putExtra(Intent.EXTRA_STREAM, uri);
+        try {
+            startActivityForResult(Intent.createChooser(intent, mContext.getResources().getQuantityString(
+                    R.plurals.title_share_via,/* quantity */ mContactIds.size()))
+                    , ACTIVITY_REQUEST_CODE_SHARE);
+        } catch (final ActivityNotFoundException ex) {
+            Toast.makeText(getContext(), R.string.share_error, Toast.LENGTH_SHORT).show();
+        }
+
+        // We don't want onLoadFinished() calls any more, which may come when the database is
+        // updating.
+        getLoaderManager().destroyLoader(R.id.dialog_share_multiple_contact_loader_id);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<String> loader) {
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_ACTIVE, mIsLoaderActive);
+        outState.putSerializable(KEY_CONTACTS_IDS, mContactIds);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        if (savedInstanceState != null) {
+            mIsLoaderActive = savedInstanceState.getBoolean(KEY_ACTIVE);
+            mContactIds = (TreeSet<Long>) savedInstanceState.getSerializable(KEY_CONTACTS_IDS);
+        }
+    }
+
+    private void cancelLoad(){
+        if(isStarted()){
+            Loader loader = getLoaderManager()
+                    .getLoader(R.id.dialog_share_multiple_contact_loader_id);
+            if (loader != null){
+                loader.cancelLoad();
+            }
+        }
+    }
+
+    private void showDialog(){
+        CharSequence title = getString(R.string.exporting_contact_list_title);
+
+        mProgressDialog = new ProgressDialog(mContext);
+        mProgressDialog.setTitle(title);
+        mProgressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+        mProgressDialog.setButton(DialogInterface.BUTTON_NEGATIVE,
+                getString(android.R.string.cancel), (OnClickListener)null);
+        mProgressDialog.setCancelable(false);
+        mProgressDialog.setProgress(0);
+        mProgressDialog.setMax(mContactIds.size());
+        mProgressDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+            @Override
+            public void onDismiss(DialogInterface dialog) {
+                cancelLoad();
+                mIsLoaderActive = false;
+                mProgressDialog = null;
+            }
+        });
+
+        mProgressDialog.show();
+    }
+
+    private static class ShareContactsLoader extends AsyncTaskLoader<String>{
+        private TreeSet<Long> mSelectedContactIds;
+        private int mProgress;
+
+        public ShareContactsLoader(Context context, TreeSet<Long> contactIds){
+            super(context);
+            mSelectedContactIds = contactIds;
+        }
+
+        @Override
+        protected void onStartLoading() {
+            forceLoad();
+        }
+
+        @Override
+        public String loadInBackground() {
+            final StringBuilder uriListBuilder = new StringBuilder();
+            for (Long contactId : mSelectedContactIds) {
+                if (!isLoadInBackgroundCanceled()) {
+                    updateProgress();
+                    final Uri contactUri = ContentUris.withAppendedId(
+                            ContactsContract.Contacts.CONTENT_URI, contactId);
+                    final Uri lookupUri = ContactsContract.Contacts.getLookupUri(
+                            getContext().getContentResolver(), contactUri);
+                    if (lookupUri == null) {
+                        continue;
+                    }
+                    final List<String> pathSegments = lookupUri.getPathSegments();
+                    if (pathSegments.size() < 2) {
+                        continue;
+                    }
+                    final String lookupKey = pathSegments.get(pathSegments.size() - 2);
+                    if (uriListBuilder.length() > 0) {
+                        uriListBuilder.append(':');
+                    }
+                    uriListBuilder.append(Uri.encode(lookupKey));
+                }
+
+            }
+            return uriListBuilder.toString();
+        }
+
+        private void updateProgress(){
+            mProgress++;
+            if (mProgressDialog != null) {
+                mProgressDialog.setProgress(mProgress);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/contacts/interactions/ExportDialogFragment.java b/src/com/android/contacts/interactions/ExportDialogFragment.java
index c7ce072..ac391f9 100644
--- a/src/com/android/contacts/interactions/ExportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ExportDialogFragment.java
@@ -41,6 +41,7 @@
 import com.android.contacts.R;
 import com.android.contacts.util.ImplicitIntentsUtil;
 import com.android.contacts.vcard.ExportVCardActivity;
+import com.android.contacts.model.SimCard;
 import com.android.contacts.vcard.ShareVCardActivity;
 import com.android.contacts.vcard.VCardCommonArguments;
 
@@ -61,7 +62,6 @@
     };
 
     private SubscriptionManager mSubscriptionManager;
-
     /** Preferred way to show this dialog */
     public static void show(FragmentManager fragmentManager, Class callingActivity,
             int exportMode) {
@@ -91,7 +91,6 @@
                 .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         final String callingActivity = getArguments().getString(
                 VCardCommonArguments.ARG_CALLING_ACTIVITY);
-
         // Adapter that shows a list of string resources
         final ArrayAdapter<AdapterEntry> adapter = new ArrayAdapter<AdapterEntry>(getActivity(),
                 R.layout.select_dialog_item) {
@@ -217,18 +216,18 @@
     private static class AdapterEntry {
         public final CharSequence mLabel;
         public final int mChoiceResourceId;
-        public final int mSubscriptionId;
+        public final SimCard mSim;
 
-        public AdapterEntry(CharSequence label, int resId, int subId) {
+        public AdapterEntry(CharSequence label, int resId, SimCard sim) {
             mLabel = label;
             mChoiceResourceId = resId;
-            mSubscriptionId = subId;
+            mSim = sim;
         }
 
         public AdapterEntry(String label, int resId) {
             // Store a nonsense value for mSubscriptionId. If this constructor is used,
             // the mSubscriptionId value should not be read later.
-            this(label, resId, /* subId = */ -1);
+            this(label, resId, /* subId = */ null);
         }
     }
 }
diff --git a/src/com/android/contacts/interactions/ImportDialogFragment.java b/src/com/android/contacts/interactions/ImportDialogFragment.java
index 41b1c71..6e05f08 100644
--- a/src/com/android/contacts/interactions/ImportDialogFragment.java
+++ b/src/com/android/contacts/interactions/ImportDialogFragment.java
@@ -35,6 +35,7 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.android.contacts.R;
 import com.android.contacts.activities.SimImportActivity;
@@ -48,6 +49,7 @@
 import com.android.contacts.model.account.AccountInfo;
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.util.AccountSelectionUtil;
+import com.android.contacts.util.ImplicitIntentsUtil;
 import com.google.common.util.concurrent.Futures;
 
 import java.util.List;
@@ -237,16 +239,20 @@
             adapter.add(new AdapterEntry(getString(R.string.import_from_vcf_file),
                     R.string.import_from_vcf_file));
         }
-        final List<SimCard> sims = mSimDao.getSimCards();
+        if (!ImplicitIntentsUtil.checkIntentIfExists(getActivity(),
+                ImplicitIntentsUtil.getIntentForSimContactsManagement())) {
+            final List<SimCard> sims = mSimDao.getSimCards();
 
-        if (sims.size() == 1) {
-            adapter.add(new AdapterEntry(getString(R.string.import_from_sim),
-                    R.string.import_from_sim, sims.get(0)));
-            return;
-        }
-        for (int i = 0; i < sims.size(); i++) {
-            final SimCard sim = sims.get(i);
-            adapter.add(new AdapterEntry(getSimDescription(sim, i), R.string.import_from_sim, sim));
+            if (sims.size() == 1) {
+                adapter.add(new AdapterEntry(getString(R.string.import_from_sim),
+                        R.string.import_from_sim, sims.get(0)));
+                return;
+            }
+            for (int i = 0; i < sims.size(); i++) {
+                final SimCard sim = sims.get(i);
+                adapter.add(new AdapterEntry(getSimDescription(sim, i),
+                        R.string.import_from_sim, sim));
+            }
         }
     }
 
@@ -259,6 +265,11 @@
      * Handle "import from SD".
      */
     private void handleImportRequest(int resId, int subscriptionId) {
+        //if the accounts is not initial complete, give a toast here.
+        if (mAccountsFuture == null) {
+            Toast.makeText(getActivity(), R.string.vcard_import_failed, Toast.LENGTH_SHORT).show();
+            return;
+        }
         // Get the accounts. Because this only happens after a user action this should pretty
         // much never block since it will usually be at least several seconds before the user
         // interacts with the view
diff --git a/src/com/android/contacts/lettertiles/LetterTileDrawable.java b/src/com/android/contacts/lettertiles/LetterTileDrawable.java
old mode 100644
new mode 100755
diff --git a/src/com/android/contacts/list/ContactEntryListAdapter.java b/src/com/android/contacts/list/ContactEntryListAdapter.java
index b508dda..5d46fa4 100644
--- a/src/com/android/contacts/list/ContactEntryListAdapter.java
+++ b/src/com/android/contacts/list/ContactEntryListAdapter.java
@@ -710,7 +710,6 @@
         if (!cursor.isNull(photoIdColumn)) {
             photoId = cursor.getLong(photoIdColumn);
         }
-
         QuickContactBadge quickContact = view.getQuickContact();
         quickContact.assignContactUri(
                 getContactUri(partitionIndex, cursor, contactIdColumn, lookUpKeyColumn));
diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index cb63f53..95ce6fe 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -50,7 +50,7 @@
             Contacts.PHOTO_THUMBNAIL_URI,           // 5
             Contacts.LOOKUP_KEY,                    // 6
             Contacts.PHONETIC_NAME,                 // 7
-            Contacts.STARRED,                       // 9
+            Contacts.STARRED,                       // 8
         };
 
         private static final String[] CONTACT_PROJECTION_ALTERNATIVE = new String[] {
@@ -252,7 +252,6 @@
         if (!cursor.isNull(ContactQuery.CONTACT_PHOTO_ID)) {
             photoId = cursor.getLong(ContactQuery.CONTACT_PHOTO_ID);
         }
-
         if (photoId != 0) {
             getPhotoLoader().loadThumbnail(view.getPhotoView(), photoId, false,
                     getCircularPhotos(), null);
diff --git a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
index 9851d2b..b4f748c 100644
--- a/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
+++ b/src/com/android/contacts/list/DefaultContactBrowseListFragment.java
@@ -62,6 +62,7 @@
 import com.android.contacts.activities.ActionBarAdapter;
 import com.android.contacts.activities.PeopleActivity;
 import com.android.contacts.compat.CompatUtils;
+import com.android.contacts.interactions.ContactMultiShareInteraction;
 import com.android.contacts.interactions.ContactDeletionInteraction;
 import com.android.contacts.interactions.ContactMultiDeletionInteraction;
 import com.android.contacts.interactions.ContactMultiDeletionInteraction.MultiContactDeleteListener;
@@ -1015,8 +1016,10 @@
                 && getSelectedContactIds().size() != 0;
         makeMenuItemVisible(menu, R.id.menu_share, showSelectedContactOptions);
         makeMenuItemVisible(menu, R.id.menu_delete, showSelectedContactOptions);
+        makeMenuItemVisible(menu, R.id.menu_select_all, !isSearchOrSelectionMode);
         final boolean showLinkContactsOptions = mActionBarAdapter.isSelectionMode()
-                && getSelectedContactIds().size() > 1;
+                && getSelectedContactIds().size() > 1
+                && getSelectedContactIds().size() <= 9;
         makeMenuItemVisible(menu, R.id.menu_join, showLinkContactsOptions);
 
         // Debug options need to be visible even in search mode.
@@ -1085,6 +1088,10 @@
             intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET);
             ImplicitIntentsUtil.startActivityOutsideApp(getContext(), intent);
             return true;
+        } else if (id == R.id.menu_select_all){
+            mActionBarAdapter.setSelectionMode(true);
+            mActivity.invalidateOptionsMenu();
+            setSelectedAll();
         }
         return super.onOptionsItemSelected(item);
     }
@@ -1094,41 +1101,9 @@
      * handling large numbers of contacts. I don't expect this to be a problem.
      */
     private void shareSelectedContacts() {
-        final StringBuilder uriListBuilder = new StringBuilder();
-        for (Long contactId : getSelectedContactIds()) {
-            final Uri contactUri = ContentUris.withAppendedId(
-                    ContactsContract.Contacts.CONTENT_URI, contactId);
-            final Uri lookupUri = ContactsContract.Contacts.getLookupUri(
-                    getContext().getContentResolver(), contactUri);
-            if (lookupUri == null) {
-                continue;
-            }
-            final List<String> pathSegments = lookupUri.getPathSegments();
-            if (pathSegments.size() < 2) {
-                continue;
-            }
-            final String lookupKey = pathSegments.get(pathSegments.size() - 2);
-            if (uriListBuilder.length() > 0) {
-                uriListBuilder.append(':');
-            }
-            uriListBuilder.append(Uri.encode(lookupKey));
-        }
-        if (uriListBuilder.length() == 0) {
-            return;
-        }
-        final Uri uri = Uri.withAppendedPath(
-                ContactsContract.Contacts.CONTENT_MULTI_VCARD_URI,
-                Uri.encode(uriListBuilder.toString()));
-        final Intent intent = new Intent(Intent.ACTION_SEND);
-        intent.setType(ContactsContract.Contacts.CONTENT_VCARD_TYPE);
-        intent.putExtra(Intent.EXTRA_STREAM, uri);
-        try {
-            startActivityForResult(Intent.createChooser(intent, getResources().getQuantityString(
-                    R.plurals.title_share_via,/* quantity */ getSelectedContactIds().size()))
-                    , ACTIVITY_REQUEST_CODE_SHARE);
-        } catch (final ActivityNotFoundException ex) {
-            Toast.makeText(getContext(), R.string.share_error, Toast.LENGTH_SHORT).show();
-        }
+        final ContactMultiShareInteraction multiShareInteraction =
+                ContactMultiShareInteraction.start(this, getSelectedContactIds());
+        mActionBarAdapter.setSelectionMode(false);
     }
 
     private void joinSelectedContacts() {
diff --git a/src/com/android/contacts/list/DefaultContactListAdapter.java b/src/com/android/contacts/list/DefaultContactListAdapter.java
old mode 100644
new mode 100755
diff --git a/src/com/android/contacts/list/JoinContactListAdapter.java b/src/com/android/contacts/list/JoinContactListAdapter.java
old mode 100644
new mode 100755
diff --git a/src/com/android/contacts/list/MultiSelectContactsListFragment.java b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
index 5e7f9e8..1d6b900 100644
--- a/src/com/android/contacts/list/MultiSelectContactsListFragment.java
+++ b/src/com/android/contacts/list/MultiSelectContactsListFragment.java
@@ -189,6 +189,23 @@
         }
     }
 
+    /**
+     * @param selected all contacts
+     */
+    public void setSelectedAll() {
+        TreeSet<Long> allContactIds = new TreeSet<Long>();
+        for (int i = 0; i < getAdapter().getCount(); i++) {
+            final long contactId = getContactId(i);
+            if (contactId < 0) {
+                return;
+            }
+            allContactIds.add(contactId);
+        }
+        if (getAdapter().isDisplayingCheckBoxes()) {
+            getAdapter().setSelectedContactIds(allContactIds);
+        }
+    }
+
     private long getContactId(int position) {
         final int contactIdColumnIndex = getAdapter().getContactColumnIdIndex();
 
diff --git a/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java b/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
index a0b4f3c..32cfff1 100644
--- a/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
+++ b/src/com/android/contacts/list/MultiSelectEntryContactListAdapter.java
@@ -165,7 +165,7 @@
       * @param displayNameColumn Index of the display name column
       */
     protected void bindPhoto(final ContactListItemView view, final Cursor cursor,
-           final int photoIdColumn, final int lookUpKeyColumn, final int displayNameColumn) {
+            final int photoIdColumn, final int lookUpKeyColumn, final int displayNameColumn) {
         final long photoId = cursor.isNull(photoIdColumn)
             ? 0 : cursor.getLong(photoIdColumn);
         final ContactPhotoManager.DefaultImageRequest imageRequest = photoId == 0
diff --git a/src/com/android/contacts/list/PhoneNumberListAdapter.java b/src/com/android/contacts/list/PhoneNumberListAdapter.java
index d459d47..4d17aeb 100644
--- a/src/com/android/contacts/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/list/PhoneNumberListAdapter.java
@@ -540,7 +540,6 @@
         if (!cursor.isNull(PhoneQuery.PHOTO_ID)) {
             photoId = cursor.getLong(PhoneQuery.PHOTO_ID);
         }
-
         if (photoId != 0) {
             getPhotoLoader().loadThumbnail(view.getPhotoView(), photoId, false,
                     getCircularPhotos(), null);
diff --git a/src/com/android/contacts/model/AccountTypeManager.java b/src/com/android/contacts/model/AccountTypeManager.java
index 196e67f..7bab0be 100644
--- a/src/com/android/contacts/model/AccountTypeManager.java
+++ b/src/com/android/contacts/model/AccountTypeManager.java
@@ -100,7 +100,7 @@
             public boolean apply(@Nullable AccountInfo input) {
                 return input != null && input.getType().isGroupMembershipEditable();
             }
-        };
+        },
     }
 
     /**
diff --git a/src/com/android/contacts/model/RawContactDelta.java b/src/com/android/contacts/model/RawContactDelta.java
old mode 100644
new mode 100755
diff --git a/src/com/android/contacts/model/RawContactModifier.java b/src/com/android/contacts/model/RawContactModifier.java
old mode 100644
new mode 100755
index 789bd10..171a810
--- a/src/com/android/contacts/model/RawContactModifier.java
+++ b/src/com/android/contacts/model/RawContactModifier.java
@@ -1038,10 +1038,30 @@
             return;
         }
 
+        boolean supportPrefix = false;
+        boolean supportFamilyName = false;
+        boolean supportMiddleName = false;
+        boolean supportGivenName = false;
+        boolean supportSuffix = false;
         boolean supportPhoneticFamilyName = false;
         boolean supportPhoneticMiddleName = false;
         boolean supportPhoneticGivenName = false;
         for (EditField editField : newDataKind.fieldList) {
+            if (StructuredName.PREFIX.equals(editField.column)) {
+                supportPrefix = true;
+            }
+            if (StructuredName.FAMILY_NAME.equals(editField.column)) {
+                supportFamilyName = true;
+            }
+            if (StructuredName.MIDDLE_NAME.equals(editField.column)) {
+                supportMiddleName = true;
+            }
+            if (StructuredName.GIVEN_NAME.equals(editField.column)) {
+                supportGivenName = true;
+            }
+            if (StructuredName.SUFFIX.equals(editField.column)) {
+                supportSuffix = true;
+            }
             if (StructuredName.PHONETIC_FAMILY_NAME.equals(editField.column)) {
                 supportPhoneticFamilyName = true;
             }
@@ -1053,6 +1073,21 @@
             }
         }
 
+        if (!supportPrefix) {
+            values.remove(StructuredName.PREFIX);
+        }
+        if (!supportFamilyName) {
+            values.remove(StructuredName.FAMILY_NAME);
+        }
+        if (!supportMiddleName) {
+            values.remove(StructuredName.MIDDLE_NAME);
+        }
+        if (!supportGivenName) {
+            values.remove(StructuredName.GIVEN_NAME);
+        }
+        if (!supportSuffix) {
+            values.remove(StructuredName.SUFFIX);
+        }
         if (!supportPhoneticFamilyName) {
             values.remove(StructuredName.PHONETIC_FAMILY_NAME);
         }
diff --git a/src/com/android/contacts/model/SimContact.java b/src/com/android/contacts/model/SimContact.java
index 7babe27..d6cc13e 100644
--- a/src/com/android/contacts/model/SimContact.java
+++ b/src/com/android/contacts/model/SimContact.java
@@ -47,20 +47,26 @@
     private final String mName;
     private final String mPhone;
     private final String[] mEmails;
+    private final String[] mAnrs;
 
     public SimContact(long id, String name, String phone) {
         this(id, name, phone, null);
     }
 
     public SimContact(long id, String name, String phone, String[] emails) {
+        this(id, name, phone, emails, null);
+    }
+
+    public SimContact(long id, String name, String phone, String[] emails, String[] anrs) {
         mId = id;
         mName = name;
         mPhone = phone == null ? "" : phone.trim();
         mEmails = emails;
+        mAnrs = anrs;
     }
 
     public SimContact(SimContact other) {
-        this(other.mId, other.mName, other.mPhone, other.mEmails);
+        this(other.mId, other.mName, other.mPhone, other.mEmails, other.mAnrs);
     }
 
     public long getId() {
@@ -79,10 +85,14 @@
         return mEmails;
     }
 
+    public String[] getAnrs() {
+        return mAnrs;
+    }
+
     public void appendCreateContactOperations(List<ContentProviderOperation> ops,
             AccountWithDataSet targetAccount) {
         // There is nothing to save so skip it.
-        if (!hasName() && !hasPhone() && !hasEmails()) return;
+        if (!hasName() && !hasPhone() && !hasEmails() && !hasAnrs()) return;
 
         final int rawContactOpIndex = ops.size();
         ops.add(ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
@@ -105,6 +115,12 @@
                         Email.ADDRESS, email));
             }
         }
+        if (mAnrs != null) {
+            for (String anr : mAnrs) {
+                ops.add(createInsertOp(rawContactOpIndex, Phone.CONTENT_ITEM_TYPE,
+                        Phone.NUMBER, anr));
+            }
+        }
     }
 
     private ContentProviderOperation createInsertOp(int rawContactOpIndex, String mimeType,
@@ -134,6 +150,10 @@
         return mEmails != null && mEmails.length > 0;
     }
 
+    public boolean hasAnrs() {
+        return mAnrs != null && mAnrs.length > 0;
+    }
+
     /**
      * Generate a "fake" lookup key. This is needed because
      * {@link ContactPhotoManager} will only generate a letter avatar
@@ -167,7 +187,8 @@
         final SimContact that = (SimContact) o;
 
         return mId == that.mId && Objects.equals(mName, that.mName) &&
-                Objects.equals(mPhone, that.mPhone) && Arrays.equals(mEmails, that.mEmails);
+                Objects.equals(mPhone, that.mPhone) && Arrays.equals(mEmails, that.mEmails)
+                && Arrays.equals(mAnrs, that.mAnrs);
     }
 
     @Override
@@ -176,6 +197,7 @@
         result = 31 * result + (mName != null ? mName.hashCode() : 0);
         result = 31 * result + (mPhone != null ? mPhone.hashCode() : 0);
         result = 31 * result + Arrays.hashCode(mEmails);
+        result = 31 * result + Arrays.hashCode(mAnrs);
         return result;
     }
 
@@ -190,6 +212,7 @@
         dest.writeString(mName);
         dest.writeString(mPhone);
         dest.writeStringArray(mEmails);
+        dest.writeStringArray(mAnrs);
     }
 
     public static final Creator<SimContact> CREATOR = new Creator<SimContact>() {
@@ -199,7 +222,8 @@
             final String name = source.readString();
             final String phone = source.readString();
             final String[] emails = source.createStringArray();
-            return new SimContact(id, name, phone, emails);
+            final String[] anrs = source.createStringArray();
+            return new SimContact(id, name, phone, emails, anrs);
         }
 
         @Override
diff --git a/src/com/android/contacts/model/account/SimAccountType.java b/src/com/android/contacts/model/account/SimAccountType.java
index 360e944..b0efef4 100644
--- a/src/com/android/contacts/model/account/SimAccountType.java
+++ b/src/com/android/contacts/model/account/SimAccountType.java
@@ -17,6 +17,8 @@
 
 import android.accounts.AuthenticatorDescription;
 import android.content.Context;
+import android.provider.ContactsContract.CommonDataKinds.Email;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.Nickname;
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 
@@ -32,19 +34,22 @@
  */
 public class SimAccountType extends BaseAccountType {
 
+    public static final String ACCOUNT_TYPE = "com.android.sim";
+
     public SimAccountType(Context context) {
-        this.titleRes = R.string.account_sim;
-        this.iconRes = R.drawable.quantum_ic_sim_card_vd_theme_24;
+        this(context, null);
+    }
+
+    public SimAccountType(Context context, String resPackageName) {
+        this.accountType = ACCOUNT_TYPE;
+        this.resourcePackageName = resPackageName;
+        this.syncAdapterPackageName = resPackageName;
 
         try {
             addDataKindStructuredName(context);
             addDataKindName(context);
-            final DataKind phoneKind = addDataKindPhone(context);
-            phoneKind.typeOverallMax = 1;
-            // SIM card contacts don't necessarily support separate types (based on data exposed
-            // in Samsung and LG Contacts Apps.
-            phoneKind.typeList = Collections.emptyList();
-
+            addDataKindPhone(context);
+            addDataKindEmail(context);
             mIsInitialized = true;
         } catch (DefinitionException e) {
             // Just fail fast. Because we're explicitly adding the fields in this class this
@@ -66,6 +71,7 @@
     @Override
     public void initializeFieldsFromAuthenticator(AuthenticatorDescription authenticator) {
         // Do nothing. We want to use our local icon and title
+        super.initializeFieldsFromAuthenticator(authenticator);
     }
 
     @Override
@@ -75,14 +81,9 @@
         kind.actionHeader = new SimpleInflater(R.string.nameLabelsGroup);
         kind.actionBody = new SimpleInflater(Nickname.NAME);
         kind.typeOverallMax = 1;
-
-
         kind.fieldList = Lists.newArrayList();
-        kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.name_given,
+        kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.nameLabelsGroup,
                 FLAGS_PERSON_NAME));
-        kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,
-                FLAGS_PERSON_NAME));
-
         return kind;
     }
 
@@ -98,18 +99,33 @@
                 context.getResources().getBoolean(R.bool.config_editor_field_order_primary);
 
         kind.fieldList = Lists.newArrayList();
-        if (!displayOrderPrimary) {
-            kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,
-                    FLAGS_PERSON_NAME));
-            kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.name_given,
-                    FLAGS_PERSON_NAME));
-        } else {
-            kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME, R.string.name_given,
-                    FLAGS_PERSON_NAME));
-            kind.fieldList.add(new EditField(StructuredName.FAMILY_NAME, R.string.name_family,
-                    FLAGS_PERSON_NAME));
-        }
+        kind.fieldList.add(new EditField(StructuredName.GIVEN_NAME,
+                R.string.nameLabelsGroup, FLAGS_PERSON_NAME));
+        return kind;
+    }
 
+    @Override
+    protected DataKind addDataKindPhone(Context context) throws DefinitionException {
+        final DataKind kind = super.addDataKindPhone(context);
+        kind.typeOverallMax = 2;
+        kind.typeColumn = Phone.TYPE;
+        kind.typeList = Lists.newArrayList();
+        kind.typeList.add(buildPhoneType(Phone.TYPE_MOBILE));
+        kind.typeList.add(buildPhoneType(Phone.TYPE_HOME));// This is used to save ANR records
+        kind.fieldList = Lists.newArrayList();
+        kind.fieldList.add(new EditField(Phone.NUMBER, R.string.phoneLabelsGroup, FLAGS_PHONE));
+
+        return kind;
+    }
+
+    @Override
+    protected DataKind addDataKindEmail(Context context) throws DefinitionException {
+        final DataKind kind = super.addDataKindEmail(context);
+
+        kind.typeOverallMax = 1;
+        kind.typeList =  Collections.emptyList();
+        kind.fieldList = Lists.newArrayList();
+        kind.fieldList.add(new EditField(Email.ADDRESS, R.string.emailLabelsGroup, FLAGS_EMAIL));
         return kind;
     }
 
@@ -118,7 +134,7 @@
         // Use the "SIM" type label for the name as well because on OEM phones the "name" is
         // not always user-friendly
         return new AccountInfo(
-                new AccountDisplayInfo(account, getDisplayLabel(context), getDisplayLabel(context),
+                new AccountDisplayInfo(account, account.name, getDisplayLabel(context),
                         getDisplayIcon(context), true), this);
     }
 }
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 43ade96..b8ccd11 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2319,7 +2319,6 @@
             ContactDisplayUtils.configureStarredMenuItem(starredMenuItem,
                     mContactData.isDirectoryEntry(), mContactData.isUserProfile(),
                     mContactData.getStarred());
-
             // Configure edit MenuItem
             final MenuItem editMenuItem = menu.findItem(R.id.menu_edit);
             editMenuItem.setVisible(true);
diff --git a/src/com/android/contacts/util/ImageViewDrawableSetter.java b/src/com/android/contacts/util/ImageViewDrawableSetter.java
index b90cf1f..a197a32 100644
--- a/src/com/android/contacts/util/ImageViewDrawableSetter.java
+++ b/src/com/android/contacts/util/ImageViewDrawableSetter.java
@@ -30,7 +30,6 @@
 import com.android.contacts.ContactPhotoManager.DefaultImageRequest;
 import com.android.contacts.lettertiles.LetterTileDrawable;
 import com.android.contacts.model.Contact;
-
 import java.util.Arrays;
 
 /**
diff --git a/src/com/android/contacts/util/ImplicitIntentsUtil.java b/src/com/android/contacts/util/ImplicitIntentsUtil.java
old mode 100644
new mode 100755
index a1ab896..3a61b37
--- a/src/com/android/contacts/util/ImplicitIntentsUtil.java
+++ b/src/com/android/contacts/util/ImplicitIntentsUtil.java
@@ -23,6 +23,7 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.ComponentName;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.ContactsContract;
@@ -156,6 +157,19 @@
         return intent;
     }
 
+    /**
+     * Returns an Intent to manage SIM contacts.
+     */
+    public static Intent getIntentForSimContactsManagement() {
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.addCategory(Intent.CATEGORY_LAUNCHER);
+        ComponentName cn = new ComponentName("com.qualcomm.qti.simcontacts",
+                "com.qualcomm.qti.simcontacts.activities.SimCardsSelectionActivity");
+        intent.setComponent(cn);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return intent;
+    }
+
     public static Intent getIntentForQuickContactLauncherShortcut(Context context, Uri contactUri) {
         final Intent intent = composeQuickContactIntent(context, contactUri,
                 QuickContact.MODE_LARGE, ScreenType.UNKNOWN);
@@ -178,6 +192,12 @@
         return intent;
     }
 
+    public static boolean checkIntentIfExists(Context context, Intent intent){
+        List<ResolveInfo> list = context.getPackageManager().queryIntentActivities(intent,
+                PackageManager.GET_ACTIVITIES);
+        return list != null && list.size() > 0;
+    }
+
     /**
      * Returns a copy of {@param intent} with a class name set, if a class inside this app
      * has a corresponding intent filter.
diff --git a/src/com/android/contacts/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
index 66308c6..0b96ea1 100644
--- a/src/com/android/contacts/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -209,7 +209,7 @@
             mService.updateMediaScanner(request.destUri.getPath());
 
             successful = true;
-            final String filename = ExportVCardActivity.getOpenableUriDisplayName(mService, uri);
+            final String filename = request.displayName;
             // If it is a local file (i.e. not a file from Drive), we need to allow user to share
             // the file by pressing the notification; otherwise, it would be a file in Drive, we
             // don't need to enable this action in notification since the file is already uploaded.
diff --git a/src/com/android/contacts/vcard/ExportRequest.java b/src/com/android/contacts/vcard/ExportRequest.java
index 65e395e..654f65b 100644
--- a/src/com/android/contacts/vcard/ExportRequest.java
+++ b/src/com/android/contacts/vcard/ExportRequest.java
@@ -24,12 +24,19 @@
      */
     public final String exportType;
 
+    public final String displayName;
+
     public ExportRequest(Uri destUri) {
         this(destUri, null);
     }
 
     public ExportRequest(Uri destUri, String exportType) {
+        this(destUri, exportType, null);
+    }
+
+    public ExportRequest(Uri destUri, String exportType, String displayName) {
         this.destUri = destUri;
         this.exportType = exportType;
+        this.displayName = displayName;
     }
 }
diff --git a/src/com/android/contacts/vcard/ExportVCardActivity.java b/src/com/android/contacts/vcard/ExportVCardActivity.java
index 690f207..87a1eb1 100644
--- a/src/com/android/contacts/vcard/ExportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ExportVCardActivity.java
@@ -136,7 +136,8 @@
                     data != null && data.getData() != null) {
                 final Uri targetFileName = data.getData();
                 if (DEBUG) Log.d(LOG_TAG, "exporting to " + targetFileName);
-                final ExportRequest request = new ExportRequest(targetFileName);
+                final String displayName = getOpenableUriDisplayName(this, targetFileName);
+                final ExportRequest request = new ExportRequest(targetFileName, null, displayName);
                 // The connection object will call finish().
                 mService.handleExportRequest(request, new NotificationImportExportListener(
                         ExportVCardActivity.this));
diff --git a/src/com/android/contacts/vcard/ImportVCardActivity.java b/src/com/android/contacts/vcard/ImportVCardActivity.java
old mode 100644
new mode 100755
index 38367c4..81ff3bb
--- a/src/com/android/contacts/vcard/ImportVCardActivity.java
+++ b/src/com/android/contacts/vcard/ImportVCardActivity.java
@@ -598,6 +598,8 @@
 
         if (!TextUtils.isEmpty(accountName) && !TextUtils.isEmpty(accountType)) {
             mAccount = new AccountWithDataSet(accountName, accountType, dataSet);
+        } if (accountName == null && accountType == null && dataSet == null){
+            mAccount = AccountWithDataSet.getNullAccount();
         } else {
             final AccountTypeManager accountTypes = AccountTypeManager.getInstance(this);
             final List<AccountWithDataSet> accountList = accountTypes.blockForWritableAccounts();
diff --git a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
index 521a610..7fb5d1d 100644
--- a/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
+++ b/src/com/android/contacts/vcard/ImportVCardDialogFragment.java
@@ -57,6 +57,7 @@
 
         final ImportVCardDialogFragment dialog = new ImportVCardDialogFragment();
         dialog.setArguments(args);
+        dialog.setCancelable(false);
         dialog.show(activity.getFragmentManager(), TAG);
     }
 
diff --git a/src/com/android/contacts/vcard/NotificationImportExportListener.java b/src/com/android/contacts/vcard/NotificationImportExportListener.java
index efd6861..3b4dc5e 100644
--- a/src/com/android/contacts/vcard/NotificationImportExportListener.java
+++ b/src/com/android/contacts/vcard/NotificationImportExportListener.java
@@ -160,8 +160,7 @@
 
     @Override
     public Notification onExportProcessed(ExportRequest request, int jobId) {
-        final String displayName = ExportVCardActivity.getOpenableUriDisplayName(mContext,
-                request.destUri);
+        final String displayName = request.displayName;
         final String message = mContext.getString(R.string.contacts_export_will_start_message);
 
         mHandler.obtainMessage(0, message).sendToTarget();
diff --git a/src/com/android/contacts/vcard/ShareVCardActivity.java b/src/com/android/contacts/vcard/ShareVCardActivity.java
index 5873b7f..7e86ce1 100644
--- a/src/com/android/contacts/vcard/ShareVCardActivity.java
+++ b/src/com/android/contacts/vcard/ShareVCardActivity.java
@@ -60,7 +60,7 @@
                 getString(R.string.contacts_file_provider_authority), file);
         if (DEBUG) Log.d(LOG_TAG, "exporting to " + contentUri);
 
-        final ExportRequest request = new ExportRequest(contentUri);
+        final ExportRequest request = new ExportRequest(contentUri, null, file.getName());
         // The connection object will call finish().
         mService.handleExportRequest(request, new NotificationImportExportListener(
                 ShareVCardActivity.this));