diff --git a/res-common/values-af-sw600dp/strings.xml b/res-common/values-af-sw600dp/strings.xml
deleted file mode 100644
index d4bda3f..0000000
--- a/res-common/values-af-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Net tablet, ongesinkroniseerde"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Daar is geen kontakte wat uitgevoer kan word nie. As jy wel kontakte op jou tablet het, laat sommige dataverskaffers dalk nie toe dat die kontakte van die tablet af uitgevoer word nie."</string>
-</resources>
diff --git a/res-common/values-af/strings.xml b/res-common/values-af/strings.xml
index a6f4bad..b7d487d 100644
--- a/res-common/values-af/strings.xml
+++ b/res-common/values-af/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Bel werkroeper"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Bel <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Bel MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Bel)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS huis"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS selfoon"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS werkroeper"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Boodskap)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Maak video-oproep"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Vee gereeld-gekontaktes uit?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Jy gaan die gereeld gekontak-lys in die Kontakte- en Foon-program uitvee en e-posprogramme dwing om jou adresvoorkeure van nuuts af te leer."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontakte"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Ander"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Gids"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Werkgids"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Werkgids"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Alle kontakte"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ek"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Soek tans…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Gereeld gekontak"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Bekyk kontak"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Alle kontakte met foonnommers"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Werkprofielkontakte"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Werkprofielkontakte"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Bekyk opdaterings"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Net foon, ongesinkroniseerde"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Net foon, ongesinkroniseer"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Naam"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Bynaam"</string>
     <string name="full_name" msgid="885420216812981202">"Naam"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Een of meer lêers kon nie ingevoer word nie (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Klaar met uitvoer van <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Het kontakte klaar uitgevoer."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontakte is klaar uitgevoer; klik die kennisgewing om kontakte te deel."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Tik om kontakte te deel."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Uitvoer van <xliff:g id="FILENAME">%s</xliff:g> is gekanselleer."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Voer kontakdata uit"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontakdata word tans uitgevoer."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Jou kontakdata word uitgevoer na: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Kon nie databasis-inligting kry nie"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Daar is geen kontakte wat uitgevoer kan word nie. As jy kontakte op jou foon het, kan sommige dataverskaffers dalk nie toelaat dat die foon se kontakte uitgevoer word nie."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Daar is geen kontakte wat uitgevoer kan word nie. As jy kontakte op jou foon het, kan sommige dataverskaffers dalk nie toelaat dat die foon se kontakte uitgevoer word nie."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Die vCard-opsteller het nie behoorlik begin nie."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Kon nie uitvoer nie"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Die kontakdata is nie uitgevoer nie.\nRede: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard invoerversoek is verwerp. Probeer asseblief later weer."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> sal binnekort uitgevoer word."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Die lêer sal binnekort uitgevoer word."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontakte sal binnekort uitgevoer word."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard uitvoerversoek is verwerp. Probeer asseblief later weer."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontak"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Kas tans vCard(s) na die plaaslike tydelike berging. Die werklike invoer sal binnekort begin."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Voornaam eerste"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Van eerste"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Verstekrekening vir nuwe kontakte"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sinkroniseer kontakmetadata [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sinkroniseer kontakmetadata"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kontakmetadata-sinkroniseringrekening"</string>
     <string name="setting_about" msgid="3926137653588942297">"Meer oor Kontakte"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Instellings"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Deel sigbare kontakte"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Kon nie sigbare kontakte deel nie."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Deel gunstelingkontakte"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Deel alle kontakte"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kon nie kontakte deel nie."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Voer kontakte in/uit"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Voer kontakte in"</string>
     <string name="share_error" msgid="665756457151793108">"Hierdie kontak kan nie gedeel word nie."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Privaatheidsbeleid"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Diensbepalings"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Oopbronlisensies"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Kon nie die URL oopmaak nie."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> is gemerk"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> is nie gemerk nie"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Maak video-oproep"</string>
diff --git a/res-common/values-am-sw600dp/strings.xml b/res-common/values-am-sw600dp/strings.xml
deleted file mode 100644
index b4236a7..0000000
--- a/res-common/values-am-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"ጡባዊ-ብቻ፣ ያልተሰመረ"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"ወደ ውጭ ሊላኩ የሚችሉ እውቂያዎች የሉም። በጡባዊዎ ውስጥ እውቂያዎች ካለዎት አንዳንድ የውሂብ አቅራቢዎች እውቂያዎቹ ከጡባዊው ወደ ውጭ እንዲላኩ አይፈቅዱም።"</string>
-</resources>
diff --git a/res-common/values-am/strings.xml b/res-common/values-am/strings.xml
index 86a579c..0ada042 100644
--- a/res-common/values-am/strings.xml
+++ b/res-common/values-am/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"ለየሥራ ጥሪ ምልክት ማድረጊያ ይደውሉ"</string>
     <string name="call_assistant" msgid="5188990854852312696">"ለ<xliff:g id="ASSISTANT">%s</xliff:g> ይደውሉ"</string>
     <string name="call_mms" msgid="8998771923464696960">"ለኤም ኤም ኤስ ይደውሉ"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ጥሪ)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"ለ<xliff:g id="CUSTOM">%s</xliff:g> ጽሑፍ ይላኩ"</string>
     <string name="sms_home" msgid="7765831490534280540">"ለቤት ጽሑፍ ይላኩ"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"ለተንቀሳቃሽ ስልክ ጽሑፍ ይላኩ"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"ለሥራ ምልክት ማድረጊያ ጽሑፍ ይላኩ"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"ለ<xliff:g id="ASSISTANT">%s</xliff:g> ጽሑፍ ይላኩ"</string>
     <string name="sms_mms" msgid="4887206338311086612">"ለኤም ኤም ኤስ ጽሑፍ ይላኩ"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (መልዕክት)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"የቪዲዮ ጥሪ ያድርጉ"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"በተደጋጋሚ የተገኙ ይጽዱ?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"በእውቂያዎች እና በስልክ መተግበሪያዎች ውስጥ በተደጋጋሚ ያገኟቸውን ዝርዝር አጽድተው የኢሜይል መተግበሪያዎች ምርጫዎችዎን ከባዶ ተነስተው እንዲያውቁ ያስገድዱዋቸዋል።"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"ዕውቂያዎች"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"ሌላ"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ማውጫ"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"የሥራ ስልክ ማውጫ"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"የሥራ ስልክ ማውጫ"</string>
     <string name="local_search_label" msgid="9094584931063745728">"ሁሉም እውቂያዎች"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"እኔ"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"በመፈለግ ላይ…"</string>
@@ -89,21 +87,21 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"በተደጋጋሚ የተገኙ"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"ዕውቂያ ይመልከቱ"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"የስልክ ቁጥር ያላቸው ሁሉም ዕውቂያዎች"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"የሥራ መገለጫ ዕውቂያዎች"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"የሥራ መገለጫ እውቂያዎች"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"ዝማኔዎችን ይመልከቱ"</string>
-    <string name="account_phone" msgid="6104157990869081962">"ስልክ-ብቻ፣ ያልተመሳሰለ"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"ስልክ-ብቻ፣ ያልተመሳሰለ"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"ስም"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"ቅጽል ስም"</string>
     <string name="full_name" msgid="885420216812981202">"ስም"</string>
     <string name="name_given" msgid="4153709115654909377">"የመጀመሪያ ስም"</string>
-    <string name="name_family" msgid="5317387657540738981">"የመጨረሻ ስም"</string>
+    <string name="name_family" msgid="5317387657540738981">"የመጠሪያ ስም"</string>
     <string name="name_prefix" msgid="8219879405071462309">"ቅድመ-ስም"</string>
     <string name="name_middle" msgid="3951610314424632183">"የመካከለኛ ስም"</string>
     <string name="name_suffix" msgid="5436984808550075931">"ድህረ-ስም"</string>
     <string name="name_phonetic" msgid="2249169131785620210">"የድምፀ ልሳን ስም"</string>
     <string name="name_phonetic_given" msgid="2863316331175661852">"የመጀመሪያ ስም ፎነቲክ"</string>
     <string name="name_phonetic_middle" msgid="5970174427249235577">"የድምፀ ልሳን መካከለኛ ስም"</string>
-    <string name="name_phonetic_family" msgid="1572398622239414464">"የመጨረሻ ስም ፎነቲክ"</string>
+    <string name="name_phonetic_family" msgid="1572398622239414464">"የመጠሪያ ስም ፎነቲክ"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"ስልክ"</string>
     <string name="emailLabelsGroup" msgid="4696310712601184208">"ኢሜይል"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"አድራሻ"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"አንድ ወይም ከዚያ በላይ ፋይሎች ማስመጣት አልተቻለም (%s)።"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g>ን ወደ ውጪ መላክ ተጠናቅቋል።"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"እውቂያዎችን ወደ ውጪ መላክ ተጠናቅቋል።"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"እውቂያዎችን ወደ ውጭ መላክ ተጠናቅቋል፣ እውቂያዎችን ለማጋራት ማሳወቂያውን ጠቅ ያድርጉ።"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"እውቂያዎችን ለማጋራት መታ ያድርጉ።"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g>ን ወደ ውጪ መላክ ተሰርዟል።"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"የዕውቂያ ውሂብ ወደ ውጪ በመላክ ላይ"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"የእውቂያ ውሂብ ወደ ውጭ በመላክ ላይ።"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"የዕውቅያ ውሂብዎ ወደዚህ በመላክ ላይ ነው፦ <xliff:g id="FILE_NAME">%s</xliff:g>።"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ውሂብ ጎታ መረጃን ማግኘት አልተቻለም።"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"ወደ ውጭ ሊላኩ የሚችሉ እውቅያዎች የሉም። ስልክዎ ውስጥ እውቅያዎች ካሉዎት አንዳንድ የውሂብ አቅራቢዎች እውቂያዎቹ ከስልኩ ወደ ውጭ እንዲላኩ አይፈቅዱም።"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"ወደ ውጭ ሊላኩ የሚችሉ እውቅያዎች የሉም። ስልክዎ ውስጥ እውቅያዎች ካሉዎት አንዳንድ የውሂብ አቅራቢዎች እውቂያዎቹ ከስልኩ ወደ ውጭ እንዲላኩ አይፈቅዱም።"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"የvCard  አቀናባሪው በትክክል አልጀመረም።"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"ወደ ውጭ መላክ አልተቻለም"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"የዕውቅያ ውሂቡ ወደ ውጭ አልተላከም።\nምክንያት፦«<xliff:g id="FAIL_REASON">%s</xliff:g>»"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"የvCard ማስመጣት ጥያቄ ተቀባይነት አላገኘም። ትንሽ ቆይተው ይሞክሩ።"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> ከትንሽ ጊዜ በኋላ ወደ ውጪ ይላካል።"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ፋይሉ ትንሽ ቆይቶ ወደ ውጪ ይላካል።"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"እውቂያዎች በቅርቡ ወደ ውጭ ይላካሉ።"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"የvCard ወደ ውጪ መላክ ጥያቄ ተቀባይነት አላገኘም። ትንሽ ቆይተው ይሞከሩ።"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"እውቂያ"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(s) ወደ ጊዜያዊ ማከማቻ በመሸጎጥ ላይ ነው። ትክክለኛው ማስመጣቱ በቅርቡ ይጀምራል።"</string>
@@ -219,20 +214,15 @@
     <string name="export_to_vcf_file" product="default" msgid="4142192068495589925">"ወደ የ .vcf ፋይል ላክ"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"ደርድር በ"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"የመጀመሪያ ስም"</string>
-    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"የመጨረሻ ስም"</string>
+    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"የመጠሪያ ስም"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"የስም ቅርጸት"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"የመጀመሪያ ስም መጀመሪያ"</string>
-    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"የመጨረሻ ስም መጀመሪያ"</string>
+    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"የመጠሪያ ስም መጀመሪያ"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"ለአዲስ እውቂያዎች ነባሪ መለያ"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"የእውቂያ ዲበ ውሂብን አሥምር [የሙከራ ስሪት]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"የእውቂያ ዲበ ውሂብን አሥምር"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"የዲበ ውሂብ ስምረት መለያን ያነጋግሩ"</string>
     <string name="setting_about" msgid="3926137653588942297">"ስለዕውቂያዎች"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"ቅንብሮች"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"የሚታዩ እውቂያዎችን አጋራ"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"የሚታዩ እውቂያዎችን ማጋራት አልተሳካም።"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"ተወዳጅ እውቂያዎችን አጋራ"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"ሁሉንም እውቂያዎች አጋራ"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"እውቂያዎችን ማጋራት አልተሳካም።"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"ዕውቂያዎች ያስመጡ/ይላኩ"</string>
     <string name="dialog_import" msgid="5177004290082451296">"እውቅያዎችን ያስመጡ"</string>
     <string name="share_error" msgid="665756457151793108">"ይህ ዕውቂያ ሊጋራ አይችልም።"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"የግላዊነት መመሪያ"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"የአገልግሎት ውል"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"የክፍት ምንጭ ፍቃዶች"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"ዩ አር ኤሉን ለመክፈት አልተሳካም።"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ምልክት ተደርጎበታል"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ምልክት አልተደረገበትም"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"የቪዲዮ ጥሪ አስቀምጥ"</string>
diff --git a/res-common/values-ar-sw600dp/strings.xml b/res-common/values-ar-sw600dp/strings.xml
deleted file mode 100644
index 36346ad..0000000
--- a/res-common/values-ar-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"الجهاز اللوحي فقط، غير متزامنة"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"ليست هناك أية جهات اتصال قابلة للتصدير. إذا كانت لديك جهات اتصال على الجهاز اللوحي، فإن بعض موفري البيانات لا يسمحون بتصدير جهات الاتصال من الجهاز اللوحي."</string>
-</resources>
diff --git a/res-common/values-ar/strings.xml b/res-common/values-ar/strings.xml
index e27274d..2981d49 100644
--- a/res-common/values-ar/strings.xml
+++ b/res-common/values-ar/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"الاتصال بجهاز نداء العمل"</string>
     <string name="call_assistant" msgid="5188990854852312696">"الاتصال بـ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"اتصال بهاتف رسائل الوسائط المتعددة"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (اتصال)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"إرسال رسالة نصية إلى <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"إرسال رسالة نصية إلى هاتف منزلي"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"إرسال رسالة نصية إلى جوال"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"إرسال رسالة نصية إلى جهاز نداء العمل"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"إرسال رسالة نصية إلى <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"إرسال رسالة نصية إلى هاتف رسائل الوسائط المتعددة"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (رسالة)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"إجراء مكالمة فيديو"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"محو قائمة من يتم الاتصال بهم كثيرًا؟"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"ستمحو قائمة من يتم الاتصال بهم كثيرًا في تطبيقي جهات الاتصال والهاتف، وستفرض على تطبيقات البريد الإلكتروني التعرف على تفضيلات توجيه الرسائل من البداية."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"جهات الاتصال"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"غير ذلك"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"الدليل"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"دليل العمل"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"دليل العمل"</string>
     <string name="local_search_label" msgid="9094584931063745728">"جميع جهات الاتصال"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"أنا"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"جارٍ البحث..."</string>
@@ -93,9 +91,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"يتم الاتصال بها بشكل متكرر"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"عرض جهة الاتصال"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"جميع جهات الاتصال التي لها أرقام هواتف"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"جهات الاتصال للملف الشخصي للعمل"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"جهات الاتصال للملف الشخصي للعمل"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"عرض التحديثات"</string>
-    <string name="account_phone" msgid="6104157990869081962">"الهاتف فقط، غير متزامنة"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"الهاتف فقط، غير متزامنة"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"الاسم"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"اللقب"</string>
     <string name="full_name" msgid="885420216812981202">"الاسم"</string>
@@ -191,13 +189,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"‏تعذر استيراد ملف أو أكثر (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"تم الانتهاء من تصدير <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"تم الانتهاء من تصدير جهات الاتصال."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"تم الانتهاء من تصدير جهات الاتصال، انقر على الإشعار لمشاركة جهات الاتصال."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"انقر لمشاركة جهات الاتصال."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"تم إلغاء تصدير <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"تصدير بيانات جهة الاتصال"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"يجري تصدير بيانات جهات الاتصال."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"يجري تصدير بيانات جهات الاتصال إلى: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"تعذر الحصول على معلومات قاعدة البيانات."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"ليست هناك أية جهات اتصال قابلة للتصدير. إذا كانت لديك جهات اتصال على هاتفك، فإن بعض موفري البيانات لا يسمحون بتصدير جهات الاتصال من الهاتف."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"ليست هناك أية جهات اتصال قابلة للتصدير. إذا كانت لديك جهات اتصال على هاتفك، فإن بعض موفري البيانات لا يسمحون بتصدير جهات الاتصال من الهاتف."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"‏لم يبدأ مؤلف vCard بشكل صحيح."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"تعذر التصدير"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"لم يتم تصدير بيانات جهة الاتصال.\nالسبب: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -211,7 +207,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"‏تم رفض طلب استيراد vCard. أعد المحاولة لاحقًا."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"سيتم تصدير <xliff:g id="FILENAME">%s</xliff:g> بعد قليل."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"سيتم تصدير الملف بعد قليل."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"سيتم تصدير جهات الاتصال قريبًا."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"‏تم رفض طلب تصدير vCard. أعد المحاولة لاحقًا."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"جهة اتصال"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"‏يجري تخزين ملفات vCard مؤقتًا على وحدة تخزين مؤقتة محلية. سيبدأ الاستيراد الفعلي قريبًا."</string>
@@ -228,15 +223,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"الاسم الأول أولاً"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"اسم العائلة /الاسم الأول"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"الحساب الافتراضي لجهات الاتصال الجديدة"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"‏مزامنة البيانات الوصفية لجهات الاتصال [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"مزامنة البيانات الوصفية لجهات الاتصال"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"حساب مزامنة البيانات الوصفية لجهات الاتصال"</string>
     <string name="setting_about" msgid="3926137653588942297">"حول جهات الاتصال"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"الإعدادات"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"مشاركة جهات الاتصال المرئية"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"أخفقت مشاركة جهات الاتصال المرئية."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"مشاركة جهات الاتصال المفضلة"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"مشاركة جميع جهات الاتصال"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"أخفقت مشاركة جهات الاتصال."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"استيراد/تصدير جهات اتصال"</string>
     <string name="dialog_import" msgid="5177004290082451296">"استيراد جهات الاتصال"</string>
     <string name="share_error" msgid="665756457151793108">"لا يمكن مشاركة جهة الاتصال هذه."</string>
@@ -282,7 +272,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"سياسة الخصوصية"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"بنود الخدمة"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"تراخيص البرامج مفتوحة المصدر"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"‏فشل فتح عنوان URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"تم تحديد <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"لم يتم تحديد <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"إجراء مكالمة فيديو"</string>
diff --git a/res-common/values-az-rAZ-sw600dp/strings.xml b/res-common/values-az-rAZ-sw600dp/strings.xml
deleted file mode 100644
index 3f63244..0000000
--- a/res-common/values-az-rAZ-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Yalnız planşet, sinxronsuz"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Eksport oluna bilən kontakt yoxdur. Əgər planşetinizdə kontakt varsa, bəzi data provayderləri kontaktların telefondan kənara eksport olunmasına icazə verməyə bilər."</string>
-</resources>
diff --git a/res-common/values-az-rAZ/strings.xml b/res-common/values-az-rAZ/strings.xml
index 1d706f4..bea462b 100644
--- a/res-common/values-az-rAZ/strings.xml
+++ b/res-common/values-az-rAZ/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"İş peycerinə zəng"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Zəng <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS zəngi"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Zəng)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Mətn <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Ev mətni"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Mobil mətn"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"İş peyceri nömrəsinə mesaj"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Mətn <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS nömrəsinə mesaj"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Mesaj)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Video zəng edin"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Tez-tez ünsiyyət qurulanlar silinsin?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Əlaqələr və Telefon proqramlarında tez-tez əlaqə saxlanılanların siyahısını siləcəksiniz və fraqmentdən ünvanlama seçimlərinizi öyrənmək üçün e-poçt proqramlarını məcbur edəcəksiniz."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontaktlar"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Digər"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Kataloq"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"İş kataloqu"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"İş Kataloqu"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Bütün kontaktlar"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Mən"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Axtarılır..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Tez-tez əlaqə saxlanılan"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Kontakta baxın"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Telefon nömrələri olan bütün kontaktlar"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"İş profili kontaktları"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"İş Profili kontaktları"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Güncəlləşmələri göstər"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Yalnız telefon, sinxronsuz"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Yalnız telefon, sinxronsuz"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Ad"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Nik"</string>
     <string name="full_name" msgid="885420216812981202">"Ad"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Bir və daha çox fayl İmport edilə bilməz (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> eksportu bitdi"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Kontaktların eksportu tamamlandı."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontaktların eksportu tamamlandı, kontaktları paylaşmaq üçün bildirişə tıklayın."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Kontaktları paylaşmaq üçün toxunun."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> eksportu ləğv edildi"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Kontakt datası eksport olunur"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontakt datası eksport olunur."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Kontakt datanız bura eksport olunur: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Verilənlər bazası məlumatları əldə oluna bilmədi."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Eksport edilə bilən kontakt yoxdur. Əgər telefonunuzda kontaktlarınız varsa, bəzi data provayderləri kontaktların telefondan eksport olunmasına icazə verməyə bilər."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Eksport edilə bilən kontakt yoxdur. Əgər telefonunuzda kontaktlarınız varsa, bəzi data provayderləri kontaktların telefondan eksport olunmasına icazə verməyə bilər."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Vizit kart tərtibçisi düzgün başlamadı."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Eksport edilə bilmədi"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Kontakt datası eksport edilmədi.\nSəbəb: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Vizit kart import sorğusu rədd edildi. Yenidən cəhd edin."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> tezliklə eksport ediləcək."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Fayl az sonra eksport ediləcək."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontaktlar tezliklə eksport ediləcək."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Vizit kart eksport sorğusu rədd edildi. Daha sonra cəhd edin."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Vizit kart yerli müvəqqəti yaddaşa keşlənir. Hazırkı import tezliklə başlayacaq."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Ad ilk yazılsın"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Soyad ilk yazılsın"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Yeni kontaktlar üçün defolt hesab"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sinxronizasiya kontakt metadatası [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sinxronizasiya kontakt metadatası"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Metadata sinxronizasiya hesabı kontaktı"</string>
     <string name="setting_about" msgid="3926137653588942297">"Kontaktlar Haqqında"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Ayarlar"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Görünən kontaktları paylaşın"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Görünən kontaktları paylaşmaq olmadı"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Sevdiyiniz kontaktları paylaşın"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Bütün kontaktları paylaşın"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kontaktları paylaşmaq uğursuz oldu."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Kontaktları import/eksport edin"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Kontaktları İmport edin"</string>
     <string name="share_error" msgid="665756457151793108">"Bu kontakt paylaşıla bilməz."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Məxfilik siyasəti"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Xidmət şərtləri"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Açıq mənbə lisenziyaları"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Linki açmaq alınmadı."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> yoxlanılıb"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> yoxlanılmayıb"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Video zəng edin"</string>
diff --git a/res-common/values-bg-sw600dp/strings.xml b/res-common/values-bg-sw600dp/strings.xml
deleted file mode 100644
index ceeaade..0000000
--- a/res-common/values-bg-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Само в таблета, без синхронизиране"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Няма контакти с възможност за експортиране. Ако имате контакти в таблета си, възможно е някои доставчици на данни да не позволяват експортирането им извън него."</string>
-</resources>
diff --git a/res-common/values-bg/strings.xml b/res-common/values-bg/strings.xml
index 45038b4..94d8b59 100644
--- a/res-common/values-bg/strings.xml
+++ b/res-common/values-bg/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Обаждане на служебен пейджър"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Обаждане на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Обаждане на MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (обаждане)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Изпращане на SMS на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Изпращaне на SMS на домашен"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Изпращане на SMS на мобилен"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Изпращане на SMS на служебен пейджър"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Изпращане на SMS на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Изпращане на SMS на MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (изпращане на съобщение)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Провеждане на видеообаждане"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Да се изчистят ли често търсените?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Ще изчистите списъка с често търсените в приложенията Контакти и Телефон и ще принудите приложенията за имейл да научат предпочитанията ви за адресите, започвайки отначало."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Контакти"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Други"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Директория"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Служебен указател"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Служебен указател"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Всички контакти"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Аз"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Търси се…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Често търсени"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Преглед на контакта"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Всички контакти с телефонни номера"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Контакти в служебния потребителски профил"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Контакти в служебния потребителски профил"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Преглед на актуализациите"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Само в тел., несинхрон."</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Само в тел., несинхрон."</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Име"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Псевдоним"</string>
     <string name="full_name" msgid="885420216812981202">"Име"</string>
@@ -114,7 +112,7 @@
     <string name="sms" msgid="8086289395154598654">"Текстово съобщение"</string>
     <string name="postal_address" msgid="7692926530081579786">"Адрес"</string>
     <string name="ghostData_company" msgid="22470841482615409">"Фирма"</string>
-    <string name="ghostData_title" msgid="6221293237772204604">"Длъжност"</string>
+    <string name="ghostData_title" msgid="6221293237772204604">"Наименование"</string>
     <string name="label_notes" msgid="3997277594846722699">"Бележки"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"Уебсайт"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Един или повече файла не можаха да бъдат импортирани (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Експортирането на „<xliff:g id="FILENAME">%s</xliff:g>“ завърши."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Експортирането на контактите завърши."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Експортирането на контактите завърши. Кликнете върху известието, за да ги споделите."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Докоснете, за да споделите контактите."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Експортирането на „<xliff:g id="FILENAME">%s</xliff:g>“ е анулирано."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Експортиране на данни за контакти"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Данните за контактите се експортират."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Данните за контактите ви се експортират във: „<xliff:g id="FILE_NAME">%s</xliff:g>“."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Информацията за базата от данни не можа да бъде получена."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Няма контакти, позволяващи експортиране. Ако в телефона си имате контакти, е възможно някои доставчици на данни да не позволяват експортирането им извън него."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Няма контакти, позволяващи експортиране. Ако в телефона си имате контакти, е възможно някои доставчици на данни да не позволяват експортирането им извън него."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Създателят на vCard не се стартира правилно."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Не се експортираха"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Данните за контакта не бяха експортирани.\nПричина: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Заявката за импортиране на vCard бе отхвърлена. Опитайте отново по-късно."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"„<xliff:g id="FILENAME">%s</xliff:g>“ ще се експортира скоро."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Файлът ще се експортира скоро."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Контактите ще бъдат експортирани скоро."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Заявката за експортиране на vCard бе отхвърлена. Опитайте отново по-късно."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard се кешира/т във временно локално хранилище. Самото импортиране ще започне скоро."</string>
@@ -216,7 +211,7 @@
     <string name="confirm_export_title" msgid="3240899428149018226">"Да се експортират ли контактите?"</string>
     <string name="caching_vcard_title" msgid="9185299351381102305">"Кешира се"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"Импортира/т се <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="4142192068495589925">"Експортиране като .vcf файл"</string>
+    <string name="export_to_vcf_file" product="default" msgid="4142192068495589925">"Експорт. като .vcf файл"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"Сортиране по"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Собствено име"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Фамилно име"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Първо собственото име"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Първо фамилното име"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Стандартен профил за новите контакти"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Синхронизиране на метаданните за контактите [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Синхронизиране на метаданните за контактите"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Профил за синхронизиране на метаданните на контактите"</string>
     <string name="setting_about" msgid="3926137653588942297">"Всичко за Контакти"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Настройки"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Споделяне на видимите контакти"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Споделянето на видимите контакти не бе успешно."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Споделяне на любимите контакти"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Споделяне на всички контакти"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Споделянето на контактите не бе успешно."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Импортиране/eкспортиране на контакти"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Импортиране на контактите"</string>
     <string name="share_error" msgid="665756457151793108">"Този контакт не може да бъде споделен."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Декларация за поверителност"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Общи условия"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Лицензи за отворен код"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Отварянето на URL адреса не бе успешно."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"За <xliff:g id="ACCOUNT_INFO">%s</xliff:g> е поставена отметка"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"За <xliff:g id="ACCOUNT_INFO">%s</xliff:g> не е поставена отметка"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Извършване на видеообаждане"</string>
diff --git a/res-common/values-bn-rBD-sw600dp/strings.xml b/res-common/values-bn-rBD-sw600dp/strings.xml
deleted file mode 100644
index bf538c8..0000000
--- a/res-common/values-bn-rBD-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"শুধুমাত্র ট্যাবলেট, সমন্বয় করা নেই"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"এখানে রপ্তানিযোগ্য কোনো পরিচিতি নেই৷ আপনার ট্যাবলেটে পরিচিতি থাকলে, কিছু ডেটা সরবরাহকারী আপনার ট্যাবলেট থেকে সেই পরিচিতিগুলিকে রপ্তানি করা মঞ্জুর নাও করতে পারে৷"</string>
-</resources>
diff --git a/res-common/values-bn-rBD/strings.xml b/res-common/values-bn-rBD/strings.xml
index e73457b..4fd3644 100644
--- a/res-common/values-bn-rBD/strings.xml
+++ b/res-common/values-bn-rBD/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"কর্মক্ষেত্রের পেজার নম্বরে কল করুন"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> এ কল করুন"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS নম্বরে কল করুন"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (কল)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> নম্বরে পাঠ্য বার্তা পাঠান"</string>
     <string name="sms_home" msgid="7765831490534280540">"ঘরের ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"মোবাইল নম্বরে পাঠ্য বার্তা পাঠান"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"কর্মক্ষেত্রের পেজারে পাঠ্য বার্তা পাঠান"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> নম্বরে পাঠ্য বার্তা পাঠান"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS ফোন নম্বরে পাঠ্য বার্তা পাঠান"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (বার্তা)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"ভিডিও কল করুন"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"ঘন ঘন যোগাযোগ করা হয়েছে এমন পরিচিতিগুলিকে সাফ করবেন?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"পরিচিতি এবং ফোন অ্যাপ্লিকেশানগুলি থেকে আপনি ঘন ঘন যোগাযোগ করা পরিচিতির তালিকা সাফ করবেন, এবং ইমেল অ্যাপ্লিকেশানগুলিকে আবার শুরু থেকে আপনার ঠিকানা অভিরুচি জানতে বাধ্য করবেন৷"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"পরিচিতিগুলি"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"অন্যান্য"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ডিরেক্টরি"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"কাজের সংগ্রহ"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"কাজের সংগ্রহ"</string>
     <string name="local_search_label" msgid="9094584931063745728">"সকল পরিচিতি"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"আমি"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"অনুসন্ধান করছে..."</string>
@@ -89,14 +87,14 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"ঘন ঘন যোগাযোগ করা হয়েছে"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"পরিচিতি দেখুন"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ফোন নম্বর সহ সমস্ত পরিচিতি"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"কর্মস্থলের প্রোফাইলের পরিচিতিগুলি"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"কর্মস্থলের প্রোফাইলের পরিচিতিগুলি"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"আপডেটগুলি দেখুন"</string>
-    <string name="account_phone" msgid="6104157990869081962">"শুধুমাত্র ফোন, সমন্বয় করা নেই"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"শুধুমাত্র ফোন, সমন্বয় করা নেই"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"নাম"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"ডাকনাম"</string>
     <string name="full_name" msgid="885420216812981202">"নাম"</string>
     <string name="name_given" msgid="4153709115654909377">"প্রথম নাম"</string>
-    <string name="name_family" msgid="5317387657540738981">"পদবি"</string>
+    <string name="name_family" msgid="5317387657540738981">"পারিবারিক নাম"</string>
     <string name="name_prefix" msgid="8219879405071462309">"নামের আগের অংশ"</string>
     <string name="name_middle" msgid="3951610314424632183">"মাঝের নাম"</string>
     <string name="name_suffix" msgid="5436984808550075931">"নামের পরের অংশ"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"একটি বা একাধিক (%s) ফাইল আমদানি করা যাবে না৷"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> রপ্তানি করা সম্পন্ন হয়েছে৷"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"পরিচিতি রপ্তানি করা সম্পন্ন হয়েছে৷"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"পরিচিতিগুলি রপ্তানি করা হয়েছে, পরিচিতিগুলিকে শেয়ার করতে বিজ্ঞপ্তিটিতে ক্লিক করুন৷"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"পরিচিতিগুলিকে শেয়ার করতে আলতো চাপ দিন৷"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> রপ্তানি করা বাতিল হয়েছে৷"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"পরিচিতির তথ্য রপ্তানি করা হচ্ছে"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"পরিচিতির ডেটা রপ্তানি করা হচ্ছে৷"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"আপনার পরিচিতির ডেটা রপ্তানি করা হচ্ছে: <xliff:g id="FILE_NAME">%s</xliff:g>৷"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ডেটাবেসের তথ্য পাওয়া যায়নি৷"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"এখানে রপ্তানিযোগ্য কোনো পরিচিতি নেই৷ আপনার ফোনে পরিচিতি থাকলে, কিছু ডেটা সরবরাহকারী আপনার ফোন থেকে সেই পরিচিতিগুলিকে রপ্তানি করা মঞ্জুর নাও করতে পারে৷"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"এখানে রপ্তানিযোগ্য কোনো পরিচিতি নেই৷ আপনার ফোনে পরিচিতি থাকলে, কিছু ডেটা সরবরাহকারী আপনার ফোন থেকে সেই পরিচিতিগুলিকে রপ্তানি করা মঞ্জুর নাও করতে পারে৷"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard কম্পোজার সঠিকভাবে শুরু করা হয়নি৷"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"রপ্তানি করা যায়নি"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"পরিচিতির তথ্য রপ্তানি করা যায়নি৷\nকারণ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard আমদানি করার অনুরোধ প্রত্যাখ্যাত হয়েছে৷ পরে আবার চেষ্টা করুন৷"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> শীঘ্রই রপ্তানি করা হবে৷"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ফাইলটি শীঘ্রই রপ্তানি করা হবে৷"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"পরিচিতিগুলি শীঘ্রই রপ্তানি করা হবে৷"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard রপ্তানি করার অনুরোধ প্রত্যাখ্যাত হয়েছে৷ পরে আবার চেষ্টা করুন৷"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"পরিচিতি"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"স্থানীয় অস্থায়ী সংগ্রহস্থলে vCard(গুলি)কে ক্যাশ করা হচ্ছে৷ প্রকৃত আমদানি শীঘ্রই শুরু হবে৷"</string>
@@ -219,24 +214,19 @@
     <string name="export_to_vcf_file" product="default" msgid="4142192068495589925">".vcf ফাইলে রপ্তানি করুন"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"এই অনুসারে বাছুন"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"প্রথম নাম"</string>
-    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"পদবি"</string>
+    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"পারিবারিক নাম"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"নামের বিন্যাস"</string>
-    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"প্রথমে প্রথম নামটি"</string>
-    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"প্রথমে উপাধি"</string>
+    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"প্রথমে আদ্য নাম"</string>
+    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"প্রথমে পারিবারিক নাম"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"নতুন পরিচিতিগুলির জন্য ডিফল্ট অ্যাকাউন্ট"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"পরিচিতির মেটাডাটা সিঙ্ক করুন [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"পরিচিতির মেটাডাটা সিঙ্ক করুন"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"পরিচিতির মেটাডেটা সমন্বয়ের অ্যাকাউন্ট"</string>
     <string name="setting_about" msgid="3926137653588942297">"পরিচিতি সম্পর্কিত"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"সেটিংস"</string>
-    <string name="share_visible_contacts" msgid="2150662668080757107">"দৃশ্যমান পরিচিতিগুলিকে শেয়ার করুন"</string>
-    <string name="share_visible_contacts_failure" msgid="5895137872238059893">"দৃশ্যমান পরিচিতিগুলি শেয়ার করতে ব্যর্থ হয়েছে৷"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"পছন্দসই পরিচিতিগুলি শেয়ার করুন"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"সকল পরিচিতি শেয়ার করুন"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"পরিচিতিগুলিকে শেয়ার করতে ব্যর্থ হয়েছে৷"</string>
+    <string name="share_visible_contacts" msgid="2150662668080757107">"দৃশ্যমান পরিচিতিগুলিকে ভাগ করুন"</string>
+    <string name="share_visible_contacts_failure" msgid="5895137872238059893">"দৃশ্যমান পরিচিতিগুলি ভাগ করতে ব্যর্থ হয়েছে৷"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"পরিচিতিগুলি আমদানি/রপ্তানি করুন"</string>
     <string name="dialog_import" msgid="5177004290082451296">"পরিচিতিগুলি আমদানি করুন"</string>
-    <string name="share_error" msgid="665756457151793108">"এই পরিচিতিটিকে শেয়ার করা যাবে না৷"</string>
-    <string name="no_contact_to_share" msgid="5749367538191552509">"শেয়ার করার জন্য কোনো পরিচিতি নেই৷"</string>
+    <string name="share_error" msgid="665756457151793108">"এই পরিচিতিটিকে ভাগ করা যাবে না৷"</string>
+    <string name="no_contact_to_share" msgid="5749367538191552509">"ভাগ করার জন্য কোনো পরিচিতি নেই৷"</string>
     <string name="menu_search" msgid="7464453023659824700">"অনুসন্ধান করুন"</string>
     <string name="menu_contacts_filter" msgid="586356478145511794">"দেখানোর জন্য পরিচিতিগুলি"</string>
     <string name="activity_title_contacts_filter" msgid="7689519428197855166">"দেখানোর জন্য পরিচিতিগুলি"</string>
@@ -245,7 +235,7 @@
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"পছন্দগুলি"</string>
     <string name="listTotalAllContactsZero" msgid="6041341919823872732">"কোনো পরিচিতি নেই৷"</string>
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"কোনো দৃশ্যমান পরিচিতি নেই৷"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"কোনো পছন্দসই পরিচিতি নেই৷"</string>
+    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"কোনো পছন্দসই নেই"</string>
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g> এ কোনো পরিচিতি নেই"</string>
     <string name="menu_clear_frequents" msgid="8492322695770647639">"পুনরাবৃত্তি সাফ করুন"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"সিম কার্ড নির্বাচন করুন"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"গোপনীয়তা নীতি"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"পরিষেবার শর্তাবলী"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"মুক্ত উৎস লাইসেন্সগুলি"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url খুলতে ব্যর্থ হয়েছে৷"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> এ টিক চিহ্ন দেওয়া হয়েছে"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> এ টিক চিহ্ন দেওয়া হয়নি"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"ভিডিও কল করুন"</string>
diff --git a/res-common/values-ca-sw600dp/strings.xml b/res-common/values-ca-sw600dp/strings.xml
deleted file mode 100644
index 089f1df..0000000
--- a/res-common/values-ca-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Només a la tauleta, sense sincronitzar"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"No hi ha cap contacte que es pugui exportar. Si en tens algun a la tauleta, és possible que hi hagi proveïdors de dades que no permetin que els contactes s\'exportin des d\'aquest dispositiu."</string>
-</resources>
diff --git a/res-common/values-ca/strings.xml b/res-common/values-ca/strings.xml
index a9c1940..0c4add1 100644
--- a/res-common/values-ca/strings.xml
+++ b/res-common/values-ca/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Truca al cercapersones de la feina"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Truca al <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Truca al número MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (truca-li)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Envia SMS al <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Envia un SMS a casa"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Envia un SMS al mòbil"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Envia un SMS al cercapersones de la feina"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Envia un SMS a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Envia un MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (envia-li un missatge)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Fes una videotrucada"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Vols esborrar els contactes freqüents?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"S\'esborrarà la llista de contactes més freqüents a les aplicacions Contactes i Telèfon i es forçarà les aplicacions de correu electrònic a obtenir informació nova sobre les teves preferències pel que fa a adreces."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contactes"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Altres"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Directori"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Directori de la feina"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Directori de la feina"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Tots els contactes"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Jo"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"S\'està cercant..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contactes freqüents"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Mostra el contacte"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Tots els contactes que tenen números de telèfon"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contactes del perfil professional"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contactes del perfil professional"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Mostra les actualitzacions"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Només telèfon, sense sincronitzar"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Només telèfon, sense sincronitzar"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nom"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Àlies"</string>
     <string name="full_name" msgid="885420216812981202">"Nom"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"No s\'ha pogut importar un dels fitxers com a mínim (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Exportació de <xliff:g id="FILENAME">%s</xliff:g> finalitzada."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"S\'han acabat d\'exportar els contactes."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"S\'han acabat d\'exportar els contactes; fes clic a la notificació per compartir-los."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Toca per compartir els contactes."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"S\'ha cancel·lat l\'exportació de: <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"S\'estan exportant les dades de contacte"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"S\'estan exportant les dades de contacte."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"S\'estan exportant les teves dades de contacte a: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"No s\'ha pogut obtenir informació de la base de dades."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"No hi ha cap contacte que es pugui exportar. Si en tens algun al telèfon, és possible que hi hagi proveïdors de dades que no permetin que els contactes s\'exportin des del telèfon."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"No hi ha cap contacte que es pugui exportar. Si en tens algun al telèfon, és possible que hi hagi proveïdors de dades que no permetin que els contactes s\'exportin des del telèfon."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"No s\'ha iniciat correctament el creador de vCard."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Error en exportar"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"No s\'han exportat les dades de contacte.\nMotiu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"S\'ha rebutjat la sol·licitud per importar la vCard. Torna-ho a provar més tard."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> s\'exportarà en breu."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"El fitxer s\'exportarà en breu."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Aviat s\'exportaran els contactes."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"S\'ha rebutjat la sol·licitud per exportar la vCard. Torna-ho a provar més tard."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contacte"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"S\'estan desant les vCard a l\'emmagatzematge temporal local. La importació real començarà aviat."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Primer el nom"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Primer els cognoms"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Compte predeterminat per als contactes nous"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sincronitza les metadades dels contactes [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sincronitza les metadades dels contactes"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Compte de sincronització de metadades de contacte"</string>
     <string name="setting_about" msgid="3926137653588942297">"Sobre Contactes"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Configuració"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Comparteix contactes visibles"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Error en compartir els contactes visibles."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Comparteix els contactes preferits"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Comparteix tots els contactes"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"No s\'han pogut compartir els contactes."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importa/exporta contactes"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importa contactes"</string>
     <string name="share_error" msgid="665756457151793108">"No es pot compartir aquest contacte."</string>
@@ -245,7 +235,7 @@
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"Preferits"</string>
     <string name="listTotalAllContactsZero" msgid="6041341919823872732">"No hi ha cap contacte."</string>
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"No hi ha cap contacte visible."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"Sense preferits"</string>
+    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"No hi ha cap preferit"</string>
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"No hi ha cap contacte a <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="8492322695770647639">"Esborra contactes freqüents"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"Selecciona una targeta SIM"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Política de privadesa"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Condicions del servei"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Llicències de programari lliure"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"No s\'ha pogut obrir l\'URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"S\'ha marcat <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"No s\'ha marcat <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Fa una videotrucada"</string>
diff --git a/res-common/values-cs-sw600dp/strings.xml b/res-common/values-cs-sw600dp/strings.xml
deleted file mode 100644
index e09f64565..0000000
--- a/res-common/values-cs-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Pouze v tabletu, nesynchronizováno"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Nelze exportovat žádné kontakty. Pokud kontakty v tabletu uložené máte, je možné, že poskytovatel datových služeb zakázal jejich export mimo tablet."</string>
-</resources>
diff --git a/res-common/values-cs/strings.xml b/res-common/values-cs/strings.xml
index c19ea5d..c56b7c8 100644
--- a/res-common/values-cs/strings.xml
+++ b/res-common/values-cs/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Volat na pracovní pager"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Volat kontakt <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Volat MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Zavolat)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Poslat SMS na číslo <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Poslat SMS domů"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Poslat SMS na mobil"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Poslat SMS na pracovní pager"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Poslat SMS na kontakt <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Poslat SMS na číslo MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Poslat zprávu)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Uskutečnit videohovor"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Vymazat často kontaktované osoby?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Vymažete seznam často kontaktovaných osob v aplikacích Kontakty a Telefon a e-mailové aplikace budou muset nastavení adresátů vytvořit znovu."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontakty"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Jiné"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Adresář"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Pracovní adresář"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Adresář Práce"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Všechny kontakty"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Já"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Vyhledávání…"</string>
@@ -91,9 +89,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Často používané"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Zobrazit kontakt"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Kontakty s telefonními čísly"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Kontakty z pracovního profilu"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kontakty v pracovním profilu"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Zobrazit aktualizace"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Pouze v telefonu, nesynchronizováno"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Pouze v telefonu, nesynchronizováno"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Jméno"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Přezdívka"</string>
     <string name="full_name" msgid="885420216812981202">"Jméno"</string>
@@ -189,13 +187,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Jeden nebo více souborů se nepodařilo importovat (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Export souboru <xliff:g id="FILENAME">%s</xliff:g> byl dokončen."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Exportování kontaktů bylo dokončeno."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Export kontaktů byl dokončen. Klepnutím na oznámení je můžete sdílet."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Klepnutím můžete sdílet kontakty."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Export souboru <xliff:g id="FILENAME">%s</xliff:g> byl zrušen."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Export dat kontaktů"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Probíhá export dat kontaktů."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Data kontaktů jsou exportována do souboru <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Nepodařilo se získat informace o databázi."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Nelze exportovat žádné kontakty. Pokud kontakty v telefonu uložené máte, je možné, že poskytovatel datových služeb zakázal jejich export mimo telefon."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Nelze exportovat žádné kontakty. Pokud kontakty v telefonu uložené máte, je možné, že poskytovatel datových služeb zakázal jejich export mimo telefon."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Editor souboru vCard nebyl správně spuštěn."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Export se nezdařil"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Data kontaktů nebyla exportována.\nDůvod: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Požadavek na import souborů vCard byl zamítnut. Zkuste to prosím později."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Soubor <xliff:g id="FILENAME">%s</xliff:g> bude za okamžik exportován."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Soubor bude brzy exportován."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontakty budou brzy exportovány."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Požadavek na export souborů vCard byl zamítnut. Zkuste to prosím později."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Načítání souboru vCard do mezipaměti místního dočasného úložiště. Vlastní import bude zahájen v krátké době."</string>
@@ -226,15 +221,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Nejprve jméno"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Nejprve příjmení"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Výchozí účet pro nové kontakty"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Synchronizovat metadata kontaktů [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Synchronizovat metadata kontaktů"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Účet pro synchronizaci metadat kontaktů"</string>
     <string name="setting_about" msgid="3926137653588942297">"Informace o kontaktech"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Nastavení"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Sdílet viditelné kontakty"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Sdílení viditelných kontaktů se nezdařilo."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Sdílet oblíbené kontakty"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Sdílet všechny kontakty"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kontakty se nepodařilo sdílet."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importovat nebo exportovat kontakty"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importovat kontakty"</string>
     <string name="share_error" msgid="665756457151793108">"Tento kontakt nelze sdílet."</string>
@@ -278,7 +268,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Zásady ochrany soukromí"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Smluvní podmínky"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licence open source"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Adresu URL se nepodařilo otevřít."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> – zaškrtnuto"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> – nezaškrtnuto"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Zahájit videohovor"</string>
diff --git a/res-common/values-da-sw600dp/strings.xml b/res-common/values-da-sw600dp/strings.xml
deleted file mode 100644
index f31c596..0000000
--- a/res-common/values-da-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Kun på tablet – synkroniseres ikke"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Der er ingen kontaktpersoner, der kan eksporteres. Hvis du har kontaktpersoner på din tablet, tillader nogle dataudbydere muligvis ikke, at kontaktpersonerne eksporteres fra din tablet."</string>
-</resources>
diff --git a/res-common/values-da/strings.xml b/res-common/values-da/strings.xml
index 063f4ba..88ef3d5 100644
--- a/res-common/values-da/strings.xml
+++ b/res-common/values-da/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Ring til personsøger på arbejdet"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Ring til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Ring til mms"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ring op)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Send sms til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Send sms til hjem"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Send sms til mobil"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Send sms til personsøger på arbejdet"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Send sms til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Send sms til mms"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (send besked)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Foretag videoopkald"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Vil du rydde de ofte kontaktede?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Hvis du gør dette, rydder du listen over personer, som du ofte kontakter, i appene Kontaktpersoner og Opkald. Du vil samtidig tvinge e-mailapps til at lære dine adressepræferencer fra bunden."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontaktpersoner"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Andet"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Indeks"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Indeks for arbejde"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Indeks for arbejde"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Alle kontaktpersoner"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Mig"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Søger..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Ofte kontaktet"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Vis kontaktperson"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Alle kontaktpersoner med telefonnumre"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Kontaktpersoner for arbejdsprofil"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kontaktpersoner for arbejdsprofil"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Se opdateringer"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Kun telefon, ikke synk."</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Kun telefon, ikke synk."</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Navn"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Kaldenavn"</string>
     <string name="full_name" msgid="885420216812981202">"Navn"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"En eller flere filer kunne ikke importeres (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> er eksporteret."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Kontaktpersoner blev eksporteret."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontaktpersonerne er eksporteret. Klik på underretningen for at dele kontaktpersoner."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Tryk for at dele kontaktpersoner."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Eksport af <xliff:g id="FILENAME">%s</xliff:g> er annulleret."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Eksporterer kontaktdata"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontaktoplysningerne eksporteres."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Dine kontaktdata bliver eksporteret til: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Databaseoplysningerne kunne ikke hentes."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Der er ingen kontaktpersoner, der kan eksporteres. Hvis du har kontaktpersoner på din telefon, vil nogle dataudbydere muligvis ikke tillade, at kontaktpersonerne eksporteres fra telefonen."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Der er ingen kontaktpersoner, der kan eksporteres. Hvis du har kontaktpersoner på din telefon, vil nogle dataudbydere muligvis ikke tillade, at kontaktpersonerne eksporteres fra telefonen."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Oprettelsen af vCard startede ikke korrekt."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Eksport ikke mulig"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Kontaktdataene blev ikke eksporteret.\nÅrsag: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Anmodningen om import af vCard blev afvist. Prøv igen senere."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> eksporteres om et øjeblik."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Filen eksporteres om et øjeblik."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontaktpersoner eksporteres om lidt."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Anmodningen om eksport af vCard blev afvist. Prøv igen senere."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontaktperson"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Cachelagrer vCard-fil(er) til lokalt midlertidigt lager. Den egentlige import starter snart."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Fornavn først"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Efternavn først"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Standardkonto til nye kontaktpersoner"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Synkroniser metadata for kontaktpersoner [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Synkroniser metadata for kontaktpersoner"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kontakt synkroniseringskonto for metadata"</string>
     <string name="setting_about" msgid="3926137653588942297">"Om Kontaktpersoner"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Indstillinger"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Del synlige kontaktpersoner"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Det lykkedes ikke at dele synlige kontaktpersoner."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Del foretrukne kontaktpersoner"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Del alle kontaktpersoner"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kontaktpersonerne kunne ikke deles."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importér/eksportér kontaktpersoner"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importér kontaktpersoner"</string>
     <string name="share_error" msgid="665756457151793108">"Denne kontaktperson kan ikke deles."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Privatlivspolitik"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Servicevilkår"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Open source-licenser"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Webadressen kunne ikke åbnes."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> er valgt"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> er ikke valgt"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Foretag videoopkald"</string>
diff --git a/res-common/values-de-sw600dp/strings.xml b/res-common/values-de-sw600dp/strings.xml
deleted file mode 100644
index 0e79d84..0000000
--- a/res-common/values-de-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Nur Tablet, nicht synchronisiert"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Es sind keine exportierbaren Kontakte vorhanden. Falls sich Kontakte auf deinem Tablet befinden, ist das Exportieren der Kontakte eventuell durch den Datenanbieter gesperrt."</string>
-</resources>
diff --git a/res-common/values-de/strings.xml b/res-common/values-de/strings.xml
index 1b12531..bd58599 100644
--- a/res-common/values-de/strings.xml
+++ b/res-common/values-de/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Pager (geschäftlich) anrufen"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> anrufen"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS anrufen"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Anruf)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS an <xliff:g id="CUSTOM">%s</xliff:g> senden"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS an private Nummer senden"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS an Mobilfunknummer senden"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS an Pager (geschäftlich) senden"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS an <xliff:g id="ASSISTANT">%s</xliff:g> senden"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS an MMS senden"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Nachricht)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Videoanruf starten"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Liste \"Häufig kontaktiert\" löschen?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Du löschst die Liste \"Häufig kontaktiert\" in den Apps \"Kontakte\" und \"Telefon\" und bewirkst so ein Zurücksetzen deiner Adresseinstellungen für E-Mail-Apps."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontakte"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Sonstige"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Verzeichnis"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Verzeichnis geschäftlicher Kontakte"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Verzeichnis geschäftlicher Kontakte"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Alle Kontakte"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ich"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Suche läuft…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Häufig kontaktiert"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Kontakt anzeigen"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Alle Kontakte mit Telefonnummern"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Arbeitsprofilkontakte"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Arbeitsprofilkontakte"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Updates ansehen"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Nur Telefon, nicht synchronisiert"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Nur Telefon, nicht synchronisiert"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Name"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Alias"</string>
     <string name="full_name" msgid="885420216812981202">"Name"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Eine oder mehrere Dateien können nicht importiert werden (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Export von <xliff:g id="FILENAME">%s</xliff:g> abgeschlossen"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Kontakte wurden exportiert"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Das Exportieren der Kontakte ist abgeschlossen. Klicke auf die Benachrichtigung, um die Kontakte freizugeben."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Zum Teilen der Kontakte tippen."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Export von <xliff:g id="FILENAME">%s</xliff:g> abgebrochen"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Kontaktdaten werden exportiert..."</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Die Kontaktdaten werden gerade exportiert."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Deine Kontaktdaten werden in \"<xliff:g id="FILE_NAME">%s</xliff:g>\" exportiert..."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Datenbankinformationen konnten nicht abgerufen werden."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Es sind keine exportierbaren Kontakte vorhanden. Falls sich Kontakte auf deinem Telefon befinden, ist das Exportieren der Kontakte eventuell durch den Datenanbieter gesperrt."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Es sind keine exportierbaren Kontakte vorhanden. Falls sich Kontakte auf deinem Telefon befinden, ist das Exportieren der Kontakte eventuell durch den Datenanbieter gesperrt."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Das Programm zum Erstellen der vCard wurde nicht richtig gestartet."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Export nicht möglich"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Die Kontaktdaten wurden nicht exportiert.\nGrund: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Die vCard-Importanfrage wurde abgelehnt. Bitte versuche es später erneut."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> wird in Kürze exportiert."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Die Datei wird in Kürze exportiert."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Die Kontakte werden in Kürze exportiert."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Die vCard-Exportanfrage wurde abgelehnt. Bitte versuche es später erneut."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"Kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Caching der vCard(s) in lokalen temporären Speicher wird durchgeführt. Der eigentliche Import beginnt gleich."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Vorname zuerst"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Nachname zuerst"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Standardkonto für neue Kontakte"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Kontakt-Metadaten synchronisieren [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Kontakt-Metadaten synchronisieren"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Synchronisierungskonto für Kontakt-Metadaten"</string>
     <string name="setting_about" msgid="3926137653588942297">"Über \"Kontakte\""</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Einstellungen"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Sichtbare Kontakte teilen"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Die sichtbaren Kontakte konnten nicht geteilt werden."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Lieblingskontakte teilen"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Alle Kontakte teilen"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kontakte konnten nicht geteilt werden."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Kontakte importieren/exportieren"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Kontakte importieren"</string>
     <string name="share_error" msgid="665756457151793108">"Dieser Kontakt kann nicht geteilt werden."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Datenschutzerklärung"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Nutzungsbedingungen"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Open-Source-Lizenzen"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Die URL konnte nicht geöffnet werden."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ausgewählt"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> nicht ausgewählt"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Videoanruf starten"</string>
diff --git a/res-common/values-el-sw600dp/strings.xml b/res-common/values-el-sw600dp/strings.xml
deleted file mode 100644
index 66277c6..0000000
--- a/res-common/values-el-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Μόνο στο tablet, χωρίς συγχρονισμό"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Δεν υπάρχουν επαφές προς εξαγωγή. Αν υπάρχουν επαφές στο tablet, ορισμένοι πάροχοι δεδομένων ενδέχεται να μην επιτρέπουν την εξαγωγή επαφών από το tablet."</string>
-</resources>
diff --git a/res-common/values-el/strings.xml b/res-common/values-el/strings.xml
index 866902a..2d4a76c 100644
--- a/res-common/values-el/strings.xml
+++ b/res-common/values-el/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Κλήση βομβητή εργασίας"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Κλήση <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Κλήση MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Κλήση)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Αποστολή μηνύματος κειμένου προς <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Αποστολή μηνύματος κειμένου προς οικία"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Αποστολή μηνύματος κειμένου προς κινητή συσκευή"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Αποστολή μηνύματος κειμένου προς βομβητή εργασίας"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Αποστολή μηνύματος προς <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Αποστολή μηνύματος κειμένου ως MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Μήνυμα)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Πραγματοποίηση βιντεοκλήσης"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Διαγραφή ατόμων με συχνή επικοινωνία;"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Θα διαγράψετε τη λίστα συχνών επαφών στις εφαρμογές Επαφές και Τηλέφωνο και θα επιβάλλετε στις εφαρμογές ηλεκτρονικού ταχυδρομείου να μάθουν τις προτιμήσεις διευθύνσεών σας από την αρχή,"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Επαφές"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Άλλο"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Κατάλογος"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Κατάλογος εργασίας"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Κατάλογος εργασίας"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Όλες οι επαφές"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Εγώ"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Αναζήτηση…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Συχνή επικοινωνία"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Προβολή επαφής"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Όλες οι επαφές με αριθμούς τηλεφώνου"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Επαφές προφίλ εργασίας"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Επαφές προφίλ εργασίας"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Προβολή ενημερώσεων"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Μόνο στο τηλέφωνο, χωρίς συγχρονισμό"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Μόνο στο τηλέφωνο, χωρίς συγχρονισμό"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Όνομα"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Ψευδώνυμο"</string>
     <string name="full_name" msgid="885420216812981202">"Όνομα"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Δεν ήταν δυνατή η εισαγωγή ενός ή περισσότερων αρχείων (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Η εξαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g> ολοκληρώθηκε."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Ολοκλήρωση εξαγωγής επαφών."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Ολοκληρώθηκε η εξαγωγή των επαφών. Κάντε κλικ στην ειδοποίηση για να μοιραστείτε επαφές."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Πατήστε για να μοιραστείτε επαφές."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Η εξαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g> ακυρώθηκε."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Εξαγωγή δεδομένων επαφών"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Γίνεται εξαγωγή των δεδομένων επαφών."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Γίνεται εξαγωγή των δεδομένων επαφών σας στο αρχείο: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Δεν ήταν δυνατή η λήψη πληροφοριών βάσης δεδομένων."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Δεν υπάρχουν επαφές προς εξαγωγή. Αν υπάρχουν επαφές στο τηλέφωνό σας, ορισμένοι πάροχοι δεδομένων ενδέχεται να μην επιτρέπουν την εξαγωγή των επαφών από το τηλέφωνο."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Δεν υπάρχουν επαφές προς εξαγωγή. Αν υπάρχουν επαφές στο τηλέφωνό σας, ορισμένοι πάροχοι δεδομένων ενδέχεται να μην επιτρέπουν την εξαγωγή των επαφών από το τηλέφωνο."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Η έναρξη της vCard δεν ήταν σωστή."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Αδυναμία εξαγωγής"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Δεν έγινε εξαγωγή των δεδομένων επαφής.\nΑιτία: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Το αίτημα εισαγωγής vCard απορρίφθηκε. Δοκιμάστε ξανά αργότερα."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Η εξαγωγή του αρχείου <xliff:g id="FILENAME">%s</xliff:g> θα γίνει σύντομα."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Η εξαγωγή του αρχείου θα γίνει σύντομα."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Σε λίγο θα ξεκινήσει η εξαγωγή επαφών."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Το αίτημα εξαγωγής vCard απορρίφθηκε. Δοκιμάστε ξανά αργότερα."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"επαφή"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Αλλαγή vCard σε τοπικό χώρο προσωρινής αποθήκευσης. Η εισαγωγή θα ξεκινήσει σύντομα."</string>
@@ -224,19 +219,14 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Πρώτα το όνομα"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Πρώτα το επώνυμο"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Προεπιλεγμένος λογαριασμός για νέες επαφές"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Συγχρονισμός μεταδεδομένων επαφής [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Συγχρονισμός μεταδεδομένων επαφής"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Λογαριασμός συγχρονισμού μεταδεδομένων επαφής"</string>
     <string name="setting_about" msgid="3926137653588942297">"Σχετικά με τις Επαφές"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Ρυθμίσεις"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Κοινοποίηση ορατών επαφών"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Η κοινοποίηση των ορατών επαφών απέτυχε."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Κοινοποίηση αγαπημένων επαφών"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Κοινή χρήση όλων των επαφών"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Αποτυχία κοινής χρήσης επαφών."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Εισαγωγή/Εξαγωγή επαφών"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Εισαγωγή επαφών"</string>
     <string name="share_error" msgid="665756457151793108">"Δεν είναι δυνατή η κοινή χρήση αυτής της επαφής."</string>
-    <string name="no_contact_to_share" msgid="5749367538191552509">"Δεν υπάρχουν επαφές για κοινοποίηση."</string>
+    <string name="no_contact_to_share" msgid="5749367538191552509">"Δεν υπάρχουν επαφές για κοινή χρήση."</string>
     <string name="menu_search" msgid="7464453023659824700">"Αναζήτηση"</string>
     <string name="menu_contacts_filter" msgid="586356478145511794">"Επαφές για προβολή"</string>
     <string name="activity_title_contacts_filter" msgid="7689519428197855166">"Επαφές για προβολή"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Πολιτική απορρήτου"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Όροι Παροχής Υπηρεσιών"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Άδειες λογισμικού ανοικτού κώδικα"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Αποτυχία ανοίγματος url."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ελέγχθηκε"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> δεν ελέγχθηκε"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Πραγματοποίηση βιντεοκλήσης"</string>
diff --git a/res-common/values-en-rAU-sw600dp/strings.xml b/res-common/values-en-rAU-sw600dp/strings.xml
deleted file mode 100644
index 75313be..0000000
--- a/res-common/values-en-rAU-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tablet only, unsynced"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"There are no exportable contacts. If you do have contacts on your tablet, some data providers may not allow the contacts to be exported from the tablet."</string>
-</resources>
diff --git a/res-common/values-en-rAU/strings.xml b/res-common/values-en-rAU/strings.xml
index eed9ea3..9abd069 100644
--- a/res-common/values-en-rAU/strings.xml
+++ b/res-common/values-en-rAU/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Call work pager"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Call <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Call MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Call)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Text home"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Text mobile"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Text work pager"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Text <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Text MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Message)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Make video call"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Clear frequently contacted?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contacts"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Other"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Work directory"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Work Directory"</string>
     <string name="local_search_label" msgid="9094584931063745728">"All contacts"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Me"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Searching…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Frequently contacted"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"View contact"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"All contacts with phone numbers"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Work profile contacts"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Work Profile contacts"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"View updates"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Phone-only, unsynced"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Phone-only, unsynced"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Name"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Nickname"</string>
     <string name="full_name" msgid="885420216812981202">"Name"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"One or more files couldn\'t be imported (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Finished exporting <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Finished exporting contacts."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Finished exporting contacts, click the notification to share contacts."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Tap to share contacts."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exporting <xliff:g id="FILENAME">%s</xliff:g> cancelled."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exporting contact data"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Contact data is being exported."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Your contact data is being exported to: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Couldn\'t get database information."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"There are no exportable contacts. If you do have contacts on your phone, some data providers may not allow the contacts to be exported from the phone."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"There are no exportable contacts. If you do have contacts on your phone, some data providers may not allow the contacts to be exported from the phone."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"The vCard composer didn\'t start properly."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Couldn\'t export"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"The contact data wasn\'t exported.\nReason: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard import request was rejected. Try again later."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> will be exported shortly."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"The file will be exported shortly."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Contacts will be exported shortly."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard export request was rejected. Try again later."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Caching vCard(s) to local temporary storage. The actual import will start soon."</string>
@@ -224,16 +219,11 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"First name first"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Surname first"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Default account for new contacts"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sync contact metadata [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sync contact metadata"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Contact metadata sync account"</string>
     <string name="setting_about" msgid="3926137653588942297">"About Contacts"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Settings"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Share visible contacts"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Failed to share visible contacts."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Share favourite contacts"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Share all contacts"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Failed to share contacts."</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"Import/Export contacts"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"Import/export contacts"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Import contacts"</string>
     <string name="share_error" msgid="665756457151793108">"This contact cannot be shared."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"There are no contacts to share."</string>
@@ -249,8 +239,8 @@
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"No contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="8492322695770647639">"Clear frequents"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"Select SIM card"</string>
-    <string name="menu_accounts" msgid="2944004960829403994">"Manage accounts"</string>
-    <string name="menu_import_export" msgid="6446229463809981669">"Import/export"</string>
+    <string name="menu_accounts" msgid="2944004960829403994">"Manage Accounts"</string>
+    <string name="menu_import_export" msgid="6446229463809981669">"Import/Export"</string>
     <string name="contact_status_update_attribution" msgid="8419168578670128134">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"stop searching"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Privacy Policy"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Terms of Service"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Open-source licences"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Failed to open the URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> checked"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> not checked"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Place video call"</string>
diff --git a/res-common/values-en-rGB-sw600dp/strings.xml b/res-common/values-en-rGB-sw600dp/strings.xml
deleted file mode 100644
index 75313be..0000000
--- a/res-common/values-en-rGB-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tablet only, unsynced"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"There are no exportable contacts. If you do have contacts on your tablet, some data providers may not allow the contacts to be exported from the tablet."</string>
-</resources>
diff --git a/res-common/values-en-rGB/strings.xml b/res-common/values-en-rGB/strings.xml
index eed9ea3..9abd069 100644
--- a/res-common/values-en-rGB/strings.xml
+++ b/res-common/values-en-rGB/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Call work pager"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Call <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Call MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Call)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Text home"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Text mobile"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Text work pager"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Text <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Text MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Message)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Make video call"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Clear frequently contacted?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contacts"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Other"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Work directory"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Work Directory"</string>
     <string name="local_search_label" msgid="9094584931063745728">"All contacts"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Me"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Searching…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Frequently contacted"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"View contact"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"All contacts with phone numbers"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Work profile contacts"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Work Profile contacts"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"View updates"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Phone-only, unsynced"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Phone-only, unsynced"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Name"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Nickname"</string>
     <string name="full_name" msgid="885420216812981202">"Name"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"One or more files couldn\'t be imported (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Finished exporting <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Finished exporting contacts."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Finished exporting contacts, click the notification to share contacts."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Tap to share contacts."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exporting <xliff:g id="FILENAME">%s</xliff:g> cancelled."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exporting contact data"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Contact data is being exported."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Your contact data is being exported to: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Couldn\'t get database information."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"There are no exportable contacts. If you do have contacts on your phone, some data providers may not allow the contacts to be exported from the phone."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"There are no exportable contacts. If you do have contacts on your phone, some data providers may not allow the contacts to be exported from the phone."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"The vCard composer didn\'t start properly."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Couldn\'t export"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"The contact data wasn\'t exported.\nReason: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard import request was rejected. Try again later."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> will be exported shortly."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"The file will be exported shortly."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Contacts will be exported shortly."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard export request was rejected. Try again later."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Caching vCard(s) to local temporary storage. The actual import will start soon."</string>
@@ -224,16 +219,11 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"First name first"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Surname first"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Default account for new contacts"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sync contact metadata [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sync contact metadata"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Contact metadata sync account"</string>
     <string name="setting_about" msgid="3926137653588942297">"About Contacts"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Settings"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Share visible contacts"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Failed to share visible contacts."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Share favourite contacts"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Share all contacts"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Failed to share contacts."</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"Import/Export contacts"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"Import/export contacts"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Import contacts"</string>
     <string name="share_error" msgid="665756457151793108">"This contact cannot be shared."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"There are no contacts to share."</string>
@@ -249,8 +239,8 @@
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"No contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="8492322695770647639">"Clear frequents"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"Select SIM card"</string>
-    <string name="menu_accounts" msgid="2944004960829403994">"Manage accounts"</string>
-    <string name="menu_import_export" msgid="6446229463809981669">"Import/export"</string>
+    <string name="menu_accounts" msgid="2944004960829403994">"Manage Accounts"</string>
+    <string name="menu_import_export" msgid="6446229463809981669">"Import/Export"</string>
     <string name="contact_status_update_attribution" msgid="8419168578670128134">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"stop searching"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Privacy Policy"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Terms of Service"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Open-source licences"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Failed to open the URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> checked"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> not checked"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Place video call"</string>
diff --git a/res-common/values-en-rIN-sw600dp/strings.xml b/res-common/values-en-rIN-sw600dp/strings.xml
deleted file mode 100644
index 75313be..0000000
--- a/res-common/values-en-rIN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tablet only, unsynced"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"There are no exportable contacts. If you do have contacts on your tablet, some data providers may not allow the contacts to be exported from the tablet."</string>
-</resources>
diff --git a/res-common/values-en-rIN/strings.xml b/res-common/values-en-rIN/strings.xml
index eed9ea3..9abd069 100644
--- a/res-common/values-en-rIN/strings.xml
+++ b/res-common/values-en-rIN/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Call work pager"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Call <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Call MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Call)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Text <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Text home"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Text mobile"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Text work pager"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Text <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Text MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Message)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Make video call"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Clear frequently contacted?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"You\'ll clear the frequently contacted list in the Contacts and Phone apps, and force email apps to learn your addressing preferences from scratch."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contacts"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Other"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Work directory"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Work Directory"</string>
     <string name="local_search_label" msgid="9094584931063745728">"All contacts"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Me"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Searching…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Frequently contacted"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"View contact"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"All contacts with phone numbers"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Work profile contacts"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Work Profile contacts"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"View updates"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Phone-only, unsynced"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Phone-only, unsynced"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Name"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Nickname"</string>
     <string name="full_name" msgid="885420216812981202">"Name"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"One or more files couldn\'t be imported (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Finished exporting <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Finished exporting contacts."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Finished exporting contacts, click the notification to share contacts."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Tap to share contacts."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exporting <xliff:g id="FILENAME">%s</xliff:g> cancelled."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exporting contact data"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Contact data is being exported."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Your contact data is being exported to: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Couldn\'t get database information."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"There are no exportable contacts. If you do have contacts on your phone, some data providers may not allow the contacts to be exported from the phone."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"There are no exportable contacts. If you do have contacts on your phone, some data providers may not allow the contacts to be exported from the phone."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"The vCard composer didn\'t start properly."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Couldn\'t export"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"The contact data wasn\'t exported.\nReason: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard import request was rejected. Try again later."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> will be exported shortly."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"The file will be exported shortly."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Contacts will be exported shortly."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard export request was rejected. Try again later."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Caching vCard(s) to local temporary storage. The actual import will start soon."</string>
@@ -224,16 +219,11 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"First name first"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Surname first"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Default account for new contacts"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sync contact metadata [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sync contact metadata"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Contact metadata sync account"</string>
     <string name="setting_about" msgid="3926137653588942297">"About Contacts"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Settings"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Share visible contacts"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Failed to share visible contacts."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Share favourite contacts"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Share all contacts"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Failed to share contacts."</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"Import/Export contacts"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"Import/export contacts"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Import contacts"</string>
     <string name="share_error" msgid="665756457151793108">"This contact cannot be shared."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"There are no contacts to share."</string>
@@ -249,8 +239,8 @@
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"No contacts in <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="menu_clear_frequents" msgid="8492322695770647639">"Clear frequents"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"Select SIM card"</string>
-    <string name="menu_accounts" msgid="2944004960829403994">"Manage accounts"</string>
-    <string name="menu_import_export" msgid="6446229463809981669">"Import/export"</string>
+    <string name="menu_accounts" msgid="2944004960829403994">"Manage Accounts"</string>
+    <string name="menu_import_export" msgid="6446229463809981669">"Import/Export"</string>
     <string name="contact_status_update_attribution" msgid="8419168578670128134">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"stop searching"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Privacy Policy"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Terms of Service"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Open-source licences"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Failed to open the URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> checked"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> not checked"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Place video call"</string>
diff --git a/res-common/values-es-rUS-sw600dp/strings.xml b/res-common/values-es-rUS-sw600dp/strings.xml
deleted file mode 100644
index 21a89d8..0000000
--- a/res-common/values-es-rUS-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Solo en la tablet, sin sincronizar"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"No hay contactos exportables. Si tienes contactos en la tablet, es posible que algunos proveedores de datos no permitan la exportación de contactos desde la tablet."</string>
-</resources>
diff --git a/res-common/values-es-rUS/strings.xml b/res-common/values-es-rUS/strings.xml
index 479b665..a84c50a 100644
--- a/res-common/values-es-rUS/strings.xml
+++ b/res-common/values-es-rUS/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Llamar al localizador del trabajo"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Llamar a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Llamar a MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Llamar)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Enviar SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Enviar SMS a casa"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Enviar SMS al móvil"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Enviar SMS al localizador del trabajo"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Enviar SMS a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Enviar SMS a MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Enviar mensaje)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Realizar videollamada"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"¿Borrar contactos frecuentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Borrarás la lista de personas con las que te pones en contacto frecuentemente de las aplicaciones Contactos y Teléfono. Además, tus aplicaciones de correo deberán establecer tus preferencias nuevamente."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contactos"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Otro"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Directorio"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Directorio del trabajo"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Directorio de trabajo"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Todos los contactos"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Yo"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Buscando…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contactados con frecuencia"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Ver contacto"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Todos los contactos con número de teléfono"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contactos del perfil de trabajo"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contactos del perfil de trabajo"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Ver actualizaciones"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Contacto no sincronizado"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Contacto no sincronizado"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nombre"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Apodo"</string>
     <string name="full_name" msgid="885420216812981202">"Nombre"</string>
@@ -105,7 +103,7 @@
     <string name="name_phonetic_middle" msgid="5970174427249235577">"Segundo nombre fonético"</string>
     <string name="name_phonetic_family" msgid="1572398622239414464">"Apellido fonético"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"Teléfono"</string>
-    <string name="emailLabelsGroup" msgid="4696310712601184208">"Correo electrónico"</string>
+    <string name="emailLabelsGroup" msgid="4696310712601184208">"Dirección de correo"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"Dirección"</string>
     <string name="imLabelsGroup" msgid="8733603247535725786">"MI"</string>
     <string name="organizationLabelsGroup" msgid="961008074745871784">"Organización"</string>
@@ -145,7 +143,7 @@
     <string name="chat_icq" msgid="7538190395602030726">"Chat mediante ICQ"</string>
     <string name="chat_jabber" msgid="4525546665986350869">"Chat mediante Jabber"</string>
     <string name="chat" msgid="6297650784873558837">"Chatear"</string>
-    <string name="description_minus_button" msgid="2142439445814730827">"borrar"</string>
+    <string name="description_minus_button" msgid="2142439445814730827">"eliminar"</string>
     <string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"Expandir o contraer campos de nombre"</string>
     <string name="expand_collapse_phonetic_name_fields_description" msgid="5241493357460353777">"Expandir o contraer campos de nombre fonético"</string>
     <string name="list_filter_all_accounts" msgid="4265359896628915784">"Todos los contactos"</string>
@@ -168,7 +166,7 @@
     <string name="import_from_sim" msgid="4749894687871835873">"Importar desde tarjeta SIM"</string>
     <string name="import_from_sim_summary" msgid="2306434118233541675">"Importar desde SIM <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string>
     <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importar desde SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="1381675161522633950">"Importar desde archivo .vcf"</string>
+    <string name="import_from_vcf_file" product="default" msgid="1381675161522633950">"Importar desde el archivo .vcf"</string>
     <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"¿Deseas cancelar la importación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"¿Deseas cancelar la exportación de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="7450212880694781527">"No se canceló impor./expor. de vCard."</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"No se pudieron importar uno o más archivos (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Exportación de <xliff:g id="FILENAME">%s</xliff:g> finalizada"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Finalizó la exportación de contactos"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Se completó la exportación de los contactos, haz clic en la notificación para compartir contactos."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Toca para compartir contactos."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Se canceló la exportación de <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exportando datos de contacto"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Se están exportando los datos de contacto."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Los datos de tu contacto se están exportando a <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"No se pudo obtener la información de la base de datos."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"No hay contactos exportables. Si tienes contactos en el dispositivo, es posible que algunos proveedores de datos no permitan la exportación de contactos desde el dispositivo."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"No hay contactos exportables. Si tienes contactos en el dispositivo, es posible que algunos proveedores de datos no permitan la exportación de contactos desde el dispositivo."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"El compositor de la vCard no se inició correctamente."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"No se pudo exportar"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"No se exportaron los datos del contacto.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Se rechazó la solicitud de importación de vCard. Vuelve a intentarlo más tarde."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> se exportará en breve."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"El archivo se exportará en breve."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Los contactos se exportarán en breve."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Se rechazó la solicitud de exportación de vCard. Vuelve a intentarlo más tarde."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contactar"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Almacenando vCard(s) en caché local temporal. La importación comenzará pronto."</string>
@@ -216,7 +211,7 @@
     <string name="confirm_export_title" msgid="3240899428149018226">"¿Exportar contactos?"</string>
     <string name="caching_vcard_title" msgid="9185299351381102305">"Almacenando en caché"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"Importando <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="4142192068495589925">"Exportar a archivo .vcf"</string>
+    <string name="export_to_vcf_file" product="default" msgid="4142192068495589925">"Exportar al archivo .vcf"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"Ordenar por"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Nombre"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Apellido"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Nombre primero"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Apellido primero"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Cuenta predeterminada para los contactos nuevos"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sincronizar metadatos de contactos [PRUEBA INTERNA]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sincronizar metadatos de contactos"</string>
-    <string name="setting_about" msgid="3926137653588942297">"Acerca de Contactos"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Configuración"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Cuenta de sincronización de metadatos de contacto"</string>
+    <string name="setting_about" msgid="3926137653588942297">"Acerca de los Contactos"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Compartir contactos visibles"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Se produjo un error al compartir los contactos visibles."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Compartir contactos favoritos"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Compartir todos los contactos"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"No se pudieron compartir los contactos."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importar/exportar contactos"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importar contactos"</string>
     <string name="share_error" msgid="665756457151793108">"No es posible compartir este contacto."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Política de privacidad"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Condiciones del servicio"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licencias de código abierto"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"No se pudo abrir la url."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> está marcado"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> no está marcado"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Hacer una videollamada"</string>
diff --git a/res-common/values-es-sw600dp/strings.xml b/res-common/values-es-sw600dp/strings.xml
deleted file mode 100644
index 8493824..0000000
--- a/res-common/values-es-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Solo en el tablet (sin sincronizar)"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"No hay contactos que exportar. Si ya tienes contactos en el tablet, es posible que el proveedor de datos no permita que se exporten los contactos del dispositivo."</string>
-</resources>
diff --git a/res-common/values-es/strings.xml b/res-common/values-es/strings.xml
index ae45533..829e073 100644
--- a/res-common/values-es/strings.xml
+++ b/res-common/values-es/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Llamar al busca del trabajo"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Llamar al <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Llamar a MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Llamar)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Enviar SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Enviar SMS a casa"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Enviar SMS al móvil"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Enviar SMS al busca del trabajo"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Enviar SMS al <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Enviar SMS a MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Enviar SMS)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Hacer videollamada"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"¿Borrar contactos frecuentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Vas a borrar la lista de contactos frecuentes de las aplicaciones Contactos y Teléfono y obligarás a las aplicaciones de correo electrónico a que memoricen tus preferencias de nuevo."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contactos"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Otros"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Directorio"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Directorio de trabajo"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Directorio de trabajo"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Todos los contactos"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Yo"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Buscando..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contactos frecuentes"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Ver contacto"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Todos los contactos con número"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contactos del perfil de trabajo"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contactos del perfil de trabajo"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Ver actualizaciones"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Solo en teléfono, no sincronizar"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Solo en teléfono, no sincronizar"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nombre"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Apodo"</string>
     <string name="full_name" msgid="885420216812981202">"Nombre"</string>
@@ -187,16 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"No se ha podido importar uno o más archivos (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Exportación de <xliff:g id="FILENAME">%s</xliff:g> finalizada"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Los contactos se han exportado."</string>
-    <!-- no translation found for exporting_vcard_finished_toast (5995505525489290221) -->
-    <skip />
-    <!-- no translation found for touch_to_share_contacts (3237211496215699092) -->
-    <skip />
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Se ha cancelado la exportación de <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exportando datos de contacto..."</string>
-    <!-- no translation found for exporting_contact_list_message (141905615542638683) -->
-    <skip />
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Se están exportando tus datos de contactos a <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"No se ha podido obtener información de la base de datos."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"No hay contactos que exportar. Si ya tienes contactos en el teléfono, es posible que el proveedor de datos no permita que se exporten los contactos del teléfono."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"No hay contactos que exportar. Si ya tienes contactos en el teléfono, es posible que el proveedor de datos no permita que se exporten los contactos del teléfono."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"El redactor de vCard no se ha iniciado correctamente."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Error al exportar"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"No se han exportado los datos de contacto(\nmotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")."</string>
@@ -210,8 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Se ha rechazado la solicitud de importación de vCard. Inténtalo de nuevo más tarde."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> se exportará en breve."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"El archivo se exportará en breve."</string>
-    <!-- no translation found for contacts_export_will_start_message (4527597765334949574) -->
-    <skip />
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Se ha rechazado la solicitud de exportación de vCard. Inténtalo de nuevo más tarde."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contacto"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Se están almacenando los archivos vCard en la caché. La importación empezará pronto."</string>
@@ -224,19 +215,14 @@
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"Ordenar por"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Nombre"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Apellido"</string>
-    <string name="display_options_view_names_as" msgid="3232196224409242435">"Formato de nombre"</string>
+    <string name="display_options_view_names_as" msgid="3232196224409242435">"Formato del nombre"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Nombre primero"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Apellido primero"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Cuenta predeterminada para nuevos contactos"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sincronizar metadatos de contactos [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sincronizar metadatos de contactos"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Cuenta de sincronización de metadatos de contactos"</string>
     <string name="setting_about" msgid="3926137653588942297">"Información sobre Contactos"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Ajustes"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Compartir contactos visibles"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"No ha sido posible compartir los contactos visibles."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Compartir contactos favoritos"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Compartir todos los contactos"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Error al compartir contactos"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importar/exportar contactos"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importar contactos"</string>
     <string name="share_error" msgid="665756457151793108">"Este contacto no se puede compartir."</string>
@@ -272,13 +258,12 @@
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> elementos no leídos. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> elemento no leído. </item>
     </plurals>
-    <string name="about_build_version" msgid="4221971683776635130">"Versión de la compilación"</string>
+    <string name="about_build_version" msgid="4221971683776635130">"Versión de compilación"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"Licencias de software libre"</string>
     <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Detalles de las licencias de software libre"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"Política de Privacidad"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Condiciones de Servicio"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licencias de software libre"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"No se ha podido abrir la URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"No se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Hacer videollamada"</string>
diff --git a/res-common/values-et-rEE-sw600dp/strings.xml b/res-common/values-et-rEE-sw600dp/strings.xml
deleted file mode 100644
index 8c9c8eb..0000000
--- a/res-common/values-et-rEE-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Ainult tahvelarvuti, sünkroonimata"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Eksporditavaid kontakte pole. Kui teil siiski on tahvelarvutis kontakte, ei pruugi mõned andmesidepakkujad kontaktide eksportimist tahvelarvutist lubada."</string>
-</resources>
diff --git a/res-common/values-et-rEE/strings.xml b/res-common/values-et-rEE/strings.xml
index e181211..76454d0 100644
--- a/res-common/values-et-rEE/strings.xml
+++ b/res-common/values-et-rEE/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Helista tööpiiparinumbrile"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Helista numbrile <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Helista MMS-i numbrile"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (helistamine)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Saada sõnum numbrile <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Saada sõnum kodutelefoninumbrile"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Saada sõnum mobiilinumbrile"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Saada sõnum tööpiiparinumbrile"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Saada sõnum numbrile <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Saada sõnum MMS-i numbrile"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (sõnum)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Videokõne tegemine"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Kas kustutada sagedased kontaktid?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Kustutate rakendustes Kontaktid ja Telefon sagedaste kontaktide loendi, mistõttu meilirakendused peavad teie adresseerimiseelistused uuesti omandama."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontaktid"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Muu"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Kataloog"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Töökontaktide kataloog"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Töökontaktide kataloog"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Kõik kontaktid"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Mina"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Otsimine ..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Sageli valitud kontaktisikud"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Vaadake kontakti"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Kõik telefoninumbritega kontaktid"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Tööprofiili kontaktid"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Tööprofiili kontaktid"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Kuva värskendused"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Ainult telefon, sünkroonimata"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Ainult telefon, sünkroonimata"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nimi"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Hüüdnimi"</string>
     <string name="full_name" msgid="885420216812981202">"Nimi"</string>
@@ -105,9 +103,9 @@
     <string name="name_phonetic_middle" msgid="5970174427249235577">"Foneetiline keskmine nimi"</string>
     <string name="name_phonetic_family" msgid="1572398622239414464">"Foneetiline perekonnanimi"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="4696310712601184208">"E-post"</string>
+    <string name="emailLabelsGroup" msgid="4696310712601184208">"Meil"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"Aadress"</string>
-    <string name="imLabelsGroup" msgid="8733603247535725786">"Kiirsuhtlus"</string>
+    <string name="imLabelsGroup" msgid="8733603247535725786">"IM"</string>
     <string name="organizationLabelsGroup" msgid="961008074745871784">"Organisatsioon"</string>
     <string name="relationLabelsGroup" msgid="3585294036166325520">"Suhe"</string>
     <string name="eventLabelsGroup" msgid="4801419345682462171">"Erikuupäev"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Vähemalt ühe faili importimine ebaõnnestus (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Faili <xliff:g id="FILENAME">%s</xliff:g> eksportimine on lõpetatud."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Kontaktide eksportimine on lõpetatud."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontaktide eksportimine lõpetati. Kontaktide jagamiseks klõpsake märguandel."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Puudutage kontaktide jagamiseks."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Faili <xliff:g id="FILENAME">%s</xliff:g> eksportimine tühistati."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Kontaktandmete eksportimine"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontaktide andmed eksporditakse."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Teie kontaktandmed eksporditakse faili: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Andmebaasiteabe hankimine ebaõnnestus."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Eksporditavaid kontakte pole. Kui teil siiski on telefonis kontakte, ei pruugi mõned andmesidepakkujad kontaktide eksportimist telefonist lubada."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Eksporditavaid kontakte pole. Kui teil siiski on telefonis kontakte, ei pruugi mõned andmesidepakkujad kontaktide eksportimist telefonist lubada."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCardi helilooja ei käivitunud korralikult."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Eksport ebaõnnestus"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Kontaktandmeid ei eksporditud.\nPõhjus: „<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCardi importimistaotlus lükati tagasi. Proovige hiljem uuesti."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Fail <xliff:g id="FILENAME">%s</xliff:g> eksporditakse peagi."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Fail eksporditakse peagi."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontaktid eksporditakse peagi."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCardi eksportimistaotlus lükati tagasi. Proovige hiljem uuesti."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCardi(de) vahemälustamine kohalikku ajutisse mäluruumi. Tegelik importimine algab peagi."</string>
@@ -217,22 +212,17 @@
     <string name="caching_vcard_title" msgid="9185299351381102305">"Vahemällu salvestamine"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"Importimine: <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="4142192068495589925">"Eksportimine VCF-faili"</string>
-    <string name="display_options_sort_list_by" msgid="8635268562263708102">"Sortimisalus"</string>
+    <string name="display_options_sort_list_by" msgid="8635268562263708102">"Sortimisalus:"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Eesnimi"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Perekonnanimi"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"Nimevorming"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Eesnimi enne"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Perekonnanimi enne"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Vaikekonto uute kontaktide jaoks"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sünkrooni kontakti metaandmed [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sünkrooni kontakti metaandmed"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kontakti metaandmete sünkroonimise konto"</string>
     <string name="setting_about" msgid="3926137653588942297">"Teave rakenduse Kontaktid kohta"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Seaded"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Jaga nähtavaid kontakte"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Nähtavate kontaktide jagamine ebaõnnestus."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Jaga lemmikkontakte"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Jaga kõiki kontakte"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kontaktide jagamine ebaõnnestus."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Kontaktide import/eksport"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Impordi kontaktid"</string>
     <string name="share_error" msgid="665756457151793108">"Seda kontakti ei saa jagada."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Privaatsuseeskirjad"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Teenusetingimused"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Avatud lähtekoodi litsentsid"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"URL-i avamine ebaõnnestus."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Üksus <xliff:g id="ACCOUNT_INFO">%s</xliff:g> on märgitud"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Üksus <xliff:g id="ACCOUNT_INFO">%s</xliff:g> pole märgitud"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Videokõne tegemine"</string>
diff --git a/res-common/values-eu-rES-sw600dp/strings.xml b/res-common/values-eu-rES-sw600dp/strings.xml
deleted file mode 100644
index 1bbd656..0000000
--- a/res-common/values-eu-rES-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tabletan soilik; sinkronizatu gabeko"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Ez dago esporta daitekeen kontakturik. Tabletan kontaktuak badituzu, baliteke datu-hornitzaileek kontaktuak telefonotik esportatzen ez uztea."</string>
-</resources>
diff --git a/res-common/values-eu-rES/strings.xml b/res-common/values-eu-rES/strings.xml
index 36fba7f..c730d64 100644
--- a/res-common/values-eu-rES/strings.xml
+++ b/res-common/values-eu-rES/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Deitu laneko bilagailura"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Deitu <xliff:g id="ASSISTANT">%s</xliff:g> zenbakira"</string>
     <string name="call_mms" msgid="8998771923464696960">"Deitu MMS zenbakira"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (deitu)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Bidali testu-mezua honi: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Bidali testu-mezua etxera"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Bidali testu-mezua mugikorrera"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Bidali testu-mezua laneko bilagailura"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Bidali testu-mezua honi: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Bidali testu-mezua MMS zenbakira"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (bidali SMS mezua)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Egin bideo-deia"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Sarri erabilitako kontaktuak garbitu?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Kontaktuak eta Telefonoa aplikazioetako sarri erabilitako kontaktuen zerrenda garbituko duzu; beraz, posta elektronikoaren aplikazioek helbideen hobespenak hutsetik ikasi beharko dituzte."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontaktuak"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Beste bat"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Direktorioa"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Laneko kontaktuak"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Laneko kontaktuak"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Kontaktu guztiak"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ni"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Bilatzen…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Sarri kontaktatutakoak"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Ikusi kontaktua"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Telefono-zenbakiak dituzten kontaktu guztiak"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Laneko profileko kontaktuak"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Laneko profileko kontaktuak"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Ikusi berritasunak"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Telefonoan soilik, sinkronizatu gabeko"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Telefonoan soilik, sinkronizatu gabe"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Izena"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Goitizena"</string>
     <string name="full_name" msgid="885420216812981202">"Izena"</string>
@@ -114,7 +112,7 @@
     <string name="sms" msgid="8086289395154598654">"Testu-mezua"</string>
     <string name="postal_address" msgid="7692926530081579786">"Helbidea"</string>
     <string name="ghostData_company" msgid="22470841482615409">"Enpresa"</string>
-    <string name="ghostData_title" msgid="6221293237772204604">"Lanpostua"</string>
+    <string name="ghostData_title" msgid="6221293237772204604">"Izena"</string>
     <string name="label_notes" msgid="3997277594846722699">"Oharrak"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"Webgunea"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Ezin izan da fitxategi bat edo gehiago inportatu (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Amaitu <xliff:g id="FILENAME">%s</xliff:g> esportatzen."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Esportatu dira kontaktuak."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Esportatu dira kontaktuak. Haiek partekatzeko, sakatu jakinarazpena."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Sakatu kontaktuak partekatzeko."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> fitxategia esportatzeari utzi zaio."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Kontaktatzeko datuak esportatzen"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontaktuen datuak esportatzen ari gara."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Zurekin kontaktatzeko datuak fitxategi honetara esportatzen ari dira: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Ezin izan da datu-baseko informazioa lortu."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Ez dago esporta daitekeen kontakturik. Telefonoan kontaktuak badituzu, baliteke datu-hornitzaileek kontaktuak telefonotik esportatzen ez uztea."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Ez dago esporta daitekeen kontakturik. Telefonoan kontaktuak badituzu, baliteke datu-hornitzaileek kontaktuak telefonotik esportatzen ez uztea."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard txartelen idazlea ez da behar bezala hasi."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Ezin da esportatu"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Ez dira kontaktuaren datuak esportatu.\nArrazoia: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard fitxategia inportatzeko eskaera ukatu da. Saiatu geroago."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> fitxategia laster esportatuko da."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Laster esportatuko da fitxategia."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Laster esportatuko dira kontaktuak."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard fitxategia esportatzeko eskaera ukatu da. Saiatu berriro geroago."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontaktua"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard-ak aldi baterako biltegi lokalaren cachean gordetzen ari dira. Inportazioa bera laster hasiko da."</string>
@@ -224,16 +219,11 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Izena lehenengo"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Abizena lehenengo"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Kontaktu berriak gordetzeko kontu lehenetsia"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sinkronizatu kontaktuen metadatuak [PROBAKO BERTSIOA]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sinkronizatu kontaktuen metadatuak"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kontaktuen metadatuen sinkronizazio-kontua"</string>
     <string name="setting_about" msgid="3926137653588942297">"Kontaktuak zerbitzuari buruz"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Ezarpenak"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Partekatu ikusgai dauden kontaktuak"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Ezin izan dira partekatu ikusgai dauden kontaktuak."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Partekatu gogoko kontaktuak"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Partekatu kontaktu guztiak"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Ezin izan dira partekatu kontaktuak."</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"Inportatu/Esportatu kontaktuak"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"Inportatu edo esportatu kontaktuak"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Inportatu kontaktuak"</string>
     <string name="share_error" msgid="665756457151793108">"Ezin da kontaktua partekatu."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"Ez dago parteka daitekeen kontakturik."</string>
@@ -241,7 +231,7 @@
     <string name="menu_contacts_filter" msgid="586356478145511794">"Bistaratzeko kontaktuak"</string>
     <string name="activity_title_contacts_filter" msgid="7689519428197855166">"Bistaratzeko kontaktuak"</string>
     <string name="custom_list_filter" msgid="582616656313514803">"Definitu ikuspegi pertsonalizatua"</string>
-    <string name="hint_findContacts" msgid="28151707326753522">"Bilatu kontaktuak"</string>
+    <string name="hint_findContacts" msgid="28151707326753522">"Aurkitu kontaktuak"</string>
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"Gogokoak"</string>
     <string name="listTotalAllContactsZero" msgid="6041341919823872732">"Ez dago kontakturik."</string>
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"Ez dago ikusgai dagoen kontakturik."</string>
@@ -250,7 +240,7 @@
     <string name="menu_clear_frequents" msgid="8492322695770647639">"Garbitu sarri erabilitakoak"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"Hautatu SIM txartela"</string>
     <string name="menu_accounts" msgid="2944004960829403994">"Kudeatu kontuak"</string>
-    <string name="menu_import_export" msgid="6446229463809981669">"Inportatu/Esportatu"</string>
+    <string name="menu_import_export" msgid="6446229463809981669">"Inportatu/esportatu"</string>
     <string name="contact_status_update_attribution" msgid="8419168578670128134">"<xliff:g id="SOURCE">%1$s</xliff:g> bidez"</string>
     <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="SOURCE">%2$s</xliff:g> bidez"</string>
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"gelditu bilaketa"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Pribatutasun-gidalerroak"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Zerbitzu-baldintzak"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Kode irekiko lizentziak"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Ezin izan da ireki URLa."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> hautatuta"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> hautatu gabe"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Egin bideo-deia"</string>
diff --git a/res-common/values-fa-sw600dp/strings.xml b/res-common/values-fa-sw600dp/strings.xml
deleted file mode 100644
index 69f4fec..0000000
--- a/res-common/values-fa-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"فقط رایانه لوحی، همگام‌سازی نشده"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"مخاطب قابل صادر کردن وجود ندارد. اگر روی رایانه لوحی خود مخاطبینی دارید، بعضی از ارائه‌دهندگان داده ممکن است اجازه ندهند مخاطبین از رایانه لوحی صادر شوند."</string>
-</resources>
diff --git a/res-common/values-fa/strings.xml b/res-common/values-fa/strings.xml
index 826ae4f..5b54b1d 100644
--- a/res-common/values-fa/strings.xml
+++ b/res-common/values-fa/strings.xml
@@ -39,8 +39,7 @@
     <string name="call_work_mobile" msgid="4408630608955148641">"تماس با تلفن همراه محل کار"</string>
     <string name="call_work_pager" msgid="3036932765279753793">"تماس با پی‌جوی محل کار"</string>
     <string name="call_assistant" msgid="5188990854852312696">"تماس با <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="8998771923464696960">"تماس با فراپیام"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (تماس)"</string>
+    <string name="call_mms" msgid="8998771923464696960">"‏تماس با MMS"</string>
     <string name="sms_custom" msgid="4601748252470175865">"ارسال پیامک به <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"ارسال پیامک به تلفن منزل"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"ارسال پیامک به تلفن همراه"</string>
@@ -62,18 +61,17 @@
     <string name="sms_work_pager" msgid="499303540738557836">"ارسال پیامک به پی‌جوی محل کار"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"ارسال پیامک به <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"ارسال پیامک به خدمات پیام چندرسانه‌ای"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (پیام)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"برقراری تماس ویدیویی"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"مکرراً تماس‌گرفته‌ها پاک شود؟"</string>
-    <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"فهرست افرادی را که مکرر با آن‌ها تماس گرفته‌اید در برنامه‌های «مخاطبین» و «تلفن» پاک خواهید کرد و برنامه‌های رایانامه مجبور می‌شوند که تنظیمات برگزیده آدرس‌دهی شما را از اول یاد بگیرند."</string>
-    <string name="clearFrequentsProgress_title" msgid="3738406170865048982">"درحال پاک کردن مکرراً تماس‌گرفته…"</string>
+    <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"فهرست مکرر تماس‌گرفته‌شده پاک شود؟"</string>
+    <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"فهرست افرادی را که مکرر با آن‌ها تماس گرفته‌اید در برنامه‌های «مخاطبین» و «تلفن» پاک خواهید کرد و برنامه‌های ایمیل مجبور می‌شوند که تنظیمات برگزیده آدرس‌دهی شما را از اول یاد بگیرند."</string>
+    <string name="clearFrequentsProgress_title" msgid="3738406170865048982">"درحال پاک کردن مکرر تماس‌گرفته‌شده…"</string>
     <string name="status_available" msgid="4832569677396634846">"در دسترس"</string>
     <string name="status_away" msgid="6267905184545881094">"غایب"</string>
     <string name="status_busy" msgid="7111912905211403545">"مشغول"</string>
     <string name="contactsList" msgid="7140022347217602605">"مخاطبین"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"موارد دیگر"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"فهرست"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"فهرست کار"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"فهرست راهنمای مخاطب کاری"</string>
     <string name="local_search_label" msgid="9094584931063745728">"همه مخاطبین"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"من"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"درحال جستجو..."</string>
@@ -86,12 +84,12 @@
     <string name="description_quick_contact_for" msgid="6355240770807101947">"تماس سریع برای <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="2633118852693000081">"(بدون نام)"</string>
     <string name="favoritesFrequentCalled" msgid="6600127125011757687">"بیشتر تماس‌ گرفته شده"</string>
-    <string name="favoritesFrequentContacted" msgid="2849493314447751970">"مکرراً تماس‌گرفته"</string>
+    <string name="favoritesFrequentContacted" msgid="2849493314447751970">"مکرر تماس‌گرفته‌شده"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"مشاهده مخاطب"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"همه مخاطبین دارای شماره تلفن"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"مخاطبین نمایه کاری"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"مخاطبین نمایه کاری"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"مشاهده به‌روزرسانی‌ها"</string>
-    <string name="account_phone" msgid="6104157990869081962">"فقط تلفن، همگام‌سازی‌نشده"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"فقط تلفن، همگام‌سازی نشده"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"نام"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"نام مستعار"</string>
     <string name="full_name" msgid="885420216812981202">"نام"</string>
@@ -105,7 +103,7 @@
     <string name="name_phonetic_middle" msgid="5970174427249235577">"تلفظ نام میانی"</string>
     <string name="name_phonetic_family" msgid="1572398622239414464">"تلفظ نام خانوادگی"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"تلفن"</string>
-    <string name="emailLabelsGroup" msgid="4696310712601184208">"رایانامه"</string>
+    <string name="emailLabelsGroup" msgid="4696310712601184208">"ایمیل"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"آدرس"</string>
     <string name="imLabelsGroup" msgid="8733603247535725786">"پیام فوری"</string>
     <string name="organizationLabelsGroup" msgid="961008074745871784">"سازمان"</string>
@@ -119,12 +117,12 @@
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"وب سایت"</string>
     <string name="groupsLabel" msgid="3574316547053047551">"گروه‌ها"</string>
-    <string name="email_home" msgid="2230967805906450693">"رایانامه به منزل"</string>
-    <string name="email_mobile" msgid="7532438378678903685">"رایانامه به تلفن همراه"</string>
-    <string name="email_work" msgid="7065971921227432400">"رایانامه به محل کار"</string>
-    <string name="email_other" msgid="4601881243553289615">"رایانامه"</string>
-    <string name="email_custom" msgid="5777583741581538870">"رایانامه به <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="5624424151176351591">"رایانامه"</string>
+    <string name="email_home" msgid="2230967805906450693">"ایمیل به منزل"</string>
+    <string name="email_mobile" msgid="7532438378678903685">"ایمیل به تلفن همراه"</string>
+    <string name="email_work" msgid="7065971921227432400">"ایمیل به محل کار"</string>
+    <string name="email_other" msgid="4601881243553289615">"ایمیل"</string>
+    <string name="email_custom" msgid="5777583741581538870">"ایمیل به <xliff:g id="CUSTOM">%s</xliff:g>"</string>
+    <string name="email" msgid="5624424151176351591">"ایمیل"</string>
     <string name="postal_street" msgid="881349814077356134">"خیابان"</string>
     <string name="postal_pobox" msgid="1799978742074885091">"صندوق پستی"</string>
     <string name="postal_neighborhood" msgid="3721092668038527674">"محله"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"‏نمی‌توان یک یا چند فایل را وارد کرد (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"صادر کردن <xliff:g id="FILENAME">%s</xliff:g> پایان یافت."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"صادرکردن مخاطبین تمام شد."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"صادر کردن مخاطبین تمام شد؛ برای به اشتراک گذاشتن مخاطبین، روی اعلان کلیک کنید."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"برای به اشتراک گذاشتن مخاطبین ضربه بزنید."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"صادر کردن <xliff:g id="FILENAME">%s</xliff:g> لغو شد."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"صدور اطلاعات مخاطب"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"داده‌های مخاطب در حال صادر شدن است."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"داده‌های تماس شما در حال صادر شدن به این فایل هستند: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"نمی‌توان اطلاعات پایگاه داده را دریافت کرد."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"هیچ مخاطب قابل صدوری وجود ندارد. اگر در گوشی خود مخاطبینی دارید، بعضی از ارائه‌دهندگان داده ممکن است اجازه ندهند تا مخاطبین از گوشی صادر شوند."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"هیچ مخاطب قابل صدوری وجود ندارد. اگر در گوشی خود مخاطبینی دارید، بعضی از ارائه‌دهندگان داده ممکن است اجازه ندهند تا مخاطبین از گوشی صادر شوند."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"سازنده فایل کارت ویزیت به درستی اجرا نشد."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"صادر نمی‌شود"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"‏داده‎های مخاطب صادر نشد.\nعلت: «<xliff:g id="FAIL_REASON">%s</xliff:g>»"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"درخواست وارد کردن کارت ویزیت رد شد. لطفاً بعداً امتحان کنید."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> به زودی صادر می‌شود."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"فایل به‌زودی منقضی می‌شود."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"مخاطبین به‌زودی صادر می‌شوند."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"درخواست صدور کارت ویزیت رد شد. لطفاً بعداً امتحان کنید."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"مخاطب"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"در حال ذخیره کارت‌(های) ویزیت در حافظه موقت محلی است. وارد کردن واقعی به زودی آغاز خواهد شد."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"ابتدا نام"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"ابتدا نام خانوادگی"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"حساب پیش‌فرض برای مخاطبین جدید"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"همگام‌سازی فراداده مخاطب [آزمایشی]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"همگام‌سازی فراداده مخاطب"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"حساب همگام‌سازی فراداده مخاطب"</string>
     <string name="setting_about" msgid="3926137653588942297">"درباره مخاطبین"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"تنظیمات"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"اشتراک‌گذاری مخاطبین قابل مشاهده"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"مخاطبین قابل مشاهده به اشتراک گذاشته نشدند."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"اشتراک‌گذاری مخاطبین موردعلاقه"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"اشتراک‌گذاری همه مخاطبین"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"مخاطبین به اشتراک گذاشته نشدند."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"وارد کردن/صادر کردن مخاطبین"</string>
     <string name="dialog_import" msgid="5177004290082451296">"وارد کردن مخاطبین"</string>
     <string name="share_error" msgid="665756457151793108">"این مخاطب قابل اشتراک‌گذاری نیست."</string>
@@ -245,9 +235,9 @@
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"موارد دلخواه"</string>
     <string name="listTotalAllContactsZero" msgid="6041341919823872732">"مخاطبی موجود نیست."</string>
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"مخاطب قابل مشاهده‌ای موجود نیست."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"مورد دلخواهی ندارید"</string>
+    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"مورد دلخواهی وجود ندارد"</string>
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"هیچ مخاطبی در <xliff:g id="NAME">%s</xliff:g> موجود نیست"</string>
-    <string name="menu_clear_frequents" msgid="8492322695770647639">"پاک کردن مکرراً تماس‌گرفته"</string>
+    <string name="menu_clear_frequents" msgid="8492322695770647639">"پاک کردن موارد مکرر"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"انتخاب سیم‌کارت"</string>
     <string name="menu_accounts" msgid="2944004960829403994">"مدیریت حساب‌ها"</string>
     <string name="menu_import_export" msgid="6446229463809981669">"وارد کردن/صادر کردن"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"خط‌مشی رازداری"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"شرایط خدمات"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"مجوزهای منبع آزاد"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"نشانی وب باز نشد."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> علامت‌گذاری شد"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> بدون علامت شد"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"برقراری تماس ویدیویی"</string>
diff --git a/res-common/values-fi-sw600dp/strings.xml b/res-common/values-fi-sw600dp/strings.xml
deleted file mode 100644
index 8045651..0000000
--- a/res-common/values-fi-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Vain tabletti, ei synkronoitu"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Vietäviä yhteystietoja ei ole. Jos tabletissasi on yhteystietoja, tietojen tarjoaja on saattanut estää niiden viemisen tabletin ulkopuolelle."</string>
-</resources>
diff --git a/res-common/values-fi/strings.xml b/res-common/values-fi/strings.xml
index be2599a..92d8497 100644
--- a/res-common/values-fi/strings.xml
+++ b/res-common/values-fi/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Soita hakulaitteeseen (työ)"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Soita: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Soita MMS-numeroon"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (soita)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Lähetä tekstiviesti: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Lähetä tekstiviesti kotinumeroon"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Lähetä tekstiviesti matkapuhelimeen"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Lähetä tekstiviesti hakulaitteeseen (työ)"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Lähetä tekstiviesti: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Lähetä tekstiviesti MMS-numeroon"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (lähetä viesti)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Soita videopuhelu"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Tyhjennetäänkö usein käytetyt?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Toiminto tyhjentää Yhteystiedot- ja Puhelin-sovellusten usein käytettyjen kontaktien luettelon. Lisäksi sähköpostisovellukset pakotetaan opettelemaan osoiteasetuksesi uudestaan."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Yhteystiedot"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Muu"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Osoitekirja"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Työhakemisto"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Työhakemisto"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Kaikki yhteystiedot"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Minä"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Haetaan..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Usein käytetyt"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Näytä kontakti"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Kaikki kontaktit, joilla on puhelinnumero"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Työprofiilin yhteystiedot"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Työprofiilin yhteystiedot"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Näytä päivitykset"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Vain puhelin, ei synkronoitu"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Vain puhelin, ei synkronoitu"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nimi"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Lempinimi"</string>
     <string name="full_name" msgid="885420216812981202">"Nimi"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Ainakin yhden tiedoston tuominen epäonnistui (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Kohde <xliff:g id="FILENAME">%s</xliff:g> on viety."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Yhteystiedot on viety."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Yhteystiedot vietiin. Jaa yhteystiedot klikkaamalla ilmoitusta."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Jaa yhteystiedot koskettamalla."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Kohteen <xliff:g id="FILENAME">%s</xliff:g> vienti peruutettiin."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Viedään yhteystietoja"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Yhteystietoja viedään."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Yhteystietosi viedään kohteeseen <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Tietokannan tietojen hakeminen epäonnistui."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Vietäviä yhteystietoja ei ole. Jos puhelimessasi on yhteystietoja, tietojen tarjoaja on saattanut estää niiden viemisen puhelimen ulkopuolelle."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Vietäviä yhteystietoja ei ole. Jos puhelimessasi on yhteystietoja, tietojen tarjoaja on saattanut estää niiden viemisen puhelimen ulkopuolelle."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard-luonti ei käynnistynyt oikein."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Vieminen epäonnistui"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Yhteystietoja ei viety.\nSyy: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard-tuontipyyntö hylättiin. Yritä myöhemmin uudelleen."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> viedään pian."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Tiedosto viedään pian."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Yhteystiedot viedään hetken kuluttua."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard-vientipyyntö hylättiin. Yritä myöhemmin uudelleen."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"yhteystieto"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Lisätään vCard-tietojen välimuistiversiot paikalliseen väliaikaistallennustilaan. Tuonti alkaa pian."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Etunimi ensin"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Sukunimi ensin"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Uusien yhteystietojen oletustili"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Synkronoi yhteystietojen kuvaustiedot [TESTIVERSIO]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Synkronoi yhteystietojen kuvaustiedot"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Yhteystietojen sisällönkuvaustietojen synkronointitili"</string>
     <string name="setting_about" msgid="3926137653588942297">"Tietoja Yhteystiedoista"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Asetukset"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Jaa näkyvät yhteystiedot"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Näkyvien yhteystietojen jakaminen epäonnistui."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Jaa suosikkiyhteystiedot"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Jaa kaikki yhteystiedot"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Yhteystietojen jakaminen epäonnistui."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Tuo/vie yhteystietoja"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Tuo yhteystietoja"</string>
     <string name="share_error" msgid="665756457151793108">"Yhteystieto ei jaettavissa"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Tietosuojakäytäntö"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Käyttöehdot"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Avoimen lähdekoodin käyttöluvat"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"URL-osoitteen avaus epäonnistui."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> valittu"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ei valittu"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Soita videopuhelu"</string>
diff --git a/res-common/values-fr-rCA-sw600dp/strings.xml b/res-common/values-fr-rCA-sw600dp/strings.xml
deleted file mode 100644
index 1716290..0000000
--- a/res-common/values-fr-rCA-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tablette seulement, non synchronisé"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Aucun contact ne peut être exporté. Si des contacts sont enregistrés sur votre tablette, il est possible qu\'un fournisseur de données n\'autorise pas l\'exportation de contacts vers un autre appareil."</string>
-</resources>
diff --git a/res-common/values-fr-rCA/strings.xml b/res-common/values-fr-rCA/strings.xml
index d8b10ac..ffbd8c7 100644
--- a/res-common/values-fr-rCA/strings.xml
+++ b/res-common/values-fr-rCA/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Appeler le téléavertisseur professionnel"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Appeler le <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Appeler le numéro de téléphone MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Appel)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Envoyer un SMS au <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Envoyer un SMS au numéro de téléphone du domicile"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Envoyer un SMS au numéro de téléphone mobile"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Envoyer un SMS au téléavertisseur professionnel"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Envoyer un SMS au <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Envoyer un SMS au numéro de téléph MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Message)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Faire un appel vidéo"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Effacer les contacts fréquents?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Cette opération efface la liste des personnes avec qui vous communiquez le plus souvent dans les applications Contacts et Téléphone, et forcera les applications de courriel à mémoriser de nouveau les adresses que vous utilisez le plus."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contacts"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Autre"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Répertoire"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Annuaire professionnel"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Répertoire professionnel"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Tous les contacts"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Moi"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Recherche en cours..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contacts fréquents"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Afficher le contact"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Tous les contacts disposant d\'un numéro de téléphone"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contacts du profil professionnel"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contacts du profil professionnel"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Afficher les mises à jour"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Téléphone uniquement, sans synchronisation"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Téléphone uniquement, sans synchronisation"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nom"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Pseudo"</string>
     <string name="full_name" msgid="885420216812981202">"Nom"</string>
@@ -105,7 +103,7 @@
     <string name="name_phonetic_middle" msgid="5970174427249235577">"Deuxième prénom phonétique"</string>
     <string name="name_phonetic_family" msgid="1572398622239414464">"Prononciation du nom de famille"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"Numéro de téléphone"</string>
-    <string name="emailLabelsGroup" msgid="4696310712601184208">"Adresse de courriel"</string>
+    <string name="emailLabelsGroup" msgid="4696310712601184208">"Adresse de courriel :"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"Adresse"</string>
     <string name="imLabelsGroup" msgid="8733603247535725786">"MI"</string>
     <string name="organizationLabelsGroup" msgid="961008074745871784">"Entreprise"</string>
@@ -122,9 +120,9 @@
     <string name="email_home" msgid="2230967805906450693">"Envoyer un courriel au domicile"</string>
     <string name="email_mobile" msgid="7532438378678903685">"Envoyer un courriel sur le mobile"</string>
     <string name="email_work" msgid="7065971921227432400">"Envoyer un courriel au bureau"</string>
-    <string name="email_other" msgid="4601881243553289615">"Envoyer un courriel"</string>
+    <string name="email_other" msgid="4601881243553289615">"Adresse de courriel :"</string>
     <string name="email_custom" msgid="5777583741581538870">"Envoyer un courriel à <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="email" msgid="5624424151176351591">"Envoyer un courriel"</string>
+    <string name="email" msgid="5624424151176351591">"Adresse de courriel :"</string>
     <string name="postal_street" msgid="881349814077356134">"Rue"</string>
     <string name="postal_pobox" msgid="1799978742074885091">"Case postale"</string>
     <string name="postal_neighborhood" msgid="3721092668038527674">"Quartier"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Impossible d\'importer un ou plusieurs fichiers (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> terminée"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Les contacts ont été exportés"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Les contacts ont été exportés. Cliquez sur la notification pour les partager."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Touchez ici pour partager des contacts."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> annulée"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exportation des données des contacts en cours"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Les données de contact sont en cours d\'exportation."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Vos données de contact sont en cours d\'exportation vers le fichier <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Impossible d\'obtenir les informations concernant la base de données."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Aucun contact ne peut être exporté. Si des contacts sont enregistrés sur votre téléphone, il est possible qu\'un fournisseur de données n\'autorise pas l\'exportation de contacts vers un autre appareil."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Aucun contact ne peut être exporté. Si des contacts sont enregistrés sur votre téléphone, il est possible qu\'un fournisseur de données n\'autorise pas l\'exportation de contacts vers un autre appareil."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Le système de composition vCard n\'a pas démarré correctement."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Échec exportation"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Les données du contact n\'ont pas été exportées.\nMotif : <xliff:g id="FAIL_REASON">%s</xliff:g>."</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"La demande d\'importation du fichier vCard a été rejetée. Veuillez réessayer plus tard."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Le fichier <xliff:g id="FILENAME">%s</xliff:g> va bientôt être exporté."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Le fichier sera bientôt exporté."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Les contacts seront exportés sous peu."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"La demande d\'exportation du fichier vCard a été rejetée. Veuillez réessayer plus tard."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Mise en cache des fichiers vCard dans l\'espace de stockage temporaire local. L\'importation va bientôt démarrer."</string>
@@ -224,17 +219,12 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Prénom en premier"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Nom de famille en premier"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Compte par défaut pour les nouveaux contacts"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Synchroniser les métadonnées des contacts [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Synchroniser les métadonnées des contacts"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Compte de synchronisation des métadonnées du contact"</string>
     <string name="setting_about" msgid="3926137653588942297">"À propos de Contacts"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Paramètres"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Partager les contacts visibles"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Échec du partage des contacts visibles."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Partager les contacts favoris"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Partager tous les contacts"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Impossible de partager les contacts."</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"Importer/exporter des contacts"</string>
-    <string name="dialog_import" msgid="5177004290082451296">"Importer des contacts"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"Importer/Exporter des contacts"</string>
+    <string name="dialog_import" msgid="5177004290082451296">"Téléverser des contacts"</string>
     <string name="share_error" msgid="665756457151793108">"Impossible de partager ce contact."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"Il n\'y a aucun contact à partager."</string>
     <string name="menu_search" msgid="7464453023659824700">"Rechercher"</string>
@@ -250,7 +240,7 @@
     <string name="menu_clear_frequents" msgid="8492322695770647639">"Effacer les contacts fréquents"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"Sélectionner une carte SIM"</string>
     <string name="menu_accounts" msgid="2944004960829403994">"Gérer les comptes"</string>
-    <string name="menu_import_export" msgid="6446229463809981669">"Importer/exporter"</string>
+    <string name="menu_import_export" msgid="6446229463809981669">"Importer/Exporter"</string>
     <string name="contact_status_update_attribution" msgid="8419168578670128134">"par <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g> par <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"arrêter la recherche"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Politique de confidentialité"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Modalités"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licences de logiciels libres"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Échec de l\'ouverture de l\'URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Élément « <xliff:g id="ACCOUNT_INFO">%s</xliff:g> » coché"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Élément « <xliff:g id="ACCOUNT_INFO">%s</xliff:g> » non coché"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Faire un appel vidéo"</string>
diff --git a/res-common/values-fr-sw600dp/strings.xml b/res-common/values-fr-sw600dp/strings.xml
deleted file mode 100644
index 13654ef..0000000
--- a/res-common/values-fr-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tablette uniquement, sans synchronisation"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Aucun contact ne peut être exporté. Si des contacts sont enregistrés sur votre tablette, il est possible qu\'un fournisseur de données n\'autorise pas l\'exportation de contacts vers un autre appareil."</string>
-</resources>
diff --git a/res-common/values-fr/strings.xml b/res-common/values-fr/strings.xml
index f970b94..3b8de26 100644
--- a/res-common/values-fr/strings.xml
+++ b/res-common/values-fr/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Appeler le téléavertisseur professionnel"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Appeler le <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Appeler le numéro de téléphone MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (appeler)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Envoyer un SMS au <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Envoyer un SMS au numéro de téléphone du domicile"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Envoyer un SMS au numéro de téléphone mobile"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Envoyer un SMS au téléavertisseur professionnel"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Envoyer un SMS au <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Envoyer un SMS au numéro de téléphone MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (envoyer un SMS)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Passer un appel vidéo"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Effacer les contacts fréquents ?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Cette opération efface la liste des personnes que vous contactez le plus souvent dans les applications Contacts et Téléphone, et entraîne une réinitialisation des adresses mémorisées comme celles que vous utilisez le plus fréquemment dans vos applications de messagerie électronique."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contacts"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Autre"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Répertoire"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Contacts professionnels"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Annuaire professionnel"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Tous les contacts"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Moi"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Recherche en cours…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contacts fréquents"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Afficher le contact"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Tous les contacts disposant d\'un numéro de téléphone"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contacts du profil professionnel"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contacts du profil professionnel"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Afficher les mises à jour"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Téléphone uniquement, sans synchronisation"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Téléphone uniquement, sans synchronisation"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nom"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Pseudo"</string>
     <string name="full_name" msgid="885420216812981202">"Nom"</string>
@@ -168,7 +166,7 @@
     <string name="import_from_sim" msgid="4749894687871835873">"Importer depuis la carte SIM"</string>
     <string name="import_from_sim_summary" msgid="2306434118233541675">"Importer depuis la carte SIM <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string>
     <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importer depuis la carte SIM <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="1381675161522633950">"Importer depuis fichier .vcf"</string>
+    <string name="import_from_vcf_file" product="default" msgid="1381675161522633950">"Importer à partir de fichier VCF"</string>
     <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Annuler l\'importation du fichier <xliff:g id="FILENAME">%s</xliff:g> ?"</string>
     <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Annuler l\'exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> ?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="7450212880694781527">"Impossible annuler import./export. vCard"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Impossible d\'importer un ou plusieurs fichiers (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> terminée"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Les contacts ont bien été exportés"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Les contacts ont bien été exportés. Cliquez sur la notification pour les partager."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Appuyez pour partager les contacts."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> annulée"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exportation des données des contacts"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Les données de contact sont en cours d\'exportation."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Vos données de contact sont en cours d\'exportation vers le fichier <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Impossible d\'obtenir les informations concernant la base de données."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Aucun contact ne peut être exporté. Si des contacts sont enregistrés sur votre téléphone, il est possible qu\'un fournisseur de données n\'autorise pas l\'exportation de contacts vers un autre appareil."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Aucun contact ne peut être exporté. Si des contacts sont enregistrés sur votre téléphone, il est possible qu\'un fournisseur de données n\'autorise pas l\'exportation de contacts vers un autre appareil."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Le système de composition vCard n\'a pas démarré correctement."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Échec exportation"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Les données du contact n\'ont pas été exportées.\nMotif : <xliff:g id="FAIL_REASON">%s</xliff:g>."</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"La demande d\'importation du fichier vCard a été rejetée. Veuillez réessayer ultérieurement."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Le fichier <xliff:g id="FILENAME">%s</xliff:g> va bientôt être exporté."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Le fichier va bientôt être exporté."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Les contacts seront bientôt exportés."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"La demande d\'exportation du fichier vCard a été rejetée. Veuillez réessayer ultérieurement."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Mise en cache des fichiers vCard dans l\'espace de stockage temporaire local. L\'importation va bientôt démarrer."</string>
@@ -216,7 +211,7 @@
     <string name="confirm_export_title" msgid="3240899428149018226">"Exporter les contacts ?"</string>
     <string name="caching_vcard_title" msgid="9185299351381102305">"Mise en cache"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"Importation <xliff:g id="CURRENT_NUMBER">%s</xliff:g> sur <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="4142192068495589925">"Exporter vers fichier VCF"</string>
+    <string name="export_to_vcf_file" product="default" msgid="4142192068495589925">"Exporter dans fichier VCF"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"Trier par"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Prénom"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Nom"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Prénom en premier"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Nom en premier"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Compte par défaut pour les nouveaux contacts"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Synchroniser les métadonnées des contacts [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Synchroniser les métadonnées des contacts"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Compte de synchronisation des métadonnées du contact"</string>
     <string name="setting_about" msgid="3926137653588942297">"À propos de Contacts"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Paramètres"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Partager les contacts visibles"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Échec du partage des contacts visibles."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Partager les contacts favoris"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Partager tous les contacts"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Échec du partage des contacts."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importer/Exporter des contacts"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importer des contacts"</string>
     <string name="share_error" msgid="665756457151793108">"Impossible de partager ce contact."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Règles de confidentialité"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Conditions d\'utilisation"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licences Open Source"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Impossible d\'ouvrir l\'URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Élément \"<xliff:g id="ACCOUNT_INFO">%s</xliff:g>\" coché"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Élément \"<xliff:g id="ACCOUNT_INFO">%s</xliff:g>\" non coché"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Passer un appel vidéo"</string>
diff --git a/res-common/values-gl-rES-sw600dp/strings.xml b/res-common/values-gl-rES-sw600dp/strings.xml
deleted file mode 100644
index 8e9c74b..0000000
--- a/res-common/values-gl-rES-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Só na tableta, sen sincronizar"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Non hai ningún contacto exportable. Se tes contactos na tableta, é posible que algúns provedores de datos non permitan a exportación dos contactos desde a tableta."</string>
-</resources>
diff --git a/res-common/values-gl-rES/strings.xml b/res-common/values-gl-rES/strings.xml
index 8756da4..17ec84f 100644
--- a/res-common/values-gl-rES/strings.xml
+++ b/res-common/values-gl-rES/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Chamar ao busca do traballo"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Chamar a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Chamar ao número de teléfono de MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (chamar)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Enviar unha mensaxe a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Enviar unha mensaxe á casa"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Enviar unha mensaxe ao teléfono móbil"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Enviar unha mensaxe ao busca do traballo"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Enviar unha mensaxe a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Enviar unha mensaxe ao teléfono da MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (enviar mensaxe)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Realiza unha videochamada"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Borrar contactados con frecuencia?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Borra a lista de persoas coas que contactaches frecuentemente das aplicacións Contactos e Teléfono, e obriga ás aplicacións de correo electrónico a que memoricen as túas preferencias de enderezos desde cero."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contactos"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Outro"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Directorio"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Directorio de traballo"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Directorio de traballo"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Todos os contactos"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Eu"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Buscando..."</string>
@@ -86,12 +84,12 @@
     <string name="description_quick_contact_for" msgid="6355240770807101947">"Contacto rápido para <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="2633118852693000081">"(Sen nome)"</string>
     <string name="favoritesFrequentCalled" msgid="6600127125011757687">"Chamados frecuentemente"</string>
-    <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contactos frecuentes"</string>
+    <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contactados frecuentemente"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Ver contacto"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Todos os contactos con números de teléfono"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contactos do perfil de traballo"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contactos do perfil de traballo"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Ver actualizacións"</string>
-    <string name="account_phone" msgid="6104157990869081962">"só no teléfono, non sincronizado"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Só no teléfono, non sincronizado"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nome"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Alcume"</string>
     <string name="full_name" msgid="885420216812981202">"Nome"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Non se puideron importar un ou máis ficheiros (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Finalizouse a exportación de <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Finalizou a exportación dos contactos."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Finalizou a exportación dos contactos. Fai clic na notificación para compartilos."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Toca para compartir os contactos."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Cancelouse a exportación de <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exportando datos de contacto"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Estanse exportando os datos dos contactos."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Estanse exportando os teus datos de contacto a: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Non se puido obter información da base de datos."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Non hai ningún contacto exportable. Se tes contactos no teu teléfono, é posible que algúns provedores de datos non permitan a exportación dos contactos desde o teléfono."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Non hai ningún contacto exportable. Se tes contactos no teu teléfono, é posible que algúns provedores de datos non permitan a exportación dos contactos desde o teléfono."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"O redactor de vCard non se iniciou correctamente."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Imposible exportar"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Non se exportaron os datos dos contactos.\n Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Rexeitouse a solicitude de importación de vCard. Téntao de novo máis tarde."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> exportarase en breve."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"O ficheiro exportarase en breve."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Exportaranse os contactos en breve."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Rexeitouse a solicitude de exportación do vCard. Téntao de novo máis tarde."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contacto"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Almacenando vCard na memoria caché do almacenamento temporal local. A importación real iniciarase en breve."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Primeiro o nome"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Primeiro os apelidos"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Conta predeterminada para novos contactos"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sincronizar metadatos de contacto [VERSIÓN DE PROBA INTERNA]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sincronizar metadatos de contacto"</string>
-    <string name="setting_about" msgid="3926137653588942297">"Información sobre Contactos"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Configuración"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Conta de sincronización de metadatos de contacto"</string>
+    <string name="setting_about" msgid="3926137653588942297">"Acerca dos contactos"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Compartir contactos visibles"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Produciuse un erro ao compartir os contactos visibles."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Compartir contactos favoritos"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Compartir todos os contactos"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Erro ao compartir os contactos."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importar/exportar contactos"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importar contactos"</string>
     <string name="share_error" msgid="665756457151793108">"Non se pode compartir este contacto."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Política de privacidade"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Condicións de servizo"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licenzas de código aberto"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Produciuse un erro ao abrir o URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Marcouse <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Non se marcou <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Facer videochamada"</string>
diff --git a/res-common/values-gu-rIN-sw600dp/strings.xml b/res-common/values-gu-rIN-sw600dp/strings.xml
deleted file mode 100644
index 94cf4ad..0000000
--- a/res-common/values-gu-rIN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"ફક્ત ટેબ્લેટ, અસમન્વયિત"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"કોઈ નિકાસયોગ્ય સંપર્કો નથી. જો તમારી પાસે તમારા ટેબ્લેટ પર કોઈ સંપર્કો નથી, તો કેટલાક ડેટા પ્રદાતા ટેબ્લેટ પરથી સંપર્કોને નિકાસ કરવાની મંજૂરી આપી શકશે નહીં."</string>
-</resources>
diff --git a/res-common/values-gu-rIN/strings.xml b/res-common/values-gu-rIN/strings.xml
index e459cb0..5d8f3c5 100644
--- a/res-common/values-gu-rIN/strings.xml
+++ b/res-common/values-gu-rIN/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"કાર્યાલયના પેજર પર કૉલ કરો"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> ને કૉલ કરો"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS પર કૉલ કરો"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (કૉલ કરો)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> ને ટેક્સ્ટ કરો"</string>
     <string name="sms_home" msgid="7765831490534280540">"ઘરે ટેક્સ્ટ કરો"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"મોબાઇલ પર ટેક્સ્ટ કરો"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"કાર્યાલયના પેજર પર ટેક્સ્ટ કરો"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> ને ટેક્સ્ટ કરો"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS પર ટેક્સ્ટ કરો"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (સંદેશ મોકલો)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"વિડિઓ કૉલ કરો"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"વારંવાર સંપર્ક કરેલા સાફ કરીએ?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"તમે સંપર્કો અને ફોન એપ્લિકેશન્સમાં વારંવાર સંપર્ક કરેલ સૂચિને સાફ કરશો અને ઇમેઇલ એપ્લિકેશન્સને તમારી સંબોધન પસંદગીઓને શરૂઆતથી જાણવા માટે ફરજ પાડશો."</string>
@@ -73,9 +71,9 @@
     <string name="contactsList" msgid="7140022347217602605">"સંપર્કો"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"અન્ય"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"નિર્દેશિકા"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"કાર્ય નિર્દેશિકા"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"કાર્ય નિર્દેશિકા"</string>
     <string name="local_search_label" msgid="9094584931063745728">"તમામ સંપર્કો"</string>
-    <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"હું"</string>
+    <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"મારા"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"શોધી રહ્યું છે..."</string>
     <string name="foundTooManyContacts" msgid="3060037437459313616">"<xliff:g id="COUNT">%d</xliff:g> કરતાં વધુ મળ્યાં."</string>
     <string name="listFoundAllContactsZero" msgid="4406036083994138930">"સંપર્કો નથી"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"વારંવાર સંપર્ક કરેલા"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"સંપર્ક જુઓ"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ફોન નંબર્સ સાથેના તમામ સંપર્કો"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"કાર્ય પ્રોફાઇલના સંપર્કો"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"કાર્ય પ્રોફાઇલના સંપર્કો"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"અપડેટ્સ જુઓ"</string>
-    <string name="account_phone" msgid="6104157990869081962">"ફક્ત ફોન, અસમન્વયિત"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"ફક્ત ફોન, અસમન્વયિત"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"નામ"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"ઉપનામ"</string>
     <string name="full_name" msgid="885420216812981202">"નામ"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"એક અથવા વધુ ફાઇલો આયાત કરી શકાઈ નથી (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> ને નિકાસ કરવું સમાપ્ત થયું."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"સંપર્કોને નિકાસ કરવાનું સમાપ્ત થયું."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"નિકાસ કરવાનું સમાપ્ત થયું, સંપર્કો શેર કરવા માટે સૂચના ક્લિક કરો."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"સંપર્કો શેર કરવા માટે ટૅપ કરો."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> ને નિકાસ કરવું રદ કર્યું."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"સંપર્ક ડેટા નિકાસ કરી રહ્યાં છે"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"સંપર્ક ડેટાનો નિકાસ કરવામાં આવી રહ્યો છે."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"તમારો સંપર્ક ડેટા આ પર નિકાસ કરવામાં આવશે: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ડેટાબેસ જાણકારી મેળવી શકાઈ નથી."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"કોઈ નિકાસયોગ્ય સંપર્કો નથી. જો તમારી પાસે તમારા ફોન પર કોઈ સંપર્કો નથી, તો કેટલાક ડેટા પ્રદાતા ફોન પરથી સંપર્કોને નિકાસ કરવાની મંજૂરી આપી શકશે નહીં."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"કોઈ નિકાસયોગ્ય સંપર્કો નથી. જો તમારી પાસે તમારા ફોન પર કોઈ સંપર્કો નથી, તો કેટલાક ડેટા પ્રદાતા ફોન પરથી સંપર્કોને નિકાસ કરવાની મંજૂરી આપી શકશે નહીં."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard કમ્પોઝર ઠીકથી પ્રારંભ થયું નથી."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"નિકાસ કરી શક્યાં નથી"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"સંપર્ક ડેટા નિકાસ કર્યો નહોતો.\nકારણ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard આયાતની વિનંતી નકારી હતી. પછીથી ફરી પ્રયાસ કરો."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> ને ટૂંક સમયમાં નિકાસ કરવામાં આવશે."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ફાઇલને ટૂંક સમયમાં નિકાસ કરવામાં આવશે."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"સંપર્કોનો ટૂંક સમયમાં નિકાસ કરવામાં આવશે."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard નિકાસની વિનંતી નકારી હતી. પછીથી ફરી પ્રયાસ કરો."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"સંપર્ક"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"સ્થાનિક અસ્થાયી સ્ટોરેજ પર vCard કેશ કરી રહ્યાં છે. વાસ્તવિક આયાત જલ્દી જ શરૂ થશે."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"પ્રથમ નામ પહેલા"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"છેલ્લું નામ પહેલા"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"નવા સંપર્કો માટે ડિફોલ્ટ એકાઉન્ટ"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"સંપર્ક મેટાડેટાને સમન્વયિત કરો [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"સંપર્ક મેટાડેટાને સમન્વયિત કરો"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"સંપર્ક મેટાડેટા સમન્વયન એકાઉન્ટ"</string>
     <string name="setting_about" msgid="3926137653588942297">"સંપર્કો વિશે"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"સેટિંગ્સ"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"દૃશ્યક્ષમ સંપર્કોને શેર કરો"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"દૃશ્યક્ષમ સંપર્કો શેર કરવામાં નિષ્ફળ થયાં."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"મનપસંદ સંપર્કોને શેર કરો"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"તમામ સંપર્કોને શેર કરો"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"સંપર્કોને શેર કરવામાં નિષ્ફળ થયાં."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"સંપર્કો આયાત/નિકાસ કરો"</string>
     <string name="dialog_import" msgid="5177004290082451296">"સંપર્કો આયાત કરો"</string>
     <string name="share_error" msgid="665756457151793108">"આ સંપર્ક શેર કરી શકાતો નથી."</string>
@@ -270,11 +260,10 @@
     </plurals>
     <string name="about_build_version" msgid="4221971683776635130">"બિલ્ડ સંસ્કરણ"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"ઓપન સોર્સ લાઇસેંસેસ"</string>
-    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ઓપન સોર્સ સૉફ્ટવેર માટે લાઇસન્સ વિગતો"</string>
+    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ઓપન સોર્સ સૉફ્ટવેર માટે લાઇસેંસ વિગતો"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"ગોપનીયતા નીતિ"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"સેવાની શરતો"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"ખુલ્લા સ્ત્રોત લાઇસેંસેસ"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url ખોલવામાં નિષ્ફળ થયાં."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ચેક કર્યું"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ચેક કરેલ નથી"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"વિડિઓ કૉલ કરો"</string>
diff --git a/res-common/values-hi-sw600dp/strings.xml b/res-common/values-hi-sw600dp/strings.xml
deleted file mode 100644
index 732a6ea..0000000
--- a/res-common/values-hi-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"केवल-टैबलेट पर, समन्वयित नहीं होगा"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"कोई भी निर्यात योग्य संपर्क नहीं है. यदि आपके पास अपने टैबलेट पर संपर्क हों, तो हो सकता है कि कुछ डेटा प्रदाता संपर्कों को टैबलेट से निर्यात ना करने दें."</string>
-</resources>
diff --git a/res-common/values-hi/strings.xml b/res-common/values-hi/strings.xml
index 86d8105..41657d0 100644
--- a/res-common/values-hi/strings.xml
+++ b/res-common/values-hi/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"कार्यालय के पेजर पर कॉल करें"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> पर कॉल करें"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS पर कॉल करें"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (कॉल करें)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> पर लेख संदेश भेजें"</string>
     <string name="sms_home" msgid="7765831490534280540">"घर के फ़ोन नंबर पर लेख संदेश भेजें"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"मोबाइल पर लेख संदेश भेजें"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"कार्यालय के पेजर पर लेख संदेश भेजें"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> पर लेख संदेश भेजें"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS पर लेख संदेश भेजें"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (संदेश भेजें)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"वीडियो कॉल करें"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"अक्‍सर किए जाने वाले संपर्क साफ करें?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"आपको संपर्क और फ़ोन ऐप्स से अक्सर संपर्क किए जाने वाली सूची साफ़ करनी होगी, और अपने ईमेल ऐप्स को आपकी पता प्राथमिकताओं को प्रारंभ से जानने के लिए बाध्य करना होगा."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"संपर्क"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"अन्य"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"निर्देशिका"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"कार्य निर्देशिका"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"कार्य निर्देशिका"</string>
     <string name="local_search_label" msgid="9094584931063745728">"सभी संपर्क"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"मुझे"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"खोज रहा है…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"बार-बार संपर्क किए गए"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"संपर्क देखें"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"फ़ोन नंबरों वाले सभी संपर्क"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"कार्य प्रोफ़ाइल के संपर्क"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"कार्य प्रोफ़ाइल के संपर्क"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"नई जानकारी देखें"</string>
-    <string name="account_phone" msgid="6104157990869081962">"केवल-फ़ोन पर, असमन्वयित"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"केवल-फ़ोन पर, असमन्वयित"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"नाम"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"प्रचलित नाम"</string>
     <string name="full_name" msgid="885420216812981202">"नाम"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"एक या अधिक फ़ाइलें आयात नहीं की जा सकीं (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> का निर्यात पूरा हो गया."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"संपर्कों का निर्यात किया जाना समाप्त हो गया."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"संपर्कों का निर्यात पूरा हो गया है, संपर्क साझा करने के लिए नोटिफिकेशन क्लिक करें."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"संपर्क साझा करने के लिए टैप करें."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> को निर्यात करना रद्द कर दिया गया."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"संपर्क डेटा निर्यात हो रहा है"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"संपर्क डेटा निर्यात किया जा रहा है."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"आपका संपर्क डेटा इस पर निर्यात किया जा रहा है: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"डेटाबेस जानकारी नहीं मिल सकी."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"कोई भी निर्यात-योग्‍य संपर्क नहीं है. यदि आपके पास अपने फ़ोन पर संपर्क  हों, तो हो सकता है कि कुछ डेटा प्रदाता संपर्कों को फ़ोन से निर्यात न करने दें."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"कोई भी निर्यात-योग्‍य संपर्क नहीं है. यदि आपके पास अपने फ़ोन पर संपर्क  हों, तो हो सकता है कि कुछ डेटा प्रदाता संपर्कों को फ़ोन से निर्यात न करने दें."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard कंपोज़र ठीक से प्रारंभ नहीं हुआ."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"निर्यात नहीं कर सका"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"संपर्क डेटा निर्या‍त नहीं किया गया था.\nकारण: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard आयात अनुरोध अस्‍वीकार हो गया था. बाद में पुन: प्रयास करें."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> को जल्‍दी ही निर्यात किया जाएगा."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"फ़ाइल शीघ्र ही निर्यात की जाएगी."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"संपर्कों को शीघ्र ही निर्यात किया जाएगा."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard निर्यात अनुरोध अस्‍वीकार हो गया था. बाद में पुन: प्रयास करें."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"संपर्क"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard को स्‍थानीय अस्‍थायी मेमोरी में संचित कर रहा है. वास्‍तविक आयात जल्‍दी ही प्रारंभ होगा."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"नाम पहले"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"उपनाम पहले"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"नए संपर्कों के लिए डिफ़ॉल्ट खाता"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"संपर्क मेटाडेटा समन्वयित करें [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"संपर्क मेटाडेटा समन्वयनित करें"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"मेटाडेटा समन्वयन खाते से संपर्क करें"</string>
     <string name="setting_about" msgid="3926137653588942297">"संपर्क के बारे में"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"सेटिंग"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"दिखाई देने वाले संपर्क साझा करें"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"दृश्‍यमान संपर्क साझा करने में विफल रहा."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"पसंदीदा संपर्कों को साझा करें"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"सभी संपर्कों को साझा करें"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"संपर्कों को साझा करना विफल रहा."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"संपर्कों को आयात/निर्यात करें"</string>
     <string name="dialog_import" msgid="5177004290082451296">"संपर्कों को आयात करें"</string>
     <string name="share_error" msgid="665756457151793108">"यह संपर्क साझा नहीं किया जा सकता."</string>
@@ -271,10 +261,9 @@
     <string name="about_build_version" msgid="4221971683776635130">"बिल्ड वर्शन"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"ओपन सोर्स लाइसेंस"</string>
     <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ओपन सोर्स सॉफ़्टवेयर के लि‍ए लाइसेंस वि‍वरण"</string>
-    <string name="about_privacy_policy" msgid="8458337666582973913">"निजता नीति"</string>
+    <string name="about_privacy_policy" msgid="8458337666582973913">"गोपनीयता नीति"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"सेवा की शर्तें"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"ओपन सोर्स लाइसेंस"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url खोलने में विफल रहा."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> चेक किया गया"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> चेक नहीं किया गया"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"वीडियो कॉल करें"</string>
diff --git a/res-common/values-hr-sw600dp/strings.xml b/res-common/values-hr-sw600dp/strings.xml
deleted file mode 100644
index 214738c..0000000
--- a/res-common/values-hr-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Samo tablet, bez sinkronizacije"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Nema kontakata koji se mogu izvoziti. Ako na tabletu imate kontakte, neki davatelji podataka možda ne dopuštaju izvoz kontakata s tableta."</string>
-</resources>
diff --git a/res-common/values-hr/strings.xml b/res-common/values-hr/strings.xml
index f6f3769..120a77f 100644
--- a/res-common/values-hr/strings.xml
+++ b/res-common/values-hr/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Nazovi poslovni dojavljivač"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Nazovi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Nazovi MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (poziv)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Pošalji SMS na <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Pošalji SMS na kućni"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Pošalji SMS na mobitel"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Pošalji SMS na poslovni dojavljivač"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Pošalji SMS na <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Pošalji SMS na MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (poruka)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Uputite videopoziv"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Brisati podatke o čestim kontaktima?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Izbrisat ćete popis osoba s kojima često kontaktirate u aplikacijama Kontakti i Osobe, pa će aplikacije e-pošte morati ispočetka učiti vaše postavke adresiranja."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontakti"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Ostalo"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Direktorij"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Poslovni direktorij"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Poslovni imenik"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Svi kontakti"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ja"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Pretraživanje…"</string>
@@ -90,9 +88,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Često kontaktirani"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Prikaži kontakt"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Svi kontakti s telefonskim brojevima"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Poslovni kontakti"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kontakti radnog profila"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Prikaži ažuriranja"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Samo telefon, bez sinkronizacije"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Samo telefon, bez sinkronizacije"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Ime"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Nadimak"</string>
     <string name="full_name" msgid="885420216812981202">"Ime"</string>
@@ -188,16 +186,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Uvoz jedne ili više datoteka nije uspio (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Završetak izvoza datoteke <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Dovršen je izvoz kontakata."</string>
-    <!-- no translation found for exporting_vcard_finished_toast (5995505525489290221) -->
-    <skip />
-    <!-- no translation found for touch_to_share_contacts (3237211496215699092) -->
-    <skip />
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> otkazan je."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Izvoz podataka o kontaktu"</string>
-    <!-- no translation found for exporting_contact_list_message (141905615542638683) -->
-    <skip />
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Vaši podaci o kontaktu izvoze se u datoteku <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Dohvaćanje podataka iz baze podataka nije uspjelo."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Nema kontakata koji se mogu izvoziti. Ako na svojem telefonu imate kontakte, neki davatelji podataka možda ne dopuštaju izvoz kontakata s tog telefona."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Nema kontakata koji se mogu izvoziti. Ako na svojem telefonu imate kontakte, neki davatelji podataka možda ne dopuštaju izvoz kontakata s tog telefona."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Sastavljač za vCard nije se ispravno pokrenuo."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Izvoz nije uspio"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Podaci o kontaktu nisu izvezeni.\nRazlog: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -211,8 +204,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Zahtjev za uvoz formata vCard odbijen je. Pokušajte ponovo kasnije."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> uskoro će biti izvezena."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Datoteka će se uskoro izvesti."</string>
-    <!-- no translation found for contacts_export_will_start_message (4527597765334949574) -->
-    <skip />
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Zahtjev za izvoz formata vCard odbijen je. Pokušajte ponovo kasnije."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Spremanje vCard datoteka u lokalnu privremenu pohranu. Stvarni uvoz počet će uskoro."</string>
@@ -229,15 +220,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Najprije ime"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Najprije prezime"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Zadani račun za nove kontakte"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sinkronizacija metapodataka kontakta [INTERNA PROBNA VERZIJA]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sinkronizacija metapodataka kontakta"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Račun za sinkronizaciju metapodataka kontakata"</string>
     <string name="setting_about" msgid="3926137653588942297">"O kontaktima"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Postavke"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Dijeli vidljive kontakte"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Nije uspjelo dijeljenje vidljivih kontakata"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Podijeli omiljene kontakte"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Podijeli sve kontakte"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Dijeljenje kontakata nije uspjelo."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Uvoz/izvoz kontakata"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Uvoz kontakata"</string>
     <string name="share_error" msgid="665756457151793108">"Ovaj kontakt nije moguće dijeliti."</string>
@@ -280,7 +266,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Pravila o privatnosti"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Uvjeti pružanja usluge"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licence otvorenog izvornog koda"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Otvaranje URL-a nije uspjelo."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> potvrđen"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> nije potvrđen"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Upućivanje videopoziva"</string>
diff --git a/res-common/values-hu-sw600dp/strings.xml b/res-common/values-hu-sw600dp/strings.xml
deleted file mode 100644
index 713ea61..0000000
--- a/res-common/values-hu-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Csak a táblagépen, nem szinkronizált"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Nincsenek exportálható névjegyek. Ha vannak névjegyek a táblagépén, akkor elképzelhető, hogy az adatszolgáltatója nem teszi lehetővé a névjegyek exportálását a táblagépről."</string>
-</resources>
diff --git a/res-common/values-hu/strings.xml b/res-common/values-hu/strings.xml
index cdf0acf..be1ed78 100644
--- a/res-common/values-hu/strings.xml
+++ b/res-common/values-hu/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Munkahelyi csipogó hívása"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> hívása"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS-ben szereplő telefonszám hívása"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (hívás)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS küldése haza"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS küldése mobiltelefonra"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS küldése munkahelyi csipogóra"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS küldése ide: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS küldése MMS-ben szereplő számra"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (üzenet)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Videohívás kezdeményezése"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Törli a gyakran keresetteket?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Törölni fogja a gyakran keresett személyek listáját a Névjegyek és a Telefon alkalmazásban, és arra kényszeríti az e-mail alkalmazásokat, hogy elölről kezdjék az Ön címzési szokásainak megtanulását."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Névjegyek"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Egyéb"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Címtár"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Munkahelyi névjegyek címtára"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Munkahelyi névjegyek címtára"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Összes névjegy"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Én"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Keresés…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Gyakran keresettek"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Névjegy megtekintése"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Minden névjegy telefonszámokkal"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Munkaprofilhoz tartozó névjegyek"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Munkaprofilnévjegyek"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Frissítések megtekintése"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Csak a telefonon, nem szinkronizált"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Csak a telefonon, nem szinkronizált"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Név"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Becenév"</string>
     <string name="full_name" msgid="885420216812981202">"Név"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Egy vagy több fájl nem importálható (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"A(z) <xliff:g id="FILENAME">%s</xliff:g> exportálása befejeződött."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"A névjegyek exportálása befejeződött."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Az exportálás befejeződött. A névjegyek megosztásához kattintson az értesítésre."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Koppintson rá a névjegyek megosztásához."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"A(z) <xliff:g id="FILENAME">%s</xliff:g> exportálása megszakítva."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Névjegyadatok exportálása"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"A névjegyadatok exportálása folyamatban van."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Névjegyadatok exportálása ide: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Nem sikerült lekérni az adatbázis-információkat."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Nincsenek exportálható névjegyek. Ha vannak névjegyek a telefonján, akkor előfordulhat, hogy az adatszolgáltató nem teszi lehetővé a névjegyek exportálását a telefonról."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Nincsenek exportálható névjegyek. Ha vannak névjegyek a telefonján, akkor előfordulhat, hogy az adatszolgáltató nem teszi lehetővé a névjegyek exportálását a telefonról."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"A vCard-készítő nem megfelelően indult el."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Sikertelen export"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Nem sikerült a névjegyadatok exportálása.\nOk: „<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"A vCard-importálási kérelem elutasítva. Próbálja újra később."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"A(z) <xliff:g id="FILENAME">%s</xliff:g> hamarosan exportálva lesz."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"A fájl exportálása hamarosan megtörténik."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"A névjegyek exportálása hamarosan megtörténik."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"A vCard-exportálási kérelem elutasítva. Próbálja újra később."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"névjegy"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(ok) mentése az ideiglenes helyi tárolóba. A tényleges importálás hamarosan megkezdődik."</string>
@@ -217,22 +212,17 @@
     <string name="caching_vcard_title" msgid="9185299351381102305">"Gyorsítótárazás"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"Importálás – <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="4142192068495589925">"Exportálás .vcf fájlba"</string>
-    <string name="display_options_sort_list_by" msgid="8635268562263708102">"Rendezés alapja"</string>
+    <string name="display_options_sort_list_by" msgid="8635268562263708102">"Rendezés"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Utónév"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Vezetéknév"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"Névformátum"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Utónév elöl"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Vezetéknév elöl"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Alapértelmezett fiók az új névjegyek számára"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Névjegyek metaadatainak szinkronizálása [DOGFOOD ALKALMAZÁS]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Névjegyek metaadatainak szinkronizálása"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"A névjegy metaadatainak szinkronizálási fiókja"</string>
     <string name="setting_about" msgid="3926137653588942297">"A Névjegyekről"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Beállítások"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Látható névjegyek megosztása"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Nem sikerült megosztani a látható névjegyeket."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Kedvenc névjegyek megosztása"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Az összes névjegy megosztása"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Nem sikerült megosztani a névjegyeket."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Névjegyek importálása/exportálása"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Névjegyek importálása"</string>
     <string name="share_error" msgid="665756457151793108">"Ezt a névjegyet nem lehet megosztani."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Adatvédelmi irányelvek"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Általános Szerződési Feltételek"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Nyílt forráskódú licencek"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Nem sikerült megnyitni az URL-címet."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"A(z) <xliff:g id="ACCOUNT_INFO">%s</xliff:g> bejelölve"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"A(z) <xliff:g id="ACCOUNT_INFO">%s</xliff:g> nincs bejelölve"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Videohívás indítása"</string>
diff --git a/res-common/values-hy-rAM-sw600dp/strings.xml b/res-common/values-hy-rAM-sw600dp/strings.xml
deleted file mode 100644
index ed3baf2..0000000
--- a/res-common/values-hy-rAM-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Միայն պլանշետի համար, չհամաժամեցված"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Արտահանելի կոնտակտներ չկան: Եթե պլանշետում ունեք կոնտակտներ, հնարավոր է՝ որոշ տվյալների մատակարարներ չեն թույլատրում պլանշետից կոնտակտների արտահանումը:"</string>
-</resources>
diff --git a/res-common/values-hy-rAM/strings.xml b/res-common/values-hy-rAM/strings.xml
index 77adf4d..a20ed7d 100644
--- a/res-common/values-hy-rAM/strings.xml
+++ b/res-common/values-hy-rAM/strings.xml
@@ -24,7 +24,7 @@
     <string name="call_mobile" msgid="8618334085824709009">"Զանգել շարժականին"</string>
     <string name="call_work" msgid="8299062439076337075">"Զանգել աշխաատավայր"</string>
     <string name="call_fax_work" msgid="3770754834467992571">"Զանգել աշխատավայրի ֆաքսին"</string>
-    <string name="call_fax_home" msgid="6219051113573396065">"Զանգել տան ֆաքսին"</string>
+    <string name="call_fax_home" msgid="6219051113573396065">"Զանգել տնային ֆաքսին"</string>
     <string name="call_pager" msgid="3038080882899955112">"Զանգել փեյջերին"</string>
     <string name="call_other" msgid="4472141328347894937">"Զանգել"</string>
     <string name="call_callback" msgid="687494744634190411">"Հետզանգել"</string>
@@ -40,13 +40,12 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Զանգել աշխատավայրի փեյջերին"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Զանգել <xliff:g id="ASSISTANT">%s</xliff:g>-ին"</string>
     <string name="call_mms" msgid="8998771923464696960">"Զանգել MMS համարին"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Զանգ)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Հաղորդագրել <xliff:g id="CUSTOM">%s</xliff:g>-ին"</string>
     <string name="sms_home" msgid="7765831490534280540">"Հաղորդագրել տուն"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Հաղորդագրել բջջայինին"</string>
     <string name="sms_work" msgid="3910570578912367742">"Հաղորդագրել աշխատանքայինին"</string>
     <string name="sms_fax_work" msgid="909086167151248212">"Հաղորդագրել աշխատանքային ֆաքսի համարին"</string>
-    <string name="sms_fax_home" msgid="4145442497939634875">"Հաղորդագրել տան ֆաքսի համարին"</string>
+    <string name="sms_fax_home" msgid="4145442497939634875">"Հաղորդագրել տնային ֆաքսի համարին"</string>
     <string name="sms_pager" msgid="5664381349583724906">"Հաղորդագրել փեյջերին"</string>
     <string name="sms_other" msgid="910895193552957097">"Հաղորդագրել"</string>
     <string name="sms_callback" msgid="728414485478941361">"Հաղորդագրել հետզանգման համարին"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Հաղորդագրել աշխատանքային փեյջերին"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Հաղորդագրել <xliff:g id="ASSISTANT">%s</xliff:g>-ին"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Հաղորդագրել MMS համարին"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Հաղորդագրություն)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Կատարել տեսազանգ"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Մաքրե՞լ հաճախակի հաղորդակցվածները"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Դուք կմաքրեք հաճախակի հաղորդակցվողների ցանկը Կոնտակտներ և Հեռախոս հավելվածներում, և ձեր էլփոստի ծրագիրը զրոյից կսովորի ձեր հասցեագրումների նախընտրությունները:"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Կոնտակտներ"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Այլ"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Գրացուցակ"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Աշխատանքային գրացուցակ"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Աշխատանքային գրացուցակ"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Բոլոր կոնտակտները"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ես"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Որոնում..."</string>
@@ -89,22 +87,22 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Հաճախակի հաղորդակցվող"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Դիտել կոնտակտը"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Բոլոր հեռախոսահամարներով կոնտատկները"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Աշխատանքային պրոֆիլի կոնտակտներ"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Աշխատանքային պրոֆիլի կոնտակտներ"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Դիտել թարմացումները"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Միայն սարքում, չհամաժամեցված"</string>
-    <string name="nameLabelsGroup" msgid="1817502703362057154">"Անուն"</string>
-    <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Մականուն"</string>
-    <string name="full_name" msgid="885420216812981202">"Անուն"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Միայն հեռախոսային, չհամաժամեցված"</string>
+    <string name="nameLabelsGroup" msgid="1817502703362057154">"Անունը"</string>
+    <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Մականունը"</string>
+    <string name="full_name" msgid="885420216812981202">"Անունը"</string>
     <string name="name_given" msgid="4153709115654909377">"Անուն"</string>
     <string name="name_family" msgid="5317387657540738981">"Ազգանուն"</string>
-    <string name="name_prefix" msgid="8219879405071462309">"Անվան նախածանց"</string>
+    <string name="name_prefix" msgid="8219879405071462309">"Անվան նախածանցը"</string>
     <string name="name_middle" msgid="3951610314424632183">"Հայրանուն"</string>
-    <string name="name_suffix" msgid="5436984808550075931">"Անվան վերջնածանց"</string>
-    <string name="name_phonetic" msgid="2249169131785620210">"Անունը՝ տառադարձված"</string>
-    <string name="name_phonetic_given" msgid="2863316331175661852">"Անունը՝ տառադարձված"</string>
-    <string name="name_phonetic_middle" msgid="5970174427249235577">"Հայրանունը՝ տառադարձված"</string>
-    <string name="name_phonetic_family" msgid="1572398622239414464">"Ազգանունը՝ տառադարձված"</string>
-    <string name="phoneLabelsGroup" msgid="7913782787902007482">"Հեռախոս"</string>
+    <string name="name_suffix" msgid="5436984808550075931">"Անվան վերջնածանցը"</string>
+    <string name="name_phonetic" msgid="2249169131785620210">"Հնչյունաբանական անունը"</string>
+    <string name="name_phonetic_given" msgid="2863316331175661852">"Անունը՝ տառադարձությամբ"</string>
+    <string name="name_phonetic_middle" msgid="5970174427249235577">"Հնչյունաբանական հայրանունը"</string>
+    <string name="name_phonetic_family" msgid="1572398622239414464">"Ազգանունը՝ տառադարձությամբ"</string>
+    <string name="phoneLabelsGroup" msgid="7913782787902007482">"Հեռախոսը"</string>
     <string name="emailLabelsGroup" msgid="4696310712601184208">"Էլփոստ"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"Հասցեն"</string>
     <string name="imLabelsGroup" msgid="8733603247535725786">"IM"</string>
@@ -112,10 +110,10 @@
     <string name="relationLabelsGroup" msgid="3585294036166325520">"Հարաբերություն"</string>
     <string name="eventLabelsGroup" msgid="4801419345682462171">"Հատուկ ամսաթիվ"</string>
     <string name="sms" msgid="8086289395154598654">"Տեքստային հաղորդագրություն"</string>
-    <string name="postal_address" msgid="7692926530081579786">"Հասցե"</string>
+    <string name="postal_address" msgid="7692926530081579786">"Հասցեն"</string>
     <string name="ghostData_company" msgid="22470841482615409">"Ընկերությունը"</string>
-    <string name="ghostData_title" msgid="6221293237772204604">"Պաշտոն"</string>
-    <string name="label_notes" msgid="3997277594846722699">"Նշումներ"</string>
+    <string name="ghostData_title" msgid="6221293237772204604">"Վերնագիրը"</string>
+    <string name="label_notes" msgid="3997277594846722699">"Գրառումներ"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"Վեբ-կայք"</string>
     <string name="groupsLabel" msgid="3574316547053047551">"Խմբերը"</string>
@@ -125,13 +123,13 @@
     <string name="email_other" msgid="4601881243553289615">"Էլփոստ"</string>
     <string name="email_custom" msgid="5777583741581538870">"Նամակագրել <xliff:g id="CUSTOM">%s</xliff:g>-ին"</string>
     <string name="email" msgid="5624424151176351591">"Էլփոստ"</string>
-    <string name="postal_street" msgid="881349814077356134">"Փողոց"</string>
-    <string name="postal_pobox" msgid="1799978742074885091">"Բաժանորդային արկղ"</string>
-    <string name="postal_neighborhood" msgid="3721092668038527674">"Թաղամաս"</string>
-    <string name="postal_city" msgid="3173008531169519309">"Քաղաք"</string>
-    <string name="postal_region" msgid="1695206048198921115">"Նահանգ/շրջան"</string>
-    <string name="postal_postcode" msgid="6542806670034753265">"Փոստային դասիչ"</string>
-    <string name="postal_country" msgid="3988452247038791892">"Երկիր"</string>
+    <string name="postal_street" msgid="881349814077356134">"Փողոցը"</string>
+    <string name="postal_pobox" msgid="1799978742074885091">"Բաժանորդային արկղը"</string>
+    <string name="postal_neighborhood" msgid="3721092668038527674">"Շրջակայքը"</string>
+    <string name="postal_city" msgid="3173008531169519309">"Քաղաքը"</string>
+    <string name="postal_region" msgid="1695206048198921115">"Նահանգը"</string>
+    <string name="postal_postcode" msgid="6542806670034753265">"Փոստային կոդը"</string>
+    <string name="postal_country" msgid="3988452247038791892">"Երկիրը"</string>
     <string name="map_home" msgid="1221397355014741634">"Դիտել տան հասցեն"</string>
     <string name="map_work" msgid="9015981646907637207">"Դիտել աշխատավայրի հասցեն"</string>
     <string name="map_other" msgid="55098598855607997">"Դիտել հասցեն"</string>
@@ -147,7 +145,7 @@
     <string name="chat" msgid="6297650784873558837">"Զրույց"</string>
     <string name="description_minus_button" msgid="2142439445814730827">"ջնջել"</string>
     <string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"Ընդարձակել կամ սեղմել անունների դաշտերը"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="5241493357460353777">"Ընդարձակել կամ կոծկել տառադարձված անվան դաշտերը"</string>
+    <string name="expand_collapse_phonetic_name_fields_description" msgid="5241493357460353777">"Ընդարձակել կամ կոծկել հնչյունաբանական անվան դաշտերը"</string>
     <string name="list_filter_all_accounts" msgid="4265359896628915784">"Բոլոր կոնտակտները"</string>
     <string name="list_filter_all_starred" msgid="9060325494254507806">"Աստղանշված"</string>
     <string name="list_filter_customize" msgid="2352794292558465089">"Հարմարեցնել"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Հնարավոր չէ ներմուծել մեկ կամ ավելի ֆայլեր (%s):"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումը ավարտվեց:"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Կոնտակտների արտահանումը ավարտվեց:"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Կոնտակտներն արտահանվեցին: Սեղմեք ծանուցումը՝ դրանք հասանելի դարձնելու համար:"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Հպեք՝ կոնտակտները հասանելի դարձնելու համար:"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումը չեղարկվեց:"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Կոնտակտային տվյալների արտահանում"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Կոնտակտային տվյալներն արտահանվում են:"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Ձեր կոնտակտային տվյալները արտահանվում են <xliff:g id="FILE_NAME">%s</xliff:g>:"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Հնարավոր չէ ստանալ տվյալների շտեմարանի տեղեկատվությունը:"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Արտահանելի կոնտակտներ չկան: Եթե ​​դուք ձեր հեռախոսի մեջ ունեք կոնտակտներ, հնարավոր է՝ որոշ տվյալների մատակարարներ չեն թույլատրում հեռախոսից կոնտակտների արտահանումը:"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Արտահանելի կոնտակտներ չկան: Եթե ​​դուք ձեր հեռախոսի մեջ ունեք կոնտակտներ, հնարավոր է՝ որոշ տվյալների մատակարարներ չեն թույլատրում հեռախոսից կոնտակտների արտահանումը:"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard-ի կազմիչը ճիշտ չի մեկնարկել:"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Հնարավոր չէ արտահանել"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Կոնտակտային տվյալները չեն արտահանվել:\nՊատճառը՝ «<xliff:g id="FAIL_REASON">%s</xliff:g>»"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard-ի ներմուծման հայցը մերժվել է: Կրկին փորձեք ավելի ուշ:"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g>-ը կարտահանվի շուտով:"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Ֆայլը շուտով կարտահանվի:"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Կոնտակտները շուտով կարտահանվեն:"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard-ի արտահանման հայցը մերժվեց: Փորձեք կրկին ավելի ուշ:"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"կոնտակտ"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(եր)-ի քեշավորում ժամանակավոր պաոց: Փաստացի ներմուծումը կսկսվի շուտով:"</string>
@@ -218,21 +213,16 @@
     <string name="progress_notifier_message" msgid="359931715339778107">"<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="4142192068495589925">"Արտահանել .vcf ֆայլ"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"Դասավորել ըստ"</string>
-    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Անունի"</string>
-    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Ազգանունի"</string>
-    <string name="display_options_view_names_as" msgid="3232196224409242435">"Անվան ձևաչափ"</string>
+    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Անուն"</string>
+    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Ազգանուն"</string>
+    <string name="display_options_view_names_as" msgid="3232196224409242435">"Անվան ձևաչափը"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Սկզբում՝ անունը"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Սկզբում՝ ազգանունը"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Կանխադրված հաշիվ նոր կոնտակտների համար"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Համաժամացնել կոնտակտի մետատվյալները [ՆԵՐՔԻՆ ՓՈՐՁԱՐԿՄԱՆ ՆՊԱՏԱԿՈՎ]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Համաժամացնել կոնտակտի մետատվյալները"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Կոնտակտի մետատվյալների համաժամացման հաշիվ"</string>
     <string name="setting_about" msgid="3926137653588942297">"Կոնտակտների մասին"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Կարգավորումներ"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Փոխանցել տեսանելի կոնտակտները"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Չհաջողվեց համօգտագործել տեսանելի կոնտակտները:"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Տրամադրել նախընտրած կոնտակտները"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Տրամադրել բոլոր կոնտակտները"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Չհաջողվեց տրամադրել կոնտակտները:"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Կոնտակտների ներմուծում/արտահանում"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Ներմուծել կոնտակտներ"</string>
     <string name="share_error" msgid="665756457151793108">"Հնարավոր չէ տարածել կոնտակտը:"</string>
@@ -265,16 +255,15 @@
     <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
     <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <plurals name="tab_title_with_unread_items" formatted="false" msgid="6318422670912575609">
-      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g>: <xliff:g id="COUNT_3">%2$d</xliff:g> չընթերցված տարր: </item>
-      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>: <xliff:g id="COUNT_3">%2$d</xliff:g> չընթերցված տարր: </item>
+      <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g>: <xliff:g id="COUNT_3">%2$d</xliff:g> չընթարցված տարր: </item>
+      <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>: <xliff:g id="COUNT_3">%2$d</xliff:g> չընթարցված տարր: </item>
     </plurals>
     <string name="about_build_version" msgid="4221971683776635130">"Թողարկման տարբերակը"</string>
-    <string name="about_open_source_licenses" msgid="3224958101863814649">"Բաց կոդով ծրագրերի արտոնագրեր"</string>
-    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Բաց կոդով ծրագրային ապահովման արտոնագրերի մանրամասներ"</string>
+    <string name="about_open_source_licenses" msgid="3224958101863814649">"Բաց աղբյուրով լիցենզիաներ"</string>
+    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Լիցենզիայի մանրամասներ բաց աղբյուրով ծրագրային ապահովման համար"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"Գաղտնիության քաղաքականություն"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Օգտագործման պայմաններ"</string>
-    <string name="activity_title_licenses" msgid="7812517458691564230">"Բաց կոդով ծրագրերի արտոնագրեր"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Չհաջողվեց բացել url-ը:"</string>
+    <string name="activity_title_licenses" msgid="7812517458691564230">"Բաց աղբյուրով լիցենզիաներ"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> հաշիվը նշվել է"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> հաշիվը չի նշվել"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Կատարել տեսազանգ"</string>
diff --git a/res-common/values-in-sw600dp/strings.xml b/res-common/values-in-sw600dp/strings.xml
deleted file mode 100644
index 2c33968..0000000
--- a/res-common/values-in-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Hanya tablet, tidak disinkronkan"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Tidak ada kontak yang dapat diekspor. Jika Anda menyimpan kontak di tablet, beberapa penyedia data mungkin tidak mengizinkan kontak untuk diekspor dari tablet."</string>
-</resources>
diff --git a/res-common/values-in/strings.xml b/res-common/values-in/strings.xml
index 60af53b..2f0c01d 100644
--- a/res-common/values-in/strings.xml
+++ b/res-common/values-in/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Hubungi pager kantor"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Hubungi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Hubungi MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Telepon)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS rumah"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS nomor seluler"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS pager kantor"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (SMS)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Lakukan video call"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Hapus yang sering dihubungi?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Anda akan menghapus daftar yang sering dihubungi pada aplikasi Kontak dan Ponsel, serta memaksa aplikasi email untuk mempelajari preferensi penanganan dari awal."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontak"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Lainnya"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Direktori"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Direktori kerja"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Direktori Kerja"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Semua kontak"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Saya"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Menelusuri…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Paling sering dihubungi"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Lihat kontak"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Semua kontak dengan nomor telepon"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Kontak profil kerja"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kontak Profil Kerja"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Lihat pembaruan"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Ponsel saja, tidak disinkronkan"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Ponsel saja, tidak disinkronkan"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nama"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Nama julukan"</string>
     <string name="full_name" msgid="885420216812981202">"Nama"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Satu file atau lebih tidak dapat diimpor (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Selesai mengekspor <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Selesai mengekspor kontak."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Selesai mengekspor kontak, klik notifikasi untuk membagikan kontak."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Ketuk untuk membagikan kontak."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Batal mengekspor <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Mengekspor data kontak"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Data kontak sedang diekspor."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Data kontak Anda sedang diekspor ke: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Tidak dapat memperoleh informasi basis data."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Tidak ada kontak yang dapat diekspor. Jika Anda menyimpan kontak pada ponsel, beberapa penyedia data mungkin tidak mengizinkan kontak diekspor dari ponsel."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Tidak ada kontak yang dapat diekspor. Jika Anda menyimpan kontak pada ponsel, beberapa penyedia data mungkin tidak mengizinkan kontak diekspor dari ponsel."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Penyusun vCard tidak memulai dengan semestinya."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Tak dapat mengekspor"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Data kontak tidak diekspor.\nAlasan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Permintaan impor vCard ditolak. Coba lagi nanti."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> akan segera diekspor."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"File akan segera diekspor."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontak akan segera diekspor."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Permintaan ekspor vCard ditolak. Coba lagi nanti."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontak"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Menyimpan vCard ke dalam cache penyimpanan lokal sementara. Impor yang sebenarnya akan segera dimulai."</string>
@@ -221,18 +216,13 @@
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Nama depan"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Nama belakang"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"Format nama"</string>
-    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Nama depan terlebih dulu"</string>
-    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Nama belakang terlebih dulu"</string>
+    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Nama depan pertama"</string>
+    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Nama belakang pertama"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Akun default untuk kontak baru"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sinkronkan metadata kontak [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sinkronkan metadata kontak"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Akun sinkronisasi metadata kontak"</string>
     <string name="setting_about" msgid="3926137653588942297">"Tentang Kontak"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Setelan"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Bagikan kontak yang terlihat"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Gagal membagikan kontak yang terlihat."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Bagikan kontak favorit"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Bagikan semua kontak"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Gagal membagikan kontak."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Impor/ekspor kontak"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Impor kontak"</string>
     <string name="share_error" msgid="665756457151793108">"Kontak ini tidak dapat dibagi."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Kebijakan privasi"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Persyaratan layanan"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Lisensi sumber terbuka"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Gagal membuka url."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> diperiksa"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> tidak diperiksa"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Lakukan video call"</string>
diff --git a/res-common/values-is-rIS-sw600dp/strings.xml b/res-common/values-is-rIS-sw600dp/strings.xml
deleted file mode 100644
index 08b1b34..0000000
--- a/res-common/values-is-rIS-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Aðeins í spjaldtölvunni, ekki samstilltur"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Engir tengiliðir til útflutnings. Ef þú ert með tengiliði í spjaldtölvunni getur verið að vissar gagnaveitur leyfi ekki útflutning tengiliða úr spjaldtölvunni."</string>
-</resources>
diff --git a/res-common/values-is-rIS/strings.xml b/res-common/values-is-rIS/strings.xml
index 8e3a1f1..ff3fcc4 100644
--- a/res-common/values-is-rIS/strings.xml
+++ b/res-common/values-is-rIS/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Hringja í vinnusímboða"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Hringja í <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Hringja í MMS-númer"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (hringja)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Senda textaskilaboð í <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Senda textaskilaboð heim"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Senda textaskilaboð í farsíma"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Senda textaskilaboð í vinnusímboða"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Senda textaskilaboð til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Senda textaskilaboð í MMS-númer"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (senda SMS)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Hringja myndsímtal"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Hreinsa mest notaða tengiliði?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Þetta hreinsar tengiliðina sem þú hefur mest samskipti við úr forritunum Tengiliðir og Sími og þvingar tölvupóstforrit til að læra upp á nýtt hvernig þú notar netföng."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Tengiliðir"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Aðrir"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Skrá"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Vinnuskrá"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Vinnuskrá"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Allir tengiliðir"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ég"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Leitar…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Oft haft samband við"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Skoða tengilið"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Allir tengiliðir með símanúmer"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Tengiliðir í vinnusniði"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Tengiliðir í vinnusniði"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Skoða uppfærslur"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Aðeins í símanum, ekki samstilltur"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Aðeins í símanum, ekki samstilltur"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nafn"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Gælunafn"</string>
     <string name="full_name" msgid="885420216812981202">"Nafn"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Ekki tókst að flytja inn eina eða fleiri skrár (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Útflutningi á <xliff:g id="FILENAME">%s</xliff:g> lokið."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Útflutningi tengiliða lokið."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Útflutningi tengiliða lokið, smelltu á tilkynninguna til að deila tengiliðum."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Ýttu til að deila tengiliðum."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Hætt við útflutning á <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Flytur út tengiliðagögn"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Verið er að flytja út tengiliðagögnin þín."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Verið er að flytja tengiliðagögnin þín út í skrána: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Ekki tókst að sækja upplýsingar úr gagnagrunni."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Engir tengiliðir til útflutnings. Ef þú ert með tengiliði í símanum getur verið að vissar gagnaveitur leyfi ekki útflutning tengiliða úr símanum."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Engir tengiliðir til útflutnings. Ef þú ert með tengiliði í símanum getur verið að vissar gagnaveitur leyfi ekki útflutning tengiliða úr símanum."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Ræsing vCard-skrifviðmótsins tókst ekki."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Flutningur mistókst"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Tengiliðagögn voru ekki flutt út.\nÁstæða: „<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Beiðni um innflutning vCard-skrár hafnað. Reyndu aftur síðar."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> verður flutt út innan skamms."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Skráin verður flutt út innan skamms."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Tengiliðir verður fluttir út eftir smástund."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Beiðni um útflutning vCard-skrár hafnað. Reyndu aftur síðar."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"tengiliður"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Setur vCard í skyndiminni í staðbundinni geymslu. Raunverulegur innflutningur hefst innan skamms."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Fornafn fyrst"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Eftirnafn fyrst"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Sjálfgefinn reikningur fyrir nýja tengiliði"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Samstilla lýsigögn tengiliða [INNANHÚSSÚTGÁFA]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Samstilla lýsigögn tengiliða"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Hafa samband við samhæfðan lýsigagnareikning"</string>
     <string name="setting_about" msgid="3926137653588942297">"Um tengiliði"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Stillingar"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Deila sýnilegum tengiliðum"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Mistókst að deila sýnilegum tengiliðum."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Deila eftirlætistengiliðum"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Deila öllum tengiliðum"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Ekki tókst að deila tengiliðum."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Tengiliðir fluttir inn/út"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Flytja tengiliði inn"</string>
     <string name="share_error" msgid="665756457151793108">"Ekki er hægt að deila þessum tengilið."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Persónuverndarstefna"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Þjónustuskilmálar"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Leyfi opins kóða"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Ekki tókst að opna slóðina."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Merkt við <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Ekki merkt við <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Hringja myndsímtal"</string>
diff --git a/res-common/values-it-sw600dp/strings.xml b/res-common/values-it-sw600dp/strings.xml
deleted file mode 100644
index 3805c5f..0000000
--- a/res-common/values-it-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"solo su tablet, non sincronizzato"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Non sono presenti contatti esportabili. Se hai contatti sul tablet, è possibile che alcuni fornitori di dati non consentano l\'esportazione dei contatti dal tablet."</string>
-</resources>
diff --git a/res-common/values-it/strings.xml b/res-common/values-it/strings.xml
index cd85667..ea6295c 100644
--- a/res-common/values-it/strings.xml
+++ b/res-common/values-it/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Chiama cercapersone lavoro"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Chiama <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Chiama MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Chiama)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS a casa"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS a cellulare"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS a cercapersone lavoro"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS a <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS a MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Invia SMS)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Fai una videochiamata"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Cancellare contattati di frequente?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Verrà cancellato l\'elenco dei contatti frequenti nelle app Contatti e Telefono e le app email dovranno apprendere da zero le tue preferenze di comunicazione."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contatti"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Altro"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Directory di lavoro"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Directory di lavoro"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Tutti i contatti"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Io"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Ricerca…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contattati spesso"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Visualizza contatto"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Tutti i contatti con numeri di telefono"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contatti del profilo di lavoro"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contatti del profilo di lavoro"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Visualizza aggiornamenti"</string>
-    <string name="account_phone" msgid="6104157990869081962">"solo su telefono, non sincronizzato"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Solo su telefono, non sincronizzato"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nome"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Nickname"</string>
     <string name="full_name" msgid="885420216812981202">"Nome"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Importazione di uno o più file non riuscita (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Esportazione di <xliff:g id="FILENAME">%s</xliff:g> terminata."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Esportazione dei contatti terminata."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Esportazione dei contatti terminata. Fai clic sulla notifica per condividere i contatti."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Tocca per condividere i contatti."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Esportazione di <xliff:g id="FILENAME">%s</xliff:g> annullata."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Esportazione dati contatti"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Esportazione dei dati dei contatti in corso."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"I dati dei contatti sono in fase di esportazione in: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Recupero informazioni database non riuscito."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Non sono presenti contatti esportabili. Se hai contatti sul telefono, è possibile che alcuni fornitori di dati non consentano l\'esportazione dei contatti dal telefono."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Non sono presenti contatti esportabili. Se hai contatti sul telefono, è possibile che alcuni fornitori di dati non consentano l\'esportazione dei contatti dal telefono."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Il compositore di vCard non si è avviato correttamente."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Impossibile esportare"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"I dati dei contatti non sono stati esportati.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Richiesta importazione vCard rifiutata. Riprova più tardi."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"La vCard <xliff:g id="FILENAME">%s</xliff:g> verrà esportata a breve."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Il file verrà esportato a breve."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"I contatti verranno esportati a breve."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Richiesta esportazione vCard rifiutata. Riprova più tardi."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contatto"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Memorizzazione delle vCard nella cache di archiviazione temporanea locale. L\'importazione reale inizierà a breve."</string>
@@ -216,7 +211,7 @@
     <string name="confirm_export_title" msgid="3240899428149018226">"Esportare contatti?"</string>
     <string name="caching_vcard_title" msgid="9185299351381102305">"Memorizzazione nella cache"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"Importazione di <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="4142192068495589925">"Esporta in file .vcf"</string>
+    <string name="export_to_vcf_file" product="default" msgid="4142192068495589925">"Esporta  in file .vcf"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"Ordina per"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Nome"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Cognome"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Prima il nome"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Prima il cognome"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Account predefinito per i nuovi contatti"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sincronizza i metadati dei contatti [VERSIONE SPERIMENTALE]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sincronizza i metadati dei contatti"</string>
-    <string name="setting_about" msgid="3926137653588942297">"Informazioni su Contatti"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Impostazioni"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Account di sincronizzazione metadati di contatto"</string>
+    <string name="setting_about" msgid="3926137653588942297">"Informazioni sull\'applicazione Contatti"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Condividi contatti visibili"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Impossibile condividere i contatti visibili."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Condividi i contatti preferiti"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Condividi tutti i contatti"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Impossibile condividere i contatti."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importa/esporta contatti"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importa contatti"</string>
     <string name="share_error" msgid="665756457151793108">"Questo contatto non può essere condiviso."</string>
@@ -270,11 +260,10 @@
     </plurals>
     <string name="about_build_version" msgid="4221971683776635130">"Versione build"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"Licenze open source"</string>
-    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Dettagli delle licenze per il software open source"</string>
+    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Dettagli della licenza del software open source"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"Norme sulla privacy"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Termini di servizio"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licenze open source"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Impossibile aprire l\'URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> contrassegnato"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> non contrassegnato"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Effettua videochiamata"</string>
diff --git a/res-common/values-iw-sw600dp/strings.xml b/res-common/values-iw-sw600dp/strings.xml
deleted file mode 100644
index 454f045..0000000
--- a/res-common/values-iw-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"טאבלט בלבד, לא מסונכרן"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"אין אנשי קשר הניתנים לייצוא. אם מוגדרים בטאבלט שלך אנשי קשר, ייתכן שספקי נתונים מסוימים אינם מאפשרים ייצוא של אנשי קשר מהטאבלט."</string>
-</resources>
diff --git a/res-common/values-iw/strings.xml b/res-common/values-iw/strings.xml
index bc36a24..10fbd51 100644
--- a/res-common/values-iw/strings.xml
+++ b/res-common/values-iw/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"התקשר לזימונית של העבודה"</string>
     <string name="call_assistant" msgid="5188990854852312696">"התקשר אל <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"‏התקשר ל-MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (שיחה)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"שלח הודעת טקסט אל <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"שלח הודעת טקסט לבית"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"שלח הודעת טקסט לנייד"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"שלח הודעת טקסט לזימונית של עבודה"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"שלח הודעת טקסט אל <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"‏שלח הודעת טקסט ל-MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (הודעה)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"בצע שיחת וידאו"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"האם למחוק אנשי קשר קבועים?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"הפעולה הזו תמחק מהאפליקציות \'אנשים\' ו\'טלפון\' את רשימת אנשי הקשר שאיתם אתה יוצר קשר בתדירות גבוהה, ויהיה עליך ללמד מחדש את אפליקציות האימייל את הכתובות המועדפות עליך."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"אנשי קשר"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"אחר"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ספריה"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"ספריית עבודה"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"ספריית עבודה"</string>
     <string name="local_search_label" msgid="9094584931063745728">"כל אנשי הקשר"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"אני"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"מחפש…"</string>
@@ -91,9 +89,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"בקשר לעתים קרובות"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"הצג איש קשר"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"כל אנשי הקשר עם מספרי טלפון"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"אנשי הקשר של פרופיל העבודה"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"אנשי קשר של פרופיל עבודה"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"הצג עדכונים"</string>
-    <string name="account_phone" msgid="6104157990869081962">"טלפון בלבד, לא מסונכרן"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"טלפון בלבד, לא מסונכרן"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"שם"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"כינוי"</string>
     <string name="full_name" msgid="885420216812981202">"שם"</string>
@@ -189,13 +187,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"‏לא ניתן היה לייבא קובץ אחד או יותר (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"הייצוא של <xliff:g id="FILENAME">%s</xliff:g> הסתיים."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"ייצוא אנשי הקשר הושלם."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"יצוא אנשי הקשר הסתיים, לחץ על ההודעה כדי לשתף אנשי קשר."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"הקש כדי לשתף אנשי קשר."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"הייצוא של <xliff:g id="FILENAME">%s</xliff:g> בוטל."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"מייצא נתונים של אנשי קשר"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"יצוא הנתונים של אנשי הקשר מתבצע כעת."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"נתוני אנשי הקשר שלך מיוצאים אל: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"לא ניתן היה לקבל מידע ממסד הנתונים."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"אין אנשי קשר הניתנים לייצוא. אם מוגדרים אנשי קשר בטלפון שלך, ייתכן שספקי נתונים מסוימים אינם מאפשרים ייצוא של אנשי קשר מהטלפון."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"אין אנשי קשר הניתנים לייצוא. אם מוגדרים אנשי קשר בטלפון שלך, ייתכן שספקי נתונים מסוימים אינם מאפשרים ייצוא של אנשי קשר מהטלפון."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"‏יישום יצירת ה-vCard לא הופעל כהלכה."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"לא ניתן היה לייצא"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"נתוני אנשי הקשר לא יוצאו.\nסיבה: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"‏הבקשה לייבוא ה-vCard נדחתה. נסה שוב מאוחר יותר."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"הייצוא של <xliff:g id="FILENAME">%s</xliff:g> יתבצע תוך זמן קצר."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ייצוא הקובץ יתבצע בעוד זמן קצר."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"יצוא אנשי הקשר יבוצע תוך זמן קצר."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"‏הבקשה לייצוא ה-vCard נדחתה. נסה שוב מאוחר יותר."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"איש קשר"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"‏קובצי ה-vCard נשמרים כקבצים באחסון מקומי זמני. הייבוא בפועל יחל בקרוב."</string>
@@ -226,15 +221,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"שם פרטי יופיע ראשון"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"שם משפחה יופיע ראשון"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"חשבון ברירת מחדל לאנשי קשר חדשים"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"שתף מטא נתונים של איש קשר [ניסוי המוצר לפני הפצה]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"שתף מטא נתונים של איש קשר"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"חשבון לסנכרון מטא נתונים של אנשי קשר"</string>
     <string name="setting_about" msgid="3926137653588942297">"מידע על אנשי קשר"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"הגדרות"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"שתף אנשי קשר שמוצגים כעת"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"שיתוף של התוכן הגלוי נכשל."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"שתף אנשי קשר מועדפים"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"שתף את כל אנשי הקשר"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"הניסיון לשתף את אנשי הקשר נכשל."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"יבא/יצא אנשי קשר"</string>
     <string name="dialog_import" msgid="5177004290082451296">"יבא אנשי קשר"</string>
     <string name="share_error" msgid="665756457151793108">"לא ניתן לשתף איש קשר זה."</string>
@@ -278,7 +268,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"מדיניות פרטיות"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"תנאים והגבלות"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"רישיונות קוד פתוח"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"לא ניתן לפתוח את כתובת האתר."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> מסומן"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> לא מסומן"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"בצע שיחת וידאו"</string>
diff --git a/res-common/values-ja-sw600dp/strings.xml b/res-common/values-ja-sw600dp/strings.xml
deleted file mode 100644
index 271e598..0000000
--- a/res-common/values-ja-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"タブレットのみ（非同期）"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"エクスポートできる連絡先がありません。タブレットに連絡先がある場合でも、データ プロバイダによってはタブレットから連絡先をエクスポートできないことがあります。"</string>
-</resources>
diff --git a/res-common/values-ja/strings.xml b/res-common/values-ja/strings.xml
index b26a825..6828c3f 100644
--- a/res-common/values-ja/strings.xml
+++ b/res-common/values-ja/strings.xml
@@ -21,7 +21,7 @@
     <string name="copy_text" msgid="3424081789297978355">"クリップボードにコピー"</string>
     <string name="call_custom" msgid="2786306789889210756">"<xliff:g id="CUSTOM">%s</xliff:g>に発信"</string>
     <string name="call_home" msgid="1479549630992276827">"自宅に発信"</string>
-    <string name="call_mobile" msgid="8618334085824709009">"モバイル端末に発信"</string>
+    <string name="call_mobile" msgid="8618334085824709009">"携帯端末に発信"</string>
     <string name="call_work" msgid="8299062439076337075">"勤務先に発信"</string>
     <string name="call_fax_work" msgid="3770754834467992571">"勤務先FAXに発信"</string>
     <string name="call_fax_home" msgid="6219051113573396065">"自宅FAXに発信"</string>
@@ -36,14 +36,13 @@
     <string name="call_radio" msgid="9055749313292712021">"無線に発信"</string>
     <string name="call_telex" msgid="2909886619224843563">"テレックスに発信"</string>
     <string name="call_tty_tdd" msgid="6704940636171078852">"TTY/TDDに発信"</string>
-    <string name="call_work_mobile" msgid="4408630608955148641">"モバイル端末（勤務先）に発信"</string>
+    <string name="call_work_mobile" msgid="4408630608955148641">"携帯端末（勤務先）に発信"</string>
     <string name="call_work_pager" msgid="3036932765279753793">"ポケベル（勤務先）に発信"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g>に発信"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMSに発信"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> さん（通話を発信）"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g>にSMS"</string>
     <string name="sms_home" msgid="7765831490534280540">"自宅にSMS"</string>
-    <string name="sms_mobile" msgid="8387632124165893103">"モバイル端末にSMS"</string>
+    <string name="sms_mobile" msgid="8387632124165893103">"携帯端末にSMS"</string>
     <string name="sms_work" msgid="3910570578912367742">"勤務先にSMS"</string>
     <string name="sms_fax_work" msgid="909086167151248212">"勤務先FAXにSMS"</string>
     <string name="sms_fax_home" msgid="4145442497939634875">"自宅FAXにSMS"</string>
@@ -58,11 +57,10 @@
     <string name="sms_radio" msgid="8750339218480745940">"無線にSMS"</string>
     <string name="sms_telex" msgid="5469333785775443999">"テレックスにSMS"</string>
     <string name="sms_tty_tdd" msgid="5057886576150816002">"TTY/TDDにSMS"</string>
-    <string name="sms_work_mobile" msgid="8426872094268475047">"モバイル端末（勤務先）にSMS"</string>
+    <string name="sms_work_mobile" msgid="8426872094268475047">"携帯端末（勤務先）にSMS"</string>
     <string name="sms_work_pager" msgid="499303540738557836">"ポケベル（勤務先）にSMS"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g>にSMS"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMSにSMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> さん（メッセージを送信）"</string>
     <string name="description_video_call" msgid="4907306403398614909">"ビデオハングアウト"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"よく使う連絡先を消去しますか？"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"連絡帳アプリや電話アプリのよく使う連絡先リストを消去し、メールアプリがアドレス設定を初めから保存していくようにします。"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"連絡先"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"その他"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ディレクトリ"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"仕事用の連絡先リスト"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"仕事用の連絡先リスト"</string>
     <string name="local_search_label" msgid="9094584931063745728">"すべての連絡先"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"自分"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"検索しています…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"よく使う連絡先"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"連絡先を表示"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"電話番号のあるすべての連絡先"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"仕事用プロファイルの連絡先"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"仕事用プロファイルの連絡先"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"更新情報を表示"</string>
-    <string name="account_phone" msgid="6104157990869081962">"電話のみ（非同期）"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"電話のみ（非同期）"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"名前"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"ニックネーム"</string>
     <string name="full_name" msgid="885420216812981202">"名前"</string>
@@ -120,7 +118,7 @@
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"ウェブサイト"</string>
     <string name="groupsLabel" msgid="3574316547053047551">"グループ"</string>
     <string name="email_home" msgid="2230967805906450693">"自宅にメール"</string>
-    <string name="email_mobile" msgid="7532438378678903685">"モバイル端末にメール"</string>
+    <string name="email_mobile" msgid="7532438378678903685">"携帯端末にメール"</string>
     <string name="email_work" msgid="7065971921227432400">"勤務先にメール"</string>
     <string name="email_other" msgid="4601881243553289615">"メール"</string>
     <string name="email_custom" msgid="5777583741581538870">"<xliff:g id="CUSTOM">%s</xliff:g>にメール"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"1つ以上のファイルをインポートできませんでした（%s）。"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g>のエクスポートの完了"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"連絡先のエクスポートの完了"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"連絡先のエクスポートが終了しました。通知をタップして連絡先を共有してください。"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"タップして連絡先を共有してください。"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g>のエクスポートのキャンセル"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"連絡先データのエクスポート"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"連絡先データをエクスポートしています。"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"連絡先データを<xliff:g id="FILE_NAME">%s</xliff:g>にエクスポートします。"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"データベース情報を取得できませんでした。"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"エクスポートできる連絡先がありません。モバイル端末に連絡先がある場合でも、データプロバイダによってはモバイル端末から連絡先をエクスポートできないことがあります。"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"エクスポートできる連絡先がありません。携帯端末に連絡先がある場合でも、データプロバイダによっては携帯端末から連絡先をエクスポートできないことがあります。"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCardコンポーザーが正しく起動しませんでした。"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"エクスポート失敗"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"連絡先データはエクスポートされませんでした。\n理由: 「<xliff:g id="FAIL_REASON">%s</xliff:g>」"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCardのインポートリクエストは拒否されました。しばらくしてからもう一度お試しください。"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g>はまもなくエクスポートされます。"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ファイルはまもなくエクスポートされます。"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"連絡先のエクスポートをまもなく開始します。"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCardのエクスポートリクエストは拒否されました。しばらくしてからもう一度お試しください。"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"連絡先"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCardをローカル一時ストレージにキャッシュしています。まもなくインポート処理を開始します。"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"名が先"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"姓が先"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"新しい連絡先のデフォルトアカウント"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"連絡先メタデータの同期 [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"連絡先メタデータの同期"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"連絡先メタデータ同期アカウント"</string>
     <string name="setting_about" msgid="3926137653588942297">"連絡先について"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"設定"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"表示可能な連絡先を共有"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"表示可能な連絡先を共有できませんでした。"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"お気に入りの連絡先を共有"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"すべての連絡先を共有"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"連絡先を共有できませんでした。"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"連絡先のインポート/エクスポート"</string>
     <string name="dialog_import" msgid="5177004290082451296">"連絡先のインポート"</string>
     <string name="share_error" msgid="665756457151793108">"この連絡先は共有できません。"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"プライバシーポリシー"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"利用規約"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"オープンソースライセンス"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"この URL を開けませんでした。"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> はONです"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> はOFFです"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"ビデオハングアウトを発信"</string>
diff --git a/res-common/values-ka-rGE-sw600dp/strings.xml b/res-common/values-ka-rGE-sw600dp/strings.xml
deleted file mode 100644
index 3410c0f..0000000
--- a/res-common/values-ka-rGE-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"მხოლოდ ტაბლეტზე, არასინქრონიზებული"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"ექსპორტირებადი კონტაქტები არ არის. შესაძლოა, არსებული კონტაქტების ტაბლეტიდან ექპორტს მონაცემთა ზოგიერთი პროვაიდერი კრძალავდეს."</string>
-</resources>
diff --git a/res-common/values-ka-rGE/strings.xml b/res-common/values-ka-rGE/strings.xml
index 1dc8e54..9408a72 100644
--- a/res-common/values-ka-rGE/strings.xml
+++ b/res-common/values-ka-rGE/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"დარეკვა სამსახურის პეიჯერზე"</string>
     <string name="call_assistant" msgid="5188990854852312696">"დარეკვა <xliff:g id="ASSISTANT">%s</xliff:g>-თან"</string>
     <string name="call_mms" msgid="8998771923464696960">"დარეკვა MMS-ის ნომერზე"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ზარი)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"ტექსტური შეტყობინების გაგზავნა <xliff:g id="CUSTOM">%s</xliff:g>-ზე"</string>
     <string name="sms_home" msgid="7765831490534280540">"ტექსტური შეტყობინების გაგზავნა სახლში"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"ტექსტური შეტყობინების გაგზავნა მობილურზე"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"ტექსტური შეტყობინების გაგზავნა სამსახურის პეიჯერზე"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"ტექსტური შეტყობინების გაგზავნა <xliff:g id="ASSISTANT">%s</xliff:g>-ისთვის"</string>
     <string name="sms_mms" msgid="4887206338311086612">"ტექსტური შეტყობინების გაგზავნა MMS ნომერზე"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (შეტყობინება)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"ვიდეოზარის განხორციელება"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"გსურთ ხშირი კონტაქტების წაშლა?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"თქვენ წაშლით ხშირად დაკავშირებულთა სიას კონტაქტებიდან და ტელეფონის აპლიკაციიდან და აიძულებთ ელ-ფოსტის აპლიკაციებს შეისწავლონ თქვენი ადრესატების პრიორიტეტები ნულიდან."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"კონტაქტები"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"სხვა"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"კატალოგი"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"სამსახურის კატალოგი"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"სამსახურის კატალოგი"</string>
     <string name="local_search_label" msgid="9094584931063745728">"ყველა კონტაქტი"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"მე"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"ძიება..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"ხშირი კონტაქტები"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"კონტაქტის ნახვა"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ყველა ტელეფონის ნომრიანი კონტაქტი"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"სამსახურის პროფილის კონტაქტები"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"სამსახურის პროფილის კონტაქტები"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"განახლებების ნახვა"</string>
-    <string name="account_phone" msgid="6104157990869081962">"მხოლოდ ტელ-ზე,  სინქ.გარეშე"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"მხოლოდ ტელეფონზე, არასინქრონიზებული"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"სახელი"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"მეტსახელი"</string>
     <string name="full_name" msgid="885420216812981202">"სახელი"</string>
@@ -114,7 +112,7 @@
     <string name="sms" msgid="8086289395154598654">"ტექსტური შეტყობინება (SMS)"</string>
     <string name="postal_address" msgid="7692926530081579786">"მისამართი"</string>
     <string name="ghostData_company" msgid="22470841482615409">"კომპანია"</string>
-    <string name="ghostData_title" msgid="6221293237772204604">"პოზიცია"</string>
+    <string name="ghostData_title" msgid="6221293237772204604">"სათაური"</string>
     <string name="label_notes" msgid="3997277594846722699">"შენიშვნები"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"ვებ-საიტი"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ერთი ან მეტი ფაილის იმპორტი ვერ მოხერხდა (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g>-ის ექსპორტი დასრულდა."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"კონტაქტების ექსპორტი დასრულდა."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"კონტაქტების ექსპორტი დასრულდა. კონტაქტების გასაზიარებლად, შეეხეთ შეტყობინებას."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"შეეხეთ კონტაქტების გასაზიარებლად."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g>-ის ექსპორტი გაუქმდა."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"მიმდინარეობს კონტაქტების მონაცემების ექსპორტი"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"მიმდინარეობს კონტაქტების მონაცემების ექსპორტი."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"მიმდინარეობს თქვენი კონტაქტების მონაცემების ექსპორტი <xliff:g id="FILE_NAME">%s</xliff:g>-ში."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"მონაცემთა ბაზის შესახებ ინფორმაციის მიღება ვერ მოხერხდა."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"ექსპორტირებადი კონტაქტები არ მოიპოვება. თუ კონტაქტები ნამდვილად არის თქვენს ტელეფონში, შესაძლოა ზოგიერთი მონაცემთა პროვაიდერი არ იძლევა ტელეფონიდან მათი ექსპორტის უფლებას."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"ექსპორტირებადი კონტაქტები არ მოიპოვება. თუ კონტაქტები ნამდვილად არის თქვენს ტელეფონში, შესაძლოა ზოგიერთი მონაცემთა პროვაიდერი არ იძლევა ტელეფონიდან მათი ექსპორტის უფლებას."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard ფაილის კომპოზიტორი გაშვებულია არასწორად."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"ექსპორტი ჩაიშალა."</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"კონტაქტების მონაცემები არ არის ექსპორტირებული.\nმიზეზი: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard-ის იმპორტის მოთხოვნა უარყოფილია. სცადეთ მოგვიანებით."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> მალე ექსპორტირდება."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ამ ფაილის ექსპორტი მალე შესრულდება."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"კონტაქტების ექსპორტი მალე განხორციელდება."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard-ის ექსპორტის მოთხოვნა უარყოფილია. სცადეთ მოგვიანებით."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"კონტაქტი"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"მიმდინარეობს vCard ფაილ(ებ)ის ქეშირება ადგილობრივ დროებით მეხსიერებაში. ფაქტიური იმპორტი დაიწყება მალე."</string>
@@ -218,28 +213,23 @@
     <string name="progress_notifier_message" msgid="359931715339778107">"იმპორტირდება <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="4142192068495589925">"ექსპორტი .vcf ფაილში"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"სორტირება:"</string>
-    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"სახელით"</string>
-    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"გვარით"</string>
+    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"სახელი"</string>
+    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"გვარი"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"სახელის ფორმატი"</string>
-    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"ჯერ სახელი"</string>
-    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"ჯერ გვარი"</string>
+    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"ჯერ სახელით"</string>
+    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"ჯერ გვარით"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"ნაგულისხმევი ანგარიში ახალი კონტაქტებისთვის"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"კონტაქტების მეტამონაცემების სინქრონიზაცია (Dogfood-ვერსია)"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"კონტაქტების მეტამონაცემების სინქრონიზაცია"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"კონტაქტების მეტამონაცემების სინქრონიზაციის ანგარიში"</string>
     <string name="setting_about" msgid="3926137653588942297">"Contacts-ის შესახებ"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"პარამეტრები"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"ხილული კონტაქტების გაზიარება"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"ხილული კონტაქტების გაზიარება ვერ მოხერხდა."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"რჩეული კონტაქტების გაზიარება"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"ყველა კონტაქტის გაზიარება"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"კონტაქტების გაზიარება ვერ მოხერხდა."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"კონტაქტების იმპორტი/ექსპორტი"</string>
     <string name="dialog_import" msgid="5177004290082451296">"კონტაქტების იმპორტი"</string>
     <string name="share_error" msgid="665756457151793108">"ამ კონტაქტის გაზიარება შეუძლებელია."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"გასაზიარებელი კონტაქტები არ არის."</string>
     <string name="menu_search" msgid="7464453023659824700">"ძიება"</string>
-    <string name="menu_contacts_filter" msgid="586356478145511794">"ნაჩვენები კონტაქტები"</string>
-    <string name="activity_title_contacts_filter" msgid="7689519428197855166">"ნაჩვენები კონტაქტები"</string>
+    <string name="menu_contacts_filter" msgid="586356478145511794">"კონტაქტები საჩვენებლად"</string>
+    <string name="activity_title_contacts_filter" msgid="7689519428197855166">"კონტაქტები საჩვენებლად"</string>
     <string name="custom_list_filter" msgid="582616656313514803">"მორგებული ხედის განსაზღვრა"</string>
     <string name="hint_findContacts" msgid="28151707326753522">"კონტაქტების პოვნა"</string>
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"რჩეულები"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"კონფიდენციალურობის დებულება"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"მომსახურების პირობები"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"ღია კოდის ლიცენზიები"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Url-ის გახსნა ვერ მოხერხდა."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> მონიშნულია"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> არ არის მონიშნული"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"ვიდეოზარის განხორციელება"</string>
diff --git a/res-common/values-kk-rKZ-sw600dp/strings.xml b/res-common/values-kk-rKZ-sw600dp/strings.xml
deleted file mode 100644
index 4e2ac49..0000000
--- a/res-common/values-kk-rKZ-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Планшет-қана, синхрондалмаған"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Экспортталатын контактілер жоқ. Планшетіңізде контактілер болса, кейбір деректер жеткізушілері контактілердің планшеттен экспортталуына рұқсат бермеуі мүмкін."</string>
-</resources>
diff --git a/res-common/values-kk-rKZ/strings.xml b/res-common/values-kk-rKZ/strings.xml
index e33136c..9b9138d 100644
--- a/res-common/values-kk-rKZ/strings.xml
+++ b/res-common/values-kk-rKZ/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Жұмыс пэйджеріне қоңырау шалу"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> нөміріне қоңырау соғу"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS нөміріне қоңырау шалу"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Қоңырау)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> мәтін-хабар жіберу"</string>
     <string name="sms_home" msgid="7765831490534280540">"Үй телефонына мәтін-хабар жіберу"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Ұялы телефонған мәтін-хабар жіберу"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Жұмыс пейджеріне мәтін-хабар жіберу"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> нөміріне мәтін-хабар жіберу"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS нөміріне мәтін-хабар жіберу"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Хабар)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Бейне қоңырау шалу"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Жиі қолданылғандар тазартылсын ба?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Контактілер және Телефондар қолданбаларындағы жиі хабарласатындар тізімі тазаланады және электрондық пошта қолданбалары мекенжай параметрлерін басынан үйренуге мәжбүрленеді."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Контактілер"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Басқа"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Анықтама"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Жұмыс каталогы"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Жұмыс каталогы"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Барлық контактілер"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Мен"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Іздеуде..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Жиі қолданылғандар"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Контактіні көру"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Телефон нөмірі бар барлық контактілер"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Жұмыс профилінің контактілері"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Жұмыс профилінің контактілері"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Жаңартуларды көру"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Телефон ғана, синхрондалмайтын"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Телефон ғана, синхрондалмайды"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Аты-жөні"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Қысқа аты"</string>
     <string name="full_name" msgid="885420216812981202">"Аты-жөні"</string>
@@ -100,10 +98,10 @@
     <string name="name_prefix" msgid="8219879405071462309">"Аттың префиксі"</string>
     <string name="name_middle" msgid="3951610314424632183">"Әкесінің аты"</string>
     <string name="name_suffix" msgid="5436984808550075931">"Аттың суффиксі"</string>
-    <string name="name_phonetic" msgid="2249169131785620210">"Атының транскрипциясы"</string>
-    <string name="name_phonetic_given" msgid="2863316331175661852">"Атының транскрипциясы"</string>
-    <string name="name_phonetic_middle" msgid="5970174427249235577">"Әкесінің атының транскрипциясы"</string>
-    <string name="name_phonetic_family" msgid="1572398622239414464">"Тегінің транскрипциясы"</string>
+    <string name="name_phonetic" msgid="2249169131785620210">"Фонетикалық есімі"</string>
+    <string name="name_phonetic_given" msgid="2863316331175661852">"Фонетикалық аты"</string>
+    <string name="name_phonetic_middle" msgid="5970174427249235577">"Әкесінің фонетикалық аты"</string>
+    <string name="name_phonetic_family" msgid="1572398622239414464">"Фонетикалық тегі"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"Телефон"</string>
     <string name="emailLabelsGroup" msgid="4696310712601184208">"Э-пошта"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"Мекенжай"</string>
@@ -114,7 +112,7 @@
     <string name="sms" msgid="8086289395154598654">"Мәтін-хабар"</string>
     <string name="postal_address" msgid="7692926530081579786">"Мекенжай"</string>
     <string name="ghostData_company" msgid="22470841482615409">"Компания"</string>
-    <string name="ghostData_title" msgid="6221293237772204604">"Лауазымы"</string>
+    <string name="ghostData_title" msgid="6221293237772204604">"Атауы"</string>
     <string name="label_notes" msgid="3997277594846722699">"Ескертулер"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"Веб-сайт"</string>
@@ -147,7 +145,7 @@
     <string name="chat" msgid="6297650784873558837">"Чаттасу"</string>
     <string name="description_minus_button" msgid="2142439445814730827">"жою"</string>
     <string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"Ат аймақтарын кеңейту немесе қирату"</string>
-    <string name="expand_collapse_phonetic_name_fields_description" msgid="5241493357460353777">"Атының транскрипциясы өрістерін жаю немесе жию"</string>
+    <string name="expand_collapse_phonetic_name_fields_description" msgid="5241493357460353777">"Фонетикалық атау өрістерін жаю немесе жию"</string>
     <string name="list_filter_all_accounts" msgid="4265359896628915784">"Барлық контактілер"</string>
     <string name="list_filter_all_starred" msgid="9060325494254507806">"Жұлдызшалы"</string>
     <string name="list_filter_customize" msgid="2352794292558465089">"Қалау бойынша реттеу"</string>
@@ -160,7 +158,7 @@
     <string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"\"<xliff:g id="GROUP">%s</xliff:g>\" синрондаудан алу топталмаған контактілердің синхрондаудан алынуына себеп болады."</string>
     <string name="savingDisplayGroups" msgid="6863012138107446030">"Дисплей опцияларын сақтау…"</string>
     <string name="menu_done" msgid="32470053723443112">"Дайын"</string>
-    <string name="menu_doNotSave" msgid="6012426160993364871">"Бас тарту"</string>
+    <string name="menu_doNotSave" msgid="6012426160993364871">"Өшіру"</string>
     <string name="listAllContactsInAccount" msgid="755499980092808715">"<xliff:g id="NAME">%s</xliff:g> ішіндегі контактілер"</string>
     <string name="listCustomView" msgid="1915154113477432033">"Контактілердің жеке көрінісі"</string>
     <string name="listSingleContact" msgid="8525131203887307088">"Жалғыз контакт"</string>
@@ -187,16 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Бір немесе бірнеше карталарды импорттау мүмкін болмады (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> экспорттау аяқталды."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Контактілер экспортталып болды."</string>
-    <!-- no translation found for exporting_vcard_finished_toast (5995505525489290221) -->
-    <skip />
-    <!-- no translation found for touch_to_share_contacts (3237211496215699092) -->
-    <skip />
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> экспорттау тоқтатылды."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Контакт дерекқор экспортталуда"</string>
-    <!-- no translation found for exporting_contact_list_message (141905615542638683) -->
-    <skip />
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Контакт дерекқорыңыз келесі файлға экспортталуда: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Дерекқор ақпаратын ала алмады."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Экспорттауға болатын контактілер жоқ. Телефоныңызда контактілер болса, кейбір дерекқор жадбықтаушылар контактілердің телефоннан экспортталуына рұқсат бермейді."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Экспорттауға болатын контактілер жоқ. Телефоныңызда контактілер болса, кейбір дерекқор жадбықтаушылар контактілердің телефоннан экспортталуына рұқсат бермейді."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vКарта жасақтаушы дұрыс басталмады."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Экспорттай алмады"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Контакт деректері экспортталмады. \nСебебі: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -210,8 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vКартасын импорттау өтініші қабылданбады. Кейінірек қайта әрекеттеніп көріңіз."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> жуық арада экспортталады."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Файл қысқа уақыттан кейін экспортталады."</string>
-    <!-- no translation found for contacts_export_will_start_message (4527597765334949574) -->
-    <skip />
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vКартасын экспорттау өтініші қабылданбады. Кейінірек қайта әрекеттеніп көріңіз."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vКарталарын жергілікті уақытша жадқа кэштеу. Импорттау жуық арада басталады."</string>
@@ -228,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Алдымен аты"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Алдымен тегі"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Жаңа контактілерге арналған әдепкі есептік жазба"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Контакт метадеректерін синхрондау [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Контакт метадеректерін синхрондау"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Контактінің метадеректерін синхрондау есептік жазбасы"</string>
     <string name="setting_about" msgid="3926137653588942297">"Контактілер туралы"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Параметрлер"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Көрінетін контактілерді бөлісу"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Көрінетін контактілерді бөлісу сәтсіз аяқталды."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Таңдаулы контактілерді бөлісу"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Барлық контактілерді бөлісу"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Контактілерді бөлісу сәтсіз аяқталды."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Контактілерді импорттау/экспорттау"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Контактілерді импорттау"</string>
     <string name="share_error" msgid="665756457151793108">"Бұл контактіні бөлісу мүмкін болмады"</string>
@@ -278,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Құпиялылық саясаты"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Қызмет көрсету шарттары"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Ашық бастапқы код лицензиялары"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Url ашылған жоқ."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> құсбелгі қойылған"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> құсбелгі қойылмаған"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Бейне қоңырау соғу"</string>
diff --git a/res-common/values-km-rKH-sw600dp/strings.xml b/res-common/values-km-rKH-sw600dp/strings.xml
deleted file mode 100644
index 0192cc8..0000000
--- a/res-common/values-km-rKH-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"តែថេប្លេតប៉ុណ្ណោះ និងមិនបានធ្វើសមកាលកម្ម"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"មិនមានទំនាក់ទំនងដែលអាចនាំចេញបានទេ។ ប្រសិនបើអ្នកពិតជាមានទំនាក់ទំនងនៅក្នុងថេប្លេតរបស់អ្នកមែន នោះក្រុមហ៊ុនផ្ដល់ទិន្នន័យប្រហែលជាមិនអនុញ្ញាតឲ្យធ្វើការនាំចេញទំនាក់ទំនងទាំងនោះពីថេប្លេតនោះទេ។"</string>
-</resources>
diff --git a/res-common/values-km-rKH/strings.xml b/res-common/values-km-rKH/strings.xml
index 299e681..b2d4a1b 100644
--- a/res-common/values-km-rKH/strings.xml
+++ b/res-common/values-km-rKH/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"ហៅ​ទៅ​ភេយ័រ​កន្លែង​ធ្វើការ"</string>
     <string name="call_assistant" msgid="5188990854852312696">"ហៅ​ទៅ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"ហៅ MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ហៅ)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"អត្ថបទ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"​សារ​ទៅ​​ផ្ទះ"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"អត្ថបទ​ទូរស័ព្ទ​ចល័ត"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"អត្ថបទ​ភេ​យ័រ​កន្លែង​ធ្វើការ"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"អត្ថបទ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"អត្ថបទ MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (សារ)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"ហៅ​ជា​វីដេអូ"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"សម្អាត​ទំនាក់ទំនង​ញឹកញាប់?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"អ្នកនឹងជម្រះបញ្ជីដែលអ្នកទាក់ទងជាញឹកញាប់នៅក្នុងកម្មវិធីទូរស័ព្ទ និងទំនាក់ទំនង ហើយបង្ខំឲ្យកម្មវិធីអ៊ីមែលស្វែងយល់ពីចំណូលចិត្តទំនាក់ទំនងរបស់អ្នកតាំងពីដំបូង។"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"ទំនាក់ទំនង"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"ផ្សេងៗ"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ថត"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"ថតកន្លែងការងារ"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"ថតទំនាក់ទំនងកន្លែងការងារ"</string>
     <string name="local_search_label" msgid="9094584931063745728">"ទំនាក់ទំនង​ទាំងអស់"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"ខ្ញុំ"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"កំពុង​រក..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"បាន​ទាក់ទង​ញឹកញាប់"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"មើល​ទំនាក់ទំនង"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ទំនាក់ទំនង​ទាំងអស់​ដែល​មាន​លេខ​ទូរស័ព្ទ"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"ទំនាក់ទំនងប្រវត្តិរូបការងារ"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"ទំនាក់ទំនងប្រវត្តិរូបការងារ"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"មើល​បច្ចុប្បន្នភាព"</string>
-    <string name="account_phone" msgid="6104157990869081962">"តែ​ទូរស័ព្ទ, មិន​បាន​ធ្វើ​សមកាលកម្ម"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"តែ​ទូរស័ព្ទ, មិន​បាន​ធ្វើ​សមកាលកម្ម"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"ឈ្មោះ"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"ឈ្មោះ​ហៅ​ក្រៅ"</string>
     <string name="full_name" msgid="885420216812981202">"ឈ្មោះ"</string>
@@ -114,10 +112,10 @@
     <string name="sms" msgid="8086289395154598654">"សារ​អត្ថបទ"</string>
     <string name="postal_address" msgid="7692926530081579786">"អាសយដ្ឋាន"</string>
     <string name="ghostData_company" msgid="22470841482615409">"ក្រុមហ៊ុន"</string>
-    <string name="ghostData_title" msgid="6221293237772204604">"តួនាទី"</string>
+    <string name="ghostData_title" msgid="6221293237772204604">"មុខងារ"</string>
     <string name="label_notes" msgid="3997277594846722699">"ចំណាំ"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="8620657380165071493">"គេហទំព័រ"</string>
+    <string name="websiteLabelsGroup" msgid="8620657380165071493">"តំបន់បណ្ដាញ"</string>
     <string name="groupsLabel" msgid="3574316547053047551">"ក្រុម"</string>
     <string name="email_home" msgid="2230967805906450693">"អ៊ីមែល​ទៅ​ផ្ទះ"</string>
     <string name="email_mobile" msgid="7532438378678903685">"អ៊ីមែល​ទៅ​ទូរស័ព្ទ​ចល័ត"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"មាន​ឯកសារ​មួយ ឬ​ច្រើន​ដែល​មិន​អាច​នាំចូល (%s​) បាន​។"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"បាន​បញ្ចប់​ការ​នាំ​ចេញ <xliff:g id="FILENAME">%s</xliff:g> ។"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"បានបញ្ចប់ការនាំចេញទំនាក់ទំនង។"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"បានបញ្ចប់ការនាំចេញទំនាក់ទំនង សូមចុចការជូនដំណឹងនោះដើម្បីចែករំលែកទំនាក់ទំនង"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"ប៉ះដើម្បីចែករំលែកទំនាក់ទំនង"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"បាន​បោះបង់​ការ​នាំចេញ <xliff:g id="FILENAME">%s</xliff:g> ។"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"កំពុង​នាំចេញ​ព័ត៌មាន​ទំនាក់ទំនង"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"ទិន្នន័យចំណាំកំពុងត្រូវបាននាំចេញ"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"កំពុង​នាំចេញ​ព័ត៌មាន​ទំនាក់ទំនង​របស់​អ្នក​ទៅកាន់៖ <xliff:g id="FILE_NAME">%s</xliff:g> ។"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"មិន​អាច​យក​ព័ត៌មាន​មូលដ្ឋាន​ទិន្នន័យ។"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"មិន​មាន​ទំនាក់​ទំនង​ដើម្បី​នាំចេញ​ទេ។ ប្រសិនបើ​អ្នក​ពិតជា​មាន​ទំនាក់ទំនង​នៅ​ក្នុង​ទូរស័ព្ទ​របស់​អ្នក​មែន នោះ​ទំនាក់ទំនង​ទាំងអស់​អាច​បាន​ហាម​មិន​ឲ្យ​នាំចេញ​ដោយ​ក្រុមហ៊ុន​ផ្ដល់​ទិន្នន័យ​មួយ​ចំនួន។"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"មិន​មាន​ទំនាក់​ទំនង​ដើម្បី​នាំចេញ​ទេ។ ប្រសិនបើ​អ្នក​ពិតជា​មាន​ទំនាក់ទំនង​នៅ​ក្នុង​ទូរស័ព្ទ​របស់​អ្នក​មែន នោះ​ទំនាក់ទំនង​ទាំងអស់​អាច​បាន​ហាម​មិន​ឲ្យ​នាំចេញ​ដោយ​ក្រុមហ៊ុន​ផ្ដល់​ទិន្នន័យ​មួយ​ចំនួន។"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"កម្មវិធី​តែង​របស់ vCard មិន​បាន​ចាប់ផ្ដើម​ត្រឹមត្រូវ​ទេ។"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"មិន​អាច​នាំចេញ"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"មិន​បាន​នាំចេញ​ព័ត៌មាន​ទំនាក់ទំនង។\nមូលហេតុ៖ \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"បាន​បដិសេធ​សំណើ​នាំចូល vCard ។ សូម​ព្យាយាម​ម្ដងទៀត​នៅ​ពេល​ក្រោយ​។"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"នឹង​នាំចេញ <xliff:g id="FILENAME">%s</xliff:g> ក្នុង​ពេល​ឆាប់ៗ។"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"នឺងនាំចេញឯកសារក្នុងពេលឆាប់ៗ។"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"ទំនាក់ទំនងនឹងត្រូវបាននាំចេញក្នុងពេលបន្តិចទៀតនេះ"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"បាន​បដិសេធ​សំណើ​នាំចេញ vCard ។ សូម​ព្យាយាម​ម្ដងទៀត​នៅ​ពេល​ក្រោយ​។"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"ទំនាក់ទំនង"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"ការ​ផ្ទុក vCard(s​) ទៅកាន់​ឧបករណ៍​ផ្ទុក​បណ្ដោះអាសន្ន​មូលដ្ឋាន។ ការ​នាំ​ចូល​ពិតប្រាកដ​នឹង​ចាប់ផ្ដើម​ក្នុង​ពេល​ឆាប់ៗ។"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"នាម​ខ្លួន​មុន"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"នាមត្រកូល​មុន"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"គណនីលំនាំដើមសម្រាប់ទំនាក់ទំនងថ្មី"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"ធ្វើសមកាលកម្មទិន្នន័យមេតា [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"ធ្វើសមកាលកម្មទិន្នន័យមេតា"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"គណនីសមកាលកម្មទិន្នន័យមេតាទំនាក់ទំនង"</string>
     <string name="setting_about" msgid="3926137653588942297">"អំពីទំនាក់ទំនង"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"ការកំណត់"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"ចែករំលែក​ទំនាក់ទំនង​ដែល​អាច​មើល​ឃើញ"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"បានបរាជ័យក្នុងការចែករំលែកទំនាក់ទំនងដែលអាចមើលឃើញ។"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"ចែករំលែកទំនាក់ទំនងសំណព្វចិត្ត"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"ចែករំលែកទំនាក់ទំនងទាំងអស់"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"បរាជ័យក្នុងការចែករំលែកទំនាក់ទំនង"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"នាំចេញ/នាំចូល​ទំនាក់ទំនង"</string>
     <string name="dialog_import" msgid="5177004290082451296">"នាំចូល​ទំនាក់ទំនង"</string>
     <string name="share_error" msgid="665756457151793108">"ទំនាក់ទំនង​នេះ​មិន​អាច​ចែករំលែក​បាន​ទេ។"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"គោលការណ៍ភាពឯកជន"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"លក្ខខណ្ឌប្រើប្រាស់"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"អាជ្ញាប័ណ្ណប្រភពកូដចំហ"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"បាន​បរាជ័យ​ក្នុង​ការ​បើក URL។"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"បានពិនិត្យ <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"មិនបានពិនិត្យ <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"ធ្វើការហៅជាវីដេអូ"</string>
diff --git a/res-common/values-kn-rIN-sw600dp/strings.xml b/res-common/values-kn-rIN-sw600dp/strings.xml
deleted file mode 100644
index 8e975a5..0000000
--- a/res-common/values-kn-rIN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"ಟ್ಯಾಬ್ಲೆಟ್‌ ಮಾತ್ರ, ಅನ್‌ಸಿಂಕ್‌ ಮಾಡಲಾದ"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"ಯಾವುದೇ ರಫ್ತುಮಾಡಿದ ಸಂಪರ್ಕಗಳಿಲ್ಲ. ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ನಲ್ಲಿ ಸಂಪರ್ಕಗಳನ್ನು ಹೊಂದಿದ್ದರೆ, ಟ್ಯಾಬ್ಲೆಟ್‌‌‌‌ನಿಂದ ರಫ್ತು ಮಾಡಲಿರುವ ಸಂಪರ್ಕಗಳಿಗೆ ಕೆಲವು ಡೇಟಾ ಪೂರೈಕೆದಾರರು ಅನುಮತಿ ನೀಡದಿರಬಹುದು."</string>
-</resources>
diff --git a/res-common/values-kn-rIN/strings.xml b/res-common/values-kn-rIN/strings.xml
index f7afd3d..243a5ff 100644
--- a/res-common/values-kn-rIN/strings.xml
+++ b/res-common/values-kn-rIN/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"ಕೆಲಸದ ಪೇಜರ್‌‌ಗೆ ಕರೆ ಮಾಡಿ"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> ಕರೆ ಮಾಡಿ"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS ಕರೆ ಮಾಡಿ"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ಕರೆ ಮಾಡಿ)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
     <string name="sms_home" msgid="7765831490534280540">"ನಿವಾಸಕ್ಕೆ ಸಂದೇಶ ಮಾಡಿ"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"ಮೊಬೈಲ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"ಕೆಲಸದ ಪೇಜರ್‌‌ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> ಗೆ ಸಂದೇಶ ಮಾಡಿ"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS ಸಂದೇಶ ಮಾಡಿ"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ಸಂದೇಶ ಕಳುಹಿಸಿ)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"ಪದೇ ಪದೇ ಸಂಪರ್ಕಿಸಿರುವುದನ್ನು ತೆರುವುಗೊಳಿಸುವುದೇ?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"ಸಂಪರ್ಕಗಳು ಮತ್ತು ಫೋನ್‌ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಪದೇ ಪದೇ ಸಂಪರ್ಕಪಡಿಸಿರುವ ಪಟ್ಟಿಯನ್ನು ನೀವು ತೆರುವುಗೊಳಿಸುತ್ತೀರಿ ಮತ್ತು ಮೊದಲಿನಿಂದ ನಿಮ್ಮ ವಿಳಾಸ ಪ್ರಾಶಸ್ತ್ಯಗಳನ್ನು ತಿಳಿಯಲು ಇಮೇಲ್‌ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಒತ್ತಾಯಿಸಿ."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"ಸಂಪರ್ಕಗಳು"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"ಇತರೆ"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ಡೈರೆಕ್ಟರಿ"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"ಕೆಲಸದ ಡೈರೆಕ್ಟರಿ"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"ಕೆಲಸದ ಡೈರೆಕ್ಟರಿ"</string>
     <string name="local_search_label" msgid="9094584931063745728">"ಎಲ್ಲಾ ಸಂಪರ್ಕಗಳು"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"ನಾನು"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"ಹುಡುಕಲಾಗುತ್ತಿದೆ…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"ಪದೇ ಪದೇ ಸಂಪರ್ಕಿಸಿರುವುದು"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"ಸಂಪರ್ಕವನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ಫೋನ್‌ ಸಂಖ್ಯೆಗಳೊಂದಿಗೆ ಎಲ್ಲ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸಂಪರ್ಕಗಳು"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸಂಪರ್ಕಗಳು"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"ನವೀಕರಣಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
-    <string name="account_phone" msgid="6104157990869081962">"ಫೋನ್‌ ಮಾತ್ರ, ಅನ್‌ಸಿಂಕ್‌‌ ಮಾಡಲಾದ"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"ಫೋನ್‌ ಮಾತ್ರ, ಅನ್‌ಸಿಂಕ್‌‌ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"ಹೆಸರು"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"ಅಡ್ಡಹೆಸರು"</string>
     <string name="full_name" msgid="885420216812981202">"ಹೆಸರು"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ಒಂದು ಅಥವಾ ಹೆಚ್ಚಿನ ಫೈಲ್‌ಗಳನ್ನು ಆಮದು ಮಾಡಲಾಗುವುದಿಲ್ಲ (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> ರಫ್ತು ಮುಗಿದಿದೆ."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"ಸಂಪರ್ಕಗಳ ರಫ್ತು ಮಾಡುವಿಕೆ ಮುಗಿದಿದೆ."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡುವುದನ್ನು ಮುಕ್ತಾಯಗೊಳಿಸಲಾಗಿದೆ, ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಧಿಸೂಚನೆ ಕ್ಲಿಕ್ ಮಾಡಿ."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> ರಫ್ತು ಮಾಡುವುದನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"ಸಂಪರ್ಕ ಡೇಟಾವನ್ನು ರಫ್ತುಮಾಡಲಾಗುತ್ತಿದೆ"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"ಸಂಪರ್ಕ ಡೇಟಾವನ್ನು ಆಮದು ಮಾಡಲಾಗುತ್ತಿದೆ."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"ನಿಮ್ಮ ಸಂಪರ್ಕ ಡೇಟಾವನ್ನು ಇದಕ್ಕೆ ರಫ್ತು ಮಾಡಲಾಗುತ್ತಿದೆ: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ಡೇಟಾಬೇಸ್ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"ಯಾವುದೇ ರಫ್ತುಮಾಡಿದ ಸಂಪರ್ಕಗಳಿಲ್ಲ. ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ನೀವು ಸಂಪರ್ಕಗಳನ್ನು ಹೊಂದಿದ್ದರೆ, ಫೋನ್‌ನಿಂದ ರಫ್ತು ಮಾಡಲಿರುವ ಸಂಪರ್ಕಗಳಿಗೆ ಕೆಲವು ಡೇಟಾ ಪೂರೈಕೆದಾರರು ಅನುಮತಿ ನೀಡದಿರಬಹುದು."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"ಯಾವುದೇ ರಫ್ತುಮಾಡಿದ ಸಂಪರ್ಕಗಳಿಲ್ಲ. ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ನೀವು ಸಂಪರ್ಕಗಳನ್ನು ಹೊಂದಿದ್ದರೆ, ಫೋನ್‌ನಿಂದ ರಫ್ತು ಮಾಡಲಿರುವ ಸಂಪರ್ಕಗಳಿಗೆ ಕೆಲವು ಡೇಟಾ ಪೂರೈಕೆದಾರರು ಅನುಮತಿ ನೀಡದಿರಬಹುದು."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard ಸಂಯೋಜಕ ಸರಿಯಾಗಿ ಪ್ರಾರಂಭವಾಗಿಲ್ಲ."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"ರಫ್ತು ಮಾಡಲಾಗುವುದಿಲ್ಲ"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"ಸಂಪರ್ಕ ಡೇಟಾವನ್ನು ರಫ್ತು ಮಾಡಲಿಲ್ಲ.\nಕಾರಣ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard ಆಮದು ವಿನಂತಿಯನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ. ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> ಸ್ವಲ್ಪ ಸಮಯದಲ್ಲಿ ರಫ್ತು ಮಾಡಲಾಗುತ್ತದೆ."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ಫೈಲ್‌ ಅನ್ನು ಸ್ವಲ್ಪ ಸಮಯದಲ್ಲಿ ರಪ್ತು ಮಾಡಲಾಗುತ್ತದೆ."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"ಸಂಪರ್ಕಗಳನ್ನು ಶೀಘ್ರದಲ್ಲೇ ಆಮದು ಮಾಡಲಾಗುತ್ತದೆ."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard ರಫ್ತು ವಿನಂತಿಯನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"ಸಂಪರ್ಕ"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(ಗಳು) ಅನ್ನು ಸ್ಥಳೀಯ ತಾತ್ಕಾಲಿಕ ಸಂಗ್ರಹಣೆಗೆ ಸಂಗ್ರಹ ಮಾಡಲಾಗುತ್ತಿದೆ. ನಿಜವಾದ ಆಮದು ಶೀಘ್ರದಲ್ಲೇ ಪ್ರಾರಂಭವಾಗುತ್ತದೆ."</string>
@@ -223,23 +218,18 @@
     <string name="display_options_view_names_as" msgid="3232196224409242435">"ಹೆಸರಿನ ಫಾರ್ಮ್ಯಾಟ್‌"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"ಮೊದಲ ಹೆಸರು ಮೊದಲು"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"ಕೊನೆಯ ಹೆಸರು ಮೊದಲು"</string>
-    <string name="default_editor_account" msgid="4338725881650654966">"ಹೊಸ ಸಂಪರ್ಕಗಳಿಗೆ ಡಿಫಾಲ್ಟ್‌ ಖಾತೆ"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"ಸಂಪರ್ಕ ಮೆಟಾಡೇಟಾವನ್ನು ಸಿಂಕ್ ಮಾಡಿ [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"ಸಂಪರ್ಕ ಮೆಟಾಡೇಟಾವನ್ನು ಸಿಂಕ್ ಮಾಡಿ"</string>
+    <string name="default_editor_account" msgid="4338725881650654966">"ಹೊಸ ಸಂಪರ್ಕಗಳಿಗೆ ಡೀಫಾಲ್ಟ್‌ ಖಾತೆ"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"ಮೆಟಾಡೇಟಾ ಸಿಂಕ್ ಖಾತೆಯನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="setting_about" msgid="3926137653588942297">"ಸಂಪರ್ಕಗಳ ಕುರಿತು"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"ಗೋಚರಿಸುವ ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"ಗೋಚರಿಸುವ ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ವಿಫಲವಾಗಿದೆ."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"ಮೆಚ್ಚಿನ ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"ಎಲ್ಲ ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"ಸಂಪರ್ಕಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ವಿಫಲವಾಗಿದೆ."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು/ರವಾನೆ ಮಾಡಿ"</string>
     <string name="dialog_import" msgid="5177004290082451296">"ಸಂಪರ್ಕಗಳನ್ನು ಆಮದು ಮಾಡಿ"</string>
     <string name="share_error" msgid="665756457151793108">"ಈ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"ಹಂಚಿಕೊಳ್ಳಲು ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ."</string>
     <string name="menu_search" msgid="7464453023659824700">"ಹುಡುಕು"</string>
-    <string name="menu_contacts_filter" msgid="586356478145511794">"ಪ್ರದರ್ಶನ ಸಂಪರ್ಕಗಳು"</string>
-    <string name="activity_title_contacts_filter" msgid="7689519428197855166">"ಪ್ರದರ್ಶನ ಸಂಪರ್ಕಗಳು"</string>
+    <string name="menu_contacts_filter" msgid="586356478145511794">"ಪ್ರದರ್ಶಿಸಲು ಸಂಪರ್ಕಗಳು"</string>
+    <string name="activity_title_contacts_filter" msgid="7689519428197855166">"ಪ್ರದರ್ಶಿಸಲು ಸಂಪರ್ಕಗಳು"</string>
     <string name="custom_list_filter" msgid="582616656313514803">"ಕಸ್ಟಮ್ ವೀಕ್ಷಣೆ ವಿವರಿಸಿ"</string>
     <string name="hint_findContacts" msgid="28151707326753522">"ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಿ"</string>
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"ಮೆಚ್ಚಿನವುಗಳು"</string>
@@ -269,12 +259,11 @@
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ಓದದಿರುವ ಐಟಂಗಳು. </item>
     </plurals>
     <string name="about_build_version" msgid="4221971683776635130">"ಬಿಲ್ಡ್ ಆವೃತ್ತಿ"</string>
-    <string name="about_open_source_licenses" msgid="3224958101863814649">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
-    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ಮುಕ್ತ ಮೂಲ ಸಾಫ್ಟ್‌ವೇರ್‌ಗಾಗಿ ಪರವಾನಗಿ ವಿವರಗಳು"</string>
+    <string name="about_open_source_licenses" msgid="3224958101863814649">"ಓಪನ್ ಸೋರ್ಸ್ ಪರವಾನಗಿಗಳು"</string>
+    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ಓಪನ್ ಸೋರ್ಸ್ ಸಾಫ್ಟ್‌ವೇರ್‌ಗಾಗಿ ಪರವಾನಗಿ ವಿವರಗಳು"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"ಗೌಪ್ಯತೆ ನೀತಿ"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"ಸೇವಾ ನಿಯಮಗಳು"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"ತೆರೆದ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url ತೆರೆಯಲು ವಿಫಲವಾಗಿದೆ."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ಪರಿಶೀಲಿಸಲಾಗಿದೆ"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ಪರಿಶೀಲಿಸಲಾಗಿಲ್ಲ"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"ವೀಡಿಯೊ ಕರೆ ಮಾಡಿ"</string>
diff --git a/res-common/values-ko-sw600dp/strings.xml b/res-common/values-ko-sw600dp/strings.xml
deleted file mode 100644
index 9577ba4..0000000
--- a/res-common/values-ko-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"태블릿 전용(동기화되지 않음)"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"내보낼 수 있는 연락처가 없습니다. 태블릿에 연락처가 있다면 일부 데이터 제공업체에서 연락처를 태블릿에서 내보내지 못하도록 했기 때문일 수 있습니다."</string>
-</resources>
diff --git a/res-common/values-ko/strings.xml b/res-common/values-ko/strings.xml
index a3a3532..fb189e4 100644
--- a/res-common/values-ko/strings.xml
+++ b/res-common/values-ko/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"직장 호출기로 전화 걸기"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g>(으)로 전화걸기"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS로 전화걸기"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g>(전화)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g>에 문자 보내기"</string>
     <string name="sms_home" msgid="7765831490534280540">"집으로 문자 보내기"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"휴대전화로 문자 보내기"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"직장 호출기로 문자 보내기"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g>(으)로 문자 보내기"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS로 문자 보내기"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g>(메시지)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"화상 통화하기"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"자주 연락하는 사람들 목록을 삭제하시겠습니까?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"주소록 및 휴대전화 앱에서 자주 연락하는 사람의 목록을 삭제하고 이메일 앱이 주소록 환경설정을 처음부터 다시 반영하도록 합니다."</string>
@@ -73,12 +71,12 @@
     <string name="contactsList" msgid="7140022347217602605">"주소록"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"기타"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"디렉토리"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"직장 디렉토리"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"직장 디렉토리"</string>
     <string name="local_search_label" msgid="9094584931063745728">"모든 주소록"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"나"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"검색 중…"</string>
     <string name="foundTooManyContacts" msgid="3060037437459313616">"<xliff:g id="COUNT">%d</xliff:g>개 이상 찾았습니다."</string>
-    <string name="listFoundAllContactsZero" msgid="4406036083994138930">"연락처 없음"</string>
+    <string name="listFoundAllContactsZero" msgid="4406036083994138930">"주소록 없음"</string>
     <plurals name="searchFoundContacts" formatted="false" msgid="4016164064185890420">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g>개 찾음</item>
       <item quantity="one">1개 찾음</item>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"자주 연락하는 사람들"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"연락처 보기"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"전화번호가 포함된 모든 연락처"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"직장 프로필 연락처"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"직장 프로필 연락처"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"업데이트 보기"</string>
-    <string name="account_phone" msgid="6104157990869081962">"휴대전화 전용(동기화되지 않음)"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"휴대전화 전용(동기화되지 않음)"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"이름"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"닉네임"</string>
     <string name="full_name" msgid="885420216812981202">"이름"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"하나 이상의 파일을 가져오지 못했습니다(%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> 내보내기 완료됨"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"연락처 내보내기 완료"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"연락처 내보내기가 끝나면 알림을 클릭하여 연락처를 공유하세요."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"연락처를 공유하려면 탭하세요."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> 내보내기 취소됨"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"연락처 데이터 내보내기"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"연락처 데이터를 내보내는 중입니다."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"연락처 데이터를 <xliff:g id="FILE_NAME">%s</xliff:g>(으)로 내보내고 있습니다."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"데이터베이스 정보를 가져오지 못했습니다."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"내보낼 수 있는 연락처가 없습니다. 휴대전화에 연락처가 있다면 일부 데이터 제공업체에서 연락처를 휴대전화에서 내보내지 못하도록 했기 때문일 수 있습니다."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"내보낼 수 있는 연락처가 없습니다. 휴대전화에 연락처가 있다면 일부 데이터 제공업체에서 연락처를 휴대전화에서 내보내지 못하도록 했기 때문일 수 있습니다."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard 작성기가 제대로 시작되지 않았습니다."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"내보내기 실패"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"주소록 데이터를 내보내지 못했습니다.\n(이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard 가져오기 요청이 거부되었습니다. 나중에 다시 시도해 주세요."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g>을(를) 곧 내보냅니다."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"파일을 곧 내보냅니다."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"곧 연락처를 내보냅니다."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard 내보내기 요청이 거부되었습니다. 나중에 다시 시도해 주세요."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"연락처"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard를 로컬 임시 저장공간에 캐시하는 중입니다. 곧 가져오기가 시작됩니다."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"이름 먼저"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"성 먼저"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"새 연락처에 대한 기본 계정"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"연락처 메타데이터 동기화 [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"연락처 메타데이터 동기화"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"연락처 메타데이터 동기화 계정"</string>
     <string name="setting_about" msgid="3926137653588942297">"주소록 정보"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"설정"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"표시되는 연락처 모두 공유"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"표시되는 연락처를 공유하지 못했습니다."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"자주 사용하는 연락처 공유"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"모든 연락처 공유"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"연락처를 공유할 수 없습니다."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"주소록 가져오기/내보내기"</string>
     <string name="dialog_import" msgid="5177004290082451296">"주소록 가져오기"</string>
     <string name="share_error" msgid="665756457151793108">"연락처를 공유할 수 없습니다."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"개인정보취급방침"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"서비스 약관"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"오픈소스 라이선스"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"URL을 열지 못했습니다."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> 선택함"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> 선택 안함"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"화상 통화 걸기"</string>
diff --git a/res-common/values-ky-rKG-sw600dp/strings.xml b/res-common/values-ky-rKG-sw600dp/strings.xml
deleted file mode 100644
index 204e8e6..0000000
--- a/res-common/values-ky-rKG-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Планшет үчүн гана, шайкештирилбейт"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Экспорттоло турган байланыштар жок. Эгер байланыштар планшетиңизде болсо, айрым дайындарды камсыздоочулар байланыштарды планшеттен экспорттоого жол бербеши мүмкүн."</string>
-</resources>
diff --git a/res-common/values-ky-rKG/strings.xml b/res-common/values-ky-rKG/strings.xml
index 226df2c..7d30fdd 100644
--- a/res-common/values-ky-rKG/strings.xml
+++ b/res-common/values-ky-rKG/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Жумушчу пейжерге чалуу"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Чалуу <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS номурна чалуу"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Чалуу)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Үйгө SMS жөнөтүү"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Мобилге SMS жөнөтүү"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Жумушчу пейжерге SMS жөнөтүү"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Текст жөнөтүү <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS телефонго SMS жөнөтүү"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Билдирүү жөнөтүү)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Видео түрүндө чалуу"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Көп чалынгандар тизмеси тазалансынбы?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Байланыштар жана Телефон колдонмолорунан көп байланышкан адамдар тизмесин тазалап, даректүү жеке жөндөөлөр тууралуу билүү үчүн электрондук почта колдонмолорун иштетиңиз."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Байланыштар"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Башка"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Директорий"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Жумуш профилиндеги байланыштар китепчеси"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Жумуш боюнча маалымат китепчеси"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Бардык байланыштар"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Мен"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Изделүүдө…"</string>
@@ -85,13 +83,18 @@
     </plurals>
     <string name="description_quick_contact_for" msgid="6355240770807101947">"<xliff:g id="NAME">%1$s</xliff:g> үчүн тез байланышуу"</string>
     <string name="missing_name" msgid="2633118852693000081">"(Аты жок)"</string>
-    <string name="favoritesFrequentCalled" msgid="6600127125011757687">"Көп чалынган"</string>
-    <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Көп байланышып турган"</string>
-    <string name="description_view_contact_detail" msgid="2756753096193839285">"Байланышты карап көрүү"</string>
-    <string name="list_filter_phones" msgid="3692815632088465422">"Телефон номерлери бар бардык байланыштар"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Жумуш профилиндеги байланыштар"</string>
+    <!-- no translation found for favoritesFrequentCalled (6600127125011757687) -->
+    <skip />
+    <!-- no translation found for favoritesFrequentContacted (2849493314447751970) -->
+    <skip />
+    <!-- no translation found for description_view_contact_detail (2756753096193839285) -->
+    <!-- no translation found for description_view_contact_detail (2795575601596468581) -->
+    <skip />
+    <!-- no translation found for list_filter_phones (3692815632088465422) -->
+    <skip />
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Жумуш профилиндеги байланыштар"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Жаңыртууларды көрүү"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Телефондо гана, шайкештирилбейт"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Телефон үчүн гана, сихрондоштурулбаган"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Аты"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Каймана аты"</string>
     <string name="full_name" msgid="885420216812981202">"Аты"</string>
@@ -101,11 +104,11 @@
     <string name="name_middle" msgid="3951610314424632183">"Атасынын аты"</string>
     <string name="name_suffix" msgid="5436984808550075931">"Атынын суффикси"</string>
     <string name="name_phonetic" msgid="2249169131785620210">"Фонетикалык аты"</string>
-    <string name="name_phonetic_given" msgid="2863316331175661852">"Ысымы (транскрипция)"</string>
-    <string name="name_phonetic_middle" msgid="5970174427249235577">"Атасынын аты (транскрипция)"</string>
-    <string name="name_phonetic_family" msgid="1572398622239414464">"Фамилия (транскрипция)"</string>
+    <string name="name_phonetic_given" msgid="2863316331175661852">"Фонетикалык ысымы"</string>
+    <string name="name_phonetic_middle" msgid="5970174427249235577">"Атасынын фонетикалык аты"</string>
+    <string name="name_phonetic_family" msgid="1572398622239414464">"Фонетикалык фамилиясы"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"Телефону"</string>
-    <string name="emailLabelsGroup" msgid="4696310712601184208">"Электрондук почта"</string>
+    <string name="emailLabelsGroup" msgid="4696310712601184208">"Эмейл"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"Дареги"</string>
     <string name="imLabelsGroup" msgid="8733603247535725786">"IM"</string>
     <string name="organizationLabelsGroup" msgid="961008074745871784">"Иштеген жери"</string>
@@ -122,9 +125,9 @@
     <string name="email_home" msgid="2230967805906450693">"Үй дарегине эмейлдөө"</string>
     <string name="email_mobile" msgid="7532438378678903685">"Мобилге эмейлдөө"</string>
     <string name="email_work" msgid="7065971921227432400">"Жумушка эмейлдөө"</string>
-    <string name="email_other" msgid="4601881243553289615">"Электрондук кат жазуу"</string>
+    <string name="email_other" msgid="4601881243553289615">"Эмейл"</string>
     <string name="email_custom" msgid="5777583741581538870">"<xliff:g id="CUSTOM">%s</xliff:g> эмейл жөнөтүү"</string>
-    <string name="email" msgid="5624424151176351591">"Email"</string>
+    <string name="email" msgid="5624424151176351591">"Эмейл"</string>
     <string name="postal_street" msgid="881349814077356134">"Көчөсү"</string>
     <string name="postal_pobox" msgid="1799978742074885091">"Абонент кутусу"</string>
     <string name="postal_neighborhood" msgid="3721092668038527674">"Району"</string>
@@ -187,13 +190,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Бир же эки файл импорттолбой жатат (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> экспорттоо аяктады."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Байланыштар өткөрүлүп бүттү."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Байланыштар өткөрүлүп берилди, байланыштар менен бөлүшүү үчүн эскертмени басыңыз."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Байланыштар менен бөлүшүү үчүн таптап коюңуз."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> экспортто токтотулду."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Байланыш берилиштери экспорттолууда"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Байланыштын дайындары өткөрүлүп берилүүдө."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Сиздин байланыш берилиштериңиз <xliff:g id="FILE_NAME">%s</xliff:g> файлына экспорттолууда."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Берилиштер корунун маалыматтарын алуу мүмкүн эмес."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Экспортко жарактуу байланыштар жок. Эгер байланыштар телефонуңузда болсо, айрым берилиштер камсыздоочулары байланыштарды телефондон экспорттоого жол бербеши мүмкүн."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Экспортко жарактуу байланыштар жок. Эгер байланыштар телефонуңузда болсо, айрым берилиштер камсыздоочулары байланыштарды телефондон экспорттоого жол бербеши мүмкүн."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard түзүүчү туура эмес иштеп баштады."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Экспорттоо мүмкүн эмес"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Байланыш маалыматтары экспорттолгон жок.\nСебеби: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +208,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard импорттоо талабы четке кагылды. Кийинчерээк кайра аракеттениңиз."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> жакынкы убакытта экспорттолот."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Файл бир аздан кийин өткөрүлүп берилет."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Байланыштар жакында экспорттолот."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard экспорттоо талабы четке кагылды. Кийинчерээк кайра аракеттениңиз."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"байланыш"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(дар) жергиликтүү убактылуу жайга топтолууда. Чыныгы импорт жакында башталат."</string>
@@ -224,15 +224,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Биринчи ысымы"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Биринчи фамилиясы"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Жаңы байланыштарыңыз үчүн демейки каттоо эсеби"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Байланыш метадайындарын шайкештирүү [БЕТА ПРОГРАММАЛАРДЫ СЫНОО]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Байланыш метадайындарын шайкештирүү"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Байланыштардын метадайындарын шайкештирүүчү каттоо эсеби"</string>
     <string name="setting_about" msgid="3926137653588942297">"Байланыштар жөнүндө"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Жөндөөлөр"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Көрүнүктүү байланыштарды бөлүшүү"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Көрүнүктүү байланыштар бөлүшүлбөй койду."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Сүйүктүү байланыштарды бөлүшүү"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Бардык байланыштарды бөлүшүү"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Байланыштар бөлүшүлбөй калды."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Байланыштарды импорттоо/эскорттоо"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Байланыштарды импорттоо"</string>
     <string name="share_error" msgid="665756457151793108">"Бул байланышты бөлүшүү мүмкүн эмес."</string>
@@ -250,7 +245,7 @@
     <string name="menu_clear_frequents" msgid="8492322695770647639">"Көп чалуулар тизмесин тазалоо"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"SIM карта тандаңыз"</string>
     <string name="menu_accounts" msgid="2944004960829403994">"Каттоо эсептерин башкаруу"</string>
-    <string name="menu_import_export" msgid="6446229463809981669">"Импорттоо/экспорттоо"</string>
+    <string name="menu_import_export" msgid="6446229463809981669">"Импортоо/экспортоо"</string>
     <string name="contact_status_update_attribution" msgid="8419168578670128134">"<xliff:g id="SOURCE">%1$s</xliff:g> аркылуу"</string>
     <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g>  <xliff:g id="SOURCE">%2$s</xliff:g> аркылуу"</string>
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"издөөнү токтотуу"</string>
@@ -270,11 +265,10 @@
     </plurals>
     <string name="about_build_version" msgid="4221971683776635130">"Куралыш версиясы"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"Ачык программа уруксаттамалары"</string>
-    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Баштапкы коду ачык программанын уруксаттамасынын чоо-жайы"</string>
+    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Ачык булак программа уруксаттамасынын чоо-жайы"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"Купуялык саясаты"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Тейлөө шарттары"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Ачык программа уруксаттамалары"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url ачылбай калды."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> белгиленди"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> белгиленген жок"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Видео чалуу"</string>
diff --git a/res-common/values-lo-rLA-sw600dp/strings.xml b/res-common/values-lo-rLA-sw600dp/strings.xml
deleted file mode 100644
index 32b8cb3..0000000
--- a/res-common/values-lo-rLA-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"ແທັບເລັດເທົ່ານັ້ນ, ບໍ່ຊິ້ງຂໍ້ມູນ"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"ບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ສາມາດສົ່ງອອກໄດ້. ຫາກທ່ານມີລາຍຊື່ຜູ້ຕິດຕໍ່ໃນແທັບເລັດຂອງທ່ານ ແຕ່ບໍ່ສາມາດສົ່ງອອກໄດ້ ກໍອາດເປັນເພາະບາງຜູ້ໃຫ້ບໍລິການຂໍ້ມູນບໍ່ອະນຸຍາດໃຫ້ສົ່ງລາຍຊື່ຜູ້ຕິດຕໍ່ອອກຈາກແທັບເລັດໄດ້."</string>
-</resources>
diff --git a/res-common/values-lo-rLA/strings.xml b/res-common/values-lo-rLA/strings.xml
index 5c1591b..8f8e006 100644
--- a/res-common/values-lo-rLA/strings.xml
+++ b/res-common/values-lo-rLA/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"ໂທຫາ pager ບ່ອນເຮັດວຽກ"</string>
     <string name="call_assistant" msgid="5188990854852312696">"ໂທ​ຫາ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"ໂທຫາເບີ MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ໂທ)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"ສົ່ງຂໍ້ຄວາມຫາເບີບ້ານ"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"ສົ່ງຂໍ້ຄວາມຫາເບີມືຖື"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"ສົ່ງຂໍ້ຄວາມຫາເບີ pager ບ່ອນເຮັດວຽກ"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"ສົ່ງຂໍ້ຄວາມຫາ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"ສົ່ງຂໍ້ຄວາມຫາເບີ MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ສົ່ງຂໍ້ຄວາມ)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"​ໂທ​ອອກ​ດ້ວຍ​ວິ​ດີ​ໂອ"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"ລຶບລາຍຊື່ທີ່ຕິດຕໍ່ເລື້ອຍໆອອກ?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"ທ່ານຈະລຶບຂໍ້ມູນລາຍຊື່ທີ່ຕິດຕໍ່ຫາເລື້ອຍໆຢູ່ໃນແອັບຯລາຍ​ຊື່ ແລະໂທ​ລະ​ສັບ ພ້ອມທັງບັງຄັບໃຫ້ແອັບຯອີເມວເລີ່ມຮຽນຮູ້ຄ່າກຳນົດທີ່ຢູ່ຂອງທ່ານໃໝ່ຕັ້ງແຕ່ຕົ້ນ."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"ອື່ນໆ"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ໄດເຣັກທໍຣີ"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"ໄດເຣັກທໍຣີບ່ອນເຮັດວຽກ"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"ໄດເຣັກທໍຣີບ່ອນເຮັດວຽກ"</string>
     <string name="local_search_label" msgid="9094584931063745728">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດ"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"ຂ້ອຍ"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"ກຳລັງຊອກຫາ..."</string>
@@ -89,20 +87,20 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"ຕິດຕໍ່ຫາເລື້ອຍໆ"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"ເບິ່ງລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ລາຍຊື່ຜູ່ຕິດຕໍ່ທັງໝົດທີ່ມີເບີໂທລະສັບ"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"ລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"ລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງໂປຣໄຟລ໌ບ່ອນເຮັດວຽກ"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"ເບິ່ງອັບເດດ"</string>
-    <string name="account_phone" msgid="6104157990869081962">"ໂທລະສັບເທົ່ານັ້ນ, ບໍ່ຊິ້ງຂໍ້ມູນ"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"ໂທລະສັບເທົ່ານັ້ນ, ບໍ່ຊິ້ງຂໍ້ມູນ"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"ຊື່"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"ຊື່ຫຼິ້ນ"</string>
     <string name="full_name" msgid="885420216812981202">"ຊື່"</string>
     <string name="name_given" msgid="4153709115654909377">"ຊື່"</string>
     <string name="name_family" msgid="5317387657540738981">"ນາມສະກຸນ"</string>
     <string name="name_prefix" msgid="8219879405071462309">"ຄຳນຳໜ້າຊື່"</string>
-    <string name="name_middle" msgid="3951610314424632183">"ຊື່ຮອງ"</string>
+    <string name="name_middle" msgid="3951610314424632183">"ຊື່ກາງ"</string>
     <string name="name_suffix" msgid="5436984808550075931">"ຄຳຕໍ່ທ້າຍຊື່"</string>
     <string name="name_phonetic" msgid="2249169131785620210">"ການອອກສຽງຊື່"</string>
     <string name="name_phonetic_given" msgid="2863316331175661852">"ການ​ອອກ​ສຽງ​​ຊື່"</string>
-    <string name="name_phonetic_middle" msgid="5970174427249235577">"ການອອກສຽງຊື່ຮອງ"</string>
+    <string name="name_phonetic_middle" msgid="5970174427249235577">"ການອອກສຽງຊື່ກາງ"</string>
     <string name="name_phonetic_family" msgid="1572398622239414464">"ການ​ອອກ​ສຽງ​ນາມ​ສະ​ກຸນ​​​"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"ໂທລະສັບ"</string>
     <string name="emailLabelsGroup" msgid="4696310712601184208">"ອີເມວ"</string>
@@ -176,7 +174,7 @@
     <string name="fail_reason_could_not_open_file" msgid="7041148341788958325">"ບໍ່ສາມາດເປີດ \"<xliff:g id="FILE_NAME">%s</xliff:g>\" ໄດ້: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="1231982631020480035">"ບໍ່ສາມາດເລີ່ມໂປຣແກຣມສົ່ງອອກໄດ້: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_no_exportable_contact" msgid="3717046989062541369">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ສາມາດສົ່ງອອກໄດ້."</string>
-    <string name="missing_required_permission" msgid="3120850759881656369">"ທ່ານປິດການນຳໃຊ້ສິດອະນຸຍາດທີ່ຈຳເປັນໄວ້ແລ້ວ."</string>
+    <string name="missing_required_permission" msgid="3120850759881656369">"ທ່ານ​ປິດ​ໃຊ້​ງານ​ການ​ອະ​ນຸ​ຍາດ​ທີ່​ຕ້ອງ​ການ​ແລ້ວ."</string>
     <string name="fail_reason_error_occurred_during_export" msgid="8426833603664168716">"ເກີດຄວາມຜິດພາດໃນລະຫວ່າງການສົ່ງອອກ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_too_long_filename" msgid="3996610741248972232">"ຊື່ໄຟລ໌ທີ່ຕ້ອງການຍາວເກີນໄປ (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
     <string name="fail_reason_io_error" msgid="7736686553669161933">"I/O ຜິດພາດ"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ມີໄຟລ໌ນຶ່ງ ຫຼືຫຼາຍກວ່ານັ້ນບໍ່ສາມາດນຳເຂົ້າໄດ້ (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"ສິ້ນສຸດການສົ່ງອອກແລ້ວ <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"ສຳ​ເລັດ​ການ​ສົ່ງ​ອອກລາຍ​ຊື່​ອ​ແລ້ວ."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"ເມື່ອສຳເລັດການສົ່ງອອກລາຍຊື່ຜູ້ຕິດຕໍ່ແລ້ວ, ໃຫ້ຄລິກການແຈ້ງເຕືອນເພື່ອແບ່ງປັນລາຍຊື່ຜູ້ຕິດຕໍ່."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"ແຕະເພື່ອແບ່ງປັນລາຍຊື່ຜູ້ຕິດຕໍ່."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"ການສົ່ງອອກ <xliff:g id="FILENAME">%s</xliff:g> ຖືກຍົກເລີກແລ້ວ."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"ກຳລັງສົ່ງອອກຂໍ້ມູນລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"ຂໍ້ມູນລາຍຊື່ຜູ້ຕິດຕໍ່ກຳລັງຖືກສົ່ງອອກ."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"ຂໍ້ມູນລາຍຊື່ລາຍຊື່ຜູ່ຕິດຕໍ່ຂອງທ່ານ ກຳລັງຖືກສົ່ງອອກເປັນ: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ບໍ່ສາມາດດຶງຂໍ້ມູນຖານຂໍ້ມູນໄດ້."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ສາມາດສົ່ງອອກໄດ້. ຫາກທ່ານມີລາຍຊື່ຜູ່ຕິດຕໍ່ໃນໂທລະສັບຂອງທ່ານ ແຕ່ບໍ່ສາມາດສົ່ງອອກໄດ້ ກໍອາດເປັນເພາະບາງຜູ່ໃຫ້ບໍລິການຂໍ້ມູນບໍ່ອະນຸຍາດ ໃຫ້ສົ່ງລາຍຊື່ຜູ່ຕິດຕໍ່ອອກຈາກໂທລະສັບໄດ້."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ສາມາດສົ່ງອອກໄດ້. ຫາກທ່ານມີລາຍຊື່ຜູ່ຕິດຕໍ່ໃນໂທລະສັບຂອງທ່ານ ແຕ່ບໍ່ສາມາດສົ່ງອອກໄດ້ ກໍອາດເປັນເພາະບາງຜູ່ໃຫ້ບໍລິການຂໍ້ມູນບໍ່ອະນຸຍາດ ໃຫ້ສົ່ງລາຍຊື່ຜູ່ຕິດຕໍ່ອອກຈາກໂທລະສັບໄດ້."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"ໂປຣແກຣມຂຽນ vCard ຖືກເລີ່ມຢ່າງບໍ່ຖືກຕ້ອງ."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"ບໍ່ສາມາດສົ່ງອອກໄດ້"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"ຂໍ້ມູນລາຍຊື່ຜູ່ຕິດຕໍ່ຍັງບໍ່ໄດ້ຖືກສົ່ງອອກເທື່ອ.\nເຫດຜົນ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"ການຮ້ອງຂໍການນຳເຂົ້າ vCard​ ຖືກປະຕິເສດ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> ຈະຖືກສົ່ງອອກໃນໄວໆນີ້."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ໄຟ​ລ໌​ຈະ​ຖືກ​ສົ່ງ​ອອກ​ໄວໆ​ນີ້."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"ລາຍຊື່ຜູ້ຕິດຕໍ່ຈະຖືກສົ່ງອອກໃນໄວໆນີ້."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"ຄຳຂໍການສົ່ງອອກ vCard ຖືກປະຕິເສດ. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"ກຳລັງເກັບຂໍ້ມູນ vCard ໃສ່ບ່ອນຈັດເກັບຂໍ້ມູນຊົ່ວຄາວໃນອຸປະກອນ. ການນຳເຂົ້າຈະເລີ່ມຂຶ້ນໃນໄວໆນີ້."</string>
@@ -224,24 +219,19 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"​ຊື່​ກ່ອນ"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"​ນາມ​ສະ​ກຸນ​ກ່ອນ"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"ບັນ​ຊີ​ເລີ່ມຕົ້ນ​ສຳ​ລັບ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ໃໝ່"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"ຊິ້ງຂໍ້ມູນເມຕາເດຕາຂອງລາຍຊື່ຜູ້ຕິດຕໍ່ [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"ຊິ້ງຂໍ້ມູນເມຕາເດຕາຂອງລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="setting_about" msgid="3926137653588942297">"ກ່ຽວກັບລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"ການຕັ້ງຄ່າ"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"ຕິດຕໍ່ບັນຊີຊິ້ງຂໍ້ມູນເມຕາ"</string>
+    <string name="setting_about" msgid="3926137653588942297">"ກ່ຽວ​ກັບ​ລາຍ​ຊື່​ຕິດ​ຕໍ່"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"ແບ່ງປັນລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ເບິ່ງເຫັນໄດ້"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"ແບ່ງ​ປັນ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ສາ​ມາດ​ເຫັນ​ໄດ້​ບໍ່​ສຳ​ເລັດ."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"ແບ່ງປັນລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ມັກ"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"ແບ່ງປັນທຸກລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"ແບ່ງປັນລາຍຊື່ຜູ້ຕິດຕໍ່ບໍ່ສຳເລັດ."</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"ນຳເຂົ້າ/ສົ່ງອອກ ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"ນຳເຂົ້າ/ສົ່ງອອກ ລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
     <string name="dialog_import" msgid="5177004290082451296">"ນຳເຂົ້າລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
     <string name="share_error" msgid="665756457151793108">"ບໍ່ສາມາດແບ່ງປັນລາຍຊື່ລາຍຊື່ຜູ່ຕິດຕໍ່ນີ້ໄດ້."</string>
-    <string name="no_contact_to_share" msgid="5749367538191552509">"ບໍ່ມີລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຈະແບ່ງປັນ."</string>
+    <string name="no_contact_to_share" msgid="5749367538191552509">"ບໍ່​ມີ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ທີ່​ຈະ​ໂທ."</string>
     <string name="menu_search" msgid="7464453023659824700">"ຊອກຫາ"</string>
-    <string name="menu_contacts_filter" msgid="586356478145511794">"ລາຍຊື່ຜູ້ຕິດຕໍ່ເພື່ອສະແດງ"</string>
-    <string name="activity_title_contacts_filter" msgid="7689519428197855166">"ລາຍຊື່ຜູ້ຕິດຕໍ່ເພື່ອສະແດງ"</string>
+    <string name="menu_contacts_filter" msgid="586356478145511794">"ລາຍຊື່ຜູ່ຕິດຕໍ່ເພື່ອສະແດງ"</string>
+    <string name="activity_title_contacts_filter" msgid="7689519428197855166">"ລາຍຊື່ຜູ່ຕິດຕໍ່ເພື່ອສະແດງ"</string>
     <string name="custom_list_filter" msgid="582616656313514803">"ກຳນົດມຸມມອງເອງ"</string>
-    <string name="hint_findContacts" msgid="28151707326753522">"ຊອກຫາລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
+    <string name="hint_findContacts" msgid="28151707326753522">"ຊອກຫາລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"ລາຍການທີ່ມັກ"</string>
     <string name="listTotalAllContactsZero" msgid="6041341919823872732">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່."</string>
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"ບໍ່ມີລາຍຊື່ຜູ່ຕິດຕໍ່ທີ່ເບິ່ງເຫັນໄດ້."</string>
@@ -268,13 +258,12 @@
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ລາຍ​ການ​ບໍ່​ທັນ​ໄດ້​ອ່ານ. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> ​ລາຍ​ການ​ບໍ່​ທັນ​ໄດ້​ອ່ານ. </item>
     </plurals>
-    <string name="about_build_version" msgid="4221971683776635130">"ເວີຊັນທີ່ສ້າງ"</string>
-    <string name="about_open_source_licenses" msgid="3224958101863814649">"ລິຂະສິດໂອເພນຊອດ"</string>
+    <string name="about_build_version" msgid="4221971683776635130">"ລຸ້ນທີ່ສ້າງ"</string>
+    <string name="about_open_source_licenses" msgid="3224958101863814649">"ໃບອະນຸຍາດແຫຼ່ງເປີດ"</string>
     <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ລາຍລະອຽດໃບອະນຸຍາດຂອງຊອບແວແຫຼ່ງເປີດ"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"​ນະ​ໂຍ​ບາຍ​ຄວາມ​ເປັນ​ສ່ວນຕົວ"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"​ເງື່ອນ​ໄຂ​ການ​ໃຫ້​ບໍ​ລິ​ການ"</string>
-    <string name="activity_title_licenses" msgid="7812517458691564230">"ລິຂະສິດໂອເພນຊອດ"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"ເປີດ URL ລົ້ມເຫລວ."</string>
+    <string name="activity_title_licenses" msgid="7812517458691564230">"ໃບອະນຸຍາດແຫຼ່ງເປີດ"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ຖືກ​ໝາຍ​ແລ້ວ"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ບໍ່​ໄດ້​ໝາຍ​ແລ້ວ"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"ເຮັດການໂທວິດີໂອ"</string>
diff --git a/res-common/values-lt-sw600dp/strings.xml b/res-common/values-lt-sw600dp/strings.xml
deleted file mode 100644
index 79b9d18..0000000
--- a/res-common/values-lt-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tik planšetinis kompiuteris, nesinchronizuojama"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Nėra eksportuojamų kontaktų. Jei planšetiniame kompiuteryje yra kontaktų, kai kurie duomenų paslaugų teikėjai gali neleisti eksportuoti kontaktų iš planšetinio kompiuterio."</string>
-</resources>
diff --git a/res-common/values-lt/strings.xml b/res-common/values-lt/strings.xml
index 224fb82..3cd4cd7 100644
--- a/res-common/values-lt/strings.xml
+++ b/res-common/values-lt/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Skambinti darbo pranešimų gaviklio numeriu"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Skambinti <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Skambinti MMS telefono numeriu"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (skambutis)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Siųsti teksto pranešimą <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Siųsti teksto pranešimą namų telefono numeriu"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Siųsti teksto pranešimą mobiliojo telefono numeriu"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Siųsti teksto pranešimą darbo pranešimų gaviklio numeriu"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Siųsti teksto pranešimą <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Siųsti MMS telefono numeriu"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (pranešimas)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Atlikti vaizdo skambutį"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Išvalyti dažniausius kontaktus?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Išvalysite dažniausių kontaktų sąrašą Kontaktų ir Telefono programose, o el. pašto programoms reikės iš naujo gauti adresavimo nuostatas."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontaktai"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Kitas"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Katalogas"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Darbo katalogas"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Darbo katalogas"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Visi kontaktai"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Aš"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Ieškoma…"</string>
@@ -91,12 +89,12 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Dažniausiai susisiekta"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Peržiūrėti kontaktą"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Visi kontaktai su telefonų numeriais"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Darbo profilio kontaktai"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Darbo profilio kontaktai"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Peržiūrėti naujinius"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Tik telefonas, nesinchronizuojama"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Tik telefonas, nesinchronizuojama"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Pavadinimas"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Slapyvardis"</string>
-    <string name="full_name" msgid="885420216812981202">"Vardas"</string>
+    <string name="full_name" msgid="885420216812981202">"Pavadinimas"</string>
     <string name="name_given" msgid="4153709115654909377">"Vardas"</string>
     <string name="name_family" msgid="5317387657540738981">"Pavardė"</string>
     <string name="name_prefix" msgid="8219879405071462309">"Priešvardis"</string>
@@ -189,13 +187,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Nepavyko importuoti vieno ar daugiau failų (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Baigta eksportuoti „<xliff:g id="FILENAME">%s</xliff:g>“."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Baigta eksportuoti kontaktus."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontaktai baigti eksportuoti. Spustelėkite pranešimą ir bendrinkite kontaktus."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Palieskite, kad bendrintumėte kontaktus."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"„<xliff:g id="FILENAME">%s</xliff:g>“ eksportavimas atšauktas."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Eksportuojami kontaktų duomenys"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontaktų duomenys eksportuojami."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Kontaktų duomenys eksportuojami į: „<xliff:g id="FILE_NAME">%s</xliff:g>“."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Nepavyko gauti duomenų informacijos."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Nėra eksportuojamų kontaktų. Jei telefone yra kontaktų, kai kurie duomenų paslaugų teikėjai gali neleisti eksportuoti kontaktų iš telefono."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Nėra eksportuojamų kontaktų. Jei telefone yra kontaktų, kai kurie duomenų paslaugų teikėjai gali neleisti eksportuoti kontaktų iš telefono."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"El. vizitinių kortelių rengyklė nebuvo tinkamai paleista."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Nepavyko eksportuoti"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Kontakto duomenys nebuvo eksportuoti.\nPriežastis: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"El. vizitinės kortelės importavimo užklausa atmesta. Vėliau bandykite dar kartą."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"„<xliff:g id="FILENAME">%s</xliff:g>“ bus netrukus eksportuotas."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Failas bus eksportuotas netrukus."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Netrukus kontaktai bus eksportuoti."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"El. vizitinės kortelės eksportavimo užklausa buvo atmesta. Vėliau bandykite dar kartą."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontaktas"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"El. vizitinė (-ės) kortelė (-ės) padedama (-os) į vietinę laikinąją saugyklą. Netrukus bus pradėtas tikrasis importavimas."</string>
@@ -226,16 +221,11 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Pirmiausia vardas"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Pirmiausia pavardė"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Numatytoji naujų kontaktų paskyra"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sinchronizuoti kontaktų metaduomenis [NEGALUTINĖ VERSIJA]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Kontaktų metaduomenų sinchronizavimas"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kontaktų metaduomenų sinchronizavimo paskyra"</string>
     <string name="setting_about" msgid="3926137653588942297">"Apie Kontaktus"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Nustatymai"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Bendrinti matomus kontaktus"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Nepavyko bendrinti matomų kontaktų."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Bendrinti mėgstamiausius kontaktus"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Bendrinti visus kontaktus"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Nepavyko bendrinti kontaktų."</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"Kontaktų importavimas / eksportavimas"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"Importuoti / eksportuoti kontaktus"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importuoti kontaktus"</string>
     <string name="share_error" msgid="665756457151793108">"Šio kontakto negalima bendrinti."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"Nėra bendrintinų kontaktų."</string>
@@ -278,7 +268,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Privatumo politika"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Paslaugų teikimo sąlygos"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Atvirojo šaltinio licencijos"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Nepavyko atidaryti URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> pažymėta"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> nepažymėta"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Atlikti vaizdo skambutį"</string>
diff --git a/res-common/values-lv-sw600dp/strings.xml b/res-common/values-lv-sw600dp/strings.xml
deleted file mode 100644
index 6d7834f..0000000
--- a/res-common/values-lv-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tikai planšetdatorā, bez sinhronizācijas"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Nav eksportējamu kontaktpersonu datu. Ja jūsu planšetdatorā ir saglabāta kontaktpersonu informācija, iespējams, jūsu datu pakalpojumu sniedzējs neļauj eksportēt kontaktpersonu datus no planšetdatora."</string>
-</resources>
diff --git a/res-common/values-lv/strings.xml b/res-common/values-lv/strings.xml
index 2ae99a9..58d02f7 100644
--- a/res-common/values-lv/strings.xml
+++ b/res-common/values-lv/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Zvanīt uz darba peidžeri"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Zvanīt: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Zvanīt uz multiziņas numuru"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (zvanīt)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Sūtīt īsziņu: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Sūtīt īsziņu uz mājas tālruņa numuru"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Sūtīt īsziņu uz mobilo tālruni"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Sūtīt īsziņu uz darba peidžeri"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Sūtīt īsziņu: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Sūtīt multiziņu"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (sūtīt īsziņu)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Veikt videozvanu"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Vai dzēst bieži lietotos kontaktus?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Tiks dzēsts bieži lietoto kontaktpersonu saraksts lietotnēs Kontaktpersonas un Tālrunis, un e-pasta lietotnēs no jauna tiks sākta adrešu preferenču saglabāšana."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontaktpersonas"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Cits"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Katalogs"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Darba katalogs"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Darba katalogs"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Visas kontaktpersonas"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Es"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Notiek meklēšana…"</string>
@@ -90,9 +88,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Personas, ar kurām bieži sazināties"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Skatīt kontaktpersonu"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Visas kontaktpersonas ar tālruņa numuriem"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Kontaktpersonas darba profilā"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kontaktpersonas darba profilā"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Skatīt atjauninājumus"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Tikai tālrunī, bez sinhronizācijas"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Tikai tālrunī, bez sinhronizācijas"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Vārds un uzvārds"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Segvārds"</string>
     <string name="full_name" msgid="885420216812981202">"Vārds un uzvārds"</string>
@@ -188,13 +186,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Nevarēja importēt vienu vai vairākus failus (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Faila <xliff:g id="FILENAME">%s</xliff:g> eksportēšana pabeigta"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Kontaktpersonu eksportēšana ir pabeigta."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontaktpersonu eksportēšana ir pabeigta. Lai kopīgotu kontaktpersonas, noklikšķiniet uz paziņojuma."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Pieskarieties, lai kopīgotu kontaktpersonas."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Faila <xliff:g id="FILENAME">%s</xliff:g> eksportēšana atcelta"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Kontaktpersonu datu eksportēšana"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontaktpersonu dati tiek eksportēti."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Kontaktpersonas dati tiek eksportēti uz failu <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Nevarēja iegūt informāciju no datu bāzes."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Nav nevienas eksportējamas kontaktpersonas. Ja jūsu tālrunī ir saglabātas kontaktpersonas, iespējams, jūsu datu pakalpojumu sniedzējs neļauj eksportēt kontaktpersonas no tālruņa."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Nav nevienas eksportējamas kontaktpersonas. Ja jūsu tālrunī ir saglabātas kontaktpersonas, iespējams, jūsu datu pakalpojumu sniedzējs neļauj eksportēt kontaktpersonas no tālruņa."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard veidotājs netika pareizi startēts."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Nevarēja eksportēt"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Kontaktpersonas dati netika eksportēti.\nIemesls: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
@@ -208,7 +204,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Tika noraidīts vCard faila importēšanas pieprasījums. Vēlāk mēģiniet vēlreiz."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Fails <xliff:g id="FILENAME">%s</xliff:g> drīzumā tiks eksportēts."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Fails drīzumā tiks eksportēts."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontaktpersonas drīzumā tiks eksportētas."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Tika noraidīts vCard faila eksportēšanas pieprasījums. Vēlāk mēģiniet vēlreiz."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontaktpersona"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Notiek vCard failu saglabāšana vietējā pagaidu kešatmiņā. Importēšana tiks sākta pēc neilga brīža."</string>
@@ -225,15 +220,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Vispirms rādīt vārdu"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Vispirms rādīt uzvārdu"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Noklusējuma konts jaunām kontaktpersonām"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sinhronizēt kontaktpersonu metadatus [IZSTRĀDES PROGRAMMATŪRA]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Kontaktpersonu metadatu sinhronizācija"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kontaktpersonu metadatu sinhronizācijas konts"</string>
     <string name="setting_about" msgid="3926137653588942297">"Par lietotni Kontaktpersonas"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Iestatījumi"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Kopīgot redzamo kontaktpersonu datus"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Neizdevās kopīgot redzamās kontaktpersonas."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Kopīgot izlases kontaktpersonas"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Kopīgot visas kontaktpersonas"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Neizdevās kopīgot kontaktpersonas."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Kontaktpersonu importēšana/eksportēšana"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Kontaktpersonu datu importēšana"</string>
     <string name="share_error" msgid="665756457151793108">"Šīs kontaktpersonas datus nevar kopīgot."</string>
@@ -276,7 +266,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Konfidencialitātes politika"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Pakalpojumu sniegšanas noteikumi"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Atklātā pirmkoda licences"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Neizdevās atvērt URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> atzīmēts"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> nav atzīmēts"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Sākt videozvanu"</string>
diff --git a/res-common/values-mk-rMK-sw600dp/strings.xml b/res-common/values-mk-rMK-sw600dp/strings.xml
deleted file mode 100644
index 7655ff0..0000000
--- a/res-common/values-mk-rMK-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Само таблет, несинхронизиран"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Нема контакти што може да се извезат. Ако имате контакти на вашиот таблет, некои даватели на податоци може да не дозволат контактите да се извезуваат од таблетот."</string>
-</resources>
diff --git a/res-common/values-mk-rMK/strings.xml b/res-common/values-mk-rMK/strings.xml
index 200002c..a0ce63a 100644
--- a/res-common/values-mk-rMK/strings.xml
+++ b/res-common/values-mk-rMK/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Повикај пејџер на работа"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Повикај <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Повикај MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Повик)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Испрати текстуална порака на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Испрати текстуална порака дома"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Испрати текстуална порака на мобилен"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Испрати текстуална порака на пејџер на работа"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Испрати текстуална порака на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Испрати текстуална порака на MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Порака)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Остварете видеоповик"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Исчисти често контактирани?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Ќе го исчистите списокот на често контактирани лица во апликациите „Контакти“ и „Телефон“ и ќе ги принудите апликациите на е-пошта одново да ги дознаат вашите параметри на обраќање."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Контакти"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Друг"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Адресар"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Работен директориум"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Работен директориум"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Сите контакти"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Јас"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Се пребарува..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Често контактирани"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Прикажи контакт"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Сите контакти со телефонски броеви"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Контакти на Работниот профил"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Контакти на работниот профил"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Прикажи ажурирања"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Само на телефон, несинхронизиран"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Само телефон, несинхрнизиран"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Име"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Прекар"</string>
     <string name="full_name" msgid="885420216812981202">"Име"</string>
@@ -116,7 +114,7 @@
     <string name="ghostData_company" msgid="22470841482615409">"Компанија"</string>
     <string name="ghostData_title" msgid="6221293237772204604">"Име"</string>
     <string name="label_notes" msgid="3997277594846722699">"Белешки"</string>
-    <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
+    <string name="label_sip_address" msgid="3754551597798479318">"СИП"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"Веб-сајт"</string>
     <string name="groupsLabel" msgid="3574316547053047551">"Групи"</string>
     <string name="email_home" msgid="2230967805906450693">"Домашна е-пошта"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Една или повеќе датотеки не можеа да се увезат (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Заврши извезувањето на <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Извозот на контакти заврши."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Извозот на контакти заврши, кликнете на известувањето за да ги споделите контактите."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Допрете за да ги споделите контактите."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Извезувањето на <xliff:g id="FILENAME">%s</xliff:g> е откажано."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Извезување податоци за контакт"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Податоците за контакт се извезуваат."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Вашите податоци за контакт се извезуваат во: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Не можеше да добие информации за базата на податоци."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Нема контакти што може да се извезат. Ако имате контакти на вашиот телефон, некои даватели на податоци може да не дозволат контактите да се извезуваат од телефонот."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Нема контакти што може да се извезат. Ако имате контакти на вашиот телефон, некои даватели на податоци може да не дозволат контактите да се извезуваат од телефонот."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Композиторот на визит картичката не започна правилно."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Не можеа да се извезат"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Податоците за контакт не се извезоа.\nПричина: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Барањето за увезување визит картичка беше одбиено. Обидете се повторно подоцна."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> ќе се извезе наскоро."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Датотеката ќе се извезе наскоро."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Контактите ќе се извезат наскоро."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Барањето за извезување визит картичка беше одбиено. Обидете се повторно подоцна."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Кеширање визит картичка(и) во локална привремена меморија. Реалниот увоз ќе започне наскоро."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Прво името"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Прво презимето"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Стандардна сметка за новите контакти"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Синхронизација на метаподатоци за контакт [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Синхронизација на метаподатоци за контакт"</string>
-    <string name="setting_about" msgid="3926137653588942297">"За Контакти"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Поставки"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Сметка за синхронизација на метаподатоците на контактот"</string>
+    <string name="setting_about" msgid="3926137653588942297">"За контактите"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Сподели видливи контакти"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Не успеаја да се споделат видливите контакти."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Сподели ги омилените контакти"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Сподели ги сите контакти"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Не успеа да се споделат контактите."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Увези/извези контакти"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Увези контакти"</string>
     <string name="share_error" msgid="665756457151793108">"Овој контакт не може да се сподели."</string>
@@ -268,13 +258,12 @@
       <item quantity="one"><xliff:g id="TITLE_2">%1$s</xliff:g> <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитана ставка. </item>
       <item quantity="other"><xliff:g id="TITLE_2">%1$s</xliff:g> <xliff:g id="COUNT_3">%2$d</xliff:g> непрочитани ставки. </item>
     </plurals>
-    <string name="about_build_version" msgid="4221971683776635130">"Верзија"</string>
+    <string name="about_build_version" msgid="4221971683776635130">"Вградена верзија"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"Лиценци за софтвер со отворен код"</string>
     <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Детали за лиценците за софтвер со отворен код"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"Политика за приватност"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Услови на користење"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Лиценци за софтвер со отворен код"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Врската не успеа да се отвори."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> е штиклирано"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> не е штиклирано"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Воспостави видеоповик"</string>
diff --git a/res-common/values-ml-rIN-sw600dp/strings.xml b/res-common/values-ml-rIN-sw600dp/strings.xml
deleted file mode 100644
index 2b65025..0000000
--- a/res-common/values-ml-rIN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"ടാബ്‌ലെറ്റിൽ മാത്രമുള്ളത്, സമന്വയിപ്പിക്കില്ല"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"എക്‌സ്‌പോർട്ടുചെയ്യാനാകുന്ന കോൺടാക്റ്റുകളൊന്നുമില്ല. നിങ്ങളുടെ ടാബ്‌ലെറ്റിൽ കോൺടാക്റ്റുകളുണ്ടെങ്കിൽ, ടാബ്‌ലെറ്റിൽ നിന്നും കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യാൻ ചില സേവന ദാതാക്കൾ അനുവദിക്കാനിടയില്ല."</string>
-</resources>
diff --git a/res-common/values-ml-rIN/strings.xml b/res-common/values-ml-rIN/strings.xml
index 6112f50..ad75d73 100644
--- a/res-common/values-ml-rIN/strings.xml
+++ b/res-common/values-ml-rIN/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"ഔദ്യോഗിക പേജറിലേക്ക് വിളിക്കുക"</string>
     <string name="call_assistant" msgid="5188990854852312696">"വിളിക്കുക <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS ഫോണിലേക്ക് വിളിക്കുക"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (വിളിക്കുക)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> എന്നതിലേക്ക് വാചക സന്ദേശമയയ്‌ക്കുക"</string>
     <string name="sms_home" msgid="7765831490534280540">"വീട്ടിലെ ഫോണിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"മൊബൈലിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"ഔദ്യോഗിക പേജറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> എന്നതിലേക്ക് വാചക സന്ദേശമയയ്‌ക്കുക"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS നമ്പറിലേക്ക് വാചകസന്ദേശമയയ്‌ക്കുക"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (സന്ദേശം)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"വീഡിയോ കോൾ ചെയ്യുക"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കണോ?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"നിങ്ങൾ കോൺടാക്‌റ്റുകളുടെയും ഫോണിന്റെയും അപ്ലിക്കേഷനുകളിലെ പതിവായി കോൺടാക്റ്റുചെയ്യുന്നവരുടെ ലിസ്റ്റ് മായ്‌ക്കുകയും സ്‌ക്രാച്ചിൽ നിന്നും ബന്ധപ്പെടൽ മുൻഗണനകൾ അറിയാൻ ഇമെയിൽ അപ്ലിക്കേഷനുകളെ പ്രേരിപ്പിക്കുകയും ചെയ്യും."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"വിലാസങ്ങൾ"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"മറ്റുള്ളവ"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ഡയറക്‌ടറി"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"ഔദ്യോഗിക ഡയറക്‌ടറി"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"ഔദ്യോഗിക ഡയറക്ടറി"</string>
     <string name="local_search_label" msgid="9094584931063745728">"എല്ലാ കോൺടാക്റ്റുകളും"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"ഞാന്‍"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"തിരയുന്നു…"</string>
@@ -86,22 +84,22 @@
     <string name="description_quick_contact_for" msgid="6355240770807101947">"<xliff:g id="NAME">%1$s</xliff:g> എന്നയാളുടെ ദ്രുത കോൺടാക്റ്റ്"</string>
     <string name="missing_name" msgid="2633118852693000081">"(പേരില്ല)"</string>
     <string name="favoritesFrequentCalled" msgid="6600127125011757687">"പതിവായി വിളിച്ചവർ"</string>
-    <string name="favoritesFrequentContacted" msgid="2849493314447751970">"പതിവ് കോൺടാക്റ്റുകൾ"</string>
+    <string name="favoritesFrequentContacted" msgid="2849493314447751970">"പതിവായി കോൺടാക്റ്റുചെയ്യുന്നവർ"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"കോൺടാക്റ്റ് കാണുക"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ഫോൺ നമ്പറുകളുള്ള എല്ലാ കോൺടാക്റ്റുകളും"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"ഔദ്യോഗിക പ്രൊഫൈൽ കോൺടാക്റ്റുകൾ"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"ഔദ്യോഗിക പ്രൊഫൈൽ കോണ്‍‌ടാക്റ്റുകള്‍‌"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"അപ്‌ഡേറ്റുകള്‍ കാണുക"</string>
-    <string name="account_phone" msgid="6104157990869081962">"ഫോണിൽ മാത്രം, സമന്വയിപ്പിക്കാത്ത"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"ഫോണിൽ മാത്രം, സമന്വയിപ്പിക്കില്ല"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"പേര്"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"വിളിപ്പേര്"</string>
     <string name="full_name" msgid="885420216812981202">"പേര്"</string>
-    <string name="name_given" msgid="4153709115654909377">"ഫസ്റ്റ് നെയിം"</string>
-    <string name="name_family" msgid="5317387657540738981">"ലാസ്റ്റ് നെയിം"</string>
+    <string name="name_given" msgid="4153709115654909377">"പേരിന്‍റെ ആദ്യഭാഗം"</string>
+    <string name="name_family" msgid="5317387657540738981">"പേരിന്റെ അവസാനഭാഗം"</string>
     <string name="name_prefix" msgid="8219879405071462309">"പേര് പ്രിഫിക്‌സ്"</string>
     <string name="name_middle" msgid="3951610314424632183">"പേരിന്റെ മധ്യഭാഗം"</string>
     <string name="name_suffix" msgid="5436984808550075931">"പേര് സഫിക്‌സ്"</string>
     <string name="name_phonetic" msgid="2249169131785620210">"ഉച്ചാരണപ്രകാരമുള്ള പേര്"</string>
-    <string name="name_phonetic_given" msgid="2863316331175661852">"ഫസ്റ്റ് നെയിം"</string>
+    <string name="name_phonetic_given" msgid="2863316331175661852">"പേരിന്റെ ആദ്യ ഭാഗം"</string>
     <string name="name_phonetic_middle" msgid="5970174427249235577">"പേരിന്റെ മധ്യഭാഗം"</string>
     <string name="name_phonetic_family" msgid="1572398622239414464">"പേരിന്റെ അവസാന ഭാഗം"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"ഫോണ്‍"</string>
@@ -114,7 +112,7 @@
     <string name="sms" msgid="8086289395154598654">"വാചക സന്ദേശം"</string>
     <string name="postal_address" msgid="7692926530081579786">"വിലാസം"</string>
     <string name="ghostData_company" msgid="22470841482615409">"കമ്പനി"</string>
-    <string name="ghostData_title" msgid="6221293237772204604">"ജോലി"</string>
+    <string name="ghostData_title" msgid="6221293237772204604">"ശീര്‍ഷകം"</string>
     <string name="label_notes" msgid="3997277594846722699">"കുറിപ്പുകള്‍"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"വെബ്‌സൈറ്റ്"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ഒന്നോ അതിലധികമോ ഫയലുകൾ ഇമ്പോർട്ടുചെയ്യാനായില്ല (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യൽ പൂർത്തിയായി, കോൺടാക്റ്റുകൾ പങ്കിടുന്നതിന് അറിയിപ്പിൽ ക്ലിക്കുചെയ്യുക."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"കോൺടാക്റ്റുകൾ പങ്കിടാൻ ടാപ്പുചെയ്യുക."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> എക്‌സ്‌പോർട്ടുചെയ്യൽ റദ്ദാക്കി."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"കോൺടാക്റ്റ് ഡാറ്റ എക്‌സ്‌പോർട്ടുചെയ്യുന്നു"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"കോൺടാക്റ്റ് ഡാറ്റ എക്സ്പോർട്ടുചെയ്യുകയാണ്."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"നിങ്ങളുടെ കോൺടാക്റ്റ് ഡാറ്റ ഇതിലേക്ക് എക്‌സ്‌പോർട്ടുചെയ്യുന്നു: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ഡാറ്റാബേസ് വിവരം നേടാനായില്ല."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"എക്‌സ്‌പോർട്ടുചെയ്യാനാകുന്ന കോൺടാക്റ്റുകളൊന്നുമില്ല. നിങ്ങളുടെ ഫോണിൽ കോൺടാക്റ്റുകളുണ്ടെങ്കിൽ, ഫോണിൽ നിന്നും കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യാൻ ചില സേവന ദാതാക്കൾ അനുവദിക്കാനിടയില്ല."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"എക്‌സ്‌പോർട്ടുചെയ്യാനാകുന്ന കോൺടാക്റ്റുകളൊന്നുമില്ല. നിങ്ങളുടെ ഫോണിൽ കോൺടാക്റ്റുകളുണ്ടെങ്കിൽ, ഫോണിൽ നിന്നും കോൺടാക്റ്റുകൾ എക്‌സ്‌പോർട്ടുചെയ്യാൻ ചില സേവന ദാതാക്കൾ അനുവദിക്കാനിടയില്ല."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard കമ്പോസർ ശരിയായി ആരംഭിച്ചില്ല."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"എക്‌സ്‌പോർട്ടുചെയ്യാനായില്ല"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"കോൺടാക്റ്റ് ഡാറ്റ എക്‌സ്‌പോർട്ടുചെയ്‌തില്ല.\nകാരണം: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard ഇമ്പോർട്ടുചെയ്യൽ അഭ്യർത്ഥന നിരസിച്ചു. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> എന്നത് ഉടൻ എക്‌സ്‌പോർട്ടുചെയ്യും."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ഫയൽ ഉടൻ എക്സ്പോർട്ടുചെയ്യും."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"കോൺടാക്റ്റുകൾ താമസിയാതെ എക്സ്പോർട്ടുചെയ്യും."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard എക്‌സ്‌പോർട്ടുചെയ്യൽ അഭ്യർത്ഥന നിരസിച്ചു. പിന്നീട് വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"കോൺടാക്റ്റ്"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"പ്രാദേശിക താൽക്കാലിക സംഭരണത്തിലേക്ക് vCard (vCard-കൾ) കാഷെ ചെയ്യുന്നു. യഥാർത്ഥ ഇമ്പോർട്ടുചെയ്യൽ ഉടൻ ആരംഭിക്കും."</string>
@@ -218,21 +213,16 @@
     <string name="progress_notifier_message" msgid="359931715339778107">"<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="4142192068495589925">".vcf ഫയലിലേക്ക് എക്സ്പോർട്ട് ചെയ്യൂ"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"ഇതുപ്രകാരം അടുക്കുക"</string>
-    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"ഫസ്റ്റ് നെയിം"</string>
-    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"ലാസ്റ്റ് നെയിം"</string>
+    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"പേരിന്‍റെ ആദ്യഭാഗം"</string>
+    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"പേരിന്റെ അവസാനഭാഗം"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"പേരിന്റെ ഫോർമാറ്റ്"</string>
-    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"ഫസ്റ്റ് നെയിം ആദ്യം"</string>
-    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"ലാസ്റ്റ് നെയിം ആദ്യം"</string>
+    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"പേരിന്റെ ആദ്യഭാഗം ആദ്യം"</string>
+    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"പേരിന്റെ അവസാന ഭാഗം ആദ്യം"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"പുതിയ കോൺടാക്റ്റുകൾക്കായുള്ള ഡിഫോൾട്ട് അക്കൗണ്ട്"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"കോൺടാക്റ്റ് മെറ്റാഡാറ്റ സമന്വയിപ്പിക്കുക [ഡോഗ്‌ഫുഡ്]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"കോൺടാക്റ്റ് മെറ്റാഡാറ്റ സമന്വയിപ്പിക്കുക"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"കോൺടാക്റ്റ് മെറ്റാഡാറ്റ സമന്വയ അക്കൗണ്ട്"</string>
     <string name="setting_about" msgid="3926137653588942297">"കോണ്‍ടാക്റ്റുകളെ കുറിച്ച്"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"ക്രമീകരണം"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"ദൃശ്യമായ കോൺടാക്റ്റുകൾ പങ്കിടുക"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"ദൃശ്യമായ കോൺടാക്റ്റുകൾ പങ്കിടുന്നത് പരാജയപ്പെട്ടു."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"പ്രിയപ്പെട്ട കോൺടാക്റ്റുകൾ പങ്കിടുക"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"എല്ലാ കോൺടാക്റ്റുകളും പങ്കിടുക"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"കോൺടാക്റ്റുകൾ പങ്കിടുന്നത് പരാജയം."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"കോൺടാക്റ്റ് ഡൗൺലോഡ്/അപ്‌ലോഡ്"</string>
     <string name="dialog_import" msgid="5177004290082451296">"കോൺടാക്റ്റുകൾ ഇമ്പോർട്ടുചെയ്യുക"</string>
     <string name="share_error" msgid="665756457151793108">"ഈ കോൺടാക്റ്റ് പങ്കിടാനാകില്ല."</string>
@@ -247,7 +237,7 @@
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"ദൃശ്യമായ കോൺടാക്റ്റുകളൊന്നുമില്ല."</string>
     <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"പ്രിയപ്പെട്ടവയൊന്നുമില്ല"</string>
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g> എന്നതിൽ കോൺടാക്റ്റുകളൊന്നുമില്ല"</string>
-    <string name="menu_clear_frequents" msgid="8492322695770647639">"സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കൂ"</string>
+    <string name="menu_clear_frequents" msgid="8492322695770647639">"സ്ഥിരംവിളിക്കുന്നവരെ മായ്‌ക്കുക"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"സിം കാർഡ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="menu_accounts" msgid="2944004960829403994">"മാനേജുചെയ്യുക"</string>
     <string name="menu_import_export" msgid="6446229463809981669">"ഡൗൺലോഡ്/അപ്‌ലോഡ്"</string>
@@ -272,9 +262,8 @@
     <string name="about_open_source_licenses" msgid="3224958101863814649">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസ്"</string>
     <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ഓപ്പൺ സോഴ്‌സ് സോഫ്റ്റ്‌വെയറിനായുള്ള ലൈസൻസ് വിശദാംശങ്ങൾ"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"സ്വകാര്യതാ നയം"</string>
-    <string name="about_terms_of_service" msgid="628537491496465267">"സേവന നിബന്ധനകൾ"</string>
+    <string name="about_terms_of_service" msgid="628537491496465267">"സേവന നിബന്ധനകള്‍"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"ഓപ്പൺ സോഴ്‌സ് ലൈസൻസ്"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url തുറക്കാനായില്ല."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ചെക്കുചെയ്തു"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ചെക്കുചെയ്തില്ല"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"വീഡിയോ കോൾ ചെയ്യുക"</string>
diff --git a/res-common/values-mn-rMN-sw600dp/strings.xml b/res-common/values-mn-rMN-sw600dp/strings.xml
deleted file mode 100644
index 298e698..0000000
--- a/res-common/values-mn-rMN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Зөвхөн таблет, синк хийгээгүй"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Экспортлох боломжтой харилцагч байхгүй байна. Таны таблетад харилцагч байсан ч гэсэн зарим өгөгдөл нийлүүлэгчээс харилцагчдын мэдээллийг таблетаас экспортлохыг зөвшөөрдөггүй."</string>
-</resources>
diff --git a/res-common/values-mn-rMN/strings.xml b/res-common/values-mn-rMN/strings.xml
index 631956a..87bf0ba 100644
--- a/res-common/values-mn-rMN/strings.xml
+++ b/res-common/values-mn-rMN/strings.xml
@@ -29,7 +29,7 @@
     <string name="call_other" msgid="4472141328347894937">"Залгах"</string>
     <string name="call_callback" msgid="687494744634190411">"Дуудлага хүлээж авахаар залгах"</string>
     <string name="call_car" msgid="9078083109758282133">"Машин руу залгах"</string>
-    <string name="call_company_main" msgid="8768047233970315359">"Компаний үндсэн дугаар руу залгах"</string>
+    <string name="call_company_main" msgid="8768047233970315359">"Компанийн үндсэн дугаар руу залгах"</string>
     <string name="call_isdn" msgid="3342482563847537747">"ISDN руу залгах"</string>
     <string name="call_main" msgid="4640261071249938558">"Үндсэн дугаар руу залгах"</string>
     <string name="call_other_fax" msgid="2536328553125487877">"Факс руу залгах"</string>
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Ажлын пейжер рүү залгах"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> руу залгах"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS рүү залгах"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Залгах)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> руу зурвас илгээх"</string>
     <string name="sms_home" msgid="7765831490534280540">"Гэрийн утас руу зурвас илгээх"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Гар утас руу зурвас илгээх"</string>
@@ -51,7 +50,7 @@
     <string name="sms_other" msgid="910895193552957097">"Зурвас илгээх"</string>
     <string name="sms_callback" msgid="728414485478941361">"Дуудлага авах зурвас илгээх"</string>
     <string name="sms_car" msgid="8543669230270954512">"Машин руу зурвас илгээх"</string>
-    <string name="sms_company_main" msgid="5441902128445061862">"Компаний үндсэн дугаар руу зурвас илгээх"</string>
+    <string name="sms_company_main" msgid="5441902128445061862">"Компанийн үндсэн дугаар руу зурвас илгээх"</string>
     <string name="sms_isdn" msgid="7142483128948042667">"ISDN рүү зурвас илгээх"</string>
     <string name="sms_main" msgid="6815987840926184815">"Үндсэн дугаар руу зурвас илгээх"</string>
     <string name="sms_other_fax" msgid="8649822154879781466">"Факс руу зурвас илгээх"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Ажлын пейжэр рүү зурвас илгээх"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> руу зурвас бичих"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS руу зурвас илгээх"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Зурвас илгээх)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Видео дуудлага хийх"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгах уу?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Та холбоо барих хэсэг болон утасны програмд байгаа тогтмол холбоо баридаг хаягуудыг устгах ба имэйл програмуудыг таны холбоо барих хаягуудыг эрэмбэлэх үйлдлийг идэвхжүүлэх болно."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Харилцагчид"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Бусад"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Директор"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Ажлын лавлагаа"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Ажлын лавлагаа"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Бүх харилцагчид"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Би"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Хайж байна..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Байнга холбоо барьдаг"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Харилцагчийг харах"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Утасны дугаартай бүх харилцагчид"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Ажлын профайлын харилцагч"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Ажлын профайлын харилцагчид"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Шинэчлэлтүүдийг харах"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Синк хийгдээгүй, зөвхөн утас"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Синк хийгдээгүй, зөвхөн утас"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Нэр"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Хоч"</string>
     <string name="full_name" msgid="885420216812981202">"Нэр"</string>
@@ -189,13 +187,11 @@
     <skip />
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g>-г экспорт хийж дууссан."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Харилцагчийн жагсаалтыг экспортолж дууслаа."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Харилцагчдыг экспортолж дууссан. Харилцагчдыг хуваалцахын тулд мэдэгдлийг дарна уу."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Харилцагчдыг хуваалцахын тулд дарна уу."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g>-г экспорт хийхийг цуцлав."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Харилцагчийн өгөгдлийг экспорт хийж байна"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Харилцагчдын өгөгдлийг экпортолсон."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Таны харилцагчийн өгөгдлийг дараах руу экспорт хийж байна: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Өгөгдлийн сангийн мэдээллийг авч чадсангүй"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Экспорт хийж болох харилцагчид алга байна. Хэрэв та утсандаа харилцагчидтай байгаа бол зарим өгөгдөл нийлүүлэгчээс харилцагчдын мэдээллийг утаснаас экспорт хийхийг зөвшөөрөхгүй байж магадгүй."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Экспорт хийж болох харилцагчид алга байна. Хэрэв та утсандаа харилцагчидтай байгаа бол зарим өгөгдөл нийлүүлэгчээс харилцагчдын мэдээллийг утаснаас экспорт хийхийг зөвшөөрөхгүй байж магадгүй."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard бичигч зохих ёсоор эхэлсэнгүй."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Экспорт хийж чадсангүй"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Харилцагчийн өгөгдлийг экспорт хийсэнгүй.\nШалтгаан: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard импорт хийх хүсэлтийг зөвшөөрсөнгүй. Дараа дахин оролдоно уу."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g>-г удахгүй экспорт хийх болно."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Энэ файлыг удахгүй экспортлох болно."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Харилцагчдыг удахгүй экспортлох болно."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard экспорт хийх хүсэлтийг зөвшөөрсөнгүй. Дараа дахин оролдоно уу."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"харилцагч"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard-г дотоод түр санд кеш хийж байна. Удахгүй бодитоор импорт хийж эхлэх болно."</string>
@@ -223,20 +218,15 @@
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Өөрийн нэр"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Овог"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"Нэрний формат"</string>
-    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Нэрийг эхэнд нь"</string>
+    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Өөрийн нэрийг эхэнд нь"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Овгийг эхэнд нь"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Шинэ харилцагчийн өгөгдмөл бүртгэл"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Харилцагчдын мета-өгөгдлийг синк хийх [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Харилцагчдын мета-өгөгдлийг синк хийх"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Мета-өгөгдлийн синк хийх бүртгэлтэй холбоо барих"</string>
     <string name="setting_about" msgid="3926137653588942297">"Харилцагчийн хаягийн тухай"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Тохиргоо"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Харагдах харилцагчдыг хуваалцах"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Харагдаж байгаа харилцагчийн хаягийг хуваалцаж чадсангүй."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Дуртай харилцагчдаа хуваалцах"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Бүх харилцагчдыг хуваалцах"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Харилцагчдыг хуваалцаж чадсангүй."</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"Харилцагчид импортлох/экспортлох"</string>
-    <string name="dialog_import" msgid="5177004290082451296">"Харилцагчид импортлох"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"Харилцагчид импорт/экспорт хийх"</string>
+    <string name="dialog_import" msgid="5177004290082451296">"Харилцагчид импорт хийх"</string>
     <string name="share_error" msgid="665756457151793108">"Энэ харилцагчийг хуваалцах боломжгүй."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"Хуваалцах харилцагчийн жагсаалт алга."</string>
     <string name="menu_search" msgid="7464453023659824700">"Хайх"</string>
@@ -258,7 +248,7 @@
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"хайлтыг зогсоох"</string>
     <string name="description_clear_search" msgid="3893511425518852086">"Хайлтыг цэвэрлэх"</string>
     <string name="settings_contact_display_options_title" msgid="1020420603072835628">"Харилцагчийн харагдах сонголт"</string>
-    <string name="select_account_dialog_title" msgid="5509088895267310568">"Бүртгэл"</string>
+    <string name="select_account_dialog_title" msgid="5509088895267310568">"Акаунт"</string>
     <string name="set_default_account" msgid="3865970860434642695">"Дуудлагад байнга үүнийг ашиглах"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"Залгах"</string>
     <string name="call_with_a_note" msgid="8453800473226831257">"Тэмдэглэл бүхий дуудлага хийх"</string>
@@ -276,7 +266,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Нууцлалын бодлого"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Үйлчилгээний нөхцөл"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Нээлттэй эхийн лиценз"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"URL-г нээж чадсангүй."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g>-г шалгасан"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g>-г шалгаагүй"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Видео дуудлага хийх"</string>
diff --git a/res-common/values-mr-rIN-sw600dp/strings.xml b/res-common/values-mr-rIN-sw600dp/strings.xml
deleted file mode 100644
index 2c5f3af..0000000
--- a/res-common/values-mr-rIN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"केवळ-टॅब्‍लेट, संकालित न केलेले"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"निर्यात करण्यायोग्य संपर्क नाहीत. आपल्याकडे आपल्या टॅब्लेटवर संपर्क असल्यास, काही डेटा प्रदाते टॅब्लेटवरून संपर्क निर्यात करण्यास कदाचित अनुमती देणार नाहीत."</string>
-</resources>
diff --git a/res-common/values-mr-rIN/strings.xml b/res-common/values-mr-rIN/strings.xml
index cf735fb..8ca56cc 100644
--- a/res-common/values-mr-rIN/strings.xml
+++ b/res-common/values-mr-rIN/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"कार्यस्‍थानी पेजरवर कॉल करा"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> ला कॉल  करा"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS वर कॉल करा"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (कॉल करा)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> मजकूर पाठवा"</string>
     <string name="sms_home" msgid="7765831490534280540">"निवासस्थानी मजकूर पाठवा"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"मोबाईलवर मजकूर पाठवा"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"कार्य पेजरवर मजकूर पाठवा"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> मजकूर पाठवा"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS वर मजकूर पाठवा"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (संदेश पाठवा)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"व्‍हिडिओ कॉल करा"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"वारंवार सपर्क साधलेले साफ करायचे?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"आपण संपर्क आणि फोन अ‍ॅप्‍स मधील वारंवार संपर्क साधलेली सूची साफ कराल आणि ईमेल अ‍ॅप्‍सना सुरवातीपासून आपली पत्ता प्राधान्‍ये जाणून घेण्‍याची सक्ती कराल."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"संपर्क"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"इतर"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"निर्देशिका"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"कार्य निर्देशिका"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"कार्य निर्देशिका"</string>
     <string name="local_search_label" msgid="9094584931063745728">"सर्व संपर्क"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"मी"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"शोधत आहे..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"वारंवार संपर्क केलेले"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"संपर्क पहा"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"फोन नंबरसह सर्व संपर्क"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"कार्य प्रोफाईल संपर्क"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"कार्य प्रोफाईल संपर्क"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"अद्यतने पहा"</string>
-    <string name="account_phone" msgid="6104157990869081962">"केवळ-फोन, संकालित न केलेले"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"केवळ-फोन, संकालित न केलेले"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"नाव"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"टोपणनाव"</string>
     <string name="full_name" msgid="885420216812981202">"नाव"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"एक किंवा अधिक फायली आयात केल्‍या जाऊ शकत नाहीत(%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> निर्यात करणे समाप्त झाले."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"संपर्क आयात करणे समाप्त झाले"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"संपर्क निर्यात करणे समाप्त झाले, संपर्क सामायिक करण्यासाठी सूचनेवर क्लिक करा."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"संपर्क सामायिक करण्यासाठी टॅप करा."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> निर्यात करणे रद्द केले."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"संपर्क डेटा निर्यात करीत आहे"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"संपर्क डेटा निर्यात केला जात आहे."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"आपला संपर्क डेटा यावर निर्यात केला जात आहे: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"डेटाबेस माहिती मिळवू शकलो नाही."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"निर्यात करण्‍यायोग्‍य संपर्क नाहीत. आपल्‍या फोनवर संपर्क असल्‍यास, काही डेटा प्रदाते फोनवरून संपर्क निर्यात करण्‍यास कदाचित अनुमती देणार नाहीत."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"निर्यात करण्‍यायोग्‍य संपर्क नाहीत. आपल्‍या फोनवर संपर्क असल्‍यास, काही डेटा प्रदाते फोनवरून संपर्क निर्यात करण्‍यास कदाचित अनुमती देणार नाहीत."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard रचनाकाराने योग्‍यरित्‍या प्रारंभ केला नाही."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"निर्यात करू शकलो नाही"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"संपर्क डेटा निर्यात केला नाही.\nकारण: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard आयात विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> लवकरच निर्यात केली जाईल."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"फाईल लवकरच निर्यात केली जाईल."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"संपर्क लवकरच निर्यात केले जातील."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard निर्यात विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"संपर्क"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"स्‍थानिक तात्‍पुरत्‍या संचयनावर vCard(s) कॅशे करीत आहे. वास्‍तविक आयात लवकरच प्रारंभ होईल."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"नाव प्रथम"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"आडनाव प्रथम"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"नवीन संपर्कांसाठी डीफॉल्ट खाते"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"संपर्क मेटाडेटा संकालित करा [डॉगफूड]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"संपर्क मेटाडेटा संकालित करा"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"मेटाडेटा संकालन खात्याशी संपर्क साधा"</string>
     <string name="setting_about" msgid="3926137653588942297">"संपर्कांबद्दल"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"सेटिंग्ज"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"दृश्यमान संपर्क सामायिक करा"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"दृश्यमान संपर्क सामायिक करण्‍यात अयशस्वी झाले."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"आवडते संपर्क सामायिक करा"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"सर्व संपर्क सामायिक करा"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"संपर्क सामायिक करण्यात अयशस्वी झाले."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"संपर्क आयात/निर्यात करा"</string>
     <string name="dialog_import" msgid="5177004290082451296">"संपर्क आयात करा"</string>
     <string name="share_error" msgid="665756457151793108">"हा संपर्क सामायिक केला जाऊ शकत नाही."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"गोपनीयता धोरण"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"सेवा अटी"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"मुक्त स्त्रोत परवाने"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url उघडण्यात अयशस्वी झाले."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> चेक केले"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> चेक केले नाही"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"व्हिडिओ कॉल करा"</string>
diff --git a/res-common/values-ms-rMY-sw600dp/strings.xml b/res-common/values-ms-rMY-sw600dp/strings.xml
deleted file mode 100644
index 3bf9e09..0000000
--- a/res-common/values-ms-rMY-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tablet sahaja, tidak disegerakkan"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Tiada kenalan yang dapat dieksport. Jika anda mempunyai kenalan pada tablet anda, sesetengah pembekal data mungkin tidak membenarkan kenalan itu dieksport daripada tablet."</string>
-</resources>
diff --git a/res-common/values-ms-rMY/strings.xml b/res-common/values-ms-rMY/strings.xml
index 4eb66f1..ed73bad 100644
--- a/res-common/values-ms-rMY/strings.xml
+++ b/res-common/values-ms-rMY/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Panggil alat kelui tempat kerja"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Panggil <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Panggil MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Panggil)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS rumah"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS telefon mudah alih"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS alat kelui tempat kerja"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS nombor MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Hantar mesej)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Buat panggilan video"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Padam bersih senarai kerap dihubungi?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Anda akan mengosongkan senarai yang kerap dihubungi dalam apl Kenalan dan Telefon serta memaksa apl e-mel untuk mempelajari pilihan alamat anda dari awal."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kenalan"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Lain-lain"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Direktori"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Direktori kerja"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Direktori Kerja"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Semua kenalan"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Saya"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Mencari..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Kerap dihubungi"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Lihat kenalan"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Semua kenalan dengan nombor telefon"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Kenalan profil kerja"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kenalan Profil Kerja"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Lihat kemas kini"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Telefon sahaja, tidak disegerakkan"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Telefon sahaja, tidak disegerakkan"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nama"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Nama panggilan"</string>
     <string name="full_name" msgid="885420216812981202">"Nama"</string>
@@ -189,13 +187,11 @@
     <skip />
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Selesai mengeksport <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Selesai mengeksport kenalan."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Selesai mengeksport kenalan, klik pemberitahuan untuk berkongsi kenalan."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Ketik untuk berkongsi kenalan."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Mengeksport <xliff:g id="FILENAME">%s</xliff:g> dibatalkan."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Mengeksport data kenalan"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Data kenalan sedang dieksport."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Data kenalan anda sedang dieksport ke: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Tidak boleh mendapatkan maklumat pangkalan data."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Tiada kenalan boleh dieksport. Jika anda mempunyai kenalan pada telefon anda, sesetengah pembekal data tidak boleh membenarkan kenalan dieksport dari telefon."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Tiada kenalan boleh dieksport. Jika anda mempunyai kenalan pada telefon anda, sesetengah pembekal data tidak boleh membenarkan kenalan dieksport dari telefon."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Komposer vCard tidak bermula dengan betul."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Tidak dapat mengeksport"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Data kenalan tidak dieksport.\nAlasan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Permintaan import vCard telah ditolak. Cuba lagi nanti."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g>akan dieksport sebentar lagi."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Fail akan dieksport sebentar lagi."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kenalan akan dieksport sebentar lagi."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Permintaan eksport vCard telah ditolak. Cuba lagi nanti."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kenalan"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Membuat cache vCard ke storan sementara setempat. Pengimportan sebenar akan bermula tidak lama lagi."</string>
@@ -226,15 +221,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Nama pertama dahulu"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Nama keluarga dahulu"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Akaun lalai untuk kenalan baharu"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Segerakkan metadata kenalan [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Segerakkan metadata kenalan"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Akaun penyegerakan metadata kenalan"</string>
     <string name="setting_about" msgid="3926137653588942297">"Perihal Kenalan"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Tetapan"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Kongsi kenalan yang kelihatan"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Gagal berkongsi kenalan yang kelihatan"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Kongsi kenalan kegemaran"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Kongsi semua kenalan"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Gagal berkongsi kenalan."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Import/eksport kenalan"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Import kenalan"</string>
     <string name="share_error" msgid="665756457151793108">"Kenalan ini tidak boleh dikongsi."</string>
@@ -276,7 +266,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Dasar privasi"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Syarat perkhidmatan"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Lesen sumber terbuka"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Gagal membuka url."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> disemak"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> tidak disemak"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Buat panggilan video"</string>
diff --git a/res-common/values-my-rMM-sw600dp/strings.xml b/res-common/values-my-rMM-sw600dp/strings.xml
deleted file mode 100644
index 9ff181a..0000000
--- a/res-common/values-my-rMM-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"တက်ဘလက်−အတွက်သာ၊  စင့်ခ်မလုပ်ရသေးပါ"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"တင်ပို့၍ရသော အဆက်အသွယ်များမရှိပါ။ သင့်တက်ဘလက်ပေါ်တွင် အဆက်အသွယ်မရှိပါက၊  အချို့ ဒေတာထောက်ပံ့ပေးသူတို့သည် အဆက်အသွယ်များကို တက်ဘလက်မှ တင်ပို့ခွင့်ပေးမည် မဟုတ်ပါ။"</string>
-</resources>
diff --git a/res-common/values-my-rMM/strings.xml b/res-common/values-my-rMM/strings.xml
index 1e3aa1b..93fd31b 100644
--- a/res-common/values-my-rMM/strings.xml
+++ b/res-common/values-my-rMM/strings.xml
@@ -29,9 +29,9 @@
     <string name="call_other" msgid="4472141328347894937">"ခေါ်ပါ"</string>
     <string name="call_callback" msgid="687494744634190411">"ပြန်ခေါ်ခြင်းဝန်ဆောင်မှုကို ခေါ်ပါ"</string>
     <string name="call_car" msgid="9078083109758282133">"ကားကိုခေါ်ပါ"</string>
-    <string name="call_company_main" msgid="8768047233970315359">"ကုမ္ပဏီပင်မနံပါတ်ကို ခေါ်ပါ"</string>
+    <string name="call_company_main" msgid="8768047233970315359">"ကုမ္ပဏီအဓိက နံပါတ်ကို ခေါ်ပါ"</string>
     <string name="call_isdn" msgid="3342482563847537747">"ISDN ကိုခေါ်ပါ"</string>
-    <string name="call_main" msgid="4640261071249938558">"ပင်မနံပါတ်ကို ခေါ်ပါ"</string>
+    <string name="call_main" msgid="4640261071249938558">"အဓိကနံပါတ်ကိုခေါ်ပါ"</string>
     <string name="call_other_fax" msgid="2536328553125487877">"ဖက်စ်ကိုခေါ်ပါ"</string>
     <string name="call_radio" msgid="9055749313292712021">"ရေဒီယိုကိုခေါ်ပါ"</string>
     <string name="call_telex" msgid="2909886619224843563">"တဲလက်ဇ်နံပါတ်ကိုခေါ်ပါ"</string>
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"အလုပ်ပေဂျာကိုခေါ်ပါ"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> ကိုခေါ်ပါ"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS ကိုခေါ်ပါ"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ခေါ်ပါ)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> သို့ စာပို့ပါ"</string>
     <string name="sms_home" msgid="7765831490534280540">"အိမ်သို့ စာပို့ပါ"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"မိုဘိုင်းသို့ စာပို့ပါ"</string>
@@ -62,10 +61,9 @@
     <string name="sms_work_pager" msgid="499303540738557836">"အလုပ်ပေ့ဂျာသို့ စာပို့ပါ"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g>ထံ စာပို့ပါ"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS နံပါတ်သို့ စာပို့ပါ"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (မက်ဆေ့ဂ်ျပို့ပါ)"</string>
-    <string name="description_video_call" msgid="4907306403398614909">"ဗီဒီယို ဖုန်းခေါ်ရန်"</string>
+    <string name="description_video_call" msgid="4907306403398614909">"ဗီဒီယို ခေါ်ဆိုမှု ပြုလုပ်ရန်"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"အသုံးများသောလိပ်စာများရှင်းပစ်မလား?"</string>
-    <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"အသုံးများသော အဆက်အသွယ်စာရင်းအား Contacts နှင့် Phone app များမှ သင် ရှင်းလင်းပစ်မှာဖြစ်ပြီး၊ အီးမေးလ် app များအား သင့်နှစ်သက်ရာ ​ပ​ြောဆိုဆက်ဆံမှုပုံစံကို အစမှပြန်လည် လေ့လာခိုင်းမည်။"</string>
+    <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"အသုံးများသော အဆက်အသွယ်စာရင်းအား Contacts နှင့် Phone app များမှ သင် ရှင်းလင်းပစ်မှာဖြစ်ပြီး၊ အီးမေး app များအား သင့်နှစ်သက်ရာ ​ပ​ြောဆိုဆက်ဆံမှုပုံစံကို အစမှပြန်လည် လေ့လာခိုင်းမည်။"</string>
     <string name="clearFrequentsProgress_title" msgid="3738406170865048982">"အသုံးများသောလိပ်စာများ ရှင်းလင်းနေစဉ်"</string>
     <string name="status_available" msgid="4832569677396634846">"ဆက်သွယ်နိုင်ပါသည်"</string>
     <string name="status_away" msgid="6267905184545881094">"အဝေးရောက်နေပါသည်"</string>
@@ -73,9 +71,9 @@
     <string name="contactsList" msgid="7140022347217602605">"အဆက်အသွယ်များ"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"တစ်ခြား"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"လမ်းညွှန်"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"အလုပ်လမ်းညွှန်"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Work Directory"</string>
     <string name="local_search_label" msgid="9094584931063745728">"လိပ်စာများအားလုံး"</string>
-    <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"မိမိ"</string>
+    <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"ကျွန်ုပ်"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"ရှာဖွေနေသည်…"</string>
     <string name="foundTooManyContacts" msgid="3060037437459313616">"<xliff:g id="COUNT">%d</xliff:g> ထက်ပိုတွေ့ရှိသည်"</string>
     <string name="listFoundAllContactsZero" msgid="4406036083994138930">"အဆက်အသွယ်များမရှိပါ"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"မကြာခဏဆက်သွယ်ရန်သူများ"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"အဆက်အသွယ်အား ကြည့်ရန်"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ဖုန်းနံပါတ်ပါသော လိပ်စာများအားလုံး"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"အလုပ်ပရိုဖိုင် အဆက်အသွယ်များ"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Work Profile အဆက်အသွယ်များ"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"အဆင့်မြှင့်ခြင်းများပြရန်"</string>
-    <string name="account_phone" msgid="6104157990869081962">"ဖုန်းတွင်သာရှိပြီး အဆက်အသွယ်ကို စင့်ခ်လုပ်မထားပါ"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"ဖုန်းတွင်သာ ညီတူမညှိထားပါ"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"အမည်"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"နာမည်ဝှက်"</string>
     <string name="full_name" msgid="885420216812981202">"အမည်"</string>
@@ -160,7 +158,7 @@
     <string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"\"<xliff:g id="GROUP">%s</xliff:g>\" အား ထပ်တူပြုလုပ်ခြင်းမှ ဖယ်ထုတ်ခြင်းသည် တခြား အုပ်စုမလုပ်ထားသော အဆက်အသွယ်များအားလည်း ဖယ်ထုတ်ပါလိမ့်မည်။"</string>
     <string name="savingDisplayGroups" msgid="6863012138107446030">"ပြသမှု ရွေးချယ်ခြင်းများ သိမ်းဆည်နေစဉ်…"</string>
     <string name="menu_done" msgid="32470053723443112">"ပြီးပါပြီ"</string>
-    <string name="menu_doNotSave" msgid="6012426160993364871">"မလုပ်တော့ပါ"</string>
+    <string name="menu_doNotSave" msgid="6012426160993364871">"ထားတော့"</string>
     <string name="listAllContactsInAccount" msgid="755499980092808715">"<xliff:g id="NAME">%s</xliff:g> ထဲမှ အဆက်အသွယ်များ"</string>
     <string name="listCustomView" msgid="1915154113477432033">"မိမိစိတ်ကြိုက် မြင်ကွင်းမှ"</string>
     <string name="listSingleContact" msgid="8525131203887307088">"အဆက်အသွယ်တစ်ခုတည်း"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ဖိုင်တစ်ခု သို့မဟုတ် တစ်ခုထက်ပိုသော ဖိုင်များအား အထဲသို့သွင်းလို့မရပါ(%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> ကို အပြင်ထုတ်ခြင်းပြီးစီးပါပြီး"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"အဆက်အသွယ်များ တင်ပို့ခြင်း ပြီးပါပြီ။"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"အဆက်အသွယ်များကို တင်ပို့၍ပြီးပါပြီ၊ အဆက်အသွယ်များကို မျှဝေရန် သတိပေးချက်ကိုနှိပ်ပါ။"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"အဆက်အသွယ်များကို မျှဝေရန်တို့ပါ။"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> ကို အပြင်ထုတ်ခြင်းအား ပယ်ဖျက်ပြီး"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"အဆက်အသွယ်ဒေတာများအား အပြင်သို့ထုတ်နေစဉ်"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"အဆက်အသွယ်ဒေတာကို တင်ပို့နေသည်။"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"သင့်အဆက်အသွယ်အချက်အလက်များကို ဖော်ပြပါထံထုတ်လိုက်ပါပြီ: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ဒေတာဘေ့စ်အချက်အလက်အား မရရှိနိုင်ပါ"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"အပြင်သို့ထုတ်ယူရနိုင်သော လိပ်စာမရှိပါ။ သင့်ဖုန်းထဲမှာ လိပ်စာများရှိပါက တချို့ ဒေတာဝန်ဆောင်မှုက ထိုလိပ်စာများအား ဖုန်းထဲမှအပြင်သို့ ထုတ်ခွင့်ပေးခွင့် မပေးတာမျိုးဖြစ်နိုင်ပါသည်"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"အပြင်သို့ထုတ်ယူရနိုင်သော လိပ်စာမရှိပါ။ သင့်ဖုန်းထဲမှာ လိပ်စာများရှိပါက တချို့ ဒေတာဝန်ဆောင်မှုက ထိုလိပ်စာများအား ဖုန်းထဲမှအပြင်သို့ ထုတ်ခွင့်ပေးခွင့် မပေးတာမျိုးဖြစ်နိုင်ပါသည်"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"လိပ်စာကဒ်ပြုလုပ်သောစန် ကောင်းမွန်စာ မစတင်ပါ"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"အပြင်ထုတ်လို့မရပါ"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"အဆက်အသွယ် အချက်အလက်ကို \nအကြောင်းပြချက်ကြောင့် မထုတ်နိုင်ပါ။  \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"လိပ်စာကဒ်အား အထဲသွင်းရန် တောင်းဆိုမှု ငြင်းဆန်ခံရပါသည်။ နောင်မှ ပြန်လည်ကြိုးစားပါ"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> ကို မကြာမီ အပြင်သို့ ထုတ်ပါမည်"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ဖိုင်အား မကြာမီ တင်ပို့ပါလိမ့်မည်။"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"အဆက်အသွယ်များကို မကြာခင်အချိန်တွင် တင်ပို့သွားပါမည်။"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"လိပ်စာကဒ်အား အပြင်ထုတ်ရန် တောင်းဆိုမှု ငြင်းဆန်ခံရပါသည်။ နောင်မှ ပြန်လည်ကြိုးစားပါ"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"အဆက်အသွယ်"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"လိပ်စာကဒ်(များ)ကို စက်တွင်း ခဏသိမ်းဆည်းရာနေရာသို့ ပို့နေပါသည်။ အမှန်တကယ် တင်သွင်းခြင်း မကြာခင် စပါမည်။"</string>
@@ -217,24 +212,19 @@
     <string name="caching_vcard_title" msgid="9185299351381102305">"ယာယီသိမ်းထားခြင်း"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"<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="4142192068495589925">".vcf ဖိုင်သို့ထုတ်မည်"</string>
-    <string name="display_options_sort_list_by" msgid="8635268562263708102">"အောက်ပါအတိုင်း စီပါ"</string>
+    <string name="display_options_sort_list_by" msgid="8635268562263708102">"ဖြင့် စီပေးရန်"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"ပထမ အမည်"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"နောက်ဆုံး အမည်"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"အမည် ချထားပုံစံ"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"ပထမ အမည် ဦးစွာ"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"နောက်ဆုံး အမည် ဦးစွာ"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"အဆက်အသွယ် အသစ်များအတွက် မူရင်း အကောင့်"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"အဆက်အသွယ် မက်တာဒေတာကို စင့်ခ်လုပ်ပါ [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"အဆက်အသွယ် မက်တာဒေတာကို စင့်ခ်လုပ်ပါ"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"မက်တာဒေတာ ပြိုင်တူညိမှု အကောင့်ကို ဆက်သွယ်ပါ"</string>
     <string name="setting_about" msgid="3926137653588942297">"အဆက်အသွယ်များ အကြောင်း"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"ဆက်တင်များ"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"မြင်နိုင်သော အဆက်အသွယ်များအား မျှဝေပါ"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"မြင်သာသော အဆက်အသွယ်တွေကိုဝေမျှခြင်းမပြုနိုင်ခဲ့ပါ။"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"အကြိုက်ဆုံးအဆက်အသွယ်များကို မျှဝေပါ"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"အဆက်အသွယ်များအားလုံးကို မျှဝေပါ"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"အဆက်အသွယ်များကို မျှဝေခြင်းမအောင်မြင်ပါ။"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"အဆက်အသွယ်များ သွင်းယူ၊ ထုတ်ယူရန်"</string>
-    <string name="dialog_import" msgid="5177004290082451296">"အဆက်အသွယ်များ သွင်းပါ"</string>
+    <string name="dialog_import" msgid="5177004290082451296">"အဆက်အသွယ်များ တင်သွင်းပါ"</string>
     <string name="share_error" msgid="665756457151793108">"ဒီလိပ်စာအား မျှဝေလို့ မရပါ"</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"မျှဝေရန် အဆက်အသွယ်များမရှိပါ။"</string>
     <string name="menu_search" msgid="7464453023659824700">"ရှာဖွေခြင်း"</string>
@@ -271,10 +261,9 @@
     <string name="about_build_version" msgid="4221971683776635130">"တည်ဆောက်မှု ဗားရှင်း"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"အခမဲ့ ရင်းမြစ် လိုင်စင်များ"</string>
     <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"အခမဲ့  ဆော့ဝဲအတွက် လိုင်စင် အသေးစိတ်များ"</string>
-    <string name="about_privacy_policy" msgid="8458337666582973913">"ပုဂ္ဂိုလ်ရေးဆိုင်ရာ မူဝါဒ"</string>
-    <string name="about_terms_of_service" msgid="628537491496465267">"ဝန်ဆောင်မှုဆိုင်ရာ စည်းမျဉ်းများ"</string>
+    <string name="about_privacy_policy" msgid="8458337666582973913">"ပုဂ္ဂိုလ်ရေး မူဝါဒ"</string>
+    <string name="about_terms_of_service" msgid="628537491496465267">"ဝန်ဆောင်မှု စည်းကမ်းချက်များ"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"အခမဲ့ ရင်းမြစ် လိုင်စင်များ"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url ကို ဖွင့်၍မရပါ။"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ကိုစစ်ဆေးပြီးပါပြီ"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ကိုမစစ်ဆေးရသေးပါ"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"ဗီဒီယို ခေါ်ဆိုမှုကို ပြုလုပ်ပါ"</string>
diff --git a/res-common/values-nb-sw600dp/strings.xml b/res-common/values-nb-sw600dp/strings.xml
deleted file mode 100644
index cd3201d..0000000
--- a/res-common/values-nb-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Bare nettbrett (usynkronisert)"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Du har ingen kontakter som kan eksporteres. Hvis du har kontakter på nettbrettet, kan det hende at dataleverandøren din ikke tillater at kontaktene eksporteres fra nettbrettet."</string>
-</resources>
diff --git a/res-common/values-nb/strings.xml b/res-common/values-nb/strings.xml
index 5f57d43..8046370 100644
--- a/res-common/values-nb/strings.xml
+++ b/res-common/values-nb/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Ring personsøkernummer (arbeid)"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Ring <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Ring multimediemeldingnummer"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ring)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Send tekstmelding til <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Send tekstmelding til hjemmenummer"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Send tekstmelding til mobilnummer"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Send tekstmelding til personsøkernummer (arbeid)"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Send tekstmelding til <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Send tekstmelding til multimediemeldingnummer"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (send en melding)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Utfør videoanrop"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Vil du fjerne ofte kontaktede personer?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Du fjerner listen over ofte kontaktede personer i Kontakter- og Telefon-appene, og tvinger e-postappene til å lære seg adresseinnstillingene dine på nytt."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontakter"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Annet"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Katalog"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Jobbkatalog"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Jobbkatalog"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Alle kontakter"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Jeg"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Søker ..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Ofte kontaktet"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Se kontakt"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Alle kontakter med telefonnumre"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Jobbprofilkontakter"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Jobbprofilkontakter"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Se oppdateringer"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Bare telefon (usynkronisert)"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Bare telefon (usynkronisert)"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Navn"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Kallenavn"</string>
     <string name="full_name" msgid="885420216812981202">"Navn"</string>
@@ -168,7 +166,7 @@
     <string name="import_from_sim" msgid="4749894687871835873">"Importér fra SIM-kort"</string>
     <string name="import_from_sim_summary" msgid="2306434118233541675">"Importér fra SIM-kortet <xliff:g id="SIM_NAME">^1</xliff:g> – <xliff:g id="SIM_NUMBER">^2</xliff:g>"</string>
     <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Importér fra SIM-kortet <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="1381675161522633950">"Importer fra .vcf-fil"</string>
+    <string name="import_from_vcf_file" product="default" msgid="1381675161522633950">"Importér fra .vcf-fil"</string>
     <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Vil du avbryte importeringen av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Vil du avbryte eksporteringen av <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="7450212880694781527">"Kunne ikke avbryte imp./eksp. av vCard"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"En eller flere filer kan ikke importeres (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Eksporteringen av <xliff:g id="FILENAME">%s</xliff:g> er fullført."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Eksportering av kontaktene er fullført."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontaktdataene er eksportert. Klikk på varselet for å dele kontaktene."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Trykk for å dele kontaktene."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Eksporteringen av <xliff:g id="FILENAME">%s</xliff:g> ble avbrutt."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Eksporterer kontaktdata"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontaktdataene eksporteres."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Kontaktdataene dine eksporteres til: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Kunne ikke hente databaseinformasjon."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Du har ingen kontakter som kan eksporteres. Hvis du har kontakter på telefonen, kan det hende at dataleverandøren din ikke tillater at kontaktene eksporteres fra telefonen."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Du har ingen kontakter som kan eksporteres. Hvis du har kontakter på telefonen, kan det hende at dataleverandøren din ikke tillater at kontaktene eksporteres fra telefonen."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard-oppretteren startet ikke som den skulle."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Eksporten mislyktes"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Kontaktdataene ble ikke eksportert.\nÅrsak: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Forespørselen om vCard-importering ble avvist. Prøv på nytt senere."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> blir snart eksportert."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Filen eksporteres snart."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontaktene eksporteres snart."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Forespørselen om eksport av vCard ble avvist. Prøv på nytt senere."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Bufrer vCard for import til lokal, midlertidig lagring. Selve importeringen starter snart."</string>
@@ -224,17 +219,12 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Fornavnet først"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Etternavnet først"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Standardkonto for nye kontakter"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Synkroniser metadata for kontakter [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Synkroniser metadata for kontakter"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kontaktmetadata for synkroniseringskonto"</string>
     <string name="setting_about" msgid="3926137653588942297">"Om Kontakter"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Innstillinger"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Del synlige kontakter"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Delingen av synlige kontakter mislyktes."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Del favorittkontaktene"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Del alle kontaktene"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kunne ikke dele kontaktene."</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"Importér/eksportér kontakter"</string>
-    <string name="dialog_import" msgid="5177004290082451296">"Importér kontakter"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"Importer/eksporter kontakter"</string>
+    <string name="dialog_import" msgid="5177004290082451296">"Importer kontakter"</string>
     <string name="share_error" msgid="665756457151793108">"Denne kontakten kan ikke deles."</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"Det finnes ingen kontakter å dele."</string>
     <string name="menu_search" msgid="7464453023659824700">"Søk"</string>
@@ -250,7 +240,7 @@
     <string name="menu_clear_frequents" msgid="8492322695770647639">"Fjern ofte kontaktede personer"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"Velg SIM-kort"</string>
     <string name="menu_accounts" msgid="2944004960829403994">"Administrer kontoer"</string>
-    <string name="menu_import_export" msgid="6446229463809981669">"Importér/eksportér"</string>
+    <string name="menu_import_export" msgid="6446229463809981669">"Importer/eksporter"</string>
     <string name="contact_status_update_attribution" msgid="8419168578670128134">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="7492465535645607473">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="1138551123844019647">"avslutt søket"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Personvernregler"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Vilkår for bruk"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Lisenser for åpen kildekode"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Kunne ikke åpne nettadressen."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Det er merket av for <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Det er ikke merket av for <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Start et videoanrop"</string>
diff --git a/res-common/values-ne-rNP-sw600dp/strings.xml b/res-common/values-ne-rNP-sw600dp/strings.xml
deleted file mode 100644
index d5b5bb0..0000000
--- a/res-common/values-ne-rNP-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"ट्याब्लेट मात्र, सिंक नगरिएको"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"कुनै पनि निर्यात गर्ने मिल्ने सम्पर्कहरू छैनन्। यदि तपाईँको ट्याब्लेटमा सच्चिकै सम्पर्कहरू छन् भने केही डेटा प्रदायकहरूले ट्याब्लेटबाट सम्पर्कहरू निर्यात गर्ने अनुमति दिँदैनन् होला।"</string>
-</resources>
diff --git a/res-common/values-ne-rNP/strings.xml b/res-common/values-ne-rNP/strings.xml
index 23da0a4..9fe8a29 100644
--- a/res-common/values-ne-rNP/strings.xml
+++ b/res-common/values-ne-rNP/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"काम पेजरमा कल गर्नुहोस्"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> लाई कल गर्नुहोस्"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS लाई कल गर्नुहोस्"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (फोन गर्नुहोस्)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"पाठ <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"पाठ घर"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"पाठ मोबाइल"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"पाठ काम पेजर"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"पाठ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"पाठ MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (सन्देश पठाउनुहोस्)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"भिडियो कल बनाउनुहोस्"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"प्रायः सम्पर्क भएकालाई हटाउने?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"तपाईंले सम्पर्कहरू र फोन अनुप्रयोगहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल अनुप्रयोगहरूलाई दबाब दिनुहुनेछ।"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"सम्पर्कहरू"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"अन्य"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"निर्देशिका"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"कार्यको निर्देशिका"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"कार्यको निर्देशिका"</string>
     <string name="local_search_label" msgid="9094584931063745728">"सबै सम्पर्कहरू"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"मलाई"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"खोजी गरिँदै..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"लगातार सम्पर्क गरिएको"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"सम्पर्क हेर्नुहोस्"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"फोन नम्बर भएका सबै सम्पर्कहरू"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"कार्य प्रोफाइलका सम्पर्कहरू"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"कार्य प्रोफाइलको सम्पर्कहरू"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"अद्यावधिकहरू अवलोकन गर्नुहोस्"</string>
-    <string name="account_phone" msgid="6104157990869081962">"फोन मात्र, सिंक नभएको"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"फोन मात्र, सिङ्क नभएको"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"नाम"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"उपनाम"</string>
     <string name="full_name" msgid="885420216812981202">"नाम"</string>
@@ -103,7 +101,7 @@
     <string name="name_phonetic" msgid="2249169131785620210">"फोनेटिक नाम"</string>
     <string name="name_phonetic_given" msgid="2863316331175661852">"ध्वनितात्त्विक नाम"</string>
     <string name="name_phonetic_middle" msgid="5970174427249235577">"फोनेटिक मध्य नाम"</string>
-    <string name="name_phonetic_family" msgid="1572398622239414464">"फोनेटिक थर"</string>
+    <string name="name_phonetic_family" msgid="1572398622239414464">"ध्वनितात्त्विक थर"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"फोन"</string>
     <string name="emailLabelsGroup" msgid="4696310712601184208">"इमेल गर्नुहोस्"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"ठेगाना"</string>
@@ -154,8 +152,8 @@
     <string name="list_filter_single" msgid="4553809449379139446">"ठेगाना"</string>
     <string name="display_ungrouped" msgid="3669471582032440138">"सबै अन्य सम्पर्कहरू"</string>
     <string name="display_all_contacts" msgid="7251385818740728862">"सबै सम्पर्कहरू"</string>
-    <string name="menu_sync_remove" msgid="6581565236520430269">"सिंक समूह हटाउनुहोस्"</string>
-    <string name="dialog_sync_add" msgid="1795682729089027675">"सिंक समूह थप्नुहोस्"</string>
+    <string name="menu_sync_remove" msgid="6581565236520430269">"सिङ्क समूह हटाउनुहोस्"</string>
+    <string name="dialog_sync_add" msgid="1795682729089027675">"सिङ्क समूह थप्नुहोस्"</string>
     <string name="display_more_groups" msgid="6304997485733158224">"अधिक समूहहरू..."</string>
     <string name="display_warn_remove_ungrouped" msgid="7297678747857509619">"\"<xliff:g id="GROUP">%s</xliff:g>\" सिङ्कबाट हटाइदै,  सिङ्कबाट समूहमा विभाजन नभएका सम्पर्कहरूलाई हटाउने छ।"</string>
     <string name="savingDisplayGroups" msgid="6863012138107446030">"प्रदर्शन विकल्पहरू बचत गर्दै ..."</string>
@@ -187,16 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"एक वा बढी फाइलहरू आयात गर्न सकिएन (%s)।"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g>निर्यात सकियो।"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"सम्पर्क ठेगानाहरू निर्यात गर्ने सकियो।"</string>
-    <!-- no translation found for exporting_vcard_finished_toast (5995505525489290221) -->
-    <skip />
-    <!-- no translation found for touch_to_share_contacts (3237211496215699092) -->
-    <skip />
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> निर्यात रद्द गरियो।"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"सम्पर्क डेटा निर्यात हुँदै"</string>
-    <!-- no translation found for exporting_contact_list_message (141905615542638683) -->
-    <skip />
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"तपाईँको सम्पर्क डेटा  <xliff:g id="FILE_NAME">%s</xliff:g> मा निर्यात हुँदै छ।"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"डेटाबेस जानकारी पाउन सकेन।"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"निर्यात योग्य सम्पर्कहरू छैनन्। यदि तपाईँसँग फोनमा सम्पर्कहरू छन् भने केही डेटा प्रदायकहरूले फोनबाट सम्पर्कहरू निर्यात गर्ने अनुमति दिँदैनन्।"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"निर्यात योग्य सम्पर्कहरू छैनन्। यदि तपाईँसँग फोनमा सम्पर्कहरू छन् भने केही डेटा प्रदायकहरूले फोनबाट सम्पर्कहरू निर्यात गर्ने अनुमति दिँदैनन्।"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard रचनाकार राम्ररी सुरु भएन।"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"निर्यात गर्न सकेन"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"सम्पर्क डेटा निर्यात गरिएको थिएन \n कारण: \" <xliff:g id="FAIL_REASON">%s</xliff:g> \""</string>
@@ -210,8 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard आयात अनुरोध अस्वीकृत गरियो। पछि फेरि प्रयास गर्नुहोस्।"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> तुरुन्तै निर्यात गरिने छ।"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"फाइल तुरुन्तै निर्यात गरिने छ।"</string>
-    <!-- no translation found for contacts_export_will_start_message (4527597765334949574) -->
-    <skip />
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard निर्यात अनुरोध अस्वीकार गरियो। कृपया फेरि प्रयास गर्नुहोस्।"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"सम्पर्क"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"स्थानीय अस्थायी भण्डारणका लागि vCard (हरू) क्यास गर्दै ।  वास्तविक आयात छिट्टै सुरु हुने छ।"</string>
@@ -224,21 +215,16 @@
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"क्रमवद्घ गर्नुहोस्"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"नाम"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"थर"</string>
-    <string name="display_options_view_names_as" msgid="3232196224409242435">"नामको ढाँचा"</string>
+    <string name="display_options_view_names_as" msgid="3232196224409242435">"नाम ढाँचा"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"नाम पहिले"</string>
-    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"थर पहिले"</string>
+    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"थर पहिला"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"नयाँ सम्पर्कहरूका लागि पूर्वनिर्धारित खाता"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"सम्पर्क मेटाडाटा [DOGFOOD]लाई सिंक गर्नुहोस्"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"सम्पर्क मेटाडाटालाई सिंक गर्नुहोस्"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"मेटाडेटा सिंकको खातामा सम्पर्क गर्नुहोस्"</string>
     <string name="setting_about" msgid="3926137653588942297">"सम्पर्कहरूको बारेमा"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"सेटिङहरू"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"देखिने सम्पर्कहरू साझेदारी गर्नुहोस्"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"देख्न सकिने सम्पर्कहरू साझेदारी गर्न असफल भयो।"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"मनपर्ने सम्पर्क साझेदारी गर्नुहोस्"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"सबै सम्पर्क साझेदारी गर्नुहोस्"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"सम्पर्कहरू साझेदारी गर्न असफल भयो।"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"आयात/निर्यात सम्पर्कहरू"</string>
-    <string name="dialog_import" msgid="5177004290082451296">"सम्पर्कहरूलाई आयात गर्नुहोस्"</string>
+    <string name="dialog_import" msgid="5177004290082451296">"सम्पर्क आयात गर्नुहोस्"</string>
     <string name="share_error" msgid="665756457151793108">"यस सम्पर्कलाई साझेदारी गर्न सकिँदैन।"</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"साझेदारी गर्न कुनै सम्पर्क ठेगानाहरू छैनन्।"</string>
     <string name="menu_search" msgid="7464453023659824700">"खोज्नुहोस्"</string>
@@ -274,11 +260,10 @@
     </plurals>
     <string name="about_build_version" msgid="4221971683776635130">"बिल्ड संस्करण"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"खुला स्रोत इजाजतपत्रहरू"</string>
-    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"खुला स्रोत सफ्टवेयरका लागि इजाजतपत्रका विवरणहरू"</string>
+    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"खुला स्रोत सफ्टवेयरका लागि इजाजतपत्र विवरणहरू"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"गोपनीयता नीति"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"सेवा सर्तहरू"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"खुलास्रोत इजाजतपत्रहरू"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url खोल्न सकिएन।"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> जाँच गरियो"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> जाँच गरिएन"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"भिडियो कल गर्नुहोस्"</string>
diff --git a/res-common/values-nl-sw600dp/strings.xml b/res-common/values-nl-sw600dp/strings.xml
deleted file mode 100644
index bc38522..0000000
--- a/res-common/values-nl-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Alleen tablet, niet gesynchroniseerd"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Er zijn geen exporteerbare contacten. Als je wel contacten op je tablet hebt opgeslagen, staat je gegevensprovider het exporteren van contacten van de tablet mogelijk niet toe."</string>
-</resources>
diff --git a/res-common/values-nl/strings.xml b/res-common/values-nl/strings.xml
index f96964e..9aa53e6 100644
--- a/res-common/values-nl/strings.xml
+++ b/res-common/values-nl/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Pager werk bellen"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> bellen"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS bellen"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (bellen)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Sms\'en naar <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Sms\'en naar huis"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Sms\'en naar mobiel"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Sms\'en naar pager werk"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Sms\'en naar <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Sms\'en naar MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (sms\'en)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Videogesprek starten"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Lijst regelmatige contacten wissen?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Je wist de lijst met contacten waarmee je regelmatig contact opneemt in de apps Contacten en Telefoon, en e-mailapps moeten je voorkeursadressen weer opnieuw leren."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contacten"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Overig"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Directory"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Zakelijke contactenlijst"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Zakelijke contactenlijst"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Alle contacten"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ik"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Zoeken..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Regelmatig contact mee opgenomen"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Contact weergeven"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Alle contacten met telefoonnummers"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contacten uit werkprofiel"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contacten uit werkprofiel"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Updates bekijken"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Niet gesynchr. telefoon"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Telefoon-contact, synchr. uit"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Naam"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Bijnaam"</string>
     <string name="full_name" msgid="885420216812981202">"Naam"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Kan een of meer bestanden niet importeren (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Exporteren van <xliff:g id="FILENAME">%s</xliff:g> voltooid."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Contacten geëxporteerd."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"De contacten zijn geëxporteerd. Klik op de melding om contacten te delen."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Tik om contacten te delen."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exporteren van <xliff:g id="FILENAME">%s</xliff:g> geannuleerd."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Contactgegevens exporteren"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Contactgegevens worden geëxporteerd."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Je contactgegevens worden geëxporteerd naar: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Kan databasegegevens niet ophalen."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Er zijn geen exporteerbare contacten. Als je wel contacten op je telefoon hebt opgeslagen, staat je gegevensprovider het exporteren van contacten van de telefoon mogelijk niet toe."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Er zijn geen exporteerbare contacten. Als je wel contacten op je telefoon hebt opgeslagen, staat je gegevensprovider het exporteren van contacten van de telefoon mogelijk niet toe."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"De vCard-editor is niet correct gestart."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Kan niet exporteren"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"De contactgegevens zijn niet geëxporteerd.\nReden: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\'"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Verzoek voor vCard-import is geweigerd. Probeer het later opnieuw."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> wordt binnenkort geëxporteerd."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Dit bestand wordt binnenkort geëxporteerd."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Contacten worden binnenkort geëxporteerd."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Verzoek voor vCard-export is geweigerd. Probeer het later opnieuw."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Bezig met opslaan van vCard(s) in de lokale tijdelijke opslag. Het daadwerkelijke importeren begint binnenkort."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Voornaam eerst"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Achternaam eerst"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Standaardaccount voor nieuwe contacten"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Metadata van contacten synchroniseren [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Metadata van contacten synchroniseren"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Synchronisatieaccount voor metadata van contacten"</string>
     <string name="setting_about" msgid="3926137653588942297">"Over Contacten"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Instellingen"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Zichtbare contacten delen"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Kan zichtbare contacten niet delen."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Favoriete contacten delen"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Alle contacten delen"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kan contacten niet delen."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Contacten importeren/exporteren"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Contacten importeren"</string>
     <string name="share_error" msgid="665756457151793108">"Dit contact kan niet worden gedeeld."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Privacybeleid"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Servicevoorwaarden"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Open-sourcelicenties"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Kan de URL niet openen."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> geselecteerd"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> niet geselecteerd"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Videogesprek starten"</string>
diff --git a/res-common/values-pa-rIN-sw600dp/strings.xml b/res-common/values-pa-rIN-sw600dp/strings.xml
deleted file mode 100644
index e065922..0000000
--- a/res-common/values-pa-rIN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"ਸਿਰਫ਼-ਟੈਬਲੈੱਟ, ਸਮਕਾਲੀਕਿਰਤ ਨਹੀਂ"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"ਇੱਥੇ ਕੋਈ ਵੀ ਨਿਰਯਾਤ ਕਰਨਯੋਗ ਸੰਪਰਕ ਨਹੀਂ ਹਨ। ਜੇਕਰ ਤੁਹਾਡੇ ਕੋਲ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਵਿੱਚ ਸੰਪਰਕ ਨਹੀਂ ਹਨ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਕੁਝ ਡੈਟਾ ਪ੍ਰਦਾਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਟੈਬਲੈੱਟ ਤੋਂ ਨਿਰਯਾਤ ਕਰਨ ਦੀ ਮਨਜ਼ੂਰੀ ਨਾ ਦੇਣ।"</string>
-</resources>
diff --git a/res-common/values-pa-rIN/strings.xml b/res-common/values-pa-rIN/strings.xml
index 488f5dd..673beab 100644
--- a/res-common/values-pa-rIN/strings.xml
+++ b/res-common/values-pa-rIN/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"ਦਫ਼ਤਰ ਦੇ ਪੇਜ਼ਰ ਤੇ ਕਾਲ ਕਰੋ"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> ਨੂੰ ਕਾਲ ਕਰੋ"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS ਕਾਲ ਕਰੋ"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ਕਾਲ ਕਰੋ)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
     <string name="sms_home" msgid="7765831490534280540">"ਘਰ ਦੇ ਨੰਬਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"ਮੋਬਾਈਲ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"ਦਫ਼ਤਰ ਦੇ ਪੇਜ਼ਰ ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> ਨੂੰ ਟੈਕਸਟ ਕਰੋ"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS ਤੇ ਟੈਕਸਟ ਕਰੋ"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ਸੁਨੇਹਾ ਭੇਜੋ)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"ਵੀਡੀਓ ਕਾਲ ਕਰੋ"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"ਕੀ ਅਕਸਰ ਸੰਪਰਕ ਕੀਤੇ ਜਾਣ ਵਾਲੇ ਹਟਾਉਣੇ ਹਨ?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"ਤੁਸੀਂ ਵਾਰੀ-ਵਾਰੀ ਸੰਪਰਕ ਅਤੇ ਫੋਨ ਐਪਸ ਵਿੱਚ ਸੰਪਰਕ ਕੀਤੀ ਸੂਚੀ ਹਟਾਓਗੇ ਅਤੇ ਈਮੇਲ ਐਪਸ ਤੇ ਸਕ੍ਰੈਚ ਨਾਲ ਤੁਹਾਡੀਆਂ ਪਤਾ ਲਗਾਉਣ ਦੀਆਂ ਤਰਜੀਹਾਂ ਜਾਣਨ ਲਈ ਜ਼ੋਰ ਪਾਓਗੇ।"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"ਸੰਪਰਕ"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"ਹੋਰ"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ਡਾਇਰੈਕਟਰੀ"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"ਕੰਮ ਡਾਇਰੈਕਟਰੀ"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"ਕੰਮ ਡਾਇਰੈਕਟਰੀ"</string>
     <string name="local_search_label" msgid="9094584931063745728">"ਸਾਰੇ ਸੰਪਰਕ"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"ਮੈਂ"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"ਖੋਜ ਰਿਹਾ ਹੈ..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"ਅਕਸਰ ਸੰਪਰਕ ਕੀਤੇ ਜਾਣ ਵਾਲੇ"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"ਸੰਪਰਕ ਦੇਖੋ"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ਫੋਨ ਨੰਬਰਾਂ ਵਾਲੇ ਸਾਰੇ ਸੰਪਰਕ"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੰਪਰਕ"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"ਕੰਮ ਪ੍ਰੋਫਾਈਲ ਸੰਪਰਕ"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"ਅਪਡੇਟਾਂ ਦੇਖੋ"</string>
-    <string name="account_phone" msgid="6104157990869081962">"ਕੇਵਲ-ਫ਼ੋਨ \'ਤੇ, ਅਣਸਮਕਾਲੀਕਿਰਤ"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"ਫੋਨ-ਓਨਲੀ, ਅਣਸਿੰਕਡ"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"ਨਾਮ"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"ਉਪਨਾਮ"</string>
     <string name="full_name" msgid="885420216812981202">"ਨਾਮ"</string>
@@ -117,7 +115,7 @@
     <string name="ghostData_title" msgid="6221293237772204604">"ਸਿਰਲੇਖ"</string>
     <string name="label_notes" msgid="3997277594846722699">"ਸੂਚਨਾਵਾਂ"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="8620657380165071493">"ਵੈੱਬਸਾਈਟ"</string>
+    <string name="websiteLabelsGroup" msgid="8620657380165071493">"ਵੈਬਸਾਈਟ"</string>
     <string name="groupsLabel" msgid="3574316547053047551">"ਸਮੂਹ"</string>
     <string name="email_home" msgid="2230967805906450693">"ਘਰ ਈਮੇਲ ਕਰੋ"</string>
     <string name="email_mobile" msgid="7532438378678903685">"ਮੋਬਾਈਲ ਤੇ ਈਮੇਲ ਕਰੋ"</string>
@@ -150,7 +148,7 @@
     <string name="expand_collapse_phonetic_name_fields_description" msgid="5241493357460353777">"ਫੋਨੈਟਿਕ ਨਾਮ ਖੇਤਰਾਂ ਦਾ ਵਿਸਤਾਰ ਕਰੋ ਜਾਂ ਨਸ਼ਟ ਕਰੋ"</string>
     <string name="list_filter_all_accounts" msgid="4265359896628915784">"ਸਾਰੇ ਸੰਪਰਕ"</string>
     <string name="list_filter_all_starred" msgid="9060325494254507806">"ਸਟਾਰ ਵਾਲੇ"</string>
-    <string name="list_filter_customize" msgid="2352794292558465089">"ਵਿਸ਼ੇਸ਼-ਵਿਉਂਤਬੱਧ ਕਰੋ"</string>
+    <string name="list_filter_customize" msgid="2352794292558465089">"ਅਨੁਕੂਲਿਤ ਕਰੋ"</string>
     <string name="list_filter_single" msgid="4553809449379139446">"ਸੰਪਰਕ"</string>
     <string name="display_ungrouped" msgid="3669471582032440138">"ਹੋਰ ਸਾਰੇ ਸੰਪਰਕ"</string>
     <string name="display_all_contacts" msgid="7251385818740728862">"ਸਾਰੇ ਸੰਪਰਕ"</string>
@@ -176,7 +174,7 @@
     <string name="fail_reason_could_not_open_file" msgid="7041148341788958325">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" ਨੂੰ ਖੋਲ੍ਹ ਨਹੀਂ ਸਕਿਆ: <xliff:g id="EXACT_REASON">%s</xliff:g>।"</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="1231982631020480035">"ਐਕਸਪੋਰਟ ਚਾਲੂ ਨਹੀੰ ਕਰ ਸਕਿਆ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"।"</string>
     <string name="fail_reason_no_exportable_contact" msgid="3717046989062541369">"ਕੋਈ ਵੀ ਨਿਰਯਾਤ ਕਰਨ ਯੋਗ ਸੰਪਰਕ ਨਹੀਂ ਹਨ।"</string>
-    <string name="missing_required_permission" msgid="3120850759881656369">"ਤੁਸੀਂ ਇੱਕ ਲੁੜੀਂਦੀ ਅਨੁਮਤੀ ਨੂੰ ਅਯੋਗ ਬਣਾਇਆ ਹੈ।"</string>
+    <string name="missing_required_permission" msgid="3120850759881656369">"ਤੁਸੀਂ ਇੱਕ ਲੁੜੀਂਦੀ ਅਨੁਮਤੀ ਨੂੰ ਅਸਮਰੱਥ ਬਣਾਇਆ ਹੈ।"</string>
     <string name="fail_reason_error_occurred_during_export" msgid="8426833603664168716">"ਨਿਰਯਾਤ ਕਰਨ ਦੌਰਾਨ ਇੱਕ ਅਸ਼ੁੱਧੀ ਵਾਪਰੀ: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"।"</string>
     <string name="fail_reason_too_long_filename" msgid="3996610741248972232">"ਲੁੜੀਂਦਾ ਫਾਈਲ ਨਾਮ ਬਹੁਤ ਜ਼ਿਆਦਾ ਵੱਡਾ ਹੈ (\"<xliff:g id="FILENAME">%s</xliff:g>\")।"</string>
     <string name="fail_reason_io_error" msgid="7736686553669161933">"I/O ਅਸ਼ੁੱਧੀ"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ਇੱਕ ਜਾਂ ਵੱਧ ਫਾਈਲਾਂ ਆਯਾਤ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ (%s)।"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ।"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"ਸੰਪਰਕਾਂ ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ।"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"ਸੰਪਰਕਾਂ ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ, ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਸੂਚਨਾ \'ਤੇ ਕਲਿੱਕ ਕਰੋ।"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਨਿਰਯਾਤ ਕਰਨਾ ਰੱਦ ਕੀਤਾ।"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"ਸੰਪਰਕ ਡਾਟਾ ਨਿਰਯਾਤ ਕਰ ਰਿਹਾ ਹੈ"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"ਸੰਪਰਕ ਡੈਟੇ ਨੂੰ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ।"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"ਤੁਹਾਡਾ ਸੰਪਰਕ ਡਾਟਾ ਇਸ ਵਿੱਚ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ: <xliff:g id="FILE_NAME">%s</xliff:g>।"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ਡਾਟਾਬੇਸ ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"ਨਿਰਯਾਤ ਕਰਨ ਯੋਗ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ। ਜੇਕਰ ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ, ਤਾਂ ਕੁਝ ਡਾਟਾ ਪ੍ਰਦਾਤਾ ਸੰਪਰਕਾਂ ਨੂੰ ਫੋਨ ਤੋਂ ਨਿਰਯਾਤ ਕੀਤੇ ਜਾਣ ਦੀ ਆਗਿਆ ਨਹੀਂ ਵੀ ਦੇ ਸਕਦੇ।"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"ਨਿਰਯਾਤ ਕਰਨ ਯੋਗ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ। ਜੇਕਰ ਤੁਹਾਡੇ ਫੋਨ ਤੇ ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਹਨ, ਤਾਂ ਕੁਝ ਡਾਟਾ ਪ੍ਰਦਾਤਾ ਸੰਪਰਕਾਂ ਨੂੰ ਫੋਨ ਤੋਂ ਨਿਰਯਾਤ ਕੀਤੇ ਜਾਣ ਦੀ ਆਗਿਆ ਨਹੀਂ ਵੀ ਦੇ ਸਕਦੇ।"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard ਕੰਪੋਜ਼ਰ ਸਹੀ ਢੰਗ ਨਾਲ ਚਾਲੂ ਨਹੀਂ ਹੋਇਆ।"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"ਨਿਰਯਾਤ ਨਹੀਂ ਕਰ ਸਕਿਆ"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"ਸੰਪਰਕ ਡਾਟਾ ਨਿਰਯਾਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ।\nਕਾਰਨ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard ਆਯਾਤ ਬੇਨਤੀ ਅਸਵੀਕਾਰ ਕੀਤੀ ਗਈ ਸੀ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> ਨੂੰ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾਏਗਾ।"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ਫਾਈਲ ਥੋੜ੍ਹੀ ਦੇਰ ਵਿੱਚ ਨਿਰਯਾਤ ਕੀਤੀ ਜਾਏਗੀ।"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"ਸੰਪਰਕਾਂ ਨੂੰ ਜਲਦ ਹੀ ਨਿਰਯਾਤ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard ਨਿਰਯਾਤ ਬੇਨਤੀ ਅਸਵੀਕਾਰ ਕੀਤੀ ਗਈ ਸੀ। ਬਾਅਦ ਵਿੱਚ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"ਸੰਪਰਕ"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"ਸਥਾਨਕ ਅਸਥਾਈ ਸਟੋਰੇਜ ਲਈ vCard ਕੈਚ ਕਰ ਰਿਹਾ ਹੈ। ਅਸਲੀ ਆਯਾਤ ਜਲਦੀ ਹੀ ਚਾਲੂ ਹੋਵੇਗਾ।"</string>
@@ -217,22 +212,17 @@
     <string name="caching_vcard_title" msgid="9185299351381102305">"ਕੈਚ ਕਰ ਰਿਹਾ ਹੈ"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"<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="4142192068495589925">".vcf ਫ਼ਾਈਲ ਵਿੱਚ ਨਿਰਯਾਤ ਕਰੋ"</string>
-    <string name="display_options_sort_list_by" msgid="8635268562263708102">"ਇਸ ਮੁਤਾਬਕ ਛਾਂਟੋ"</string>
+    <string name="display_options_sort_list_by" msgid="8635268562263708102">"ਇਸ ਅਨੁਸਾਰ ਛਾਂਟੋ"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"ਪਹਿਲਾ ਨਾਮ"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"ਆਖਰੀ ਨਾਮ"</string>
-    <string name="display_options_view_names_as" msgid="3232196224409242435">"ਨਾਮ ਦੀ ਵੰਨਗੀ"</string>
+    <string name="display_options_view_names_as" msgid="3232196224409242435">"ਨਾਮ ਫੌਰਮੈਟ"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"ਪਹਿਲਾਂ ਪਹਿਲਾ ਨਾਮ"</string>
-    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"ਪਹਿਲਾਂ ਆਖਰੀ ਨਾਮ"</string>
+    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"ਪਹਿਲਾਂ ਆਖ਼ਰੀ ਨਾਮ"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"ਨਵੇਂ ਸੰਪਰਕਾਂ ਲਈ ਪੂਰਵ-ਨਿਰਧਾਰਤ ਖਾਤਾ"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"ਸੰਪਰਕ ਮੈਟਾਡੈਟੇ ਨੂੰ ਸਮਕਾਲੀ ਕਰੋ [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"ਸੰਪਰਕ ਮੈਟਾਡੈਟੇ ਨੂੰ ਸਮਕਾਲੀ ਕਰੋ"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"ਸੰਪਰਕ ਮੈਟਾਡੈਟਾ ਸਮਕਾਲੀਕਰਨ ਖਾਤਾ"</string>
     <string name="setting_about" msgid="3926137653588942297">"ਸੰਪਰਕਾਂ ਬਾਰੇ"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"ਸੈਟਿੰਗਾਂ"</string>
-    <string name="share_visible_contacts" msgid="2150662668080757107">"ਦਿਖਣਯੋਗ ਸੰਪਰਕ ਸਾਂਝੇ ਕਰੋ"</string>
+    <string name="share_visible_contacts" msgid="2150662668080757107">"ਦਿੱਸਦੇ ਸੰਪਰਕ ਸ਼ੇਅਰ ਕਰੋ"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"ਦ੍ਰਿਸ਼ਮਾਨ ਸੰਪਰਕ ਸ਼ੇਅਰ ਕਰਨ ਵਿੱਚ ਅਸਫਲ।"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"ਮਨਪਸੰਦ ਸੰਪਰਕਾਂ ਨੂੰ ਸਾਂਝਾ ਕਰੋ"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"ਸਾਰੇ ਸੰਪਰਕ ਸਾਂਝੇ ਕਰੋ"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"ਸੰਪਰਕ ਸਾਂਝੇ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ।"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"ਸੰਪਰਕ ਆਯਾਤ/ਨਿਰਯਾਤ ਕਰੋ"</string>
     <string name="dialog_import" msgid="5177004290082451296">"ਸੰਪਰਕ ਆਯਾਤ ਕਰੋ"</string>
     <string name="share_error" msgid="665756457151793108">"ਇਸ ਸੰਪਰਕ ਸ਼ੇਅਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
@@ -268,13 +258,12 @@
       <item quantity="one"> <xliff:g id="TITLE_2">%1$s</xliff:g>। <xliff:g id="COUNT_3">%2$d</xliff:g> ਬਿਨਾਂ ਪੜ੍ਹੀਆਂ ਆਈਟਮਾਂ। </item>
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>। <xliff:g id="COUNT_3">%2$d</xliff:g> ਬਿਨਾਂ ਪੜ੍ਹੀਆਂ ਆਈਟਮਾਂ। </item>
     </plurals>
-    <string name="about_build_version" msgid="4221971683776635130">"ਨਿਰਮਾਣ ਸਰੂਪ"</string>
-    <string name="about_open_source_licenses" msgid="3224958101863814649">"ਖੁੱਲ੍ਹਾ ਸ੍ਰੋਤ ਲਾਇਸੰਸ"</string>
-    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ਖੁੱਲ੍ਹਾ ਸ੍ਰੋਤ ਸਾਫਟਵੇਅਰ ਲਈ ਲਾਇਸੰਸ ਵੇਰਵੇ"</string>
+    <string name="about_build_version" msgid="4221971683776635130">"ਬਿਲਡ ਵਰਜਨ"</string>
+    <string name="about_open_source_licenses" msgid="3224958101863814649">"ਓਪਨ ਸੋਰਸ ਲਾਇਸੰਸ"</string>
+    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ਓਪਨ ਸੋਰਸ ਸੌਫਟਵੇਅਰ ਲਈ ਲਾਇਸੰਸ ਵੇਰਵੇ"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"ਪਰਦੇਦਾਰੀ ਨੀਤੀ"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"ਸੇਵਾ ਦੀਆਂ ਮਦਾਂ"</string>
-    <string name="activity_title_licenses" msgid="7812517458691564230">"ਖੁੱਲ੍ਹਾ ਸ੍ਰੋਤ ਲਾਇਸੰਸ"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url ਖੋਲ੍ਹਣ ਵਿੱਚ ਅਸਫਲ।"</string>
+    <string name="activity_title_licenses" msgid="7812517458691564230">"ਓਪਨ ਸੋਰਸ ਲਾਇਸੰਸ"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ਜਾਂਚੀ ਗਈ"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ਜਾਂਚੀ ਨਹੀਂ ਗਈ"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"ਵੀਡੀਓ ਕਾਲ ਕਰੋ"</string>
diff --git a/res-common/values-pl-sw600dp/strings.xml b/res-common/values-pl-sw600dp/strings.xml
deleted file mode 100644
index 7008464..0000000
--- a/res-common/values-pl-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tylko tablet, brak synchronizacji"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Brak kontaktów do eksportu. Jeśli masz na tablecie kontakty, być może niektórzy dostawcy danych nie zezwalają na ich eksport z tabletu."</string>
-</resources>
diff --git a/res-common/values-pl/strings.xml b/res-common/values-pl/strings.xml
index 0dcfdfa..c93528c 100644
--- a/res-common/values-pl/strings.xml
+++ b/res-common/values-pl/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Połącz – służbowy pager"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Połącz – <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Połącz – MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (zadzwoń)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS – <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS – domowy"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS – komórka"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS – służbowy pager"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS – <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS – MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (wyślij wiadomość)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Rozmowa wideo"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Wyczyścić częste kontakty?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Wyczyścisz listę częstych kontaktów w aplikacjach Kontakty i Telefon. Aplikacje pocztowe będą musiały od nowa poznać Twoje preferencje adresowe."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontakty"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Inne"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Katalog"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Katalog służbowy"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Katalog służbowy"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Wszystkie kontakty"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ja"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Szukam…"</string>
@@ -91,9 +89,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Częste kontakty"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Pokaż kontakt"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Wszystkie kontakty z numerami telefonów"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Kontakty w profilu służbowym"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kontakty w profilu do pracy"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Pokaż aktualizacje"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Tylko telefon, brak synchronizacji"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Tylko telefon, brak synchronizacji"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Imię i nazwisko"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Pseudonim"</string>
     <string name="full_name" msgid="885420216812981202">"Imię i nazwisko"</string>
@@ -189,13 +187,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Nie można zaimportować co najmniej jednego pliku (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Zakończono eksportowanie pliku <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Eksportowanie kontaktów zostało zakończone."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontakty zostały wyeksportowane. Aby je udostępnić, kliknij powiadomienie."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Kliknij, by udostępnić kontakty."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Anulowano eksportowanie pliku <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Eksportowanie danych kontaktowych"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Dane kontaktów są eksportowane."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Dane kontaktów są eksportowane do pliku <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Nie udało się pobrać informacji z bazy danych."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Brak kontaktów do eksportu. Jeśli masz w telefonie kontakty, być może dostawcy danych nie zezwalają na ich eksport z telefonu."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Brak kontaktów do eksportu. Jeśli masz w telefonie kontakty, być może dostawcy danych nie zezwalają na ich eksport z telefonu."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Obiekt tworzenia danych vCard nie uruchomił się poprawnie."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Eksport nieudany"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Dane kontaktów nie zostały wyeksportowane.\nPrzyczyna: „<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Żądanie importu danych vCard zostało odrzucone. Spróbuj ponownie później."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Plik <xliff:g id="FILENAME">%s</xliff:g> zostanie za chwilę wyeksportowany."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Plik zostanie za chwilę wyeksportowany."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Wkrótce kontakty zostaną wyeksportowane."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Żądanie eksportu danych vCard zostało odrzucone. Spróbuj ponownie później."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Trwa buforowanie plików vCard w lokalnym obszarze tymczasowym. Właściwy import rozpocznie się za chwilę."</string>
@@ -226,15 +221,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Najpierw imię"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Najpierw nazwisko"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Domyślne konto dla nowych kontaktów"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Synchronizuj metadane kontaktów [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Synchronizuj metadane kontaktów"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Konto do synchronizacji metadanych kontaktu"</string>
     <string name="setting_about" msgid="3926137653588942297">"Aplikacja Kontakty"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Ustawienia"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Udostępnij widoczne kontakty"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Nie udało się udostępnić widocznych kontaktów."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Udostępnij ulubione kontakty"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Udostępnij wszystkie kontakty"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Nie udało się udostępnić kontaktów."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importuj/eksportuj kontakty"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importuj kontakty"</string>
     <string name="share_error" msgid="665756457151793108">"Tego kontaktu nie można udostępnić."</string>
@@ -278,7 +268,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Polityka prywatności"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Warunki usługi"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licencje open source"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Nie udało się otworzyć URL-a."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> zaznaczone"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> niezaznaczone"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Rozpocznij rozmowę wideo"</string>
diff --git a/res-common/values-pt-rBR-sw600dp/strings.xml b/res-common/values-pt-rBR-sw600dp/strings.xml
deleted file mode 100644
index a814eb0..0000000
--- a/res-common/values-pt-rBR-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Somente tablet, não sincronizado"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Não há contatos exportáveis. Se você tem contatos no seu tablet, alguns provedores de dados podem não permitir que os contatos sejam exportados a partir do tablet."</string>
-</resources>
diff --git a/res-common/values-pt-rBR/strings.xml b/res-common/values-pt-rBR/strings.xml
index d12292b..d602133 100644
--- a/res-common/values-pt-rBR/strings.xml
+++ b/res-common/values-pt-rBR/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Ligar para pager comercial"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Ligar para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Ligar para MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (chamada)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Enviar SMS para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Enviar SMS para residência"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Enviar SMS para celular"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Enviar SMS para pager comercial"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Enviar SMS para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Enviar SMS para MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (mensagem)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Fazer videochamada"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Apagar contatos frequentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Você apagará a lista de contatos frequentes nos apps Contatos e Telefone, fazendo com que os apps de e-mail tenham que redefinir suas preferências de endereçamento."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contatos"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Outro"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Diretório"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Diretório de trabalho"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Diretório de trabalho"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Todos os contatos"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Eu"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Pesquisando…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contatos frequentes"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Visualizar contato"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Todos os contatos com números de telefone"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contatos do perfil de trabalho"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contatos do perfil de trabalho"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Ver atualizações"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Somente telefone, não sincronizado"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Somente telefone, não sincronizado"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nome"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Apelido"</string>
     <string name="full_name" msgid="885420216812981202">"Nome"</string>
@@ -187,16 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Um ou mais arquivos não puderam ser importados (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Exportação de <xliff:g id="FILENAME">%s</xliff:g> concluída."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"A exportação de contatos foi concluída."</string>
-    <!-- no translation found for exporting_vcard_finished_toast (5995505525489290221) -->
-    <skip />
-    <!-- no translation found for touch_to_share_contacts (3237211496215699092) -->
-    <skip />
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exportação de <xliff:g id="FILENAME">%s</xliff:g> cancelada."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exportando dados do contato"</string>
-    <!-- no translation found for exporting_contact_list_message (141905615542638683) -->
-    <skip />
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Seus dados de contato estão sendo exportados para: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Não foi possível obter as informações do banco de dados."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Não há contatos exportáveis. Se você tiver contatos em seu telefone, alguns provedores de dados podem não permitir que os contatos sejam exportados a partir do telefone."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Não há contatos exportáveis. Se você tiver contatos em seu telefone, alguns provedores de dados podem não permitir que os contatos sejam exportados a partir do telefone."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"O criador do vCard não iniciou corretamente."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Impossível exportar"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Os dados de contato não foram exportados.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -210,8 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"O pedido de importação do vCard foi rejeitado. Tente novamente mais tarde."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> será exportado em breve."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"O arquivo será exportado em breve."</string>
-    <!-- no translation found for contacts_export_will_start_message (4527597765334949574) -->
-    <skip />
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contato"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Armazenando VCards em cache no armazenamento temporário local. A importação real começará em breve."</string>
@@ -228,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Primeiro o nome"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Primeiro o sobrenome"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Conta padrão para novos contatos"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sincronizar metadados de contatos [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sincronizar metadados de contatos"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Conta de sincronização de metadados de contato"</string>
     <string name="setting_about" msgid="3926137653588942297">"Sobre Contatos"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Config."</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Compartilhar contatos visíveis"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Falha ao compartilhar contatos visíveis."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Compartilhar contatos favoritos"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Compartilhar todos os contatos"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Falha ao compartilhar contatos."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importar/exportar contatos"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importar contatos"</string>
     <string name="share_error" msgid="665756457151793108">"Este contato não pode ser compartilhado."</string>
@@ -278,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Política de Privacidade"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Termos de Serviço"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licenças de código aberto"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Falha ao abrir o URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> verificado"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> não verificado"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Realizar videochamada"</string>
diff --git a/res-common/values-pt-rPT-sw600dp/strings.xml b/res-common/values-pt-rPT-sw600dp/strings.xml
deleted file mode 100644
index 90d7ec0..0000000
--- a/res-common/values-pt-rPT-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Apenas tablet, não sincronizado"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Não existem contactos exportáveis. Se tem, efetivamente, contactos no tablet, alguns fornecedores de dados podem não permitir a exportação dos mesmos a partir do tablet."</string>
-</resources>
diff --git a/res-common/values-pt-rPT/strings.xml b/res-common/values-pt-rPT/strings.xml
index e834a9e..7b30327 100644
--- a/res-common/values-pt-rPT/strings.xml
+++ b/res-common/values-pt-rPT/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Telefonar para o pager do trabalho"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Telefonar para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Telefonar para um número MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Chamada)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Enviar mensagem de texto para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Enviar mensagem de texto para o telefone de casa"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Enviar mensagem de texto para telemóvel"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Enviar mensagem de texto para o pager do trabalho"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Enviar mensagem de texto para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Enviar mensagem de texto para um número MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Mensagem)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Fazer videochamada"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Limpar contactos frequentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Limpa a lista de contactos frequentes nas aplicações Contactos e Telemóvel e força as aplicações de email a aprenderem as suas preferências de endereço de raiz."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contactos"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Outro"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Diretório"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Diretório de trabalho"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Diretório de trabalho"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Todos os contactos"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Eu"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"A pesquisar…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contactados frequentemente"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Ver contacto"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Todos os contactos com números de telefone"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contactos do perfil de trabalho"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contactos do perfil de trabalho"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Ver atualizações"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Apenas telemóvel, não sincronizado"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Apenas telemóvel, não sincronizado"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nome"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Pseudónimo"</string>
     <string name="full_name" msgid="885420216812981202">"Nome"</string>
@@ -107,7 +105,7 @@
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"Telefone"</string>
     <string name="emailLabelsGroup" msgid="4696310712601184208">"Email"</string>
     <string name="postalLabelsGroup" msgid="3727124282406728557">"Endereço"</string>
-    <string name="imLabelsGroup" msgid="8733603247535725786">"IM"</string>
+    <string name="imLabelsGroup" msgid="8733603247535725786">"Chat"</string>
     <string name="organizationLabelsGroup" msgid="961008074745871784">"Entidade"</string>
     <string name="relationLabelsGroup" msgid="3585294036166325520">"Tipo de relação"</string>
     <string name="eventLabelsGroup" msgid="4801419345682462171">"Data especial"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Não foi possível importar um ou mais ficheiros (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"A exportação de <xliff:g id="FILENAME">%s</xliff:g> terminou."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Exportação de contactos concluída."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Foi concluída a exportação dos contactos. Clique na notificação para partilhar contactos."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Toque para partilhar contactos."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"A exportação de <xliff:g id="FILENAME">%s</xliff:g> foi cancelada."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"A exportar dados do contacto"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Os dados de contactos estão a ser exportados."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Os dados de contactos estão a ser exportados para: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Não foi possível obter informações da base de dados"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Não existem contactos exportáveis. Se tiver contactos no seu telemóvel, alguns fornecedores de dados podem não permitir a exportação dos contactos a partir do telemóvel."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Não existem contactos exportáveis. Se tiver contactos no seu telemóvel, alguns fornecedores de dados podem não permitir a exportação dos contactos a partir do telemóvel."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"O compositor vCard não iniciou corretamente."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Impossível exportar"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Os dados de contactos não foram exportados.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"O pedido de importação do vCard foi rejeitado. Tente novamente mais tarde."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"O <xliff:g id="FILENAME">%s</xliff:g> será exportado em breve."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"O ficheiro é exportado em breve."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Os contactos serão exportados brevemente."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contacto"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"A colocar vCard(s) em cache no armazenamento temporário local. A importação efetiva começará brevemente."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Nome próprio em primeiro lugar"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Apelido em primeiro lugar"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Conta predefinida para novos contactos"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sincronizar metadados de contactos [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sincronizar metadados de contactos"</string>
-    <string name="setting_about" msgid="3926137653588942297">"Acerca do Contactos"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Definições"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Conta de sincronização de metadados de contactos"</string>
+    <string name="setting_about" msgid="3926137653588942297">"Acerca dos Contactos"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Partilhar contactos visíveis"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Falha ao partilhar os contactos visíveis."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Partilhar contactos favoritos"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Partilhar todos os contactos"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Falha ao partilhar os contactos."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importar/exportar contactos"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importar contactos"</string>
     <string name="share_error" msgid="665756457151793108">"Não é possível partilhar este contacto."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Política de Privacidade"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Termos de Utilização"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licenças de código aberto"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Falha ao abrir o URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> verificado"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> não verificado"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Efetuar videochamada"</string>
diff --git a/res-common/values-pt-sw600dp/strings.xml b/res-common/values-pt-sw600dp/strings.xml
deleted file mode 100644
index a814eb0..0000000
--- a/res-common/values-pt-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Somente tablet, não sincronizado"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Não há contatos exportáveis. Se você tem contatos no seu tablet, alguns provedores de dados podem não permitir que os contatos sejam exportados a partir do tablet."</string>
-</resources>
diff --git a/res-common/values-pt/strings.xml b/res-common/values-pt/strings.xml
index d12292b..d602133 100644
--- a/res-common/values-pt/strings.xml
+++ b/res-common/values-pt/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Ligar para pager comercial"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Ligar para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Ligar para MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (chamada)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Enviar SMS para <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Enviar SMS para residência"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Enviar SMS para celular"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Enviar SMS para pager comercial"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Enviar SMS para <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Enviar SMS para MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (mensagem)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Fazer videochamada"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Apagar contatos frequentes?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Você apagará a lista de contatos frequentes nos apps Contatos e Telefone, fazendo com que os apps de e-mail tenham que redefinir suas preferências de endereçamento."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Contatos"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Outro"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Diretório"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Diretório de trabalho"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Diretório de trabalho"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Todos os contatos"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Eu"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Pesquisando…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contatos frequentes"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Visualizar contato"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Todos os contatos com números de telefone"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Contatos do perfil de trabalho"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Contatos do perfil de trabalho"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Ver atualizações"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Somente telefone, não sincronizado"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Somente telefone, não sincronizado"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nome"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Apelido"</string>
     <string name="full_name" msgid="885420216812981202">"Nome"</string>
@@ -187,16 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Um ou mais arquivos não puderam ser importados (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Exportação de <xliff:g id="FILENAME">%s</xliff:g> concluída."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"A exportação de contatos foi concluída."</string>
-    <!-- no translation found for exporting_vcard_finished_toast (5995505525489290221) -->
-    <skip />
-    <!-- no translation found for touch_to_share_contacts (3237211496215699092) -->
-    <skip />
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exportação de <xliff:g id="FILENAME">%s</xliff:g> cancelada."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Exportando dados do contato"</string>
-    <!-- no translation found for exporting_contact_list_message (141905615542638683) -->
-    <skip />
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Seus dados de contato estão sendo exportados para: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Não foi possível obter as informações do banco de dados."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Não há contatos exportáveis. Se você tiver contatos em seu telefone, alguns provedores de dados podem não permitir que os contatos sejam exportados a partir do telefone."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Não há contatos exportáveis. Se você tiver contatos em seu telefone, alguns provedores de dados podem não permitir que os contatos sejam exportados a partir do telefone."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"O criador do vCard não iniciou corretamente."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Impossível exportar"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Os dados de contato não foram exportados.\nMotivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -210,8 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"O pedido de importação do vCard foi rejeitado. Tente novamente mais tarde."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> será exportado em breve."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"O arquivo será exportado em breve."</string>
-    <!-- no translation found for contacts_export_will_start_message (4527597765334949574) -->
-    <skip />
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contato"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Armazenando VCards em cache no armazenamento temporário local. A importação real começará em breve."</string>
@@ -228,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Primeiro o nome"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Primeiro o sobrenome"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Conta padrão para novos contatos"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sincronizar metadados de contatos [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sincronizar metadados de contatos"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Conta de sincronização de metadados de contato"</string>
     <string name="setting_about" msgid="3926137653588942297">"Sobre Contatos"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Config."</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Compartilhar contatos visíveis"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Falha ao compartilhar contatos visíveis."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Compartilhar contatos favoritos"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Compartilhar todos os contatos"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Falha ao compartilhar contatos."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importar/exportar contatos"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importar contatos"</string>
     <string name="share_error" msgid="665756457151793108">"Este contato não pode ser compartilhado."</string>
@@ -278,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Política de Privacidade"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Termos de Serviço"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licenças de código aberto"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Falha ao abrir o URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> verificado"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> não verificado"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Realizar videochamada"</string>
diff --git a/res-common/values-ro-sw600dp/strings.xml b/res-common/values-ro-sw600dp/strings.xml
deleted file mode 100644
index 946f653..0000000
--- a/res-common/values-ro-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Numai pe tabletă, nesincronizată"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Nu există persoane de contact care să poată fi exportate. Dacă aveți persoane de contact pe tabletă, este posibil ca exportul acestora de pe tabletă să fie interzis de unii furnizori de date."</string>
-</resources>
diff --git a/res-common/values-ro/strings.xml b/res-common/values-ro/strings.xml
index 9190ff2..63de1b1 100644
--- a/res-common/values-ro/strings.xml
+++ b/res-common/values-ro/strings.xml
@@ -19,28 +19,27 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="toast_text_copied" msgid="8327159932780920627">"Text copiat"</string>
     <string name="copy_text" msgid="3424081789297978355">"Copiați în clipboard"</string>
-    <string name="call_custom" msgid="2786306789889210756">"Apelați <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="call_home" msgid="1479549630992276827">"Apelați numărul de domiciliu"</string>
-    <string name="call_mobile" msgid="8618334085824709009">"Apelați numărul de mobil"</string>
-    <string name="call_work" msgid="8299062439076337075">"Apelați numărul de serviciu"</string>
-    <string name="call_fax_work" msgid="3770754834467992571">"Apelați numărul de fax de serviciu"</string>
-    <string name="call_fax_home" msgid="6219051113573396065">"Apelați numărul de fax de domiciliu"</string>
-    <string name="call_pager" msgid="3038080882899955112">"Apelați numărul de pager"</string>
-    <string name="call_other" msgid="4472141328347894937">"Apelați"</string>
-    <string name="call_callback" msgid="687494744634190411">"Apelați un număr cu apelare inversă"</string>
-    <string name="call_car" msgid="9078083109758282133">"Apelați numărul de mașină"</string>
-    <string name="call_company_main" msgid="8768047233970315359">"Apelați numărul principal al companiei"</string>
-    <string name="call_isdn" msgid="3342482563847537747">"Apelați ISDN"</string>
-    <string name="call_main" msgid="4640261071249938558">"Apelați numărul principal"</string>
-    <string name="call_other_fax" msgid="2536328553125487877">"Apelați numărul de fax"</string>
-    <string name="call_radio" msgid="9055749313292712021">"Apelați un număr radio"</string>
-    <string name="call_telex" msgid="2909886619224843563">"Apelați un număr de telex"</string>
-    <string name="call_tty_tdd" msgid="6704940636171078852">"Apelați TTY/TDD"</string>
-    <string name="call_work_mobile" msgid="4408630608955148641">"Apelați numărul de mobil de la serviciu"</string>
-    <string name="call_work_pager" msgid="3036932765279753793">"Apelați numărul de pager de serviciu"</string>
-    <string name="call_assistant" msgid="5188990854852312696">"Apelați <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
-    <string name="call_mms" msgid="8998771923464696960">"Apelați MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (apelați)"</string>
+    <string name="call_custom" msgid="2786306789889210756">"Apelaţi <xliff:g id="CUSTOM">%s</xliff:g>"</string>
+    <string name="call_home" msgid="1479549630992276827">"Apelaţi numărul de domiciliu"</string>
+    <string name="call_mobile" msgid="8618334085824709009">"Apelaţi numărul de mobil"</string>
+    <string name="call_work" msgid="8299062439076337075">"Apelaţi numărul de serviciu"</string>
+    <string name="call_fax_work" msgid="3770754834467992571">"Apelaţi numărul de fax de serviciu"</string>
+    <string name="call_fax_home" msgid="6219051113573396065">"Apelaţi numărul de fax de domiciliu"</string>
+    <string name="call_pager" msgid="3038080882899955112">"Apelaţi numărul de pager"</string>
+    <string name="call_other" msgid="4472141328347894937">"Apelaţi"</string>
+    <string name="call_callback" msgid="687494744634190411">"Apelaţi un număr cu apelare inversă"</string>
+    <string name="call_car" msgid="9078083109758282133">"Apelaţi numărul de maşină"</string>
+    <string name="call_company_main" msgid="8768047233970315359">"Apelaţi numărul principal al companiei"</string>
+    <string name="call_isdn" msgid="3342482563847537747">"Apelaţi ISDN"</string>
+    <string name="call_main" msgid="4640261071249938558">"Apelaţi numărul principal"</string>
+    <string name="call_other_fax" msgid="2536328553125487877">"Apelaţi numărul de fax"</string>
+    <string name="call_radio" msgid="9055749313292712021">"Apelaţi un număr radio"</string>
+    <string name="call_telex" msgid="2909886619224843563">"Apelaţi un număr de telex"</string>
+    <string name="call_tty_tdd" msgid="6704940636171078852">"Apelaţi TTY/TDD"</string>
+    <string name="call_work_mobile" msgid="4408630608955148641">"Apelaţi numărul de mobil de la serviciu"</string>
+    <string name="call_work_pager" msgid="3036932765279753793">"Apelaţi numărul de pager de serviciu"</string>
+    <string name="call_assistant" msgid="5188990854852312696">"Apelaţi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
+    <string name="call_mms" msgid="8998771923464696960">"Apelaţi MMS"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Trimiteți un mesaj text către <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Trimiteți un mesaj text către telefonul de domiciliu"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Trimiteți un mesaj text către numărul de mobil"</string>
@@ -50,7 +49,7 @@
     <string name="sms_pager" msgid="5664381349583724906">"Trimiteți un mesaj text către un număr de pager"</string>
     <string name="sms_other" msgid="910895193552957097">"Trimiteți un mesaj text"</string>
     <string name="sms_callback" msgid="728414485478941361">"Trimiteți un mesaj text către un număr cu apelare inversă"</string>
-    <string name="sms_car" msgid="8543669230270954512">"Trimiteți un mesaj text către un număr de telefon de mașină"</string>
+    <string name="sms_car" msgid="8543669230270954512">"Trimiteți un mesaj text către un număr de telefon de maşină"</string>
     <string name="sms_company_main" msgid="5441902128445061862">"Trimiteți un mesaj text către numărul principal al companiei"</string>
     <string name="sms_isdn" msgid="7142483128948042667">"Trimiteți un mesaj text către un număr ISDN"</string>
     <string name="sms_main" msgid="6815987840926184815">"Trimiteți un mesaj text către numărul principal"</string>
@@ -62,18 +61,17 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Trimiteți un mesaj text către un număr de pager de serviciu"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Trimiteți un mesaj text către <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Trimiteți un mesaj text către un număr MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (trimiteți mesaj)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Inițiați un apel video"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Ștergeți pers. frecvent contactate?"</string>
+    <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Ștergeţi pers. frecvent contactate?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Veți șterge lista persoanelor contactate frecvent din aplicațiile Agendă și Telefon și veți forța aplicațiile de e-mail să vă învețe preferințele pentru adrese de la zero."</string>
-    <string name="clearFrequentsProgress_title" msgid="3738406170865048982">"Se șterg pers. frecvent contactate…"</string>
+    <string name="clearFrequentsProgress_title" msgid="3738406170865048982">"Se şterg pers. frecvent contactate…"</string>
     <string name="status_available" msgid="4832569677396634846">"Disponibil(ă)"</string>
     <string name="status_away" msgid="6267905184545881094">"Plecat(ă)"</string>
     <string name="status_busy" msgid="7111912905211403545">"Ocupat(ă)"</string>
     <string name="contactsList" msgid="7140022347217602605">"Agendă"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Altele"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Director"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Directorul de serviciu"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Directorul de serviciu"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Toată Agenda"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Eu"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Se caută…"</string>
@@ -88,11 +86,11 @@
     <string name="missing_name" msgid="2633118852693000081">"(Fără nume)"</string>
     <string name="favoritesFrequentCalled" msgid="6600127125011757687">"Apelate frecvent"</string>
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Contactate frecvent"</string>
-    <string name="description_view_contact_detail" msgid="2756753096193839285">"Afișați persoana de contact"</string>
+    <string name="description_view_contact_detail" msgid="2756753096193839285">"Afişaţi persoana de contact"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Toate persoanele de contact cu numere de telefon"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Persoane de contact din profilul de serviciu"</string>
-    <string name="view_updates_from_group" msgid="3310864388165884352">"Afișați actualizări"</string>
-    <string name="account_phone" msgid="6104157990869081962">"numai pe telefon, nesincronizată"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Persoane de contact din profilul de serviciu"</string>
+    <string name="view_updates_from_group" msgid="3310864388165884352">"Afişaţi actualizări"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Numai pe telefon, nesincronizată"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Nume"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Pseudonim"</string>
     <string name="full_name" msgid="885420216812981202">"Nume"</string>
@@ -106,19 +104,19 @@
     <string name="name_phonetic_middle" msgid="5970174427249235577">"Al doilea prenume fonetic"</string>
     <string name="name_phonetic_family" msgid="1572398622239414464">"Nume fonetic"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"Telefon"</string>
-    <string name="emailLabelsGroup" msgid="4696310712601184208">"E-mail"</string>
-    <string name="postalLabelsGroup" msgid="3727124282406728557">"Adresă"</string>
+    <string name="emailLabelsGroup" msgid="4696310712601184208">"Adrese de e-mail"</string>
+    <string name="postalLabelsGroup" msgid="3727124282406728557">"Adrese poștale"</string>
     <string name="imLabelsGroup" msgid="8733603247535725786">"IM"</string>
     <string name="organizationLabelsGroup" msgid="961008074745871784">"Organizație"</string>
-    <string name="relationLabelsGroup" msgid="3585294036166325520">"Relație"</string>
+    <string name="relationLabelsGroup" msgid="3585294036166325520">"Relaţie"</string>
     <string name="eventLabelsGroup" msgid="4801419345682462171">"Dată specială"</string>
     <string name="sms" msgid="8086289395154598654">"Mesaj text"</string>
-    <string name="postal_address" msgid="7692926530081579786">"Adresă"</string>
+    <string name="postal_address" msgid="7692926530081579786">"Adresă poştală"</string>
     <string name="ghostData_company" msgid="22470841482615409">"Companie"</string>
     <string name="ghostData_title" msgid="6221293237772204604">"Titlu"</string>
     <string name="label_notes" msgid="3997277594846722699">"Note"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="8620657380165071493">"Site"</string>
+    <string name="websiteLabelsGroup" msgid="8620657380165071493">"Site web"</string>
     <string name="groupsLabel" msgid="3574316547053047551">"Grupuri"</string>
     <string name="email_home" msgid="2230967805906450693">"Trimiteți un e-mail la o adresă de e-mail de domiciliu"</string>
     <string name="email_mobile" msgid="7532438378678903685">"Trimiteți un e-mail către un telefon mobil"</string>
@@ -127,27 +125,27 @@
     <string name="email_custom" msgid="5777583741581538870">"Trimiteți un e-mail la <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="email" msgid="5624424151176351591">"Trimiteți un e-mail"</string>
     <string name="postal_street" msgid="881349814077356134">"Stradă"</string>
-    <string name="postal_pobox" msgid="1799978742074885091">"Căsuță poștală"</string>
+    <string name="postal_pobox" msgid="1799978742074885091">"Căsuţă poştală"</string>
     <string name="postal_neighborhood" msgid="3721092668038527674">"Cartier"</string>
-    <string name="postal_city" msgid="3173008531169519309">"Oraș"</string>
+    <string name="postal_city" msgid="3173008531169519309">"Oraş"</string>
     <string name="postal_region" msgid="1695206048198921115">"Stat"</string>
-    <string name="postal_postcode" msgid="6542806670034753265">"Cod poștal"</string>
+    <string name="postal_postcode" msgid="6542806670034753265">"Cod poştal"</string>
     <string name="postal_country" msgid="3988452247038791892">"Țară"</string>
     <string name="map_home" msgid="1221397355014741634">"Vizualizați adresa de domiciliu"</string>
     <string name="map_work" msgid="9015981646907637207">"Vizualizați adresa de serviciu"</string>
-    <string name="map_other" msgid="55098598855607997">"Vizualizați adresa poștală"</string>
+    <string name="map_other" msgid="55098598855607997">"Vizualizați adresa poştală"</string>
     <string name="map_custom" msgid="4943554530347163288">"Vizualizați adresa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
-    <string name="chat_aim" msgid="6479001490307452172">"Conversați prin AIM"</string>
-    <string name="chat_msn" msgid="627481952525245054">"Conversați prin Windows Live"</string>
-    <string name="chat_yahoo" msgid="5542489454092719897">"Conversați prin Yahoo"</string>
-    <string name="chat_skype" msgid="3145166404699830256">"Conversați prin Skype"</string>
-    <string name="chat_qq" msgid="2811762660890755082">"Conversați prin QQ"</string>
-    <string name="chat_gtalk" msgid="6043734883347741789">"Conversați prin Google Talk"</string>
-    <string name="chat_icq" msgid="7538190395602030726">"Conversați prin ICQ"</string>
-    <string name="chat_jabber" msgid="4525546665986350869">"Conversați prin Jabber"</string>
-    <string name="chat" msgid="6297650784873558837">"Conversați prin chat"</string>
+    <string name="chat_aim" msgid="6479001490307452172">"Conversaţi prin AIM"</string>
+    <string name="chat_msn" msgid="627481952525245054">"Conversaţi prin Windows Live"</string>
+    <string name="chat_yahoo" msgid="5542489454092719897">"Conversaţi prin Yahoo"</string>
+    <string name="chat_skype" msgid="3145166404699830256">"Conversaţi prin Skype"</string>
+    <string name="chat_qq" msgid="2811762660890755082">"Conversaţi prin QQ"</string>
+    <string name="chat_gtalk" msgid="6043734883347741789">"Conversaţi prin Google Talk"</string>
+    <string name="chat_icq" msgid="7538190395602030726">"Conversaţi prin ICQ"</string>
+    <string name="chat_jabber" msgid="4525546665986350869">"Conversaţi prin Jabber"</string>
+    <string name="chat" msgid="6297650784873558837">"Conversaţi prin chat"</string>
     <string name="description_minus_button" msgid="2142439445814730827">"ștergeți"</string>
-    <string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"Extindeți sau restrângeți câmpurile pentru nume"</string>
+    <string name="expand_collapse_name_fields_description" msgid="5073419090665464541">"Extindeţi sau restrângeți câmpurile pentru nume"</string>
     <string name="expand_collapse_phonetic_name_fields_description" msgid="5241493357460353777">"Extindeți sau restrângeți câmpurile pentru nume fonetice"</string>
     <string name="list_filter_all_accounts" msgid="4265359896628915784">"Toată agenda"</string>
     <string name="list_filter_all_starred" msgid="9060325494254507806">"Cu stea"</string>
@@ -188,13 +186,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Unul sau mai multe fișiere nu s-au putut importa (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"S-a finalizat exportul fișierului <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Persoanele de contact au fost exportate."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"S-a încheiat exportul persoanelor de contact. Dați clic pe notificare pentru a trimite persoanele de contact."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Atingeți pentru a trimite persoanele de contact."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exportul fișierului <xliff:g id="FILENAME">%s</xliff:g> a fost anulat."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Se exportă datele persoanelor de contact"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Se exportă datele privind persoanele de contact."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Datele persoanelor de contact se exportă în fișierul: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Nu s-au putut obține informații din baza de date."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Nu există persoane de contact care să poată fi exportate. Dacă aveți persoane de contact pe telefon, este posibil ca exportul acestora de pe telefon să fie interzis de unii furnizori de date."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Nu există persoane de contact care să poată fi exportate. Dacă aveți persoane de contact pe telefon, este posibil ca exportul acestora de pe telefon să fie interzis de unii furnizori de date."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Editorul de vCard nu a pornit în mod corespunzător."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Nu s-a putut exporta"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Datele persoanelor de contact nu au fost exportate.\nMotivul: „<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
@@ -208,7 +204,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Solicitarea de import a fișierului vCard a fost respinsă. Încercați din nou mai târziu."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> va fi exportat în curând."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Fișierul va fi exportat în curând."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Persoanele de contact vor fi exportate în curând."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Solicitarea de export a fișierului vCard a fost respinsă. Încercați din nou mai târziu."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"persoană de contact"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Fișierele vCard se stochează în memoria cache într-un spațiu de stocare local temporar. Importul propriu-zis va începe în curând."</string>
@@ -225,15 +220,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Întâi prenumele"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Întâi numele"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Contul prestabilit pentru persoanele de contact noi"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sincronizați metadatele pentru persoanele de contact [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sincronizați metadatele pentru persoanele de contact"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Contul de sincronizare a metadatelor pentru persoanele de contact"</string>
     <string name="setting_about" msgid="3926137653588942297">"Despre Agendă"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Setări"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Distribuiți persoanele de contact vizibile"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Persoanele de contact vizibile nu au putut fi trimise."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Trimiteți persoanele de contact preferate"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Trimiteți toate persoanele de contact"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Persoanele de contact nu s-au trimis."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importați/exportați agenda"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importați agenda"</string>
     <string name="share_error" msgid="665756457151793108">"Nu se poate permite accesul la această intrare."</string>
@@ -276,7 +266,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Politica de confidențialitate"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Termeni și condiții"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licențe open source"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Adresa URL nu a putut fi deschisă."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Contul <xliff:g id="ACCOUNT_INFO">%s</xliff:g> este selectat"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Contul <xliff:g id="ACCOUNT_INFO">%s</xliff:g> nu este selectat"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Efectuați un apel video"</string>
diff --git a/res-common/values-ru-sw600dp/strings.xml b/res-common/values-ru-sw600dp/strings.xml
deleted file mode 100644
index f2e58bf..0000000
--- a/res-common/values-ru-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Только планшет, без синхронизации"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Нет контактов для экспорта. Возможно, поставщик услуг по передаче данных запретил экспортировать контакты с планшета."</string>
-</resources>
diff --git a/res-common/values-ru/strings.xml b/res-common/values-ru/strings.xml
index c16516e..98038b8 100644
--- a/res-common/values-ru/strings.xml
+++ b/res-common/values-ru/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Рабочий пейджер"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Вызов: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Номер MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (вызов)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS: <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS: домашний"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS: мобильный"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS: рабочий пейджер"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS: номер MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (SMS)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Начать видеовстречу"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Очистить список популярных контактов?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Список популярных контактов в приложениях \"Контакты\" и \"Телефон\" будет очищен, а приложения электронной почты начнут запоминать адреса заново."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Контакты"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Другое"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Каталог"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Каталог контактов из рабочего профиля"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Каталог контактов из рабочего профиля"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Все контакты"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Я"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Поиск…"</string>
@@ -91,9 +89,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Часто набираемые"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Показать сведения о контакте"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Контакты с номерами телефонов"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Контакты из рабочего профиля"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Контакты из рабочего профиля"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Просмотреть обновления"</string>
-    <string name="account_phone" msgid="6104157990869081962">"только на телефоне, без синхронизации"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Только телефон, без синхронизации"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Имя"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Псевдоним"</string>
     <string name="full_name" msgid="885420216812981202">"Полное имя"</string>
@@ -170,7 +168,7 @@
     <string name="import_from_sim" msgid="4749894687871835873">"Импорт с SIM-карты"</string>
     <string name="import_from_sim_summary" msgid="2306434118233541675">"Импорт с SIM-карты <xliff:g id="SIM_NAME">^1</xliff:g> (<xliff:g id="SIM_NUMBER">^2</xliff:g>)"</string>
     <string name="import_from_sim_summary_no_number" msgid="8498561004799710237">"Импорт с SIM-карты <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
-    <string name="import_from_vcf_file" product="default" msgid="1381675161522633950">"Импорт из файла VCF"</string>
+    <string name="import_from_vcf_file" product="default" msgid="1381675161522633950">"Импортировать из файла VCF"</string>
     <string name="cancel_import_confirmation_message" msgid="7764915400478970495">"Отменить импорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string>
     <string name="cancel_export_confirmation_message" msgid="4063783315931861656">"Отменить экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="7450212880694781527">"Не удалось отменить импорт/экспорт vCard"</string>
@@ -189,13 +187,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Не удалось импортировать один или несколько файлов (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" завершен"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Экспорт контактов завершен."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Экспорт контактов завершен. Чтобы открыть к ним доступ, нажмите на уведомление."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Нажмите, чтобы открыть доступ к контактам."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" отменен"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Экспорт данных контакта"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Экспорт контактов…"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Данные экспортируются в файл \"<xliff:g id="FILE_NAME">%s</xliff:g>\"."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"База данных недоступна."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Не найдены контакты для экспорта. Возможно, экспорт контактов с телефона не поддерживается поставщиком услуг передачи данных."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Не найдены контакты для экспорта. Возможно, экспорт контактов с телефона не поддерживается поставщиком услуг передачи данных."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Сбой при запуске редактора vCard."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Ошибка экспорта"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Не удалось экспортировать данные.\nПричина: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Запрос на импорт данных vCard отклонен. Повторите попытку позже."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" скоро начнется."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Файл будет экспортирован в ближайшее время."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Контакты скоро будут экспортированы."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Запрос на экспорт данных vCard отклонен. Повторите попытку позже."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Выполняется кеширование файлов vCard в локальное временное хранилище, после чего начнется импорт."</string>
@@ -218,7 +213,7 @@
     <string name="confirm_export_title" msgid="3240899428149018226">"Экспортировать контакты?"</string>
     <string name="caching_vcard_title" msgid="9185299351381102305">"Кеширование…"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"Импорт <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="4142192068495589925">"Экспорт в файл VCF"</string>
+    <string name="export_to_vcf_file" product="default" msgid="4142192068495589925">"Экспортировать в файл VCF"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"Сортировка"</string>
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"По имени"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"По фамилии"</string>
@@ -226,15 +221,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Сначала имя"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Сначала фамилия"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Аккаунт по умолчанию для новых контактов"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Синхронизация метаданных контакта [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Синхронизация метаданных контакта"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Синхронизируемый аккаунт метаданных контактов"</string>
     <string name="setting_about" msgid="3926137653588942297">"О Контактах"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Настройки"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Передать видимые контакты"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Не удалось поделиться видимыми контактами."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Отправить избранные"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Отправить все контакты"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Не удалось отправить контакты"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Импорт/экспорт контактов"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Импорт контактов"</string>
     <string name="share_error" msgid="665756457151793108">"Не удалось передать данные"</string>
@@ -278,7 +268,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Политика конфиденциальности"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Условия использования"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Лицензии открытого ПО"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Не удалось открыть URL."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Аккаунт <xliff:g id="ACCOUNT_INFO">%s</xliff:g> выбран"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Аккаунт <xliff:g id="ACCOUNT_INFO">%s</xliff:g> не выбран"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Видеовызов"</string>
diff --git a/res-common/values-si-rLK-sw600dp/strings.xml b/res-common/values-si-rLK-sw600dp/strings.xml
deleted file mode 100644
index a233482..0000000
--- a/res-common/values-si-rLK-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"ටැබ්ලට්-පමණි, සමමුහුර්ත නොකරන ලද"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"නිර්යාත කළ හැකි සම්බන්ධතා නැත. ඔබගේ ටැබ්ලටයේ සම්බන්ධතා තිබේ නම්, සමහර දත්ත සපයන්නන් ටැබ්ලටයෙන් සම්බන්ධතා නිර්යාත කිරීමට අවසර ලබා නොදිය හැක."</string>
-</resources>
diff --git a/res-common/values-si-rLK/strings.xml b/res-common/values-si-rLK/strings.xml
index eb784fc..4000512 100644
--- a/res-common/values-si-rLK/strings.xml
+++ b/res-common/values-si-rLK/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"කාර්යාල පේජරය අමතන්න"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> අමතන්න"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS අමතන්න"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ඇමතුම)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> ට කෙටි පණිවිඩයක් යවන්න"</string>
     <string name="sms_home" msgid="7765831490534280540">"නිවසට කෙටි පණිවිඩයක් යවන්න"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"ජංගම දුරකථනයට කෙටි පණිවිඩයක් යවන්න"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"කාර්යාල පේජරයට කෙටි පණිවිඩයක් යවන්න"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> ට කෙටි පණිවිඩයක් යවන්න"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS වෙත කෙටි පණිවිඩයක් යවන්න"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (පණිවිඩය)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"වීඩියෝ ඇමතුමක් ලබාගන්න"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"නිතරම සම්බන්ධ වන අය හිස් කරන්නද?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"ඔබ සම්බන්ධතා සහ දුරකථන යෙදුම්වලින් නිතරම සම්බන්ධ වුණු අයගේ ලැයිස්තුව හිස් කර, මුල සිටම ඔබගේ ලිපින අභිරුචි ඉගෙනීමට ඊ-තැපැල් යෙදුම්වලට බල කරයි."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"සම්බන්ධතා"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"වෙනත්"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"නාමාවලිය"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"කාර්යාල සම්බන්ධතා නාමාවලිය"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"කාර්යාල සම්බන්ධතා නාමාවලිය"</string>
     <string name="local_search_label" msgid="9094584931063745728">"සියලුම සම්බන්ධතා"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"මම"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"සොයමින්..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"නිතරම සම්බන්ධ වන"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"සම්බන්ධතාව පෙන්වන්න"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"දුරකථන අංක සහිත සම්බන්ධතා"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"කාර්යාල පැතිකඩ සම්බන්ධතා"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"කාර්යාල පැතිකඩ සම්බන්ධතා"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"යාවත්කාලීන වීම් පෙන්වන්න"</string>
-    <string name="account_phone" msgid="6104157990869081962">"දුරකථනය-පමණි, සමමුහුර්ත නොකරනලද"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"දුරකථනය-පමණි, සමමුහුර්ත නොකරනලද"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"නම‍"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"අපනාමය"</string>
     <string name="full_name" msgid="885420216812981202">"නම‍"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ගොනු එකක් හෝ කිහිපයක් ආයාත කිරීමට නොහැකි විය (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> නිර්යාත කිරීම සම්පූර්ණ කෙරුණි."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"සම්බන්ධතා නිර්යාත කිරීම සම්පූර්ණ කෙරුණි."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"සම්බන්ධතා නිර්යාත කිරීම අවසන්ය, සම්බන්ධතා බෙදා ගැනීමට දැනුම්දීම ක්ලික් කරන්න."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"සම්බන්ධතා බෙදා ගැනීමට තට්ටු කරන්න."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> නිර්යාත කිරීම අවලංගු කෙරුණි."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"සම්බන්ධතා දත්ත නිර්යාත කිරීම"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"සම්බන්ධතා දත්ත නිර්යාත කරමින් තිබේ."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"<xliff:g id="FILE_NAME">%s</xliff:g> වෙත ඔබගේ සම්බන්ධතා දත්ත නිර්යාත කරමින් පවතී."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"දත්ත සමුදායේ තොරතුරු ලබාගත නොහැකි විය."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"නිර්යාත කළ හැකි සම්බන්ධතා නැත. ඔබගේ දුරකථනයේ සම්බන්ධතා තිබේ නම්, සමහර දත්ත සපයන්නන් දුරකථනයෙන් සම්බන්ධතා නිර්යාත කිරීමට අවසර ලබා නොදිය හැක."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"නිර්යාත කළ හැකි සම්බන්ධතා නැත. ඔබගේ දුරකථනයේ සම්බන්ධතා තිබේ නම්, සමහර දත්ත සපයන්නන් දුරකථනයෙන් සම්බන්ධතා නිර්යාත කිරීමට අවසර ලබා නොදිය හැක."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard සකසනය නිවැරදිව පටන් ගත්තේ නැත."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"නිර්යාත කළ නොහැකි වීය"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"සම්බන්ධතා දත්ත නිර්යාත නොකරන ලදි.\nහේතුව: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard ආයාත ඉල්ලීම ප්‍රතික්ෂේප කරන ලදි. පසුව නැවත උත්සාහ කරන්න."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> කෙටි වේලාවකින් නිර්යාත කරනු ඇත."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ගොනුව කෙටි වේලාවකින් නිර්යාත කරනු ඇත."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"ටික වේලාවකින් සම්බන්ධතා නිර්යාත කරනු ඇත."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard නිර්යාත අයැදුම ප්‍රතික්ෂේප කරන ලදි. පසුව නැවත උත්සාහ කරන්න."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"සම්බන්ධතාවය"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"පෙදෙසි තාවකාලික ආචයනයට vCard(s) හැඹිලිගත කරමින් පවතී. සැබෑ ආයාත කිරීම ඉක්මනින් පටන් ගනු ඇත."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"මුල් නම මුලින්ම"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"අවසාන නම මුලින්ම"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"නව සම්බන්ධතා සඳහා පෙරනිමි ගිණුම"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"සම්බන්ධතා පාරදත්ත සමමුහුර්ත කරන්න [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"සම්බන්ධතා පාරදත්ත සමමුහුර්ත කරන්න"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"සම්බන්ධතා පාරදත්ත සමමුහුර්ත ගිණුම"</string>
     <string name="setting_about" msgid="3926137653588942297">"සම්බන්ධතා ගැන"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"සැකසීම්"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"පෙනෙන සම්බන්ධතා බෙදාගන්න"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"දෘශ්‍යමාන සම්බන්ධතා බෙදා ගැනීම අසාර්ථක විය."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"ප්‍රියතම සම්බන්ධතා බෙදා ගන්න"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"සියලු සම්බන්ධතා බෙදා ගන්න"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"සම්බන්ධතා බෙදා ගැනීම අසාර්ථක විය."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"සම්බන්ධතා ආයාත/නිර්යාත කිරීම"</string>
     <string name="dialog_import" msgid="5177004290082451296">"සම්බන්ධතා ආයාත කරන්න"</string>
     <string name="share_error" msgid="665756457151793108">"මෙම සම්බන්ධතාව බෙදා ගත නොහැක."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"රහස්‍යතා ප්‍රතිපත්තිය"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"සේවා නියම"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"විවෘත මූලාශ්‍ර බලපත්‍ර"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"url විවෘත කිරීමට අසමත් විය."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ලකුණු කරන ලදී"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ලකුණු කර නැත"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"වීඩියෝ ඇමතුම සිදු කිරීම"</string>
diff --git a/res-common/values-sk-sw600dp/strings.xml b/res-common/values-sk-sw600dp/strings.xml
deleted file mode 100644
index dfad52a..0000000
--- a/res-common/values-sk-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Iba v tablete, nesynchronizované"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Nenašli sa žiadne kontakty, ktoré by bolo možné exportovať. Ak v tablete skutočne máte kontakty, problém môže byť spôsobený tým, že niektorí poskytovatelia údajov neumožňujú export kontaktov z tabletu."</string>
-</resources>
diff --git a/res-common/values-sk/strings.xml b/res-common/values-sk/strings.xml
index f2045d2..577ff3d 100644
--- a/res-common/values-sk/strings.xml
+++ b/res-common/values-sk/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Volať na pracovný pager"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Volať kontakt <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Volať na číslo MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (hovor)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Poslať správu kontaktu <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Poslať správu na domáci telefón"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Poslať správu na mobil"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Poslať správu na pracovný pager"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Poslať správu kontaktu <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Poslať správu na číslo MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (správa)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Uskutočniť videohovor"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Vymazať často kontaktované osoby?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Vymažete zoznam často kontaktovaných osôb v aplikáciách Kontakty a Telefón a e-mailové aplikácie budú musieť odznova vytvoriť predvoľby adresátov."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontakty"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Iné"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Adresár"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Pracovný adresár"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Pracovný adresár"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Všetky kontakty"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ja"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Hľadá sa…"</string>
@@ -91,13 +89,13 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Najčastejšie používané kontakty"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Zobraziť kontakt"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Všetky kontakty s telefónnymi číslami"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Kontakty v pracovnom profile"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kontakty v pracovnom profile"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Zobraziť aktualizácie"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Telefón, nesynchronizované"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Iba v telefóne, nesynchronizované"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Meno"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Prezývka"</string>
     <string name="full_name" msgid="885420216812981202">"Meno"</string>
-    <string name="name_given" msgid="4153709115654909377">"Krstné meno"</string>
+    <string name="name_given" msgid="4153709115654909377">"Meno"</string>
     <string name="name_family" msgid="5317387657540738981">"Priezvisko"</string>
     <string name="name_prefix" msgid="8219879405071462309">"Titul pred menom"</string>
     <string name="name_middle" msgid="3951610314424632183">"Stredné meno"</string>
@@ -116,7 +114,7 @@
     <string name="sms" msgid="8086289395154598654">"Textová správa"</string>
     <string name="postal_address" msgid="7692926530081579786">"Adresa"</string>
     <string name="ghostData_company" msgid="22470841482615409">"Spoločnosť"</string>
-    <string name="ghostData_title" msgid="6221293237772204604">"Funkcia"</string>
+    <string name="ghostData_title" msgid="6221293237772204604">"Názov"</string>
     <string name="label_notes" msgid="3997277594846722699">"Poznámky"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"Web"</string>
@@ -189,13 +187,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Nepodaril sa import jedného alebo viacerých súborov (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Exportovanie súboru <xliff:g id="FILENAME">%s</xliff:g> bolo dokončené."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Exportovanie kontaktov bolo dokončené"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Exportovanie kontaktov sa skončilo. Zdieľajte ich kliknutím na upozornenie."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Klepnutím zdieľajte kontakty."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exportovanie súboru <xliff:g id="FILENAME">%s</xliff:g> bolo zrušené."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Export údajov kontaktov"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontaktné informácie sa exportujú."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Vaše údaje o kontaktoch sa exportujú do súboru: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Nepodarilo sa získať informácie z databázy."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Nenašli sa žiadne kontakty, ktoré by bolo možné exportovať. Ak v telefóne skutočne máte kontakty, problém môže byť spôsobený tým, že niektorí poskytovatelia údajov neumožňujú export kontaktov z telefónu."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Nenašli sa žiadne kontakty, ktoré by bolo možné exportovať. Ak v telefóne skutočne máte kontakty, problém môže byť spôsobený tým, že niektorí poskytovatelia údajov neumožňujú export kontaktov z telefónu."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Nástroj na tvorbu vizitiek vCard sa nespustil správne."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Exportovanie zlyhalo"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Údaje o kontaktoch sa neexportovali.\nDôvod: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Žiadosť o import vizitky vCard bola odmietnutá. Skúste to znova neskôr."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Vizitka <xliff:g id="FILENAME">%s</xliff:g> bude čoskoro exportovaná."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Súbor bude čoskoro exportovaný."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontakty budú čoskoro exportované."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Žiadosť o exportovanie vizitky vCard bola odmietnutá. Skúste to znova neskôr."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Prebieha načítavanie vizitiek vCard do vyrovnávacej pamäte miestneho dočasného úložiska. Samotné importovanie začne o chvíľu."</string>
@@ -220,21 +215,16 @@
     <string name="progress_notifier_message" msgid="359931715339778107">"Import: <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="4142192068495589925">"Exportovať do súboru .vcf"</string>
     <string name="display_options_sort_list_by" msgid="8635268562263708102">"Zoradiť podľa"</string>
-    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Krstné meno"</string>
+    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Meno"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Priezvisko"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"Formát mena"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Najprv meno"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Najprv priezvisko"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Predvolený účet pre nové kontakty"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Synchronizovať metadáta kontaktov [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Synchronizácia metadát kontaktov"</string>
-    <string name="setting_about" msgid="3926137653588942297">"O aplikácii Kontakty"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Nastavenia"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kontaktovať účet na synchronizáciu metadát"</string>
+    <string name="setting_about" msgid="3926137653588942297">"Informácie o kontaktoch"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Zdieľať viditeľné kontakty"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Nepodarilo sa zdieľať viditeľné kontakty"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Zdieľať obľúbené kontakty"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Zdieľať všetky kontakty"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Nepodarilo sa zdieľať kontakty."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Import a export kontaktov"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importovať kontakty"</string>
     <string name="share_error" msgid="665756457151793108">"Tento kontakt nie je možné zdieľať"</string>
@@ -247,7 +237,7 @@
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"Obľúbené"</string>
     <string name="listTotalAllContactsZero" msgid="6041341919823872732">"Žiadne kontakty."</string>
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"Žiadne kontakty nie sú viditeľné."</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"Žiadne obľúbené kontakty"</string>
+    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"Žiadne obľúbené položky"</string>
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"V skupine <xliff:g id="NAME">%s</xliff:g> nie sú žiadne kontakty"</string>
     <string name="menu_clear_frequents" msgid="8492322695770647639">"Vymazať často kontaktovaných"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"Vybrať SIM kartu"</string>
@@ -273,12 +263,11 @@
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> neprečítaná položka. </item>
     </plurals>
     <string name="about_build_version" msgid="4221971683776635130">"Verzia zostavy"</string>
-    <string name="about_open_source_licenses" msgid="3224958101863814649">"Licencie open source"</string>
+    <string name="about_open_source_licenses" msgid="3224958101863814649">"Licencie Open source"</string>
     <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Podrobnosti o licencii pre softvér open source"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"Pravidlá ochrany súkromia"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Zmluvné podmienky"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licencie open source"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Webovú adresu nebolo možné otvoriť"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> – skontrolované"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> – neskontrolované"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Uskutočniť videohovor"</string>
diff --git a/res-common/values-sl-sw600dp/strings.xml b/res-common/values-sl-sw600dp/strings.xml
deleted file mode 100644
index 2cb547a..0000000
--- a/res-common/values-sl-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Samo v tabličnem računalniku, nesinhroniziran"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Ni stikov za izvoz. Če imate v tabličnem računalniku stike, nekateri ponudniki podatkov morda ne omogočajo izvoza stikov iz njega."</string>
-</resources>
diff --git a/res-common/values-sl/strings.xml b/res-common/values-sl/strings.xml
index 9308a3f..c25277c 100644
--- a/res-common/values-sl/strings.xml
+++ b/res-common/values-sl/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Pokliči službeni pozivnik"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Pokliči številko pomočnika <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Pokliči telefon MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Pokliči)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Pošlji SMS na številko <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Pošlji SMS domov"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Pošlji SMS v mobilni telefon"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Pošlji SMS v službeni pozivnik"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Pošlji SMS pomočniku na številko <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Pošlji SMS na telefonsko številko MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Pošlji sporočilo)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Opravi videoklic"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Želite izbrisati seznam pog. stikov?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Izbrisali boste seznam pogostih stikov v aplikacijah Stiki in Telefon, zato bodo e-poštne aplikacije začele shranjevati pogoste naslovnike od začetka."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Stiki"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Drugo"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Imenik"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Delovni imenik"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Delovni imenik"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Vsi stiki"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Jaz"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Iskanje …"</string>
@@ -91,15 +89,15 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Pogosto uporabljeni stiki"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Ogled stika"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Vsi stiki s telefonskimi številkami"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Stiki za delovni profil"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Stiki za delovni profil"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Prikaži posodobitve"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Samo v telefonu, nesinhroniziran"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Samo v telefonu, nesinhroniziran"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Ime"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Vzdevek"</string>
     <string name="full_name" msgid="885420216812981202">"Ime"</string>
     <string name="name_given" msgid="4153709115654909377">"Ime"</string>
     <string name="name_family" msgid="5317387657540738981">"Priimek"</string>
-    <string name="name_prefix" msgid="8219879405071462309">"Naziv (pred imenom)"</string>
+    <string name="name_prefix" msgid="8219879405071462309">"Naziv"</string>
     <string name="name_middle" msgid="3951610314424632183">"Drugo ime"</string>
     <string name="name_suffix" msgid="5436984808550075931">"Naziv (za imenom)"</string>
     <string name="name_phonetic" msgid="2249169131785620210">"Ime – fonetično"</string>
@@ -189,13 +187,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Ene ali več datotek ni bilo mogoče uvoziti (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je končan."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Izvoz stikov je končan."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Izvoz stikov je dokončan. Kliknite obvestilo, če želite dati stike v skupno rabo."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Dotaknite se, če želite dati stike v skupno rabo."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je preklican."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Izvažanje podatkov o stikih"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Podatki o stikih se izvažajo."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Podatki o stikih se izvažajo v to datoteko: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Informacij o zbirki podatkov ni bilo mogoče dobiti."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Ni stikov za izvoz. Če imate v telefonu stike, nekateri ponudniki podatkov morda ne omogočajo izvoza stikov iz telefona."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Ni stikov za izvoz. Če imate v telefonu stike, nekateri ponudniki podatkov morda ne omogočajo izvoza stikov iz telefona."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Urejevalnik za vCard se ni pravilno zagnal."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Izvoz ni mogoč"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Podatki stika niso bili izvoženi.\nRazlog: »<xliff:g id="FAIL_REASON">%s</xliff:g>«"</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Zahteva za uvoz datoteke vCard je bila zavrnjena. Poskusite znova pozneje."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> bo kmalu izvožena."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Datoteka bo kmalu izvožena."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Stiki bodo kmalu izvoženi."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Zahteva za izvoz datoteke vCard je bila zavrnjena. Poskusite znova pozneje."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"stik"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Predpomnjenje datotek vCard v lokalno začasno shrambo. Dejanski uvoz se bo začel kmalu."</string>
@@ -226,15 +221,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Najprej ime"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Najprej priimek"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Privzeti račun za nove stike"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sinhronizacija metapodatkov stikov [PRESKUSNA INTERNA UPORABA]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sinhronizacija metapodatkov stikov"</string>
-    <string name="setting_about" msgid="3926137653588942297">"O Stikih"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Nastavitve"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Račun za sinhronizacijo metapodatkov za stike"</string>
+    <string name="setting_about" msgid="3926137653588942297">"O programu za stike"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Vidne stike deli z drugimi"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Deljenje vidnih stikov z drugimi ni uspelo."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Deljenje priljubljenih stikov"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Skupna raba vseh stikov"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Dajanje stikov v skupno rabo ni uspelo."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Uvoz/izvoz stikov"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Uvozi stike"</string>
     <string name="share_error" msgid="665756457151793108">"Tega stika ni mogoče dati v skupno rabo."</string>
@@ -278,7 +268,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Pravilnik o zasebnosti"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Pogoji storitve"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Odprtokodne licence"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Naslova URL ni bilo mogoče odpreti."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> – označeno"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> – ni označeno"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Začetek videoklica"</string>
diff --git a/res-common/values-sq-rAL-sw600dp/strings.xml b/res-common/values-sq-rAL-sw600dp/strings.xml
deleted file mode 100644
index 29579f7..0000000
--- a/res-common/values-sq-rAL-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Vetëm në tablet, i pasinkronizuar"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Nuk ka kontakte që mund të eksportohen. Nëse ke kontakte në tabletin tënd, disa ofrues të të dhënave mund të mos lejojnë që kontaktet të eksportohen nga tableti."</string>
-</resources>
diff --git a/res-common/values-sq-rAL/strings.xml b/res-common/values-sq-rAL/strings.xml
index 58807d2..af094e3 100644
--- a/res-common/values-sq-rAL/strings.xml
+++ b/res-common/values-sq-rAL/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Telefono numrin e biperit të punës"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Telefono <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Telefono numrin MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Telefono)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Dërgo mesazh te <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Dërgo mesazh te numri i shtëpisë"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Dërgo mesazh te numri celular"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Dërgo mesazh te numri i biperit"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Dërgo mesazh te <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Dërgo mesazh te numri i MMS-së"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Mesazh)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Bëj një telefonatë me video"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Të pastrohen kontaktet e shpeshta?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Do ta pastrosh listën e kontakteve të shpeshta në aplikacionet \"Kontaktet\" dhe \"Telefoni\" dhe do t\'i detyrosh aplikacionet e mail-it të mësojnë preferencat e tua të adresimit nga e para."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontaktet"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Tjetër"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Direktoria"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Direktoria e punës"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Direktoria e punës"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Të gjitha kontaktet"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Unë"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Po kërkon..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Të kontaktuara shpesh"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Shiko kontaktin"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Të gjitha kontaktet me numra telefoni"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Kontaktet e profilit të punës"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kontaktet e profilit të punës"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Shiko përditësimet"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Vetëm në telefon, i pasinkronizuar"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Vetëm në telefon, i pasinkronizuar"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Emri"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Pseudonimi"</string>
     <string name="full_name" msgid="885420216812981202">"Emri"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Një ose më shumë skedarë nuk mundën të importoheshin (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Eksportimi i <xliff:g id="FILENAME">%s</xliff:g> përfundoi."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Eksportimi i kontakteve përfundoi."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Eksportimi i kontakteve përfundoi, kliko njoftimin për të ndarë kontaktet."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Trokit për të ndarë kontaktet."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Eksportimi i <xliff:g id="FILENAME">%s</xliff:g> u anulua."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Po eksporton të dhënat e kontaktit"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Të dhënat e kontaktit po eksportohen."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Të dhënat e kontaktit po eksportohen te: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Informacionet e bazës së të dhënave nuk mund të merreshin."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Nuk ka kontakte që mund të eksportohen. Nëse ke kontakte në telefonin tënd, disa ofrues të të dhënave mund të mos lejojnë që kontaktet të eksportohen nga telefoni."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Nuk ka kontakte që mund të eksportohen. Nëse ke kontakte në telefonin tënd, disa ofrues të të dhënave mund të mos lejojnë që kontaktet të eksportohen nga telefoni."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Kompozitori i vCard nuk u nis si duhet."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Nuk mund të eksportoheshin"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Të dhënat e kontaktit nuk u eksportuan.\nArsyeja: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Kërkesa e importit të vCard u refuzua. Provo përsëri më vonë."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> do të eksportohet së shpejti."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Skedari do të eksportohet së shpejti."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontaktet do të eksportohen së shpejti."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Kërkesa e eksportimit të vCard u refuzua. Provo përsëri më vonë."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakti"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Po ruan vCard në hapësirën ruajtëse lokale të përkohshme. Importimi aktual do të nisë së shpejti."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Emri në fillim"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Mbiemri në fillim"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Llogaria e parazgjedhur për kontaktet e reja"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sinkronizo të dhënat meta të kontakteve [TESTIM]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sinkronizo të dhënat meta të kontakteve"</string>
-    <string name="setting_about" msgid="3926137653588942297">"Rreth kontakteve"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Cilësimet"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Llogari sinkronizimi për meta të dhënat e kontaktit"</string>
+    <string name="setting_about" msgid="3926137653588942297">"Rreth Kontakteve"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Shpërnda kontaktet e dukshme"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Ndarja e kontakteve të dukshme dështoi."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Ndaj kontaktet e preferuara"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Ndaj të gjitha kontaktet"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Ndarja e kontakteve dështoi."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importo/eksporto kontaktet"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importo kontaktet"</string>
     <string name="share_error" msgid="665756457151793108">"Ky kontakt nuk mund të shpërndahet"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Politika e privatësisë"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Kushtet e shërbimit"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licencat me burim të hapur"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Dështoi në hapjen e url-së."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> u shënua"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> nuk u shënua"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Kryej një telefonatë me video"</string>
diff --git a/res-common/values-sr-sw600dp/strings.xml b/res-common/values-sr-sw600dp/strings.xml
deleted file mode 100644
index 4a73ddd..0000000
--- a/res-common/values-sr-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Само на таблету, без синхронизације"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Нема контаката за извоз. Ако имате контакте на таблету, неки добављачи података можда неће дозволити извоз контаката са таблета."</string>
-</resources>
diff --git a/res-common/values-sr/strings.xml b/res-common/values-sr/strings.xml
index 0d1b391..57568ea 100644
--- a/res-common/values-sr/strings.xml
+++ b/res-common/values-sr/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Позови пословни пејџер"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Позови <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Позови број за MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (позови)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Пошаљи SMS на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Пошаљи SMS на кућни телефон"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Пошаљи SMS на мобилни телефон"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Пошаљи SMS на пословни пејџер"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Пошаљи SMS на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Пошаљи SMS на број за MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (пошаљи SMS)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Упути видео позив"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Бришете често контактиране?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Обрисаћете листу често контактираних у апликацијама Контакти и Телефон, па ће имејл апликације морати поново да прикупе информације о адресирању."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Контакти"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Друго"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Директоријум"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Директоријум за Work"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Директоријум за Work"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Сви контакти"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ја"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Претражује се..."</string>
@@ -90,9 +88,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Често контактирани"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Приказивање контакта"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Сви контакти са бројевима телефона"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Контакти са профила за Work"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Контакти профила за Work"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Прикажи ажурирања"</string>
-    <string name="account_phone" msgid="6104157990869081962">"само на телефону, без синхронизације"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Само на телефону, без синхронизације"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Име"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Надимак"</string>
     <string name="full_name" msgid="885420216812981202">"Име"</string>
@@ -188,13 +186,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Није могућ увоз једне или више датотека (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Извоз датотеке <xliff:g id="FILENAME">%s</xliff:g> је завршен."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Извоз контаката је завршен."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Извожење контаката је завршено. Кликните на обавештење да бисте делили контакте."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Додирните да бисте делили контакте."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Извоз датотеке <xliff:g id="FILENAME">%s</xliff:g> је отказан."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Извоз података о контактима је у току"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Подаци о контактима се извозе."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Подаци о контактима се извозе у: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Преузимање информација из базе података није могуће."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Нема контаката за извоз. Ако имате контакте на телефону, неки добављачи података можда неће дозволити да се контакти извозе са телефона."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Нема контаката за извоз. Ако имате контакте на телефону, неки добављачи података можда неће дозволити да се контакти извозе са телефона."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Програм за израду vCard датотека се није исправно покренуо."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Извоз није могућ"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Подаци о контактима низу извезени.\nРазлог: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
@@ -208,7 +204,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Захтев за увоз vCard датотеке је одбијен. Покушајте поново касније."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Датотека <xliff:g id="FILENAME">%s</xliff:g> ће ускоро бити извезена."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Датотека ће ускоро бити извезена."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Контакти ће ускоро бити извезени."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Захтев за извоз vCard датотеке је одбијен. Покушајте поново касније."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Кеширање vCard датотекa у локалну привремену меморију. Увоз ће ускоро започети."</string>
@@ -225,15 +220,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Прво име"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Прво презиме"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Подразумевани налог за нове контакте"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Синхронизуј метаподатке контаката [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Синхронизујте метаподатке контаката"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Налог за синхронизовање метаподатака контакта"</string>
     <string name="setting_about" msgid="3926137653588942297">"О Контактима"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Подешавања"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Дели видљиве контакте"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Није успело дељење видљивих контаката."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Дели омиљене контакте"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Дели све контакте"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Дељење контаката није успело."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Увоз/извоз контаката"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Увоз контаката"</string>
     <string name="share_error" msgid="665756457151793108">"Овај контакт не може да се дели."</string>
@@ -276,7 +266,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Политика приватности"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Услови коришћења услуге"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Лиценце отвореног кода"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Отварање URL-а није успело."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Означено: <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Није означено: <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Упути видео позив"</string>
diff --git a/res-common/values-sv-sw600dp/strings.xml b/res-common/values-sv-sw600dp/strings.xml
deleted file mode 100644
index e1451b3..0000000
--- a/res-common/values-sv-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Bara surfplatta (osynkad)"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Det finns inga kontakter att exportera. Om du har kontakter på surfplattan kanske vissa dataleverantörer inte tillåter att kontakterna exporteras från surfplattan."</string>
-</resources>
diff --git a/res-common/values-sv/strings.xml b/res-common/values-sv/strings.xml
index c395fcf..b8e6089 100644
--- a/res-common/values-sv/strings.xml
+++ b/res-common/values-sv/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Ring upp jobbpersonsökare"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Ring <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Ring upp MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ring)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Skicka SMS till <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Skicka SMS till hem"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Skicka SMS till mobil"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Skicka SMS till jobbpersonsökare"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Skicka SMS till <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Skicka SMS till MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (meddelande)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Ring videosamtal"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Vill du rensa listan?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Du rensar listan över personer som du kontaktar ofta i apparna Kontakter och Telefon. E-postappar tvingas lära sig dina mottagarinställningar från början."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontakter"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Annan"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Katalog"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Jobbkatalog"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Jobbkatalog"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Alla kontakter"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Jag"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Söker ..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Kontaktar ofta"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Visa kontakt"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Alla kontakter med telefonnummer"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Kontakter i jobbprofilen"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Kontakter i jobbprofilen"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Visa uppdateringar"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Bara telefon (osynkad)"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Bara telefon (osynkad)"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Namn"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Smeknamn"</string>
     <string name="full_name" msgid="885420216812981202">"Namn"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"En eller flera filer kunde inte importeras (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> har exporterats."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Kontakterna har exporterats."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontakterna har exporterats. Klicka på aviseringen om du vill dela kontakterna."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Tryck här om du vill dela kontakterna."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Exporten av <xliff:g id="FILENAME">%s</xliff:g> avbröts."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Kontaktuppgifter exporteras"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontaktuppgifterna exporteras."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Kontaktuppgifterna exporteras till: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Det gick inte att hämta databasinformation."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Det finns inga kontakter att exportera. Om du har kontakter på mobilen kanske vissa dataleverantörer inte tillåter att kontakterna exporteras från mobilen."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Det finns inga kontakter att exportera. Om du har kontakter på mobilen kanske vissa dataleverantörer inte tillåter att kontakterna exporteras från mobilen."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard-kompositören initierades inte korrekt."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Kunde inte exportera"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Kontaktuppgifterna exporterades inte.\nOrsak: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Begäran om vCard-import avvisades. Försök igen vid ett senare tillfälle."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> exporteras snart."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Filen kommer snart att exporteras."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontakterna exporteras inom kort."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Begäran om vCard-export avvisades. Försök igen vid ett senare tillfälle."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard-fil(er) cachelagras till en lokal tillfällig lagringsenhet. Den faktiska importen börjar snart."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Förnamn först"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Efternamn först"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Standardkonto för nya kontakter"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Synkronisera metadata för kontakter [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Synkronisera metadata för kontakter"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kontaktmetadata för synkroniseringskonto"</string>
     <string name="setting_about" msgid="3926137653588942297">"Om Kontakter"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Inställningar"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Dela synliga kontakter"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Det gick inte att dela synliga kontakter."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Dela favoritkontakterna"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Dela alla kontakter"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Det gick inte att dela kontakterna."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Importera/exportera kontakter"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Importera kontakter"</string>
     <string name="share_error" msgid="665756457151793108">"Den här kontakten kan inte delas."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Sekretesspolicy"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Användarvillkor"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Licenser för öppen källkod"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Det gick inte att öppna webbadressen."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> har markerats"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> har inte markerats"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Ring ett videosamtal"</string>
diff --git a/res-common/values-sw-sw600dp/strings.xml b/res-common/values-sw-sw600dp/strings.xml
deleted file mode 100644
index 7f19d66..0000000
--- a/res-common/values-sw-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Kompyuta kibao pekee, haijasawazishwa"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Hakuna anwani za kuhamishwa.  Kama una anwani kwenye kompyuta yako kibao, baadhi ya watoa huduma za data huenda wasiruhusu anwani kuhamishwa kutoka kwenye kompyuta yako kibao."</string>
-</resources>
diff --git a/res-common/values-sw/strings.xml b/res-common/values-sw/strings.xml
index 751d74a..d9ea082 100644
--- a/res-common/values-sw/strings.xml
+++ b/res-common/values-sw/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Ipigie peja ya kazini"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Piga simu <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Piga simu kwa MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Piga)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Tumia ujumbe wa maandishi kwa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Tuma ujumbe wa maandishi nyumbani"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Tumia simu ya mkononi ujumbe wa maandishi"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Itumie peja ya kazini ya kazini ujumbe"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Tuma ujumbe wa maandishi kwa <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Tumia MMS ujmbe wa maandishi"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Tuma Ujumbe)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Piga Hangout ya video"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Futa unaowasiliana nao mara kwa mara?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Utafuta orodha ya unaowasiliana nao mara kwa mara katika programu za Anwani na Simu, na ulazimishe programu za barua pepe zitambue mapendeleo yako ya anwani kutoka mwanzo."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Anwani"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Kingine"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Saraka"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Anwani za kazi"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Saraka ya Kazi"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Anwani zote"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Mimi"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Inatafuta…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Unaowasiliana nao zaidi"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Angalia anwani"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Anwani zote zilizo na nambari ya simu"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Anwani za watu wa kazini"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Anwani za Wasifu wa Kazini"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Ona sasisho"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Simu pekee, hazitasawazishwa"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Simu pekee, haijalandanishwa"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Jina"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Lakabu"</string>
     <string name="full_name" msgid="885420216812981202">"Jina"</string>
@@ -99,10 +97,10 @@
     <string name="name_family" msgid="5317387657540738981">"Jina la mwisho"</string>
     <string name="name_prefix" msgid="8219879405071462309">"Herufi za kwanza za jina"</string>
     <string name="name_middle" msgid="3951610314424632183">"Jina la kati"</string>
-    <string name="name_suffix" msgid="5436984808550075931">"Herufi za mwisho za jina"</string>
-    <string name="name_phonetic" msgid="2249169131785620210">"Jina la kifonetiki"</string>
-    <string name="name_phonetic_given" msgid="2863316331175661852">"Anza na jina kifonetiki"</string>
-    <string name="name_phonetic_middle" msgid="5970174427249235577">"Jina la kati kifonetiki"</string>
+    <string name="name_suffix" msgid="5436984808550075931">"Kiambishi tamati cha jina"</string>
+    <string name="name_phonetic" msgid="2249169131785620210">"Jina la fonetiki"</string>
+    <string name="name_phonetic_given" msgid="2863316331175661852">"Jina la kwanza kifonetiki"</string>
+    <string name="name_phonetic_middle" msgid="5970174427249235577">"Jina la kati la fonetiki"</string>
     <string name="name_phonetic_family" msgid="1572398622239414464">"Jina la mwisho kifonetiki"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"Simu"</string>
     <string name="emailLabelsGroup" msgid="4696310712601184208">"Barua pepe"</string>
@@ -114,7 +112,7 @@
     <string name="sms" msgid="8086289395154598654">"SMS, (Ujumbe wa maandishi)"</string>
     <string name="postal_address" msgid="7692926530081579786">"Anwani"</string>
     <string name="ghostData_company" msgid="22470841482615409">"Kampuni"</string>
-    <string name="ghostData_title" msgid="6221293237772204604">"Jina"</string>
+    <string name="ghostData_title" msgid="6221293237772204604">"Kichwa"</string>
     <string name="label_notes" msgid="3997277594846722699">"Madokezo"</string>
     <string name="label_sip_address" msgid="3754551597798479318">"SIP"</string>
     <string name="websiteLabelsGroup" msgid="8620657380165071493">"Tovuti"</string>
@@ -176,7 +174,7 @@
     <string name="fail_reason_could_not_open_file" msgid="7041148341788958325">"Haikuweza kufungua \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="1231982631020480035">"Haikuweza kuanzisha kihamishaji: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_no_exportable_contact" msgid="3717046989062541369">"Hakuna anwani inayoweza kuhamishwa."</string>
-    <string name="missing_required_permission" msgid="3120850759881656369">"Umezima idhini inayohitajika."</string>
+    <string name="missing_required_permission" msgid="3120850759881656369">"Umezima ruhusa inayohitajika."</string>
     <string name="fail_reason_error_occurred_during_export" msgid="8426833603664168716">"Hitilafu imetokea wakati wa uhamisho: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_too_long_filename" msgid="3996610741248972232">"Jina la faili linalohitajika ni ndefu sana (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
     <string name="fail_reason_io_error" msgid="7736686553669161933">"Hitilafu ya I/O"</string>
@@ -189,13 +187,11 @@
     <skip />
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Imemaliza kuhamisha <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Imekamilisha kuhamisha anwani."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Imemaliza kuhamisha anwani, bofya kipengele cha arifa ili kushiriki anwani."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Gonga ili ushiriki anwani."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Kuhamisha <xliff:g id="FILENAME">%s</xliff:g> kumeghairiwa."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Inahamisha data ya anwani"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Inahamisha data ya anwani."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Data ya anwani yako inahamishwa <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Haikupata maelezo ya hifadhidata."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Hakuna anwani zinazohamishika. Kama una anwani kwenye simu yako, baadhi ya watoa huduma za data hawawezi kuruhusu anwani kuhamishwa kutoka kwenye simu."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Hakuna anwani zinazohamishika. Kama una anwani kwenye simu yako, baadhi ya watoa huduma za data hawawezi kuruhusu anwani kuhamishwa kutoka kwenye simu."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Kitunzi cha vCard hakikuanza vizuri."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Isingehamishika"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Data ya anwani haikuhamishwa.\nKwa sababu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Ombi la kuleta vCard limekataliwa. Tafadhali jaribu baadaye."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> itahamishwa baada ya muda mfupi."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Faili itahamishwa baada ya dakika chache."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Itahamisha anwani baada ya muda mfupi."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Ombi la kuhamishwa kwa vCard limekataliwa. Jaribu tena baadaye."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"anwani"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Vcard Inaakibisha ndani ya hifadhi ya muda mfupi. Uhamisho halisi utaanza hivi karibuni."</string>
@@ -223,18 +218,13 @@
     <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Jina la kwanza"</string>
     <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Jina la mwisho"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"Mpangilio wa majina"</string>
-    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Anza na jina la kwanza"</string>
-    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Anza na jina la mwisho"</string>
+    <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Jina la kwanza liwe mwanzo"</string>
+    <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Jina la mwisho kwanza"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Akaunti ya msingi ya anwani mpya"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Sawazisha metadata ya anwani [SHIRIKI KATIKA JARIBIO LA KINDANI]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Sawazisha metadata ya anwani"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Akaunti iliyosawazishwa yenye metadata ya anwani"</string>
     <string name="setting_about" msgid="3926137653588942297">"Kuhusu Anwani"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Mipangilio"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Shiriki anwani zinazoonekana"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Imeshindwa kushiriki anwani zinazoonekana."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Shiriki anwani unazopenda"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Shiriki anwani zote"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Imeshindwa kushiriki anwani."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Ingiza au uhamishe anwani"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Ingiza anwani"</string>
     <string name="share_error" msgid="665756457151793108">"Anwani hii haiwezi kushirikiwa."</string>
@@ -270,13 +260,12 @@
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>. Ujumbe <xliff:g id="COUNT_3">%2$d</xliff:g> ambao haujasomwa. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>. Ujumbe <xliff:g id="COUNT_1">%2$d</xliff:g> ambao haujasomwa. </item>
     </plurals>
-    <string name="about_build_version" msgid="4221971683776635130">"Nambari ya toleo"</string>
+    <string name="about_build_version" msgid="4221971683776635130">"Unda toleo"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"Leseni za programu huria"</string>
     <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Maelezo ya leseni ya programu huria"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"Sera ya faragha"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Sheria na masharti"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Leseni za programu huria"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Imeshindwa kufungua url."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> imeteuliwa"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> haijateuliwa"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Anzisha Hangout ya Video"</string>
diff --git a/res-common/values-ta-rIN-sw600dp/strings.xml b/res-common/values-ta-rIN-sw600dp/strings.xml
deleted file mode 100644
index 5ea1a4c..0000000
--- a/res-common/values-ta-rIN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"டேப்லெட் மட்டும், ஒத்திசைக்கப்படவில்லை"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"ஏற்றுமதி செய்யத்தக்க தொடர்புகள் இல்லை. டேப்லெட்டில் தொடர்புகள் இருந்தால், டேப்லெட்டிலிருந்து தொடர்புகளை ஏற்றுமதி செய்வதற்குச் சில தரவு வழங்குநர்கள் அனுமதிக்காமல் போகலாம்."</string>
-</resources>
diff --git a/res-common/values-ta-rIN/strings.xml b/res-common/values-ta-rIN/strings.xml
index 85ce399..7404d58 100644
--- a/res-common/values-ta-rIN/strings.xml
+++ b/res-common/values-ta-rIN/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"பணியிடத்தின் பேஜர் எண்ணில் அழை"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> ஐ அழை"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS தொலைபேசி எண்ணில் அழை"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (அழை)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> க்கு உரைச்செய்தி அனுப்பு"</string>
     <string name="sms_home" msgid="7765831490534280540">"வீட்டு தொலைபேசி எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"பணியிட பேஜர் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> க்கு உரைச்செய்தி அனுப்பு"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS மொபைல் எண்ணிற்கு உரைச்செய்தி அனுப்பு"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (செய்தி அனுப்பு)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"வீடியோவில் அழை"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"அடிக்கடி தொடர்புகொண்ட தொடர்பை அழிக்கவா?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"தொடர்புகள் மற்றும் ஃபோன் பயன்பாடுகளில் உள்ள அடிக்கடி தொடர்பு கொண்டவர்களின் பட்டியல் அழிக்கப்பட்டு, தொடக்கத்திலிருந்து மீண்டும் உங்கள் முகவரியிடல் விருப்பத்தேர்வுகளை மின்னஞ்சல் பயன்பாடுகள் அறியும்படி செய்யப்படும்."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"தொடர்புகள்"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"பிற"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"கோப்பகம்"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"பணிக் கோப்பகம்"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"பணி கோப்பகம்"</string>
     <string name="local_search_label" msgid="9094584931063745728">"எல்லா தொடர்புகளும்"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"நான்"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"தேடுகிறது..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"அடிக்கடி தொடர்புகொண்டவர்கள்"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"தொடர்பைக் காட்டு"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"மொபைல் எண்களுடனான எல்லா தொடர்புகளும்"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"பணிச் சுயவிவரத் தொடர்புகள்"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"பணி சுயவிவரத் தொடர்புகள்"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"புதுப்பிப்புகளைக் காட்டு"</string>
-    <string name="account_phone" msgid="6104157990869081962">"மொபைல் மட்டும், ஒத்திசைக்கப்படவில்லை"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"மொபைல் மட்டும், ஒத்திசைக்கப்படவில்லை"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"பெயர்"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"செல்லப்பெயர்"</string>
     <string name="full_name" msgid="885420216812981202">"பெயர்"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ஒன்று அல்லது அதற்கு மேற்பட்ட கோப்புகளை ஏற்றுமதி செய்ய முடியவில்லை (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> ஐ ஏற்றுமதி செய்வது முடிந்தது."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"தொடர்புகளை ஏற்றுவது முடிந்தது."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"தொடர்புகள் ஏற்றப்பட்டன. தொடர்புகளைப் பகிர, அறிவிப்பைக் கிளிக் செய்யவும்."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"தொடர்புகளைப் பகிர, தட்டவும்."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> ஐ ஏற்றுமதி செய்வது ரத்துசெய்யப்பட்டது."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"தொடர்பு தரவை ஏற்றுமதி செய்கிறது"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"தொடர்புத் தரவு ஏற்றப்படுகிறது."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"தொடர்பின் தரவு ஏற்றுமதி செய்யப்படுகிறது: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"தரவுத்தளத் தகவலைப் பெற முடியவில்லை."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"ஏற்றுமதி செய்யத்தக்க தொடர்புகள் இல்லை. மொபைலில் தொடர்புகள் இல்லை எனில், மொபைலிலிருந்து தொடர்புகளை ஏற்றுமதி செய்வதற்குச் சில தரவு வழங்குநர்கள் அனுமதிக்காமல் போகலாம்."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"ஏற்றுமதி செய்யத்தக்க தொடர்புகள் இல்லை. மொபைலில் தொடர்புகள் இல்லை எனில், மொபைலிலிருந்து தொடர்புகளை ஏற்றுமதி செய்வதற்குச் சில தரவு வழங்குநர்கள் அனுமதிக்காமல் போகலாம்."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard தொகுப்பான் முறையாகத் தொடங்கவில்லை."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"ஏற்றுமதி செய்ய முடியவில்லை"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"தொடர்பு தரவு ஏற்றுமதி செய்யப்படவில்லை.\nகாரணம்: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard இன் இறக்குமதி கோரிக்கை நிராகரிக்கப்பட்டது. பிறகு முயற்சிக்கவும்."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> விரைவில் ஏற்றுமதி செய்யப்படும்."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"கோப்பு விரைவில் ஏற்றப்படும்."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"கூடிய விரைவில் தொடர்புகள் ஏற்றப்படும்."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard இன் ஏற்றுமதி கோரிக்கை நிராகரிக்கப்பட்டது. பிறகு முயற்சிக்கவும்."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"தொடர்பு"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(களை) ஐ அகச் சேமிப்பிடத்தில் தற்காலிகமாகச் சேமிக்கிறது. அசல் இறக்குமதி உடனடியாக தொடங்கப்படும்."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"முதல் பெயர் முதலில்"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"இறுதிப் பெயர் முதலில்"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"புதிய தொடர்புகளுக்கான இயல்பு கணக்கு"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"தொடர்பின் மீத்தரவை ஒத்திசை [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"தொடர்பின் மீத்தரவை ஒத்திசை"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"தொடர்பின் மீத்தரவை ஒத்திசைப்பதற்கான கணக்கு"</string>
     <string name="setting_about" msgid="3926137653588942297">"தொடர்புகள் விவரம்"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"அமைப்புகள்"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"தெரியும் தொடர்புகளைப் பகிர்"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"தெரியும் தொடர்புகளைப் பகிர்வதில் தோல்வி."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"பிடித்த தொடர்புகளைப் பகிர்"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"எல்லா தொடர்புகளையும் பகிர்"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"தொடர்புகளைப் பகிர முடியவில்லை."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"தொடர்புகளை இறக்கு/ஏற்று"</string>
     <string name="dialog_import" msgid="5177004290082451296">"தொடர்புகளை இறக்குமதி செய்தல்"</string>
     <string name="share_error" msgid="665756457151793108">"தொடர்பைப் பகிர முடியவில்லை."</string>
@@ -268,13 +258,12 @@
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>. படிக்காதவை (<xliff:g id="COUNT_3">%2$d</xliff:g>). </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>. படிக்காதது (<xliff:g id="COUNT_1">%2$d</xliff:g>). </item>
     </plurals>
-    <string name="about_build_version" msgid="4221971683776635130">"பதிப்பு எண்"</string>
+    <string name="about_build_version" msgid="4221971683776635130">"அகநிரல் பதிப்பு"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"ஓப்பன் சோர்ஸ் உரிமங்கள்"</string>
     <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"ஓப்பன் சோர்ஸ் மென்பொருளுக்கான உரிம விவரங்கள்"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"தனியுரிமைக் கொள்கை"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"சேவை விதிமுறைகள்"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"ஓப்பன் சோர்ஸ் உரிமங்கள்"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"urlஐத் திறக்க முடியவில்லை."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> தேர்ந்தெடுக்கப்பட்டது"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> தேர்ந்தெடுக்கப்படவில்லை"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"வீடியோ அழைப்பைச் செய்"</string>
diff --git a/res-common/values-te-rIN-sw600dp/strings.xml b/res-common/values-te-rIN-sw600dp/strings.xml
deleted file mode 100644
index 757311a..0000000
--- a/res-common/values-te-rIN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"టాబ్లెట్-మాత్రమే, సమకాలీకరించబడని"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"ఎగుమతి చేయదగిన పరిచయాలు ఏవీ లేవు. మీరు మీ టాబ్లెట్‌లో పరిచయాలు కలిగి ఉన్నప్పటికీ, కొందరు డేటా ప్రదాతలు పరిచయాలను టాబ్లెట్ నుండి ఎగుమతి చేయడానికి అనుమతించకపోవచ్చు."</string>
-</resources>
diff --git a/res-common/values-te-rIN/strings.xml b/res-common/values-te-rIN/strings.xml
index 9018488..f9b1c28 100644
--- a/res-common/values-te-rIN/strings.xml
+++ b/res-common/values-te-rIN/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"కార్యాలయ పేజర్‌కు కాల్ చేయండి"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g>కు కాల్ చేయండి"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMSకు కాల్ చేయండి"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (కాల్ చేయి)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g>కు వచనం పంపండి"</string>
     <string name="sms_home" msgid="7765831490534280540">"ఇంటికి వచనం పంపండి"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"మొబైల్‌కు వచనం పంపండి"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"కార్యాలయ పేజర్‌కు వచనం పంపండి"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g>కు వచనం పంపండి"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMSకు వచనం పంపండి"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (సందేశం పంపు)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"వీడియో కాల్ చేయి"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"తరచుగా సంప్రదించినవాటిని క్లియర్ చేయాలా?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"మీరు పరిచయాలు మరియు ఫోన్ అనువర్తనాల్లో తరచుగా సంప్రదించిన పరిచయాల జాబితాను తీసివేస్తారు మరియు స్క్రాచ్ నుండి మీ చిరునామా ప్రాధాన్యతలను తెలుసుకునేలా ఇమెయిల్ అనువర్తనాలను నిర్బంధిస్తారు."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"పరిచయాలు"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"ఇతరం"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"డైరెక్టరీ"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"కార్యాలయ డైరెక్టరీ"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"కార్యాలయ డైరెక్టరీ"</string>
     <string name="local_search_label" msgid="9094584931063745728">"అన్ని పరిచయాలు"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"నేను"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"శోధిస్తోంది..."</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"తరచుగా సంప్రదించబడినవి"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"పరిచయాన్ని వీక్షించండి"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"ఫోన్ నంబర్‌లు గల అన్ని పరిచయాలు"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"కార్యాలయ ప్రొఫైల్ పరిచయాలు"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"కార్యాలయ ప్రొఫైల్ పరిచయాలు"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"నవీకరణలను వీక్షించండి"</string>
-    <string name="account_phone" msgid="6104157990869081962">"ఫోన్-మాత్రమే, సమకాలీకరించబడని"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"ఫోన్-మాత్రమే, సమకాలీకరించబడలేదు"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"పేరు"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"మారుపేరు"</string>
     <string name="full_name" msgid="885420216812981202">"పేరు"</string>
@@ -100,9 +98,9 @@
     <string name="name_prefix" msgid="8219879405071462309">"పేరు ఆదిప్రత్యయం"</string>
     <string name="name_middle" msgid="3951610314424632183">"మధ్య పేరు"</string>
     <string name="name_suffix" msgid="5436984808550075931">"పేరు అంత్యప్రత్యయం"</string>
-    <string name="name_phonetic" msgid="2249169131785620210">"ఫొనెటిక్ పేరు"</string>
+    <string name="name_phonetic" msgid="2249169131785620210">"ఫోనెటిక్ పేరు"</string>
     <string name="name_phonetic_given" msgid="2863316331175661852">"ఫొనెటిక్ మొదటి పేరు"</string>
-    <string name="name_phonetic_middle" msgid="5970174427249235577">"ఫొనెటిక్ మధ్య పేరు"</string>
+    <string name="name_phonetic_middle" msgid="5970174427249235577">"ఫోనెటిక్ మధ్య పేరు"</string>
     <string name="name_phonetic_family" msgid="1572398622239414464">"ఫొనెటిక్ చివరి పేరు"</string>
     <string name="phoneLabelsGroup" msgid="7913782787902007482">"ఫోన్"</string>
     <string name="emailLabelsGroup" msgid="4696310712601184208">"ఇమెయిల్"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ఒకటి లేదా అంతకంటే ఎక్కువ ఫైల్‌లను (%s) దిగుమతి చేయడం సాధ్యపడలేదు."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g>ని ఎగుమతి చేయడం పూర్తయింది."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"పరిచయాలను ఎగుమతి చేయడం పూర్తయింది."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"పరిచయాలను ఎగుమతి చేయడం పూర్తయింది, పరిచయాలను భాగస్వామ్యం చేయడానికి నోటిఫికేషన్‌ను క్లిక్ చేయండి."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"పరిచయాలను భాగస్వామ్యం చేయడానికి నొక్కండి."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g>ని ఎగుమతి చేయడం రద్దు చేయబడింది."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"పరిచయ డేటాను ఎగుమతి చేస్తోంది"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"పరిచయ డేటా ఎగుమతి చేయబడుతోంది."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"మీ పరిచయ డేటా దీనికి ఎగుమతి చేయబడుతోంది: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"డేటాబేస్ సమాచారాన్ని పొందడం సాధ్యపడలేదు."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"ఎగుమతి చేయదగిన పరిచయాలు ఏవీ లేవు. మీరు మీ ఫోన్‌లో పరిచయాలు కలిగి ఉన్నప్పటికీ, కొందరు డేటా ప్రదాతలు పరిచయాలను ఫోన్ నుండి ఎగుమతి చేయడానికి అనుమతించకపోవచ్చు."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"ఎగుమతి చేయదగిన పరిచయాలు ఏవీ లేవు. మీరు మీ ఫోన్‌లో పరిచయాలు కలిగి ఉన్నప్పటికీ, కొందరు డేటా ప్రదాతలు పరిచయాలను ఫోన్ నుండి ఎగుమతి చేయడానికి అనుమతించకపోవచ్చు."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard కంపోజర్ సరిగ్గా ప్రారంభించబడలేదు."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"ఎగుమతి చేయడం సాధ్యపడలేదు"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"పరిచయ డేటా ఎగుమతి చేయబడలేదు.\nకారణం: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard దిగుమతి అభ్యర్థన తిరస్కరించబడింది. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> కొద్దిసేపట్లో ఎగుమతి చేయబడుతుంది."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ఫైల్ కాసేపట్లో ఎగుమతి చేయబడుతుంది."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"పరిచయాలు త్వరలో ఎగుమతి చేయబడతాయి."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard ఎగుమతి అభ్యర్థన తిరస్కరించబడింది. తర్వాత మళ్లీ ప్రయత్నించండి."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"పరిచయం"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard(ల)ను స్థానిక తాత్కాలిక నిల్వకు కాష్ చేస్తోంది. అసలు దిగుమతి కొద్దిసేపట్లో ప్రారంభమవుతుంది."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"ముందుగా మొదటి పేరు"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"ముందుగా చివరి పేరు"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"కొత్త పరిచయాల కోసం డిఫాల్ట్ ఖాతా"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"పరిచయ మెటాడేటాను సమకాలీకరించు [డాగ్‌ఫుడ్]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"పరిచయ మెటాడేటాను సమకాలీకరించు"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"పరిచయ మెటాడేటా సమకాలీకరణ ఖాతా"</string>
     <string name="setting_about" msgid="3926137653588942297">"పరిచయాల గురించి"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"సెట్టింగ్‌లు"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"కనిపించే పరిచయాలను భాగస్వామ్యం చేయండి"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"కనిపించే పరిచయాలను భాగస్వామ్యం చేయడం విఫలమైంది."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"ఇష్టమైన పరిచయాలను భాగస్వామ్యం చేయి"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"పరిచయాలన్నీ భాగస్వామ్యం చేయి"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"పరిచయాలను భాగస్వామ్యం చేయడం విఫలమైంది."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"పరిచయాలను దిగుమతి/ఎగుమతి చేయండి"</string>
     <string name="dialog_import" msgid="5177004290082451296">"పరిచయాలను దిగుమతి చేయండి"</string>
     <string name="share_error" msgid="665756457151793108">"ఈ పరిచయాన్ని భాగస్వామ్యం చేయడం సాధ్యపడదు."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"గోప్యతా విధానం"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"సేవా నిబంధనలు"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"ఓపెన్ సోర్స్ లైసెన్స్‌లు"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"urlని తెరవడంలో విఫలమైంది."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ఎంచుకోబడింది"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> ఎంచుకోబడలేదు"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"వీడియో కాల్ చేస్తుంది"</string>
diff --git a/res-common/values-th-sw600dp/strings.xml b/res-common/values-th-sw600dp/strings.xml
deleted file mode 100644
index 20e8cfe..0000000
--- a/res-common/values-th-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"แท็บเล็ตเท่านั้น ไม่ซิงค์"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"ไม่มีรายชื่อติดต่อที่สามารถส่งออกได้ หากคุณมีรายชื่อติดต่ออยู่ในแท็บเล็ตของคุณจริงๆ อาจเป็นเพราะผู้ให้บริการข้อมูลบางรายไม่อนุญาตให้ส่งออกรายชื่อติดต่อจากแท็บเล็ต"</string>
-</resources>
diff --git a/res-common/values-th/strings.xml b/res-common/values-th/strings.xml
index 23e0014..bece801 100644
--- a/res-common/values-th/strings.xml
+++ b/res-common/values-th/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"โทรเข้าเพจเจอร์ที่ทำงาน"</string>
     <string name="call_assistant" msgid="5188990854852312696">"โทรหา <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"โทรหา MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (โทร)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"ส่งข้อความถึง <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"ส่งข้อความเข้าโทรศัพท์บ้าน"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"ส่งข้อความเข้ามือถือ"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"ส่งข้อความเข้าเพจเจอร์ที่ทำงาน"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"ส่งข้อความถึง <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"ส่งข้อความถึง MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ข้อความ)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"ใช้แฮงเอาท์วิดีโอ"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"ล้างรายชื่อที่ติดต่อบ่อยไหม"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"คุณจะล้างรายชื่อของผู้ที่ติดต่อด้วยบ่อยๆ ในแอปพลิเคชัน Contacts  และ Phone และบังคับให้แอปพลิเคชันอีเมลเรียนรู้ค่ากำหนดที่อยู่ของคุณใหม่ตั้งแต่ต้น"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"สมุดโทรศัพท์"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"อื่นๆ"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ไดเรกทอรี"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"ไดเรกทอรีที่ทำงาน"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"ไดเรกทอรีที่ทำงาน"</string>
     <string name="local_search_label" msgid="9094584931063745728">"รายชื่อติดต่อทั้งหมด"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"ฉัน"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"กำลังค้นหา…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"ติดต่อบ่อยครั้ง"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"ดูรายชื่อติดต่อ"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"รายชื่อติดต่อทั้งหมดที่มีหมายเลขโทรศัพท์"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"รายชื่อติดต่อในโปรไฟล์งาน"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"รายชื่อติดต่อในโปรไฟล์งาน"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"ดูการอัปเดต"</string>
-    <string name="account_phone" msgid="6104157990869081962">"โทรศัพท์เท่านั้น ไม่ซิงค์"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"โทรศัพท์เท่านั้น ไม่ซิงค์"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"ชื่อ"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"ชื่อเล่น"</string>
     <string name="full_name" msgid="885420216812981202">"ชื่อ"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"ไม่สามารถนำเข้าไฟล์ตั้งแต่หนึ่งไฟล์ขึ้นไป (%s)"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"ส่งออก <xliff:g id="FILENAME">%s</xliff:g> เสร็จแล้ว"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"ส่งออกรายชื่อติดต่อเรียบร้อยแล้ว"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"ส่งออกรายชื่อติดต่อเสร็จแล้ว คลิกการแจ้งเตือนเพื่อแชร์รายชื่อติดต่อ"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"แตะเพื่อแชร์รายชื่อติดต่อ"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"ยกเลิกการส่งออก <xliff:g id="FILENAME">%s</xliff:g> แล้ว"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"กำลังส่งออกข้อมูลสมุดโทรศัพท์"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"กำลังส่งออกข้อมูลรายชื่อติดต่อ"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"กำลังส่งออกข้อมูลรายชื่อติดต่อของคุณไปยัง: <xliff:g id="FILE_NAME">%s</xliff:g>"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ไม่สามารถดึงข้อมูลจากฐานข้อมูล"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"ไม่มีรายชื่อติดต่อที่สามารถส่งออกได้ หากคุณมีรายชื่อติดต่ออยู่ในโทรศัพท์ของคุณจริงๆ อาจเป็นเพราะผู้ให้บริการข้อมูลบางรายไม่อนุญาตให้ส่งออกรายชื่อติดต่อจากโทรศัพท์"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"ไม่มีรายชื่อติดต่อที่สามารถส่งออกได้ หากคุณมีรายชื่อติดต่ออยู่ในโทรศัพท์ของคุณจริงๆ อาจเป็นเพราะผู้ให้บริการข้อมูลบางรายไม่อนุญาตให้ส่งออกรายชื่อติดต่อจากโทรศัพท์"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"โปรแกรมเขียนข้อความ vCard เริ่มการทำงานไม่ถูกต้อง"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"ไม่สามารถส่งออก"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"ไม่ได้ส่งออกข้อมูลรายชื่อติดต่อ\nสาเหตุ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"คำขอนำเข้า vCard ถูกปฏิเสธ ลองใหม่ภายหลัง"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"การส่งออก <xliff:g id="FILENAME">%s</xliff:g> จะเกิดขึ้นในไม่ช้า"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"ระบบจะส่งออกไฟล์ในอีกสักครู่"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"ระบบจะส่งออกรายชื่อติดต่อในไม่ช้า"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"คำขอส่งออก vCard ถูกปฏิเสธ ลองใหม่ภายหลัง"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"รายชื่อติดต่อ"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"กำลังแคช vCard ไปยังที่จัดเก็บข้อมูลชั่วคราวในตัวเครื่อง การนำเข้าจริงจะเริ่มต้นในอีกสักครู่"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"ชื่อขึ้นก่อน"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"นามสกุลขึ้นก่อน"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"บัญชีเริ่มต้นสำหรับรายชื่อติดต่อใหม่"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"ซิงค์ข้อมูลเมตาของรายชื่อติดต่อ [การลองใช้]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"ซิงค์ข้อมูลเมตาของรายชื่อติดต่อ"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"ติดต่อบัญชีซิงค์ข้อมูลเมตา"</string>
     <string name="setting_about" msgid="3926137653588942297">"เกี่ยวกับ \"รายชื่อติดต่อ\""</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"การตั้งค่า"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"แชร์รายชื่อติดต่อที่มองเห็น"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"ไม่สามารถแชร์รายชื่อติดต่อที่มองเห็นได้"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"แชร์รายชื่อติดต่อโปรด"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"แชร์รายชื่อติดต่อทั้งหมด"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"ไม่สามารถแชร์รายชื่อติดต่อ"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"นำเข้า/ส่งออกรายชื่อติดต่อ"</string>
     <string name="dialog_import" msgid="5177004290082451296">"นำเข้ารายชื่อติดต่อ"</string>
     <string name="share_error" msgid="665756457151793108">"ไม่สามารถแชร์รายชื่อติดต่อนี้ได้"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"นโยบายส่วนบุคคล"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"ข้อกำหนดในการให้บริการ"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"ใบอนุญาตโอเพนซอร์ส"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"เปิด URL ไม่สำเร็จ"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"เลือก <xliff:g id="ACCOUNT_INFO">%s</xliff:g> แล้ว"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"ไม่ได้เลือก <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"เริ่มแฮงเอาท์วิดีโอ"</string>
diff --git a/res-common/values-tl-sw600dp/strings.xml b/res-common/values-tl-sw600dp/strings.xml
deleted file mode 100644
index 58f40fa..0000000
--- a/res-common/values-tl-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Tablet lang, hindi naka-sync"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Walang mga nae-export na contact. Kung mayroon kang mga contact sa iyong tablet, maaaring hindi pahintulutan ng ilang data provider na i-export ang mga contact na iyon mula sa tablet."</string>
-</resources>
diff --git a/res-common/values-tl/strings.xml b/res-common/values-tl/strings.xml
index df55f2e..8763dda 100644
--- a/res-common/values-tl/strings.xml
+++ b/res-common/values-tl/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Tawagan sa pager sa trabaho"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Tawagan sa <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Tawagan sa MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Tawagan)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"I-text sa <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"I-text sa bahay"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"I-text sa mobile"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"I-text sa pager sa trabaho"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"I-text sa <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"I-text sa MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Imensahe)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Gumawa ng video call"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"I-clear ang madalas na kinontak"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Iki-clear mo ang listahan ng mga madalas na nakakaugnay sa mga app ng Mga Contact at Telepono at pupuwersahin mo ang mga app ng email na matutunan ang iyong mga kagustuhan sa pag-a-address mula sa simula."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Mga Contact"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Iba pa"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Direktoryo"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Directory sa trabaho"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Direktoryo sa Trabaho"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Lahat ng contact"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ako"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Naghahanap…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Madalas na kino-contact"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Tingnan ang contact"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Lahat ng contact na may mga numero ng telepono"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Mga contact ng profile sa trabaho"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Mga contact ng Profile sa Trabaho"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Tingnan ang mga update"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Telepono lang, hindi naka-sync"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Telepono lang, hindi naka-sync"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Pangalan"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Palayaw"</string>
     <string name="full_name" msgid="885420216812981202">"Pangalan"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Hindi ma-import ang isa o higit pang mga file (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Tapos na ang pag-export ng <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Tapos nang i-export ang mga contact."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Tapos nang ma-export ang mga contact, i-click ang notification upang ibahagi ang mga contact."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"I-tap upang ibahagi ang mga contact."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Kinansela ang pag-export ng <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Ine-export ang data ng contact"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Ine-export ang data ng contact."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Ine-export ang data ng iyong contact sa: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Hindi makuha ang impormasyon ng database."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Walang mga na-e-export na contact. Kung mayroon kang mga contact sa iyong telepono, maaaring hindi payagan ng ilang provider ng data na ma-export mula sa telepono ang mga contact."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Walang mga na-e-export na contact. Kung mayroon kang mga contact sa iyong telepono, maaaring hindi payagan ng ilang provider ng data na ma-export mula sa telepono ang mga contact."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Hindi nagsimula nang maayos ang composer ng vCard."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Hindi ma-export"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Hindi na-export ang data ng contact.\nDahilan: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Tinanggihan ang kahilingan sa pag-import ng vCard. Subukang muli sa ibang pagkakataon."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"I-e-export ang <xliff:g id="FILENAME">%s</xliff:g> sa ilang sandali."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Ie-export ang file sa ilang sandali."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Ie-export ang mga contact sa ilang sandali."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Tinanggihan ang kahilingan sa pag-export ng vCard. Subukang muli sa ibang pagkakataon."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"contact"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Kina-cache ang (mga) vCard sa lokal na pansamantalang storage. Magsisimula sa lalong madaling panahon ang aktwal na pag-import."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Pangalan muna"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Apelyido muna"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Default na account para sa mga bagong contact"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"I-sync ang metadata ng contact [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"I-sync ang metadata ng contact"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Account ng pag-sync ng metadata ng contact"</string>
     <string name="setting_about" msgid="3926137653588942297">"Tungkol sa Mga Contact"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Mga Setting"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Magbahagi ng mga nakikitang contact"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Hindi naibahagi ang mga nakikitang contact."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Ibahagi ang mga paboritong contact"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Ibahagi ang lahat ng contact"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Hindi naibahagi ang mga contact."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Mag-import/mag-export ng mga contact"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Mag-import ng mga contact"</string>
     <string name="share_error" msgid="665756457151793108">"Hindi maibabahagi ang contact na ito."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Patakaran sa privacy"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Mga tuntunin ng serbisyo"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Mga open source na lisensya"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Nabigong buksan ang url."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Nilagyan ng check ang <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Hindi nilagyan ng check ang <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Magsimula ng video call"</string>
diff --git a/res-common/values-tr-sw600dp/strings.xml b/res-common/values-tr-sw600dp/strings.xml
deleted file mode 100644
index 1fe209c..0000000
--- a/res-common/values-tr-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Yalnızca tablet, senkronize değil"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Dışa aktarılabilir kişi yok. Tabletinizde kişiler varsa, bazı veri sağlayıcıları kişilerin tabletten dışa aktarılmasına izin vermeyebilir."</string>
-</resources>
diff --git a/res-common/values-tr/strings.xml b/res-common/values-tr/strings.xml
index 62fb402..7ae7e21 100644
--- a/res-common/values-tr/strings.xml
+++ b/res-common/values-tr/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Sesli arama yap (iş çağrı cihazı)"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Sesli arama yap (<xliff:g id="ASSISTANT">%s</xliff:g>)"</string>
     <string name="call_mms" msgid="8998771923464696960">"Sesli arama yap (MMS)"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Telefon et)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS gönder (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS gönder (ev)"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS gönder (mobil)"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS gönder (iş çağrı cihazı)"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS gönder (<xliff:g id="ASSISTANT">%s</xliff:g>)"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS gönder (MMS)"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Mesaj gönder)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Video görüşmesi yap"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Sık iletişim kurulanlar silinsin mi?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Kişiler ve Telefon uygulamalarındaki sık iletişim kurulanlar listesini temizleyecek ve e-posta uygulamalarını adres tercihlerinizi en baştan öğrenmeye zorlayacaksınız."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Kişiler"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Diğer"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Dizin"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"İş dizini"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"İş Dizini"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Tüm kişiler"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Ben"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Aranıyor…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Sık iletişim kurulanlar"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Kişiyi görüntüle"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Telefon numarası olan tüm kişiler"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"İş profili kişileri"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"İş Profili kişileri"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Güncellemeleri görüntüle"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Yalnızca telefonda saklanan, senkronize olmayan"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Yalnızca telefonda saklanan, senkronize olmayan"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Adı"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Takma ad"</string>
     <string name="full_name" msgid="885420216812981202">"Adı"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Bir veya daha fazla dosya içe aktarılamadı (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> dosyasını dışa aktarma tamamlandı."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Kişileri dışa aktarma işlemi tamamlandı."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kişileri dışa aktarma işlemi tamamlandı. Dışa aktarılan kişileri paylaşmak için bildirimi tıklayın."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Kişileri paylaşmak için hafifçe dokunun."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> dosyasını dışa aktarma iptal edildi."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Kişi verileri dışa aktarılıyor"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kişi verileri dışa aktarılıyor."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Kişi verileriniz şu dosyaya aktarılıyor: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Veritabanı bilgileri alınamadı."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Dışa aktarılabilecek kişi yok. Telefonunuzda kişileriniz varsa, bazı veri sağlayıcıları kişilerin telefondan dışa aktarılmasına izin vermeyebilir."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Dışa aktarılabilecek kişi yok. Telefonunuzda kişileriniz varsa, bazı veri sağlayıcıları kişilerin telefondan dışa aktarılmasına izin vermeyebilir."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard oluşturucu düzgün başlamadı."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Dışa aktarılamadı"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Kişi verileri dışa aktarılamadı.\nNedeni: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard\'ı içe aktarma isteği reddedildi. Daha sonra tekrar deneyin."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> kısa bir süre içinde dışa aktarılacak."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Dosya kısa bir süre sonra dışa aktarılacak."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kişiler kısa sürede dışa aktarılacak."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard\'ı dışa aktarma isteği reddedildi. Daha sonra tekrar deneyin."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kişi"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"vCard\'lar geçici bir yerel depolama alanında önbelleğe alınıyor. Asıl içe aktarma işlemi kısa süre içinde başlayacak."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Önce ad"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Önce soyadı"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Yeni kişiler için varsayılan hesap"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Kişi meta verilerini senkronize et [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Kişi meta verilerini senkronize et"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Kişi meta veri senkronizasyon hesabı"</string>
     <string name="setting_about" msgid="3926137653588942297">"Kişiler Hakkında"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Ayarlar"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Görülebilir kişileri paylaş"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Görünür kişiler paylaşılamadı."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Favori kişileri paylaş"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Tüm kişileri paylaş"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kişiler paylaşılamadı."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Kişileri içe/dışa aktar"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Kişileri içe aktar"</string>
     <string name="share_error" msgid="665756457151793108">"Bu kişi paylaşılamıyor."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Gizlilik politikası"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Hizmet şartları"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Açık kaynak lisansları"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"URL açılamadı."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> işaretlendi"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> işaretlenmedi"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Video görüşmesi yap"</string>
diff --git a/res-common/values-uk-sw600dp/strings.xml b/res-common/values-uk-sw600dp/strings.xml
deleted file mode 100644
index 2a28ef2..0000000
--- a/res-common/values-uk-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Лише на мобільному пристрої, не синхронізується"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Немає контактів, які можна експортувати. Якщо на вашому планшеті є контакти, можливо, постачальник даних заборонив їх експортувати."</string>
-</resources>
diff --git a/res-common/values-uk/strings.xml b/res-common/values-uk/strings.xml
index 4745a4b..51f074a 100644
--- a/res-common/values-uk/strings.xml
+++ b/res-common/values-uk/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Набрати робочий номер пейджера"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Набрати <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Набрати номер MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (зателефонувати)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"SMS на <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"SMS на домашній номер телефону"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS на номер мобільного телефону"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"SMS на робочий номер пейджера"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"SMS на <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"SMS на номер MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (надіслати повідомлення)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Здійснити відеодзвінок"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Очистити список частих контактів?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Буде видалено список користувачів, з якими ви часто спілкуєтеся, з додатків Контакти та Телефон і скинуто налаштування адрес у додатках для електронної пошти."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Контакти"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Інше"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Каталог"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Робочі контакти"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Робочий каталог"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Усі контакти"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Я"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Пошук…"</string>
@@ -91,9 +89,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Часті контакти"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Переглянути контакт"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Усі контакти з номерами телефону"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Контакти в робочому профілі"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Контакти в робочому профілі"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Переглянути оновлення"</string>
-    <string name="account_phone" msgid="6104157990869081962">"лише в телефоні, не синхронізується"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Лише в телефоні, не синхронізується"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Ім’я"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Псевдонім"</string>
     <string name="full_name" msgid="885420216812981202">"Ім’я"</string>
@@ -189,13 +187,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Не вдалось імпортувати один або декілька файлів (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Експорт файлу <xliff:g id="FILENAME">%s</xliff:g> завершено."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Контакти експортовано."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Контакти експортовано. Натисніть сповіщення, щоб надати доступ до контактів."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Торкніться, щоб надати доступ до контактів."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Експорт файлу <xliff:g id="FILENAME">%s</xliff:g> скасовано."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Експортувати контактні дані"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Контакти експортуються."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Ваші контактні дані експортуються у файл: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Не вдалось отримати інформацію бази даних."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Немає контактів, які можна експортувати. Якщо у вашому телефоні є контакти, можливо, якийсь постачальник даних заборонив експорт контактів із телефону."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Немає контактів, які можна експортувати. Якщо у вашому телефоні є контакти, можливо, якийсь постачальник даних заборонив експорт контактів із телефону."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Майстер vCard не запущено належним чином."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Помилка експорту"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Контактні дані не експортовано.\nПричина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -209,7 +205,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Запит на імпорт файлу vCard відхилено. Повторіть спробу пізніше."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"Файл <xliff:g id="FILENAME">%s</xliff:g> незабаром буде експортовано."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Невдовзі файл буде експортовано."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Контакти невдовзі буде експортовано."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Запит на експорт файлу vCard відхилено. Повторіть спробу пізніше."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"контакт"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Кешування файлів vCard у локальну тимчасову пам’ять. Імпорт почнеться незабаром."</string>
@@ -226,15 +221,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Ім’я спочатку"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Прізвище спочатку"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Обліковий запис за умовчанням для нових контактів"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Синхронізувати метадані контактів [ВНУТРІШНЄ ТЕСТУВАННЯ]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Синхронізувати метадані контактів"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Обліковий запис для синхронізації метаданих контактів"</string>
     <string name="setting_about" msgid="3926137653588942297">"Про додаток Контакти"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Налаштування"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Надіслати видимі контакти"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Не вдалося поділитись видимими контактами."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Поділитися вибраними контактами"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Поділитися всіма контактами"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Не вдалося поділитися контактами."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Імпорт/експорт контактів"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Імпорт контактів"</string>
     <string name="share_error" msgid="665756457151793108">"Цей контакт неможливо надіслати."</string>
@@ -278,7 +268,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Політика конфіденційності"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Умови використання"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Ліцензії відкритого коду"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Не вдалося відкрити посилання."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> вибрано"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> не вибрано"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Почати відеодзвінок"</string>
diff --git a/res-common/values-ur-rPK-sw600dp/strings.xml b/res-common/values-ur-rPK-sw600dp/strings.xml
deleted file mode 100644
index 63f2829..0000000
--- a/res-common/values-ur-rPK-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"صرف ٹیبلٹ، غیر مطابقت پذیر"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"برآمد کرنے لائق کوئی رابطے نہیں ہیں۔ اگر آپ کے ٹیبلٹ پر واقعی رابطے ہیں تو ممکن ہے کچھ ڈیٹا فراہم کنندگان رابطوں کو ٹیبلٹ سے برآمد کیے جانے کی اجازت نہ دیتے ہوں۔"</string>
-</resources>
diff --git a/res-common/values-ur-rPK/strings.xml b/res-common/values-ur-rPK/strings.xml
index 0d7fb85..f5a6102 100644
--- a/res-common/values-ur-rPK/strings.xml
+++ b/res-common/values-ur-rPK/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"دفتر کے پیجر پر کال کریں"</string>
     <string name="call_assistant" msgid="5188990854852312696">"<xliff:g id="ASSISTANT">%s</xliff:g> کو کال کریں"</string>
     <string name="call_mms" msgid="8998771923464696960">"‏MMS نمبر پر کال کریں"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (کال کریں)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g> پر متن بھیجیں"</string>
     <string name="sms_home" msgid="7765831490534280540">"گھر کے نمبر پر متن بھیجیں"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"موبائل پر متن بھیجیں"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"دفتر کے پیجر پر متن بھیجیں"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> پر متن بھیجیں"</string>
     <string name="sms_mms" msgid="4887206338311086612">"‏MMS نمبر پر متن بھیجیں"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (پیغام بھیجیں)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"ویڈیو کال کریں"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"اکثر رابطہ کردہ کو صاف کریں؟"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"آپ رابطے اور فون ایپس میں اکثر رابطہ کردہ فہرست کو صاف کر دیں گے اور ای میل ایپس کو از سر نو اپنے پتے کی ترجیحات جاننے پر مجبور کریں گے۔"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"رابطے"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"دیگر"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"ڈائریکٹری"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"دفتری ڈائرکٹری"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"کام کی ڈائرکٹری"</string>
     <string name="local_search_label" msgid="9094584931063745728">"سبھی رابطے"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"میں"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"تلاش کر رہا ہے…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"اکثر رابطہ کردہ"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"رابطہ دیکھیں"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"فون نمبرز کے ساتھ سبھی رابطے"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"دفتری پروفائل رابطے"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"دفتری پروفائل رابطے"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"اپ ڈیٹس دیکھیں"</string>
-    <string name="account_phone" msgid="6104157990869081962">"صرف فون، غیر مطابقت پذیر"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"صرف فون، غیر مطابقت پذیر"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"نام"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"عرفی نام"</string>
     <string name="full_name" msgid="885420216812981202">"نام"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"‏ایک یا مزید فائلیں درآمد نہیں ہوسکیں (%s)۔"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g> کی برآمد پوری ہوگئی۔"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"رابطوں کی برآمدگی مکمل ہو گئی۔"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"رابطوں کی برآمدگی مکمل ہو گئی، رابطوں کا اشتراک کرنے کیلئے اطلاع پر کلک کریں۔"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"رابطوں کا اشتراک کرنے کے لئے تھپتھپائیں۔"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g> کی برآمد منسوخ ہوگئی۔"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"رابطہ کا ڈیٹا برآمد کر رہا ہے"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"رابطہ ڈیٹا برآمد ہو رہا ہے۔"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"آپ کا رابطے کا ڈیٹا اس میں برآمد کیا جا رہا ہے: <xliff:g id="FILE_NAME">%s</xliff:g>۔"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"ڈیٹابیس کی معلومات حاصل نہیں ہو سکی۔"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"برآمد کرنے لائق کوئی رابطے نہیں ہیں۔ اگر آپ کے فون پر واقعی رابطے ہیں تو ممکن ہے کچھ ڈیٹا فراہم کنندگان رابطوں کو فون سے برآمد کیے جانے کی اجازت نہ دیتے ہوں۔"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"برآمد کرنے لائق کوئی رابطے نہیں ہیں۔ اگر آپ کے فون پر واقعی رابطے ہیں تو ممکن ہے کچھ ڈیٹا فراہم کنندگان رابطوں کو فون سے برآمد کیے جانے کی اجازت نہ دیتے ہوں۔"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"وی کارڈ کمپوزر مناسب طریقے سے شروع نہیں ہوا۔"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"برآمد نہیں کیا جاسکا"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"رابطہ کا ڈیٹا برآمد نہیں ہوا۔\nوجہ: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"وی کارڈ درآمد کرنے کی درخواست مسترد ہوگئی تھی۔ بعد میں دوبارہ کوشش کریں۔"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> جلد ہی برآمد کی جائے گی۔"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"فائل تھوڑی دیر میں برآمد کر دی جائے گی۔"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"رابطے جلد ہی برآمد ہو جائیں گے۔"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"وی کارڈ برآمد کرنے کی درخواست مسترد ہوگئی تھی۔ بعد میں دوبارہ کوشش کریں۔"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"رابطہ"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"وی کارڈ (کارڈز) کو مقامی عارضی اسٹوریج میں ذخیرہ کر رہا ہے۔ اصل درآمد جلد ہی شروع ہوگی۔"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"پہلا نام پہلے"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"آخری نام پہلے"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"نئے رابطوں کیلئے ڈیفالٹ اکاؤنٹ"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"‏رابطہ میٹا ڈیٹا مطابقت پذیر بنائیں [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"رابطہ میٹا ڈیٹا مطابقت پذیر بنائیں"</string>
-    <string name="setting_about" msgid="3926137653588942297">"رابطے کے بارے میں"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"ترتیبات"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"رابطہ میٹا ڈیٹا کیلئے مطابقت پذیر اکاؤنٹ"</string>
+    <string name="setting_about" msgid="3926137653588942297">"رابطوں کے بارے میں"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"مرئی رابطوں کا اشتراک کریں"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"مرئی رابطوں کا اشتراک کرنے میں ناکام ہو گیا۔"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"پسندیدہ رابطوں کا اشتراک کریں"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"سارے رابطوں کا اشتراک کریں"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"رابطوں کا اشتراک کرنے میں ناکام۔"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"رابطے درآمد/برآمد کریں"</string>
     <string name="dialog_import" msgid="5177004290082451296">"رابطے درآمد کریں"</string>
     <string name="share_error" msgid="665756457151793108">"اس رابطہ کا اشتراک نہیں کیا جا سکتا۔"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"رازداری کی پالیسی"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"سروس کی شرائط"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"اوپن سورس لائسنسز"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"‏URL کھولنے میں ناکامی۔"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> چیک ہو گیا"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> چیک نہیں ہوا"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"ویڈیو کال کریں"</string>
diff --git a/res-common/values-uz-rUZ-sw600dp/strings.xml b/res-common/values-uz-rUZ-sw600dp/strings.xml
deleted file mode 100644
index 6a4db01..0000000
--- a/res-common/values-uz-rUZ-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Faqat planshetda, sinxronlanmaydi"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Eksport qilsa bo‘ladigan kontaktlar mavjud emas. Agar planshetingizda kontaktlar bo‘lsa, ba’zi tarmoq operatorlari planshetdan kontaktlarni eksport qilishga ruxsat bermaydi."</string>
-</resources>
diff --git a/res-common/values-uz-rUZ/strings.xml b/res-common/values-uz-rUZ/strings.xml
index ea1c6e1..f9a0d50 100644
--- a/res-common/values-uz-rUZ/strings.xml
+++ b/res-common/values-uz-rUZ/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Ish peyjeriga qo‘ng‘iroq qilish"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Qo‘ng‘iroq: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"MMS raqamga qo‘ng‘iroq qilish"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Qo‘ng‘iroq qilish)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"<xliff:g id="CUSTOM">%s</xliff:g>ga sms jo‘natish"</string>
     <string name="sms_home" msgid="7765831490534280540">"Uy telefoniga sms jo‘natish"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"SMS: mobil"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Ish peyjeriga sms jo‘natish"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"<xliff:g id="ASSISTANT">%s</xliff:g> telefoniga qo‘ng‘iroq qilish"</string>
     <string name="sms_mms" msgid="4887206338311086612">"MMS telefonga sms jo‘natish"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Xabar yozish)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Videoqo‘ng‘iroq qilish"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Ko‘p gaplashilganlar tozalansinmi?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Kontaktlar va Telefon ilovalaridagi tez-tez aloqa qilingan kontaktlar ro‘yxati tozalanadi hamda e-pochta ilovalari sizning shaxsiy sozlamalaringizga moslashadi."</string>
@@ -73,12 +71,12 @@
     <string name="contactsList" msgid="7140022347217602605">"Kontaktlar"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Boshqa"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Direktoriya"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Ishchi katalogi"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Ishchi guruhi"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Barcha kontaktlar"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Men"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Qidirilmoqda…"</string>
     <string name="foundTooManyContacts" msgid="3060037437459313616">"<xliff:g id="COUNT">%d</xliff:g>dan ko‘proq topildi."</string>
-    <string name="listFoundAllContactsZero" msgid="4406036083994138930">"Hech narsa topilmadi"</string>
+    <string name="listFoundAllContactsZero" msgid="4406036083994138930">"Hech qanday kontakt yo‘q"</string>
     <plurals name="searchFoundContacts" formatted="false" msgid="4016164064185890420">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ta topildi</item>
       <item quantity="one">1 found</item>
@@ -89,17 +87,17 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Ko‘p gaplashilgan kontaktlar"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Kontaktni ko‘rish"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Telefon raqamli kontaktlar"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Ishchi profili kontaktlari"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Ishchi profil kontaktlari"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Yangilanishlarni ko‘rish"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Faqat telefonga saqlanadigan va sinxronlanmaydigan"</string>
-    <string name="nameLabelsGroup" msgid="1817502703362057154">"Ism"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Faqat telefonda, sinxronlanmaydi"</string>
+    <string name="nameLabelsGroup" msgid="1817502703362057154">"Ismi"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Taxallusi"</string>
     <string name="full_name" msgid="885420216812981202">"To‘liq ismi"</string>
-    <string name="name_given" msgid="4153709115654909377">"Ism"</string>
+    <string name="name_given" msgid="4153709115654909377">"Ismi"</string>
     <string name="name_family" msgid="5317387657540738981">"Familiyasi"</string>
-    <string name="name_prefix" msgid="8219879405071462309">"Ism prefiksi"</string>
+    <string name="name_prefix" msgid="8219879405071462309">"Ismga old qo‘shimcha"</string>
     <string name="name_middle" msgid="3951610314424632183">"Otasining ismi"</string>
-    <string name="name_suffix" msgid="5436984808550075931">"Ism suffiksi"</string>
+    <string name="name_suffix" msgid="5436984808550075931">"Ismga qo‘shimcha"</string>
     <string name="name_phonetic" msgid="2249169131785620210">"Ism talaffuzi"</string>
     <string name="name_phonetic_given" msgid="2863316331175661852">"Ism talaffuzi"</string>
     <string name="name_phonetic_middle" msgid="5970174427249235577">"Otasining ismi talaffuzi"</string>
@@ -151,7 +149,7 @@
     <string name="list_filter_all_accounts" msgid="4265359896628915784">"Barcha kontaktlar"</string>
     <string name="list_filter_all_starred" msgid="9060325494254507806">"Baho berilgan"</string>
     <string name="list_filter_customize" msgid="2352794292558465089">"Sozlash"</string>
-    <string name="list_filter_single" msgid="4553809449379139446">"Tanlangan kontakt"</string>
+    <string name="list_filter_single" msgid="4553809449379139446">"Kontakt"</string>
     <string name="display_ungrouped" msgid="3669471582032440138">"Boshqa kontaktlar"</string>
     <string name="display_all_contacts" msgid="7251385818740728862">"Barcha kontaktlar"</string>
     <string name="menu_sync_remove" msgid="6581565236520430269">"Sinx. guruhini o‘chirish"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Bir yoki bir necha fayllarni import qilib bo‘lmadi (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"<xliff:g id="FILENAME">%s</xliff:g>ni eksport qilish tugadi."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Kontaktlar eksport qilindi."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Kontaktlar eksport qilindi, ularni baham ko‘rish uchun bildirishnoma ustiga bosing."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Kontaktlarni baham ko‘rish uchun bosing."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"<xliff:g id="FILENAME">%s</xliff:g>ni eksport qilish bekor qilindi."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Kontakt ma’lumoti eksport qilinmoqda"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Kontakt ma’lumotlari eksport qilinmoqda."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Kontakt ma’lumotlaringiz <xliff:g id="FILE_NAME">%s</xliff:g>ga eksport qilinmoqda."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Ma’lumotlar bazasining ma’lumoti olinmadi."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Eksport qilsa bo‘ladigan kontaktlar mavjud emas. Agar telefoningizda kontaktlar bo‘lsa, ba’zi tarmoq operatorlari telefondan kontaktlarni eksport qilishga ruxsat bermaydi."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Eksport qilsa bo‘ladigan kontaktlar mavjud emas. Agar telefoningizda kontaktlar bo‘lsa, ba’zi tarmoq operatorlari telefondan kontaktlarni eksport qilishga ruxsat bermaydi."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Tashrifnoma yaratgich to‘g‘ri ishga tushmagan."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Eksport qilinmadi"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Kontakt ma’lumoti eksport qilinmadi.\nSababi: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Tashrifnomani import qilish so‘rovi rad qilindi. Keyinroq urinib ko‘ring."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> tezda eksport qilinadi."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Fayl tez orada eksport qilinadi."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Kontaktlar tez orada eksport qilinadi."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Tashrifnomani eksport qilish rad qilindi. Keyinroq urinib ko‘ring."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"kontakt"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Tashrifnoma(lar) telefondagi vaqtinchalik xotira keshiga yuklanmoqda. Import qilish jarayoni tezda boshlanadi."</string>
@@ -217,37 +212,32 @@
     <string name="caching_vcard_title" msgid="9185299351381102305">"Keshga yuklanmoqda"</string>
     <string name="progress_notifier_message" msgid="359931715339778107">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g> import qilinmoqda"</string>
     <string name="export_to_vcf_file" product="default" msgid="4142192068495589925">"VCF faylga eksport qilish"</string>
-    <string name="display_options_sort_list_by" msgid="8635268562263708102">"Saralash tartibi"</string>
-    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Ismi bo‘yicha"</string>
-    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Familiyasi bo‘yicha"</string>
+    <string name="display_options_sort_list_by" msgid="8635268562263708102">"Saralash"</string>
+    <string name="display_options_sort_by_given_name" msgid="7775798046001047995">"Ismi"</string>
+    <string name="display_options_sort_by_family_name" msgid="8196947856299225342">"Familiyasi"</string>
     <string name="display_options_view_names_as" msgid="3232196224409242435">"Ism formati"</string>
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Avval ismi"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Avval familiyasi"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Yangi kontaktlar uchun birlamchi hisob"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Kontakt meta-ma’lumotlarini sinxronlash [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Kontakt meta-ma’lumotlarini sinxronlash"</string>
-    <string name="setting_about" msgid="3926137653588942297">"Kontaktlar ilovasi haqida"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Sozlamalar"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Hisobni sinxronlash kontakt meta-ma’lumotlari"</string>
+    <string name="setting_about" msgid="3926137653588942297">"Kontaktlar haqida"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Ko‘rinadigan kontaktlarni yuborish"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Ko‘rinadigan kontaktlarni yuborib bo‘lmadi."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Sevimli kontaktlarni yuborish"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Barcha kontaktlarni yuborish"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Kontaktlarni yuborib bo‘lmadi."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Kontaktlarni import/eksport qilish"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Kontaktlarni import qilish"</string>
     <string name="share_error" msgid="665756457151793108">"Kontaktni yuborib bo‘lmadi."</string>
-    <string name="no_contact_to_share" msgid="5749367538191552509">"Yuborish uchun hech qanday kontakt yo‘q."</string>
+    <string name="no_contact_to_share" msgid="5749367538191552509">"Ulashish uchun hech qanday kontakt yo‘q."</string>
     <string name="menu_search" msgid="7464453023659824700">"Qidirish"</string>
-    <string name="menu_contacts_filter" msgid="586356478145511794">"Ko‘rinadigan kontaktlar"</string>
-    <string name="activity_title_contacts_filter" msgid="7689519428197855166">"Ko‘rinadigan kontaktlar"</string>
+    <string name="menu_contacts_filter" msgid="586356478145511794">"Kontaktlarni filtrlash"</string>
+    <string name="activity_title_contacts_filter" msgid="7689519428197855166">"Kontaktlarni filtrlash"</string>
     <string name="custom_list_filter" msgid="582616656313514803">"Kontaktlar guruhini tanlang"</string>
-    <string name="hint_findContacts" msgid="28151707326753522">"Kontaktlar ichidan qidirish"</string>
-    <string name="contactsFavoritesLabel" msgid="1222038757062409949">"Sevimlilar"</string>
+    <string name="hint_findContacts" msgid="28151707326753522">"Kontakt qidirish"</string>
+    <string name="contactsFavoritesLabel" msgid="1222038757062409949">"Saralar"</string>
     <string name="listTotalAllContactsZero" msgid="6041341919823872732">"Hech qanday kontakt yo‘q."</string>
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"Ko‘rinadigan kontaktlar yo‘q."</string>
     <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"Hech narsa yo‘q"</string>
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"<xliff:g id="NAME">%s</xliff:g> guruhida hech qanday kontakt yo‘q"</string>
-    <string name="menu_clear_frequents" msgid="8492322695770647639">"Tez-tez aloqadagilarni tozalash"</string>
+    <string name="menu_clear_frequents" msgid="8492322695770647639">"Muntazam qo‘n-qlarni tozalash"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"SIM kartani tanlash"</string>
     <string name="menu_accounts" msgid="2944004960829403994">"Hisoblarni boshqarish"</string>
     <string name="menu_import_export" msgid="6446229463809981669">"Import/eksport"</string>
@@ -268,13 +258,12 @@
       <item quantity="other"> <xliff:g id="TITLE_2">%1$s</xliff:g>. <xliff:g id="COUNT_3">%2$d</xliff:g> ta o‘qilmagan. </item>
       <item quantity="one"> <xliff:g id="TITLE_0">%1$s</xliff:g>. <xliff:g id="COUNT_1">%2$d</xliff:g> ta o‘qilmagan. </item>
     </plurals>
-    <string name="about_build_version" msgid="4221971683776635130">"Versiyasi"</string>
-    <string name="about_open_source_licenses" msgid="3224958101863814649">"Ochiq kodli DT litsenziyalari"</string>
-    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Ochiq kodli DT litsenziyalari haqida ma’lumot"</string>
+    <string name="about_build_version" msgid="4221971683776635130">"Yig‘ma versiyasi"</string>
+    <string name="about_open_source_licenses" msgid="3224958101863814649">"Ochiq kodli dasturiy ta’minot litsenziyalari"</string>
+    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"Ochiq kodli dasturiy ta’minot litsenziyalari haqida ma’lumot"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"Maxfiylik siyosati"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Foydalanish shartlari"</string>
-    <string name="activity_title_licenses" msgid="7812517458691564230">"Ochiq kodli DT litsenziyalari"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"URLni ochishda xatolik yuz berdi."</string>
+    <string name="activity_title_licenses" msgid="7812517458691564230">"Ochiq kodli dasturiy ta’minot litsenziyalari"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> belgilandi"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> belgilanmadi"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Video qo‘ng‘iroq qilish"</string>
diff --git a/res-common/values-vi-sw600dp/strings.xml b/res-common/values-vi-sw600dp/strings.xml
deleted file mode 100644
index 0ffca5c..0000000
--- a/res-common/values-vi-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Chỉ trên máy tính bảng, chưa được đồng bộ hóa"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Không thể xuất liên hệ nào. Nếu bạn có danh bạ trên máy tính bảng của mình, một số nhà cung cấp dữ liệu có thể không cho phép xuất danh bạ từ máy tính bảng."</string>
-</resources>
diff --git a/res-common/values-vi/strings.xml b/res-common/values-vi/strings.xml
index cba17634..1e50ea7 100644
--- a/res-common/values-vi/strings.xml
+++ b/res-common/values-vi/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Gọi số máy nhắn tin cơ quan"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Gọi <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Gọi MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Gọi)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Nhắn tin tới <xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Nhắn tin tới số điện thoại nhà riêng"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Nhắn tin tới số điện thoại di động"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Nhắn tin tới số máy nhắn tin cơ quan"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Nhắn tin tới <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Nhắn tin tới số điện thoại MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Tin nhắn)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Gọi điện video"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Xóa danh sách liên hệ thường xuyên?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Bạn sẽ xóa danh sách liên hệ thường xuyên trong ứng dụng Danh bạ và điện thoại cũng như buộc các ứng dụng email phải tìm hiểu các tùy chọn gửi của bạn lại từ đầu."</string>
@@ -73,12 +71,12 @@
     <string name="contactsList" msgid="7140022347217602605">"Danh bạ"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Khác"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Thư mục"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Thư mục công việc"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Thư mục công việc"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Tất cả người liên hệ"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Tôi"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Đang tìm kiếm…"</string>
     <string name="foundTooManyContacts" msgid="3060037437459313616">"Đã tìm thấy hơn <xliff:g id="COUNT">%d</xliff:g> người liên hệ."</string>
-    <string name="listFoundAllContactsZero" msgid="4406036083994138930">"Không có liên hệ nào"</string>
+    <string name="listFoundAllContactsZero" msgid="4406036083994138930">"Không có người liên hệ nào"</string>
     <plurals name="searchFoundContacts" formatted="false" msgid="4016164064185890420">
       <item quantity="other">Đã tìm thấy <xliff:g id="COUNT">%d</xliff:g></item>
       <item quantity="one">Đã tìm thấy 1</item>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Thường xuyên được liên hệ"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Xem người liên hệ"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Tất cả người liên hệ có số điện thoại"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Liên hệ trên hồ sơ công việc"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Danh bạ trên Hồ sơ công việc"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Xem thông tin cập nhật"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Chỉ trên điện thoại, ko đồng bộ"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Chỉ trên điện thoại, ko đồng bộ"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Tên"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Biệt hiệu"</string>
     <string name="full_name" msgid="885420216812981202">"Tên"</string>
@@ -187,16 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Không thể nhập một hoặc nhiều tệp (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Đã xuất xong <xliff:g id="FILENAME">%s</xliff:g>."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Đã xuất xong danh bạ."</string>
-    <!-- no translation found for exporting_vcard_finished_toast (5995505525489290221) -->
-    <skip />
-    <!-- no translation found for touch_to_share_contacts (3237211496215699092) -->
-    <skip />
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Quá trình xuất <xliff:g id="FILENAME">%s</xliff:g> bị hủy."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Đang xuất dữ liệu liên hệ"</string>
-    <!-- no translation found for exporting_contact_list_message (141905615542638683) -->
-    <skip />
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Dữ liệu liên hệ của bạn đang được xuất sang: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Không thể nhận thông tin cơ sở dữ liệu."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Không thể xuất liên hệ nào. Nếu bạn có danh bạ trên điện thoại của mình, một số nhà cung cấp dữ liệu không cho phép xuất danh bạ từ điện thoại."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Không thể xuất liên hệ nào. Nếu bạn có danh bạ trên điện thoại của mình, một số nhà cung cấp dữ liệu không cho phép xuất danh bạ từ điện thoại."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Trình soạn vCard không khởi động đúng."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Không thể xuất"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Không xuất được dữ liệu liên hệ.\nLý do: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -210,8 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Yêu cầu nhập vCard bị từ chối. Hãy thử lại sau."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> sẽ sớm được xuất."</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Tệp sẽ sớm được xuất."</string>
-    <!-- no translation found for contacts_export_will_start_message (4527597765334949574) -->
-    <skip />
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Yêu cầu xuất vCard bị từ chối. Hãy thử lại sau."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"liên hệ"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Đang lưu vào bộ nhớ cache các tệp vCard sẽ được nhập vào bộ nhớ cục bộ tạm thời. Thao tác nhập thực sự sẽ sớm bắt đầu."</string>
@@ -228,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Tên trước"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Họ trước"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"Tài khoản mặc định cho các liên hệ mới"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Đồng bộ hóa siêu dữ liệu liên hệ [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Đồng bộ hóa siêu dữ liệu liên hệ"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"Tài khoản đồng bộ hóa siêu dữ liệu liên hệ"</string>
     <string name="setting_about" msgid="3926137653588942297">"Giới thiệu về Danh bạ"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Cài đặt"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Chia sẻ liên hệ hiển thị"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Không chia sẻ được liên hệ được hiển thị."</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Chia sẻ liên hệ yêu thích"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Chia sẻ tất cả các liên hệ"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Không chia sẻ được liên hệ."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Nhập/xuất danh bạ"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Nhập danh bạ"</string>
     <string name="share_error" msgid="665756457151793108">"Không thể chia sẻ liên hệ này."</string>
@@ -278,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Chính sách bảo mật"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Điều khoản dịch vụ"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Giấy phép nguồn mở"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Không mở được url."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"Đã kiểm tra <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"Chưa kiểm tra <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Gọi điện video"</string>
diff --git a/res-common/values-zh-rCN-sw600dp/strings.xml b/res-common/values-zh-rCN-sw600dp/strings.xml
deleted file mode 100644
index f771c78..0000000
--- a/res-common/values-zh-rCN-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"仅保存在平板电脑中，不同步"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"没有可导出的联系人。如果您的平板电脑上确实存有联系人，则可能是某些数据源不允许从平板电脑中导出联系人。"</string>
-</resources>
diff --git a/res-common/values-zh-rCN/strings.xml b/res-common/values-zh-rCN/strings.xml
index a25ecb7..835935d 100644
--- a/res-common/values-zh-rCN/strings.xml
+++ b/res-common/values-zh-rCN/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"拨打公司寻呼机号码"</string>
     <string name="call_assistant" msgid="5188990854852312696">"拨打<xliff:g id="ASSISTANT">%s</xliff:g>的电话号码"</string>
     <string name="call_mms" msgid="8998771923464696960">"拨打彩信电话号码"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g>（拨打电话）"</string>
     <string name="sms_custom" msgid="4601748252470175865">"向<xliff:g id="CUSTOM">%s</xliff:g>的电话号码发短信"</string>
     <string name="sms_home" msgid="7765831490534280540">"向家庭电话号码发短信"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"向手机发短信"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"向公司寻呼机号码发短信"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"向<xliff:g id="ASSISTANT">%s</xliff:g>发短信"</string>
     <string name="sms_mms" msgid="4887206338311086612">"向彩信电话号码发短信"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g>（发送短信）"</string>
     <string name="description_video_call" msgid="4907306403398614909">"发起视频通话"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"是否清除常用联系人？"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"此操作会清除“通讯录”和“电话”应用中的常用联系人列表，并强制电子邮件应用重新获取您最常使用的联系地址。"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"通讯录"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"其他"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"目录"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"工作目录"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"工作目录"</string>
     <string name="local_search_label" msgid="9094584931063745728">"所有联系人"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"我"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"正在搜索…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"常用联系人"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"查看联系人"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"所有拥有电话号码的联系人"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"工作资料通讯录"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"工作资料通讯录"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"查看最新动态"</string>
-    <string name="account_phone" msgid="6104157990869081962">"仅保存在手机中，不同步"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"仅保存在手机中，不同步"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"姓名"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"昵称"</string>
     <string name="full_name" msgid="885420216812981202">"姓名"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"一个或多个文件无法导入 (%s)。"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"已顺利导出“<xliff:g id="FILENAME">%s</xliff:g>”。"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"已成功导出联系人。"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"联系人数据导出已完成；点击通知即可分享联系人数据。"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"点按即可分享联系人数据。"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"已取消导出“<xliff:g id="FILENAME">%s</xliff:g>”。"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"正在导出联系人数据"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"正在导出联系人数据。"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"正在将您的联系人数据导出到以下文件：<xliff:g id="FILE_NAME">%s</xliff:g>。"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"无法获取数据库信息。"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"没有可导出的联系人。如果您手机上确实存有联系人信息，则可能是某些数据源不允许您从手机中导出联系人信息。"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"没有可导出的联系人。如果您手机上确实存有联系人信息，则可能是某些数据源不允许您从手机中导出联系人信息。"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard 制作程序未正确启动。"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"无法导出"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"未导出联系人数据。\n原因：“<xliff:g id="FAIL_REASON">%s</xliff:g>”"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard 导入请求遭拒，请稍后重试。"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"“<xliff:g id="FILENAME">%s</xliff:g>”将在稍后导出。"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"该文件将在稍后导出。"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"即将导出联系人数据。"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard 导出请求遭拒，请稍后重试。"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"联系人"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"正在将 vCard 缓存到本地临时存储空间。实际导入操作即将开始。"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"名字在前"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"姓氏在前"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"用于保存新联系人的默认帐号"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"同步联系人元数据 [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"同步联系人元数据"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"联系人元数据同步帐号"</string>
     <string name="setting_about" msgid="3926137653588942297">"关于通讯录"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"设置"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"分享所显示的联系人"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"无法分享所显示的联系人。"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"分享收藏的联系人"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"分享所有联系人"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"无法分享联系人。"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"导入/导出联系人"</string>
     <string name="dialog_import" msgid="5177004290082451296">"导入联系人"</string>
     <string name="share_error" msgid="665756457151793108">"无法分享此联系人。"</string>
@@ -259,8 +249,8 @@
     <string name="select_account_dialog_title" msgid="5509088895267310568">"帐号"</string>
     <string name="set_default_account" msgid="3865970860434642695">"一律使用这张卡进行通话"</string>
     <string name="select_phone_account_for_calls" msgid="933905607702811164">"用于外拨电话的帐号"</string>
-    <string name="call_with_a_note" msgid="8453800473226831257">"拨打电话并发送备注"</string>
-    <string name="call_subject_hint" msgid="2270115162050853866">"输入要在拨打电话时发送的备注…"</string>
+    <string name="call_with_a_note" msgid="8453800473226831257">"拨打电话时发送记事"</string>
+    <string name="call_subject_hint" msgid="2270115162050853866">"输入可在拨打电话时发送的记事…"</string>
     <string name="send_and_call_button" msgid="7459507823002185202">"发送记事并拨打电话"</string>
     <string name="call_subject_limit" msgid="4746194916585506281">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
     <string name="call_subject_type_and_number" msgid="517676698821671164">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"隐私权政策"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"服务条款"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"开放源代码许可"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"无法打开网址。"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"已选中 <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"未选中 <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"发起视频通话"</string>
diff --git a/res-common/values-zh-rHK-sw600dp/strings.xml b/res-common/values-zh-rHK-sw600dp/strings.xml
deleted file mode 100644
index 41a4527..0000000
--- a/res-common/values-zh-rHK-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"僅儲存在平板電腦，不會同步處理"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"沒有聯絡人資料可以匯出。如果您的平板電腦中確實有聯絡人資料，則可能是部分資料提供者不允許您將聯絡人資料從平板電腦匯出。"</string>
-</resources>
diff --git a/res-common/values-zh-rHK/strings.xml b/res-common/values-zh-rHK/strings.xml
index 6b41d45..5bfc61b 100644
--- a/res-common/values-zh-rHK/strings.xml
+++ b/res-common/values-zh-rHK/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"撥打公司傳呼機號碼"</string>
     <string name="call_assistant" msgid="5188990854852312696">"撥打<xliff:g id="ASSISTANT">%s</xliff:g>的電話號碼"</string>
     <string name="call_mms" msgid="8998771923464696960">"撥打 MMS 電話號碼"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (通話)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"傳送短訊至<xliff:g id="CUSTOM">%s</xliff:g>電話"</string>
     <string name="sms_home" msgid="7765831490534280540">"傳送短訊至住家電話"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"傳送短訊至手機"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"傳送短訊至公司傳呼機"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"傳送短訊至<xliff:g id="ASSISTANT">%s</xliff:g>的電話"</string>
     <string name="sms_mms" msgid="4887206338311086612">"傳送短訊至 MMS 電話號碼"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (訊息)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"進行視像通話"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"清除常用聯絡人？"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"您將清除「通訊錄」應用程式和「電話」應用程式中的常用聯絡人名單，並強制電子郵件應用程式重新取得您的寄件喜好設定。"</string>
@@ -73,9 +71,9 @@
     <string name="contactsList" msgid="7140022347217602605">"通訊錄"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"其他"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"名錄"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"工作目錄"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"工作目錄"</string>
     <string name="local_search_label" msgid="9094584931063745728">"所有聯絡人"</string>
-    <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"我"</string>
+    <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"我本人"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"正在搜尋..."</string>
     <string name="foundTooManyContacts" msgid="3060037437459313616">"找到超過 <xliff:g id="COUNT">%d</xliff:g> 位聯絡人。"</string>
     <string name="listFoundAllContactsZero" msgid="4406036083994138930">"沒有聯絡人"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"常用聯絡人"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"查看聯絡人資料"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"所有附有電話號碼的聯絡人"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"工作設定檔通訊錄"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"工作設定檔通訊錄"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"瀏覽更新資訊"</string>
-    <string name="account_phone" msgid="6104157990869081962">"只限手機，不會保持同步"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"只限手機，不會保持同步"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"姓名"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"暱稱"</string>
     <string name="full_name" msgid="885420216812981202">"姓名"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"無法匯入一個或多個檔案 (%s)。"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"已完成匯出 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"已匯出聯絡人。"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"已完成匯出通訊錄，按一下通知即可共用通訊錄。"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"輕按即可共用通訊錄。"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"已取消匯出 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"正在匯出聯絡人資料"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"正在匯出聯絡人資料。"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"正在將您的聯絡人資料匯出至：<xliff:g id="FILE_NAME">%s</xliff:g>。"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"無法取得資料庫資訊。"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"沒有聯絡人資料可以匯出。如果您的手機中確實存有聯絡人資料，則可能是部分資料提供者不允許您將聯絡人資料從手機中匯出。"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"沒有聯絡人資料可以匯出。如果您的手機中確實存有聯絡人資料，則可能是部分資料提供者不允許您將聯絡人資料從手機中匯出。"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard 編輯器並未正確啟動。"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"無法匯出"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"聯絡人資料未匯出。\n原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard 匯入要求已被拒，請稍後再試。"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> 將在稍後匯出。"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"檔案即將匯出。"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"系統即將匯出通訊錄。"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard 匯出要求已被拒，請稍後再試。"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"聯絡人"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"正在將 vCard 資料快取至本機暫存空間，隨即將開始實際的匯入操作。"</string>
@@ -224,17 +219,12 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"名字在前"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"姓氏在前"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"新聯絡人的預設帳戶"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"同步處理聯絡人元數據 [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"同步處理聯絡人元數據"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"聯絡人元數據同步處理帳戶"</string>
     <string name="setting_about" msgid="3926137653588942297">"有關通訊錄"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"設定"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"分享正常顯示的聯絡人"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"無法分享顯示的聯絡人"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"分享常用聯絡人資料"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"分享所有聯絡人資料"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"無法分享聯絡人資料。"</string>
-    <string name="dialog_import_export" msgid="1125776851100740858">"匯入/匯出通訊錄"</string>
-    <string name="dialog_import" msgid="5177004290082451296">"匯入通訊錄"</string>
+    <string name="dialog_import_export" msgid="1125776851100740858">"匯入/匯出聯絡人資料"</string>
+    <string name="dialog_import" msgid="5177004290082451296">"匯入聯絡人資料"</string>
     <string name="share_error" msgid="665756457151793108">"無法分享這位聯絡人的資料。"</string>
     <string name="no_contact_to_share" msgid="5749367538191552509">"沒有聯絡人可供分享。"</string>
     <string name="menu_search" msgid="7464453023659824700">"搜尋"</string>
@@ -245,7 +235,7 @@
     <string name="contactsFavoritesLabel" msgid="1222038757062409949">"最愛的聯絡人"</string>
     <string name="listTotalAllContactsZero" msgid="6041341919823872732">"沒有聯絡人。"</string>
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"沒有可顯示的聯絡人。"</string>
-    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"沒有常用聯絡人"</string>
+    <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"沒有最愛聯絡人"</string>
     <string name="listTotalAllContactsZeroGroup" msgid="7450331854661098879">"「<xliff:g id="NAME">%s</xliff:g>」中沒有聯絡人"</string>
     <string name="menu_clear_frequents" msgid="8492322695770647639">"清除常用聯絡人"</string>
     <string name="menu_select_sim" msgid="7814841439832447299">"選取 SIM 卡"</string>
@@ -270,11 +260,10 @@
     </plurals>
     <string name="about_build_version" msgid="4221971683776635130">"版本"</string>
     <string name="about_open_source_licenses" msgid="3224958101863814649">"開放原始碼授權"</string>
-    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"開放原始碼軟件的授權詳情"</string>
+    <string name="about_open_source_licenses_summary" msgid="3009343539281606716">"開放原始碼軟件的授權詳細資料"</string>
     <string name="about_privacy_policy" msgid="8458337666582973913">"私隱權政策"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"服務條款"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"開放原始碼授權"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"無法開啟網址。"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"已選取 <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"未選取 <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"開始視像通話"</string>
diff --git a/res-common/values-zh-rTW-sw600dp/strings.xml b/res-common/values-zh-rTW-sw600dp/strings.xml
deleted file mode 100644
index eb065b2..0000000
--- a/res-common/values-zh-rTW-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"僅儲存在平板電腦中 (不同步處理)"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"沒有可匯出的聯絡人。如果您的平板電腦中確實有聯絡人資料，那麼可能是部分資料提供者不允許您將聯絡人資料從平板電腦匯出。"</string>
-</resources>
diff --git a/res-common/values-zh-rTW/strings.xml b/res-common/values-zh-rTW/strings.xml
index e9b50cb..ffd3dfe 100644
--- a/res-common/values-zh-rTW/strings.xml
+++ b/res-common/values-zh-rTW/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"撥打公司呼叫器號碼"</string>
     <string name="call_assistant" msgid="5188990854852312696">"撥打<xliff:g id="ASSISTANT">%s</xliff:g>電話號碼"</string>
     <string name="call_mms" msgid="8998771923464696960">"撥打 MMS 電話號碼"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (撥號)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"傳送簡訊至<xliff:g id="CUSTOM">%s</xliff:g>電話"</string>
     <string name="sms_home" msgid="7765831490534280540">"傳送簡訊至住家電話"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"傳送簡訊至手機"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"傳送簡訊至公司呼叫器"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"傳送簡訊至<xliff:g id="ASSISTANT">%s</xliff:g>電話"</string>
     <string name="sms_mms" msgid="4887206338311086612">"傳送簡訊至 MMS 電話"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (傳送簡訊)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"進行視訊通話"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"清除常用聯絡人？"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"您即將清除「聯絡人」應用程式和「電話」應用程式中的常用聯絡人清單，並設定讓電子郵件應用程式重新熟悉您的寄件偏好設定。"</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"聯絡人"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"其他"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"目錄"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Work 聯絡人目錄"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Work 聯絡人目錄"</string>
     <string name="local_search_label" msgid="9094584931063745728">"所有聯絡人"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"我"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"搜尋中…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"經常聯絡"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"查看聯絡人"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"所有包含電話號碼的聯絡人資訊"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Work 設定檔聯絡人"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Work 設定檔聯絡人"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"查看最新動態"</string>
-    <string name="account_phone" msgid="6104157990869081962">"僅儲存在手機中，不同步"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"僅儲存在手機中，不同步"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"姓名"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"暱稱"</string>
     <string name="full_name" msgid="885420216812981202">"姓名"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"無法匯入一或多個檔案 (%s)。"</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"已完成 <xliff:g id="FILENAME">%s</xliff:g> 匯出作業。"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"匯出聯絡人完成。"</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"聯絡人資料匯出完畢，按一下通知即可分享聯絡人資料。"</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"輕觸即可分享聯絡人資料。"</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"已取消匯出 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"正在匯出聯絡人資料"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"正在匯出聯絡人資料。"</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"正在將您的聯絡人資料匯出至以下檔案：<xliff:g id="FILE_NAME">%s</xliff:g>。"</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"無法取得資料庫資訊。"</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"沒有可匯出的聯絡人。如果您的手機中確實有聯絡人資料，那麼可能是部分資料提供者不允許您將聯絡人資料從手機中匯出。"</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"沒有可匯出的聯絡人。如果您的手機中確實有聯絡人資料，那麼可能是部分資料提供者不允許您將聯絡人資料從手機中匯出。"</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"vCard 編輯器並未正確啟動。"</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"無法匯出"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"聯絡人資料未匯出。\n原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」"</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"vCard 匯入要求遭到拒絕，請稍後再試。"</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> 將在稍後匯出。"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"稍後即將匯出該檔案。"</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"即將匯出聯絡人資料。"</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"vCard 匯出要求遭到拒絕，請稍後再試。"</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"聯絡人"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"正在將 vCard 資料快取至本機暫存空間，隨即將啟動實際的匯入作業。"</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"名字在前"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"姓氏在前"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"新聯絡人的預設帳戶"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"同步處理聯絡人中繼資料 [處於 Dogfood 測試階段]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"同步處理聯絡人中繼資料"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"聯絡人中繼資料同步處理帳戶"</string>
     <string name="setting_about" msgid="3926137653588942297">"關於聯絡人"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"設定"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"分享正常顯示的聯絡人"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"無法分享目前顯示的聯絡人資料。"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"分享常用聯絡人資料"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"分享所有聯絡人資料"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"無法分享聯絡人資料。"</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"匯入/匯出聯絡人"</string>
     <string name="dialog_import" msgid="5177004290082451296">"匯入聯絡人"</string>
     <string name="share_error" msgid="665756457151793108">"無法分享這位聯絡人的資料。"</string>
@@ -242,7 +232,7 @@
     <string name="activity_title_contacts_filter" msgid="7689519428197855166">"要顯示的聯絡人"</string>
     <string name="custom_list_filter" msgid="582616656313514803">"定義自訂檢視"</string>
     <string name="hint_findContacts" msgid="28151707326753522">"尋找聯絡人"</string>
-    <string name="contactsFavoritesLabel" msgid="1222038757062409949">"常用聯絡人"</string>
+    <string name="contactsFavoritesLabel" msgid="1222038757062409949">"最愛的聯絡人"</string>
     <string name="listTotalAllContactsZero" msgid="6041341919823872732">"沒有聯絡人。"</string>
     <string name="listTotalAllContactsZeroCustom" msgid="5661794891640163617">"沒有可顯示的聯絡人。"</string>
     <string name="listTotalAllContactsZeroStarred" msgid="2747107662985362061">"沒有常用聯絡人"</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"隱私權政策"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"服務條款"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"開放原始碼授權"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"無法開啟網址。"</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"已勾選 <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"未勾選 <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"撥打視訊通話"</string>
diff --git a/res-common/values-zu-sw600dp/strings.xml b/res-common/values-zu-sw600dp/strings.xml
deleted file mode 100644
index 0630d3d..0000000
--- a/res-common/values-zu-sw600dp/strings.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-  ~ Copyright (C) 2012 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License
-   -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="account_phone" msgid="4804592866198643905">"Ithebulethi kuphela, ayivumelanisiwe"</string>
-    <string name="composer_has_no_exportable_contact" msgid="441543908614399381">"Abekho oxhumana nabo abangathumeleka. Uma unabo oxhumana nabo kuthebulethi yakho, abanye abahlinzeki bedatha kungenzeka bangavumi ukuthi oxhumana nabo bathuyelwe kusukela kuthebulethi."</string>
-</resources>
diff --git a/res-common/values-zu/strings.xml b/res-common/values-zu/strings.xml
index 870b31a..0a22944 100644
--- a/res-common/values-zu/strings.xml
+++ b/res-common/values-zu/strings.xml
@@ -40,7 +40,6 @@
     <string name="call_work_pager" msgid="3036932765279753793">"Fonela isicingo sasemsebenzini"</string>
     <string name="call_assistant" msgid="5188990854852312696">"Fonela <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="call_mms" msgid="8998771923464696960">"Fonela i-MMS"</string>
-    <string name="call_by_shortcut" msgid="4053430514293064454">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Ikholi)"</string>
     <string name="sms_custom" msgid="4601748252470175865">"Bhalela ku-<xliff:g id="CUSTOM">%s</xliff:g>"</string>
     <string name="sms_home" msgid="7765831490534280540">"Bhalela ekhaya"</string>
     <string name="sms_mobile" msgid="8387632124165893103">"Bhalela iselula"</string>
@@ -62,7 +61,6 @@
     <string name="sms_work_pager" msgid="499303540738557836">"Bhalela isicingo sasemsebenzini"</string>
     <string name="sms_assistant" msgid="2677586547377136683">"Bhalela ku-<xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="4887206338311086612">"Bhala i-MMS"</string>
-    <string name="sms_by_shortcut" msgid="2675928528835074838">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Umlayezo)"</string>
     <string name="description_video_call" msgid="4907306403398614909">"Yenza ikholi yevidiyo"</string>
     <string name="clearFrequentsConfirmation_title" msgid="1482750234535491083">"Sula oxhumana nabo njalo?"</string>
     <string name="clearFrequentsConfirmation" msgid="1117709667923254374">"Uzosula uhlu loxhumana nabo kakhulu kuzinhelo zokusebenza zokuxhumana noma zefoni, futhi uphoqelele izinhlelo zokusebenza ze-imeyili ukufunda izintandokazi zakho zekheli kusuka ekuqaleni."</string>
@@ -73,7 +71,7 @@
     <string name="contactsList" msgid="7140022347217602605">"Oxhumana nabo"</string>
     <string name="local_invisible_directory" msgid="8934840494825588347">"Okunye"</string>
     <string name="directory_search_label" msgid="4484648822765516947">"Uhla lwemibhalo"</string>
-    <string name="directory_search_label_work" msgid="7396227297795426967">"Uhla lwemibhalo lomsebenzi"</string>
+    <string name="directory_search_label_work" msgid="8927844610764999234">"Uhla lwemibhalo yomsebenzi"</string>
     <string name="local_search_label" msgid="9094584931063745728">"Bonke oxhumana nabo"</string>
     <string name="user_profile_contacts_list_header" msgid="8436133790234197565">"Mina"</string>
     <string name="search_results_searching" msgid="9022794597388306615">"Iyasesha…"</string>
@@ -89,9 +87,9 @@
     <string name="favoritesFrequentContacted" msgid="2849493314447751970">"Abathintwa njalo"</string>
     <string name="description_view_contact_detail" msgid="2756753096193839285">"Buka oxhumana naye"</string>
     <string name="list_filter_phones" msgid="3692815632088465422">"Bonke othintana nabo kanye nezinombolo zabo zefoni"</string>
-    <string name="list_filter_phones_work" msgid="5226451114859079417">"Oxhumana nabo bephrofayela yomsebenzi"</string>
+    <string name="list_filter_phones_work" msgid="484839599760375521">"Oxhumana nabo bephrofayela yomsebenzi"</string>
     <string name="view_updates_from_group" msgid="3310864388165884352">"Buka okubuyekeziwe"</string>
-    <string name="account_phone" msgid="6104157990869081962">"Iselula kuphela, ayivumelanisiwe"</string>
+    <string name="account_phone" product="default" msgid="6104157990869081962">"Iselula kuphela, ayivumelanisiwe"</string>
     <string name="nameLabelsGroup" msgid="1817502703362057154">"Igama"</string>
     <string name="nicknameLabelsGroup" msgid="6312795212164843246">"Isidlaliso"</string>
     <string name="full_name" msgid="885420216812981202">"Igama"</string>
@@ -187,13 +185,11 @@
     <string name="fail_reason_failed_to_read_files" msgid="9213844535907986665">"Ifayela elilodwa noma amafayela angaphezulu ehlulekile ukulandwa (%s)."</string>
     <string name="exporting_vcard_finished_title" msgid="3581883972188707378">"Iqedile ukuthumela i-<xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="2953278060195308065">"Iqedile ukukhipha oxhumana nabo."</string>
-    <string name="exporting_vcard_finished_toast" msgid="5995505525489290221">"Iqedile ukuthumela oxhumana nabo, chofoza isaziso ukuze wabelane ngoxhumana nabo."</string>
-    <string name="touch_to_share_contacts" msgid="3237211496215699092">"Thepha ukuze wabelane ngoxhumana nabo."</string>
     <string name="exporting_vcard_canceled_title" msgid="6993607802553630980">"Ukulandwa kwe-<xliff:g id="FILENAME">%s</xliff:g> kukhanseliwe."</string>
     <string name="exporting_contact_list_title" msgid="5663945499580026953">"Kuthunyelwa idatha yoxhumana naye"</string>
-    <string name="exporting_contact_list_message" msgid="141905615542638683">"Idatha yoxhumana nabo iyathunyelwa."</string>
+    <string name="exporting_contact_list_message" msgid="3955619563572081300">"Idatha yoxhumana naye ithunyelelwa lapha: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
     <string name="composer_failed_to_get_database_infomation" msgid="7801276776746351694">"Yehlulekile ukuthola ulwazi lwemininingo egciniwe."</string>
-    <string name="composer_has_no_exportable_contact" msgid="7063040740576745307">"Abekho oxhumana nabo abathumelekayo. Uma unabo oxhumana nabo kufoni yakho, abanye abahlinzeki bedatha kungenzeka bangavumeli labo oxhumana nabo ukuthi bathunyelwe kusukela kufoni."</string>
+    <string name="composer_has_no_exportable_contact" product="default" msgid="7063040740576745307">"Abekho oxhumana nabo abathumelekayo. Uma unabo oxhumana nabo kufoni yakho, abanye abahlinzeki bedatha kungenzeka bangavumeli labo oxhumana nabo ukuthi bathunyelwe kusukela kufoni."</string>
     <string name="composer_not_initialized" msgid="6514403866246950877">"Umqambi we-Vcard akazange aqale ngendlela efanele."</string>
     <string name="exporting_contact_failed_title" msgid="6059039606302373945">"Yehlulekile ukuthumela"</string>
     <string name="exporting_contact_failed_message" msgid="3922498776695333328">"Idatha yoxhumana naye ayizange ithunyelwe.\nIsizathu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -207,7 +203,6 @@
     <string name="vcard_import_request_rejected_message" msgid="5209363425953891316">"Isicelo sokungenisa i-vCard sinqatshelwe. Zama futhi emuva kwesikhathi."</string>
     <string name="vcard_export_will_start_message" msgid="2168853666316526278">"<xliff:g id="FILENAME">%s</xliff:g> izothunyelwa maduzane"</string>
     <string name="vcard_export_will_start_message_fallback" msgid="6418767460851707308">"Ifayela lizokhishwa maduze."</string>
-    <string name="contacts_export_will_start_message" msgid="4527597765334949574">"Oxhumana nabo bazothunyelwa maduze."</string>
     <string name="vcard_export_request_rejected_message" msgid="8044599716727705282">"Isicelo sokuthumela i-vCard sinqatshelwe. Sicela uzame futhi emuva kwesikhathi."</string>
     <string name="vcard_unknown_filename" msgid="4832657686149881554">"oxhumana naye"</string>
     <string name="caching_vcard_message" msgid="6635485116655518520">"Ifaka kunqolobane ama-vCard kusitoreji sesikhashana. Ukulandwa kwangempela kuzoqala khona maduze."</string>
@@ -224,15 +219,10 @@
     <string name="display_options_view_given_name_first" msgid="7283772578267332801">"Igama lokuqala kuqala"</string>
     <string name="display_options_view_family_name_first" msgid="8133167685885174166">"Isibongo kuqala"</string>
     <string name="default_editor_account" msgid="4338725881650654966">"I-akhawunti ezenzakalelayo yoxhumana nabo abasha"</string>
-    <string name="sync_contact_metadata_title" msgid="8322455849769727129">"Vumelanisa imethadatha yoxhumana naye [DOGFOOD]"</string>
-    <string name="sync_contact_metadata_dialog_title" msgid="4521648342253661374">"Vumelanisa imethadatha"</string>
+    <string name="contact_metadata_sync_account" msgid="1787463969598716702">"I-akhawunti yokuvumelanisa imethadatha yoxhumana naye"</string>
     <string name="setting_about" msgid="3926137653588942297">"Mayelana noxhumana nabo"</string>
-    <string name="activity_title_settings" msgid="3056389601004689380">"Izilungiselelo"</string>
     <string name="share_visible_contacts" msgid="2150662668080757107">"Yabelana noxhumana nabo ababonakalayo"</string>
     <string name="share_visible_contacts_failure" msgid="5895137872238059893">"Yehlulekile ukwabelana ngoxhumana nabo ababonakalayo"</string>
-    <string name="share_favorite_contacts" msgid="2838432887118216222">"Yabelana ngoxhumana nabo obathandayo"</string>
-    <string name="share_contacts" msgid="6404040163340914061">"Yabelana bonke oxhumana nabo"</string>
-    <string name="share_contacts_failure" msgid="3498837575583860197">"Yehlulekile ukwabelana ngoxhumana nabo."</string>
     <string name="dialog_import_export" msgid="1125776851100740858">"Landa/thumela oxhumana nabo"</string>
     <string name="dialog_import" msgid="5177004290082451296">"Landa oxhumana nabo"</string>
     <string name="share_error" msgid="665756457151793108">"Lona oxhumana naye ngeke ukwazi ukwabelana ngaye."</string>
@@ -274,7 +264,6 @@
     <string name="about_privacy_policy" msgid="8458337666582973913">"Inqubomgomo yobumfihlo"</string>
     <string name="about_terms_of_service" msgid="628537491496465267">"Imigomo yesevisi"</string>
     <string name="activity_title_licenses" msgid="7812517458691564230">"Amalayisensi womthombo ovulekile"</string>
-    <string name="url_open_error_toast" msgid="7557601281695424805">"Yehlulekile ukuvula i-url."</string>
     <string name="account_filter_view_checked" msgid="4368757211136754319">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> kuhloliwe"</string>
     <string name="account_filter_view_not_checked" msgid="5652044086126815700">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> akuhloliwe"</string>
     <string name="description_search_video_call" msgid="1699305143973045516">"Yenza ikholi yevidiyo"</string>