resolve merge conflicts of a75206b to master

Test: built Contacts app
Change-Id: Id40b4b4eba95bd7fc5ea3d024dede169bad1d460
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5bdf99d..404b6a2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.contacts"
-    android:versionCode="10700"
-    android:versionName="1.7.0">
+    android:versionCode="20000"
+    android:versionName="2.0.0">
 
     <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />
 
diff --git a/res/layout/contacts_drawer_activity.xml b/res/layout/contacts_drawer_activity.xml
index 0e77058..814109f 100644
--- a/res/layout/contacts_drawer_activity.xml
+++ b/res/layout/contacts_drawer_activity.xml
@@ -53,4 +53,4 @@
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/activity_main_drawer"/>
 
-</android.support.v4.widget.DrawerLayout>
\ No newline at end of file
+</android.support.v4.widget.DrawerLayout>
diff --git a/res/layout/sim_import_list_item.xml b/res/layout/sim_import_list_item.xml
index 86f427e..c039570 100644
--- a/res/layout/sim_import_list_item.xml
+++ b/res/layout/sim_import_list_item.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="?android:listPreferredItemHeight"
     android:checkMark="?android:listChoiceIndicatorMultiple"
-    android:duplicateParentState="true"
     android:gravity="center_vertical"
     android:paddingEnd="@dimen/activity_horizontal_margin"
     android:paddingStart="@dimen/activity_horizontal_margin"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 96ca275..5816f7a 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Skep etiket"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Hernoem etiket"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Etiketnaam"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Etiketnaam"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Stemklets"</string>
     <string name="video_chat" msgid="1872255818640336072">"Videoklets"</string>
     <string name="connections" msgid="8098440723172028350">"Skakelpunte"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 1fa6a40..146536e 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -21,7 +21,7 @@
     <string name="shortcutContact" msgid="749243779392912958">"እውቅያ"</string>
     <string name="shortcutDialContact" msgid="746622101599186779">"ቀጥታ ደውል"</string>
     <string name="shortcutMessageContact" msgid="2460337253595976198">"ቀጥታ መልዕክት"</string>
-    <string name="shortcutActivityTitle" msgid="6642877210643565436">"የዕውቂያአቋራጭ  ምረጥ"</string>
+    <string name="shortcutActivityTitle" msgid="6642877210643565436">"የዕውቂያ አቋራጭ ምረጥ"</string>
     <string name="callShortcutActivityTitle" msgid="6065749861423648991">"ለመደወል ቁጥር ምረጥ"</string>
     <string name="messageShortcutActivityTitle" msgid="3084542316620335911">"መልዕክትለመላክ ቁጥር ምረጥ"</string>
     <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"ወደ ዕውቂያ አክል"</string>
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"መሰየሚያ ይፍጠሩ"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"መሰየሚያውን ዳግም ሰይም"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"የመሰየሚያው ስም"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"የመሰየሚያው ስም"</string>
     <string name="audio_chat" msgid="2535716629358298691">"የድምፅ ውይይት"</string>
     <string name="video_chat" msgid="1872255818640336072">"የቪዲዮ ውይይት"</string>
     <string name="connections" msgid="8098440723172028350">"ተያያዦች"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml
index cef25a3..a3f04d2 100644
--- a/res/values-az-rAZ/strings.xml
+++ b/res/values-az-rAZ/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Etiket yaradın"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Etiketin adını dəyişin"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Etiket adı"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Etiket adı"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Səsli çat"</string>
     <string name="video_chat" msgid="1872255818640336072">"Video çat"</string>
     <string name="connections" msgid="8098440723172028350">"Əlaqələr"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 170fb26..cb5c698 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -40,7 +40,7 @@
     <string name="menu_editContact" msgid="9042415603857662633">"Izmeni"</string>
     <string name="menu_deleteContact" msgid="6788644058868189393">"Izbriši"</string>
     <string name="menu_change_photo" msgid="7769177631511496210">"Promeni sliku"</string>
-    <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Postavi na Početni ekran"</string>
+    <string name="menu_create_contact_shortcut" msgid="1663022219127343858">"Napravi prečicu"</string>
     <string name="menu_call" msgid="3992595586042260618">"Pozovi kontakt"</string>
     <string name="menu_sendSMS" msgid="5535886767547006515">"Pošalji SMS kontaktu"</string>
     <string name="menu_splitAggregate" msgid="2627252205317945563">"Razdvoji"</string>
@@ -59,15 +59,21 @@
     <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"Sačuvaj i razdvoji"</string>
     <string name="joinConfirmation" msgid="8262614843581924365">"Želite li da sačuvate promene koje ste već obavili i objedinite ovaj kontakt sa izabranim kontaktom?"</string>
     <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Sačuvaj i objedini"</string>
+    <string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Povezuje se"</string>
+    <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Opoziva se veza"</string>
     <string name="menu_joinAggregate" msgid="3599512127797513606">"Objedini"</string>
+    <string name="menu_linkedContacts" msgid="400444389718855621">"Prikaži objedinjene kontakte"</string>
     <string name="menu_save" msgid="1727844363591825909">"Sačuvaj"</string>
     <string name="titleJoinContactDataWith" msgid="6825255752748313944">"Objedinite kontakte"</string>
     <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Izaberite kontakt koji želite da objedinite sa kontaktom <xliff:g id="NAME">%s</xliff:g>:"</string>
     <string name="showAllContactsJoinItem" msgid="2189695051430392383">"Prikaži sve kontakte"</string>
     <string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Predloženi kontakti"</string>
     <string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Svi kontakti"</string>
+    <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"Kontakti su povezani za <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="contactsJoinedMessage" msgid="3343535986195643136">"Kontakti su objedinjeni"</string>
-    <string name="contact_deleted_named_toast" msgid="6558941164987421174">"<xliff:g id="NAME">%s</xliff:g> je izbrisan/a"</string>
+    <string name="contacts_deleted_one_named_toast" msgid="2252551736301363193">"<xliff:g id="NAME">%1$s</xliff:g> je izbrisan/a"</string>
+    <string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"<xliff:g id="NAME_0">%1$s</xliff:g> i <xliff:g id="NAME_1">%2$s</xliff:g> su izbrisani"</string>
+    <string name="contacts_deleted_many_named_toast" msgid="7731565342428031249">"<xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>… su izbrisani"</string>
     <plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
       <item quantity="one">Kontakti su izbrisani</item>
       <item quantity="few">Kontakti su izbrisani</item>
@@ -86,10 +92,11 @@
     <string name="title_from_google" msgid="4664084747121207202">"Sa Google-a"</string>
     <string name="title_from_other_accounts" msgid="8307885412426754288">"Sa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="menu_set_ring_tone" msgid="8728345772068064946">"Podesi melodiju zvona"</string>
-    <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Svi pozivi u govornu poštu"</string>
-    <string name="readOnlyContactWarning" msgid="5526727661978307833">"Kontakti sa naloga koji su samo za čitanje ne mogu da se izbrišu, ali mogu da se sakriju."</string>
-    <string name="readOnlyContactWarning_positive_button" msgid="6541862607313811926">"Sakrij"</string>
-    <string name="readOnlyContactDeleteConfirmation" msgid="8782086424739664753">"Kontakt koji ste izabrali za brisanje sadrži detalje sa više naloga. Detalji sa naloga koji su samo za čitanje će biti skriveni, ali ne i izbrisani."</string>
+    <string name="menu_redirect_calls_to_vm" msgid="83331924006712755">"Usmeri na govornu poštu"</string>
+    <string name="menu_unredirect_calls_to_vm" msgid="8725542534701811737">"Ne usmeravaj na govornu poštu"</string>
+    <string name="readOnlyContactWarning" msgid="7514475664695089411">"Ovaj kontakt je samo za čitanje. Ne možete da ga izbrišete, ali možete da ga sakrijete."</string>
+    <string name="readOnlyContactWarning_positive_button" msgid="8914797212167683673">"Sakrij kontakt"</string>
+    <string name="readOnlyContactDeleteConfirmation" msgid="4717023505914239809">"Nalozi koji su samo za čitanje u okviru ovog kontakta će biti skriveni, a ne izbrisani."</string>
     <string name="single_delete_confirmation" msgid="3106905986948679720">"Želite li da izbrišete ovaj kontakt?"</string>
     <string name="batch_delete_confirmation" msgid="3984346060324014108">"Želite li da izbrišete izabrane kontakte?"</string>
     <string name="batch_delete_read_only_contact_confirmation" msgid="8411117621035639964">"Kontakti sa naloga koji su samo za čitanje ne mogu da se izbrišu, ali mogu da se sakriju."</string>
@@ -133,6 +140,12 @@
     <string name="groupMembersAddedToast" msgid="4824834898718972768">"Dodato je u oznaku"</string>
     <string name="groupSavedErrorToast" msgid="2355891714292740162">"Čuvanje promena oznake nije uspelo"</string>
     <string name="groupExistsErrorMessage" msgid="5196811283836946189">"Ta oznaka već postoji"</string>
+    <string name="groupSomeContactsNoEmailsToast" msgid="8211161470235548732">"Neki kontakti nemaju imejl adresu."</string>
+    <string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Neki kontakti nemaju broj telefona."</string>
+    <string name="menu_sendEmailOption" msgid="5978319931321657780">"Pošalji imejl"</string>
+    <string name="menu_sendMessageOption" msgid="8850168125274916426">"Pošalji poruku"</string>
+    <string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Izaberite kontakte"</string>
+    <string name="send_to_selection" msgid="2251339182881603540">"Pošalji"</string>
     <plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> kontakt sa brojem telefona</item>
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> kontakta sa brojevima telefona</item>
@@ -174,7 +187,8 @@
     <string name="dialog_new_group_account" msgid="3451312333591556651">"Izaberite nalog"</string>
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Napravite oznaku"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Preimenujte oznaku"</string>
-    <string name="group_name_dialog_hint" msgid="5122118085780669813">"Oznaka"</string>
+    <string name="group_name_dialog_hint" msgid="7624523157537700160">"Ime oznake"</string>
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Ime oznake"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Audio ćaskanje"</string>
     <string name="video_chat" msgid="1872255818640336072">"Video ćaskanje"</string>
     <string name="connections" msgid="8098440723172028350">"Veze"</string>
@@ -189,7 +203,6 @@
     <string name="take_new_photo" msgid="7341354729436576304">"Slikaj novu sliku"</string>
     <string name="pick_photo" msgid="2129509985223564942">"Izaberi sliku"</string>
     <string name="pick_new_photo" msgid="9122450996263688237">"Izaberite novu sliku"</string>
-    <string name="upgrade_in_progress" msgid="474511436863451061">"Kontakt lista se ažurira."</string>
     <string name="search_results_searching" msgid="3984833028938569930">"Pretražuje se..."</string>
     <string name="menu_display_selected" msgid="6470001164297969034">"Prikaži izabrano"</string>
     <string name="menu_display_all" msgid="8887488642609786198">"Prikaži sve"</string>
@@ -202,6 +215,8 @@
     <string name="change_photo" msgid="8530597935483526383">"Promeni"</string>
     <string name="description_star" msgid="2605854427360036550">"omiljeno"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Izmeni kontakt"</string>
+    <string name="cancel_button_content_description" msgid="1288652456274531846">"Otkaži"</string>
+    <string name="back_arrow_content_description" msgid="4355362760545735065">"Nazad"</string>
     <string name="action_menu_back_from_edit_select" msgid="6435476408621731420">"zatvorite"</string>
     <string name="aggregation_suggestion_join_dialog_message" msgid="6786192560870357912">"Želite li da aktuelni kontakt objedinite sa izabranim kontaktom?"</string>
     <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Želite li da prebacite na uređivanje izabranog kontakta? Biće kopirane informacije koje ste uneli do sada."</string>
@@ -246,12 +261,17 @@
     <string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Odvojte 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="3087691056345099310">"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="8565761674283473549">"Izaberite podrazumevani nalog za nove kontakte:"</string>
-    <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Dodaj novi kontakt"</string>
+    <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Novi kontakt"</string>
     <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Izmeni kontakt"</string>
+    <string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Samo pregled"</string>
+    <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Izaberite kontakt za izmenu"</string>
+    <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Objedinjeni kontakti"</string>
+    <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Dodaj"</string>
+    <string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Razdvoj"</string>
     <string name="add_account" msgid="8201790677994503186">"Dodaj nalog"</string>
     <string name="add_new_account" msgid="5748627740680940264">"Dodaj novi nalog"</string>
     <string name="menu_export_database" msgid="2659719297530170820">"Izvezi datoteke baze podataka"</string>
-    <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"dodavanje novog kontakta"</string>
+    <string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Napravi novi kontakt"</string>
     <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Prikaži više"</string>
     <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Prikaži manje"</string>
     <string name="recent_card_title" msgid="8982782042698001695">"Nedavno"</string>
@@ -287,10 +307,12 @@
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Vi: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
     <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts radi bolje kad unesete Hangouts identifikator osobe u polje za imejl adresu ili broj telefona."</string>
     <string name="editor_more_fields" msgid="3630987771304393421">"Još polja"</string>
-    <string name="editor_change_photo_content_description" msgid="754100561085306263">"Promenite sliku"</string>
+    <string name="editor_change_photo_content_description" msgid="820879708069864340">"Promenite sliku kontakta"</string>
+    <string name="editor_add_photo_content_description" msgid="4194479313465418120">"Dodajte sliku kontakta"</string>
+    <string name="editor_contact_photo_content_description" msgid="8571975622926162369">"Slika kontakta"</string>
     <string name="editor_failed_to_load" msgid="1623639078580475818">"Otvaranje uređivača nije uspelo."</string>
     <string name="editor_account_selector_title" msgid="4426337993307015833">"Čuva se na"</string>
-    <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Gledate"</string>
+    <string name="editor_account_selector_read_only_title" msgid="4137969650184457126">"Nije moguće izmeniti kontakt informacije sa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="editor_account_selector_description" msgid="3324358600570627740">"Trenutno se čuva na <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. Dodirnite dvaput da biste izabrali drugi nalog."</string>
     <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
       <item quantity="one">Objedinjeni kontakti (<xliff:g id="COUNT">%d</xliff:g>)</item>
@@ -330,18 +352,18 @@
     <string name="photo_view_description_checked" msgid="3906597168607472795">"Slika sa <xliff:g id="ACCOUNT_TYPE">%s </xliff:g> naloga <xliff:g id="USER_NAME">%s </xliff:g> je označena"</string>
     <string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Slika sa nepoznatog naloga nije označena"</string>
     <string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Slika sa nepoznatog naloga je označena"</string>
-    <string name="locale_change_in_progress" msgid="6975676844194755501">"Lista kontakata se ažurira da bi se primenila promena jezika.\n\nSačekajte…"</string>
-    <string name="menu_duplicates" msgid="4129802988372197257">"Duplikati"</string>
+    <string name="menu_assistant" msgid="5760693735722052454">"Predlozi"</string>
+    <string name="menu_assistant_new_badge" msgid="3132884821616980034">"Novo"</string>
     <string name="navigation_drawer_open" msgid="1126498472143250642">"Otvori fioku za navigaciju"</string>
     <string name="navigation_drawer_close" msgid="4137416137011817930">"Zatvori fioku za navigaciju"</string>
     <string name="menu_title_groups" msgid="8356921831150278868">"Oznake"</string>
     <string name="menu_title_filters" msgid="8210922220185114527">"Nalozi"</string>
     <string name="permission_explanation_header" msgid="5739405825039695327">"Pregledajte istoriju zajedno"</string>
-    <string name="permission_explanation_subheader_calendar_and_SMS" msgid="630115334220569184">"Događaji i poruke"</string>
+    <string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"Događaji i poruke"</string>
     <string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Događaji"</string>
     <string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Poruke"</string>
-    <string name="hamburger_feature_highlight_header" msgid="7442308698936786415">"Organizujte listu"</string>
-    <string name="hamburger_feature_highlight_body" msgid="6268711111318172098">"Uklonite duplikate i grupišite kontakte prema oznaci"</string>
+    <string name="hamburger_feature_highlight_header" msgid="5762679188565585072">"Predlozi"</string>
+    <string name="hamburger_feature_highlight_body" msgid="4403398269286898733">"Neka vam kontakti budu organizovani i korisni"</string>
     <string name="undo" msgid="1425165101664071422">"Opozovi"</string>
     <string name="call_custom" msgid="6385303130912713318">"Pozovi <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
     <string name="call_home" msgid="1990519474420545392">"Pozovi kućni telefon"</string>
@@ -463,9 +485,9 @@
     <string name="chat_jabber" msgid="7561444230307829609">"Započni ćaskanje preko Jabber-a"</string>
     <string name="chat" msgid="9025361898797412245">"Ćaskanje"</string>
     <string name="description_minus_button" msgid="6908099247930477551">"izbriši"</string>
-    <string name="expand_name_fields_description" msgid="6883935911480726652">"Proširite polja za ime"</string>
+    <string name="expand_name_fields_description" msgid="6948274252874552543">"Prikažite još polja za ime"</string>
     <string name="collapse_name_fields_description" msgid="4757877385895561556">"Skupite polja za ime"</string>
-    <string name="expand_phonetic_name_fields_description" msgid="3865726859582581741">"Proširite polja za fonetsko ime"</string>
+    <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"Prikažite još polja za fonetsko ime"</string>
     <string name="collapse_phonetic_name_fields_description" msgid="9102249481855019452">"Skupite polja za fonetsko ime"</string>
     <string name="expand_fields_description" msgid="8129294181216760037">"Proširite"</string>
     <string name="collapse_fields_description" msgid="1884143625854637874">"Skupite"</string>
@@ -486,10 +508,21 @@
     <string name="menu_doNotSave" msgid="58593876893538465">"Otkaži"</string>
     <string name="listCustomView" msgid="1840624396582117590">"Prilagođeni prikaz"</string>
     <string name="dialog_new_contact_account" msgid="4969619718062454756">"Sačuvajte uvezene kontakte na:"</string>
-    <string name="import_from_sim" msgid="3859272228033941659">"Uvezi sa SIM kartice"</string>
-    <string name="import_from_sim_summary" msgid="5815105584445743740">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="880612418352086012">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="5304572242183878086">"Uvezi iz .vcf datoteke"</string>
+    <string name="import_from_sim" msgid="6912071635295799131">"Sa SIM kartice"</string>
+    <string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"Sa SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
+    <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
+      <item quantity="one">%1$d kontakt</item>
+      <item quantity="few">%1$d kontakta</item>
+      <item quantity="other">%1$d kontakata</item>
+    </plurals>
+    <plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
+      <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> kontakt • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+      <item quantity="few"><xliff:g id="COUNT_2">^1</xliff:g> kontakta • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> kontakata • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+    </plurals>
+    <string name="import_from_vcf_file" product="default" msgid="8662528435646418203">"Iz .vcf datoteke"</string>
+    <string name="nothing_to_import_message" msgid="1651921906873335656">"Nema ničega za uvoz"</string>
+    <string name="import_from_vcf_file_confirmation_message" product="default" msgid="967723361108008345">"Želite da uvezete kontakte iz vCard datoteke?"</string>
     <string name="cancel_import_confirmation_message" msgid="3929951040347726757">"Želite li da otkažete uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Želite li da otkažete izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Nije moguće otkazati vCard uvoz/izvoz"</string>
@@ -546,8 +579,6 @@
     <string name="display_options_view_family_name_first" msgid="956445100777296467">"Prvo prezime"</string>
     <string name="settings_accounts" msgid="350219740670774576">"Nalozi"</string>
     <string name="default_editor_account" msgid="699591683362420991">"Podrazumevani nalog za nove kontakte"</string>
-    <string name="sync_contact_metadata_title" msgid="6957956139306960211">"Sinhronizuj metapodatke kontakata [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="6192335951588820553">"Sinhronizujte metapodatke kontakata"</string>
     <string name="settings_my_info_title" msgid="1534272456405343119">"Moje informacije"</string>
     <string name="set_up_profile" msgid="7370213843590143771">"Podesite profil"</string>
     <string name="setting_about" msgid="7014388749752042863">"O Kontaktima"</string>
@@ -557,10 +588,9 @@
     <string name="share_contacts" msgid="8109287987498711664">"Deli sve kontakte"</string>
     <string name="share_contacts_failure" msgid="1216431977330560559">"Deljenje kontakata nije uspelo."</string>
     <string name="dialog_export" msgid="1628001095187741417">"Izvezite kontakte"</string>
-    <string name="dialog_import" msgid="2431698729761448759">"Uvoz kontakata"</string>
+    <string name="dialog_import" msgid="2423592905927819672">"Uvezite kontakte"</string>
     <string name="share_error" msgid="948429331673358107">"Ovaj kontakt ne može da se deli."</string>
     <string name="no_contact_to_share" msgid="1276397530378323033">"Nema kontakata za deljenje."</string>
-    <string name="menu_search" msgid="9147752853603483719">"Pretraga"</string>
     <string name="menu_contacts_filter" msgid="2165153460860262501">"Kontakti za prikaz"</string>
     <string name="activity_title_contacts_filter" msgid="8275542497615516969">"Kontakti za prikaz"</string>
     <string name="custom_list_filter" msgid="2105275443109077687">"Definišite prilagođeni prikaz"</string>
@@ -609,4 +639,25 @@
     <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> s <xliff:g id="MINUTES_1">%s</xliff:g> min <xliff:g id="SECONDS">%s</xliff:g> sek"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ova prečica je onemogućena"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt je uklonjen"</string>
+    <string name="sim_import_button_text" msgid="4270841592496619317">"Uvezi"</string>
+    <string name="sim_import_title_none_selected" msgid="6910517331401970693">"Izaberite kontakte"</string>
+    <string name="sim_import_empty_message" msgid="7743815244380189651">"Nema kontakata na SIM kartici"</string>
+    <string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"Kontakt je već na listi"</string>
+    <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
+      <item quantity="one">Uvezen je <xliff:g id="COUNT">%d</xliff:g> kontakt sa SIM kartice</item>
+      <item quantity="few">Uvezena su <xliff:g id="COUNT">%d</xliff:g> kontakta sa SIM kartice</item>
+      <item quantity="other">Uvezeno je <xliff:g id="COUNT">%d</xliff:g> kontakata sa SIM kartice</item>
+    </plurals>
+    <string name="sim_import_failed_toast" msgid="5559267299793622705">"Uvoz kontakata sa SIM kartice nije uspeo"</string>
+    <string name="sim_import_title" msgid="2511154832820812822">"Uvezite sa SIM-a"</string>
+    <string name="sim_import_cancel_content_description" msgid="1619832410253424452">"Otkažite"</string>
+    <string name="auto_sync_off" msgid="2180147284456026587">"Automatska sinhronizacija je isključena. Dodirnite da biste je uključili."</string>
+    <string name="dismiss_sync_alert" msgid="8941131776605093596">"Odbacite"</string>
+    <string name="account_sync_off" msgid="7646143254066243924">"Sinhronizacija naloga je isključena. Dodirnite da biste je uključili."</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Želite da uključite automatsku sinhronizaciju?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Na vebu i uređajima će se redovno ažurirati promene koje unosite u svim aplikacijama i na svim nalozima, a ne samo u Google kontaktima."</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Uključi"</string>
+    <string name="connection_error_message" msgid="7046408921529247089">"Veza nije uspostavljena"</string>
+    <string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
+    <string name="show_more_content_description" msgid="4277410425912984722">"Prikaži više"</string>
 </resources>
diff --git a/res/values-be-rBY/strings.xml b/res/values-be-rBY/strings.xml
index c63f68f..d71867c 100644
--- a/res/values-be-rBY/strings.xml
+++ b/res/values-be-rBY/strings.xml
@@ -40,7 +40,7 @@
     <string name="menu_editContact" msgid="9042415603857662633">"Рэдагаваць"</string>
     <string name="menu_deleteContact" msgid="6788644058868189393">"Выдаліць"</string>
     <string name="menu_change_photo" msgid="7769177631511496210">"Змяніць фота"</string>
-    <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Размясціць на галоўным экране"</string>
+    <string name="menu_create_contact_shortcut" msgid="1663022219127343858">"Стварыць ярлык"</string>
     <string name="menu_call" msgid="3992595586042260618">"Выклікаць кантакт"</string>
     <string name="menu_sendSMS" msgid="5535886767547006515">"Паведамленне кантакту"</string>
     <string name="menu_splitAggregate" msgid="2627252205317945563">"Выдаліць сувязь"</string>
@@ -59,15 +59,21 @@
     <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"Захаваць і развязаць"</string>
     <string name="joinConfirmation" msgid="8262614843581924365">"Жадаеце захаваць змяненні, якія вы ўжо зрабілі, і спасылку на выбраны кантакт?"</string>
     <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Захаваць і звязаць"</string>
+    <string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Ідзе звязванне"</string>
+    <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Ідзе выдаленне сувязі"</string>
     <string name="menu_joinAggregate" msgid="3599512127797513606">"Звязаць"</string>
+    <string name="menu_linkedContacts" msgid="400444389718855621">"Прагледзець звязаныя кантакты"</string>
     <string name="menu_save" msgid="1727844363591825909">"Захаваць"</string>
     <string name="titleJoinContactDataWith" msgid="6825255752748313944">"Звязаць кантакты"</string>
     <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Выберыце кантакт, які хочаце звязаць з iмем <xliff:g id="NAME">%s</xliff:g>:"</string>
     <string name="showAllContactsJoinItem" msgid="2189695051430392383">"Паказаць усе кантакты"</string>
     <string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Прапанаваныя кантакты"</string>
     <string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Усе кантакты"</string>
+    <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"Звязаны <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="contactsJoinedMessage" msgid="3343535986195643136">"Кантакты звязаны"</string>
-    <string name="contact_deleted_named_toast" msgid="6558941164987421174">"Карыстальнік <xliff:g id="NAME">%s</xliff:g> выдалены"</string>
+    <string name="contacts_deleted_one_named_toast" msgid="2252551736301363193">"Карыстальнік <xliff:g id="NAME">%1$s</xliff:g> выдалены"</string>
+    <string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Карыстальнікі <xliff:g id="NAME_0">%1$s</xliff:g> і <xliff:g id="NAME_1">%2$s</xliff:g> выдалены"</string>
+    <string name="contacts_deleted_many_named_toast" msgid="7731565342428031249">"Карыстальнікі <xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>... выдалены"</string>
     <plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
       <item quantity="one">Кантакты выдалены</item>
       <item quantity="few">Кантакты выдалены</item>
@@ -89,10 +95,11 @@
     <string name="title_from_google" msgid="4664084747121207202">"З Google"</string>
     <string name="title_from_other_accounts" msgid="8307885412426754288">"З <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="menu_set_ring_tone" msgid="8728345772068064946">"Задаць рынгтон"</string>
-    <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Усе выклікі на галасавую пошту"</string>
-    <string name="readOnlyContactWarning" msgid="5526727661978307833">"Кантакты з уліковых запісаў, даступных толькі для чытання, нельга выдаліць, але іх можна схаваць."</string>
-    <string name="readOnlyContactWarning_positive_button" msgid="6541862607313811926">"Схаваць"</string>
-    <string name="readOnlyContactDeleteConfirmation" msgid="8782086424739664753">"Кантакт на выдаленне мае інфармацыю з некалькіх уліковых запісаў. Інфармацыя з уліковых запісаў, даступных толькі для чытання, будзе схавана, а не выдалена."</string>
+    <string name="menu_redirect_calls_to_vm" msgid="83331924006712755">"Накіроўваць на галасавую пошту"</string>
+    <string name="menu_unredirect_calls_to_vm" msgid="8725542534701811737">"Адм. накірав. на галас. пошту"</string>
+    <string name="readOnlyContactWarning" msgid="7514475664695089411">"Гэты кантакт толькі для чытання. Яго немагчыма выдаліць, але вы можаце яго схаваць."</string>
+    <string name="readOnlyContactWarning_positive_button" msgid="8914797212167683673">"Схаваць кантакт"</string>
+    <string name="readOnlyContactDeleteConfirmation" msgid="4717023505914239809">"Уліковыя запісы толькі для чытання ў гэтым кантакце будуць схаваны, а не выдалены."</string>
     <string name="single_delete_confirmation" msgid="3106905986948679720">"Выдаліць гэты кантакт?"</string>
     <string name="batch_delete_confirmation" msgid="3984346060324014108">"Выдаліць выбраныя кантакты?"</string>
     <string name="batch_delete_read_only_contact_confirmation" msgid="8411117621035639964">"Кантакты з уліковых запісаў, даступных толькі для чытання, нельга выдаліць, але іх можна схаваць."</string>
@@ -136,6 +143,12 @@
     <string name="groupMembersAddedToast" msgid="4824834898718972768">"Дададзена да этыкеткі"</string>
     <string name="groupSavedErrorToast" msgid="2355891714292740162">"Не ўдалося захаваць змяненні меткі"</string>
     <string name="groupExistsErrorMessage" msgid="5196811283836946189">"Гэта пазнака ўжо існуе"</string>
+    <string name="groupSomeContactsNoEmailsToast" msgid="8211161470235548732">"Некаторыя кантакты не маюць адрасоў электр. пошты."</string>
+    <string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Некаторыя кантакты не маюць нумароў тэлефона."</string>
+    <string name="menu_sendEmailOption" msgid="5978319931321657780">"Адправіць электронны ліст"</string>
+    <string name="menu_sendMessageOption" msgid="8850168125274916426">"Адправіць паведамленне"</string>
+    <string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Выберыце кантакты"</string>
+    <string name="send_to_selection" msgid="2251339182881603540">"Адправіць"</string>
     <plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> кантакт з нумарам(і) тэлефона(ў)</item>
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> кантакты з нумарамі тэлефонаў</item>
@@ -181,7 +194,8 @@
     <string name="dialog_new_group_account" msgid="3451312333591556651">"Выбраць уліковы запіс"</string>
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Стварыць метку"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Перайменаваць метку"</string>
-    <string name="group_name_dialog_hint" msgid="5122118085780669813">"Метка"</string>
+    <string name="group_name_dialog_hint" msgid="7624523157537700160">"Назва меткі"</string>
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Назва меткі"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Галасавы чат"</string>
     <string name="video_chat" msgid="1872255818640336072">"Відэачат"</string>
     <string name="connections" msgid="8098440723172028350">"Сувязi"</string>
@@ -196,7 +210,6 @@
     <string name="take_new_photo" msgid="7341354729436576304">"Зрабiце новую фатаграфію"</string>
     <string name="pick_photo" msgid="2129509985223564942">"Выбраць фота"</string>
     <string name="pick_new_photo" msgid="9122450996263688237">"Выбраць новае фота"</string>
-    <string name="upgrade_in_progress" msgid="474511436863451061">"Спiс кантактаў абнаўляецца."</string>
     <string name="search_results_searching" msgid="3984833028938569930">"Пошук..."</string>
     <string name="menu_display_selected" msgid="6470001164297969034">"Паказаць выбраныя"</string>
     <string name="menu_display_all" msgid="8887488642609786198">"Паказаць усіх"</string>
@@ -209,6 +222,8 @@
     <string name="change_photo" msgid="8530597935483526383">"Змяніць"</string>
     <string name="description_star" msgid="2605854427360036550">"выбранае"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Рэдагаваць кантакт"</string>
+    <string name="cancel_button_content_description" msgid="1288652456274531846">"Скасаваць"</string>
+    <string name="back_arrow_content_description" msgid="4355362760545735065">"Назад"</string>
     <string name="action_menu_back_from_edit_select" msgid="6435476408621731420">"закрыць"</string>
     <string name="aggregation_suggestion_join_dialog_message" msgid="6786192560870357912">"Звязаць бягучы кантакт з выбраным кантактам?"</string>
     <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Пераключыцца ў рэжым рэдагавання выбранага кантакту? Інфармацыя, якую вы ўвялі да гэтага часу, будзе скапіявана."</string>
@@ -253,12 +268,17 @@
     <string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Знайдзіце хвілінку, каб дадаць уліковы запіс, які дазволіць стварыць рэзервовую копію вашых кантактаў у Google."</string>
     <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Новыя кантакты будуць захаваны ва ўліковы запіс <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Выбраць уліковы запіс па змаўчанні для новых кантактаў:"</string>
-    <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Дадаць новы кантакт"</string>
+    <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Стварыць новы кантакт"</string>
     <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Рэдагаваць кантакт"</string>
+    <string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Толькі прагляд"</string>
+    <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Выбраць кантакт для рэдагавання"</string>
+    <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Звязаныя кантакты"</string>
+    <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Дадаць"</string>
+    <string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Выдаліць сувязь"</string>
     <string name="add_account" msgid="8201790677994503186">"Дадаць уліковы запіс"</string>
     <string name="add_new_account" msgid="5748627740680940264">"Дадаць новы ўліковы запіс"</string>
     <string name="menu_export_database" msgid="2659719297530170820">"Экспарт базы дадзеных файлаў"</string>
-    <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"дадаць новы кантакт"</string>
+    <string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Стварыць новы кантакт"</string>
     <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Болей"</string>
     <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Паказаць менш"</string>
     <string name="recent_card_title" msgid="8982782042698001695">"Нядаўнія"</string>
@@ -294,11 +314,13 @@
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Вы: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
     <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts працуе лепш, калі вы ўводзіце ідэнтыфікатар асобы Hangouts у поле для адраса электроннай пошты ці тэлефона."</string>
     <string name="editor_more_fields" msgid="3630987771304393421">"Дадатковыя палі"</string>
-    <string name="editor_change_photo_content_description" msgid="754100561085306263">"Змяніць фота"</string>
-    <string name="editor_failed_to_load" msgid="1623639078580475818">"Збой адкрыцця рэдактара."</string>
+    <string name="editor_change_photo_content_description" msgid="820879708069864340">"Змяніць фота кантакту"</string>
+    <string name="editor_add_photo_content_description" msgid="4194479313465418120">"Дадаць фота кантакту"</string>
+    <string name="editor_contact_photo_content_description" msgid="8571975622926162369">"Фота кантакту"</string>
+    <string name="editor_failed_to_load" msgid="1623639078580475818">"Збой пры адкрыванні рэдактара."</string>
     <string name="editor_account_selector_title" msgid="4426337993307015833">"Захоўваць у:"</string>
-    <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Прагляд"</string>
-    <string name="editor_account_selector_description" msgid="3324358600570627740">"Зараз захоўваецца ва ўліковы запіс <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. Краніце двойчы, каб выбраць іншы ўліковы запіс."</string>
+    <string name="editor_account_selector_read_only_title" msgid="4137969650184457126">"Кантактную інфармацыю з <xliff:g id="ACCOUNT">%s</xliff:g> немагчыма рэдагаваць"</string>
+    <string name="editor_account_selector_description" msgid="3324358600570627740">"Зараз захоўваецца ва ўліковы запіс <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. Дакраніцеся двойчы, каб выбраць іншы ўліковы запіс."</string>
     <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
       <item quantity="one">Звязаныя кантакты (<xliff:g id="COUNT">%d</xliff:g>)</item>
       <item quantity="few">Звязаныя кантакты (<xliff:g id="COUNT">%d</xliff:g>)</item>
@@ -341,18 +363,18 @@
     <string name="photo_view_description_checked" msgid="3906597168607472795">"Фота з уліковага запісу <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>пазначана"</string>
     <string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Фота з невядомага ўліковага запісу не пазначана"</string>
     <string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Пазначана фота з невядомага ўліковага запісу"</string>
-    <string name="locale_change_in_progress" msgid="6975676844194755501">"Спіс кантактаў абнаўляецца, каб адлюстраваць змяненне мовы.\n\nПачакайце..."</string>
-    <string name="menu_duplicates" msgid="4129802988372197257">"Дублікаты"</string>
+    <string name="menu_assistant" msgid="5760693735722052454">"Прапановы"</string>
+    <string name="menu_assistant_new_badge" msgid="3132884821616980034">"Новыя"</string>
     <string name="navigation_drawer_open" msgid="1126498472143250642">"Адкрыць высоўнае меню навігацыі"</string>
     <string name="navigation_drawer_close" msgid="4137416137011817930">"Закрыць высоўнае меню навігацыi"</string>
     <string name="menu_title_groups" msgid="8356921831150278868">"Меткі"</string>
     <string name="menu_title_filters" msgid="8210922220185114527">"Уліковыя запісы"</string>
     <string name="permission_explanation_header" msgid="5739405825039695327">"Праглядайце сваю гісторыю разам"</string>
-    <string name="permission_explanation_subheader_calendar_and_SMS" msgid="630115334220569184">"Падзеі і паведамленні"</string>
+    <string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"Падзеі і паведамленні"</string>
     <string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Падзеі"</string>
     <string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Паведамленні"</string>
-    <string name="hamburger_feature_highlight_header" msgid="7442308698936786415">"Арганізуйце свой спіс"</string>
-    <string name="hamburger_feature_highlight_body" msgid="6268711111318172098">"Выдаліце дублікаты і згрупуйце кантакты па метках"</string>
+    <string name="hamburger_feature_highlight_header" msgid="5762679188565585072">"Прапановы"</string>
+    <string name="hamburger_feature_highlight_body" msgid="4403398269286898733">"Упарадкуйце свае кантакты для зручнага выкарыстання"</string>
     <string name="undo" msgid="1425165101664071422">"Адрабіць"</string>
     <string name="call_custom" msgid="6385303130912713318">"Выклікаць <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
     <string name="call_home" msgid="1990519474420545392">"Патэлефанаваць на хатні нумар"</string>
@@ -474,9 +496,9 @@
     <string name="chat_jabber" msgid="7561444230307829609">"Чат у Jabber"</string>
     <string name="chat" msgid="9025361898797412245">"Чат"</string>
     <string name="description_minus_button" msgid="6908099247930477551">"выдаліць"</string>
-    <string name="expand_name_fields_description" msgid="6883935911480726652">"Разгарнуць палі імён"</string>
+    <string name="expand_name_fields_description" msgid="6948274252874552543">"Паказаць больш палёў імён"</string>
     <string name="collapse_name_fields_description" msgid="4757877385895561556">"Згарнуць палі імён"</string>
-    <string name="expand_phonetic_name_fields_description" msgid="3865726859582581741">"Разгарнуць палі вымаўлення імён"</string>
+    <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"Паказаць больш палёў вымаўлення імён"</string>
     <string name="collapse_phonetic_name_fields_description" msgid="9102249481855019452">"Згарнуць палі вымаўлення імён"</string>
     <string name="expand_fields_description" msgid="8129294181216760037">"Разгарнуць"</string>
     <string name="collapse_fields_description" msgid="1884143625854637874">"Згарнуць"</string>
@@ -497,10 +519,23 @@
     <string name="menu_doNotSave" msgid="58593876893538465">"Адмена"</string>
     <string name="listCustomView" msgid="1840624396582117590">"Карыстальніцкі выгляд"</string>
     <string name="dialog_new_contact_account" msgid="4969619718062454756">"Захаваць імпартаваныя кантакты ў:"</string>
-    <string name="import_from_sim" msgid="3859272228033941659">"Імпарт з SIM-карты"</string>
-    <string name="import_from_sim_summary" msgid="5815105584445743740">"Імпартаваць з SIM-карты <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="880612418352086012">"Імпартаваць з SIM-карты <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="5304572242183878086">"Імпартаваць з файла .vcf"</string>
+    <string name="import_from_sim" msgid="6912071635295799131">"SIM-карта"</string>
+    <string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"SIM-карта <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
+    <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
+      <item quantity="one">%1$d кантакт</item>
+      <item quantity="few">%1$d кантакты</item>
+      <item quantity="many">%1$d кантактаў</item>
+      <item quantity="other">%1$d кантакту</item>
+    </plurals>
+    <plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
+      <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> кантакт • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+      <item quantity="few"><xliff:g id="COUNT_2">^1</xliff:g> кантакты • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+      <item quantity="many"><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" product="default" msgid="8662528435646418203">"Файл .vcf"</string>
+    <string name="nothing_to_import_message" msgid="1651921906873335656">"Няма што імпартаваць"</string>
+    <string name="import_from_vcf_file_confirmation_message" product="default" msgid="967723361108008345">"Імпартаваць кантакты з vCard?"</string>
     <string name="cancel_import_confirmation_message" msgid="3929951040347726757">"Адмянiць iмпарт файла <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Адмянiць экспарт файла <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Немагчыма адмяніць імпарт/экспарт vCard"</string>
@@ -557,8 +592,6 @@
     <string name="display_options_view_family_name_first" msgid="956445100777296467">"Спачатку прозвішча"</string>
     <string name="settings_accounts" msgid="350219740670774576">"Уліковыя запісы"</string>
     <string name="default_editor_account" msgid="699591683362420991">"Стандартны ўліковы запіс для новых кантактаў"</string>
-    <string name="sync_contact_metadata_title" msgid="6957956139306960211">"Сінхранізаваць метаданыя кантактаў [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="6192335951588820553">"Сінхранізаваць метаданыя кантактаў"</string>
     <string name="settings_my_info_title" msgid="1534272456405343119">"Мая інфармацыя"</string>
     <string name="set_up_profile" msgid="7370213843590143771">"Наладзьце ваш профіль"</string>
     <string name="setting_about" msgid="7014388749752042863">"Інфармацыя аб Кантактах"</string>
@@ -568,10 +601,9 @@
     <string name="share_contacts" msgid="8109287987498711664">"Абагуліць усе кантакты"</string>
     <string name="share_contacts_failure" msgid="1216431977330560559">"Збой абагульвання кантактаў."</string>
     <string name="dialog_export" msgid="1628001095187741417">"Экспартаваць кантакты"</string>
-    <string name="dialog_import" msgid="2431698729761448759">"Імпартаваць кантакты"</string>
+    <string name="dialog_import" msgid="2423592905927819672">"Імпартаваць кантакты з"</string>
     <string name="share_error" msgid="948429331673358107">"Нельга падзялiцца гэтым кантактам."</string>
     <string name="no_contact_to_share" msgid="1276397530378323033">"Няма кантактаў, якія можна абагуліць."</string>
-    <string name="menu_search" msgid="9147752853603483719">"Пошук"</string>
     <string name="menu_contacts_filter" msgid="2165153460860262501">"Паказаць кантакты"</string>
     <string name="activity_title_contacts_filter" msgid="8275542497615516969">"Кантакты для адлюстр."</string>
     <string name="custom_list_filter" msgid="2105275443109077687">"Вызначыце карыстальніцкі выгляд"</string>
@@ -621,4 +653,26 @@
     <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> гадз <xliff:g id="MINUTES_1">%s</xliff:g> хв <xliff:g id="SECONDS">%s</xliff:g> с"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Гэта спалучэнне клавіш было адключана"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Кантакт быў выдалены"</string>
+    <string name="sim_import_button_text" msgid="4270841592496619317">"Імпартаваць"</string>
+    <string name="sim_import_title_none_selected" msgid="6910517331401970693">"Выберыце кантакты"</string>
+    <string name="sim_import_empty_message" msgid="7743815244380189651">"На вашай SIM-карце няма кантактаў"</string>
+    <string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"Кантакт ужо ёсць у вашым спісе"</string>
+    <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
+      <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> кантакт SIM-карты імпартаваны</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> кантакты SIM-карты імпартаваны</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> кантактаў SIM-карты імпартаваны</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> кантакту SIM-карты імпартавана</item>
+    </plurals>
+    <string name="sim_import_failed_toast" msgid="5559267299793622705">"Памылка імпарту кантактаў SIM-карты"</string>
+    <string name="sim_import_title" msgid="2511154832820812822">"Імпартаваць з SIM-карты"</string>
+    <string name="sim_import_cancel_content_description" msgid="1619832410253424452">"Скасаваць"</string>
+    <string name="auto_sync_off" msgid="2180147284456026587">"Аўтасінхранізацыя адключана. Дакраніцеся, каб уключыць яе."</string>
+    <string name="dismiss_sync_alert" msgid="8941131776605093596">"Адхіліць"</string>
+    <string name="account_sync_off" msgid="7646143254066243924">"Сінхранізацыя ўліковага запісу адключана. Дакраніцеся, каб уключыць яе."</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Уключыць аўтасінхранізацыю?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Змены, якія вы зрабілі ва ўсіх праграмах і ўліковых запісах, не толькі ў Кантактах Google, будуць сінхранізоўвацца паміж вэб-інтэрфейсам і вашымі прыладамі."</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Уключыць"</string>
+    <string name="connection_error_message" msgid="7046408921529247089">"Няма падключэння"</string>
+    <string name="single_sim_display_label" msgid="6985770499439371497">"SIM-карта"</string>
+    <string name="show_more_content_description" msgid="4277410425912984722">"Паказаць больш"</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 982047a..742d11d 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"লেবেল তৈরি করুন"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"লেবেলের পুনঃনামকরণ করুন"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"লেবেলের নাম"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"লেবেলের নাম"</string>
     <string name="audio_chat" msgid="2535716629358298691">"ভয়েস চ্যাট"</string>
     <string name="video_chat" msgid="1872255818640336072">"ভিডিও চ্যাট"</string>
     <string name="connections" msgid="8098440723172028350">"সংযোগগুলি"</string>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
index 6667bb3..2762fbb 100644
--- a/res/values-bs-rBA/strings.xml
+++ b/res/values-bs-rBA/strings.xml
@@ -40,7 +40,7 @@
     <string name="menu_editContact" msgid="9042415603857662633">"Uredi"</string>
     <string name="menu_deleteContact" msgid="6788644058868189393">"Izbriši"</string>
     <string name="menu_change_photo" msgid="7769177631511496210">"Promijeni fotografiju"</string>
-    <string name="menu_create_contact_shortcut" msgid="1217971915748509640">"Postavi na Početni ekran"</string>
+    <string name="menu_create_contact_shortcut" msgid="1663022219127343858">"Napravi prečicu"</string>
     <string name="menu_call" msgid="3992595586042260618">"Pozovi kontakt"</string>
     <string name="menu_sendSMS" msgid="5535886767547006515">"Pošalji tekstualnu poruku kontaktu"</string>
     <string name="menu_splitAggregate" msgid="2627252205317945563">"Razdvoji"</string>
@@ -59,15 +59,21 @@
     <string name="splitConfirmationWithPendingChanges_positive_button" msgid="9073444264887244032">"Sačuvaj i razdvoji"</string>
     <string name="joinConfirmation" msgid="8262614843581924365">"Želite li sačuvati promjene koje ste već načinili i povezati s odabranim kontaktom?"</string>
     <string name="joinConfirmation_positive_button" msgid="4573092849769149516">"Sačuvaj i poveži"</string>
+    <string name="contacts_linking_progress_bar" msgid="2846494347384549277">"Povezivanje u toku"</string>
+    <string name="contacts_unlinking_progress_bar" msgid="5989310198163726929">"Prekid povezanosti u toku"</string>
     <string name="menu_joinAggregate" msgid="3599512127797513606">"Poveži"</string>
+    <string name="menu_linkedContacts" msgid="400444389718855621">"Prikaz povezanih kontakata"</string>
     <string name="menu_save" msgid="1727844363591825909">"Sačuvaj"</string>
     <string name="titleJoinContactDataWith" msgid="6825255752748313944">"Poveži kontakte"</string>
     <string name="blurbJoinContactDataWith" msgid="5864256698061641841">"Izaberite kontakt koji želite povezati s kontaktom <xliff:g id="NAME">%s</xliff:g>:"</string>
     <string name="showAllContactsJoinItem" msgid="2189695051430392383">"Prikaži sve kontakte"</string>
     <string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Predloženi kontakti"</string>
     <string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Svi kontakti"</string>
+    <string name="contactsJoinedNamedMessage" msgid="1299418263439579455">"<xliff:g id="NAME">%s</xliff:g> je povezan"</string>
     <string name="contactsJoinedMessage" msgid="3343535986195643136">"Kontakti su povezani"</string>
-    <string name="contact_deleted_named_toast" msgid="6558941164987421174">"Kontakt <xliff:g id="NAME">%s</xliff:g> je izbrisan"</string>
+    <string name="contacts_deleted_one_named_toast" msgid="2252551736301363193">"Kontakt <xliff:g id="NAME">%1$s</xliff:g> je izbrisan"</string>
+    <string name="contacts_deleted_two_named_toast" msgid="3642082931473111791">"Kontakti <xliff:g id="NAME_0">%1$s</xliff:g> i <xliff:g id="NAME_1">%2$s</xliff:g> su izbrisani"</string>
+    <string name="contacts_deleted_many_named_toast" msgid="7731565342428031249">"Kontakti <xliff:g id="NAME_0">%1$s</xliff:g>, <xliff:g id="NAME_1">%2$s</xliff:g>, <xliff:g id="NAME_2">%3$s</xliff:g>… su izbrisani"</string>
     <plurals name="contacts_deleted_toast" formatted="false" msgid="1477708624197262295">
       <item quantity="one">Kontakti su izbrisani</item>
       <item quantity="few">Kontakti su izbrisani</item>
@@ -86,10 +92,11 @@
     <string name="title_from_google" msgid="4664084747121207202">"Sa Googlea"</string>
     <string name="title_from_other_accounts" msgid="8307885412426754288">"Sa računa <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="menu_set_ring_tone" msgid="8728345772068064946">"Postavi zvono"</string>
-    <string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Svi pozivi na govornu poštu"</string>
-    <string name="readOnlyContactWarning" msgid="5526727661978307833">"Kontakti s računa koji su samo za čitanje se ne mogu izbrisati, ali se mogu sakriti."</string>
-    <string name="readOnlyContactWarning_positive_button" msgid="6541862607313811926">"Sakrij"</string>
-    <string name="readOnlyContactDeleteConfirmation" msgid="8782086424739664753">"Kontakt kojeg želite izbrisati sadrži detalje s više računa. Detalji s računa koji su samo za čitanje se neće izbrisati, već sakriti."</string>
+    <string name="menu_redirect_calls_to_vm" msgid="83331924006712755">"Preusmjeri na govornu poštu"</string>
+    <string name="menu_unredirect_calls_to_vm" msgid="8725542534701811737">"Poništi preusmj. na gov. poštu"</string>
+    <string name="readOnlyContactWarning" msgid="7514475664695089411">"Ovaj kontakt je samo za čitanje. Ne može se izbrisati, ali ga možete sakriti."</string>
+    <string name="readOnlyContactWarning_positive_button" msgid="8914797212167683673">"Sakrij kontakt"</string>
+    <string name="readOnlyContactDeleteConfirmation" msgid="4717023505914239809">"Računi koji su samo za čitanje u ovom kontaktu bit će sakriveni, ne izbrisani."</string>
     <string name="single_delete_confirmation" msgid="3106905986948679720">"Izbrisati ovaj kontakt?"</string>
     <string name="batch_delete_confirmation" msgid="3984346060324014108">"Izbrisati odabrane kontakte?"</string>
     <string name="batch_delete_read_only_contact_confirmation" msgid="8411117621035639964">"Kontakti s računa koji su samo za čitanje se ne mogu izbrisati, ali se mogu sakriti."</string>
@@ -133,6 +140,12 @@
     <string name="groupMembersAddedToast" msgid="4824834898718972768">"Dodano oznaci"</string>
     <string name="groupSavedErrorToast" msgid="2355891714292740162">"Nije moguće sačuvati promjene oznake"</string>
     <string name="groupExistsErrorMessage" msgid="5196811283836946189">"Ta oznaka već postoji"</string>
+    <string name="groupSomeContactsNoEmailsToast" msgid="8211161470235548732">"Neki kontakti nemaju adrese e-pošte."</string>
+    <string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Neki kontakti nemaju brojeve telefona."</string>
+    <string name="menu_sendEmailOption" msgid="5978319931321657780">"Pošalji poruku e-pošte"</string>
+    <string name="menu_sendMessageOption" msgid="8850168125274916426">"Pošalji poruku"</string>
+    <string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Izaberite kontakte"</string>
+    <string name="send_to_selection" msgid="2251339182881603540">"Pošalji"</string>
     <plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> kontakt s brojem telefona</item>
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> kontakta s brojevima telefona</item>
@@ -174,7 +187,9 @@
     <string name="dialog_new_group_account" msgid="3451312333591556651">"Izaberi račun"</string>
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Napravi oznaku"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Preimenuj oznaku"</string>
-    <string name="group_name_dialog_hint" msgid="5122118085780669813">"Oznaka"</string>
+    <string name="group_name_dialog_hint" msgid="7624523157537700160">"Naziv oznake"</string>
+    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
+    <skip />
     <string name="audio_chat" msgid="2535716629358298691">"Glasovno ćaskanje"</string>
     <string name="video_chat" msgid="1872255818640336072">"Videoćaskanje"</string>
     <string name="connections" msgid="8098440723172028350">"Veze"</string>
@@ -189,7 +204,6 @@
     <string name="take_new_photo" msgid="7341354729436576304">"Snimi novu fotografiju"</string>
     <string name="pick_photo" msgid="2129509985223564942">"Izaberi fotografiju"</string>
     <string name="pick_new_photo" msgid="9122450996263688237">"Odaberi novu fotografiju"</string>
-    <string name="upgrade_in_progress" msgid="474511436863451061">"Lista kontakata se ažurira."</string>
     <string name="search_results_searching" msgid="3984833028938569930">"Pretraživanje…"</string>
     <string name="menu_display_selected" msgid="6470001164297969034">"Prikaži odabrane"</string>
     <string name="menu_display_all" msgid="8887488642609786198">"Prikaži sve"</string>
@@ -202,6 +216,8 @@
     <string name="change_photo" msgid="8530597935483526383">"Promijeni"</string>
     <string name="description_star" msgid="2605854427360036550">"favorit"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Uredi kontakt"</string>
+    <string name="cancel_button_content_description" msgid="1288652456274531846">"Otkaži"</string>
+    <string name="back_arrow_content_description" msgid="4355362760545735065">"Nazad"</string>
     <string name="action_menu_back_from_edit_select" msgid="6435476408621731420">"zatvori"</string>
     <string name="aggregation_suggestion_join_dialog_message" msgid="6786192560870357912">"Povezati trenutni kontakt s odabranim kontaktom?"</string>
     <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Prebaciti se na uređivanje odabranog kontakta? Informacije koje ste unijeli će biti kopirane."</string>
@@ -218,7 +234,7 @@
     <string name="activity_title_confirm_add_detail" msgid="4065089866210730616">"Dodaj u kontakt"</string>
     <string name="non_phone_close" msgid="7608506439725515667">"Zatvori"</string>
     <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
-    <string name="date_year_toggle" msgid="7122002148518724139">"Uključi godine"</string>
+    <string name="date_year_toggle" msgid="7122002148518724139">"Prikaži godinu"</string>
     <string name="social_widget_label" msgid="6378905543028924592">"Kontakt"</string>
     <string name="social_widget_loading" msgid="5327336597364074608">"Učitavanje…"</string>
     <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Napravi novi kontakt"</string>
@@ -243,15 +259,20 @@
     <string name="toast_displaying_all_contacts" msgid="2737388783898593875">"Prikazuju se svi kontakti"</string>
     <string name="generic_no_account_prompt" msgid="7218827704367325460">"Očuvajte sigurnost svojih kontakata čak i ako izgubite telefon: sinhronizirajte ih s mrežnom uslugom."</string>
     <string name="generic_no_account_prompt_title" msgid="753783911899054860">"Dodajte račun"</string>
-    <string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Odvojite trenutak da dodate račun putem kojeg će se kontakti sigurnosno kopirati na Google."</string>
+    <string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Odvojite malo vremena da dodate račun putem kojeg će se kontakti sigurnosno kopirati na Google."</string>
     <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Novi kontakti će biti sačuvani na račun <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Izaberite zadani račun za nove kontakte:"</string>
-    <string name="contact_editor_title_new_contact" msgid="7192223018128934940">"Dodaj novi kontakt"</string>
+    <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Napravi novi kontakt"</string>
     <string name="contact_editor_title_existing_contact" msgid="4898475703683187798">"Uredi kontakt"</string>
+    <string name="contact_editor_title_read_only_contact" msgid="2443496574528842237">"Samo prikaz"</string>
+    <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4186699385645902152">"Izaberite kontakt za uređivanje"</string>
+    <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Povezani kontakti"</string>
+    <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Dodaj"</string>
+    <string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Prekini povezanost"</string>
     <string name="add_account" msgid="8201790677994503186">"Dodajte račun"</string>
     <string name="add_new_account" msgid="5748627740680940264">"Dodaj novi račun"</string>
     <string name="menu_export_database" msgid="2659719297530170820">"Izvezi fajlove baze podataka"</string>
-    <string name="action_menu_add_new_contact_button" msgid="3180222523336380017">"dodaj novi kontakt"</string>
+    <string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Napravi novi kontakt"</string>
     <string name="expanding_entry_card_view_see_more" msgid="3779194067124758079">"Pogledaj više"</string>
     <string name="expanding_entry_card_view_see_less" msgid="5344160551629714168">"Vidi manje"</string>
     <string name="recent_card_title" msgid="8982782042698001695">"Nedavno"</string>
@@ -269,7 +290,7 @@
     <string name="header_organization_entry" msgid="8515394955666265406">"Organizacija"</string>
     <string name="header_nickname_entry" msgid="6743561883967451485">"Nadimak"</string>
     <string name="header_note_entry" msgid="4320190426480612344">"Bilješka"</string>
-    <string name="header_website_entry" msgid="1411467850000824745">"Web stranica"</string>
+    <string name="header_website_entry" msgid="1411467850000824745">"Web lokacija"</string>
     <string name="header_event_entry" msgid="6738250422744401460">"Događaj"</string>
     <string name="header_relation_entry" msgid="1520292958088146460">"Odnos"</string>
     <string name="header_account_entry" msgid="2684318506427891827">"Račun"</string>
@@ -287,10 +308,12 @@
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Vi: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
     <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funkcionira bolje kada unesete Hangouts identifikator osobe u polje za adresu e-pošte ili telefon."</string>
     <string name="editor_more_fields" msgid="3630987771304393421">"Više polja"</string>
-    <string name="editor_change_photo_content_description" msgid="754100561085306263">"Promijeni fotografiju"</string>
+    <string name="editor_change_photo_content_description" msgid="820879708069864340">"Promijenite fotografiju kontakta"</string>
+    <string name="editor_add_photo_content_description" msgid="4194479313465418120">"Dodajte fotografiju kontakta"</string>
+    <string name="editor_contact_photo_content_description" msgid="8571975622926162369">"Fotografija kontakta"</string>
     <string name="editor_failed_to_load" msgid="1623639078580475818">"Otvaranje uređivača nije uspjelo."</string>
     <string name="editor_account_selector_title" msgid="4426337993307015833">"Sačuvaj na"</string>
-    <string name="editor_account_selector_read_only_title" msgid="8315171723911587719">"Prikazuje se"</string>
+    <string name="editor_account_selector_read_only_title" msgid="4137969650184457126">"Informacije o kontaktu s <xliff:g id="ACCOUNT">%s</xliff:g> nije moguće uređivati"</string>
     <string name="editor_account_selector_description" msgid="3324358600570627740">"Trenutno se sprema na račun <xliff:g id="ACCOUNT_NAME">%s</xliff:g>. Dodirnite dvaput da izaberete drugi račun."</string>
     <plurals name="editor_linked_contacts_selector_title" formatted="false" msgid="249075501821303190">
       <item quantity="one">Povezani kontakti (<xliff:g id="COUNT">%d</xliff:g>)</item>
@@ -330,18 +353,18 @@
     <string name="photo_view_description_checked" msgid="3906597168607472795">"Fotografija s računa <xliff:g id="ACCOUNT_TYPE">%s </xliff:g><xliff:g id="USER_NAME">%s </xliff:g>je označena"</string>
     <string name="photo_view_description_not_checked_no_info" msgid="2749154927006406981">"Fotografija s nepoznatog računa nije označena"</string>
     <string name="photo_view_description_checked_no_info" msgid="4974335987092590591">"Fotografija s nepoznatog računa je označena"</string>
-    <string name="locale_change_in_progress" msgid="6975676844194755501">"Lista kontakata se ažurira u skladu s promjenom jezika.\n\nPričekajte…"</string>
-    <string name="menu_duplicates" msgid="4129802988372197257">"Duplikati"</string>
+    <string name="menu_assistant" msgid="5760693735722052454">"Prijedlozi"</string>
+    <string name="menu_assistant_new_badge" msgid="3132884821616980034">"Novo"</string>
     <string name="navigation_drawer_open" msgid="1126498472143250642">"Otvori panel za navigaciju"</string>
     <string name="navigation_drawer_close" msgid="4137416137011817930">"Zatvori panel za navigaciju"</string>
     <string name="menu_title_groups" msgid="8356921831150278868">"Oznake"</string>
     <string name="menu_title_filters" msgid="8210922220185114527">"Računi"</string>
     <string name="permission_explanation_header" msgid="5739405825039695327">"Pogledajte historiju kalendara i SMS-a"</string>
-    <string name="permission_explanation_subheader_calendar_and_SMS" msgid="630115334220569184">"Događaji i poruke"</string>
+    <string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"Događaji i poruke"</string>
     <string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Događaji"</string>
     <string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Poruke"</string>
-    <string name="hamburger_feature_highlight_header" msgid="7442308698936786415">"Organizirajte spisak"</string>
-    <string name="hamburger_feature_highlight_body" msgid="6268711111318172098">"Uklonite duplikate i grupirajte kontakte prema oznaci"</string>
+    <string name="hamburger_feature_highlight_header" msgid="5762679188565585072">"Prijedlozi"</string>
+    <string name="hamburger_feature_highlight_body" msgid="4403398269286898733">"Neka vam kontakti budu organizirani i korisni"</string>
     <string name="undo" msgid="1425165101664071422">"Opozovi radnju"</string>
     <string name="call_custom" msgid="6385303130912713318">"Pozovi <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
     <string name="call_home" msgid="1990519474420545392">"Pozovi kuću"</string>
@@ -413,14 +436,14 @@
     <string name="full_name" msgid="6602579550613988977">"Ime"</string>
     <string name="name_given" msgid="4280790853455320619">"Ime"</string>
     <string name="name_family" msgid="7466985689626017037">"Prezime"</string>
-    <string name="name_prefix" msgid="59756378548779822">"Prefiks imena"</string>
+    <string name="name_prefix" msgid="59756378548779822">"Titula ispred imena"</string>
     <string name="name_middle" msgid="8467433655992690326">"Srednje ime"</string>
-    <string name="name_suffix" msgid="3855278445375651441">"Sufiks imena"</string>
+    <string name="name_suffix" msgid="3855278445375651441">"Titula iza imena"</string>
     <string name="name_phonetic" msgid="4259595234312430484">"Fonetsko ime"</string>
     <string name="name_phonetic_given" msgid="8723179018384187631">"Fonetsko ime"</string>
     <string name="name_phonetic_middle" msgid="8643721493320405200">"Fonetsko srednje ime"</string>
     <string name="name_phonetic_family" msgid="2640133663656011626">"Fonetsko prezime"</string>
-    <string name="phoneLabelsGroup" msgid="6468091477851199285">"Telefoniraj"</string>
+    <string name="phoneLabelsGroup" msgid="6468091477851199285">"Telefon"</string>
     <string name="emailLabelsGroup" msgid="8389931313045344406">"E-pošta"</string>
     <string name="postalLabelsGroup" msgid="3487738141112589324">"Adresa"</string>
     <string name="imLabelsGroup" msgid="3898238486262614027">"IM"</string>
@@ -434,7 +457,7 @@
     <string name="label_notes" msgid="8337354953278341042">"Bilješke"</string>
     <string name="label_custom_field" msgid="1994056912242214426">"Prilagođeno"</string>
     <string name="label_sip_address" msgid="7252153678613978127">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="4202998982804009261">"Web stranica"</string>
+    <string name="websiteLabelsGroup" msgid="4202998982804009261">"Web lokacija"</string>
     <string name="groupsLabel" msgid="7000816729542098972">"Oznake"</string>
     <string name="email_home" msgid="8573740658148184279">"Pošalji poruku e-pošte na kućnu adresu e-pošte"</string>
     <string name="email_mobile" msgid="2042889209787989814">"Mobilna e-pošta"</string>
@@ -463,9 +486,9 @@
     <string name="chat_jabber" msgid="7561444230307829609">"Ćaskanje putem aplikacije Jabber"</string>
     <string name="chat" msgid="9025361898797412245">"Ćaskanje"</string>
     <string name="description_minus_button" msgid="6908099247930477551">"izbriši"</string>
-    <string name="expand_name_fields_description" msgid="6883935911480726652">"Proširi polja za imena"</string>
+    <string name="expand_name_fields_description" msgid="6948274252874552543">"Prikaži više polja za ime"</string>
     <string name="collapse_name_fields_description" msgid="4757877385895561556">"Skupi polja za imena"</string>
-    <string name="expand_phonetic_name_fields_description" msgid="3865726859582581741">"Proširi polja za fonetska imena"</string>
+    <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"Prikaži više polja za fonetsko ime"</string>
     <string name="collapse_phonetic_name_fields_description" msgid="9102249481855019452">"Skupi polja za fonetska imena"</string>
     <string name="expand_fields_description" msgid="8129294181216760037">"Proširi"</string>
     <string name="collapse_fields_description" msgid="1884143625854637874">"Skupi"</string>
@@ -486,10 +509,21 @@
     <string name="menu_doNotSave" msgid="58593876893538465">"Otkaži"</string>
     <string name="listCustomView" msgid="1840624396582117590">"Prilagođeni prikaz"</string>
     <string name="dialog_new_contact_account" msgid="4969619718062454756">"Sačuvaj uvezene kontakte na karticu:"</string>
-    <string name="import_from_sim" msgid="3859272228033941659">"Uvezi sa SIM kartice"</string>
-    <string name="import_from_sim_summary" msgid="5815105584445743740">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">^1</xliff:g> - <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
-    <string name="import_from_sim_summary_no_number" msgid="880612418352086012">"Uvezi sa SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="5304572242183878086">"Uvezi iz .vcf fajla"</string>
+    <string name="import_from_sim" msgid="6912071635295799131">"SIM kartice"</string>
+    <string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"SIM kartice <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
+    <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
+      <item quantity="one">%1$d kontakt</item>
+      <item quantity="few">%1$d kontakta</item>
+      <item quantity="other">%1$d kontakata</item>
+    </plurals>
+    <plurals name="import_from_sim_secondary_template" formatted="false" msgid="2484832025802907060">
+      <item quantity="one"><xliff:g id="COUNT_2">^1</xliff:g> kontakt • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+      <item quantity="few"><xliff:g id="COUNT_2">^1</xliff:g> kontakta • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+      <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> kontakata • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
+    </plurals>
+    <string name="import_from_vcf_file" product="default" msgid="8662528435646418203">".vcf fajla"</string>
+    <string name="nothing_to_import_message" msgid="1651921906873335656">"Nema ništa za uvoz"</string>
+    <string name="import_from_vcf_file_confirmation_message" product="default" msgid="967723361108008345">"Uvesti kontakte iz vCard fajla?"</string>
     <string name="cancel_import_confirmation_message" msgid="3929951040347726757">"Otkazati uvoz fajla <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_export_confirmation_message" msgid="1995462401949262638">"Otkazati izvoz fajla <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"Nemoguće otkazati uvoz/izvoz vCard fajla"</string>
@@ -538,7 +572,7 @@
     <string name="caching_vcard_title" msgid="1226272312940516605">"Spremanje u privremenu pohranu u toku"</string>
     <string name="progress_notifier_message" msgid="2311011466908220528">"Uvozi se <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="export_to_vcf_file" product="default" msgid="4407527157056120858">"Izvezi u .vcf fajl"</string>
-    <string name="display_options_sort_list_by" msgid="7028809117272018712">"Poredaj po"</string>
+    <string name="display_options_sort_list_by" msgid="7028809117272018712">"Poredano po"</string>
     <string name="display_options_sort_by_given_name" msgid="2778421332815687873">"Ime"</string>
     <string name="display_options_sort_by_family_name" msgid="2684905041926954793">"Prezime"</string>
     <string name="display_options_view_names_as" msgid="6514632499276563482">"Format imena"</string>
@@ -546,8 +580,6 @@
     <string name="display_options_view_family_name_first" msgid="956445100777296467">"Prezime prvo"</string>
     <string name="settings_accounts" msgid="350219740670774576">"Računi"</string>
     <string name="default_editor_account" msgid="699591683362420991">"Zadani račun za nove kontakte"</string>
-    <string name="sync_contact_metadata_title" msgid="6957956139306960211">"Sinhroniziraj metapodatke kontakata [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="6192335951588820553">"Sinhroniziraj metapodatke kontakata"</string>
     <string name="settings_my_info_title" msgid="1534272456405343119">"Moje informacije"</string>
     <string name="set_up_profile" msgid="7370213843590143771">"Postavite svoj profil"</string>
     <string name="setting_about" msgid="7014388749752042863">"O kontaktima"</string>
@@ -557,10 +589,9 @@
     <string name="share_contacts" msgid="8109287987498711664">"Dijeli sve kontakte"</string>
     <string name="share_contacts_failure" msgid="1216431977330560559">"Dijeljenje kontakata nije uspjelo."</string>
     <string name="dialog_export" msgid="1628001095187741417">"Izvezi kontakte"</string>
-    <string name="dialog_import" msgid="2431698729761448759">"Uvezi kontakte"</string>
+    <string name="dialog_import" msgid="2423592905927819672">"Uvezi kontakte sa"</string>
     <string name="share_error" msgid="948429331673358107">"Ovaj kontakt se ne može podijeliti."</string>
     <string name="no_contact_to_share" msgid="1276397530378323033">"Nema kontakata za dijeljenje."</string>
-    <string name="menu_search" msgid="9147752853603483719">"Traži"</string>
     <string name="menu_contacts_filter" msgid="2165153460860262501">"Kontakti za prikaz"</string>
     <string name="activity_title_contacts_filter" msgid="8275542497615516969">"Kontakti za prikaz"</string>
     <string name="custom_list_filter" msgid="2105275443109077687">"Definirajte prilagođeni prikaz"</string>
@@ -609,4 +640,25 @@
     <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> h <xliff:g id="MINUTES_1">%s</xliff:g> min. <xliff:g id="SECONDS">%s</xliff:g> sek."</string>
     <string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"Ova prečica je onemogućena"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"Kontakt je uklonjen"</string>
+    <string name="sim_import_button_text" msgid="4270841592496619317">"Uvezi"</string>
+    <string name="sim_import_title_none_selected" msgid="6910517331401970693">"Odaberite kontakte"</string>
+    <string name="sim_import_empty_message" msgid="7743815244380189651">"Nema kontakata na SIM kartici"</string>
+    <string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"Kontakt se već nalazi na listi"</string>
+    <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="8572156521110906443">
+      <item quantity="one">Uvezen je <xliff:g id="COUNT">%d</xliff:g> kontakt sa SIM kartice</item>
+      <item quantity="few">Uvezena su <xliff:g id="COUNT">%d</xliff:g> kontakta sa SIM kartice</item>
+      <item quantity="other">Uvezeno je <xliff:g id="COUNT">%d</xliff:g> kontakata sa SIM kartice</item>
+    </plurals>
+    <string name="sim_import_failed_toast" msgid="5559267299793622705">"Uvoz kontakata sa SIM kartice nije uspio"</string>
+    <string name="sim_import_title" msgid="2511154832820812822">"Uvezi sa SIM kartice"</string>
+    <string name="sim_import_cancel_content_description" msgid="1619832410253424452">"Otkaži"</string>
+    <string name="auto_sync_off" msgid="2180147284456026587">"Automatska sinhronizacija je isključena. Dodirnite da je uključite."</string>
+    <string name="dismiss_sync_alert" msgid="8941131776605093596">"Odbaci"</string>
+    <string name="account_sync_off" msgid="7646143254066243924">"Sinhronizacija računa je isključena. Dodirnite da je uključite."</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="333965456829670541">"Želite li uključiti automatsko sinhroniziranje?"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5025336917533693997">"Promjene koje načinite u svim aplikacijama i računima, ne samo u Google kontaktima, bit će ažurirani i na internetu i na vašim uređajima."</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1070332014838295599">"Uključi"</string>
+    <string name="connection_error_message" msgid="7046408921529247089">"Niste povezani na mrežu"</string>
+    <string name="single_sim_display_label" msgid="6985770499439371497">"SIM"</string>
+    <string name="show_more_content_description" msgid="4277410425912984722">"Prikaži više"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 85e77e7..525350b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Crea una etiqueta"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Canvia el nom de l\'etiqueta"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Nom de l\'etiqueta"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Nom de l\'etiqueta"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Xat de veu"</string>
     <string name="video_chat" msgid="1872255818640336072">"Xat de vídeo"</string>
     <string name="connections" msgid="8098440723172028350">"Connexions"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b72d189..d3a4163 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -195,8 +195,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Vytvořit štítek"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Přejmenovat štítek"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Název štítku"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Název štítku"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Hlasový chat"</string>
     <string name="video_chat" msgid="1872255818640336072">"Videochat"</string>
     <string name="connections" msgid="8098440723172028350">"Spojení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index baa4197..9f6d0fb 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Opret etiket"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Omdøb etiket"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Etiketnavn"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Etiketnavn"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Talechat"</string>
     <string name="video_chat" msgid="1872255818640336072">"Videochat"</string>
     <string name="connections" msgid="8098440723172028350">"Forbindelser"</string>
@@ -477,7 +476,7 @@
     <string name="description_minus_button" msgid="6908099247930477551">"slet"</string>
     <string name="expand_name_fields_description" msgid="6948274252874552543">"Vis flere navnefelter"</string>
     <string name="collapse_name_fields_description" msgid="4757877385895561556">"Skjul navnefelter"</string>
-    <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"Vis flere fonetiske navnefelter"</string>
+    <string name="expand_phonetic_name_fields_description" msgid="9133052674087187927">"Vis flere felter med fonetiske navne"</string>
     <string name="collapse_phonetic_name_fields_description" msgid="9102249481855019452">"Skjul fonetiske navnefelter"</string>
     <string name="expand_fields_description" msgid="8129294181216760037">"Udvid"</string>
     <string name="collapse_fields_description" msgid="1884143625854637874">"Skjul"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e762bb3..81cba9d 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Δημιουργία ετικέτας"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Μετονομασία ετικέτας"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Όνομα ετικέτας"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Όνομα ετικέτας"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Φωνητική συνομιλία"</string>
     <string name="video_chat" msgid="1872255818640336072">"Συζήτηση μέσω βίντεο"</string>
     <string name="connections" msgid="8098440723172028350">"Συνδέσεις"</string>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index da0ae04..2a2a8c0 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Create label"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Rename label"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Label name"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Label name"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Voice chat"</string>
     <string name="video_chat" msgid="1872255818640336072">"Video chat"</string>
     <string name="connections" msgid="8098440723172028350">"Connections"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index da0ae04..2a2a8c0 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Create label"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Rename label"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Label name"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Label name"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Voice chat"</string>
     <string name="video_chat" msgid="1872255818640336072">"Video chat"</string>
     <string name="connections" msgid="8098440723172028350">"Connections"</string>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index da0ae04..2a2a8c0 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Create label"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Rename label"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Label name"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Label name"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Voice chat"</string>
     <string name="video_chat" msgid="1872255818640336072">"Video chat"</string>
     <string name="connections" msgid="8098440723172028350">"Connections"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 576089d..ed6b30d 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Crear etiqueta"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Cambiar nombre de etiqueta"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Nombre de la etiqueta"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Nombre de etiq."</string>
     <string name="audio_chat" msgid="2535716629358298691">"Chat de voz"</string>
     <string name="video_chat" msgid="1872255818640336072">"Chat de video"</string>
     <string name="connections" msgid="8098440723172028350">"Conexiones"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index fe85789..da9e43d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Crear etiqueta"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Cambiar nombre de etiqueta"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Nombre de etiqueta"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Nombre etiqueta"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Chat de voz"</string>
     <string name="video_chat" msgid="1872255818640336072">"Chat de vídeo"</string>
     <string name="connections" msgid="8098440723172028350">"Conexiones"</string>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index ee878e7..27261ae 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -29,7 +29,7 @@
     <string name="groupMemberPickerActivityTitle" msgid="1431750793695262522">"Valimine"</string>
     <string name="header_entry_contact_list_adapter_header_title" msgid="2436981165830115659">"Loo uus kontakt"</string>
     <string name="viewContactTitle" msgid="7989394521836644384">"Kontakti üksikasjad"</string>
-    <string name="contactDetailAbout" msgid="5430408883907061400">"Teave"</string>
+    <string name="contactDetailAbout" msgid="5430408883907061400">"Teave:"</string>
     <string name="contactDetailUpdates" msgid="3780588624763446941">"Värskendused"</string>
     <string name="searchHint" msgid="8482945356247760701">"Otsige kontakte"</string>
     <string name="menu_viewContact" msgid="2795575601596468581">"Kuva kontakt"</string>
@@ -139,8 +139,8 @@
     <string name="groupExistsErrorMessage" msgid="5196811283836946189">"See silt on juba olemas"</string>
     <string name="groupSomeContactsNoEmailsToast" msgid="8211161470235548732">"Mõnel kontaktil pole e-posti aadressi."</string>
     <string name="groupSomeContactsNoPhonesToast" msgid="5530760834827530509">"Mõnel kontaktil pole telefoninumbrit."</string>
-    <string name="menu_sendEmailOption" msgid="5978319931321657780">"Meili saatmine"</string>
-    <string name="menu_sendMessageOption" msgid="8850168125274916426">"Sõnumi saatmine"</string>
+    <string name="menu_sendEmailOption" msgid="5978319931321657780">"Saada meil"</string>
+    <string name="menu_sendMessageOption" msgid="8850168125274916426">"Saada sõnum"</string>
     <string name="pickerSelectContactsActivityTitle" msgid="1936544190231136729">"Kontaktide valimine"</string>
     <string name="send_to_selection" msgid="2251339182881603540">"Saada"</string>
     <plurals name="listTotalPhoneContacts" formatted="false" msgid="3692277679143308755">
@@ -187,7 +187,7 @@
     <string name="video_chat" msgid="1872255818640336072">"Videovestlus"</string>
     <string name="connections" msgid="8098440723172028350">"Ühendused"</string>
     <string name="add_connection_button" msgid="4861308615789601727">"Lisa ühendus"</string>
-    <string name="recent" msgid="2659189233141493004">"Hiljutine"</string>
+    <string name="recent" msgid="2659189233141493004">"Hiljutised"</string>
     <string name="recent_updates" msgid="4267258535615860710">"Uusimad värskendused"</string>
     <string name="account_type_format" msgid="718948015590343010">"<xliff:g id="SOURCE">%1$s</xliff:g> kontakt"</string>
     <string name="google_account_type_format" msgid="5283997303922067997">"Teenuse <xliff:g id="SOURCE">%1$s</xliff:g> konto"</string>
@@ -227,11 +227,11 @@
     <string name="activity_title_confirm_add_detail" msgid="4065089866210730616">"Kontaktile lisamine"</string>
     <string name="non_phone_close" msgid="7608506439725515667">"Sule"</string>
     <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
-    <string name="date_year_toggle" msgid="7122002148518724139">"Lisa aasta"</string>
+    <string name="date_year_toggle" msgid="7122002148518724139">"Kaasa aasta"</string>
     <string name="social_widget_label" msgid="6378905543028924592">"Kontakt"</string>
     <string name="social_widget_loading" msgid="5327336597364074608">"Laadimine ..."</string>
     <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Loo uus kontakt"</string>
-    <string name="contacts_unavailable_add_account" msgid="4347232421410561500">"Lisa konto"</string>
+    <string name="contacts_unavailable_add_account" msgid="4347232421410561500">"Konto lisamine"</string>
     <string name="contacts_unavailable_import_contacts" msgid="3182801738595937144">"Importimine"</string>
     <string name="create_group_item_label" msgid="3263064599743742865">"Uue loomine …"</string>
     <string name="delete_group_dialog_message" msgid="335713829185261371">"Kas kustutada silt „<xliff:g id="GROUP_LABEL">%1$s</xliff:g>”? (Kontakte ei kustutata.)"</string>
@@ -262,7 +262,7 @@
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Lingitud kontaktid"</string>
     <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Lisamine"</string>
     <string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Link. tühistam."</string>
-    <string name="add_account" msgid="8201790677994503186">"Lisa konto"</string>
+    <string name="add_account" msgid="8201790677994503186">"Konto lisamine"</string>
     <string name="add_new_account" msgid="5748627740680940264">"Lisa uus konto"</string>
     <string name="menu_export_database" msgid="2659719297530170820">"Andmebaasi failide eksportimine"</string>
     <string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Loo uus kontakt"</string>
@@ -348,7 +348,7 @@
     <string name="navigation_drawer_close" msgid="4137416137011817930">"Sule navigeerimissahtel"</string>
     <string name="menu_title_groups" msgid="8356921831150278868">"Sildid"</string>
     <string name="menu_title_filters" msgid="8210922220185114527">"Kontod"</string>
-    <string name="permission_explanation_header" msgid="5739405825039695327">"Vaadake oma ajalugu koos"</string>
+    <string name="permission_explanation_header" msgid="5739405825039695327">"Ajaloo koos kuvamine"</string>
     <string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"Sündmused ja sõnumid"</string>
     <string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"Sündmused"</string>
     <string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"Sõnumid"</string>
@@ -497,7 +497,7 @@
     <string name="menu_done" msgid="796017761764190697">"Valmis"</string>
     <string name="menu_doNotSave" msgid="58593876893538465">"Tühista"</string>
     <string name="listCustomView" msgid="1840624396582117590">"Kohandatud vaade"</string>
-    <string name="dialog_new_contact_account" msgid="4969619718062454756">"Salvestage imporditud kontaktid kontole:"</string>
+    <string name="dialog_new_contact_account" msgid="4969619718062454756">"Imporditud kontaktid salvestatakse kontole:"</string>
     <string name="import_from_sim" msgid="6912071635295799131">"SIM-kaart"</string>
     <string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"SIM-kaart <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
     <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
@@ -610,11 +610,11 @@
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> lugemata üksus. </item>
     </plurals>
     <string name="about_build_version" msgid="1765533099416999801">"Järguversioon"</string>
-    <string name="about_open_source_licenses" msgid="6479990452352919641">"Avatud lähtekoodiga litsentsid"</string>
+    <string name="about_open_source_licenses" msgid="6479990452352919641">"Avatud lähtekoodi litsentsid"</string>
     <string name="about_open_source_licenses_summary" msgid="57418386931763994">"Avatud lähtekoodiga tarkvara litsentsi üksikasjad"</string>
     <string name="about_privacy_policy" msgid="3705518622499152626">"Privaatsuseeskirjad"</string>
     <string name="about_terms_of_service" msgid="4642400812150296723">"Teenusetingimused"</string>
-    <string name="activity_title_licenses" msgid="5467767062737708066">"Avatud lähtekoodiga litsentsid"</string>
+    <string name="activity_title_licenses" msgid="5467767062737708066">"Avatud lähtekoodi litsentsid"</string>
     <string name="url_open_error_toast" msgid="452592089815420457">"URL-i avamine ebaõnnestus."</string>
     <string name="account_filter_view_checked" msgid="6696859503887762213">"Üksus <xliff:g id="ACCOUNT_INFO">%s</xliff:g> on märgitud"</string>
     <string name="account_filter_view_not_checked" msgid="2248684521205038389">"Üksus <xliff:g id="ACCOUNT_INFO">%s</xliff:g> pole märgitud"</string>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index fde84cb..b835363 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Sortu etiketa"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Aldatu etiketaren izena"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Etiketaren izena"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Etiketa-izena"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Ahots-txata"</string>
     <string name="video_chat" msgid="1872255818640336072">"Bideo-txata"</string>
     <string name="connections" msgid="8098440723172028350">"Konexioak"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index fe5321b..a1c17e89 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Créer une étiquette"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Renommer l\'étiquette"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Nom d\'étiquette"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Nom d\'étiquette"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Clavardage audio"</string>
     <string name="video_chat" msgid="1872255818640336072">"Clavardage vidéo"</string>
     <string name="connections" msgid="8098440723172028350">"Liens"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 673e42d..5853936 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -188,8 +188,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Stvaranje oznake"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Promjena naziva oznake"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Naziv oznake"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Naziv oznake"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Glasovni chat"</string>
     <string name="video_chat" msgid="1872255818640336072">"Videochat"</string>
     <string name="connections" msgid="8098440723172028350">"Veze"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 4861880..4e4798f 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Buat label"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Ganti nama label"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Nama label"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Nama label"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Obrolan suara"</string>
     <string name="video_chat" msgid="1872255818640336072">"Obrolan video"</string>
     <string name="connections" msgid="8098440723172028350">"Hubungan"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 2143cfc..68481d2 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Búa til flokk"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Endurnefna flokk"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Heiti flokks"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Heiti flokks"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Símtalsspjall"</string>
     <string name="video_chat" msgid="1872255818640336072">"Myndspjall"</string>
     <string name="connections" msgid="8098440723172028350">"Tengingar"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 0bdd7a7..d8c6d87 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -195,8 +195,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"יצירת תווית"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"שינוי השם של התווית"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"שם התווית"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"שם התווית"</string>
     <string name="audio_chat" msgid="2535716629358298691">"צ\'אט קולי"</string>
     <string name="video_chat" msgid="1872255818640336072">"Hangout"</string>
     <string name="connections" msgid="8098440723172028350">"חיבורים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e32d07e..025ab42 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"ラベルの作成"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"ラベル名の変更"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"ラベルの名前"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"ラベル名"</string>
     <string name="audio_chat" msgid="2535716629358298691">"ボイスチャット"</string>
     <string name="video_chat" msgid="1872255818640336072">"ビデオチャット"</string>
     <string name="connections" msgid="8098440723172028350">"連絡先情報"</string>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 37ece94..d6f76fe 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Белгі жасау"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Белгінің атын өзгерту"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Белгі атауы"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Белгі атауы"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Дауыс чаты"</string>
     <string name="video_chat" msgid="1872255818640336072">"Видео чат"</string>
     <string name="connections" msgid="8098440723172028350">"Байланыстар"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 3c7e664..4501ee5 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -21,7 +21,7 @@
     <string name="shortcutContact" msgid="749243779392912958">"Байланыш"</string>
     <string name="shortcutDialContact" msgid="746622101599186779">"Түз чалуу"</string>
     <string name="shortcutMessageContact" msgid="2460337253595976198">"Түз SMS"</string>
-    <string name="shortcutActivityTitle" msgid="6642877210643565436">"Ыкчам чалуу үчүн байланыш тандаңыз"</string>
+    <string name="shortcutActivityTitle" msgid="6642877210643565436">"Тез чалуу үчүн байланыш тандаңыз"</string>
     <string name="callShortcutActivityTitle" msgid="6065749861423648991">"Чалуу үчүн номер тандаңыз"</string>
     <string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Билдирүү жөнөтүлө турган номерди тандоо"</string>
     <string name="contactInsertOrEditActivityTitle" msgid="6527505405325862674">"Байланышка кошуу"</string>
@@ -39,7 +39,7 @@
     <string name="description_action_menu_add_star" msgid="3327186327234177456">"Сүйүктүүлөргө кошулду"</string>
     <string name="menu_editContact" msgid="9042415603857662633">"Өзгөртүү"</string>
     <string name="menu_deleteContact" msgid="6788644058868189393">"Жок кылуу"</string>
-    <string name="menu_change_photo" msgid="7769177631511496210">"Сүрөт өзгөртүү"</string>
+    <string name="menu_change_photo" msgid="7769177631511496210">"Сүрөттү өзгөртүү"</string>
     <string name="menu_create_contact_shortcut" msgid="1663022219127343858">"Шилтемени түзүү"</string>
     <string name="menu_call" msgid="3992595586042260618">"Байланышка чалуу"</string>
     <string name="menu_sendSMS" msgid="5535886767547006515">"Байланышка SMS жазуу"</string>
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Энбелги түзүү"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Энбелгинин аталышын өзгөртүү"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Энбелгинин аталышы"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Энбелгинин аталышы"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Үн чат"</string>
     <string name="video_chat" msgid="1872255818640336072">"Видео чат"</string>
     <string name="connections" msgid="8098440723172028350">"Байланыштар"</string>
@@ -251,8 +250,8 @@
     <string name="external_profile_title" msgid="8034998767621359438">"Менин <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> профайлым"</string>
     <string name="toast_displaying_all_contacts" msgid="2737388783898593875">"Бардык байланыштарды көрсөтүү"</string>
     <string name="generic_no_account_prompt" msgid="7218827704367325460">"Телефонуңузду жоготсоңуз дагы, байланыштарыңызды жоготпоңуз: онлайн кызмат менен синхрондоңуз."</string>
-    <string name="generic_no_account_prompt_title" msgid="753783911899054860">"Эсеп кошуу"</string>
-    <string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Байланыштарыңыздын камдык көчүрмөсүн Google\'га сактоо үчүн каттоо эсебин кошууңуз керек болот."</string>
+    <string name="generic_no_account_prompt_title" msgid="753783911899054860">"Кошуу"</string>
+    <string name="contact_editor_prompt_zero_accounts" msgid="6648376557574360096">"Байланыштарыңыздын камдык көчүрмөсүн Google\'га сактоо үчүн каттоо эсебин кошуңуз."</string>
     <string name="contact_editor_prompt_one_account" msgid="3087691056345099310">"Жаңы байланыштар <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> ичине сакталат."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="8565761674283473549">"Жаңы байланыштар үчүн демейки каттоо эсебин тандаңыз:"</string>
     <string name="contact_editor_title_new_contact" msgid="3042788718983070111">"Жаңы байланыш түзүү"</string>
@@ -262,7 +261,7 @@
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="4618465940423857694">"Шилтемеленген байланыштар"</string>
     <string name="contact_editor_add_linked_contact" msgid="426142748048816297">"Кошуу"</string>
     <string name="contact_editor_unlink_contacts" msgid="4525214336177236653">"Ажыратуу"</string>
-    <string name="add_account" msgid="8201790677994503186">"Эсеп кошуу"</string>
+    <string name="add_account" msgid="8201790677994503186">"Кошуу"</string>
     <string name="add_new_account" msgid="5748627740680940264">"Жаңы эсеп кошуу"</string>
     <string name="menu_export_database" msgid="2659719297530170820">"Берилиштер корлорунун файлдарын экспорттоо"</string>
     <string name="action_menu_add_new_contact_button" msgid="5506832825256203208">"Жаңы байланыш түзүү"</string>
@@ -315,7 +314,7 @@
     <string name="quickcontact_contacts_number" msgid="6036916944287597682">"<xliff:g id="COUNT">%d</xliff:g> байланыш шилтемеленген"</string>
     <string name="quick_contact_display_name_with_phonetic" msgid="3692038078718876610">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> (<xliff:g id="PHONETIC_NAME">%s</xliff:g>)"</string>
     <string name="quickcontact_suggestion_link_button" msgid="3244619714781727946">"БАЙЛАНЫШТАРДЫ ШИЛТЕМЕЛӨӨ"</string>
-    <string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ЖОККО ЧЫГАРУУ"</string>
+    <string name="quickcontact_suggestion_cancel_button" msgid="8236954313106630862">"ЖОК"</string>
     <plurals name="quickcontact_suggestion_card_title" formatted="false" msgid="2660005966628746406">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> Жупнуска кылса болот</item>
       <item quantity="one">1 Жупнуска кылса болот</item>
@@ -667,8 +666,8 @@
     <string name="display_options_view_given_name_first" msgid="3616004640258761473">"Аты биринчи жазылсын"</string>
     <string name="display_options_view_family_name_first" msgid="956445100777296467">"Фамилиясы биринчи жазылсын"</string>
     <string name="settings_accounts" msgid="350219740670774576">"Каттоо эсептер"</string>
-    <string name="default_editor_account" msgid="699591683362420991">"Жаңы байланыштарыңыз үчүн демейки каттоо эсеби"</string>
-    <string name="settings_my_info_title" msgid="1534272456405343119">"Менин дайындарым"</string>
+    <string name="default_editor_account" msgid="699591683362420991">"Жаңы байланыштар үчүн демейки каттоо эсеби"</string>
+    <string name="settings_my_info_title" msgid="1534272456405343119">"Өзүм жөнүндө маалымат"</string>
     <string name="set_up_profile" msgid="7370213843590143771">"Профилди жөндөө"</string>
     <string name="setting_about" msgid="7014388749752042863">"Байланыштар жөнүндө"</string>
     <!-- no translation found for share_visible_contacts (890150378880783797) -->
@@ -685,7 +684,7 @@
     <skip />
     <!-- no translation found for activity_title_contacts_filter (8275542497615516969) -->
     <skip />
-    <string name="custom_list_filter" msgid="2105275443109077687">"Ылайыкташтырылган көрүнүштү аныктоо"</string>
+    <string name="custom_list_filter" msgid="2105275443109077687">"Ылайыкташтырылган көрүнүштү жөндөө"</string>
     <string name="menu_custom_filter_save" msgid="2679793632208086460">"Сактоо"</string>
     <string name="hint_findContacts" msgid="7128627979899070325">"Байланыштарды издеңиз"</string>
     <!-- no translation found for contactsFavoritesLabel (8417039765586853670) -->
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index d880cec..1771739 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Создајте етикета"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Преименувајте ја етикетата"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Име на етикетата"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Име на етикета"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Гласовен разговор"</string>
     <string name="video_chat" msgid="1872255818640336072">"Видео разговор"</string>
     <string name="connections" msgid="8098440723172028350">"Врски"</string>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 5c0bc0d..727716b 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Шошго үүсгэх"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Шошгын нэрийг өөрчлөх"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Шошгын нэр"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Шошгын нэр"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Дуут чат"</string>
     <string name="video_chat" msgid="1872255818640336072">"Видео чат"</string>
     <string name="connections" msgid="8098440723172028350">"Холболтууд"</string>
@@ -283,7 +282,7 @@
     <string name="header_organization_entry" msgid="8515394955666265406">"Байгууллага"</string>
     <string name="header_nickname_entry" msgid="6743561883967451485">"Хоч"</string>
     <string name="header_note_entry" msgid="4320190426480612344">"Тэмдэглэл"</string>
-    <string name="header_website_entry" msgid="1411467850000824745">"Вебсайт"</string>
+    <string name="header_website_entry" msgid="1411467850000824745">"Вэбсайт"</string>
     <string name="header_event_entry" msgid="6738250422744401460">"Үйл явдал"</string>
     <string name="header_relation_entry" msgid="1520292958088146460">"Хамаарал"</string>
     <string name="header_account_entry" msgid="2684318506427891827">"Бүртгэл"</string>
@@ -446,7 +445,7 @@
     <string name="label_notes" msgid="8337354953278341042">"Тэмдэглэл"</string>
     <string name="label_custom_field" msgid="1994056912242214426">"Тусгай"</string>
     <string name="label_sip_address" msgid="7252153678613978127">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="4202998982804009261">"Вебсайт"</string>
+    <string name="websiteLabelsGroup" msgid="4202998982804009261">"Вэбсайт"</string>
     <string name="groupsLabel" msgid="7000816729542098972">"Шошгууд"</string>
     <string name="email_home" msgid="8573740658148184279">"Гэрийн имэйл рүү"</string>
     <string name="email_mobile" msgid="2042889209787989814">"Гар утас руу имэйлдэх"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index d2e45c1..091de3c 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -427,7 +427,7 @@
     <string name="name_family" msgid="7466985689626017037">"आडनाव"</string>
     <string name="name_prefix" msgid="59756378548779822">"नाव प्रत्यय"</string>
     <string name="name_middle" msgid="8467433655992690326">"मधले नाव"</string>
-    <string name="name_suffix" msgid="3855278445375651441">"नाव प्रत्यय"</string>
+    <string name="name_suffix" msgid="3855278445375651441">"नाव"</string>
     <string name="name_phonetic" msgid="4259595234312430484">"ध्वन्यात्मक नाव"</string>
     <string name="name_phonetic_given" msgid="8723179018384187631">"ध्वन्यात्मक नाव"</string>
     <string name="name_phonetic_middle" msgid="8643721493320405200">"ध्वन्यात्मक मधले नाव"</string>
@@ -589,7 +589,7 @@
     <string name="menu_clear_frequents" msgid="7688250191932838833">"वारंवारता साफ करा"</string>
     <string name="menu_select_sim" msgid="3603578201960504010">"सिम कार्ड निवडा"</string>
     <string name="menu_accounts" msgid="1424330057450189074">"खाती व्यवस्थापित करा"</string>
-    <string name="menu_import" msgid="6107961135813836467">"आयात"</string>
+    <string name="menu_import" msgid="6107961135813836467">"आयात करा"</string>
     <string name="menu_export" msgid="2658783911863503902">"निर्यात"</string>
     <string name="menu_blocked_numbers" msgid="5272951629083025995">"अवरोधित केलेले नंबर"</string>
     <string name="contact_status_update_attribution" msgid="752179367353018597">"<xliff:g id="SOURCE">%1$s</xliff:g> द्वारे"</string>
@@ -626,7 +626,7 @@
     <string name="callDurationHourFormat" msgid="7392254193808506640">"<xliff:g id="MINUTES_0">%s</xliff:g> ता. <xliff:g id="MINUTES_1">%s</xliff:g> मि. <xliff:g id="SECONDS">%s</xliff:g> सेकंद"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="249939425761315252">"हा शॉर्टकट अक्षम केला गेला आहे"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="6845645831837615899">"संपर्क काढला होता"</string>
-    <string name="sim_import_button_text" msgid="4270841592496619317">"आयात"</string>
+    <string name="sim_import_button_text" msgid="4270841592496619317">"आयात करा"</string>
     <string name="sim_import_title_none_selected" msgid="6910517331401970693">"संपर्क निवडा"</string>
     <string name="sim_import_empty_message" msgid="7743815244380189651">"आपल्‍या सिम कार्डवर कोणतेही संपर्क नाहीत"</string>
     <string name="sim_import_contact_exists_toast" msgid="1503743663717316732">"संपर्क आधीपासून आपल्या सूचीमध्ये विद्यमान आहे"</string>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 1879793..bb0462c 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -110,9 +110,9 @@
     <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"တက်ဘလက်ထဲတွင် ပုံများ မရှိပါ"</string>
     <string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"ဖုန်းထဲတွင် ပုံများ မရှိပါ"</string>
     <string name="attach_photo_dialog_title" msgid="5599827035558557169">"လိပ်စာရဲ့ဓာတ်ပုံ"</string>
-    <string name="customLabelPickerTitle" msgid="1081475101983255212">"စိတ်ကြိုက် လေဘယ်လ်နာမည်"</string>
+    <string name="customLabelPickerTitle" msgid="1081475101983255212">"စိတ်ကြိုက် အညွှန်းအမည်"</string>
     <string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"ဖုန်းများအား အသံစာပို့စနစ်သို့ ပို့လိုက်ပါ"</string>
-    <string name="removePhoto" msgid="4898105274130284565">"ပုံအားဖယ်ရှားပါ"</string>
+    <string name="removePhoto" msgid="4898105274130284565">"ပုံကို ဖယ်ရှားပါ"</string>
     <string name="noContacts" msgid="2228592924476426108">"သင့်အဆက်အသွယ်များစာရင်းတွင် မည်သူမျှမရှိပါ"</string>
     <string name="noGroups" msgid="4607906327968232225">"အညွှန်းများမရှိပါ။"</string>
     <string name="noAccounts" msgid="7768267764545265909">"အုပ်စုများ ပြုလုပ်ရန် အကောင့်တစ်ခု လိုအပ်ပါသည်"</string>
@@ -167,7 +167,7 @@
     <string name="search_settings_description" msgid="2675223022992445813">"အဆက်အသွယ်များ၏နာမည်များ"</string>
     <string name="quickcontact_missing_app" msgid="358168575340921552">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်ပေးမည့် အက်ပ်မရှိပါ။"</string>
     <string name="quickcontact_transparent_view_description" msgid="987959416759562455">"ယခင် မျက်နှာပြင်သို့ ပြန်ရန် ကလစ်ပါ"</string>
-    <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ဖုန်းနံပါတ် ထည့်ပါ"</string>
+    <string name="quickcontact_add_phone_number" msgid="731665835910658965">"ဖုန်းနံပါတ် ထည့်ရန်"</string>
     <string name="quickcontact_add_email" msgid="739298028384348482">"အီးမေးလ် ထည့်ရန်"</string>
     <string name="missing_app" msgid="1466111003546611387">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်မည့် အက်ပ်မရှိပါ။"</string>
     <string name="menu_share" msgid="943789700636542260">"မျှဝေခြင်း"</string>
@@ -283,7 +283,7 @@
     <string name="header_organization_entry" msgid="8515394955666265406">"အဖွဲ့အစည်း"</string>
     <string name="header_nickname_entry" msgid="6743561883967451485">"နာမည်ပြောင်"</string>
     <string name="header_note_entry" msgid="4320190426480612344">"မှတ်ချက်"</string>
-    <string name="header_website_entry" msgid="1411467850000824745">"ဝက်ဘ်ဆိုက်"</string>
+    <string name="header_website_entry" msgid="1411467850000824745">"ဝဘ်ဆိုက်"</string>
     <string name="header_event_entry" msgid="6738250422744401460">"ဖြစ်ရပ်"</string>
     <string name="header_relation_entry" msgid="1520292958088146460">"တော်စပ်ပုံ"</string>
     <string name="header_account_entry" msgid="2684318506427891827">"အကောင့်"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 1a89f41..7028c31 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Label maken"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Label hernoemen"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Labelnaam"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Labelnaam"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Voicechat"</string>
     <string name="video_chat" msgid="1872255818640336072">"Videochat"</string>
     <string name="connections" msgid="8098440723172028350">"Connecties"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4e156ac..d7a90e1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -195,8 +195,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Utwórz etykietę"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Zmiana nazwy etykiety"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Nazwa etykiety"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Nazwa etykiety"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Czat głosowy"</string>
     <string name="video_chat" msgid="1872255818640336072">"Czat wideo"</string>
     <string name="connections" msgid="8098440723172028350">"Połączenia"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index c0bc5f9..f516612 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Criar marcador"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Renomear marcador"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Nome do marcador"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Nome - marcador"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Bate-papo por voz"</string>
     <string name="video_chat" msgid="1872255818640336072">"Bate-papo por vídeo"</string>
     <string name="connections" msgid="8098440723172028350">"Conexões"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3cedce4..97b9cc4 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Criar etiqueta"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Mudar o nome da etiqueta"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Nome da etiqueta"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Nome etiqueta"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Chat de voz"</string>
     <string name="video_chat" msgid="1872255818640336072">"Chat de vídeo"</string>
     <string name="connections" msgid="8098440723172028350">"Ligações"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c0bc5f9..f516612 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Criar marcador"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Renomear marcador"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Nome do marcador"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Nome - marcador"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Bate-papo por voz"</string>
     <string name="video_chat" msgid="1872255818640336072">"Bate-papo por vídeo"</string>
     <string name="connections" msgid="8098440723172028350">"Conexões"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index abf8fa3..8c98bcc 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -167,8 +167,8 @@
     <string name="search_settings_description" msgid="2675223022992445813">"ඔබගේ සම්බන්ධතා වල නම්"</string>
     <string name="quickcontact_missing_app" msgid="358168575340921552">"මෙම ක්‍රියාව හැසිරවීමට යෙදුමක් සොයාගත්තේ නැත"</string>
     <string name="quickcontact_transparent_view_description" msgid="987959416759562455">"පෙර තිරයට යෑම ආපසු යෑම ක්ලික් කරන්න"</string>
-    <string name="quickcontact_add_phone_number" msgid="731665835910658965">"දුරකථන අංකයක් එකතු කරන්න"</string>
-    <string name="quickcontact_add_email" msgid="739298028384348482">"ඊ-තැපෑලක් එකතු කරන්න"</string>
+    <string name="quickcontact_add_phone_number" msgid="731665835910658965">"දුරකථන අංකයක් එක් කරන්න"</string>
+    <string name="quickcontact_add_email" msgid="739298028384348482">"ඊ-තැපෑලක් එක් කරන්න"</string>
     <string name="missing_app" msgid="1466111003546611387">"මෙම ක්‍රියාව හැසිරවීමට යෙදුමක් සොයාගත්තේ නැත"</string>
     <string name="menu_share" msgid="943789700636542260">"බෙදාගන්න"</string>
     <string name="menu_add_contact" msgid="3198704337220892684">"සම්බන්ධතා වලට එක් කරන්න"</string>
@@ -527,7 +527,7 @@
     <string name="fail_reason_not_supported" msgid="8219562769267148825">"මෙම ආකෘතිය වෙත සහාය නොදක්වයි."</string>
     <string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="6427931733267328564">"ලබාදුන් vCard ගොනු(ව) වල පාර දත්ත එකතු කළ නොහැකි විය."</string>
     <string name="fail_reason_failed_to_read_files" msgid="5823434810622484922">"ගොනු එකක් හෝ කිහිපයක් ආයාත කිරීමට නොහැකි විය (%s)."</string>
-    <string name="exporting_vcard_finished_title" msgid="4767045779458185251">"<xliff:g id="FILENAME">%s</xliff:g> නිර්යාත කිරීම සම්පූර්ණ කෙරුණි."</string>
+    <string name="exporting_vcard_finished_title" msgid="4767045779458185251">"<xliff:g id="FILENAME">%s</xliff:g> නිර්යාත කිරීම අවසන් කෙරුණි."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="6060472638008218274">"සම්බන්ධතා නිර්යාත කිරීම සම්පූර්ණ කරන ලදී."</string>
     <string name="exporting_vcard_finished_toast" msgid="1739055986856453882">"සම්බන්ධතා නිර්යාත කිරීම අවසන්ය, සම්බන්ධතා බෙදා ගැනීමට දැනුම්දීම ක්ලික් කරන්න."</string>
     <string name="touch_to_share_contacts" msgid="4882485525268469736">"සම්බන්ධතා බෙදා ගැනීමට තට්ටු කරන්න."</string>
@@ -542,7 +542,7 @@
     <string name="importing_vcard_description" msgid="4245275224298571351">"<xliff:g id="NAME">%s</xliff:g> ආයාත කරමින්"</string>
     <string name="reading_vcard_failed_title" msgid="4251647443358422855">"vCard දත්ත කියවිය නොහැක"</string>
     <string name="reading_vcard_canceled_title" msgid="1925216585981542019">"vCard දත්ත කියවීම අවලංගු කෙරුණි"</string>
-    <string name="importing_vcard_finished_title" msgid="3341541727268747967">"vCard <xliff:g id="FILENAME">%s</xliff:g> ආයාත කිරීම සම්පූර්ණ විය"</string>
+    <string name="importing_vcard_finished_title" msgid="3341541727268747967">"vCard <xliff:g id="FILENAME">%s</xliff:g> ආයාත කිරීම අවසන් විය"</string>
     <string name="importing_vcard_canceled_title" msgid="2147475978165599336">"<xliff:g id="FILENAME">%s</xliff:g> ආයාත කිරීම අවලංගු කෙරුණි"</string>
     <string name="vcard_import_will_start_message" msgid="2804911199145873396">"<xliff:g id="FILENAME">%s</xliff:g> කෙටි වේලාවකින් ආයාත වනු ඇත."</string>
     <string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"ගොනුව කෙටි වේලාවකින් ආයාත කරනු ඇත."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3339063..eb72c19 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -195,8 +195,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Vytvorenie štítka"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Premenovanie štítka"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Názov štítka"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Názov štítka"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Hlasový čet"</string>
     <string name="video_chat" msgid="1872255818640336072">"Videohovor"</string>
     <string name="connections" msgid="8098440723172028350">"Spojenia"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 2373c11..d0ba46b 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -210,7 +210,7 @@
     <string name="take_photo" msgid="7496128293167402354">"Posnemi fotografijo"</string>
     <string name="take_new_photo" msgid="7341354729436576304">"Posnemi novo fotografijo"</string>
     <string name="pick_photo" msgid="2129509985223564942">"Izberi fotografijo"</string>
-    <string name="pick_new_photo" msgid="9122450996263688237">"Izberite novo fotografijo"</string>
+    <string name="pick_new_photo" msgid="9122450996263688237">"Izberi novo fotografijo"</string>
     <string name="search_results_searching" msgid="3984833028938569930">"Iskanje ..."</string>
     <string name="menu_display_selected" msgid="6470001164297969034">"Pokaži izbrane"</string>
     <string name="menu_display_all" msgid="8887488642609786198">"Pokaži vse"</string>
@@ -233,7 +233,7 @@
     <string name="contact_directory_description" msgid="683398073603909119">"Imenik <xliff:g id="TYPE">%1$s</xliff:g>"</string>
     <string name="activity_title_settings" msgid="5464130076132770781">"Nastavitve"</string>
     <string name="menu_settings" msgid="377929915873428211">"Nastavitve"</string>
-    <string name="menu_help" msgid="1680178646764069976">"Pomoč in povratne informacije"</string>
+    <string name="menu_help" msgid="1680178646764069976">"Pomoč in povr. informacije"</string>
     <string name="preference_displayOptions" msgid="1341720270148252393">"Možnosti prikaza"</string>
     <string name="organization_company_and_title" msgid="6718207751363732025">"<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="1541655052330027380">"Telefonska številka"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2ad95b1..26e185f 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -188,8 +188,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Направите ознаку"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Преименујте ознаку"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Име ознаке"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Име ознаке"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Аудио ћаскање"</string>
     <string name="video_chat" msgid="1872255818640336072">"Видео ћаскање"</string>
     <string name="connections" msgid="8098440723172028350">"Везе"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c2cb238..00b98d4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Skapa etikett"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Byt namn på etikett"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Etikettnamn"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Etikettnamn"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Röstchatt"</string>
     <string name="video_chat" msgid="1872255818640336072">"Videochatt"</string>
     <string name="connections" msgid="8098440723172028350">"Anslutningar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1aecc8b..5ee6aee 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -497,7 +497,7 @@
     <string name="menu_done" msgid="796017761764190697">"Kwisha"</string>
     <string name="menu_doNotSave" msgid="58593876893538465">"Ghairi"</string>
     <string name="listCustomView" msgid="1840624396582117590">"Mwonekano maalum"</string>
-    <string name="dialog_new_contact_account" msgid="4969619718062454756">"Hifadhi anwani zinazoingizwa kwenye:"</string>
+    <string name="dialog_new_contact_account" msgid="4969619718062454756">"Hifadhi anwani zinazoletwa kwenye:"</string>
     <string name="import_from_sim" msgid="6912071635295799131">"SIM kadi"</string>
     <string name="import_from_sim_summary_fmt" msgid="5169032449686348118">"SIM ya <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
     <plurals name="import_from_sim_secondary_contact_count_fmt" formatted="false" msgid="5821095773211149295">
@@ -544,7 +544,7 @@
     <string name="importing_vcard_description" msgid="4245275224298571351">"Inaingiza <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="reading_vcard_failed_title" msgid="4251647443358422855">"Haikuweza kusoma data ya vKadi"</string>
     <string name="reading_vcard_canceled_title" msgid="1925216585981542019">"Kusoma data ya VCard kumeghairiwa"</string>
-    <string name="importing_vcard_finished_title" msgid="3341541727268747967">"Imemaliza kuingiza vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
+    <string name="importing_vcard_finished_title" msgid="3341541727268747967">"Imemaliza kuleta vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="importing_vcard_canceled_title" msgid="2147475978165599336">"Kuingiza <xliff:g id="FILENAME">%s</xliff:g> kumeghairiwa"</string>
     <string name="vcard_import_will_start_message" msgid="2804911199145873396">"<xliff:g id="FILENAME">%s</xliff:g> italetwa hivi karibuni."</string>
     <string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"Faili italetwa hivi karibuni."</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 6f0c313..f71eba8 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"สร้างป้ายกำกับ"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"เปลี่ยนชื่อป้ายกำกับ"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"ชื่อป้ายกำกับ"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"ชื่อป้ายกำกับ"</string>
     <string name="audio_chat" msgid="2535716629358298691">"แชทด้วยเสียง"</string>
     <string name="video_chat" msgid="1872255818640336072">"วิดีโอแชท"</string>
     <string name="connections" msgid="8098440723172028350">"การเชื่อมต่อ"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 53d1cac..849f490 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Etiket oluşturun"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Etiketi yeniden adlandırın"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Etiket adı"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Etiket adı"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Sesli sohbet"</string>
     <string name="video_chat" msgid="1872255818640336072">"Görüntülü sohbet"</string>
     <string name="connections" msgid="8098440723172028350">"Bağlantılar"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index bfc03d4..004ab4f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -195,8 +195,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Створити мітку"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Перейменувати мітку"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Назва мітки"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Назва мітки"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Голосовий чат"</string>
     <string name="video_chat" msgid="1872255818640336072">"Відеочат"</string>
     <string name="connections" msgid="8098440723172028350">"Зв’язки"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 6cd3cee..7e4e0b0 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"لیبل تخلیق کریں"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"لیبل کا نام تبدیل کریں"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"لیبل کا نام"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"لیبل کا نام"</string>
     <string name="audio_chat" msgid="2535716629358298691">"صوتی چیٹ"</string>
     <string name="video_chat" msgid="1872255818640336072">"ویڈیو چیٹ"</string>
     <string name="connections" msgid="8098440723172028350">"کنکشنز"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 705e784..1394c34 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"建立標籤"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"重新命名標籤"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"標籤名稱"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"標籤名稱"</string>
     <string name="audio_chat" msgid="2535716629358298691">"話音通訊"</string>
     <string name="video_chat" msgid="1872255818640336072">"視像通訊"</string>
     <string name="connections" msgid="8098440723172028350">"聯繫"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index bb5b553..1ec8357 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -181,8 +181,7 @@
     <string name="group_name_dialog_insert_title" msgid="2668452090427027941">"Dala ilebula"</string>
     <string name="group_name_dialog_update_title" msgid="6328021162869677383">"Qamba kabusha ilebula"</string>
     <string name="group_name_dialog_hint" msgid="7624523157537700160">"Igama lelebula"</string>
-    <!-- no translation found for label_name_dialog_hint (1276051790427638142) -->
-    <skip />
+    <string name="label_name_dialog_hint" msgid="1276051790427638142">"Igama lelebula"</string>
     <string name="audio_chat" msgid="2535716629358298691">"Ingxoxo yezw"</string>
     <string name="video_chat" msgid="1872255818640336072">"Ingxoxo yevidiyo"</string>
     <string name="connections" msgid="8098440723172028350">"Oxhumana nabo"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e2f6043..5a0610b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -209,8 +209,8 @@
 
     <!-- List header indicating the number of contacts and account name in the list [CHAR LIMIT=30] -->
     <plurals name="contacts_count_with_account">
-        <item quantity="one"><xliff:g id="count">%d</xliff:g> contact · <xliff:g id="account">%s</xliff:g></item>
-        <item quantity="other"><xliff:g id="count">%d</xliff:g> contacts · <xliff:g id="account">%s</xliff:g></item>
+        <item quantity="one"><xliff:g id="count">%1$d</xliff:g> contact · <xliff:g id="account">%2$s</xliff:g></item>
+        <item quantity="other"><xliff:g id="count">%1$d</xliff:g> contacts · <xliff:g id="account">%2$s</xliff:g></item>
     </plurals>
 
     <!-- Activity title indicating contacts are from a Google account [CHAR LIMIT=30] -->
@@ -438,9 +438,6 @@
     -->
     <string name="description_plus_button">plus</string>
 
-    <!-- Message in progress bar while exporting contact list to a file "(current number) of (total number) contacts" The order of "current number" and "total number" cannot be changed (like "total: (total number), current: (current number)")-->
-    <string name="exporting_contact_list_progress"><xliff:g id="current_number">%s</xliff:g> of <xliff:g id="total_number">%s</xliff:g> contacts</string>
-
     <!-- The string used to describe Contacts as a searchable item within system search settings. -->
     <string name="search_settings_description">Names of your contacts</string>
 
@@ -798,7 +795,7 @@
     <string name="tomorrow_at_time_fmt">"Tomorrow at <xliff:g id="time_interval">%s</xliff:g>"</string>
     <!-- Format string for a date and time description.  For ex:
          "April 19, 2012, 3:00pm - 4:00pm" [CHAR LIMIT=NONE] -->
-    <string name="date_time_fmt">"<xliff:g id="date">%s</xliff:g>, <xliff:g id="time_interval">%s</xliff:g>"</string>
+    <string name="date_time_fmt">"<xliff:g id="date">%1$s</xliff:g>, <xliff:g id="time_interval">%2$s</xliff:g>"</string>
     <!-- Title for untitled calendar interactions [CHAR LIMIT=40] -->
     <string name="untitled_event">(Untitled event)</string>
 
@@ -837,7 +834,7 @@
     <string name="content_description_directions">directions to location</string>
 
     <!-- Content description for recent sms interaction [CHAR LIMIT=NONE] -->
-    <string name="content_description_recent_sms">recent sms. <xliff:g id="message_body">%s</xliff:g>. <xliff:g id="phone_number">%s</xliff:g>. <xliff:g id="date">%s</xliff:g>. click to respond</string>
+    <string name="content_description_recent_sms">recent sms. <xliff:g id="message_body">%1$s</xliff:g>. <xliff:g id="phone_number">%2$s</xliff:g>. <xliff:g id="date">%3$s</xliff:g>. click to respond</string>
 
     <!-- Header for the Relation entry [CHAR LIMIT=NONE] -->
     <string name="content_description_recent_call_type_incoming">incoming</string>
@@ -847,7 +844,7 @@
     <string name="content_description_recent_call_type_missed">missed</string>
 
     <!-- Content description for recent sms interaction [CHAR LIMIT=NONE] -->
-    <string name="content_description_recent_call">recent call. <xliff:g id="call_type">%s</xliff:g>. <xliff:g id="phone_number">%s</xliff:g>. <xliff:g id="date">%s</xliff:g>. click to call back</string>
+    <string name="content_description_recent_call">recent call. <xliff:g id="call_type">%1$s</xliff:g>. <xliff:g id="phone_number">%2$s</xliff:g>. <xliff:g id="date">%3$s</xliff:g>. click to call back</string>
 
     <!-- Prefix for messages that you sent [CHAR LIMIT=40] -->
     <string name="message_from_you_prefix">You: <xliff:g id="sms_body">%s</xliff:g></string>
@@ -888,9 +885,6 @@
     <!-- Number of linked contacts of the current contact, only shown when there are more than 2 linked contacts (plural only!!!) [CHAR LIMIT=60] -->
     <string name="quickcontact_contacts_number"><xliff:g id="count">%d</xliff:g> linked contacts</string>
 
-    <!-- Quick contact display name with phonetic name -->
-    <string name="quick_contact_display_name_with_phonetic"><xliff:g id="display_name">%s</xliff:g> (<xliff:g id="phonetic_name">%s</xliff:g>)</string>
-
     <!-- Button used in quick contact suggestion card to link selected contacts. [CHAR LIMIT=30]-->
     <string name="quickcontact_suggestion_link_button">LINK CONTACTS</string>
 
@@ -915,9 +909,6 @@
         <item quantity="other">(<xliff:g id="count">%d</xliff:g>)</item>
     </plurals>
 
-    <!-- Account type with number in quick contact suggestion card [CHAR LIMIT=30]-->
-    <string name="quickcontact_suggestion_account_type"><xliff:g id="account_type">%s</xliff:g><xliff:g id="account_type_number">%s</xliff:g></string>
-
     <!-- "This contact" title showing in suggestion card in Quick contact. [CHAR LIMIT=30]-->
     <string name="suggestion_card_this_contact_title">This contact</string>
 
@@ -941,20 +932,12 @@
 
     <!-- Content description of delete button to the right of each section in editor, including
     data type. For example: Delete Home Phone, Delete Work Email, etc [CHAR LIMIT=30]-->
-    <string name="editor_delete_view_description">Delete <xliff:g id="data_type">%s </xliff:g><xliff:g id="data_kind">%s</xliff:g></string>
+    <string name="editor_delete_view_description">Delete <xliff:g id="data_type">%1$s </xliff:g><xliff:g id="data_kind">%2$s</xliff:g></string>
 
     <!-- Content description of delete button to the right of each section in editor, without data
     type. For example: Delete Website, Delete SIP, etc [CHAR LIMIT=30]-->
     <string name="editor_delete_view_description_short">Delete <xliff:g id="data_kind">%s</xliff:g></string>
 
-    <!-- Content description of photo in photo picker indicating a photo from a specific account is *not* selected.
-         For example: Photo from Google abc@gmail.com not checked. [CHAR LIMIT=60]-->
-    <string name="photo_view_description_not_checked">Photo from <xliff:g id="account_type">%s </xliff:g><xliff:g id="user_name">%s </xliff:g>not checked</string>
-
-    <!-- Content description of photo in photo picker indicating a photo from a specific account is selected.
-         For example: Photo from Google abc@gmail.com checked. [CHAR LIMIT=60]-->
-    <string name="photo_view_description_checked">Photo from <xliff:g id="account_type">%s </xliff:g><xliff:g id="user_name">%s </xliff:g>checked</string>
-
     <!-- Content description of photo in photo picker indicating a photo from unknown account is *not* selected.-->
     <string name="photo_view_description_not_checked_no_info">Photo from unknown account not checked</string>
 
@@ -1462,7 +1445,7 @@
 
     <!-- The failed reason shown when vCard importer/exporter could not open the file
          specified by a user. The file name should be in the message. [CHAR LIMIT=NONE] -->
-    <string name="fail_reason_could_not_open_file">Couldn\'t open \"<xliff:g id="file_name">%s</xliff:g>\": <xliff:g id="exact_reason">%s</xliff:g>.</string>
+    <string name="fail_reason_could_not_open_file">Couldn\'t open \"<xliff:g id="file_name">%1$s</xliff:g>\": <xliff:g id="exact_reason">%2$s</xliff:g>.</string>
 
     <!-- The failed reason shown when contacts exporter fails to be initialized.
          Some exact reason must follow this. [CHAR LIMIT=NONE]-->
@@ -1626,7 +1609,7 @@
          Second argument is the total number of contacts.
          Third argument is the name of a contact which is being read.
          [CHAR LIMIT=20] -->
-    <string name="progress_notifier_message">Importing <xliff:g id="current_number">%s</xliff:g>/<xliff:g id="total_number">%s</xliff:g>: <xliff:g id="name" example="Joe Due">%s</xliff:g></string>
+    <string name="progress_notifier_message">Importing <xliff:g id="current_number">%1$s</xliff:g>/<xliff:g id="total_number">%2$s</xliff:g>: <xliff:g id="name" example="Joe Due">%3$s</xliff:g></string>
 
     <!-- Action that exports all contacts to a user selected destination. [CHAR LIMIT=25] -->
     <string name="export_to_vcf_file" product="default">Export to .vcf file</string>
@@ -1849,10 +1832,10 @@
     <string name="callDurationSecondFormat"><xliff:g id="seconds">%s</xliff:g> sec</string>
 
     <!-- Formatted call duration displayed in recent card in QuickContact, for duration less than 1 hour -->
-    <string name="callDurationMinuteFormat"><xliff:g id="minutes">%s</xliff:g> min <xliff:g id="seconds">%s</xliff:g> sec</string>
+    <string name="callDurationMinuteFormat"><xliff:g id="minutes">%1$s</xliff:g> min <xliff:g id="seconds">%2$s</xliff:g> sec</string>
 
     <!-- Formatted call duration displayed in recent card in QuickContact, for duration more than 1 hour -->
-    <string name="callDurationHourFormat"><xliff:g id="minutes">%s</xliff:g> hr <xliff:g id="minutes">%s</xliff:g> min <xliff:g id="seconds">%s</xliff:g> sec</string>
+    <string name="callDurationHourFormat"><xliff:g id="minutes">%1$s</xliff:g> hr <xliff:g id="minutes">%2$s</xliff:g> min <xliff:g id="seconds">%3$s</xliff:g> sec</string>
 
     <!-- Toast shown when a dynamic shortcut is tapped after being disabled because the experiment was turned off on the device -->
     <string name="dynamic_shortcut_disabled_message">This shortcut has been disabled</string>
diff --git a/src/com/android/contacts/ContactsDrawerActivity.java b/src/com/android/contacts/ContactsDrawerActivity.java
index 2e024d4..2d3c329 100644
--- a/src/com/android/contacts/ContactsDrawerActivity.java
+++ b/src/com/android/contacts/ContactsDrawerActivity.java
@@ -48,6 +48,7 @@
 
 import com.android.contacts.activities.ActionBarAdapter;
 import com.android.contacts.common.ContactsUtils;
+import com.android.contacts.common.Experiments;
 import com.android.contacts.common.compat.CompatUtils;
 import com.android.contacts.common.list.AccountFilterActivity;
 import com.android.contacts.common.list.ContactListFilter;
@@ -78,6 +79,7 @@
 import com.android.contacts.util.SharedPreferenceUtil;
 import com.android.contactsbind.HelpUtils;
 import com.android.contactsbind.ObjectFactory;
+import com.android.contactsbind.experiments.Flags;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -438,7 +440,8 @@
                     }
                 });
 
-                updateMenuContentDescription(menuItem, getString(R.string.group_name_dialog_hint));
+                updateMenuContentDescription(menuItem,
+                        getString(R.string.group_edit_field_hint_text));
             }
         }
 
diff --git a/src/com/android/contacts/activities/ActionBarAdapter.java b/src/com/android/contacts/activities/ActionBarAdapter.java
index 880aa63..c91f608 100644
--- a/src/com/android/contacts/activities/ActionBarAdapter.java
+++ b/src/com/android/contacts/activities/ActionBarAdapter.java
@@ -448,22 +448,24 @@
                         final ArrayList<View> outViews = new ArrayList<>();
                         decorView.findViewsWithText(outViews, overflowDescription,
                                 View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION);
-                        if (outViews.isEmpty()) {
-                            return;
-                        }
-                        final ImageView overflow = (ImageView) outViews.get(0);
-                        overflow.setImageResource(R.drawable.ic_more_vert);
 
-                        // Update the overflow image color.
-                        final int iconColor;
-                        if (mSelectionMode) {
-                            iconColor = mActivity.getResources().getColor(
-                                    R.color.actionbar_color_grey_solid);
-                        } else {
-                            iconColor = mActivity.getResources().getColor(
-                                    R.color.actionbar_text_color);
+                        for (View view : outViews) {
+                            if (!(view instanceof ImageView)) {
+                                continue;
+                            }
+                            final ImageView overflow = (ImageView) view;
+
+                            // Update the overflow image color.
+                            final int iconColor;
+                            if (mSelectionMode) {
+                                iconColor = mActivity.getResources().getColor(
+                                        R.color.actionbar_color_grey_solid);
+                            } else {
+                                iconColor = mActivity.getResources().getColor(
+                                        R.color.actionbar_text_color);
+                            }
+                            overflow.setImageTintList(ColorStateList.valueOf(iconColor));
                         }
-                        overflow.setImageTintList(ColorStateList.valueOf(iconColor));
 
                         // We're done, remove the listener.
                         decorView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index cdea930..c3308b5 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -739,7 +739,9 @@
 
         final AccessibilityManager am =
                 (AccessibilityManager) getSystemService(Context.ACCESSIBILITY_SERVICE);
-        final int length = am.isEnabled() ? Snackbar.LENGTH_INDEFINITE : Snackbar.LENGTH_LONG;
+        //TODO set to INDEFINITE and track user interaction to dismiss b/33208886
+        final int accessibilityLength = 15000;
+        final int length = am.isEnabled() ? accessibilityLength : Snackbar.LENGTH_LONG;
         final String message = getString(R.string.groupDeletedToast);
 
         final Snackbar snackbar = Snackbar.make(mLayoutRoot, message, length)
diff --git a/src/com/android/contacts/editor/PickRawContactDialogFragment.java b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
index eacb3cc..6d6d4d6 100644
--- a/src/com/android/contacts/editor/PickRawContactDialogFragment.java
+++ b/src/com/android/contacts/editor/PickRawContactDialogFragment.java
@@ -181,30 +181,33 @@
         mAdapter = new RawContactAccountListAdapter(getContext(), metadata);
         if (metadata.showReadOnly) {
             builder.setTitle(R.string.contact_editor_pick_linked_contact_dialog_title);
-            builder.setPositiveButton(R.string.contact_editor_add_linked_contact,
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            mShouldFinishActivity = false;
-                            final Intent intent = new Intent(getActivity(),
-                                    ContactSelectionActivity.class);
-                            intent.setAction(UiIntentActions.PICK_JOIN_CONTACT_ACTION);
-                            intent.putExtra(UiIntentActions.TARGET_CONTACT_ID_EXTRA_KEY,
-                                    metadata.contactId);
-                            getActivity().startActivityForResult(intent, REQUEST_CODE_JOIN);
-                        }
-                    });
-            builder.setNegativeButton(R.string.contact_editor_unlink_contacts,
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            mShouldFinishActivity = false;
-                            final SplitContactConfirmationDialogFragment splitDialog = new
-                                    SplitContactConfirmationDialogFragment();
-                            splitDialog.show(getActivity().getFragmentManager(),
-                                    SplitContactConfirmationDialogFragment.TAG);
-                        }
-                    });
+            // Only provide link editing options for non-user profile contacts.
+            if (!metadata.isUserProfile) {
+                builder.setPositiveButton(R.string.contact_editor_add_linked_contact,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                mShouldFinishActivity = false;
+                                final Intent intent = new Intent(getActivity(),
+                                        ContactSelectionActivity.class);
+                                intent.setAction(UiIntentActions.PICK_JOIN_CONTACT_ACTION);
+                                intent.putExtra(UiIntentActions.TARGET_CONTACT_ID_EXTRA_KEY,
+                                        metadata.contactId);
+                                getActivity().startActivityForResult(intent, REQUEST_CODE_JOIN);
+                            }
+                        });
+                builder.setNegativeButton(R.string.contact_editor_unlink_contacts,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int which) {
+                                mShouldFinishActivity = false;
+                                final SplitContactConfirmationDialogFragment splitDialog = new
+                                        SplitContactConfirmationDialogFragment();
+                                splitDialog.show(getActivity().getFragmentManager(),
+                                        SplitContactConfirmationDialogFragment.TAG);
+                            }
+                        });
+            }
         } else {
             builder.setTitle(R.string.contact_editor_pick_raw_contact_to_edit_dialog_title);
         }
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 81a3741..fcd0a50 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2560,6 +2560,7 @@
 
     @Override
     public void onDestroy() {
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(mListener);
         super.onDestroy();
     }