DO NOT MERGE - Merge RP1A.201005.006

Bug: 168212094
Merged-In: I1f62fdc077401fea2c48a31527464464f08a6b64
Change-Id: I1aee1644b811fc9de2b82b99100e3f43be4daf44
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e0814c1..52606b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -73,6 +73,7 @@
             android:launchMode="singleTop"
             android:resizeableActivity="true"
             android:theme="@style/LaunchScreenTheme"
+            android:exported="true"
             android:visibleToInstantApps="true"
             >
             <intent-filter>
@@ -183,6 +184,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" />
@@ -285,6 +287,7 @@
 
         <activity
             android:name=".activities.ShowOrCreateActivity"
+            android:exported="true"
             android:theme="@android:style/Theme.Material.Light.Dialog.NoActionBar">
 
             <intent-filter>
@@ -302,6 +305,7 @@
             android:launchMode="singleTop"
             android:taskAffinity=""
             android:theme="@style/Theme.QuickContact"
+            android:exported="true"
             android:windowSoftInputMode="stateUnchanged">
 
             <intent-filter>
@@ -330,7 +334,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" />
@@ -341,6 +346,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>
@@ -354,6 +360,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>
@@ -369,6 +376,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>
@@ -388,6 +396,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>
@@ -417,6 +426,7 @@
 
         <activity
             android:name=".activities.ContactEditorSpringBoardActivity"
+            android:exported="true"
             android:theme="@style/TransparentThemeAppCompat">
 
             <intent-filter>
@@ -429,7 +439,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>
@@ -455,6 +466,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"/>
@@ -467,6 +479,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"/>
@@ -482,6 +495,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"/>
@@ -527,6 +541,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"/>
@@ -555,6 +570,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..a849c84 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>
@@ -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">
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 499448d..03774a6 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -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 926fe45..db8ec9e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -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>
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-es/strings.xml b/res/values-es/strings.xml
index b24ddb4..95db5a7 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -471,11 +471,11 @@
     <string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g>/<xliff:g id="LIMIT">%2$s</xliff:g>"</string>
     <string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
     <string name="about_build_version" msgid="5870642814752351712">"Versión de la compilación"</string>
-    <string name="about_open_source_licenses" msgid="1617836621315557445">"Licencias de código abierto"</string>
+    <string name="about_open_source_licenses" msgid="1617836621315557445">"Licencias de software libre"</string>
     <string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Detalles de las licencias de software libre"</string>
     <string name="about_privacy_policy" msgid="4581488375200402678">"Política de Privacidad"</string>
-    <string name="about_terms_of_service" msgid="7419670771785057738">"Condiciones de Servicio"</string>
-    <string name="activity_title_licenses" msgid="6434398894019119709">"Licencias de código abierto"</string>
+    <string name="about_terms_of_service" msgid="7419670771785057738">"Términos del Servicio"</string>
+    <string name="activity_title_licenses" msgid="6434398894019119709">"Licencias de software libre"</string>
     <string name="url_open_error_toast" msgid="4885855620824048385">"No se ha podido abrir la URL."</string>
     <string name="account_filter_view_checked" msgid="4740544238806346376">"Se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
     <string name="account_filter_view_not_checked" msgid="5782705545786455847">"No se ha seleccionado <xliff:g id="ACCOUNT_INFO">%s</xliff:g>"</string>
diff --git a/res/values-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-fi/strings.xml b/res/values-fi/strings.xml
index 6bb5f56..7fc9f01 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -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 83ef3cf..7cc9320 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -29,7 +29,7 @@
     <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Créer un contact"</string>
     <string name="searchHint" msgid="1487501532610025473">"Rech. des contacts"</string>
     <string name="menu_addStar" msgid="4903812703386825130">"Ajouter aux favoris"</string>
-    <string name="menu_removeStar" msgid="3707373931808303701">"Supprimer des favoris"</string>
+    <string name="menu_removeStar" msgid="3707373931808303701">"Retirer des favoris"</string>
     <string name="description_action_menu_remove_star" msgid="4044390281910122890">"Supprimé des favoris"</string>
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"Ajouté aux favoris"</string>
     <string name="menu_editContact" msgid="5039663761025630208">"Modifier"</string>
@@ -37,7 +37,7 @@
     <string name="menu_change_photo" msgid="4911246106907208055">"Changer de photo"</string>
     <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"Créer un raccourci"</string>
     <string name="menu_splitAggregate" msgid="2062290275288905833">"Annuler la fusion"</string>
-    <string name="menu_editGroup" msgid="8706562583754054622">"Supprimer les contacts"</string>
+    <string name="menu_editGroup" msgid="8706562583754054622">"Retirer les contacts"</string>
     <string name="menu_renameGroup" msgid="2685886609399776475">"Renommer l\'étiquette"</string>
     <string name="menu_deleteGroup" msgid="1180215594530228294">"Supprimer l\'étiquette"</string>
     <string name="menu_addToGroup" msgid="5034813446697655310">"Ajouter un contact"</string>
@@ -183,7 +183,7 @@
     <string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Annuler"</string>
     <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Supprimer les personnalisations?"</string>
     <string name="enter_contact_name" msgid="521859148893732679">"Rechercher dans les contacts"</string>
-    <string name="title_edit_group" msgid="4246193439931854759">"Supprimer les contacts"</string>
+    <string name="title_edit_group" msgid="4246193439931854759">"Retirer les contacts"</string>
     <string name="local_profile_title" msgid="1613784248702623410">"Mon profil local"</string>
     <string name="external_profile_title" msgid="2706282819025406927">"Mon profil <xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>"</string>
     <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"Prenez une minute pour ajouter un compte qui sauvegardera vos contacts sur Google."</string>
@@ -369,7 +369,7 @@
     <string name="list_filter_single" msgid="6003845379327432129">"contact"</string>
     <string name="display_ungrouped" msgid="4823012484407759332">"Tous les autres contacts"</string>
     <string name="display_all_contacts" msgid="1281067776483704512">"Tous les contacts"</string>
-    <string name="menu_sync_remove" msgid="7523335046562082188">"Supprimer le groupe de synchronisation"</string>
+    <string name="menu_sync_remove" msgid="7523335046562082188">"Retirer le groupe de synchronisation"</string>
     <string name="dialog_sync_add" msgid="8012361965908515959">"Ajouter groupe de synchronisation"</string>
     <string name="display_more_groups" msgid="8398232980355188133">"Autres groupes…"</string>
     <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"Le retrait du groupe \"<xliff:g id="GROUP">%s</xliff:g>\" de la synchronisation entraîne également le retrait des contacts n\'appartenant à aucun groupe."</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 7ccb426..0448ecf 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 (pronuncia)"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"Nome (pronuncia)"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome (pronuncia)"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"Apelidos (pronuncia)"</string>
+    <string name="name_phonetic" msgid="4746541275769990740">"Nome (pronunciación)"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"Nome (pronunciación)"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"Segundo nome (pronunciación)"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"Apelidos (pronunciación)"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"Teléfono"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"Correo electrónico"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"Enderezo"</string>
@@ -430,7 +430,7 @@
     <string name="progress_notifier_message" msgid="8522060892889599746">"Importando <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>: <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"Exportar a ficheiro .vcf"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Ordenar por"</string>
-    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome (pronuncia)"</string>
+    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Nome (pronunciación)"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Mostrar sempre"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Ocultar se está baleiro"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Nome"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 8f814ab..22da670 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -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 d7d2d90..3b1769f 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -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 94420ff..e20401e 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>
@@ -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 ab535aa..1aedbc9 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -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 a200960..5cfc832 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>
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-ky/strings.xml b/res/values-ky/strings.xml
index 56672d6..6afb2ec 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -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>
@@ -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>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 33ea7a6..6835f4a 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/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>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index fdf3b01..fa23883 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 937d078..ff3c5d8 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -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>
@@ -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>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index a017629..6187dc2 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/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>
@@ -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 9271460..589f488 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>
@@ -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 b67e0e2..dee6f5e 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -34,7 +34,7 @@
     <string name="description_action_menu_add_star" msgid="7316521132809388851">"मनपर्नेमा थपियो"</string>
     <string name="menu_editContact" msgid="5039663761025630208">"सम्पादन गर्नुहोस्"</string>
     <string name="menu_deleteContact" msgid="15161764025276217">"मेट्नुहोस्"</string>
-    <string name="menu_change_photo" msgid="4911246106907208055">"तस्बिर परिवर्तन गर्नुहोस्"</string>
+    <string name="menu_change_photo" msgid="4911246106907208055">"फोटो परिवर्तन गर्नुहोस्"</string>
     <string name="menu_create_contact_shortcut" msgid="8983436328557825860">"सर्टकट सिर्जना गर्नुहोस्"</string>
     <string name="menu_splitAggregate" msgid="2062290275288905833">"अनलिंक"</string>
     <string name="menu_editGroup" msgid="8706562583754054622">"सम्पर्कहरू हटाउनुहोस्"</string>
@@ -95,10 +95,10 @@
     <string name="invalidContactMessage" msgid="6204402264821083362">"सम्पर्क उपलब्ध छैन।"</string>
     <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"सम्पर्क गृह स्क्रिनमा थपियो।"</string>
     <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> गृह स्क्रिनमा थपियो।"</string>
-    <string name="photoPickerNotFoundText" msgid="6535222297923110991">"यन्त्रमा कुनै पनि तस्बिरहरू उपलब्ध छैनन्।"</string>
-    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"सम्पर्क तस्बिर"</string>
+    <string name="photoPickerNotFoundText" msgid="6535222297923110991">"यन्त्रमा कुनै पनि फोटोहरू उपलब्ध छैनन्।"</string>
+    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"सम्पर्क फोटो"</string>
     <string name="customLabelPickerTitle" msgid="816694850254307154">"आफू अनुकूल पारिएको लेबलको नाम"</string>
-    <string name="removePhoto" msgid="1190099414600730001">"तस्बिर मेट्नुहोस्"</string>
+    <string name="removePhoto" msgid="1190099414600730001">"फोटो मेट्नुहोस्"</string>
     <string name="noContacts" msgid="3030512741779213810">"तपाईंको सम्पर्क ठेगानाहरूको सूची खाली छ"</string>
     <string name="emptyGroup" msgid="8598261660865081152">"यो लेबल अन्तर्गत कुनै सम्पर्कहरू छैनन्"</string>
     <string name="emptyAccount" msgid="7450843210977018582">"यस खातामा कुनै सम्पर्क ठेगानाहरू छैनन्"</string>
@@ -149,10 +149,10 @@
     <string name="video_chat" msgid="2477295971622477433">"भिडियो च्याट"</string>
     <string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g> सम्पर्क"</string>
     <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g> खाता"</string>
-    <string name="take_photo" msgid="820071555236547516">"तस्बिर लिनुहोस्"</string>
-    <string name="take_new_photo" msgid="4383091978116875778">"नयाँ तस्बिर खिच्नुहोस्"</string>
-    <string name="pick_photo" msgid="2050859661654812588">"तस्बिर छान्नुहोस्"</string>
-    <string name="pick_new_photo" msgid="4218112182908240970">"नयाँ तस्बिर चयन गर्नुहोस्"</string>
+    <string name="take_photo" msgid="820071555236547516">"फोटो लिनुहोस्"</string>
+    <string name="take_new_photo" msgid="4383091978116875778">"नयाँ फोटो खिच्नुहोस्"</string>
+    <string name="pick_photo" msgid="2050859661654812588">"फोटो छान्नुहोस्"</string>
+    <string name="pick_new_photo" msgid="4218112182908240970">"नयाँ फोटो चयन गर्नुहोस्"</string>
     <string name="search_results_searching" msgid="1373859095361975648">"खोजी कार्य गर्दै..."</string>
     <string name="event_edit_field_hint_text" msgid="1720286136507504896">"मिति"</string>
     <string name="group_edit_field_hint_text" msgid="1159504474053684478">"लेबल"</string>
@@ -217,9 +217,9 @@
     <string name="header_phone_entry" msgid="7092868248113091293">"फोन"</string>
     <string name="content_description_directions" msgid="860179347986211929">"स्थानको लागि निर्देशनहरू"</string>
     <string name="editor_more_fields" msgid="6158558083947445518">"थप क्षेत्रहरू"</string>
-    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"सम्पर्कको तस्बिर बदल्नुहोस्"</string>
-    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"सम्पर्कको तस्बिर थप्नुहोस्"</string>
-    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"सम्पर्कको तस्बिर"</string>
+    <string name="editor_change_photo_content_description" msgid="8146896029044539032">"सम्पर्कको फोटो बदल्नुहोस्"</string>
+    <string name="editor_add_photo_content_description" msgid="8457486801272200575">"सम्पर्कको फोटो थप्नुहोस्"</string>
+    <string name="editor_contact_photo_content_description" msgid="8699261934352739">"सम्पर्कको फोटो"</string>
     <string name="editor_failed_to_load" msgid="2328074829787373644">"सम्पादक खोल्न सकिएन।"</string>
     <string name="editor_account_selector_title" msgid="3190515989740696043">"यसमा सुरक्षित गरिँदै"</string>
     <string name="editor_account_selector_read_only_title" msgid="4870485850053962114">"<xliff:g id="ACCOUNT">%s</xliff:g> को सम्पर्क सम्बन्धी जानकारी सम्पादन गर्न मिल्दैन"</string>
@@ -286,7 +286,7 @@
     <string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (सन्देश पठाउनुहोस्)"</string>
     <string name="description_video_call" msgid="4956825008907720371">"भिडियो कल बनाउनुहोस्"</string>
     <string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"प्रायः सम्पर्क गरिएकाहरूलाई हटाउने हो?"</string>
-    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"तपाईंले सम्पर्कहरू र फोन एपहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल अनुप्रयोगहरूलाई दबाब दिनुहुनेछ।"</string>
+    <string name="clearFrequentsConfirmation" msgid="2120741757522063938">"तपाईंले सम्पर्कहरू र फोन अनुप्रयोगहरूमा बारम्बार सम्पर्क गरेको सूची खाली गर्नुहुनेछ र स्क्रयाचबाट तपाईंको ठेगाना प्राथमिकताहरू सिक्नको लागि इमेल अनुप्रयोगहरूलाई दबाब दिनुहुनेछ।"</string>
     <string name="clearFrequentsProgress_title" msgid="8271935295080659743">"प्रायः सम्पर्क गरिएकाहरूलाई हटाउँदै...."</string>
     <string name="status_available" msgid="8081626460682959098">"उपलब्ध"</string>
     <string name="status_away" msgid="2677693194455091315">"टाढा"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 6478cf2..011fe04 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -241,7 +241,7 @@
     <string name="hamburger_feature_highlight_body" msgid="782935036630531528">"Organiseer je contacten op een overzichtelijke en nuttige manier"</string>
     <string name="undo" msgid="2446931036220975026">"Ongedaan maken"</string>
     <string name="call_custom" msgid="2844900154492073207">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g> bellen"</string>
-    <string name="call_home" msgid="2443904771140750492">"Bellen naar huis"</string>
+    <string name="call_home" msgid="2443904771140750492">"Thuis bellen"</string>
     <string name="call_mobile" msgid="6504312789160309832">"Bellen naar mobiel"</string>
     <string name="call_work" msgid="2414313348547560346">"Bellen naar werk"</string>
     <string name="call_fax_work" msgid="5026843006300760797">"Bellen naar fax werk"</string>
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-sr/strings.xml b/res/values-sr/strings.xml
index 0d1af6d..c5aa628 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -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-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-uz/strings.xml b/res/values-uz/strings.xml
index 921b145..83f300e 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -310,10 +310,10 @@
     <string name="name_prefix" msgid="8857117624713905211">"Murojaat shakli"</string>
     <string name="name_middle" msgid="7330498948136181042">"Otasining ismi"</string>
     <string name="name_suffix" msgid="4502958221763936999">"Martabasi/unvoni"</string>
-    <string name="name_phonetic" msgid="4746541275769990740">"Ism talaffuzi"</string>
-    <string name="name_phonetic_given" msgid="425534279190047812">"Ism talaffuzi"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"Otasining ismi talaffuzi"</string>
-    <string name="name_phonetic_family" msgid="1690852801039809448">"Familiya talaffuzi"</string>
+    <string name="name_phonetic" msgid="4746541275769990740">"Ism transkripsiyasi"</string>
+    <string name="name_phonetic_given" msgid="425534279190047812">"Ism transkripsiyasi"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"Otasining ismi transkripsiyasi"</string>
+    <string name="name_phonetic_family" msgid="1690852801039809448">"Familiya transkripsiyasi"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"Telefon"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"Email"</string>
     <string name="postalLabelsGroup" msgid="7534317297587527570">"Manzil"</string>
@@ -430,7 +430,7 @@
     <string name="progress_notifier_message" msgid="8522060892889599746">"Import qilinmoqda: <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> – <xliff:g id="NAME">%3$s</xliff:g>"</string>
     <string name="export_to_vcf_file" msgid="3096479544575798192">"VCF faylga eksport qilish"</string>
     <string name="display_options_sort_list_by" msgid="4333658089057400431">"Saralash"</string>
-    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Ism talaffuzi"</string>
+    <string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"Ism transkripsiyasi"</string>
     <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"Har doim ko‘rsatish"</string>
     <string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"Bo‘sh maydonni berkitish"</string>
     <string name="display_options_sort_by_given_name" msgid="893781924536349248">"Ismi"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 5394ead..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-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 20d17ea..e22d44c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -312,7 +312,7 @@
     <string name="name_suffix" msgid="4502958221763936999">"姓名後稱謂"</string>
     <string name="name_phonetic" msgid="4746541275769990740">"姓名拼音"</string>
     <string name="name_phonetic_given" msgid="425534279190047812">"名字拼音"</string>
-    <string name="name_phonetic_middle" msgid="6528822054594516485">"中間名 (拼音)"</string>
+    <string name="name_phonetic_middle" msgid="6528822054594516485">"中間名拼音"</string>
     <string name="name_phonetic_family" msgid="1690852801039809448">"姓氏拼音"</string>
     <string name="phoneLabelsGroup" msgid="2746758650001801885">"電話"</string>
     <string name="emailLabelsGroup" msgid="3360719560200449554">"電子郵件"</string>
diff --git a/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/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/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/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);