diff --git a/Android.bp b/Android.bp
index 08288f8..27c5b2f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,34 @@
+package {
+    default_applicable_licenses: ["packages_apps_Contacts_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "packages_apps_Contacts_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-CC-BY",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 android_app {
     name: "Contacts",
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c9dc980..e233db9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -74,6 +74,7 @@
             android:launchMode="singleTop"
             android:resizeableActivity="true"
             android:theme="@style/LaunchScreenTheme"
+            android:exported="true"
             android:visibleToInstantApps="true"
             >
             <intent-filter>
@@ -184,6 +185,7 @@
             android:theme="@style/ContactPickerTheme"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustResize"
+            android:exported="true"
             android:visibleToInstantApps="true">
             <meta-data android:name="android.app.shortcuts.new_config"
                 android:value="true" />
@@ -286,6 +288,7 @@
 
         <activity
             android:name=".activities.ShowOrCreateActivity"
+            android:exported="true"
             android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
 
             <intent-filter>
@@ -303,6 +306,7 @@
             android:launchMode="singleTop"
             android:taskAffinity=""
             android:theme="@style/Theme.QuickContact"
+            android:exported="true"
             android:windowSoftInputMode="stateUnchanged">
 
             <intent-filter>
@@ -331,7 +335,8 @@
 
         <!-- Responsible for creating notification channels when boot is completed or when app is
         re-installed -->
-        <receiver android:name=".interactions.OnBootOrUpgradeReceiver">
+        <receiver android:name=".interactions.OnBootOrUpgradeReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
@@ -342,6 +347,7 @@
             android:name="ContactShortcut"
             android:icon="@drawable/logo_quick_contacts_color_44in48dp"
             android:label="@string/shortcutContact"
+            android:exported="true"
             android:targetActivity=".activities.ContactSelectionActivity">
 
             <intent-filter>
@@ -355,6 +361,7 @@
             android:name="alias.DialShortcut"
             android:icon="@drawable/logo_quick_contacts_dialer_color_44in48dp"
             android:label="@string/shortcutDialContact"
+            android:exported="true"
             android:targetActivity=".activities.ContactSelectionActivity">
 
             <intent-filter>
@@ -370,6 +377,7 @@
             android:name="alias.MessageShortcut"
             android:icon="@drawable/logo_quick_contacts_mail_color_44in48dp"
             android:label="@string/shortcutMessageContact"
+            android:exported="true"
             android:targetActivity=".activities.ContactSelectionActivity">
 
             <intent-filter>
@@ -389,6 +397,7 @@
         <!-- Edit or create a contact with only the most important fields displayed initially. -->
         <activity
             android:name=".activities.ContactEditorActivity"
+            android:exported="true"
             android:theme="@style/EditorActivityTheme">
 
             <intent-filter>
@@ -418,6 +427,7 @@
 
         <activity
             android:name=".activities.ContactEditorSpringBoardActivity"
+            android:exported="true"
             android:theme="@style/TransparentThemeAppCompat">
 
             <intent-filter>
@@ -430,7 +440,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".test.FragmentTestActivity">
+        <activity android:name=".test.FragmentTestActivity"
+            android:exported="true">
             <intent-filter>
                 <category android:name="android.intent.category.TEST"/>
             </intent-filter>
@@ -456,6 +467,7 @@
         <activity
             android:name=".activities.AttachPhotoActivity"
             android:label="@string/attach_photo_dialog_title"
+            android:exported="true"
             android:taskAffinity="">
             <intent-filter>
                 <action android:name="android.intent.action.ATTACH_DATA"/>
@@ -468,6 +480,7 @@
         <activity
             android:name=".vcard.ImportVCardActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:exported="true"
             android:theme="@style/BackgroundOnlyTheme">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
@@ -483,6 +496,7 @@
         <activity
             android:name=".vcard.NfcImportVCardActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:exported="true"
             android:theme="@style/BackgroundOnlyTheme">
             <intent-filter>
                 <action android:name="android.nfc.action.NDEF_DISCOVERED"/>
@@ -528,6 +542,7 @@
              are set lower, so that the user does not see a disambig dialog -->
         <activity
             android:name="com.android.contacts.NonPhoneActivity"
+            android:exported="true"
             android:theme="@style/NonPhoneActivityTheme">
             <intent-filter android:priority="-1">
                 <action android:name="android.intent.action.MAIN"/>
@@ -556,6 +571,7 @@
         <activity
             android:name="com.android.contacts.dialog.CallSubjectDialog"
             android:theme="@style/Theme.CallSubjectDialogTheme"
+            android:exported="true"
             android:windowSoftInputMode="stateVisible|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..d97975c
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,3 @@
+third_party {
+  license_type: NOTICE
+}
diff --git a/res/layout-land/contact_editor_fragment.xml b/res/layout-land/contact_editor_fragment.xml
index 6f026aa..e68d7a3 100644
--- a/res/layout-land/contact_editor_fragment.xml
+++ b/res/layout-land/contact_editor_fragment.xml
@@ -31,7 +31,7 @@
 
         <include layout="@layout/photo_editor_view" />
 
-        <!-- Dummy view so the first input field is not initially focused. b/21644158 -->
+        <!-- Placeholder view so the first input field is not initially focused. b/21644158 -->
         <View
             android:layout_width="0dp"
             android:layout_height="0dp"
diff --git a/res/layout/contact_editor_fragment.xml b/res/layout/contact_editor_fragment.xml
index 03a84e1..694e1f6 100644
--- a/res/layout/contact_editor_fragment.xml
+++ b/res/layout/contact_editor_fragment.xml
@@ -38,7 +38,7 @@
 
             <include layout="@layout/photo_editor_view" />
 
-            <!-- Dummy view so the first input field is not initially focused. b/21644158 -->
+            <!-- Placeholder view so the first input field is not initially focused. b/21644158 -->
             <View
                 android:layout_width="0dp"
                 android:layout_height="0dp"
diff --git a/res/layout/menu_item_action_view.xml b/res/layout/menu_item_action_view.xml
index 62eb758..1f8066e 100644
--- a/res/layout/menu_item_action_view.xml
+++ b/res/layout/menu_item_action_view.xml
@@ -15,7 +15,8 @@
   limitations under the License.
   -->
 
-<!-- A dummy action view to attach extra hidden content description to menuItem for Talkback. -->
+<!-- A placeholder action view to attach extra hidden content description to
+     menuItem for Talkback. -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -24,4 +25,4 @@
     <View
         android:layout_width="1dp"
         android:layout_height= "1dp" />
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 99b7a86..c393f07 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -25,7 +25,7 @@
     <string name="shortcutActivityTitle" msgid="5407832911005090417">"اختيار جهة اتصال"</string>
     <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"إضافة إلى جهة اتصال"</string>
     <string name="contactPickerActivityTitle" msgid="1842634991247618890">"اختيار جهة اتصال"</string>
-    <string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"اختيار"</string>
+    <string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"تحديد"</string>
     <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"إنشاء جهة اتصال جديدة"</string>
     <string name="searchHint" msgid="1487501532610025473">"البحث في جهات الاتصال"</string>
     <string name="menu_addStar" msgid="4903812703386825130">"إضافة إلى المفضلة"</string>
@@ -41,7 +41,7 @@
     <string name="menu_renameGroup" msgid="2685886609399776475">"إعادة تسمية التصنيف"</string>
     <string name="menu_deleteGroup" msgid="1180215594530228294">"حذف التصنيف"</string>
     <string name="menu_addToGroup" msgid="5034813446697655310">"إضافة جهة اتصال"</string>
-    <string name="menu_selectForGroup" msgid="6386553337569514850">"اختيار جهات الاتصال"</string>
+    <string name="menu_selectForGroup" msgid="6386553337569514850">"تحديد جهات الاتصال"</string>
     <string name="menu_addContactsToGroup" msgid="4549318978482280577">"إضافة جهات اتصال"</string>
     <string name="menu_removeFromGroup" msgid="8753799091967887958">"الإزالة من تصنيف"</string>
     <string name="menu_new_group_action_bar" msgid="1670312283925872483">"إنشاء تصنيف"</string>
@@ -127,14 +127,14 @@
     <string name="groupDeletedToast" msgid="7774363940327847515">"تم حذف التصنيف"</string>
     <string name="groupCreatedToast" msgid="1685148819468403239">"تم إنشاء التصنيف"</string>
     <string name="groupCreateFailedToast" msgid="1836425392831964024">"يتعذر إنشاء تصنيف"</string>
-    <string name="groupUpdatedToast" msgid="3381549467345607379">"تم تحديث التصنيف"</string>
+    <string name="groupUpdatedToast" msgid="3381549467345607379">"تمت إعادة تحميل التصنيف"</string>
     <string name="groupMembersRemovedToast" msgid="8019566066934628011">"تمت الإزالة من التصنيف"</string>
     <string name="groupMembersAddedToast" msgid="1939782548900157287">"تمت الإضافة إلى التصنيف"</string>
     <string name="groupSavedErrorToast" msgid="8456912862816145318">"لا يمكن حفظ التغييرات على التصنيف"</string>
     <string name="groupExistsErrorMessage" msgid="912222525098791136">"هذا التصنيف موجود فعلاً"</string>
     <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"بعض جهات الاتصال ليس لديها بريدًا إلكترونيًا."</string>
     <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"بعض جهات الاتصال ليست لديها أرقام هواتف."</string>
-    <string name="menu_sendEmailOption" msgid="8600335923636486825">"إرسال رسالة إلكترونية"</string>
+    <string name="menu_sendEmailOption" msgid="8600335923636486825">"إرسال البريد الإلكتروني"</string>
     <string name="menu_sendMessageOption" msgid="8051852013078110910">"إرسال رسالة"</string>
     <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"اختيار جهات الاتصال"</string>
     <string name="send_to_selection" msgid="3655197947726443720">"إرسال"</string>
@@ -168,7 +168,7 @@
     <string name="take_photo" msgid="820071555236547516">"التقاط صورة"</string>
     <string name="take_new_photo" msgid="4383091978116875778">"التقاط صورة جديدة"</string>
     <string name="pick_photo" msgid="2050859661654812588">"اختيار صورة"</string>
-    <string name="pick_new_photo" msgid="4218112182908240970">"اختيار صورة جديدة"</string>
+    <string name="pick_new_photo" msgid="4218112182908240970">"تحديد صورة جديدة"</string>
     <string name="search_results_searching" msgid="1373859095361975648">"جارٍ البحث..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"التاريخ"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"التصنيف"</string>
@@ -218,14 +218,14 @@
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"إنشاء جهة اتصال جديدة"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"الاطّلاع على المزيد"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"عرض أقل"</string>
-    <string name="about_card_title" msgid="6635849009952435700">"لمحة"</string>
+    <string name="about_card_title" msgid="6635849009952435700">"حول"</string>
     <string name="toast_making_personal_copy" msgid="9053129410039312386">"جارٍ إنشاء نسخة شخصية..."</string>
     <string name="date_time_set" msgid="8526160894146496334">"تعيين"</string>
     <string name="header_im_entry" msgid="3581797653862294826">"المراسلة الفورية"</string>
     <string name="header_organization_entry" msgid="7428066442988227441">"المؤسسة"</string>
     <string name="header_nickname_entry" msgid="1110276804512795150">"اللقب"</string>
     <string name="header_note_entry" msgid="339680292368016788">"ملاحظة"</string>
-    <string name="header_website_entry" msgid="3618691707215428785">"الموقع الإلكتروني"</string>
+    <string name="header_website_entry" msgid="3618691707215428785">"موقع الويب"</string>
     <string name="header_event_entry" msgid="70962228694476731">"الحدث"</string>
     <string name="header_relation_entry" msgid="993618132732521944">"العلاقة"</string>
     <string name="header_name_entry" msgid="2516776099121101578">"الاسم"</string>
@@ -344,7 +344,7 @@
     <string name="label_notes" msgid="7134226125644463585">"ملاحظات"</string>
     <string name="label_custom_field" msgid="4160584225306364924">"مخصص"</string>
     <string name="label_sip_address" msgid="8876347942587537552">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="114754928100220315">"الموقع الإلكتروني"</string>
+    <string name="websiteLabelsGroup" msgid="114754928100220315">"موقع الويب"</string>
     <string name="groupsLabel" msgid="5622154133880646122">"التصنيفات"</string>
     <string name="email_home" msgid="1102791500866910269">"البريد الإلكتروني للمنزل"</string>
     <string name="email_mobile" msgid="6461172430397598705">"إرسال رسالة إلكترونية إلى عنوان بريد إلكتروني على الجوال"</string>
@@ -453,20 +453,20 @@
     <string name="caching_vcard_title" msgid="6333926052524937628">"تخزين مؤقت"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"استيراد <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"‏تصدير إلى ملف vcf."</string>
-    <string name="display_options_sort_list_by" msgid="4333658089057400431">"الترتيب حسب"</string>
+    <string name="display_options_sort_list_by" msgid="4333658089057400431">"الترتيب بحسب"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"الاسم صوتيًا"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"الإظهار دائمًا"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"الإخفاء إذا كان فارغًا"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"الاسم الأول"</string>
     <string name="display_options_sort_by_family_name" msgid="1282763552330910876">"اسم العائلة"</string>
-    <string name="display_options_view_names_as" msgid="4060686468465916565">"ترتيب الاسم"</string>
+    <string name="display_options_view_names_as" msgid="4060686468465916565">"تنسيق الاسم"</string>
     <string name="display_options_view_given_name_first" msgid="383885125505521383">"الاسم الأول أولاً"</string>
     <string name="display_options_view_family_name_first" msgid="6597077054231296007">"اسم العائلة أوّلًا"</string>
     <string name="settings_accounts" msgid="119582613811929994">"الحسابات"</string>
     <string name="default_editor_account" msgid="4810392921888877149">"الحساب التلقائي لجهات الاتصال الجديدة"</string>
     <string name="settings_my_info_title" msgid="6236848378653551341">"معلوماتي"</string>
     <string name="set_up_profile" msgid="3554999219868611431">"إعداد الملف الشخصي"</string>
-    <string name="setting_about" msgid="2941859292287597555">"معلومات حول جهات الاتصال"</string>
+    <string name="setting_about" msgid="2941859292287597555">"حول جهات الاتصال"</string>
     <string name="share_favorite_contacts" msgid="8208444020721686178">"مشاركة جهات الاتصال المفضلة"</string>
     <string name="share_contacts" msgid="2377773269568609796">"مشاركة جميع جهات الاتصال"</string>
     <string name="share_contacts_failure" msgid="1348777470180064086">"تعذّرت مشاركة جهات الاتصال."</string>
@@ -509,7 +509,7 @@
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"تم إيقاف هذا الاختصار"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"تمت إزالة جهة الاتصال"</string>
     <string name="sim_import_button_text" msgid="2845608246304396009">"استيراد"</string>
-    <string name="sim_import_title_none_selected" msgid="3527680774575468781">"اختيار جهات الاتصال"</string>
+    <string name="sim_import_title_none_selected" msgid="3527680774575468781">"تحديد جهات الاتصال"</string>
     <string name="sim_import_empty_message" msgid="7238368542566545854">"‏ليس هناك جهات اتصال على شريحة SIM"</string>
     <string name="sim_import_contact_exists_toast" msgid="8423212007841229749">"جهة الاتصال موجودة فعلاً في قائمتك"</string>
     <plurals name="sim_import_success_toast_fmt" formatted="false" msgid="422539156156042210">
@@ -523,10 +523,10 @@
     <string name="sim_import_failed_toast" msgid="358117391138073786">"‏فشل استيراد جهات الاتصال من شريحة SIM"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"‏استيراد من SIM"</string>
     <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"إلغاء"</string>
-    <string name="auto_sync_off" msgid="7039314601316227882">"المزامنة التلقائية متوقفة. انقر للتفعيل."</string>
+    <string name="auto_sync_off" msgid="7039314601316227882">"المزامنة التلقائية متوقفة. انقر للتشغيل."</string>
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"تجاهل"</string>
-    <string name="account_sync_off" msgid="6187683798342006021">"مزامنة الحساب متوقفة. انقر للتفعيل."</string>
-    <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"تفعيل المزامنة التلقائية؟"</string>
+    <string name="account_sync_off" msgid="6187683798342006021">"مزامنة الحساب متوقفة. انقر للتشغيل."</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"تشغيل المزامنة التلقائية؟"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"‏سيتم إعادة تحميل التغييرات التي أجريتها على كل التطبيقات والحسابات، وليس فقط جهات اتصال Google، بين الويب وأجهزتك."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"تشغيل"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"لا اتصال"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 8c396f3..08847d9 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -353,7 +353,7 @@
     <string name="chat_gtalk" msgid="2927882858741904064">"Google Talk ব্যৱহাৰ কৰি চ্চাট কৰক"</string>
     <string name="chat_icq" msgid="4289041376069626281">"ICQ ব্যৱহাৰ কৰি চ্চাট কৰক"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Jabber ব্যৱহাৰ কৰি চ্চাট কৰক"</string>
-    <string name="chat" msgid="8390862712584830532">"Chat"</string>
+    <string name="chat" msgid="8390862712584830532">"চ্চাট কৰক"</string>
     <string name="description_minus_button" msgid="1305985971158054217">"মচক"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"নামৰ অধিক ক্ষেত্ৰ দেখুৱাওক"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"নামৰ ক্ষেত্ৰ সংকুচিত কৰক"</string>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 8f981d6..03774a6 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -190,7 +190,7 @@
     <string name="title_edit_group" msgid="4246193439931854759">"Uklonite kontakte"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Moj lokalni profil"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"Moj <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> profil"</string>
-    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Odvojite malo vremena da biste dodali nalog pomoću kog ćete napraviti rezervnu kopiju kontakata na Google-u."</string>
+    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Odvojte malo vremena da biste dodali nalog pomoću kog ćete napraviti rezervnu kopiju kontakata na Google-u."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"Novi kontakti će biti sačuvani na nalogu <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Izaberite podrazumevani nalog za nove kontakte:"</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Novi kontakt"</string>
@@ -297,13 +297,13 @@
     <string name="status_busy" msgid="2759339190187696727">"Zauzet/a"</string>
     <string name="local_invisible_directory" msgid="5936234374879813300">"Drugo"</string>
     <string name="directory_search_label" msgid="2602118204885565153">"Katalog"</string>
-    <string name="directory_search_label_work" msgid="2392128956332931231">"Poslovni katalog"</string>
+    <string name="directory_search_label_work" msgid="2392128956332931231">"Katalog za Work"</string>
     <string name="local_search_label" msgid="6692495405531144805">"Svi kontakti"</string>
     <string name="description_quick_contact_for" msgid="6364906818231956042">"Brzi kontakt za korisnika <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="7970183292521946492">"(Bez imena)"</string>
     <string name="favoritesFrequentContacted" msgid="2885862854079966676">"Često kontaktirani"</string>
     <string name="list_filter_phones" msgid="6839133198968393843">"Svi kontakti sa brojevima telefona"</string>
-    <string name="list_filter_phones_work" msgid="5583425697781385616">"Kontakti sa poslovnog profila"</string>
+    <string name="list_filter_phones_work" msgid="5583425697781385616">"Kontakti sa profila za Work"</string>
     <string name="view_updates_from_group" msgid="6233444629074835594">"Prikaži ažuriranja"</string>
     <string name="account_phone" msgid="8044426231251817556">"Uređaj"</string>
     <string name="account_sim" msgid="3200457113308694663">"SIM"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 5084937..926fe45 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -327,7 +327,7 @@
     <string name="postalLabelsGroup" msgid="7534317297587527570">"Адрас"</string>
     <string name="imLabelsGroup" msgid="2113398976789806432">"ІМ"</string>
     <string name="organizationLabelsGroup" msgid="2342482097897299099">"Арганізацыя"</string>
-    <string name="relationLabelsGroup" msgid="8931615792208307291">"Адносіны"</string>
+    <string name="relationLabelsGroup" msgid="8931615792208307291">"Сувязі"</string>
     <string name="eventLabelsGroup" msgid="8625868552164376823">"Асаблівая дата"</string>
     <string name="sms" msgid="4246338112764847384">"Тэкставае паведамленне"</string>
     <string name="postal_address" msgid="5031809899673855074">"Адрас"</string>
@@ -466,7 +466,7 @@
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Адлюстроўваць кантакты"</string>
     <string name="custom_list_filter" msgid="2544327670202891979">"Наладзіць прагляд"</string>
     <string name="menu_custom_filter_save" msgid="2412959737200856930">"Захаваць"</string>
-    <string name="hint_findContacts" msgid="5554298639062659655">"Пошук кантактаў"</string>
+    <string name="hint_findContacts" msgid="5554298639062659655">"Шукаць у кантактах"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"Выбранае"</string>
     <string name="menu_import" msgid="2206768098740726906">"Імпартаваць"</string>
     <string name="menu_export" msgid="1217402092617629429">"Экспартаваць"</string>
@@ -513,7 +513,7 @@
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"Адхіліць"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"Сінхранізацыя ўліковага запісу адключана. Дакраніцеся, каб уключыць яе."</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"Уключыць аўтасінхранізацыю?"</string>
-    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Змяненні, унесеныя вамі ў іншых праграмах і ўліковых запісах (не толькі ў Google Кантактах), будуць сінхранізавацца паміж вэб-інтэрфейсам і вашымі прыладамі."</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Змены, якія вы зрабілі ва ўсіх праграмах і ўліковых запісах, не толькі ў Кантактах Google, будуць сінхранізоўвацца паміж вэб-інтэрфейсам і вашымі прыладамі."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Уключыць"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"Няма падключэння"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM-карта"</string>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index d5365ec..deec702 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -103,7 +103,7 @@
     <string name="emptyGroup" msgid="8598261660865081152">"এই লেবেলে কোনো পরিচিতি নেই"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"এই অ্যাকাউন্টে কোনো পরিচিতি নেই"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"আপনার পরিচিতির তালিকা খালি"</string>
-    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> সেভ করা হয়েছে"</string>
+    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> সংরক্ষণ করা হয়েছে"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"পরিচিতি সংরক্ষণ করা হয়েছে"</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"পরিচিতিগুলি লিঙ্কমুক্ত করা হয়েছে"</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"পরিচিতিতে করা পরিবর্তনগুলি সংরক্ষণ করা গেল না"</string>
@@ -353,7 +353,7 @@
     <string name="chat_gtalk" msgid="2927882858741904064">"Google Talk ব্যবহার করে চ্যাট করুন"</string>
     <string name="chat_icq" msgid="4289041376069626281">"ICQ ব্যবহার করে চ্যাট করুন"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Jabber ব্যবহার করে চ্যাট করুন"</string>
-    <string name="chat" msgid="8390862712584830532">"Chat"</string>
+    <string name="chat" msgid="8390862712584830532">"চ্যাট"</string>
     <string name="description_minus_button" msgid="1305985971158054217">"মুছুন"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"আরও নামের ক্ষেত্রগুলি দেখান"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"নামের ক্ষেত্রটিকে সঙ্কুচিত করুন"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index f43d7c0..fb2e8bc 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -368,7 +368,7 @@
     <string name="announce_expanded_fields" msgid="8410808184164186871">"Prošireno"</string>
     <string name="announce_collapsed_fields" msgid="7611318715383228182">"Skupljeno"</string>
     <string name="list_filter_all_accounts" msgid="6173785387972096770">"Svi kontakti"</string>
-    <string name="list_filter_all_starred" msgid="2582865760150432568">"Označeno zvjezdicom"</string>
+    <string name="list_filter_all_starred" msgid="2582865760150432568">"Označeno zvijezdom"</string>
     <string name="list_filter_customize" msgid="2368900508906139537">"Prilagodi"</string>
     <string name="list_filter_single" msgid="6003845379327432129">"Kontakt"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"Svi drugi kontakti"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3ec77e3..2a4a36d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -297,7 +297,7 @@
     <string name="local_search_label" msgid="6692495405531144805">"Tots els contactes"</string>
     <string name="description_quick_contact_for" msgid="6364906818231956042">"Contacte ràpid per a <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="7970183292521946492">"(Sense nom)"</string>
-    <string name="favoritesFrequentContacted" msgid="2885862854079966676">"Contactes freqüents"</string>
+    <string name="favoritesFrequentContacted" msgid="2885862854079966676">"Contactats sovint"</string>
     <string name="list_filter_phones" msgid="6839133198968393843">"Tots els contactes amb números de telèfon"</string>
     <string name="list_filter_phones_work" msgid="5583425697781385616">"Contactes del perfil de treball"</string>
     <string name="view_updates_from_group" msgid="6233444629074835594">"Mostra actualitzac."</string>
@@ -503,9 +503,9 @@
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Activa"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"Sense connexió"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
-    <string name="show_more_content_description" msgid="6298277298495491712">"Mostra\'n més"</string>
+    <string name="show_more_content_description" msgid="6298277298495491712">"Mostra més"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"Importació de la targeta SIM completada"</string>
-    <string name="importing_sim_failed_title" msgid="1046154274170241788">"Ha fallat la importació"</string>
+    <string name="importing_sim_failed_title" msgid="1046154274170241788">"La importació ha fallat"</string>
     <string name="importing_sim_failed_message" msgid="55568522164349044">"No s\'han pogut importar els contactes de la targeta SIM"</string>
     <string name="importing_sim_in_progress_title" msgid="7647907413920018595">"S\'estan important els contactes de la SIM"</string>
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Notificacions"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index c2c2f58..07d01b2 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -79,7 +79,7 @@
     </plurals>
     <string name="title_from_google" msgid="2554633992366572820">"Von Google"</string>
     <string name="title_from_other_accounts" msgid="7813596336566711843">"Von <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="menu_set_ring_tone" msgid="8876328286439724181">"Klingelton auswählen"</string>
+    <string name="menu_set_ring_tone" msgid="8876328286439724181">"Klingeltonwahl"</string>
     <string name="menu_redirect_calls_to_vm" msgid="3027178444991878913">"An Mailbox weiterleiten"</string>
     <string name="menu_unredirect_calls_to_vm" msgid="2294919685954790892">"Nicht an Mailbox weiterleiten"</string>
     <string name="readOnlyContactWarning" msgid="4158660823025751201">"Dieser Kontakt ist schreibgeschützt. Er kann nicht gelöscht, aber ausgeblendet werden."</string>
@@ -367,7 +367,7 @@
     <string name="list_filter_all_starred" msgid="2582865760150432568">"Markiert"</string>
     <string name="list_filter_customize" msgid="2368900508906139537">"Anpassen"</string>
     <string name="list_filter_single" msgid="6003845379327432129">"Kontakt"</string>
-    <string name="display_ungrouped" msgid="4823012484407759332">"Alle anderen Kontakte"</string>
+    <string name="display_ungrouped" msgid="4823012484407759332">"Alle weiteren Kontakte"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"Alle Kontakte"</string>
     <string name="menu_sync_remove" msgid="7523335046562082188">"Synchronisierungsgruppe entfernen"</string>
     <string name="dialog_sync_add" msgid="8012361965908515959">"Synchronisierungsgruppe hinzufügen"</string>
@@ -450,8 +450,8 @@
     <string name="dialog_import" msgid="4590232235052756593">"Kontakte importieren von"</string>
     <string name="share_error" msgid="4854612167186185739">"Dieser Kontakt kann nicht geteilt werden."</string>
     <string name="no_contact_to_share" msgid="6285287228557175749">"Keine Kontakte zum Teilen vorhanden."</string>
-    <string name="menu_contacts_filter" msgid="5854584270038139275">"Anzuzeigende Kontakte"</string>
-    <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Anzuzeigende Kontakte"</string>
+    <string name="menu_contacts_filter" msgid="5854584270038139275">"Angezeigte Kontakte"</string>
+    <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Angezeigte Kontakte"</string>
     <string name="custom_list_filter" msgid="2544327670202891979">"Ansicht anpassen"</string>
     <string name="menu_custom_filter_save" msgid="2412959737200856930">"Speichern"</string>
     <string name="hint_findContacts" msgid="5554298639062659655">"In Kontakten suchen"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4ffa806..b24ddb4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -163,7 +163,7 @@
     <string name="contact_directory_description" msgid="1773630547110881835">"Directorio <xliff:g id="TYPE">%1$s</xliff:g>"</string>
     <string name="activity_title_settings" msgid="4004290638426915162">"Ajustes"</string>
     <string name="menu_settings" msgid="3524924670246877187">"Ajustes"</string>
-    <string name="menu_help" msgid="287801702920372292">"Ayuda y comentarios"</string>
+    <string name="menu_help" msgid="287801702920372292">"Ayuda y sugerencias"</string>
     <string name="organization_company_and_title" msgid="7197631449041284518">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
     <string name="non_phone_caption" msgid="7343449684187013327">"Número de teléfono"</string>
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Añadir a contactos"</string>
@@ -471,11 +471,11 @@
     <string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
     <string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="about_build_version" msgid="5870642814752351712">"Versión de la compilación"</string>
-    <string name="about_open_source_licenses" msgid="1617836621315557445">"Licencias de software libre"</string>
+    <string name="about_open_source_licenses" msgid="1617836621315557445">"Licencias de código abierto"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Detalles de las licencias de software libre"</string>
     <string name="about_privacy_policy" msgid="4581488375200402678">"Política de Privacidad"</string>
-    <string name="about_terms_of_service" msgid="7419670771785057738">"Términos del Servicio"</string>
-    <string name="activity_title_licenses" msgid="6434398894019119709">"Licencias de software libre"</string>
+    <string name="about_terms_of_service" msgid="7419670771785057738">"Condiciones de Servicio"</string>
+    <string name="activity_title_licenses" msgid="6434398894019119709">"Licencias de código abierto"</string>
     <string name="url_open_error_toast" msgid="4885855620824048385">"No se ha podido abrir la URL."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"Se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"No se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index baecc4b..adcc6d1 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -103,7 +103,7 @@
     <string name="emptyGroup" msgid="8598261660865081152">"Selle sildiga kontakte pole"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"Kontol ei ole ühtki kontakti"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"Teie kontaktiloend on tühi"</string>
-    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> salvestati"</string>
+    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> on salvestatud"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"Kontakt on salvestatud."</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"Kontaktide linkimine tühistati"</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"Kontakti muudatusi ei õnnestunud salvestada"</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 4967f6d..696ecce 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -169,7 +169,7 @@
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Gehitu kontaktuetan"</string>
     <string name="non_phone_close" msgid="2792373584950696532">"Itxi"</string>
     <string name="date_year_toggle" msgid="8930759990426623823">"Sartu urtea"</string>
-    <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"Gehitu kontu bat"</string>
+    <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"Gehitu kontua"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"Inportatu"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"Sortu…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"\"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" taldea ezabatu nahi duzu? (Ez dira kontaktuak ezabatuko.)"</string>
@@ -196,7 +196,7 @@
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"Lotutako kontaktuak"</string>
     <string name="contact_editor_add_linked_contact" msgid="2895453741206196138">"Gehitu"</string>
     <string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"Kendu lotura"</string>
-    <string name="add_account" msgid="3071396624500839020">"Gehitu kontu bat"</string>
+    <string name="add_account" msgid="3071396624500839020">"Gehitu kontua"</string>
     <string name="add_new_account" msgid="573368229646104110">"Gehitu beste kontu bat"</string>
     <string name="menu_export_database" msgid="1658249125751926885">"Esportatu datu-baseko fitxategiak"</string>
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Sortu kontaktua"</string>
@@ -481,7 +481,7 @@
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"Ez da hautatu <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="description_search_video_call" msgid="1768558141309418755">"Egin bideo-deia"</string>
     <string name="description_delete_contact" msgid="8110643050235441400">"Ezabatu"</string>
-    <string name="description_no_name_header" msgid="8596201864512339003">"Etenpuntuak"</string>
+    <string name="description_no_name_header" msgid="8596201864512339003">"Elipsia"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"Lasterbidea desgaitu egin da"</string>
     <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"Kendu da kontaktua"</string>
     <string name="sim_import_button_text" msgid="2845608246304396009">"Inportatu"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4ba1785..3ed971d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -129,7 +129,7 @@
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"مخاطبی موجود نیست"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"\"<xliff:g id="EMAIL">%s</xliff:g>\" به مخاطبین افزوده شود؟"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"نام‌های مخاطبین شما"</string>
-    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"برای بازگشت به صفحه قبل کلیک کنید"</string>
+    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"برای بازگشت به صفحه قبلی کلیک کنید"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"افزودن شماره تلفن"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"افزودن ایمیل"</string>
     <string name="missing_app" msgid="5674389915738964148">"برنامه‌ای برای انجام این عملکرد یافت نشد."</string>
@@ -284,7 +284,7 @@
     <string name="sms_assistant" msgid="245045451580096547">"ارسال متن به <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="7395133080765833725">"ارسال متن به فراپیام"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (پیام)"</string>
-    <string name="description_video_call" msgid="4956825008907720371">"برقراری تماس تصویری"</string>
+    <string name="description_video_call" msgid="4956825008907720371">"برقراری تماس ویدئویی"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"فهرست تماس مکرر با مخاطب پاک شود؟"</string>
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"با این کار فهرست افرادی که بیشتر با آنها تماس گرفته‌اید در برنامه‌های «مخاطبین» و «تلفن» پاک می‌کنید و برنامه‌های ایمیل را وادار می‌کنید تنظیمات برگزیده مخاطبینتان را از اول یاد بگیرند."</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"در حال پاک کردن فهرست تماس مکرر..."</string>
@@ -429,7 +429,7 @@
     <string name="caching_vcard_title" msgid="6333926052524937628">"در حال ذخیره در حافظهٔ پنهان"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"وارد کردن <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"‏صادر کردن به فایل ‎.vcf"</string>
-    <string name="display_options_sort_list_by" msgid="4333658089057400431">"به‌ترتیب"</string>
+    <string name="display_options_sort_list_by" msgid="4333658089057400431">"مرتب‌سازی براساس"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"تلفظ نام"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"همیشه نشان داده شود"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"اگر خالی است پنهان شود"</string>
@@ -479,7 +479,7 @@
     <string name="url_open_error_toast" msgid="4885855620824048385">"نشانی وب باز نشد."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> علامت‌گذاری شد"</string>
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> بدون علامت"</string>
-    <string name="description_search_video_call" msgid="1768558141309418755">"برقراری تماس تصویری"</string>
+    <string name="description_search_video_call" msgid="1768558141309418755">"برقراری تماس ویدئویی"</string>
     <string name="description_delete_contact" msgid="8110643050235441400">"حذف"</string>
     <string name="description_no_name_header" msgid="8596201864512339003">"سه نقطه"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"میان‌بر غیرفعال شده است"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 928940b..7fc9f01 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -96,7 +96,7 @@
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"Yhteystieto lisättiin aloitusnäytölle."</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> lisättiin aloitusnäytölle."</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"Laitteella ei ole kuvia."</string>
-    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"Yhteyshenkilön kuva"</string>
+    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"Yhteyshenkilön valokuva"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"Oman luokituksen nimi"</string>
     <string name="removePhoto" msgid="1190099414600730001">"Poista kuva"</string>
     <string name="noContacts" msgid="3030512741779213810">"Yhteystietoluettelo on tyhjä."</string>
@@ -149,10 +149,10 @@
     <string name="video_chat" msgid="2477295971622477433">"Videokeskustelu"</string>
     <string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g>-osoite"</string>
     <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g>-tili"</string>
-    <string name="take_photo" msgid="820071555236547516">"Ota kuva"</string>
+    <string name="take_photo" msgid="820071555236547516">"Ota valokuva"</string>
     <string name="take_new_photo" msgid="4383091978116875778">"Ota uusi kuva"</string>
-    <string name="pick_photo" msgid="2050859661654812588">"Valitse kuva"</string>
-    <string name="pick_new_photo" msgid="4218112182908240970">"Valitse uusi kuva"</string>
+    <string name="pick_photo" msgid="2050859661654812588">"Valitse valokuva"</string>
+    <string name="pick_new_photo" msgid="4218112182908240970">"Valitse uusi valokuva"</string>
     <string name="search_results_searching" msgid="1373859095361975648">"Haetaan..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"Päivämäärä"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"Tunniste"</string>
@@ -217,9 +217,9 @@
     <string name="header_phone_entry" msgid="7092868248113091293">"Puhelin"</string>
     <string name="content_description_directions" msgid="860179347986211929">"reittiohjeet sijaintiin"</string>
     <string name="editor_more_fields" msgid="6158558083947445518">"Lisää kenttiä"</string>
-    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"Vaihda yhteystiedon kuvaa"</string>
-    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"Lisää yhteystiedon kuva"</string>
-    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"Yhteystiedon kuva"</string>
+    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"Vaihda yhteystiedon valokuvaa"</string>
+    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"Lisää yhteystiedon valokuva"</string>
+    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"Yhteystiedon valokuva"</string>
     <string name="editor_failed_to_load" msgid="2328074829787373644">"Muokkausnäkymän avaaminen epäonnistui."</string>
     <string name="editor_account_selector_title" msgid="3190515989740696043">"Tallennetaan tilille"</string>
     <string name="editor_account_selector_read_only_title" msgid="4870485850053962114">"Tilin <xliff:g id="ACCOUNT">%s</xliff:g> yhteystietoja ei voi muokata."</string>
@@ -474,7 +474,7 @@
     <string name="about_open_source_licenses" msgid="1617836621315557445">"Avoimen lähdekoodin käyttöluvat"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Avoimen lähdekoodin ohjelmiston käyttöluvan tiedot"</string>
     <string name="about_privacy_policy" msgid="4581488375200402678">"Tietosuojakäytäntö"</string>
-    <string name="about_terms_of_service" msgid="7419670771785057738">"Palveluehdot"</string>
+    <string name="about_terms_of_service" msgid="7419670771785057738">"Käyttöehdot"</string>
     <string name="activity_title_licenses" msgid="6434398894019119709">"Avoimen lähdekoodin käyttöluvat"</string>
     <string name="url_open_error_toast" msgid="4885855620824048385">"URL-osoitteen avaus epäonnistui."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g>, valittu"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 7cc9320..589ae61 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -29,7 +29,7 @@
     <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Créer un contact"</string>
     <string name="searchHint" msgid="1487501532610025473">"Rech. des contacts"</string>
     <string name="menu_addStar" msgid="4903812703386825130">"Ajouter aux favoris"</string>
-    <string name="menu_removeStar" msgid="3707373931808303701">"Retirer des favoris"</string>
+    <string name="menu_removeStar" msgid="3707373931808303701">"Supprimer des favoris"</string>
     <string name="description_action_menu_remove_star" msgid="4044390281910122890">"Supprimé des favoris"</string>
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"Ajouté aux favoris"</string>
     <string name="menu_editContact" msgid="5039663761025630208">"Modifier"</string>
@@ -37,7 +37,7 @@
     <string name="menu_change_photo" msgid="4911246106907208055">"Changer de photo"</string>
     <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"Créer un raccourci"</string>
     <string name="menu_splitAggregate" msgid="2062290275288905833">"Annuler la fusion"</string>
-    <string name="menu_editGroup" msgid="8706562583754054622">"Retirer les contacts"</string>
+    <string name="menu_editGroup" msgid="8706562583754054622">"Supprimer les contacts"</string>
     <string name="menu_renameGroup" msgid="2685886609399776475">"Renommer l\'étiquette"</string>
     <string name="menu_deleteGroup" msgid="1180215594530228294">"Supprimer l\'étiquette"</string>
     <string name="menu_addToGroup" msgid="5034813446697655310">"Ajouter un contact"</string>
@@ -183,14 +183,14 @@
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Annuler"</string>
     <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Supprimer les personnalisations?"</string>
     <string name="enter_contact_name" msgid="521859148893732679">"Rechercher dans les contacts"</string>
-    <string name="title_edit_group" msgid="4246193439931854759">"Retirer les contacts"</string>
+    <string name="title_edit_group" msgid="4246193439931854759">"Supprimer les contacts"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Mon profil local"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"Mon profil <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Prenez une minute pour ajouter un compte qui sauvegardera vos contacts sur Google."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"Les nouveaux contacts seront enregistrés dans le compte <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Choisissez un compte par défaut pour les nouveaux contacts :"</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Créer un contact"</string>
-    <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Modifier le contact"</string>
+    <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Modifier"</string>
     <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Lecture seule"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"Choisissez le contact à modifier"</string>
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"Contacts associés"</string>
@@ -369,7 +369,7 @@
     <string name="list_filter_single" msgid="6003845379327432129">"contact"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"Tous les autres contacts"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"Tous les contacts"</string>
-    <string name="menu_sync_remove" msgid="7523335046562082188">"Retirer le groupe de synchronisation"</string>
+    <string name="menu_sync_remove" msgid="7523335046562082188">"Supprimer le groupe de synchronisation"</string>
     <string name="dialog_sync_add" msgid="8012361965908515959">"Ajouter groupe de synchronisation"</string>
     <string name="display_more_groups" msgid="8398232980355188133">"Autres groupes…"</string>
     <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"Le retrait du groupe \"<xliff:g id="GROUP">%s</xliff:g>\" de la synchronisation entraîne également le retrait des contacts n\'appartenant à aucun groupe."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f7ee599..194e135 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -45,7 +45,7 @@
     <string name="menu_addContactsToGroup" msgid="4549318978482280577">"Ajouter des contacts"</string>
     <string name="menu_removeFromGroup" msgid="8753799091967887958">"Retirer du libellé"</string>
     <string name="menu_new_group_action_bar" msgid="1670312283925872483">"Créer un libellé"</string>
-    <string name="splitConfirmation" msgid="4750158900636307469">"Dissocier ce contact et le scinder en plusieurs ?"</string>
+    <string name="splitConfirmation" msgid="4750158900636307469">"Diviser ce contact en plusieurs contacts ?"</string>
     <string name="splitConfirmation_positive_button" msgid="3109235536045409854">"Dissocier"</string>
     <string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"Voulez-vous enregistrer les modifications que vous avez déjà apportées et diviser ce contact en plusieurs contacts ?"</string>
     <string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"Enregistrer et dissocier"</string>
@@ -79,7 +79,7 @@
     </plurals>
     <string name="title_from_google" msgid="2554633992366572820">"Contacts Google"</string>
     <string name="title_from_other_accounts" msgid="7813596336566711843">"Contacts de <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="menu_set_ring_tone" msgid="8876328286439724181">"Définir la sonnerie"</string>
+    <string name="menu_set_ring_tone" msgid="8876328286439724181">"Régler sonnerie"</string>
     <string name="menu_redirect_calls_to_vm" msgid="3027178444991878913">"Rediriger vers la messagerie"</string>
     <string name="menu_unredirect_calls_to_vm" msgid="2294919685954790892">"Ne plus rediriger"</string>
     <string name="readOnlyContactWarning" msgid="4158660823025751201">"Ce contact est en lecture seule. Il ne peut pas être supprimé, mais vous pouvez le masquer."</string>
@@ -190,7 +190,7 @@
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"Les nouveaux contacts seront enregistrés dans le compte <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Sélectionnez un compte par défaut pour les nouveaux contacts :"</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Créer un contact"</string>
-    <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Modifier le contact"</string>
+    <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Modifier contact"</string>
     <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Lecture seule"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"Choisir le contact à modifier"</string>
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"Contacts associés"</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 690f2e7..3e5fc09 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -134,7 +134,7 @@
     <string name="quickcontact_add_email" msgid="1442894568471116797">"Engadir correo electrónico"</string>
     <string name="missing_app" msgid="5674389915738964148">"Non se encontrou ningunha aplicación para procesar esta acción."</string>
     <string name="menu_share" msgid="6343022811796001773">"Compartir"</string>
-    <string name="menu_add_contact" msgid="5822356185421997656">"Engadir aos contactos"</string>
+    <string name="menu_add_contact" msgid="5822356185421997656">"Engadir a contactos"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Engadir"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
       <item quantity="other">Compartir contactos mediante</item>
@@ -310,10 +310,10 @@
     <string name="name_prefix" msgid="8857117624713905211">"Forma de tratamento"</string>
     <string name="name_middle" msgid="7330498948136181042">"Segundo nome"</string>
     <string name="name_suffix" msgid="4502958221763936999">"Título académico ou profesional"</string>
-    <string name="name_phonetic" msgid="4746541275769990740">"Nome (pronunciación)"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"Nome (pronunciación)"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome (pronunciación)"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"Apelidos (pronunciación)"</string>
+    <string name="name_phonetic" msgid="4746541275769990740">"Nome fonético"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"Nome fonético"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome fonético"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"Apelido fonético"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"Teléfono"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"Correo electrónico"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"Enderezo"</string>
@@ -357,8 +357,8 @@
     <string name="description_minus_button" msgid="1305985971158054217">"eliminar"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"Mostrar máis campos de nome"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"Contraer campos de nome"</string>
-    <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"Mostrar máis campos de pronuncia do nome"</string>
-    <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"Contraer campos de pronuncia do nome"</string>
+    <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"Mostrar máis campos de nome fonético"</string>
+    <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"Contraer campos de nome fonético"</string>
     <string name="expand_fields_description" msgid="8604448646798943909">"Despregar"</string>
     <string name="collapse_fields_description" msgid="3213872920491992960">"Contraer"</string>
     <string name="announce_expanded_fields" msgid="8410808184164186871">"Despregado"</string>
@@ -430,7 +430,7 @@
     <string name="progress_notifier_message" msgid="8522060892889599746">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Exportar a ficheiro .vcf"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Ordenar por"</string>
-    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome (pronunciación)"</string>
+    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome fonético"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Mostrar sempre"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Ocultar se está baleiro"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Nome"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index da6125c..1ee67df 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -32,7 +32,7 @@
     <string name="menu_removeStar" msgid="3707373931808303701">"મનપસંદમાંથી દૂર કરો"</string>
     <string name="description_action_menu_remove_star" msgid="4044390281910122890">"મનપસંદમાંથી દૂર કર્યું"</string>
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"મનપસંદમાં ઉમેર્યું"</string>
-    <string name="menu_editContact" msgid="5039663761025630208">"ફેરફાર કરો"</string>
+    <string name="menu_editContact" msgid="5039663761025630208">"સંપાદન"</string>
     <string name="menu_deleteContact" msgid="15161764025276217">"કાઢી નાખો"</string>
     <string name="menu_change_photo" msgid="4911246106907208055">"ફોટો બદલો"</string>
     <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"શૉર્ટકટ બનાવો"</string>
@@ -310,10 +310,10 @@
     <string name="name_prefix" msgid="8857117624713905211">"નામ ઉપસર્ગ"</string>
     <string name="name_middle" msgid="7330498948136181042">"પિતા/પતિનું નામ"</string>
     <string name="name_suffix" msgid="4502958221763936999">"નામ પ્રત્યય"</string>
-    <string name="name_phonetic" msgid="4746541275769990740">"ફોનેટિક નામ"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"ફોનેટિક નામ"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"ફોનેટિક પિતા/પતિનું નામ"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"ફોનેટિક અટક"</string>
+    <string name="name_phonetic" msgid="4746541275769990740">"ધ્વન્યાત્મક નામ"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"ધ્વન્યાત્મક નામ"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"ધ્વન્યાત્મક પિતા/પતિનું નામ"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"ધ્વન્યાત્મક અટક"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"ફોન"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"ઇમેઇલ"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"સરનામું"</string>
@@ -353,12 +353,12 @@
     <string name="chat_gtalk" msgid="2927882858741904064">"Google Talk નો ઉપયોગ કરીને ચેટ કરો"</string>
     <string name="chat_icq" msgid="4289041376069626281">"ICQ નો ઉપયોગ કરીને ચેટ કરો"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Jabber નો ઉપયોગ કરીને ચેટ કરો"</string>
-    <string name="chat" msgid="8390862712584830532">"Chat"</string>
+    <string name="chat" msgid="8390862712584830532">"ચેટ"</string>
     <string name="description_minus_button" msgid="1305985971158054217">"કાઢી નાખો"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"વધુ નામ ફીલ્ડ્સ બતાવો"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"નામ ફીલ્ડ્સ સંકુચિત કરો"</string>
-    <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"વધુ ફોનેટિક નામ ફીલ્ડ બતાવો"</string>
-    <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"ફોનેટિક નામ ફીલ્ડ સંકુચિત કરો"</string>
+    <string name="expand_phonetic_name_fields_description" msgid="7414340689396399173">"વધુ ધ્વન્યાત્મક નામ ફીલ્ડ્સ બતાવો"</string>
+    <string name="collapse_phonetic_name_fields_description" msgid="4614902922362144094">"ધ્વન્યાત્મક નામ ફીલ્ડ્સ સંકુચિત કરો"</string>
     <string name="expand_fields_description" msgid="8604448646798943909">"વિસ્તૃત કરો"</string>
     <string name="collapse_fields_description" msgid="3213872920491992960">"સંકુચિત કરો"</string>
     <string name="announce_expanded_fields" msgid="8410808184164186871">"વિસ્તૃત કર્યું"</string>
@@ -430,7 +430,7 @@
     <string name="progress_notifier_message" msgid="8522060892889599746">"<xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> આયાત કરે છે: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">".vcf ફાઇલ પર નિકાસ કરો"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"આ પ્રમાણે સૉર્ટ કરો"</string>
-    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"ફોનેટિક નામ"</string>
+    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"ધ્વન્યાત્મક નામ"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"હંમેશા બતાવો"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"જો ખાલી હોય તો છુપાવો"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"નામ"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 5c131ec..3b1769f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -96,7 +96,7 @@
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"संपर्कों को होम स्क्रीन में जोड़ा गया."</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> को होम स्क्रीन में जोड़ा गया."</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"डिवाइस पर कोई चित्र उपलब्ध नहीं है."</string>
-    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"संपर्क की फ़ोटो"</string>
+    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"संपर्क का फ़ोटो"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"कस्टम लेबल नाम"</string>
     <string name="removePhoto" msgid="1190099414600730001">"फ़ोटो निकालें"</string>
     <string name="noContacts" msgid="3030512741779213810">"आपकी संपर्क सूची खाली है"</string>
@@ -353,7 +353,7 @@
     <string name="chat_gtalk" msgid="2927882858741904064">"Google टॉक का उपयोग करके बातचीत करें"</string>
     <string name="chat_icq" msgid="4289041376069626281">"ICQ का उपयोग करके बातचीत करें"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Jabber का उपयोग करके बातचीत करें"</string>
-    <string name="chat" msgid="8390862712584830532">"चैट करें"</string>
+    <string name="chat" msgid="8390862712584830532">"बातचीत करें"</string>
     <string name="description_minus_button" msgid="1305985971158054217">"मिटाएं"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"ज़्यादा नाम फ़ील्ड दिखाएं"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"नाम फ़ील्ड संक्षिप्त करें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0e39456..79762aa 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -106,7 +106,7 @@
     <string name="emptyGroup" msgid="8598261660865081152">"Nema kontakata s tom oznakom"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"Nema kontakata na ovom računu"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"Popis kontakata je prazan"</string>
-    <string name="contactSavedNamedToast" msgid="3067050290584834386">"Kontakt <xliff:g id="DISPLAY_NAME">%s</xliff:g> je spremljen"</string>
+    <string name="contactSavedNamedToast" msgid="3067050290584834386">"Spremljeno: <xliff:g id="DISPLAY_NAME">%s</xliff:g>"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"Kontakt je spremljen"</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"Prekinuta je veza kontakata"</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"Promjene kontakta ne mogu se spremiti"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b948140..b55ce33 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -103,7 +103,7 @@
     <string name="emptyGroup" msgid="8598261660865081152">"Nincs ilyen címkéjű névjegy"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"A fiókban nincsenek névjegyek"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"A névjegylista üres"</string>
-    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> mentve"</string>
+    <string name="contactSavedNamedToast" msgid="3067050290584834386">"Mentette a következőt: <xliff:g id="DISPLAY_NAME">%s</xliff:g>"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"Névjegy elmentve"</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"Névjegyek szétválasztva"</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"Nem sikerült menteni a névjegymódosításokat"</string>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index be9aaca..73abe8c 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -134,7 +134,7 @@
     <string name="quickcontact_add_email" msgid="1442894568471116797">"Ավելացնել էլ․ հասցե"</string>
     <string name="missing_app" msgid="5674389915738964148">"Այս գործողությունը կատարելու համար ոչ մի ծրագիր չի գտնվել:"</string>
     <string name="menu_share" msgid="6343022811796001773">"Կիսվել"</string>
-    <string name="menu_add_contact" msgid="5822356185421997656">"Ավելացնել կոնտակտներին"</string>
+    <string name="menu_add_contact" msgid="5822356185421997656">"Ավելացնել կոնտակտներում"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Ավելացնել"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
       <item quantity="one">Share contacts via</item>
@@ -178,10 +178,10 @@
     <string name="set_default" msgid="3704074175618702225">"Սահմանել ըստ կանխադրման"</string>
     <string name="clear_default" msgid="2055883863621491533">"Մաքրել լռելյայն"</string>
     <string name="toast_text_copied" msgid="845906090076228771">"Տեքսը պատճենված է"</string>
-    <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"Հրաժարվե՞լ փոփոխություններից:"</string>
+    <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"Անտեսե՞լ փոփոխությունները:"</string>
     <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="8280294641821133477">"Անտեսել"</string>
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Չեղարկել"</string>
-    <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Հրաժարվե՞լ փոփոխություններից:"</string>
+    <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Անտեսե՞լ փոփոխությունները:"</string>
     <string name="enter_contact_name" msgid="521859148893732679">"Որոնեք կոնտակտներ"</string>
     <string name="title_edit_group" msgid="4246193439931854759">"Կոնտակտների ջնջում"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Իմ տեղային պրոֆիլը"</string>
@@ -285,8 +285,8 @@
     <string name="sms_mms" msgid="7395133080765833725">"Հաղորդագրել MMS համարին"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Գրել SMS)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"Տեսազանգ սկսել"</string>
-    <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Ջնջե՞լ հաճախակի հաղորդակցվողները"</string>
-    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Կոնտակտներ և Հեռախոս հավելվածներից կմաքրվի հաճախակի օգտագործվող կոնտակտների ցանկը, և էլփոստի հավելվածները զրոյից են սովորելու ձեր հաճախակի գործածվող կոնտակտները։"</string>
+    <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Մաքրե՞լ հաճախակի հաղորդակցվողները"</string>
+    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Կոնտակտներ և Հեռախոս հավելվածներից կմաքրվի հաճախակի օգտագործվող կոնտակտների ցանկը, և էլփոստի հավելվածները զրոյից են սովորելու ձեր հաճախակի օգտագործվող կոնտակտները։"</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Մաքրվում է հաճախակի հաղորդակցվողները..."</string>
     <string name="status_available" msgid="8081626460682959098">"Հասանելի է"</string>
     <string name="status_away" msgid="2677693194455091315">"Տեղում չէ"</string>
@@ -393,13 +393,13 @@
     <string name="cancel_export_confirmation_message" msgid="370693160959236239">"Չեղարկե՞լ <xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումը"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"Հնարավոր չէ չեղարկել vCard-ի ներմուծումը/արտահանումը"</string>
     <string name="fail_reason_unknown" msgid="3721044979355043778">"Անհայտ սխալ:"</string>
-    <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"Հնարավոր չէ բացել \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\"-ը. պատճառը՝ <xliff:g id="EXACT_REASON">%2$s</xliff:g>:"</string>
+    <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"Հնարավոր չէ բացել \"<xliff:g id="FILE_NAME">%1$s</xliff:g>\"-ը. պատճառը` <xliff:g id="EXACT_REASON">%2$s</xliff:g>:"</string>
     <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"Հնարավոր չէ մեկնարկել արտահանողը. պատճառը` «<xliff:g id="EXACT_REASON">%s</xliff:g>»:"</string>
     <string name="fail_reason_no_exportable_contact" msgid="487925011719622851">"Արտահանելի կոնտակտ չկա:"</string>
     <string name="missing_required_permission" msgid="1308037728470791436">"Դուք անջատել եք անհրաժեշտ թույլտվությունը:"</string>
     <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"Արտահանման ընթացքում տեղի է ունեցել սխալ. պատճառը` «<xliff:g id="EXACT_REASON">%s</xliff:g>»:"</string>
     <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O սխալ"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"Հիշողությունը բավարար չէ: Հնարավոր է՝ ֆայլը չափազանց մեծ է:"</string>
+    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"Հիշողությունը բավարար չէ: Հնարավոր է` ֆայլը չափազանց մեծ է:"</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"Ձևաչափը չի աջակցվում:"</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g>-ի արտահանումն ավարտվեց"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"Կոնտակտների արտահանումն ավարտվեց:"</string>
@@ -436,8 +436,8 @@
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Անվան"</string>
     <string name="display_options_sort_by_family_name" msgid="1282763552330910876">"Ազգանվան"</string>
     <string name="display_options_view_names_as" msgid="4060686468465916565">"Անվան ձևաչափ"</string>
-    <string name="display_options_view_given_name_first" msgid="383885125505521383">"Սկզբում անունը"</string>
-    <string name="display_options_view_family_name_first" msgid="6597077054231296007">"Սկզբում ազգանունը"</string>
+    <string name="display_options_view_given_name_first" msgid="383885125505521383">"Սկզբում՝ անունը"</string>
+    <string name="display_options_view_family_name_first" msgid="6597077054231296007">"Սկզբում՝ ազգանունը"</string>
     <string name="settings_accounts" msgid="119582613811929994">"Հաշիվներ"</string>
     <string name="default_editor_account" msgid="4810392921888877149">"Կանխադրված հաշիվ նոր կոնտակտների համար"</string>
     <string name="settings_my_info_title" msgid="6236848378653551341">"Իմ մասին"</string>
@@ -503,7 +503,7 @@
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Միացնել"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"Կապ չկա"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM քարտ"</string>
-    <string name="show_more_content_description" msgid="6298277298495491712">"Ցույց տալ ավելին"</string>
+    <string name="show_more_content_description" msgid="6298277298495491712">"Ցուցադրել ավելի շատ"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"SIM քարտի ներմուծումն ավարտվեց"</string>
     <string name="importing_sim_failed_title" msgid="1046154274170241788">"Ներմուծման սխալ"</string>
     <string name="importing_sim_failed_message" msgid="55568522164349044">"Չհաջողվեց կոնտակտներ ներմուծել SIM քարտից"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 97c3b8d..1aedbc9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -178,7 +178,7 @@
     <string name="set_default" msgid="3704074175618702225">"Setel sebagai default"</string>
     <string name="clear_default" msgid="2055883863621491533">"Hapus default"</string>
     <string name="toast_text_copied" msgid="845906090076228771">"Teks disalin"</string>
-    <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"Hapus perubahan?"</string>
+    <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"Buang perubahan?"</string>
     <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="8280294641821133477">"Buang"</string>
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Batal"</string>
     <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Hapus penyesuaian?"</string>
@@ -207,7 +207,7 @@
     <string name="date_time_set" msgid="8526160894146496334">"Setel"</string>
     <string name="header_im_entry" msgid="3581797653862294826">"IM"</string>
     <string name="header_organization_entry" msgid="7428066442988227441">"Organisasi"</string>
-    <string name="header_nickname_entry" msgid="1110276804512795150">"Nama panggilan"</string>
+    <string name="header_nickname_entry" msgid="1110276804512795150">"Nama"</string>
     <string name="header_note_entry" msgid="339680292368016788">"Catatan"</string>
     <string name="header_website_entry" msgid="3618691707215428785">"Situs web"</string>
     <string name="header_event_entry" msgid="70962228694476731">"Acara"</string>
@@ -284,7 +284,7 @@
     <string name="sms_assistant" msgid="245045451580096547">"SMS <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="7395133080765833725">"SMS MMS"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (SMS)"</string>
-    <string name="description_video_call" msgid="4956825008907720371">"Lakukan panggilan video"</string>
+    <string name="description_video_call" msgid="4956825008907720371">"Lakukan video call"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Hapus yang sering dihubungi?"</string>
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Anda akan menghapus daftar yang sering dihubungi pada aplikasi Kontak dan Ponsel, serta memaksa aplikasi email untuk mempelajari preferensi penanganan dari awal."</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Menghapus yang sering dihubungi..."</string>
@@ -479,7 +479,7 @@
     <string name="url_open_error_toast" msgid="4885855620824048385">"Gagal membuka url."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> dicentang"</string>
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> tidak dicentang"</string>
-    <string name="description_search_video_call" msgid="1768558141309418755">"Lakukan panggilan video"</string>
+    <string name="description_search_video_call" msgid="1768558141309418755">"Lakukan video call"</string>
     <string name="description_delete_contact" msgid="8110643050235441400">"Hapus"</string>
     <string name="description_no_name_header" msgid="8596201864512339003">"Elipsis"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"Pintasan ini telah dinonaktifkan"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4396eec..bbe721a 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -134,7 +134,7 @@
     <string name="quickcontact_add_email" msgid="1442894568471116797">"Aggiungi email"</string>
     <string name="missing_app" msgid="5674389915738964148">"Nessuna applicazione trovata per gestire questa azione."</string>
     <string name="menu_share" msgid="6343022811796001773">"Condividi"</string>
-    <string name="menu_add_contact" msgid="5822356185421997656">"Aggiungi ai contatti"</string>
+    <string name="menu_add_contact" msgid="5822356185421997656">"Aggiungi a contatti"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"Aggiungi"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
       <item quantity="other">Condividi contatti tramite</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 191024d..a200960 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -137,7 +137,7 @@
     <string name="search_settings_description" msgid="5630675648560839920">"השמות של אנשי הקשר"</string>
     <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"לחץ כדי לחזור אל המסך הקודם"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"הוספת מספר טלפון"</string>
-    <string name="quickcontact_add_email" msgid="1442894568471116797">"הוספת אימייל"</string>
+    <string name="quickcontact_add_email" msgid="1442894568471116797">"הוסף אימייל"</string>
     <string name="missing_app" msgid="5674389915738964148">"לא נמצאה אפליקציה שיכולה לטפל בפעולה זו."</string>
     <string name="menu_share" msgid="6343022811796001773">"שיתוף"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"הוספה לאנשי הקשר"</string>
@@ -514,7 +514,7 @@
     <string name="account_sync_off" msgid="6187683798342006021">"סנכרון החשבון מושבת. הקש כדי להפעיל אותו."</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"האם להשבית את הסנכרון האוטומטי?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"‏השינויים שתבצע בכל האפליקציות והחשבונות, לא רק באנשי הקשר מחשבון Google, יסונכרנו בין האינטרנט לבין המכשירים שלך."</string>
-    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"הפעלה"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"הפעל"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"אין חיבור"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"‏כרטיס SIM"</string>
     <string name="show_more_content_description" msgid="6298277298495491712">"הצג עוד"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7293c44..f66b6e3 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -124,7 +124,7 @@
     <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"電話番号が登録されていない連絡先があります。"</string>
     <string name="menu_sendEmailOption" msgid="8600335923636486825">"メールを送信"</string>
     <string name="menu_sendMessageOption" msgid="8051852013078110910">"メッセージを送信"</string>
-    <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"連絡先を選択"</string>
+    <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"連絡先の選択"</string>
     <string name="send_to_selection" msgid="3655197947726443720">"送信"</string>
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"連絡先はありません"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"<xliff:g id="EMAIL">%s</xliff:g> を連絡先に追加しますか？"</string>
@@ -175,7 +175,7 @@
     <string name="delete_group_dialog_message" msgid="754082019928025404">"ラベル「<xliff:g id="GROUP_LABEL">%1$s</xliff:g>」を削除しますか？（連絡先自体は削除されません。）"</string>
     <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"別の連絡先とリンクするにはまず連絡先の名前を入力してください。"</string>
     <string name="copy_text" msgid="6835250673373028909">"クリップボードにコピー"</string>
-    <string name="set_default" msgid="3704074175618702225">"デフォルトを設定"</string>
+    <string name="set_default" msgid="3704074175618702225">"デフォルトに設定"</string>
     <string name="clear_default" msgid="2055883863621491533">"デフォルトを解除"</string>
     <string name="toast_text_copied" msgid="845906090076228771">"テキストをコピーしました"</string>
     <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"変更を破棄しますか？"</string>
@@ -183,7 +183,7 @@
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"キャンセル"</string>
     <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"カスタマイズを破棄しますか？"</string>
     <string name="enter_contact_name" msgid="521859148893732679">"連絡先を検索"</string>
-    <string name="title_edit_group" msgid="4246193439931854759">"連絡先を削除"</string>
+    <string name="title_edit_group" msgid="4246193439931854759">"連絡先の削除"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"ローカルプロファイル"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"<xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>のプロファイル"</string>
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"アカウントを追加すると、連絡先を Google にバックアップできるようになります。"</string>
@@ -452,7 +452,7 @@
     <string name="no_contact_to_share" msgid="6285287228557175749">"共有する連絡先がありません。"</string>
     <string name="menu_contacts_filter" msgid="5854584270038139275">"表示する連絡先"</string>
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"表示する連絡先"</string>
-    <string name="custom_list_filter" msgid="2544327670202891979">"表示をカスタマイズ"</string>
+    <string name="custom_list_filter" msgid="2544327670202891979">"ビューをカスタマイズ"</string>
     <string name="menu_custom_filter_save" msgid="2412959737200856930">"保存"</string>
     <string name="hint_findContacts" msgid="5554298639062659655">"連絡先を検索"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"お気入り"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 1dc5f32..01adf4d 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -295,7 +295,7 @@
     <string name="directory_search_label" msgid="2602118204885565153">"Каталог"</string>
     <string name="directory_search_label_work" msgid="2392128956332931231">"Жұмыс каталогы"</string>
     <string name="local_search_label" msgid="6692495405531144805">"Барлық контактілер"</string>
-    <string name="description_quick_contact_for" msgid="6364906818231956042">"Жылдам контакт: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="description_quick_contact_for" msgid="6364906818231956042">"<xliff:g id="NAME">%1$s</xliff:g> үшін жылдам байланыс"</string>
     <string name="missing_name" msgid="7970183292521946492">"(Атаусыз)"</string>
     <string name="favoritesFrequentContacted" msgid="2885862854079966676">"Жиі хабарласатындар"</string>
     <string name="list_filter_phones" msgid="6839133198968393843">"Телефон нөмірі бар барлық контактілер"</string>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 87d629c..356466b 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -103,7 +103,7 @@
     <string name="emptyGroup" msgid="8598261660865081152">"ಈ ಲೇಬಲ್‌ನ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"ಈ ಖಾತೆಯಲ್ಲಿ ಯಾವುದೇ ಸಂಪರ್ಕಗಳಿಲ್ಲ"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳ ಪಟ್ಟಿಯು ಖಾಲಿಯಾಗಿದೆ"</string>
-    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ಸಂಪರ್ಕವನ್ನು ಉಳಿಸಲಾಗಿದೆ"</string>
+    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ಉಳಿಸಲಾಗಿದೆ"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"ಸಂಪರ್ಕ‌ವನ್ನು ಉಳಿಸಲಾಗಿದೆ"</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"ಸಂಪರ್ಕಗಳನ್ನು ಅನ್‌ಲಿಂಕ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"ಸಂಪರ್ಕ ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲಾಗಲಿಲ್ಲ"</string>
@@ -134,7 +134,7 @@
     <string name="quickcontact_add_email" msgid="1442894568471116797">"ಇಮೇಲ್ ಸೇರಿಸಿ"</string>
     <string name="missing_app" msgid="5674389915738964148">"ಈ ಕ್ರಿಯೆಯನ್ನು ನಿರ್ವಹಿಸಲು ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌ ಕಂಡುಬಂದಿಲ್ಲ."</string>
     <string name="menu_share" msgid="6343022811796001773">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="menu_add_contact" msgid="5822356185421997656">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸಿ"</string>
+    <string name="menu_add_contact" msgid="5822356185421997656">"ಸಂಪರ್ಕಗಳಿಗೆ ಸೇರಿಸು"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"ಸೇರಿಸು"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
       <item quantity="one">ಸಂಪರ್ಕಗಳನ್ನು ಈ ಮೂಲಕ ಹಂಚಿಕೊಳ್ಳಿ</item>
@@ -353,7 +353,7 @@
     <string name="chat_gtalk" msgid="2927882858741904064">"Google Talk ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
     <string name="chat_icq" msgid="4289041376069626281">"ICQ ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Jabber ಬಳಸಿಕೊಂಡು ಚಾಟ್‌ ಮಾಡಿ"</string>
-    <string name="chat" msgid="8390862712584830532">"Chat"</string>
+    <string name="chat" msgid="8390862712584830532">"ಚಾಟ್"</string>
     <string name="description_minus_button" msgid="1305985971158054217">"ಅಳಿಸಿ"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"ಇನ್ನಷ್ಟು ಹೆಸರಿನ ಕ್ಷೇತ್ರಗಳನ್ನು ತೋರಿಸಿ"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"ಹೆಸರಿನ ಕ್ಷೇತ್ರಗಳನ್ನು ಸಂಕುಚಿಸಿ"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 3641817..0a2e2a0 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -367,7 +367,7 @@
     <string name="list_filter_all_starred" msgid="2582865760150432568">"별표"</string>
     <string name="list_filter_customize" msgid="2368900508906139537">"맞춤설정"</string>
     <string name="list_filter_single" msgid="6003845379327432129">"연락처"</string>
-    <string name="display_ungrouped" msgid="4823012484407759332">"다른 모든 연락처"</string>
+    <string name="display_ungrouped" msgid="4823012484407759332">"다른 모든 주소록"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"모든 주소록"</string>
     <string name="menu_sync_remove" msgid="7523335046562082188">"동기화 그룹 삭제"</string>
     <string name="dialog_sync_add" msgid="8012361965908515959">"동기화 그룹 추가"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index d389335..480f10a 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -181,7 +181,7 @@
     <string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"Өзгөрүүлөр сакталбасынбы?"</string>
     <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="8280294641821133477">"Жарактан чыгаруу"</string>
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Баш тартуу"</string>
-    <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Өзгөрүүлөрдү жоесузбу?"</string>
+    <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Өзгөртүүлөр жокко чыгарылсынбы?"</string>
     <string name="enter_contact_name" msgid="521859148893732679">"Байланыштардан издеп көрүңүз"</string>
     <string name="title_edit_group" msgid="4246193439931854759">"Байланыштарды алып салуу"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Менин жергиликтүү профайлым"</string>
@@ -220,7 +220,7 @@
     <string name="editor_change_photo_content_description" msgid="8146896029044539032">"Байланыштын сүрөтүн өзгөртүү"</string>
     <string name="editor_add_photo_content_description" msgid="8457486801272200575">"Байланыштын сүрөтүн кошуу"</string>
     <string name="editor_contact_photo_content_description" msgid="8699261934352739">"Байланыштын сүрөтү"</string>
-    <string name="editor_failed_to_load" msgid="2328074829787373644">"Түзөтүүчү ачылбай калды."</string>
+    <string name="editor_failed_to_load" msgid="2328074829787373644">"Түзөткүч ачылбай калды."</string>
     <string name="editor_account_selector_title" msgid="3190515989740696043">"Төмөнкүгө сакталууда"</string>
     <string name="editor_account_selector_read_only_title" msgid="4870485850053962114">"Байланыш маалыматын түзөтүүгө болбойт: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="quickcontact_suggestion_link_button" msgid="3485212664301802371">"БАЙЛАНЫШТАРДЫ ШИЛТЕМЕЛӨӨ"</string>
@@ -289,7 +289,7 @@
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Байланыштар жана Телефон колдонмолорунан көп байланышкан адамдар тизмесин тазалап, даректүү жеке жөндөөлөр тууралуу билүү үчүн электрондук почта колдонмолорун иштетиңиз."</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Көп чалынгандар тизмеси тазаланууда…"</string>
     <string name="status_available" msgid="8081626460682959098">"Жеткиликтүү"</string>
-    <string name="status_away" msgid="2677693194455091315">"Ордунда жок"</string>
+    <string name="status_away" msgid="2677693194455091315">"Чыгып кетти"</string>
     <string name="status_busy" msgid="2759339190187696727">"Бош эмес"</string>
     <string name="local_invisible_directory" msgid="5936234374879813300">"Башка"</string>
     <string name="directory_search_label" msgid="2602118204885565153">"Каталог"</string>
@@ -336,7 +336,7 @@
     <string name="email_other" msgid="9200478615023952240">"Электрондук почта"</string>
     <string name="email_custom" msgid="4614140345586842953">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> электрондук кат жөнөтүү"</string>
     <string name="email" msgid="7367975425670798827">"Электрондук почта"</string>
-    <string name="postal_street" msgid="43809570436400749">"Көчө"</string>
+    <string name="postal_street" msgid="43809570436400749">"Көчөсү"</string>
     <string name="postal_city" msgid="3571927981675393150">"Шаары"</string>
     <string name="postal_region" msgid="6130239447563491435">"Штаты"</string>
     <string name="postal_postcode" msgid="33077708757232659">"ZIP коду"</string>
@@ -454,7 +454,7 @@
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Көрсөтүлүүчү байланыштар"</string>
     <string name="custom_list_filter" msgid="2544327670202891979">"Тандап көрсөтүү"</string>
     <string name="menu_custom_filter_save" msgid="2412959737200856930">"Сактоо"</string>
-    <string name="hint_findContacts" msgid="5554298639062659655">"Байланыштарды издөө"</string>
+    <string name="hint_findContacts" msgid="5554298639062659655">"Байланыштарды издеңиз"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"Cүйүктүүлөр"</string>
     <string name="menu_import" msgid="2206768098740726906">"Өткөрүп алуу"</string>
     <string name="menu_export" msgid="1217402092617629429">"Өткөрүп берүү"</string>
@@ -492,7 +492,7 @@
       <item quantity="other">SIM-картадан <xliff:g id="COUNT">%d</xliff:g> байланыш өткөрүлүп алынды</item>
       <item quantity="one">SIM-картадан 1 байланыш өткөрүлүп алынды</item>
     </plurals>
-    <string name="sim_import_failed_toast" msgid="358117391138073786">"SIM картадагы байланыштар өткөрүлүп алынган жок"</string>
+    <string name="sim_import_failed_toast" msgid="358117391138073786">"SIM-картадагы байланыштар өткөрүлүп алынган жок"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"SIM-картадан өткөрүп алуу"</string>
     <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Жокко чыгаруу"</string>
     <string name="auto_sync_off" msgid="7039314601316227882">"Түзмөктүн авто шайкештештирүү функциясы өчүрүлгөн. Күйгүзүү үчүн тийип коюңуз."</string>
@@ -501,7 +501,7 @@
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"Автосинхрондоштуруу күйгүзүлсүнбү?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Байланыштарыңызда гана эмес бардык колдонмолордо жана каттоо эсептеринде жасалган өзгөртүүлөр желе интерфейси менен башка түзмөктөрүңүздүн ортолорунда мезгил-мезгили менен жаңыртылып турат."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Күйгүзүү"</string>
-    <string name="connection_error_message" msgid="7446131881946138093">"Интернет жок"</string>
+    <string name="connection_error_message" msgid="7446131881946138093">"Байланыш жок"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM-карта"</string>
     <string name="show_more_content_description" msgid="6298277298495491712">"Дагы көрсөтүү"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"SIM-картадан өткөрүп алуу аяктады"</string>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index c082cb3..17a25b2 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -103,14 +103,14 @@
     <string name="emptyGroup" msgid="8598261660865081152">"Нема контакти со етикетава"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"Нема контакти во сметкава"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"Списокот со контакти е празен"</string>
-    <string name="contactSavedNamedToast" msgid="3067050290584834386">"Контактот <xliff:g id="DISPLAY_NAME">%s</xliff:g> е зачуван"</string>
+    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> е зачуван"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"Контактот е зачуван"</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"Контактите се раздвоени"</string>
-    <string name="contactSavedErrorToast" msgid="3213619905154956918">"Не може да се зачуваат промените на контактот"</string>
-    <string name="contactUnlinkErrorToast" msgid="7289356996668886841">"Не може да се прекине врската со контактот"</string>
-    <string name="contactJoinErrorToast" msgid="1222155997933362787">"Не може да се поврзе контактот"</string>
+    <string name="contactSavedErrorToast" msgid="3213619905154956918">"Не можеше да се зачуваат промените на контактот"</string>
+    <string name="contactUnlinkErrorToast" msgid="7289356996668886841">"Не можеше да се прекине врската со контактот"</string>
+    <string name="contactJoinErrorToast" msgid="1222155997933362787">"Не можеше да се поврзе контактот"</string>
     <string name="contactGenericErrorToast" msgid="5689457475864876100">"Грешка при зачувување на контактот"</string>
-    <string name="contactPhotoSavedErrorToast" msgid="8568460180541397272">"Не може да се зачуваат промените на фотографијата на контактот"</string>
+    <string name="contactPhotoSavedErrorToast" msgid="8568460180541397272">"Не можеше да се зачуваат промените на фотографијата на контактот"</string>
     <string name="groupLoadErrorToast" msgid="4141488223976370583">"Етикетата не успеа да се вчита"</string>
     <string name="groupDeletedToast" msgid="7774363940327847515">"Етикетата е избришана"</string>
     <string name="groupCreatedToast" msgid="1685148819468403239">"Етикетата е создадена"</string>
@@ -118,7 +118,7 @@
     <string name="groupUpdatedToast" msgid="3381549467345607379">"Етикетата е ажурирана"</string>
     <string name="groupMembersRemovedToast" msgid="8019566066934628011">"Отстрането од етикетата"</string>
     <string name="groupMembersAddedToast" msgid="1939782548900157287">"Додадено на етикетата"</string>
-    <string name="groupSavedErrorToast" msgid="8456912862816145318">"Не може да се зачуваат промените на етикетата"</string>
+    <string name="groupSavedErrorToast" msgid="8456912862816145318">"Не можеше да се зачуваат промените на етикетата"</string>
     <string name="groupExistsErrorMessage" msgid="912222525098791136">"Етикетата веќе постои"</string>
     <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"Некои од контактите немаат е-пошта."</string>
     <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"Некои од контактите немаат телефонски број."</string>
@@ -169,7 +169,7 @@
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Додај во контакти"</string>
     <string name="non_phone_close" msgid="2792373584950696532">"Затвори"</string>
     <string name="date_year_toggle" msgid="8930759990426623823">"Вклучи година"</string>
-    <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"Додајте сметка"</string>
+    <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"Додај сметка"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"Увези"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"Создајте нова…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"Да се избрише етикетата „<xliff:g id="GROUP_LABEL">%1$s</xliff:g>“? (Контактите нема да се избришат.)"</string>
@@ -196,11 +196,11 @@
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"Поврзани контакти"</string>
     <string name="contact_editor_add_linked_contact" msgid="2895453741206196138">"Додајте"</string>
     <string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"Прекинете врска"</string>
-    <string name="add_account" msgid="3071396624500839020">"Додајте сметка"</string>
+    <string name="add_account" msgid="3071396624500839020">"Додај сметка"</string>
     <string name="add_new_account" msgid="573368229646104110">"Додај нова сметка"</string>
     <string name="menu_export_database" msgid="1658249125751926885">"Извези датотеки од база на податоци"</string>
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Создај нов контакт"</string>
-    <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Прикажи повеќе"</string>
+    <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Погледни повеќе"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Погледни помалку"</string>
     <string name="about_card_title" msgid="6635849009952435700">"За"</string>
     <string name="toast_making_personal_copy" msgid="9053129410039312386">"Се создава лична копија..."</string>
@@ -393,8 +393,8 @@
     <string name="cancel_export_confirmation_message" msgid="370693160959236239">"Да се откаже извозот на <xliff:g id="FILENAME">%s</xliff:g>?"</string>
     <string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"Не може да се откаже увоз/извоз на vCard"</string>
     <string name="fail_reason_unknown" msgid="3721044979355043778">"Непозната грешка."</string>
-    <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"„<xliff:g id="FILE_NAME">%1$s</xliff:g>“ не може да се отвори: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
-    <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"Не може да се вклучи извозникот: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
+    <string name="fail_reason_could_not_open_file" msgid="6015509564074145162">"„<xliff:g id="FILE_NAME">%1$s</xliff:g>“ не можеше да се отвори: <xliff:g id="EXACT_REASON">%2$s</xliff:g>."</string>
+    <string name="fail_reason_could_not_initialize_exporter" msgid="4145819808407973981">"Не можеше да се вклучи извозникот: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
     <string name="fail_reason_no_exportable_contact" msgid="487925011719622851">"Нема контакт на кој може да се изврши извоз."</string>
     <string name="missing_required_permission" msgid="1308037728470791436">"Оневозможивте потребна дозвола."</string>
     <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"Настанаи грешка при извоз: „<xliff:g id="EXACT_REASON">%s</xliff:g>“."</string>
@@ -408,13 +408,13 @@
     <string name="exporting_vcard_canceled_title" msgid="1287529222628052526">"Извозот на <xliff:g id="FILENAME">%s</xliff:g> е откажан."</string>
     <string name="exporting_contact_list_title" msgid="6599904516394311592">"Се врши извоз на податоци за контакт"</string>
     <string name="exporting_contact_list_message" msgid="6253904938452184387">"Во моментов се врши извоз на податоците за контакт."</string>
-    <string name="composer_failed_to_get_database_infomation" msgid="4394169679142311379">"Не може да добие информации за базата на податоци."</string>
+    <string name="composer_failed_to_get_database_infomation" msgid="4394169679142311379">"Не можеше да добие информации за базата на податоци."</string>
     <string name="composer_has_no_exportable_contact" msgid="473911071832548562">"Нема контакти за извезување."</string>
     <string name="composer_not_initialized" msgid="3861391548605450184">"Композиторот на vCard не започна правилно."</string>
     <string name="exporting_contact_failed_title" msgid="9003659313161289860">"Не е можен извоз"</string>
     <string name="exporting_contact_failed_message" msgid="9198720310560773485">"Извозот на податоците за контакт не се изврши.\nПричина: „<xliff:g id="FAIL_REASON">%s</xliff:g>“"</string>
     <string name="importing_vcard_description" msgid="6982207216746936735">"Се врши увоз на <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="reading_vcard_failed_title" msgid="1230432142768184978">"Не може да прочита податоци од vCard"</string>
+    <string name="reading_vcard_failed_title" msgid="1230432142768184978">"Не можеше да прочита податоци од vCard"</string>
     <string name="importing_vcard_finished_title" msgid="2274644947000264322">"Заврши увозот на vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
     <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"Увезувањето на <xliff:g id="FILENAME">%s</xliff:g> е откажано"</string>
     <string name="vcard_import_will_start_message" msgid="4514702035621833178">"Ќе се изврши увоз на <xliff:g id="FILENAME">%s</xliff:g> наскоро."</string>
@@ -424,7 +424,7 @@
     <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"Барањето за извоз на vCard беше одбиено. Обидете се повторно подоцна."</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"контакт"</string>
     <string name="caching_vcard_message" msgid="1879339732783666517">"Се кешираат vCard(s) во локалната привремена меморија. Реалниот увоз ќе започне наскоро."</string>
-    <string name="vcard_import_failed" msgid="37313715326741013">"Не може да се изврши увоз на vCard."</string>
+    <string name="vcard_import_failed" msgid="37313715326741013">"Не можеше да се изврши увоз на vCard."</string>
     <string name="nfc_vcard_file_name" msgid="2113518216329123152">"Контакт од NFC"</string>
     <string name="caching_vcard_title" msgid="6333926052524937628">"Кеширање"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"Се врши увоз на <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
@@ -474,7 +474,7 @@
     <string name="about_open_source_licenses" msgid="1617836621315557445">"Лиценци за софтвер со отворен код"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Детали за лиценцата за софтвер со отворен код"</string>
     <string name="about_privacy_policy" msgid="4581488375200402678">"Политика за приватност"</string>
-    <string name="about_terms_of_service" msgid="7419670771785057738">"Услови за користење"</string>
+    <string name="about_terms_of_service" msgid="7419670771785057738">"Услови на користење"</string>
     <string name="activity_title_licenses" msgid="6434398894019119709">"Лиценци за софтвер со отворен код"</string>
     <string name="url_open_error_toast" msgid="4885855620824048385">"Линкот не успеа да се отвори."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"<xliff:g id="ACCOUNT_INFO">%s</xliff:g> е штиклирано"</string>
@@ -506,7 +506,7 @@
     <string name="show_more_content_description" msgid="6298277298495491712">"Прикажи повеќе"</string>
     <string name="importing_sim_finished_title" msgid="6436721150882268416">"Увезувањето на SIM-картичката заврши"</string>
     <string name="importing_sim_failed_title" msgid="1046154274170241788">"Увезувањето не успеа"</string>
-    <string name="importing_sim_failed_message" msgid="55568522164349044">"Не може да се увезат контакти од SIM-картичката"</string>
+    <string name="importing_sim_failed_message" msgid="55568522164349044">"Не можеше да се увезат контакти од SIM-картичката"</string>
     <string name="importing_sim_in_progress_title" msgid="7647907413920018595">"Се увезува SIM"</string>
     <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Известувања"</string>
     <string name="yes_button" msgid="1120514817091581293">"Да"</string>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 603d7bd..f07b0e5 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -189,7 +189,7 @@
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"കുറച്ചുസമയമെടുത്ത് ഒരു അക്കൗണ്ട് ചേർക്കുക, അത് Google-ൽ നിങ്ങളുടെ കോൺടാക്‌റ്റുകളുടെ ബായ്‌ക്കപ്പെടുക്കുന്നതിനിടയാക്കും."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"പുതിയ കോൺടാക്റ്റുകൾ <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g> എന്ന അക്കൗണ്ടിലേക്ക് സംരക്ഷിക്കപ്പെടും."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"പുതിയ കോൺടാക്റ്റുകൾക്ക് ഒരു ഡിഫോൾട്ട് അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക:"</string>
-    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"പുതിയ കോൺടാക്റ്റ് സൃഷ്‌ടിക്കൂ"</string>
+    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"പുതിയകോൺടാക്റ്റ് സൃഷ്‌ടിക്കൂ"</string>
     <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"എഡിറ്റുചെയ്യുക"</string>
     <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"കാഴ്‌ച മാത്രം"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"എഡിറ്റുചെയ്യാനുള്ള കോൺടാക്‌റ്റ്‌ തിരഞ്ഞെടുക്കുക"</string>
@@ -199,7 +199,7 @@
     <string name="add_account" msgid="3071396624500839020">"അക്കൗണ്ട് ചേർക്കുക"</string>
     <string name="add_new_account" msgid="573368229646104110">"പുതിയ അക്കൗണ്ട് ചേർക്കുക"</string>
     <string name="menu_export_database" msgid="1658249125751926885">"ഡാറ്റാബേസ് ഫയലുകൾ എക്‌സ്‌പോർട്ടുചെയ്യുക"</string>
-    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"പുതിയ കോൺടാക്റ്റ് സൃഷ്‌ടിക്കൂ"</string>
+    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"പുതിയകോൺടാക്റ്റ് സൃഷ്‌ടിക്കൂ"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"കൂടുതൽ‍ കാണുക"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"കുറച്ച് കാണുക"</string>
     <string name="about_card_title" msgid="6635849009952435700">"ആമുഖം"</string>
@@ -311,9 +311,9 @@
     <string name="name_middle" msgid="7330498948136181042">"മിഡിൽ നെയിം"</string>
     <string name="name_suffix" msgid="4502958221763936999">"പേരിന്റെ സഫിക്‌സ്"</string>
     <string name="name_phonetic" msgid="4746541275769990740">"ഉച്ചാരണപ്രകാരമുള്ള പേര്"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"ഉച്ചാരണപ്രകാരമുള്ള ഫസ്റ്റ് നെയിം"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"ഫസ്റ്റ് നെയിം"</string>
     <string name="name_phonetic_middle" msgid="6528822054594516485">"ഉച്ചാരണപ്രകാരമുള്ള മിഡിൽ നെയിം"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"ഉച്ചാരണപ്രകാരമുള്ള ലാസ്റ്റ് നെയിം"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"പേരിന്റെ അവസാന ഭാഗം"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"ഫോണ്‍"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"ഇമെയില്‍"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"വിലാസം"</string>
@@ -353,7 +353,7 @@
     <string name="chat_gtalk" msgid="2927882858741904064">"Google Talk ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
     <string name="chat_icq" msgid="4289041376069626281">"ICQ ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Jabber ഉപയോഗിച്ച് ചാറ്റുചെയ്യുക"</string>
-    <string name="chat" msgid="8390862712584830532">"Chat"</string>
+    <string name="chat" msgid="8390862712584830532">"ചാറ്റുചെയ്യുക"</string>
     <string name="description_minus_button" msgid="1305985971158054217">"ഇല്ലാതാക്കുക"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"പേരിന്റെ കൂടുതൽ ഫീൽഡുകൾ കാണിക്കുക"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"പേരിന്റെ ഫീൽഡുകൾ ചുരുക്കുക"</string>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 94065ac..ff3c5d8 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -21,7 +21,7 @@
     <string name="shortcut_add_contact" msgid="7949342235528657981">"Харилцагч нэмэх"</string>
     <string name="shortcutContact" msgid="8009736387364461511">"Харилцагч"</string>
     <string name="shortcutDialContact" msgid="155367248069127153">"Шууд залгах"</string>
-    <string name="shortcutMessageContact" msgid="9123517151981679277">"Шууд мессеж"</string>
+    <string name="shortcutMessageContact" msgid="9123517151981679277">"Шууд зурвас"</string>
     <string name="shortcutActivityTitle" msgid="5407832911005090417">"Харилцагч сонгох"</string>
     <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Харилцагчид нэмэх"</string>
     <string name="contactPickerActivityTitle" msgid="1842634991247618890">"Харилцагч сонгоно уу"</string>
@@ -123,7 +123,7 @@
     <string name="groupSomeContactsNoEmailsToast" msgid="2142963883699535155">"Зарим харилцагчид имэйл хаяггүй байна."</string>
     <string name="groupSomeContactsNoPhonesToast" msgid="2454029254458875746">"Зарим харилцагчид утасны дугааргүй байна."</string>
     <string name="menu_sendEmailOption" msgid="8600335923636486825">"Имэйл илгээх"</string>
-    <string name="menu_sendMessageOption" msgid="8051852013078110910">"Мессеж илгээх"</string>
+    <string name="menu_sendMessageOption" msgid="8051852013078110910">"Зурвас илгээх"</string>
     <string name="pickerSelectContactsActivityTitle" msgid="8265907544009447967">"Харилцагчдыг сонгоно уу"</string>
     <string name="send_to_selection" msgid="3655197947726443720">"Илгээх"</string>
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"Харилцагч байхгүй"</string>
@@ -209,7 +209,7 @@
     <string name="header_organization_entry" msgid="7428066442988227441">"Байгууллага"</string>
     <string name="header_nickname_entry" msgid="1110276804512795150">"Хоч"</string>
     <string name="header_note_entry" msgid="339680292368016788">"Тэмдэглэл"</string>
-    <string name="header_website_entry" msgid="3618691707215428785">"Вебсайт"</string>
+    <string name="header_website_entry" msgid="3618691707215428785">"Вэбсайт"</string>
     <string name="header_event_entry" msgid="70962228694476731">"Үйл явдал"</string>
     <string name="header_relation_entry" msgid="993618132732521944">"Хамаарал"</string>
     <string name="header_name_entry" msgid="2516776099121101578">"Нэр"</string>
@@ -263,33 +263,33 @@
     <string name="call_mms" msgid="1760746475672950386">"MMS рүү залгах"</string>
     <string name="call_by_shortcut" msgid="5707329943368933423">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Залгах)"</string>
     <string name="sms_custom" msgid="3684453744622817362">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> руу мессеж бичих"</string>
-    <string name="sms_home" msgid="6132392861245316613">"Гэрийн утас руу мессеж илгээх"</string>
-    <string name="sms_mobile" msgid="433949735070334192">"Гар утас руу мессеж илгээх"</string>
-    <string name="sms_work" msgid="7784676780449153911">"Ажил руу мессеж илгээх"</string>
-    <string name="sms_fax_work" msgid="8239716828120939345">"Ажлын факс руу мессеж илгээх"</string>
-    <string name="sms_fax_home" msgid="6887675360794775735">"Гэрийн факс руу мессеж илгээх"</string>
-    <string name="sms_pager" msgid="1052540072760129272">"Пейжер рүү мессеж илгээх"</string>
-    <string name="sms_other" msgid="3584200156296349098">"Мессеж илгээх"</string>
-    <string name="sms_callback" msgid="6932315941997609031">"Дуудлага авах мессеж илгээх"</string>
-    <string name="sms_car" msgid="6051606941547979352">"Машин руу мессеж илгээх"</string>
-    <string name="sms_company_main" msgid="4801585186677340070">"Компанийн үндсэн дугаар руу мессеж илгээх"</string>
-    <string name="sms_isdn" msgid="8093269429091061478">"ISDN рүү мессеж илгээх"</string>
-    <string name="sms_main" msgid="624730854551629076">"Үндсэн дугаар руу мессеж илгээх"</string>
-    <string name="sms_other_fax" msgid="8272996838482574564">"Факс руу мессеж илгээх"</string>
-    <string name="sms_radio" msgid="3703466526430351408">"Радио руу мессеж илгээх"</string>
-    <string name="sms_telex" msgid="5926595248188984691">"Телекс рүү мессеж илгээх"</string>
-    <string name="sms_tty_tdd" msgid="5517202384458721064">"TTY/TDD рүү мессеж илгээх"</string>
-    <string name="sms_work_mobile" msgid="1170012557483816931">"Ажлын гар утас руу мессеж илгээх"</string>
-    <string name="sms_work_pager" msgid="8827367747655005608">"Ажлын пейжэр рүү мессеж илгээх"</string>
-    <string name="sms_assistant" msgid="245045451580096547">"<xliff:g id="ASSISTANT">%s</xliff:g> руу мессеж бичих"</string>
-    <string name="sms_mms" msgid="7395133080765833725">"MMS руу мессеж илгээх"</string>
-    <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Мессеж)"</string>
+    <string name="sms_home" msgid="6132392861245316613">"Гэрийн утас руу зурвас илгээх"</string>
+    <string name="sms_mobile" msgid="433949735070334192">"Гар утас руу зурвас илгээх"</string>
+    <string name="sms_work" msgid="7784676780449153911">"Ажил руу зурвас илгээх"</string>
+    <string name="sms_fax_work" msgid="8239716828120939345">"Ажлын факс руу зурвас илгээх"</string>
+    <string name="sms_fax_home" msgid="6887675360794775735">"Гэрийн факс руу зурвас илгээх"</string>
+    <string name="sms_pager" msgid="1052540072760129272">"Пейжер рүү зурвас илгээх"</string>
+    <string name="sms_other" msgid="3584200156296349098">"Зурвас илгээх"</string>
+    <string name="sms_callback" msgid="6932315941997609031">"Дуудлага авах зурвас илгээх"</string>
+    <string name="sms_car" msgid="6051606941547979352">"Машин руу зурвас илгээх"</string>
+    <string name="sms_company_main" msgid="4801585186677340070">"Компанийн үндсэн дугаар руу зурвас илгээх"</string>
+    <string name="sms_isdn" msgid="8093269429091061478">"ISDN рүү зурвас илгээх"</string>
+    <string name="sms_main" msgid="624730854551629076">"Үндсэн дугаар руу зурвас илгээх"</string>
+    <string name="sms_other_fax" msgid="8272996838482574564">"Факс руу зурвас илгээх"</string>
+    <string name="sms_radio" msgid="3703466526430351408">"Радио руу зурвас илгээх"</string>
+    <string name="sms_telex" msgid="5926595248188984691">"Телекс рүү зурвас илгээх"</string>
+    <string name="sms_tty_tdd" msgid="5517202384458721064">"TTY/TDD рүү зурвас илгээх"</string>
+    <string name="sms_work_mobile" msgid="1170012557483816931">"Ажлын гар утас руу зурвас илгээх"</string>
+    <string name="sms_work_pager" msgid="8827367747655005608">"Ажлын пейжэр рүү зурвас илгээх"</string>
+    <string name="sms_assistant" msgid="245045451580096547">"<xliff:g id="ASSISTANT">%s</xliff:g> руу зурвас бичих"</string>
+    <string name="sms_mms" msgid="7395133080765833725">"MMS руу зурвас илгээх"</string>
+    <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Зурвас)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"Видео дуудлага хийх"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгах уу?"</string>
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Та Харилцагч болон Утас апп-ууд дахь байнга холбоо барьсан харилцагчдын жагсаалтыг устгаж, ингэснээрээ имэйл апп-уудыг таны имэйл хаяглах хандлагыг бүр эхнээс нь суралцахад хүргэнэ."</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Байнга холбоо барьдаг харилцагчдын жагсаалтыг устгаж байна…"</string>
     <string name="status_available" msgid="8081626460682959098">"Холбогдсон"</string>
-    <string name="status_away" msgid="2677693194455091315">"Эзгүй"</string>
+    <string name="status_away" msgid="2677693194455091315">"Холдсон"</string>
     <string name="status_busy" msgid="2759339190187696727">"Завгүй"</string>
     <string name="local_invisible_directory" msgid="5936234374879813300">"Бусад"</string>
     <string name="directory_search_label" msgid="2602118204885565153">"Директор"</string>
@@ -321,14 +321,14 @@
     <string name="organizationLabelsGroup" msgid="2342482097897299099">"Байгууллага"</string>
     <string name="relationLabelsGroup" msgid="8931615792208307291">"Хамаарал"</string>
     <string name="eventLabelsGroup" msgid="8625868552164376823">"Баярт өдөр"</string>
-    <string name="sms" msgid="4246338112764847384">"Мессеж"</string>
+    <string name="sms" msgid="4246338112764847384">"Зурвас"</string>
     <string name="postal_address" msgid="5031809899673855074">"Хаяг"</string>
     <string name="ghostData_company" msgid="3873500610390675876">"Компани"</string>
     <string name="ghostData_title" msgid="8584897460662904533">"Гарчиг"</string>
     <string name="label_notes" msgid="7134226125644463585">"Тэмдэглэл"</string>
     <string name="label_custom_field" msgid="4160584225306364924">"Тусгай"</string>
     <string name="label_sip_address" msgid="8876347942587537552">"SIP"</string>
-    <string name="websiteLabelsGroup" msgid="114754928100220315">"Вебсайт"</string>
+    <string name="websiteLabelsGroup" msgid="114754928100220315">"Вэбсайт"</string>
     <string name="groupsLabel" msgid="5622154133880646122">"Шошгууд"</string>
     <string name="email_home" msgid="1102791500866910269">"Гэрийн имэйл рүү"</string>
     <string name="email_mobile" msgid="6461172430397598705">"Гар утас руу имэйлдэх"</string>
@@ -452,7 +452,7 @@
     <string name="no_contact_to_share" msgid="6285287228557175749">"Хуваалцах харилцагчид байхгүй байна."</string>
     <string name="menu_contacts_filter" msgid="5854584270038139275">"Харуулах харилцагчид"</string>
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Харуулах харилцагчид"</string>
-    <string name="custom_list_filter" msgid="2544327670202891979">"Харагдцыг тааруулах"</string>
+    <string name="custom_list_filter" msgid="2544327670202891979">"Харагдацыг тааруулах"</string>
     <string name="menu_custom_filter_save" msgid="2412959737200856930">"Хадгалах"</string>
     <string name="hint_findContacts" msgid="5554298639062659655">"Харилцагч хайх"</string>
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"Таалагддаг"</string>
@@ -472,7 +472,7 @@
     <string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="about_build_version" msgid="5870642814752351712">"Боловсруулсан хувилбар"</string>
     <string name="about_open_source_licenses" msgid="1617836621315557445">"Нээлттэй эхийн лиценз"</string>
-    <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Нээлттэй эхийн программ хангамжийн лицензийн мэдээлэл"</string>
+    <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Нээлттэй эхийн програм хангамжийн лицензийн мэдээлэл"</string>
     <string name="about_privacy_policy" msgid="4581488375200402678">"Нууцлалын бодлого"</string>
     <string name="about_terms_of_service" msgid="7419670771785057738">"Үйлчилгээний нөхцөл"</string>
     <string name="activity_title_licenses" msgid="6434398894019119709">"Нээлттэй эхийн лиценз"</string>
@@ -499,7 +499,7 @@
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"Хаах"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"Автомат синк идэвхгүй байна. Идэвхжүүлэх бол товшино уу."</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"Автомат синкийг асаах уу?"</string>
-    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Google Харилцагч төдийгүй бүх апп болон бүртгэлд таны оруулсан өөрчлөлтийг веб болон таны бусад төхөөрөмжүүд хооронд шинэчилж байх болно."</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Google Харилцагч төдийгүй бүх апп болон бүртгэлд таны оруулсан өөрчлөлтийг вэб болон таны бусад төхөөрөмжүүд хооронд шинэчилж байх болно."</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Идэвхжүүлэх"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"Холболт байхгүй"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 3b475ab..6968743 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -198,7 +198,7 @@
     <string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"दुवा रद्द करा"</string>
     <string name="add_account" msgid="3071396624500839020">"खाते जोडा"</string>
     <string name="add_new_account" msgid="573368229646104110">"नवीन खाते जोडा"</string>
-    <string name="menu_export_database" msgid="1658249125751926885">"डेटाबेस फाइल एक्सपोर्ट करा"</string>
+    <string name="menu_export_database" msgid="1658249125751926885">"डेटाबेस फाईल एक्सपोर्ट करा"</string>
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"नवीन संपर्क तयार करा"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"अधिक पहा"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"कमी पहा"</string>
@@ -353,7 +353,7 @@
     <string name="chat_gtalk" msgid="2927882858741904064">"Google Talk चा वापर करून चॅट करा"</string>
     <string name="chat_icq" msgid="4289041376069626281">"ICQ चा वापर करून चॅट करा"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Jabber चा वापर करून चॅट करा"</string>
-    <string name="chat" msgid="8390862712584830532">"Chat"</string>
+    <string name="chat" msgid="8390862712584830532">"चॅट करा"</string>
     <string name="description_minus_button" msgid="1305985971158054217">"हटवा"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"अधिक नाव फील्ड दर्शवा"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"नाव फील्ड संकुचित करा"</string>
@@ -369,10 +369,10 @@
     <string name="list_filter_single" msgid="6003845379327432129">"संपर्क"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"इतर सर्व संपर्क"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"सर्व संपर्क"</string>
-    <string name="menu_sync_remove" msgid="7523335046562082188">"सिंक समूह काढून टाका"</string>
-    <string name="dialog_sync_add" msgid="8012361965908515959">"सिंक गट जोडा"</string>
+    <string name="menu_sync_remove" msgid="7523335046562082188">"संकालन समूह काढून टाका"</string>
+    <string name="dialog_sync_add" msgid="8012361965908515959">"संकालन गट जोडा"</string>
     <string name="display_more_groups" msgid="8398232980355188133">"अधिक गट..."</string>
-    <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"सिंक करा मधून \"<xliff:g id="GROUP">%s</xliff:g>\" हटविल्‍याने सिंक करा मधून कोणत्‍याही गटबद्ध न केलेल्‍या संपर्कांना देखील हटवेल."</string>
+    <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"संकालन करा मधून \"<xliff:g id="GROUP">%s</xliff:g>\" हटविल्‍याने संकालन करा मधून कोणत्‍याही गटबद्ध न केलेल्‍या संपर्कांना देखील हटवेल."</string>
     <string name="savingDisplayGroups" msgid="6779839417901711381">"प्रदर्शन पर्याय सेव्ह करत आहे…"</string>
     <string name="listCustomView" msgid="5782275477737032610">"सानुकूलित दृश्य"</string>
     <string name="dialog_new_contact_account" msgid="5652018124788855057">"इंपोर्ट केलेले संपर्क यावर सेव्ह करा:"</string>
@@ -386,7 +386,7 @@
       <item quantity="other"><xliff:g id="COUNT_2">^1</xliff:g> संपर्क • <xliff:g id="PHONE_NUMBER_3">^2</xliff:g></item>
       <item quantity="one"><xliff:g id="COUNT_0">^1</xliff:g> संपर्क • <xliff:g id="PHONE_NUMBER_1">^2</xliff:g></item>
     </plurals>
-    <string name="import_from_vcf_file" msgid="6776403212804361301">".vcf फाइल"</string>
+    <string name="import_from_vcf_file" msgid="6776403212804361301">".vcf फाईल"</string>
     <string name="nothing_to_import_message" msgid="2594519620375509783">"इंपोर्ट करण्यासाठी काहीही नाही"</string>
     <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"vCard मधून संपर्क इंपोर्ट करायचे?"</string>
     <string name="cancel_import_confirmation_message" msgid="1007412828398265611">"<xliff:g id="FILENAME">%s</xliff:g> चे इंपोर्ट रद्द करायचे?"</string>
@@ -399,7 +399,7 @@
     <string name="missing_required_permission" msgid="1308037728470791436">"तुम्ही आवश्‍यक असलेली एक परवानगी अक्षम केली आहे."</string>
     <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"एक्सपोर्ट दरम्‍यान एरर आलीt: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
     <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O एरर"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"पुरेशी मेमरी नाही. फाइल कदाचित खूप मोठी असू शकते."</string>
+    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"पुरेशी मेमरी नाही. फाईल कदाचित खूप मोठी असू शकते."</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"स्वरूपन समर्थित नाही."</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g> एक्सपोर्ट करणे समाप्त झाले."</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"संपर्क इंपोर्ट करणे समाप्त झाले"</string>
@@ -418,15 +418,15 @@
     <string name="importing_vcard_finished_title" msgid="2274644947000264322">"vCard <xliff:g id="FILENAME">%s</xliff:g> इंपोर्ट करणे समाप्त झाले"</string>
     <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"<xliff:g id="FILENAME">%s</xliff:g> इंपोर्ट करणे रद्द झाले"</string>
     <string name="vcard_import_will_start_message" msgid="4514702035621833178">"<xliff:g id="FILENAME">%s</xliff:g> लवकरच इंपोर्ट केली जाईल."</string>
-    <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"फाइल लवकरच इंपोर्ट केली जाईल."</string>
+    <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"फाईल लवकरच इंपोर्ट केली जाईल."</string>
     <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"vCard इंपोर्ट विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="contacts_export_will_start_message" msgid="6428126265599715944">"संपर्क लवकरच एक्सपोर्ट केले जातील."</string>
     <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"vCard एक्सपोर्ट विनंती नाकारली. नंतर पुन्हा प्रयत्न करा."</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"संपर्क"</string>
-    <string name="caching_vcard_message" msgid="1879339732783666517">"स्‍थानिक तात्‍पुरत्‍या संचयनावर vCard(s) कॅशे    करत आहे. वास्‍तविक इंपोर्ट लवकरच प्रारंभ होईल."</string>
+    <string name="caching_vcard_message" msgid="1879339732783666517">"स्‍थानिक तात्‍पुरत्‍या संचयनावर vCard(s) कॅश   करत आहे. वास्‍तविक इंपोर्ट लवकरच प्रारंभ होईल."</string>
     <string name="vcard_import_failed" msgid="37313715326741013">"vCard इंपोर्ट करू शकलो नाही."</string>
     <string name="nfc_vcard_file_name" msgid="2113518216329123152">"NFC वर संपर्क प्राप्त केला"</string>
-    <string name="caching_vcard_title" msgid="6333926052524937628">"कॅशे    करत आहे"</string>
+    <string name="caching_vcard_title" msgid="6333926052524937628">"कॅश   करत आहे"</string>
     <string name="progress_notifier_message" msgid="8522060892889599746">"इंपोर्ट करत आहे <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">".vcf फाईलवर एक्सपोर्ट करा"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"नुसार क्रमवारी लावा"</string>
@@ -435,7 +435,7 @@
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"रिक्त असल्यास लपवा"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"नाव"</string>
     <string name="display_options_sort_by_family_name" msgid="1282763552330910876">"आडनाव"</string>
-    <string name="display_options_view_names_as" msgid="4060686468465916565">"नाव फॉरमॅट"</string>
+    <string name="display_options_view_names_as" msgid="4060686468465916565">"नाव स्वरूपन"</string>
     <string name="display_options_view_given_name_first" msgid="383885125505521383">"नाव प्रथम"</string>
     <string name="display_options_view_family_name_first" msgid="6597077054231296007">"आडनाव प्रथम"</string>
     <string name="settings_accounts" msgid="119582613811929994">"खाती"</string>
@@ -495,12 +495,12 @@
     <string name="sim_import_failed_toast" msgid="358117391138073786">"सिम संपर्क इंपोर्ट करण्यात अयशस्वी"</string>
     <string name="sim_import_title" msgid="8202961146093040684">"सिम वरून इंपोर्ट करा"</string>
     <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"रद्द करा"</string>
-    <string name="auto_sync_off" msgid="7039314601316227882">"स्वयं-सिंक बंद आहे. सुरू करण्यासाठी टॅप करा."</string>
+    <string name="auto_sync_off" msgid="7039314601316227882">"स्वयं-संकालन बंद आहे. चालू करण्यासाठी टॅप करा."</string>
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"डिसमिस करा"</string>
-    <string name="account_sync_off" msgid="6187683798342006021">"स्वयं-सिंक बंद आहे. सुरू करण्यासाठी टॅप करा."</string>
-    <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"स्वयं-सिंक सुरू करायचे?"</string>
+    <string name="account_sync_off" msgid="6187683798342006021">"स्वयं-संकालन बंद आहे. चालू करण्यासाठी टॅप करा."</string>
+    <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"स्वयं-संकालन चालू करायचे?"</string>
     <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"फक्त संपर्कांमध्ये नाही, तर तुम्ही सर्व अ‍ॅप्स आणि खात्यांमध्ये करता ते बदल, वेब आणि आपल्या अन्य डिव्हाइसेस दरम्यान अपडेट ठेवले जातील."</string>
-    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"सुरू करा"</string>
+    <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"चालू करा"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"कोणतेही कनेक्शन नाही"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"सिम"</string>
     <string name="show_more_content_description" msgid="6298277298495491712">"अधिक दर्शवा"</string>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index ad3238a..63b998e 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -103,7 +103,7 @@
     <string name="emptyGroup" msgid="8598261660865081152">"ဤအညွှန်းဖြင့်အဆက်အသွယ်များ မရှိပါ"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"ဤအကောင့်တွင် အဆက်အသွယ်များ မရှိပါ"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"သင့်အဆက်အသွယ်များစာရင်းတွင် မည်သူမျှမရှိပါ"</string>
-    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ကို သိမ်းလိုက်သည်"</string>
+    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ကို သိမ်းဆည်းလိုက်ပါပြီ"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"အဆက်အသွယ်အား သိမ်းဆည်းပြီးပါပြီ"</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"အဆက်အသွယ်များကို လင့်ခ်ဖြုတ်လိုက်ပြီ"</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"အဆက်အသွယ်ပြောင်းလဲမှုများကို သိမ်းဆည်း၍မရပါ"</string>
@@ -129,7 +129,7 @@
     <string name="listFoundAllContactsZero" msgid="1933842282916988563">"အဆက်အသွယ်များမရှိ"</string>
     <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"\"<xliff:g id="EMAIL">%s</xliff:g>\" ကို လိပ်စာထဲ ထည့်မလား?"</string>
     <string name="search_settings_description" msgid="5630675648560839920">"အဆက်အသွယ်များ၏နာမည်များ"</string>
-    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"ယခင် မျက်နှာပြင်သို့ ပြန်ရန် န"</string>
+    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"ယခင် မျက်နှာပြင်သို့ ပြန်ရန် ကလစ်ပါ"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"ဖုန်းနံပါတ် ထည့်ရန်"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"အီးမေးလ် ထည့်ရန်"</string>
     <string name="missing_app" msgid="5674389915738964148">"ဤလုပ်ဆောင်ချက်ကို ပြုလုပ်မည့် အက်ပ်မရှိပါ။"</string>
@@ -364,7 +364,7 @@
     <string name="announce_expanded_fields" msgid="8410808184164186871">"ချဲ့ထားသည်"</string>
     <string name="announce_collapsed_fields" msgid="7611318715383228182">"ချုံ့ထားသည်"</string>
     <string name="list_filter_all_accounts" msgid="6173785387972096770">"အဆက်အသွယ်အားလုံး"</string>
-    <string name="list_filter_all_starred" msgid="2582865760150432568">"ကြယ်ပွင့်ပြ"</string>
+    <string name="list_filter_all_starred" msgid="2582865760150432568">"ကြယ်ပွင့်ပြထားသော"</string>
     <string name="list_filter_customize" msgid="2368900508906139537">"စိတ်ကြိုက်ကြည့်ရန်"</string>
     <string name="list_filter_single" msgid="6003845379327432129">"အဆက်အသွယ်"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"အခြားအဆက်အသွယ်အားလုံး"</string>
@@ -459,8 +459,8 @@
     <string name="menu_import" msgid="2206768098740726906">"ထည့်သွင်းရန်"</string>
     <string name="menu_export" msgid="1217402092617629429">"ထုတ်ယူရန်"</string>
     <string name="menu_blocked_numbers" msgid="7064680515202657609">"ပိတ်ဆို့နံပါတ်များ"</string>
-    <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> မှတစ်ဆင့်"</string>
-    <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="SOURCE">%2$s</xliff:g> မှတစ်ဆင့်"</string>
+    <string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> မှတဆင့်"</string>
+    <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> <xliff:g id="SOURCE">%2$s</xliff:g> မှတဆင့်"</string>
     <string name="action_menu_back_from_search" msgid="683765774264585732">"ရှာဖွေမှုရပ်ရန်"</string>
     <string name="description_clear_search" msgid="1852934085825794095">"ရှာဖွေမှုကို ရှင်းပါ"</string>
     <string name="select_account_dialog_title" msgid="5047523441152129207">"အကောင့်"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 27dec42..5a50889 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -34,7 +34,7 @@
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"मनपर्नेमा थपियो"</string>
     <string name="menu_editContact" msgid="5039663761025630208">"सम्पादन गर्नुहोस्"</string>
     <string name="menu_deleteContact" msgid="15161764025276217">"मेट्नुहोस्"</string>
-    <string name="menu_change_photo" msgid="4911246106907208055">"फोटो परिवर्तन गर्नुहोस्"</string>
+    <string name="menu_change_photo" msgid="4911246106907208055">"तस्बिर परिवर्तन गर्नुहोस्"</string>
     <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"सर्टकट सिर्जना गर्नुहोस्"</string>
     <string name="menu_splitAggregate" msgid="2062290275288905833">"अनलिंक"</string>
     <string name="menu_editGroup" msgid="8706562583754054622">"सम्पर्कहरू हटाउनुहोस्"</string>
@@ -95,10 +95,10 @@
     <string name="invalidContactMessage" msgid="6204402264821083362">"सम्पर्क उपलब्ध छैन।"</string>
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"सम्पर्क गृह स्क्रिनमा थपियो।"</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> गृह स्क्रिनमा थपियो।"</string>
-    <string name="photoPickerNotFoundText" msgid="6535222297923110991">"यन्त्रमा कुनै पनि फोटोहरू उपलब्ध छैनन्।"</string>
-    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"सम्पर्क फोटो"</string>
+    <string name="photoPickerNotFoundText" msgid="6535222297923110991">"यन्त्रमा कुनै पनि तस्बिरहरू उपलब्ध छैनन्।"</string>
+    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"सम्पर्क तस्बिर"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"आफू अनुकूल पारिएको लेबलको नाम"</string>
-    <string name="removePhoto" msgid="1190099414600730001">"फोटो मेट्नुहोस्"</string>
+    <string name="removePhoto" msgid="1190099414600730001">"तस्बिर मेट्नुहोस्"</string>
     <string name="noContacts" msgid="3030512741779213810">"तपाईंको सम्पर्क ठेगानाहरूको सूची खाली छ"</string>
     <string name="emptyGroup" msgid="8598261660865081152">"यो लेबल अन्तर्गत कुनै सम्पर्कहरू छैनन्"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"यस खातामा कुनै सम्पर्क ठेगानाहरू छैनन्"</string>
@@ -132,13 +132,13 @@
     <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"अघिल्लो पर्दामा फर्कनको लागि क्लिक गर्नुहोस्"</string>
     <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"फोन नम्बर थप्नुहोस्"</string>
     <string name="quickcontact_add_email" msgid="1442894568471116797">"इमेल थप्नुहोस्"</string>
-    <string name="missing_app" msgid="5674389915738964148">"यो कार्य सम्हाल्न कुनै पनि एप पाइएन।"</string>
-    <string name="menu_share" msgid="6343022811796001773">"सेयर गर्नुहोस्"</string>
+    <string name="missing_app" msgid="5674389915738964148">"यो कार्य सम्हाल्न कुनै पनि अनुप्रयोग पाइएन।"</string>
+    <string name="menu_share" msgid="6343022811796001773">"साझेदारी गर्नुहोस्"</string>
     <string name="menu_add_contact" msgid="5822356185421997656">"सम्पर्कहरूमा थप्नुहोस्"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"थप्नुहोस्"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
-      <item quantity="other">यस मार्फत सम्पर्कहरू ‍सेयर गर्नुहोस्</item>
-      <item quantity="one">यस मार्फत सम्पर्क ‍सेयर गर्नुहोस्</item>
+      <item quantity="other">यस मार्फत सम्पर्कहरू ‍साझेदारी गर्नुहोस्</item>
+      <item quantity="one">यस मार्फत सम्पर्क ‍साझेदारी गर्नुहोस्</item>
     </plurals>
     <string name="dialog_new_group_account" msgid="4326402875327788728">"खाता छान्नुहोस्"</string>
     <string name="group_name_dialog_insert_title" msgid="5495572488613178283">"लेबल सिर्जना गर्नुहोस्"</string>
@@ -149,10 +149,10 @@
     <string name="video_chat" msgid="2477295971622477433">"भिडियो च्याट"</string>
     <string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g> सम्पर्क"</string>
     <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g> खाता"</string>
-    <string name="take_photo" msgid="820071555236547516">"फोटो लिनुहोस्"</string>
-    <string name="take_new_photo" msgid="4383091978116875778">"नयाँ फोटो खिच्नुहोस्"</string>
-    <string name="pick_photo" msgid="2050859661654812588">"फोटो छान्नुहोस्"</string>
-    <string name="pick_new_photo" msgid="4218112182908240970">"नयाँ फोटो चयन गर्नुहोस्"</string>
+    <string name="take_photo" msgid="820071555236547516">"तस्बिर लिनुहोस्"</string>
+    <string name="take_new_photo" msgid="4383091978116875778">"नयाँ तस्बिर खिच्नुहोस्"</string>
+    <string name="pick_photo" msgid="2050859661654812588">"तस्बिर छान्नुहोस्"</string>
+    <string name="pick_new_photo" msgid="4218112182908240970">"नयाँ तस्बिर चयन गर्नुहोस्"</string>
     <string name="search_results_searching" msgid="1373859095361975648">"खोजी कार्य गर्दै..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"मिति"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"लेबल"</string>
@@ -217,9 +217,9 @@
     <string name="header_phone_entry" msgid="7092868248113091293">"फोन"</string>
     <string name="content_description_directions" msgid="860179347986211929">"स्थानको लागि निर्देशनहरू"</string>
     <string name="editor_more_fields" msgid="6158558083947445518">"थप क्षेत्रहरू"</string>
-    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"सम्पर्कको फोटो बदल्नुहोस्"</string>
-    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"सम्पर्कको फोटो थप्नुहोस्"</string>
-    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"सम्पर्कको फोटो"</string>
+    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"सम्पर्कको तस्बिर बदल्नुहोस्"</string>
+    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"सम्पर्कको तस्बिर थप्नुहोस्"</string>
+    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"सम्पर्कको तस्बिर"</string>
     <string name="editor_failed_to_load" msgid="2328074829787373644">"सम्पादक खोल्न सकिएन।"</string>
     <string name="editor_account_selector_title" msgid="3190515989740696043">"यसमा सुरक्षित गरिँदै"</string>
     <string name="editor_account_selector_read_only_title" msgid="4870485850053962114">"<xliff:g id="ACCOUNT">%s</xliff:g> को सम्पर्क सम्बन्धी जानकारी सम्पादन गर्न मिल्दैन"</string>
@@ -286,7 +286,7 @@
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (सन्देश पठाउनुहोस्)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"भिडियो कल बनाउनुहोस्"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"प्रायः सम्पर्क गरिएकाहरूलाई हटाउने हो?"</string>
-    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"तपाईंले सम्पर्कहरू र फोन एपहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल एपहरूलाई दबाब दिनुहुनेछ।"</string>
+    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"तपाईंले सम्पर्कहरू र फोन अनुप्रयोगहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल अनुप्रयोगहरूलाई दबाब दिनुहुनेछ।"</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"प्रायः सम्पर्क गरिएकाहरूलाई हटाउँदै...."</string>
     <string name="status_available" msgid="8081626460682959098">"उपलब्ध"</string>
     <string name="status_away" msgid="2677693194455091315">"टाढा"</string>
@@ -399,7 +399,7 @@
     <string name="missing_required_permission" msgid="1308037728470791436">"तपाईँले आवश्यक अनुमति असक्षम पार्नुभएको छ।"</string>
     <string name="fail_reason_error_occurred_during_export" msgid="6179270404825288837">"\"<xliff:g id="EXACT_REASON">%s</xliff:g>\": निर्यात गर्ने क्रममा त्रुटि भयो।"</string>
     <string name="fail_reason_io_error" msgid="6364839914349999408">"I/O त्रुटि"</string>
-    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"मेमोरी प्रयाप्त छैन। फाइल धेरै ठुलो हुन सक्छ।"</string>
+    <string name="fail_reason_low_memory_during_import" msgid="4525361860523306991">"मेमोरी प्रयाप्त छैन। फाइल धेरै ठूलो हुन सक्छ।"</string>
     <string name="fail_reason_not_supported" msgid="6449916670421646290">"ढाँचा समर्थित छैन।"</string>
     <string name="exporting_vcard_finished_title" msgid="1984393609140969504">"<xliff:g id="FILENAME">%s</xliff:g> निर्यात कार्य सकियो।"</string>
     <string name="exporting_vcard_finished_title_fallback" msgid="9029067439586573959">"सम्पर्क ठेगानाहरूलाई निर्यात गर्ने काम सकियो।"</string>
@@ -443,7 +443,7 @@
     <string name="settings_my_info_title" msgid="6236848378653551341">"मेरा बारेमा जानकारी"</string>
     <string name="set_up_profile" msgid="3554999219868611431">"आफ्नो प्रोफाइल सेटअप गर्नुहोस्"</string>
     <string name="setting_about" msgid="2941859292287597555">"सम्पर्कहरूका बारेमा"</string>
-    <string name="share_favorite_contacts" msgid="8208444020721686178">"मन पर्ने सम्पर्कहरू सेयर गर्नुहोस्"</string>
+    <string name="share_favorite_contacts" msgid="8208444020721686178">"मन पर्ने सम्पर्कहरू आदान प्रदान गर्नुहोस्"</string>
     <string name="share_contacts" msgid="2377773269568609796">"सबै सम्पर्क आदान प्रदान गर्ने"</string>
     <string name="share_contacts_failure" msgid="1348777470180064086">"सम्पर्कहरू आदान प्रदान गर्न सकिएन।"</string>
     <string name="dialog_export" msgid="3497435010655060068">"सम्पर्क ठेगानाहरू निर्यात गर्नुहोस्"</string>
@@ -499,7 +499,7 @@
     <string name="dismiss_sync_alert" msgid="4057176963960104786">"खारेज गर्नुहोस्"</string>
     <string name="account_sync_off" msgid="6187683798342006021">"खाता सिङ्क गर्ने सेवा निष्क्रिय छ। सक्रिय पार्न ट्याप गर्नुहोस्।"</string>
     <string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"स्वत: सिंक सेवा सक्रिय गर्ने हो?"</string>
-    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"तपाईंले Google सम्पर्कहरूमा मात्र नभई, सबै एप र खाताहरूमा गरेका परिवर्तनहरू वेब र तपाईंका अन्य यन्त्रहरूका बीचमा अद्यावधिक हुने छन्।"</string>
+    <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"तपाईंले Google सम्पर्कहरूमा मात्र नभई, सबै अनुप्रयोग र खाताहरूमा गरेका परिवर्तनहरू वेब र तपाईंका अन्य यन्त्रहरूका बीचमा अद्यावधिक हुने छन्।"</string>
     <string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"खोल्नुहोस्"</string>
     <string name="connection_error_message" msgid="7446131881946138093">"जडान छैन"</string>
     <string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7e5242d..6478cf2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -241,7 +241,7 @@
     <string name="hamburger_feature_highlight_body" msgid="782935036630531528">"Organiseer je contacten op een overzichtelijke en nuttige manier"</string>
     <string name="undo" msgid="2446931036220975026">"Ongedaan maken"</string>
     <string name="call_custom" msgid="2844900154492073207">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> bellen"</string>
-    <string name="call_home" msgid="2443904771140750492">"Thuis bellen"</string>
+    <string name="call_home" msgid="2443904771140750492">"Bellen naar huis"</string>
     <string name="call_mobile" msgid="6504312789160309832">"Bellen naar mobiel"</string>
     <string name="call_work" msgid="2414313348547560346">"Bellen naar werk"</string>
     <string name="call_fax_work" msgid="5026843006300760797">"Bellen naar fax werk"</string>
@@ -341,7 +341,7 @@
     <string name="postal_region" msgid="6130239447563491435">"Staat"</string>
     <string name="postal_postcode" msgid="33077708757232659">"Postcode"</string>
     <string name="postal_country" msgid="6642804283917549861">"Land"</string>
-    <string name="map_home" msgid="2169053372466501148">"Woonadres weergeven"</string>
+    <string name="map_home" msgid="2169053372466501148">"Thuisadres weergeven"</string>
     <string name="map_work" msgid="8296916987749726461">"Werkadres weergeven"</string>
     <string name="map_other" msgid="4009931029322619674">"Adres weergeven"</string>
     <string name="map_custom" msgid="7797812861927817335">"Adres voor <xliff:g id="CUSTOM_LABEL">%s</xliff:g> bekijken"</string>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index f014165..8ed3649 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -134,7 +134,7 @@
     <string name="quickcontact_add_email" msgid="1442894568471116797">"ଇମେଲ୍ ଯୋଡ଼ନ୍ତୁ"</string>
     <string name="missing_app" msgid="5674389915738964148">"ଏହି କାର୍ଯ୍ୟକୁ ନିୟନ୍ତ୍ରଣ କରିବା ପାଇଁ କୌଣସି ଆପ୍‍ ମିଳିଲା ନାହିଁ"</string>
     <string name="menu_share" msgid="6343022811796001773">"ସେୟାର୍‍ କରନ୍ତୁ"</string>
-    <string name="menu_add_contact" msgid="5822356185421997656">"ଯୋଗାଯୋଗଗୁଡ଼ିକରେ ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="menu_add_contact" msgid="5822356185421997656">"ଯୋଗାଯୋଗରେ ଯୋଡ଼ନ୍ତୁ"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"ଯୋଡ଼ନ୍ତୁ"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
       <item quantity="other">ମାଧ୍ୟମରେ ଯୋଗାଯୋଗ ସେୟାର୍ କରନ୍ତୁ</item>
@@ -174,7 +174,7 @@
     <string name="create_group_item_label" msgid="921929508079162463">"ନୂଆ ତିଆରି କରନ୍ତୁ…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"\"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\" ଲେବଲକୁ ଡିଲିଟ୍ କରିବେ?(ଯୋଗାଯୋଗ ଆପେଆପେ ଡିଲିଟ୍ ହେବନାହିଁ।)"</string>
     <string name="toast_join_with_empty_contact" msgid="3886468280665325350">"ଅନ୍ୟ ଯୋଗାଯୋଗ ସହ ଲିଙ୍କ କରିବା ପୂର୍ବରୁ ଯୋଗାଯୋଗାଙ୍କ ନାମ ଲେଖନ୍ତୁ।"</string>
-    <string name="copy_text" msgid="6835250673373028909">"କ୍ଲିପ୍‌ବୋର୍ଡକୁ କପି କରନ୍ତୁ"</string>
+    <string name="copy_text" msgid="6835250673373028909">"କପୀ କରି କ୍ଲିପ୍‌ବୋର୍ଡକୁ ନିଅନ୍ତୁ"</string>
     <string name="set_default" msgid="3704074175618702225">"ଡିଫଲ୍ଟ ସେଟ୍‍ କରନ୍ତୁ"</string>
     <string name="clear_default" msgid="2055883863621491533">"ଡିଫଲ୍ଟକୁ ଖାଲି କରନ୍ତୁ"</string>
     <string name="toast_text_copied" msgid="845906090076228771">"ଟେକ୍ସଟ୍ କପୀ କରାଗଲା"</string>
@@ -353,7 +353,7 @@
     <string name="chat_gtalk" msgid="2927882858741904064">"Google Talk ବ୍ୟବହାର କରି ଚାଟ୍‍ କରନ୍ତୁ"</string>
     <string name="chat_icq" msgid="4289041376069626281">"ICQ ବ୍ୟବହାର କରି ଚା‍ଟ୍‍ କରନ୍ତୁ"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Jabber ବ୍ୟବହାର କରି ଚାଟ୍‍ କରନ୍ତୁ"</string>
-    <string name="chat" msgid="8390862712584830532">"Chat"</string>
+    <string name="chat" msgid="8390862712584830532">"ଚାଟ୍ କରନ୍ତୁ"</string>
     <string name="description_minus_button" msgid="1305985971158054217">"ଡିଲିଟ୍ କରନ୍ତୁ"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"ଅଧିକ ନାମ କ୍ଷେତ୍ର ଦର୍ଶାନ୍ତୁ"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"ନାମ କ୍ଷେତ୍ରକୁ ସଙ୍କୁଚିତ କରନ୍ତୁ"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9d054ef..69bb94d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -190,7 +190,7 @@
     <string name="cancel_confirmation_dialog_cancel_editing_button" msgid="8280294641821133477">"Odrzuć"</string>
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Anuluj"</string>
     <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Odrzucić zmiany?"</string>
-    <string name="enter_contact_name" msgid="521859148893732679">"Wyszukaj kontakty"</string>
+    <string name="enter_contact_name" msgid="521859148893732679">"Szukaj kontaktów"</string>
     <string name="title_edit_group" msgid="4246193439931854759">"Usuń kontakty"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Mój profil lokalny"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"Mój profil <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index a39e4f3..de5395f 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -191,7 +191,7 @@
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Escolha uma conta padrão para novos contatos:"</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Criar novo contato"</string>
     <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Editar contato"</string>
-    <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Somente ver"</string>
+    <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Somente visualização"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"Escolher um contato para editar"</string>
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"Contatos vinculados"</string>
     <string name="contact_editor_add_linked_contact" msgid="2895453741206196138">"Adicionar"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index a39e4f3..de5395f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -191,7 +191,7 @@
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Escolha uma conta padrão para novos contatos:"</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Criar novo contato"</string>
     <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Editar contato"</string>
-    <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Somente ver"</string>
+    <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Somente visualização"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"Escolher um contato para editar"</string>
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"Contatos vinculados"</string>
     <string name="contact_editor_add_linked_contact" msgid="2895453741206196138">"Adicionar"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index f5dcd99..bd025e5 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -26,7 +26,7 @@
     <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Adăugați pentru persoană"</string>
     <string name="contactPickerActivityTitle" msgid="1842634991247618890">"Alegeți o persoană de contact"</string>
     <string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"Selectați"</string>
-    <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Contact nou"</string>
+    <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Creați o intrare nouă"</string>
     <string name="searchHint" msgid="1487501532610025473">"Căutați în Agendă"</string>
     <string name="menu_addStar" msgid="4903812703386825130">"Adăugați la lista de favorite"</string>
     <string name="menu_removeStar" msgid="3707373931808303701">"Eliminați din lista de favorite"</string>
@@ -193,7 +193,7 @@
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Adăugați un cont în care se va face backup pentru agenda dvs. în Google."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"Persoanele noi de contact vor fi salvate în <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Alegeți un cont prestabilit pentru persoanele de contact noi:"</string>
-    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Contact nou"</string>
+    <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Creați intrare nouă"</string>
     <string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"Editați intrarea"</string>
     <string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"Numai vizualizare"</string>
     <string name="contact_editor_pick_raw_contact_to_edit_dialog_title" msgid="4478782370280424187">"Alegeți persoana de contact pentru a o edita"</string>
@@ -203,7 +203,7 @@
     <string name="add_account" msgid="3071396624500839020">"Adăugați un cont"</string>
     <string name="add_new_account" msgid="573368229646104110">"Adăugați un cont nou"</string>
     <string name="menu_export_database" msgid="1658249125751926885">"Exportați fișierele bazei de date"</string>
-    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Contact nou"</string>
+    <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Creați o intrare nouă"</string>
     <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Mai multe detalii"</string>
     <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Mai puține detalii"</string>
     <string name="about_card_title" msgid="6635849009952435700">"Despre"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3e22d5c..d8806f3 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -431,9 +431,9 @@
     <string name="importing_vcard_canceled_title" msgid="8165471996631186776">"Importovanie súboru <xliff:g id="FILENAME">%s</xliff:g> bolo zrušené"</string>
     <string name="vcard_import_will_start_message" msgid="4514702035621833178">"Vizitka <xliff:g id="FILENAME">%s</xliff:g> bude čoskoro importovaná."</string>
     <string name="vcard_import_will_start_message_with_default_name" msgid="8205422202924103470">"Súbor bude čoskoro importovaný."</string>
-    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"Žiadosť o import vizitky vCard bola odmietnutá. Skúste to neskôr."</string>
+    <string name="vcard_import_request_rejected_message" msgid="4754292694777189540">"Žiadosť o import vizitky vCard bola odmietnutá. Skúste to znova neskôr."</string>
     <string name="contacts_export_will_start_message" msgid="6428126265599715944">"Kontakty budú čoskoro exportované"</string>
-    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"Žiadosť o export vizitky bola odmietnutá. Skúste to neskôr."</string>
+    <string name="vcard_export_request_rejected_message" msgid="6455336845734884740">"Žiadosť o export vizitky bola odmietnutá. Skúste to znova neskôr."</string>
     <string name="vcard_unknown_filename" msgid="8320954544777782497">"kontakt"</string>
     <string name="caching_vcard_message" msgid="1879339732783666517">"Prebieha načítavanie vizitiek vCard do vyrovnávacej pamäte miestneho dočasného úložiska. Samotné importovanie začne o chvíľu."</string>
     <string name="vcard_import_failed" msgid="37313715326741013">"Vizitku vCard sa nepodarilo importovať."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 1438160..c5aa628 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -190,7 +190,7 @@
     <string name="title_edit_group" msgid="4246193439931854759">"Уклоните контакте"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Мој локални профил"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"Мој <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g> профил"</string>
-    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Одвојите мало времена да бисте додали налог помоћу ког ћете направити резервну копију контаката на Google-у."</string>
+    <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Одвојте мало времена да бисте додали налог помоћу ког ћете направити резервну копију контаката на Google-у."</string>
     <string name="contact_editor_prompt_one_account" msgid="765343809177951169">"Нови контакти ће бити сачувани на налогу <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>."</string>
     <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"Изаберите подразумевани налог за нове контакте:"</string>
     <string name="contact_editor_title_new_contact" msgid="7534775011591770343">"Нови контакт"</string>
@@ -297,13 +297,13 @@
     <string name="status_busy" msgid="2759339190187696727">"Заузет/а"</string>
     <string name="local_invisible_directory" msgid="5936234374879813300">"Друго"</string>
     <string name="directory_search_label" msgid="2602118204885565153">"Каталог"</string>
-    <string name="directory_search_label_work" msgid="2392128956332931231">"Пословни каталог"</string>
+    <string name="directory_search_label_work" msgid="2392128956332931231">"Каталог за Work"</string>
     <string name="local_search_label" msgid="6692495405531144805">"Сви контакти"</string>
     <string name="description_quick_contact_for" msgid="6364906818231956042">"Брзи контакт за корисника <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="missing_name" msgid="7970183292521946492">"(Без имена)"</string>
     <string name="favoritesFrequentContacted" msgid="2885862854079966676">"Често контактирани"</string>
     <string name="list_filter_phones" msgid="6839133198968393843">"Сви контакти са бројевима телефона"</string>
-    <string name="list_filter_phones_work" msgid="5583425697781385616">"Контакти са пословног профила"</string>
+    <string name="list_filter_phones_work" msgid="5583425697781385616">"Контакти са профила за Work"</string>
     <string name="view_updates_from_group" msgid="6233444629074835594">"Прикажи ажурирања"</string>
     <string name="account_phone" msgid="8044426231251817556">"Уређај"</string>
     <string name="account_sim" msgid="3200457113308694663">"SIM"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b6ff4ea..35014bc 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -92,7 +92,7 @@
     <string name="multipleContactDeleteConfirmation" msgid="2970218685653877287">"Kufuta anwani hii kutafuta maelezo kwenye akaunti nyingi."</string>
     <string name="deleteConfirmation" msgid="3727809366015979585">"Je, ungependa kufuta anwani hii?"</string>
     <string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"Futa"</string>
-    <string name="invalidContactMessage" msgid="6204402264821083362">"Anwani haipo."</string>
+    <string name="invalidContactMessage" msgid="6204402264821083362">"Mwasiliani hayupo."</string>
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"Anwani imeongezwa kwenye Skrini ya kwanza."</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> imeongezwa kwenye Skrini ya kwanza."</string>
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"Hakuna picha inayopatikana kwenye kifaa."</string>
@@ -412,7 +412,7 @@
     <string name="composer_has_no_exportable_contact" msgid="473911071832548562">"Hakuna anwani zinazoweza kuhamishwa."</string>
     <string name="composer_not_initialized" msgid="3861391548605450184">"Kitunzi cha vCard hakikuanza vizuri."</string>
     <string name="exporting_contact_failed_title" msgid="9003659313161289860">"Imeshindwa kuhamisha"</string>
-    <string name="exporting_contact_failed_message" msgid="9198720310560773485">"Data ya anwani halikuhamishwa.\nSababu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
+    <string name="exporting_contact_failed_message" msgid="9198720310560773485">"Data ya mwasiliani haikuhamishwa.\nSababu: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
     <string name="importing_vcard_description" msgid="6982207216746936735">"Inaingiza <xliff:g id="NAME">%s</xliff:g>"</string>
     <string name="reading_vcard_failed_title" msgid="1230432142768184978">"Haikuweza kusoma data ya vKadi"</string>
     <string name="importing_vcard_finished_title" msgid="2274644947000264322">"Imemaliza kuleta vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
@@ -448,7 +448,7 @@
     <string name="share_contacts_failure" msgid="1348777470180064086">"Imeshindwa kushiriki anwani."</string>
     <string name="dialog_export" msgid="3497435010655060068">"Hamisha anwani"</string>
     <string name="dialog_import" msgid="4590232235052756593">"Leta anwani kutoka kwenye"</string>
-    <string name="share_error" msgid="4854612167186185739">"Anwani hii haiwezi kushirikiwa."</string>
+    <string name="share_error" msgid="4854612167186185739">"Mwasiliani huyu hawezi kushirikishwa."</string>
     <string name="no_contact_to_share" msgid="6285287228557175749">"Hakuna anwani za kushiriki."</string>
     <string name="menu_contacts_filter" msgid="5854584270038139275">"Anwani za kuonyesha"</string>
     <string name="activity_title_contacts_filter" msgid="6340531582631006680">"Anwani za kuonyesha"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 52259b3..39a7dcb 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -353,7 +353,7 @@
     <string name="chat_gtalk" msgid="2927882858741904064">"Google Talkని ఉపయోగించి చాట్ చేయండి"</string>
     <string name="chat_icq" msgid="4289041376069626281">"ICQని ఉపయోగించి చాట్ చేయండి"</string>
     <string name="chat_jabber" msgid="1097960594943864847">"Jabberని ఉపయోగించి చాట్ చేయండి"</string>
-    <string name="chat" msgid="8390862712584830532">"Chat"</string>
+    <string name="chat" msgid="8390862712584830532">"చాట్ చేయండి"</string>
     <string name="description_minus_button" msgid="1305985971158054217">"తొలగించు"</string>
     <string name="expand_name_fields_description" msgid="6059558159338959487">"మరిన్ని పేరు ఫీల్డ్‌లను చూపుతుంది"</string>
     <string name="collapse_name_fields_description" msgid="7950435675716414477">"పేరు ఫీల్డ్‌లను కుదిస్తుంది"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 48c3982..8d276e4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -98,7 +98,7 @@
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"ไม่มีรูปภาพให้ใช้งานบนอุปกรณ์"</string>
     <string name="attach_photo_dialog_title" msgid="7948754072673745235">"ภาพของรายชื่อติดต่อ"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"ชื่อป้ายที่กำหนดเอง"</string>
-    <string name="removePhoto" msgid="1190099414600730001">"นำรูปภาพออก"</string>
+    <string name="removePhoto" msgid="1190099414600730001">"นำภาพออก"</string>
     <string name="noContacts" msgid="3030512741779213810">"รายชื่อติดต่อของคุณว่างเปล่า"</string>
     <string name="emptyGroup" msgid="8598261660865081152">"ไม่มีรายชื่อติดต่อที่มีป้ายกำกับนี้"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"ไม่มีรายชื่อติดต่อในบัญชีนี้"</string>
@@ -134,7 +134,7 @@
     <string name="quickcontact_add_email" msgid="1442894568471116797">"เพิ่มอีเมล"</string>
     <string name="missing_app" msgid="5674389915738964148">"ไม่พบแอปสำหรับการทำงานนี้"</string>
     <string name="menu_share" msgid="6343022811796001773">"แชร์"</string>
-    <string name="menu_add_contact" msgid="5822356185421997656">"เพิ่มในรายชื่อติดต่อ"</string>
+    <string name="menu_add_contact" msgid="5822356185421997656">"เพิ่มในสมุดติดต่อ"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"เพิ่ม"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
       <item quantity="other">แชร์ผู้ติดต่อผ่านทาง</item>
@@ -150,7 +150,7 @@
     <string name="account_type_format" msgid="4926968760755013450">"รายชื่อในสมุดโทรศัพท์จาก <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="google_account_type_format" msgid="4046692740262396811">"บัญชี <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="take_photo" msgid="820071555236547516">"ถ่ายภาพ"</string>
-    <string name="take_new_photo" msgid="4383091978116875778">"ถ่ายรูปภาพใหม่"</string>
+    <string name="take_new_photo" msgid="4383091978116875778">"ถ่ายภาพใหม่"</string>
     <string name="pick_photo" msgid="2050859661654812588">"เลือกรูปภาพ"</string>
     <string name="pick_new_photo" msgid="4218112182908240970">"เลือกรูปภาพใหม่"</string>
     <string name="search_results_searching" msgid="1373859095361975648">"กำลังค้นหา..."</string>
@@ -458,7 +458,7 @@
     <string name="contactsFavoritesLabel" msgid="8339645684721732714">"รายการโปรด"</string>
     <string name="menu_import" msgid="2206768098740726906">"นำเข้า"</string>
     <string name="menu_export" msgid="1217402092617629429">"ส่งออก"</string>
-    <string name="menu_blocked_numbers" msgid="7064680515202657609">"หมายเลขที่บล็อก"</string>
+    <string name="menu_blocked_numbers" msgid="7064680515202657609">"หมายเลขที่ถูกบล็อก"</string>
     <string name="contact_status_update_attribution" msgid="5051874518046969847">"ผ่านทาง <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="DATE">%1$s</xliff:g> ผ่านทาง <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
     <string name="action_menu_back_from_search" msgid="683765774264585732">"หยุดการค้นหา"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 02cd79d..fa043fd 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -163,13 +163,13 @@
     <string name="contact_directory_description" msgid="1773630547110881835">"Direktoriya <xliff:g id="TYPE">%1$s</xliff:g>"</string>
     <string name="activity_title_settings" msgid="4004290638426915162">"Sozlamalar"</string>
     <string name="menu_settings" msgid="3524924670246877187">"Sozlamalar"</string>
-    <string name="menu_help" msgid="287801702920372292">"Yordam/fikr-mulohaza"</string>
+    <string name="menu_help" msgid="287801702920372292">"Yordam va fikr-mulohaza"</string>
     <string name="organization_company_and_title" msgid="7197631449041284518">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
     <string name="non_phone_caption" msgid="7343449684187013327">"Telefon raqami"</string>
     <string name="non_phone_add_to_contacts" msgid="5472784294274676663">"Kontaktlarga saqlash"</string>
     <string name="non_phone_close" msgid="2792373584950696532">"Yopish"</string>
     <string name="date_year_toggle" msgid="8930759990426623823">"yili bilan birga"</string>
-    <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"Hisob kiritish"</string>
+    <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"Hisob qo‘shish"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"Import qilish"</string>
     <string name="create_group_item_label" msgid="921929508079162463">"Yangi yorliq yaratish…"</string>
     <string name="delete_group_dialog_message" msgid="754082019928025404">"“<xliff:g id="GROUP_LABEL">%1$s</xliff:g>” yorlig‘i o‘chirib tashlansinmi? Kontaktlar o‘chib ketmaydi."</string>
@@ -196,7 +196,7 @@
     <string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"Bog‘langan kontaktlar"</string>
     <string name="contact_editor_add_linked_contact" msgid="2895453741206196138">"Qo‘shish"</string>
     <string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"Ajratish"</string>
-    <string name="add_account" msgid="3071396624500839020">"Hisob kiritish"</string>
+    <string name="add_account" msgid="3071396624500839020">"Hisob qo‘shish"</string>
     <string name="add_new_account" msgid="573368229646104110">"Yangi hisob qo‘shish"</string>
     <string name="menu_export_database" msgid="1658249125751926885">"Ma’lumotlar bazasi fayllarini eksport qilish"</string>
     <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Yangi kontakt yaratish"</string>
@@ -310,10 +310,10 @@
     <string name="name_prefix" msgid="8857117624713905211">"Murojaat shakli"</string>
     <string name="name_middle" msgid="7330498948136181042">"Otasining ismi"</string>
     <string name="name_suffix" msgid="4502958221763936999">"Martabasi/unvoni"</string>
-    <string name="name_phonetic" msgid="4746541275769990740">"Ism transkripsiyasi"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"Ism transkripsiyasi"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"Otasining ismi transkripsiyasi"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"Familiya transkripsiyasi"</string>
+    <string name="name_phonetic" msgid="4746541275769990740">"Ism talaffuzi"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"Ism talaffuzi"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"Otasining ismi talaffuzi"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"Familiya talaffuzi"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"Telefon"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"Email"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"Manzil"</string>
@@ -430,7 +430,7 @@
     <string name="progress_notifier_message" msgid="8522060892889599746">"Import qilinmoqda: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> – <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"VCF faylga eksport qilish"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Saralash"</string>
-    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Ism transkripsiyasi"</string>
+    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Ism talaffuzi"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Har doim ko‘rsatish"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Bo‘sh maydonni berkitish"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Ismi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5394ead..a1ef3d8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="applicationLabel" msgid="8908212014470937609">"Danh bạ"</string>
     <string name="contactsList" msgid="4456188358262700898">"Danh bạ"</string>
-    <string name="shortcut_add_contact" msgid="7949342235528657981">"Thêm người liên hệ"</string>
+    <string name="shortcut_add_contact" msgid="7949342235528657981">"Thêm liên hệ"</string>
     <string name="shortcutContact" msgid="8009736387364461511">"Liên hệ"</string>
     <string name="shortcutDialContact" msgid="155367248069127153">"Quay số trực tiếp"</string>
     <string name="shortcutMessageContact" msgid="9123517151981679277">"Tin nhắn trực tiếp"</string>
@@ -40,9 +40,9 @@
     <string name="menu_editGroup" msgid="8706562583754054622">"Xóa liên hệ"</string>
     <string name="menu_renameGroup" msgid="2685886609399776475">"Đổi tên nhãn"</string>
     <string name="menu_deleteGroup" msgid="1180215594530228294">"Xóa nhãn"</string>
-    <string name="menu_addToGroup" msgid="5034813446697655310">"Thêm người liên hệ"</string>
+    <string name="menu_addToGroup" msgid="5034813446697655310">"Thêm liên hệ"</string>
     <string name="menu_selectForGroup" msgid="6386553337569514850">"Chọn liên hệ"</string>
-    <string name="menu_addContactsToGroup" msgid="4549318978482280577">"Thêm người liên hệ"</string>
+    <string name="menu_addContactsToGroup" msgid="4549318978482280577">"Thêm liên hệ"</string>
     <string name="menu_removeFromGroup" msgid="8753799091967887958">"Xóa khỏi nhãn"</string>
     <string name="menu_new_group_action_bar" msgid="1670312283925872483">"Tạo nhãn"</string>
     <string name="splitConfirmation" msgid="4750158900636307469">"Bạn muốn hủy liên kết liên hệ này thành nhiều liên hệ?"</string>
@@ -241,7 +241,7 @@
     <string name="hamburger_feature_highlight_body" msgid="782935036630531528">"Giữ cho danh bạ của bạn luôn được sắp xếp và hữu ích"</string>
     <string name="undo" msgid="2446931036220975026">"Hoàn tác"</string>
     <string name="call_custom" msgid="2844900154492073207">"Gọi <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
-    <string name="call_home" msgid="2443904771140750492">"Gọi về nhà"</string>
+    <string name="call_home" msgid="2443904771140750492">"Gọi số điện thoại nhà riêng"</string>
     <string name="call_mobile" msgid="6504312789160309832">"Gọi số điện thoại di động"</string>
     <string name="call_work" msgid="2414313348547560346">"Gọi số điện thoại cơ quan"</string>
     <string name="call_fax_work" msgid="5026843006300760797">"Gọi số fax cơ quan"</string>
@@ -284,7 +284,7 @@
     <string name="sms_assistant" msgid="245045451580096547">"Nhắn tin <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
     <string name="sms_mms" msgid="7395133080765833725">"Nhắn tin tới số điện thoại MMS"</string>
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Tin nhắn)"</string>
-    <string name="description_video_call" msgid="4956825008907720371">"Gọi video"</string>
+    <string name="description_video_call" msgid="4956825008907720371">"Gọi điện video"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Xóa danh sách liên hệ thường xuyên?"</string>
     <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"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>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"Đang xóa DS liên hệ thường xuyên…"</string>
@@ -479,7 +479,7 @@
     <string name="url_open_error_toast" msgid="4885855620824048385">"Không mở được url."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"Đã kiểm tra <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"Chưa kiểm tra <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
-    <string name="description_search_video_call" msgid="1768558141309418755">"Gọi video"</string>
+    <string name="description_search_video_call" msgid="1768558141309418755">"Gọi điện video"</string>
     <string name="description_delete_contact" msgid="8110643050235441400">"Xóa"</string>
     <string name="description_no_name_header" msgid="8596201864512339003">"Dấu ba chấm"</string>
     <string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"Phím tắt này đã bị vô hiệu hóa"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cbc7e81..6702431 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -98,7 +98,7 @@
     <string name="photoPickerNotFoundText" msgid="6535222297923110991">"设备上没有可用的照片。"</string>
     <string name="attach_photo_dialog_title" msgid="7948754072673745235">"联系人照片"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"自定义标签名称"</string>
-    <string name="removePhoto" msgid="1190099414600730001">"移除照片"</string>
+    <string name="removePhoto" msgid="1190099414600730001">"删除照片"</string>
     <string name="noContacts" msgid="3030512741779213810">"联系人列表是空的"</string>
     <string name="emptyGroup" msgid="8598261660865081152">"此标签下没有联系人"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"此帐号中没有联系人"</string>
@@ -317,7 +317,7 @@
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"电话"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"电子邮件"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"地址"</string>
-    <string name="imLabelsGroup" msgid="2113398976789806432">"即时通讯"</string>
+    <string name="imLabelsGroup" msgid="2113398976789806432">"即时聊天工具"</string>
     <string name="organizationLabelsGroup" msgid="2342482097897299099">"组织"</string>
     <string name="relationLabelsGroup" msgid="8931615792208307291">"关系"</string>
     <string name="eventLabelsGroup" msgid="8625868552164376823">"特别的日子"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index cb34b4e..991b3fd 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -103,7 +103,7 @@
     <string name="emptyGroup" msgid="8598261660865081152">"沒有任何聯絡人有此標籤"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"此帳戶中沒有聯絡人"</string>
     <string name="emptyMainList" msgid="3266182207039677163">"您的聯絡人名單是空白的"</string>
-    <string name="contactSavedNamedToast" msgid="3067050290584834386">"已儲存<xliff:g id="DISPLAY_NAME">%s</xliff:g>"</string>
+    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g>已儲存"</string>
     <string name="contactSavedToast" msgid="4370392215196995301">"聯絡人記錄已儲存"</string>
     <string name="contactUnlinkedToast" msgid="6791720274141804377">"已解除連結聯絡人"</string>
     <string name="contactSavedErrorToast" msgid="3213619905154956918">"無法儲存聯絡人變更"</string>
@@ -134,7 +134,7 @@
     <string name="quickcontact_add_email" msgid="1442894568471116797">"新增電郵"</string>
     <string name="missing_app" msgid="5674389915738964148">"找不到可以處理這個操作的應用程式。"</string>
     <string name="menu_share" msgid="6343022811796001773">"分享"</string>
-    <string name="menu_add_contact" msgid="5822356185421997656">"加到通訊錄"</string>
+    <string name="menu_add_contact" msgid="5822356185421997656">"加入通訊錄"</string>
     <string name="menu_add_contacts" msgid="7114262784903366463">"新增"</string>
     <plurals name="title_share_via" formatted="false" msgid="3868648642107664607">
       <item quantity="other">使用下列應用程式分享聯絡人資訊：</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e22d44c..605236d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -241,7 +241,7 @@
     <string name="hamburger_feature_highlight_body" msgid="782935036630531528">"讓你的聯絡人資料井然有序又實用"</string>
     <string name="undo" msgid="2446931036220975026">"復原"</string>
     <string name="call_custom" msgid="2844900154492073207">"撥打<xliff:g id="CUSTOM_LABEL">%s</xliff:g>電話號碼"</string>
-    <string name="call_home" msgid="2443904771140750492">"撥打住家電話"</string>
+    <string name="call_home" msgid="2443904771140750492">"去電住家電話"</string>
     <string name="call_mobile" msgid="6504312789160309832">"去電行動裝置"</string>
     <string name="call_work" msgid="2414313348547560346">"去電公司電話"</string>
     <string name="call_fax_work" msgid="5026843006300760797">"去電公司傳真"</string>
@@ -312,7 +312,7 @@
     <string name="name_suffix" msgid="4502958221763936999">"姓名後稱謂"</string>
     <string name="name_phonetic" msgid="4746541275769990740">"姓名拼音"</string>
     <string name="name_phonetic_given" msgid="425534279190047812">"名字拼音"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"中間名拼音"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"中間名 (拼音)"</string>
     <string name="name_phonetic_family" msgid="1690852801039809448">"姓氏拼音"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"電話"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"電子郵件"</string>
@@ -432,7 +432,7 @@
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"排序依據"</string>
     <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"姓名拼音"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"一律顯示"</string>
-    <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"欄位留空時隱藏"</string>
+    <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"留空時隱藏"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"名字"</string>
     <string name="display_options_sort_by_family_name" msgid="1282763552330910876">"姓氏"</string>
     <string name="display_options_view_names_as" msgid="4060686468465916565">"姓名格式"</string>
diff --git a/src/com/android/contacts/CallUtil.java b/src/com/android/contacts/CallUtil.java
index bba1faa..0f09df9 100644
--- a/src/com/android/contacts/CallUtil.java
+++ b/src/com/android/contacts/CallUtil.java
@@ -109,7 +109,7 @@
 
     /**
      * Return an Intent for making a phone call. A given Uri will be used as is (without any
-     * sanity check).
+     * quick check).
      */
     public static Intent getCallIntent(Uri uri) {
         return new Intent(Intent.ACTION_CALL, uri);
diff --git a/src/com/android/contacts/ContactPhotoManager.java b/src/com/android/contacts/ContactPhotoManager.java
index e5f808d..1468ed7 100644
--- a/src/com/android/contacts/ContactPhotoManager.java
+++ b/src/com/android/contacts/ContactPhotoManager.java
@@ -602,8 +602,8 @@
     private static final String[] COLUMNS = new String[] { Photo._ID, Photo.PHOTO };
 
     /**
-     * Dummy object used to indicate that a bitmap for a given key could not be stored in the
-     * cache.
+     * Placeholder object used to indicate that a bitmap for a given key could not
+     * be stored in the cache.
      */
     private static final BitmapHolder BITMAP_UNAVAILABLE;
 
diff --git a/src/com/android/contacts/SimImportFragment.java b/src/com/android/contacts/SimImportFragment.java
index cee1b1a..1d16df0 100644
--- a/src/com/android/contacts/SimImportFragment.java
+++ b/src/com/android/contacts/SimImportFragment.java
@@ -18,7 +18,6 @@
 import android.app.Activity;
 import android.app.Fragment;
 import android.app.LoaderManager;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.IntentFilter;
 import android.content.Loader;
@@ -26,7 +25,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.android.material.snackbar.Snackbar;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import androidx.collection.ArrayMap;
 import androidx.core.view.ViewCompat;
 import androidx.core.widget.ContentLoadingProgressBar;
@@ -372,7 +371,7 @@
             if (position < 0 || position >= getCount()) {
                 return View.NO_ID;
             }
-            return getItem(position).getId();
+            return getItem(position).getRecordNumber();
         }
 
         @Override
diff --git a/src/com/android/contacts/database/SimContactDaoImpl.java b/src/com/android/contacts/database/SimContactDaoImpl.java
index 5ba6bd5..54106f0 100644
--- a/src/com/android/contacts/database/SimContactDaoImpl.java
+++ b/src/com/android/contacts/database/SimContactDaoImpl.java
@@ -26,20 +26,20 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.RemoteException;
-import android.provider.BaseColumns;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
-import androidx.annotation.VisibleForTesting;
-import androidx.collection.ArrayMap;
+import android.provider.SimPhonebookContract;
+import android.provider.SimPhonebookContract.SimRecords;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
-import android.text.TextUtils;
 import android.util.SparseArray;
 
+import androidx.collection.ArrayMap;
+
 import com.android.contacts.R;
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.model.SimCard;
@@ -47,6 +47,7 @@
 import com.android.contacts.model.account.AccountWithDataSet;
 import com.android.contacts.util.PermissionsUtil;
 import com.android.contacts.util.SharedPreferenceUtil;
+
 import com.google.common.base.Joiner;
 
 import java.util.ArrayList;
@@ -75,14 +76,6 @@
     // query parameter limit.
     static final int QUERY_MAX_BATCH_SIZE = 100;
 
-    @VisibleForTesting
-    public static final Uri ICC_CONTENT_URI = Uri.parse("content://icc/adn");
-
-    public static String _ID = BaseColumns._ID;
-    public static String NAME = "name";
-    public static String NUMBER = "number";
-    public static String EMAILS = "emails";
-
     private final Context mContext;
     private final ContentResolver mResolver;
     private final TelephonyManager mTelephonyManager;
@@ -128,18 +121,14 @@
         if (sim.hasValidSubscriptionId()) {
             return loadSimContacts(sim.getSubscriptionId());
         }
-        return loadSimContacts();
+        // Return an empty list.
+        return new ArrayList<>(0);
     }
 
     public ArrayList<SimContact> loadSimContacts(int subscriptionId) {
-        return loadFrom(ICC_CONTENT_URI.buildUpon()
-                .appendPath("subId")
-                .appendPath(String.valueOf(subscriptionId))
-                .build());
-    }
-
-    public ArrayList<SimContact> loadSimContacts() {
-        return loadFrom(ICC_CONTENT_URI);
+        return loadFrom(
+                SimRecords.getContentUri(
+                        subscriptionId, SimPhonebookContract.ElementaryFiles.EF_ADN));
     }
 
     @Override
@@ -273,7 +262,12 @@
     private static final Object SIM_READ_LOCK = new Object();
     private ArrayList<SimContact> loadFrom(Uri uri) {
         synchronized (SIM_READ_LOCK) {
-            final Cursor cursor = mResolver.query(uri, null, null, null, null);
+            final Cursor cursor = mResolver.query(uri,
+                    new String[]{
+                            SimRecords.RECORD_NUMBER,
+                            SimRecords.NAME,
+                            SimRecords.PHONE_NUMBER
+                    }, null, null);
             if (cursor == null) {
                 // Assume null means there are no SIM contacts.
                 return new ArrayList<>(0);
@@ -288,22 +282,20 @@
     }
 
     private ArrayList<SimContact> loadFromCursor(Cursor cursor) {
-        final int colId = cursor.getColumnIndex(_ID);
-        final int colName = cursor.getColumnIndex(NAME);
-        final int colNumber = cursor.getColumnIndex(NUMBER);
-        final int colEmails = cursor.getColumnIndex(EMAILS);
+        final int colRecordNumber = cursor.getColumnIndex(SimRecords.RECORD_NUMBER);
+        final int colName = cursor.getColumnIndex(SimRecords.NAME);
+        final int colNumber = cursor.getColumnIndex(SimRecords.PHONE_NUMBER);
 
         final ArrayList<SimContact> result = new ArrayList<>();
 
         while (cursor.moveToNext()) {
-            final long id = cursor.getLong(colId);
+            final int recordNumber = cursor.getInt(colRecordNumber);
             final String name = cursor.getString(colName);
             final String number = cursor.getString(colNumber);
-            final String emails = cursor.getString(colEmails);
 
-            final SimContact contact = new SimContact(id, name, number, parseEmails(emails));
+            final SimContact contact = new SimContact(recordNumber, name, number, null);
             // Only include contact if it has some useful data
-            if (contact.hasName() || contact.hasPhone() || contact.hasEmails()) {
+            if (contact.hasName() || contact.hasPhone()) {
                 result.add(contact);
             }
         }
@@ -392,10 +384,6 @@
         return ops;
     }
 
-    private String[] parseEmails(String emails) {
-        return !TextUtils.isEmpty(emails) ? emails.split(",") : null;
-    }
-
     private boolean hasTelephony() {
         return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
     }
diff --git a/src/com/android/contacts/model/SimCard.java b/src/com/android/contacts/model/SimCard.java
index ea74379..969d96d 100644
--- a/src/com/android/contacts/model/SimCard.java
+++ b/src/com/android/contacts/model/SimCard.java
@@ -19,6 +19,7 @@
 import androidx.annotation.RequiresApi;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
@@ -78,11 +79,6 @@
         mCountryCode = countryCode != null ? countryCode.toUpperCase(Locale.US) : null;
     }
 
-    public SimCard(String simId, CharSequence carrierName,
-            CharSequence displayName, String phoneNumber, String countryCode) {
-        this(simId, NO_SUBSCRIPTION_ID, carrierName, displayName, phoneNumber, countryCode);
-    }
-
     public String getSimId() {
         return mSimId;
     }
@@ -245,12 +241,14 @@
 
     public static SimCard create(TelephonyManager telephony, String displayLabel) {
         if (telephony.getSimState() == TelephonyManager.SIM_STATE_READY) {
-            return new SimCard(telephony.getSimSerialNumber(),
+            return new SimCard(telephony.getSimSerialNumber(), telephony.getSubscriptionId(),
                     telephony.getSimOperatorName(), displayLabel, telephony.getLine1Number(),
                     telephony.getSimCountryIso());
         } else {
             // This should never happen but in case it does just fallback to an "empty" instance
-            return new SimCard(/* SIM id */ "", /* operator name */ null, displayLabel,
+            return new SimCard(/* SIM id */ "",
+                    /* subscriptionId */ SubscriptionManager.INVALID_SUBSCRIPTION_ID,
+                    /* operator name */ null, displayLabel,
                     /* phone number */ "", /* Country code */ null);
         }
     }
diff --git a/src/com/android/contacts/model/SimContact.java b/src/com/android/contacts/model/SimContact.java
index 7babe27..820e346 100644
--- a/src/com/android/contacts/model/SimContact.java
+++ b/src/com/android/contacts/model/SimContact.java
@@ -43,28 +43,28 @@
  * Holds data for contacts loaded from the SIM card.
  */
 public class SimContact implements Parcelable {
-    private final long mId;
+    private final int mRecordNumber;
     private final String mName;
     private final String mPhone;
     private final String[] mEmails;
 
-    public SimContact(long id, String name, String phone) {
-        this(id, name, phone, null);
+    public SimContact(int recordNumber, String name, String phone) {
+        this(recordNumber, name, phone, null);
     }
 
-    public SimContact(long id, String name, String phone, String[] emails) {
-        mId = id;
+    public SimContact(int recordNumber, String name, String phone, String[] emails) {
+        mRecordNumber = recordNumber;
         mName = name;
         mPhone = phone == null ? "" : phone.trim();
         mEmails = emails;
     }
 
     public SimContact(SimContact other) {
-        this(other.mId, other.mName, other.mPhone, other.mEmails);
+        this(other.mRecordNumber, other.mName, other.mPhone, other.mEmails);
     }
 
-    public long getId() {
-        return mId;
+    public int getRecordNumber() {
+        return mRecordNumber;
     }
 
     public String getName() {
@@ -117,7 +117,7 @@
     }
 
     public void appendAsContactRow(MatrixCursor cursor) {
-        cursor.newRow().add(ContactsContract.Contacts._ID, mId)
+        cursor.newRow().add(ContactsContract.Contacts._ID, mRecordNumber)
                 .add(ContactsContract.Contacts.DISPLAY_NAME_PRIMARY, mName)
                 .add(ContactsContract.Contacts.LOOKUP_KEY, getLookupKey());
     }
@@ -152,7 +152,7 @@
     @Override
     public String toString() {
         return "SimContact{" +
-                "mId=" + mId +
+                "mId=" + mRecordNumber +
                 ", mName='" + mName + '\'' +
                 ", mPhone='" + mPhone + '\'' +
                 ", mEmails=" + Arrays.toString(mEmails) +
@@ -166,13 +166,13 @@
 
         final SimContact that = (SimContact) o;
 
-        return mId == that.mId && Objects.equals(mName, that.mName) &&
+        return mRecordNumber == that.mRecordNumber && Objects.equals(mName, that.mName) &&
                 Objects.equals(mPhone, that.mPhone) && Arrays.equals(mEmails, that.mEmails);
     }
 
     @Override
     public int hashCode() {
-        int result = (int) (mId ^ (mId >>> 32));
+        int result = (int) (mRecordNumber ^ (mRecordNumber >>> 32));
         result = 31 * result + (mName != null ? mName.hashCode() : 0);
         result = 31 * result + (mPhone != null ? mPhone.hashCode() : 0);
         result = 31 * result + Arrays.hashCode(mEmails);
@@ -186,7 +186,7 @@
 
     @Override
     public void writeToParcel(Parcel dest, int flags) {
-        dest.writeLong(mId);
+        dest.writeInt(mRecordNumber);
         dest.writeString(mName);
         dest.writeString(mPhone);
         dest.writeStringArray(mEmails);
@@ -195,11 +195,11 @@
     public static final Creator<SimContact> CREATOR = new Creator<SimContact>() {
         @Override
         public SimContact createFromParcel(Parcel source) {
-            final long id = source.readLong();
+            final int recordNumber = source.readInt();
             final String name = source.readString();
             final String phone = source.readString();
             final String[] emails = source.createStringArray();
-            return new SimContact(id, name, phone, emails);
+            return new SimContact(recordNumber, name, phone, emails);
         }
 
         @Override
@@ -253,7 +253,7 @@
             @Override
             public int compare(SimContact lhs, SimContact rhs) {
                 // We assume ids are unique.
-                return Long.compare(lhs.mId, rhs.mId);
+                return Long.compare(lhs.mRecordNumber, rhs.mRecordNumber);
             }
         };
     }
diff --git a/src/com/android/contacts/preference/ContactsPreferences.java b/src/com/android/contacts/preference/ContactsPreferences.java
index 85da891..e478b9b 100644
--- a/src/com/android/contacts/preference/ContactsPreferences.java
+++ b/src/com/android/contacts/preference/ContactsPreferences.java
@@ -246,7 +246,7 @@
      *         true if the contact editor should show the "accounts changed" notification, that is:
      *              - If it's the first launch.
      *              - Or, if the default account has been removed.
-     *              (And some extra sanity check)
+     *              (And some extra soundness check)
      *
      * Note if this method returns {@code false}, the caller can safely assume that
      * {@link #getDefaultAccount} will return a valid account.  (Either an account which still
diff --git a/src/com/android/contacts/util/StopWatch.java b/src/com/android/contacts/util/StopWatch.java
index 4300eff..1797d2a 100644
--- a/src/com/android/contacts/util/StopWatch.java
+++ b/src/com/android/contacts/util/StopWatch.java
@@ -84,7 +84,7 @@
     }
 
     /**
-     * Return a dummy instance that does no operations.
+     * Return a no-op StopWatch instance that does no operations.
      */
     public static StopWatch getNullStopWatch() {
         return NullStopWatch.INSTANCE;
diff --git a/tests/Android.bp b/tests/Android.bp
index 2e1d47b..10ebbc9 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -1,3 +1,13 @@
+package {
+    // See: http://go/android-license-faq
+    // A large-scale-change added 'default_applicable_licenses' to import
+    // all of the 'license_kinds' from "packages_apps_Contacts_license"
+    // to get the below license kinds:
+    //   SPDX-license-identifier-Apache-2.0
+    //   SPDX-license-identifier-CC-BY
+    default_applicable_licenses: ["packages_apps_Contacts_license"],
+}
+
 android_test {
     name: "ContactsTests",
 
@@ -12,6 +22,8 @@
 
     static_libs: [
         "androidx.test.rules",
+        "androidx.test.runner",
+        "androidx.test.ext.junit",
         "hamcrest-library",
         "mockito-target-minus-junit4",
         "ub-uiautomator",
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index f61efda..f22f92c 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -40,7 +40,8 @@
         <uses-library android:name="android.test.runner" />
         <meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" />
 
-        <activity android:name=".allintents.AllIntentsActivity">
+        <activity android:name=".allintents.AllIntentsActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -48,7 +49,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".allintents.ResultActivity">
+        <activity android:name=".allintents.ResultActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/tests/src/com/android/contacts/activities/SimImportActivityTest.java b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
index 7069ef1..250ce4b 100644
--- a/tests/src/com/android/contacts/activities/SimImportActivityTest.java
+++ b/tests/src/com/android/contacts/activities/SimImportActivityTest.java
@@ -40,6 +40,8 @@
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.Data;
+import android.provider.SimPhonebookContract;
+import android.provider.SimPhonebookContract.SimRecords;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.Until;
@@ -48,9 +50,9 @@
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
-import androidx.test.runner.AndroidJUnit4;
 
 import com.android.contacts.SimImportService;
 import com.android.contacts.database.SimContactDao;
@@ -224,10 +226,10 @@
         final AccountWithDataSet targetAccount = mAccountHelper.addTestAccount(
                 mAccountHelper.generateAccountName("SimImportActivity0_targetAccount_"));
 
-        final MockContentProvider iccProvider = new MockContentProvider();
-        iccProvider.expect(MockContentProvider.Query.forAnyUri())
-                .withDefaultProjection(new String[] {SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
-                        SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS })
+        final MockContentProvider simPhonebookProvider = new MockContentProvider();
+        simPhonebookProvider.expect(MockContentProvider.Query.forAnyUri())
+                .withProjection(
+                        SimRecords.RECORD_NUMBER, SimRecords.NAME, SimRecords.PHONE_NUMBER)
                 .anyNumberOfTimes()
                 .returnRow(toCursorRow(new SimContact(1, "Import One", "5550101")))
                 .returnRow(toCursorRow(new SimContact(2, "Skip Two", "5550102")))
@@ -236,7 +238,7 @@
                 .returnRow(toCursorRow(new SimContact(5, "Skip Five", "5550105")))
                 .returnRow(toCursorRow(new SimContact(6, "Import Six", "5550106")));
         final MockContentResolver mockResolver = new MockContentResolver();
-        mockResolver.addProvider("icc", iccProvider);
+        mockResolver.addProvider(SimPhonebookContract.AUTHORITY, simPhonebookProvider);
         final ContentProviderClient contactsProviderClient = mContext.getContentResolver()
                 .acquireContentProviderClient(ContactsContract.AUTHORITY);
         mockResolver.addProvider(ContactsContract.AUTHORITY, new ForwardingContentProvider(
@@ -258,6 +260,7 @@
 
         mActivity = mInstrumentation.startActivitySync(
                 new Intent(mContext, SimImportActivity.class)
+                        .putExtra(SimImportActivity.EXTRA_SUBSCRIPTION_ID, 1)
                         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
 
         assertTrue(mDevice.wait(Until.hasObject(By.desc("Show more")), TIMEOUT));
@@ -319,6 +322,7 @@
 
         mActivity = mInstrumentation.startActivitySync(
                 new Intent(mContext, SimImportActivity.class)
+                        .putExtra(SimImportActivity.EXTRA_SUBSCRIPTION_ID, 1)
                         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
 
         assertTrue(mDevice.wait(Until.hasObject(By.text("Import One")), TIMEOUT));
@@ -351,7 +355,7 @@
     }
 
     private Object[] toCursorRow(SimContact contact) {
-        return new Object[] { contact.getId(), contact.getName(), contact.getPhone(), null };
+        return new Object[]{contact.getRecordNumber(), contact.getName(), contact.getPhone()};
     }
 
     private SimCard someSimCard() {
diff --git a/tests/src/com/android/contacts/database/SimContactDaoTests.java b/tests/src/com/android/contacts/database/SimContactDaoTests.java
index 0b5b37f..680ba10 100644
--- a/tests/src/com/android/contacts/database/SimContactDaoTests.java
+++ b/tests/src/com/android/contacts/database/SimContactDaoTests.java
@@ -45,16 +45,18 @@
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.Data;
+import android.provider.SimPhonebookContract;
+import android.provider.SimPhonebookContract.SimRecords;
 import android.test.mock.MockContentResolver;
 import android.test.mock.MockContext;
 
 import androidx.annotation.RequiresApi;
 import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import androidx.test.filters.Suppress;
-import androidx.test.runner.AndroidJUnit4;
 
 import com.android.contacts.model.SimCard;
 import com.android.contacts.model.SimContact;
@@ -578,92 +580,78 @@
     @RunWith(AndroidJUnit4.class)
     public static class LoadContactsUnitTests {
 
-        private MockContentProvider mMockIccProvider;
+        private MockContentProvider mMockSimPhonebookProvider;
         private Context mContext;
 
         @Before
         public void setUp() {
             mContext = mock(MockContext.class);
             final MockContentResolver mockResolver = new MockContentResolver();
-            mMockIccProvider = new MockContentProvider();
-            mockResolver.addProvider("icc", mMockIccProvider);
+            mMockSimPhonebookProvider = new MockContentProvider();
+            mockResolver.addProvider(SimPhonebookContract.AUTHORITY, mMockSimPhonebookProvider);
             when(mContext.getContentResolver()).thenReturn(mockResolver);
         }
 
 
         @Test
         public void createsContactsFromCursor() {
-            mMockIccProvider.expect(MockContentProvider.Query.forAnyUri())
+            mMockSimPhonebookProvider.expect(MockContentProvider.Query.forAnyUri())
                     .withDefaultProjection(
-                            SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
-                            SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
+                            SimRecords.RECORD_NUMBER, SimRecords.NAME, SimRecords.PHONE_NUMBER)
                     .withAnyProjection()
                     .withAnySelection()
                     .withAnySortOrder()
-                    .returnRow(1, "Name One", "5550101", null)
-                    .returnRow(2, "Name Two", "5550102", null)
-                    .returnRow(3, "Name Three", null, null)
-                    .returnRow(4, null, "5550104", null)
-                    .returnRow(5, "Name Five", "5550105",
-                            "five@example.com,nf@example.com,name.five@example.com")
-                    .returnRow(6, "Name Six", "5550106", "thesix@example.com");
+                    .returnRow(1, "Name One", "5550101")
+                    .returnRow(2, "Name Two", "5550102")
+                    .returnRow(3, "Name Three", null)
+                    .returnRow(4, null, "5550104");
 
             final SimContactDao sut = SimContactDao.create(mContext);
             final List<SimContact> contacts = sut
-                    .loadContactsForSim(new SimCard("123", "carrier", "sim", null, "us"));
+                    .loadContactsForSim(new SimCard("123", 1, "carrier", "sim", null, "us"));
 
             assertThat(contacts, equalTo(
                     Arrays.asList(
                             new SimContact(1, "Name One", "5550101", null),
                             new SimContact(2, "Name Two", "5550102", null),
                             new SimContact(3, "Name Three", null, null),
-                            new SimContact(4, null, "5550104", null),
-                            new SimContact(5, "Name Five", "5550105", new String[] {
-                                    "five@example.com", "nf@example.com", "name.five@example.com"
-                            }),
-                            new SimContact(6, "Name Six", "5550106", new String[] {
-                                    "thesix@example.com"
-                            })
+                            new SimContact(4, null, "5550104", null)
                     )));
         }
 
         @Test
         public void excludesEmptyContactsFromResult() {
-            mMockIccProvider.expect(MockContentProvider.Query.forAnyUri())
+            mMockSimPhonebookProvider.expect(MockContentProvider.Query.forAnyUri())
                     .withDefaultProjection(
-                            SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
-                            SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
+                            SimRecords.RECORD_NUMBER, SimRecords.NAME, SimRecords.PHONE_NUMBER)
                     .withAnyProjection()
                     .withAnySelection()
                     .withAnySortOrder()
-                    .returnRow(1, "Non Empty1", "5550101", null)
-                    .returnRow(2, "", "", "")
-                    .returnRow(3, "Non Empty2", null, null)
-                    .returnRow(4, null, null, null)
-                    .returnRow(5, "", null, null)
-                    .returnRow(6, null, "5550102", null)
-                    .returnRow(7, null, null, "user@example.com");
+                    .returnRow(1, "Non Empty1", "5550101")
+                    .returnRow(2, "", "")
+                    .returnRow(3, "Non Empty2", null)
+                    .returnRow(4, null, null)
+                    .returnRow(5, "", null)
+                    .returnRow(6, null, "5550102");
 
             final SimContactDao sut = SimContactDao.create(mContext);
             final List<SimContact> contacts = sut
-                    .loadContactsForSim(new SimCard("123", "carrier", "sim", null, "us"));
+                    .loadContactsForSim(new SimCard("123", 1, "carrier", "sim", null, "us"));
 
             assertThat(contacts, equalTo(
                     Arrays.asList(
                             new SimContact(1, "Non Empty1", "5550101", null),
                             new SimContact(3, "Non Empty2", null, null),
-                            new SimContact(6, null, "5550102", null),
-                            new SimContact(7, null, null, new String[] { "user@example.com" })
+                            new SimContact(6, null, "5550102", null)
                     )));
         }
 
         @Test
         public void usesSimCardSubscriptionIdIfAvailable() {
-            mMockIccProvider.expectQuery(SimContactDaoImpl.ICC_CONTENT_URI.buildUpon()
-                    .appendPath("subId").appendPath("2").build())
+            mMockSimPhonebookProvider.expectQuery(SimRecords.getContentUri(2,
+                    SimPhonebookContract.ElementaryFiles.EF_ADN))
                     .withDefaultProjection(
-                            SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
-                            SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
+                            SimRecords.RECORD_NUMBER, SimRecords.NAME, SimRecords.PHONE_NUMBER)
                     .withAnyProjection()
                     .withAnySelection()
                     .withAnySortOrder()
@@ -671,32 +659,14 @@
 
             final SimContactDao sut = SimContactDao.create(mContext);
             sut.loadContactsForSim(new SimCard("123", 2, "carrier", "sim", null, "us"));
-            mMockIccProvider.verify();
-        }
-
-        @Test
-        public void omitsSimCardSubscriptionIdIfUnavailable() {
-            mMockIccProvider.expectQuery(SimContactDaoImpl.ICC_CONTENT_URI)
-                    .withDefaultProjection(
-                            SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
-                            SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
-                    .withAnyProjection()
-                    .withAnySelection()
-                    .withAnySortOrder()
-                    .returnEmptyCursor();
-
-            final SimContactDao sut = SimContactDao.create(mContext);
-            sut.loadContactsForSim(new SimCard("123", SimCard.NO_SUBSCRIPTION_ID,
-                    "carrier", "sim", null, "us"));
-            mMockIccProvider.verify();
+            mMockSimPhonebookProvider.verify();
         }
 
         @Test
         public void returnsEmptyListForEmptyCursor() {
-            mMockIccProvider.expect(MockContentProvider.Query.forAnyUri())
+            mMockSimPhonebookProvider.expect(MockContentProvider.Query.forAnyUri())
                     .withDefaultProjection(
-                            SimContactDaoImpl._ID, SimContactDaoImpl.NAME,
-                            SimContactDaoImpl.NUMBER, SimContactDaoImpl.EMAILS)
+                            SimRecords.RECORD_NUMBER, SimRecords.NAME, SimRecords.PHONE_NUMBER)
                     .withAnyProjection()
                     .withAnySelection()
                     .withAnySortOrder()
@@ -704,7 +674,7 @@
 
             final SimContactDao sut = SimContactDao.create(mContext);
             List<SimContact> result = sut
-                    .loadContactsForSim(new SimCard("123", "carrier", "sim", null, "us"));
+                    .loadContactsForSim(new SimCard("123", 1, "carrier", "sim", null, "us"));
             assertTrue(result.isEmpty());
         }
 
@@ -725,7 +695,7 @@
 
             final SimContactDao sut = SimContactDao.create(mContext);
             final List<SimContact> result = sut
-                    .loadContactsForSim(new SimCard("123", "carrier", "sim", null, "us"));
+                    .loadContactsForSim(new SimCard("123", 1, "carrier", "sim", null, "us"));
             assertTrue(result.isEmpty());
         }
     }
diff --git a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
index 7ffecc1..06d64a8 100644
--- a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
+++ b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java
@@ -197,7 +197,7 @@
     }
 
     @Test
-    public void testShouldShowAccountChangedNotification_sanity_check() {
+    public void testShouldShowAccountChangedNotification_initial_check() {
         // Prepare 1 account and save it as the default.
         mTarget.saveDefaultAccount(ACCOUNT_1_A);
 
diff --git a/tests/src/com/android/contacts/model/RawContactDeltaListTests.java b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
index 03e1d4f..d9ff184 100644
--- a/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
+++ b/tests/src/com/android/contacts/model/RawContactDeltaListTests.java
@@ -17,6 +17,8 @@
 package com.android.contacts.model;
 
 import android.content.ContentProviderOperation;
+import android.content.ContentProviderResult;
+import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
 import android.net.Uri;
@@ -56,6 +58,8 @@
     public static final long CONTACT_BOB = 10;
     public static final long CONTACT_MARY = 11;
 
+    public static final long INSERTED_CONTACT_ID = 3;
+
     public static final long PHONE_RED = 20;
     public static final long PHONE_GREEN = 21;
     public static final long PHONE_BLUE = 22;
@@ -182,6 +186,8 @@
 
     static void assertDiffPattern(ArrayList<CPOWrapper> diff, CPOWrapper... pattern) {
         assertEquals("Unexpected operations", pattern.length, diff.size());
+
+        ContentProviderResult[] fakeBackReferences = new ContentProviderResult[diff.size()];
         for (int i = 0; i < pattern.length; i++) {
             final CPOWrapper expected = pattern[i];
             final CPOWrapper found = diff.get(i);
@@ -193,21 +199,25 @@
             final String foundType = getTypeString(found);
             assertEquals("Unexpected type", expectedType, foundType);
 
-            if (CompatUtils.isDeleteCompat(expected)) continue;
-
-            try {
-                final ContentValues expectedValues = getValues(expected.getOperation());
-                final ContentValues foundValues = getValues(found.getOperation());
-
-                expectedValues.remove(BaseColumns._ID);
-                foundValues.remove(BaseColumns._ID);
-
-                assertEquals("Unexpected values", expectedValues, foundValues);
-            } catch (NoSuchFieldException e) {
-                fail(e.toString());
-            } catch (IllegalAccessException e) {
-                fail(e.toString());
+            if (CompatUtils.isDeleteCompat(expected)) {
+                continue;
             }
+
+            if (CompatUtils.isInsertCompat(found)) {
+                fakeBackReferences[i] = new ContentProviderResult(
+                        ContentUris.withAppendedId(RawContacts.CONTENT_URI, INSERTED_CONTACT_ID));
+            } else if (CompatUtils.isUpdateCompat(found)) {
+                fakeBackReferences[i] = new ContentProviderResult(1);
+            }
+
+
+            ContentValues expectedValues = expected.getOperation().resolveValueBackReferences(
+                    new ContentProviderResult[0], 0);
+            ContentValues foundValues = found.getOperation().resolveValueBackReferences(
+                    fakeBackReferences, fakeBackReferences.length);
+            expectedValues.remove(BaseColumns._ID);
+            foundValues.remove(BaseColumns._ID);
+            assertEquals("Unexpected values", expectedValues, foundValues);
         }
     }
 
@@ -247,6 +257,7 @@
     static CPOWrapper buildUpdateAggregationKeepTogether(long rawContactId) {
         final ContentValues values = new ContentValues();
         values.put(AggregationExceptions.RAW_CONTACT_ID1, rawContactId);
+        values.put(AggregationExceptions.RAW_CONTACT_ID2, INSERTED_CONTACT_ID);
         values.put(AggregationExceptions.TYPE, AggregationExceptions.TYPE_KEEP_TOGETHER);
         return buildCPOWrapper(AggregationExceptions.CONTENT_URI, TYPE_UPDATE, values);
     }
@@ -462,7 +473,8 @@
         assertDiffPattern(first,
                 buildAssertVersion(VER_FIRST),
                 buildUpdateAggregationSuspended(),
-                buildCPOWrapper(Data.CONTENT_URI, TYPE_INSERT, buildDataInsert(bluePhone, CONTACT_BOB)),
+                buildCPOWrapper(Data.CONTENT_URI, TYPE_INSERT,
+                        buildDataInsert(bluePhone, CONTACT_BOB)),
                 buildUpdateAggregationDefault());
 
         // Merge in the second version, verify that our insert remains
@@ -470,7 +482,8 @@
         assertDiffPattern(merged,
                 buildAssertVersion(VER_SECOND),
                 buildUpdateAggregationSuspended(),
-                buildCPOWrapper(Data.CONTENT_URI, TYPE_INSERT, buildDataInsert(bluePhone, CONTACT_BOB)),
+                buildCPOWrapper(Data.CONTENT_URI, TYPE_INSERT,
+                        buildDataInsert(bluePhone, CONTACT_BOB)),
                 buildUpdateAggregationDefault());
     }
 
@@ -479,10 +492,11 @@
                 VER_FIRST, buildPhone(PHONE_RED)));
         final RawContactDeltaList second = buildSet(buildBeforeEntity(mContext, CONTACT_BOB,
                 VER_SECOND, buildPhone(PHONE_RED)), buildBeforeEntity(mContext, CONTACT_MARY,
-                        VER_SECOND, buildPhone(PHONE_RED)));
+                VER_SECOND, buildPhone(PHONE_RED)));
 
         // Add new contact locally, should remain insert
         final ContentValues joePhoneInsert = buildPhone(PHONE_BLUE);
+        joePhoneInsert.put(Data.RAW_CONTACT_ID, INSERTED_CONTACT_ID);
         final RawContactDelta joeContact = buildAfterEntity(joePhoneInsert);
         final ContentValues joeContactInsert = joeContact.getValues().getCompleteValues();
         joeContactInsert.put(RawContacts.AGGREGATION_MODE, RawContacts.AGGREGATION_MODE_SUSPENDED);
@@ -542,6 +556,7 @@
                 buildUpdateAggregationDefault());
 
         final ContentValues phoneInsert = phone.getCompleteValues();
+        phoneInsert.put(Data.RAW_CONTACT_ID, INSERTED_CONTACT_ID);
         final ContentValues contactInsert = first.getByRawContactId(CONTACT_MARY).getValues()
                 .getCompleteValues();
         contactInsert.put(RawContacts.AGGREGATION_MODE, RawContacts.AGGREGATION_MODE_SUSPENDED);
@@ -562,11 +577,11 @@
         final RawContactDeltaList second = buildSet(buildBeforeEntity(mContext, CONTACT_BOB,
                 VER_SECOND, buildPhone(PHONE_RED)));
 
-        assertEquals((Long)VER_FIRST, getVersion(first, CONTACT_BOB));
-        assertEquals((Long)VER_SECOND, getVersion(second, CONTACT_BOB));
+        assertEquals((Long) VER_FIRST, getVersion(first, CONTACT_BOB));
+        assertEquals((Long) VER_SECOND, getVersion(second, CONTACT_BOB));
 
         final RawContactDeltaList merged = RawContactDeltaList.mergeAfter(second, first);
-        assertEquals((Long)VER_SECOND, getVersion(merged, CONTACT_BOB));
+        assertEquals((Long) VER_SECOND, getVersion(merged, CONTACT_BOB));
     }
 
     public void testMergeAfterEnsureAndTrim() {
@@ -585,7 +600,8 @@
         assertDiffPattern(first,
                 buildAssertVersion(VER_FIRST),
                 buildUpdateAggregationSuspended(),
-                buildCPOWrapper(Data.CONTENT_URI, TYPE_INSERT, buildDataInsert(bobPhone, CONTACT_BOB)),
+                buildCPOWrapper(Data.CONTENT_URI, TYPE_INSERT,
+                        buildDataInsert(bobPhone, CONTACT_BOB)),
                 buildUpdateAggregationDefault());
 
         // Trim values and ensure that we don't insert things
diff --git a/tests/src/com/android/contacts/tests/FakeSimContactDao.java b/tests/src/com/android/contacts/tests/FakeSimContactDao.java
index c40ab25..ab6c653 100644
--- a/tests/src/com/android/contacts/tests/FakeSimContactDao.java
+++ b/tests/src/com/android/contacts/tests/FakeSimContactDao.java
@@ -110,5 +110,4 @@
         result.canReadSimContacts = false;
         return result;
     }
-
 }
diff --git a/tests/src/com/android/contacts/tests/SimContactsTestHelper.java b/tests/src/com/android/contacts/tests/SimContactsTestHelper.java
index 740d013..99c95cb 100644
--- a/tests/src/com/android/contacts/tests/SimContactsTestHelper.java
+++ b/tests/src/com/android/contacts/tests/SimContactsTestHelper.java
@@ -28,13 +28,15 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.RemoteException;
+import android.provider.SimPhonebookContract;
+import android.provider.SimPhonebookContract.ElementaryFiles;
+import android.provider.SimPhonebookContract.SimRecords;
 import android.telephony.TelephonyManager;
 
 import androidx.annotation.NonNull;
 import androidx.test.InstrumentationRegistry;
 
 import com.android.contacts.database.SimContactDao;
-import com.android.contacts.database.SimContactDaoImpl;
 import com.android.contacts.model.SimCard;
 import com.android.contacts.model.SimContact;
 
@@ -47,6 +49,8 @@
     private final TelephonyManager mTelephonyManager;
     private final ContentResolver mResolver;
     private final SimContactDao mSimDao;
+    private final int mSubscriptionId;
+    private final Uri mDefaultSimAdnUri;
 
     public SimContactsTestHelper() {
         this(InstrumentationRegistry.getTargetContext());
@@ -57,10 +61,13 @@
         mResolver = context.getContentResolver();
         mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
         mSimDao = SimContactDao.create(context);
+        mSubscriptionId = mTelephonyManager.getSubscriptionId();
+        mDefaultSimAdnUri = SimRecords.getContentUri(
+                mTelephonyManager.getSubscriptionId(), ElementaryFiles.EF_ADN);
     }
 
     public int getSimContactCount() {
-        Cursor cursor = mContext.getContentResolver().query(SimContactDaoImpl.ICC_CONTENT_URI,
+        Cursor cursor = mContext.getContentResolver().query(mDefaultSimAdnUri,
                 null, null, null, null);
         try {
             return cursor.getCount();
@@ -71,15 +78,13 @@
 
     public Uri addSimContact(String name, String number) {
         ContentValues values = new ContentValues();
-        // Oddly even though it's called name when querying we have to use "tag" for it to work
-        // when inserting.
         if (name != null) {
-            values.put("tag", name);
+            values.put(SimRecords.NAME, name);
         }
         if (number != null) {
-            values.put(SimContactDaoImpl.NUMBER, number);
+            values.put(SimRecords.PHONE_NUMBER, number);
         }
-        return mResolver.insert(SimContactDaoImpl.ICC_CONTENT_URI, values);
+        return mResolver.insert(mDefaultSimAdnUri, values);
     }
 
     public ContentProviderResult[] deleteAllSimContacts()
@@ -92,11 +97,11 @@
         ArrayList<ContentProviderOperation> ops = new ArrayList<>();
         for (SimContact contact : contacts) {
             ops.add(ContentProviderOperation
-                    .newDelete(SimContactDaoImpl.ICC_CONTENT_URI)
-                    .withSelection(getWriteSelection(contact), null)
+                    .newDelete(SimRecords.getItemUri(
+                            mSubscriptionId, ElementaryFiles.EF_ADN, contact.getRecordNumber()))
                     .build());
         }
-        return mResolver.applyBatch(SimContactDaoImpl.ICC_CONTENT_URI.getAuthority(), ops);
+        return mResolver.applyBatch(SimPhonebookContract.AUTHORITY, ops);
     }
 
     public ContentProviderResult[] restore(ArrayList<ContentProviderOperation> restoreOps)
@@ -106,7 +111,7 @@
         // Remove SIM contacts because we assume that caller wants the data to be in the exact
         // state as when the restore ops were captured.
         deleteAllSimContacts();
-        return mResolver.applyBatch(SimContactDaoImpl.ICC_CONTENT_URI.getAuthority(), restoreOps);
+        return mResolver.applyBatch(SimPhonebookContract.AUTHORITY, restoreOps);
     }
 
     public ArrayList<ContentProviderOperation> captureRestoreSnapshot() {
@@ -124,24 +129,16 @@
                         " Please manually remove SIM contacts with emails.");
             }
             ops.add(ContentProviderOperation
-                    .newInsert(SimContactDaoImpl.ICC_CONTENT_URI)
-                    .withValue("tag", contact.getName())
-                    .withValue("number", contact.getPhone())
+                    .newInsert(mDefaultSimAdnUri)
+                    .withValue(SimRecords.NAME, contact.getName())
+                    .withValue(SimRecords.PHONE_NUMBER, contact.getPhone())
                     .build());
         }
         return ops;
     }
 
-    public String getWriteSelection(SimContact simContact) {
-        return "tag='" + simContact.getName() + "' AND " + SimContactDaoImpl.NUMBER + "='" +
-                simContact.getPhone() + "'";
-    }
-
-    public int deleteSimContact(@NonNull  String name, @NonNull  String number) {
-        // IccProvider doesn't use the selection args.
-        final String selection = "tag='" + name + "' AND " +
-                SimContactDaoImpl.NUMBER + "='" + number + "'";
-        return mResolver.delete(SimContactDaoImpl.ICC_CONTENT_URI, selection, null);
+    public int deleteSimContact(@NonNull Uri recordUri) {
+        return mResolver.delete(recordUri, null);
     }
 
     public boolean isSimReady() {
@@ -156,7 +153,7 @@
         if (!isSimReady()) return false;
         final String name = "writabeProbe" + System.nanoTime();
         final Uri uri = addSimContact(name, "15095550101");
-        return uri != null && deleteSimContact(name, "15095550101") == 1;
+        return uri != null && deleteSimContact(uri) == 1;
     }
 
     public void assumeSimReady() {