Merge "Collapse extra raw contact editors" into lmp-mr1-dev
diff --git a/res/drawable-hdpi/ic_delete_white_24dp.png b/res/drawable-hdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..4a9f769
--- /dev/null
+++ b/res/drawable-hdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_trash_white_24.png b/res/drawable-hdpi/ic_trash_white_24.png
deleted file mode 100644
index 86e9099..0000000
--- a/res/drawable-hdpi/ic_trash_white_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_delete_white_24dp.png b/res/drawable-mdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..e2f5f35
--- /dev/null
+++ b/res/drawable-mdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_trash_white_24.png b/res/drawable-mdpi/ic_trash_white_24.png
deleted file mode 100644
index fc67992..0000000
--- a/res/drawable-mdpi/ic_trash_white_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_delete_white_24dp.png b/res/drawable-xhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..388b5b0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_trash_white_24.png b/res/drawable-xhdpi/ic_trash_white_24.png
deleted file mode 100644
index df96462..0000000
--- a/res/drawable-xhdpi/ic_trash_white_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_delete_white_24dp.png b/res/drawable-xxhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..3fcdfdb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_trash_white_24.png b/res/drawable-xxhdpi/ic_trash_white_24.png
deleted file mode 100644
index 96acd7e..0000000
--- a/res/drawable-xxhdpi/ic_trash_white_24.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_delete_white_24dp.png b/res/drawable-xxxhdpi/ic_delete_white_24dp.png
new file mode 100644
index 0000000..8d322aa
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_delete_white_24dp.png
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index ccf2dfa..6d64a62 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Voeg organisasie by"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Groepnaam"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Verander"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Primêre foto"</string>
     <string name="description_star" msgid="2605854427360036550">"gunsteling"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Redigeer kontak"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"gemis"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"onlangse oproep. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik om terug te bel"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Jy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts werk beter as jy die persoon se Hangouts-identifiseerder in die e-posveld of foonveld invoer."</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 328e3ea..06caa07 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"ድርጅት አክል"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"ቀን"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"የቡድን ስም"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"ቀይር"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"ዋና ፎቶ"</string>
     <string name="description_star" msgid="2605854427360036550">"ተወዳጅ"</string>
     <string name="edit_contact" msgid="7529281274005689512">"እውቅያ አርትዕ"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ያመለጡ"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"የቅርብ ጊዜ ጥሪ። <xliff:g id="CALL_TYPE">%s</xliff:g>። <xliff:g id="PHONE_NUMBER">%s</xliff:g>። <xliff:g id="DATE">%s</xliff:g>። መልሰው ለመደወል ጠቅ ያድርጉ"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"እርስዎ፦ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"የግለሰቡን የHangouts ለይቶ አዋቂ ወደ ኢሜይል መስኩ ወይም የስልክ መስኩ በሚያስገቡበት ጊዜ Hangouts በተሻለ ሁኔታ ይሰራል።"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1ec1c50..6987748 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"الفائتة"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"المكالمة الأخيرة. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. انقر لمعاودة الاتصال"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"أنت: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"‏تعمل Hangouts بشكل أفضل عند إدخال معرف الشخص في Hangouts في حقل البريد الإلكتروني أو حقل الهاتف."</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5bde995..40ca906 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Организация: Добавяне"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Дата"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Име на групата"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Промяна"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Основна снимка"</string>
     <string name="description_star" msgid="2605854427360036550">"любимо"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Редактиране на контакта"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропуснато"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Скорошно обаждане (<xliff:g id="CALL_TYPE">%s</xliff:g>) от <xliff:g id="PHONE_NUMBER">%s</xliff:g> на <xliff:g id="DATE">%s</xliff:g>. Кликнете за обратно обаждане"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Вие: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts работи по-добре, когато въведете съответния идентификатор на човека в полето за имейл или телефон."</string>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index c4a2195..8b4d0dd 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"সংগঠন যোগ করুন"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"তারিখ"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"গোষ্ঠী নাম"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"পরিবর্তন"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"প্রাথমিক ফটো"</string>
     <string name="description_star" msgid="2605854427360036550">"পছন্দসই"</string>
     <string name="edit_contact" msgid="7529281274005689512">"পরিচিতি সম্পাদনা করুন"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"মিস করা"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"সাম্প্রতিক কল৷ <xliff:g id="CALL_TYPE">%s</xliff:g>৷ <xliff:g id="PHONE_NUMBER">%s</xliff:g>৷ <xliff:g id="DATE">%s</xliff:g>৷ ঘুরিয়ে কল করতে ক্লিক করুন"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"আপনি: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"আপনি যখন ইমেল বা ফোন নম্বর লেখার ক্ষেত্রটিতে ব্যক্তির Hangouts সনাক্তকারী লেখেন তখন Hangouts আরো ভালো কাজ করে৷"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b5b50e8..2f5f11d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Afegeix organització"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nom del grup"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Canvia"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Foto principal"</string>
     <string name="description_star" msgid="2605854427360036550">"preferit"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Edita el contacte"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdudes"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Trucada recent. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Fes clic per tornar la trucada."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Usuari: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funciona millor si introdueixes l\'identificador de Hangouts de la persona corresponent al camp de l\'adreça electrònica o del telèfon."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 36e367c..035ba2a 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Přidat organizaci"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Název skupiny"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Změnit"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Primární fotka"</string>
     <string name="description_star" msgid="2605854427360036550">"oblíbené"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Upravit kontakt"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"zmeškaný"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"nedávný hovor. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknutím zavoláte zpět"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Vy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Aplikace Hangouts funguje lépe, když do pole pro e-mail nebo pro telefon zadáte identifikátor osoby ve službě Hangouts."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index eacf269..e110e27 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Tilføj organisation"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dato"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Gruppenavn"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Rediger"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Primært foto"</string>
     <string name="description_star" msgid="2605854427360036550">"foretrukken"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Rediger kontaktperson"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ubesvarede"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"seneste opkald. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Klik for at ringe tilbage"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Dig: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts fungerer bedre, når du indtaster personens Hangouts-id i e-mailfeltet eller telefonfeltet."</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index a844a5b..647d5d7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Unternehmen hinzufügen"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Gruppenname"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Ändern"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Hauptfoto"</string>
     <string name="description_star" msgid="2605854427360036550">"Favorit"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Kontakt bearbeiten"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"Verpasst"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Letzter Anruf. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Für Rückruf klicken."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Ich: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funktioniert besser, wenn Sie die Hangouts-ID der Person in das E-Mail- oder Telefonfeld eingeben."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index aed828d..d5a6804 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Προσθήκη οργανισμού"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Ημερομηνία"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Όν. ομάδ."</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Αλλαγή"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Κύρια φωτογραφία"</string>
     <string name="description_star" msgid="2605854427360036550">"αγαπημένο"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Επεξεργασία επαφής"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"αναπάντητες"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"πρόσφατη κλήση. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. κάντε κλικ για επιστροφή της κλήσης"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Εσείς: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Το Hangouts λειτουργεί καλύτερα όταν εισάγετε το αναγνωριστικό Hangouts του ατόμου στο πεδίο ηλεκτρονικού ταχυδρομείου ή τηλεφώνου."</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3d085b6..0f2effc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Agregar organización"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Fecha"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nombre de grupo"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Cambiar"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Foto principal"</string>
     <string name="description_star" msgid="2605854427360036550">"favorito"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Editar contacto"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Llamada reciente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Haz clic para devolver la llamada."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Tú: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funciona mejor si ingresas el identificador de Hangouts de la persona en el campo de correo electrónico o teléfono."</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 02755ff..e04be98 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Añadir organización"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Fecha"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nombre del grupo"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Cambiar"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Foto principal"</string>
     <string name="description_star" msgid="2605854427360036550">"favoritos"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Editar contacto"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"llamada reciente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. haz clic para devolver la llamada"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Tú: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funciona mejor si se introduce el identificador de Hangouts de la persona en el campo del correo electrónico o en el campo del teléfono."</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 4028f1a..649a55b 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Lisa organisatsioon"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Kuupäev"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Grupi nimi"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Muuda"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Põhifoto"</string>
     <string name="description_star" msgid="2605854427360036550">"lemmik"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Muuda kontakti"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"vastamata"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"viimane kõne. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klõpsake tagasihelistamiseks"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Teie: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts toimib paremini, kui sisestate isiku Hangoutsi koodi e-posti aadressi või telefoninumbri väljale."</string>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index a075766..aa7703d 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Gehitu erakundea"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Taldearen izena"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Aldatu"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Argazki nagusia"</string>
     <string name="description_star" msgid="2605854427360036550">"gogokoa"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Editatu kontaktua"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"galdua"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"duela gutxiko deia. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. sakatu deitzeko"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Zu: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts-ek hobeto funtzionatzen du pertsonaren Hangouts identifikatzailea idazten baduzu helbide elektronikoaren edo telefonoaren eremuan."</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index b086c10..3e394f8 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"افزودن سازمان"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"تاریخ"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"نام گروه"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"تغییر"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"عکس اصلی"</string>
     <string name="description_star" msgid="2605854427360036550">"مورد دلخواه"</string>
     <string name="edit_contact" msgid="7529281274005689512">"ویرایش مخاطب"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"بی‌پاسخ"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"تماس اخیر. <xliff:g id="CALL_TYPE">%s</xliff:g>‏. <xliff:g id="PHONE_NUMBER">%s</xliff:g>‏. ‏<xliff:g id="DATE">%s</xliff:g>. برای بازگرداندن تماس کلیک کنید"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"شما: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"‏وقتی شناسه Hangouts شخص را در فیلد ایمیل یا فیلد تلفن وارد کنید، Hangouts بهتر کار می‌کند."</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index aa11871..ba4248c 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Lisää organisaatio"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Päivämäärä"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Ryhmän nimi"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Muuta"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Kontaktin kuva"</string>
     <string name="description_star" msgid="2605854427360036550">"lisää suosikkeihin"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Muokkaa yhteystietoa"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"vastaamaton"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Viimeisin puhelu. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Soita takaisin klikkaamalla."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Sinä: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts toimii paremmin, kun kirjoitat käyttäjän Hangouts-tunnuksen sähköposti- tai puhelinnumerokenttään."</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e4329fe..0b1a89e 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Ajouter une entreprise"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Date"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nom du groupe"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Modifier"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Photo principale"</string>
     <string name="description_star" msgid="2605854427360036550">"favori"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Modifier un contact"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"manqué"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Appel récent : <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>. Touchez l\'écran pour rappeler ce numéro."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Vous : <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Google Hangout fonctionne mieux lorsque vous entrez l\'identifiant Hangout de la personne dans le champ de l\'adresse de courriel ou du numéro de téléphone."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 0adbdfb..3685208 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Ajouter une entreprise"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Date"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nom du groupe"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Modifier"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Photo principale"</string>
     <string name="description_star" msgid="2605854427360036550">"favori"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Modifier le contact"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"manqué"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Appel récent : <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>. Appuyez sur l\'écran pour rappeler ce numéro."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Vous : <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Les Hangouts fonctionnent mieux si vous saisissez l\'identifiant Hangouts de la personne concernée dans le champ de l\'adresse e-mail ou du numéro de téléphone."</string>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 705d9d2..694e349 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Engadir organización"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nome do grupo"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Cambiar"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Foto principal"</string>
     <string name="description_star" msgid="2605854427360036550">"favorito"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Editar contacto"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. fai clic para devolver a chamada"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Ti: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funciona mellor se introduces o identificador de Hangouts da persoa no campo do correo electrónico ou do teléfono."</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 165396f..cbd9ddd 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"संगठन जोड़ें"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"दि‍नांक"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"समूह नाम"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"बदलें"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"प्राथमिक फ़ोटो"</string>
     <string name="description_star" msgid="2605854427360036550">"पसंदीदा"</string>
     <string name="edit_contact" msgid="7529281274005689512">"संपर्क संपादित करें"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"छूटा"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"हाल ही का कॉल. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. पुनः कॉल करने के लिए क्लिक करें"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"आप: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts तब बेहतर कार्य करता है जब आप व्‍यक्‍ति के Hangouts पहचानकर्ता को ईमेल फ़ील्‍ड या फ़ोन फ़ील्‍ड में डालते हैं."</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 02e5c71..8c21178 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Dodaj organizaciju"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Naziv grupe"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Promijeni"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Primarna slika"</string>
     <string name="description_star" msgid="2605854427360036550">"favorit"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Uredi kontakt"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"propušteno"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"nedavni poziv. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknite za uzvratni poziv"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Vi: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funkcionira bolje kada unesete njegov identifikator osobe u polje e-adrese ili telefona."</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index fd81a86..d0591cf 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Szervezet hozzáadása"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dátum"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Csoport neve"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Módosítás"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Elsődleges fotó"</string>
     <string name="description_star" msgid="2605854427360036550">"kedvenc"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Névjegy szerkesztése"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"nem fogadott"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"hívás a közelmúltban. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kattintson a visszahíváshoz"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Ön: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"A Hangouts jobban működik, ha a személy Hangouts-azonosítóját adja meg az e-mail vagy telefonszám mezőben."</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index b6c4bba..ac15d20 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -157,7 +157,7 @@
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Ամսաթիվը"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Խմբի անունը"</string>
     <string name="change_photo" msgid="8530597935483526383">"Փոխել"</string>
-    <string name="primary_photo" msgid="8517942231868516999">"Առաջնային լուսանկար"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Հիմնական լուսանկար"</string>
     <string name="description_star" msgid="2605854427360036550">"ընտրյալ"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Խմբագրել կոնտակտը"</string>
   <plurals name="merge_info">
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"բաց թողնված"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"վերջին զանգը՝ <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>, սեղմեք՝ հետ զանգելու համար"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Դուք՝ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts-ն ավելի լավ կաշխատի, եթե էլփոստի կամ հեռախոսի դաշտում մուտքագրեք Hangouts-ի օգտվողի նույնացուցիչը:"</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index b253b16..d575494 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"tak terjawab"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"panggilan telepon terbaru. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik untuk menelepon balik"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Anda: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts bekerja lebih baik jika Anda memasukkan pengidentifikasi Hangouts orang tersebut ke bidang email atau bidang ponsel."</string>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index 008a054..5ae7931 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Bæta fyrirtæki við"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dagsetning"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Heiti hóps"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Breyta"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Aðalmynd"</string>
     <string name="description_star" msgid="2605854427360036550">"uppáhald"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Breyta tengilið"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ósvarað"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"nýlegt símtal. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. smelltu til að hringja til baka"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Þú: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts virkar betur ef þú slærð Hangouts auðkenni viðkomandi inn í netfangsreitinn eða símanúmersreitinn."</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 62b6a06..580ee73 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Aggiungi organizzazione"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nome del gruppo"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Modifica"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Foto principale"</string>
     <string name="description_star" msgid="2605854427360036550">"preferiti"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Modifica contatto"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"senza risposta"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"chiamata recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. fai clic per richiamare"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Tu: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funziona meglio se inserisci l\'identificatore Hangouts della persona nel campo dell\'indirizzo email o del numero di telefono."</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 8fc86d1..4dff766 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"所属を追加"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"日付"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"グループ名"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"変更"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"メインの写真"</string>
     <string name="description_star" msgid="2605854427360036550">"お気に入り"</string>
     <string name="edit_contact" msgid="7529281274005689512">"連絡先の編集"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"不在着信"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"最近の通話。<xliff:g id="CALL_TYPE">%s</xliff:g>。<xliff:g id="PHONE_NUMBER">%s</xliff:g>。<xliff:g id="DATE">%s</xliff:g>。折り返し電話するにはタップしてください。"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"あなた: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"ハングアウトを使いやすくするには、相手のハングアウトIDをメールアドレス欄または電話番号欄に入力します。"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 4f2183b..de9c1e6 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"ორგანიზაციის დამატება"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"თარიღი"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"ჯგუფის სახელი"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"შეცვლა"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"პირველადი ფოტო"</string>
     <string name="description_star" msgid="2605854427360036550">"რჩეული"</string>
     <string name="edit_contact" msgid="7529281274005689512">"კონტაქტის რედაქტირება"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"გამოტოვებული"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"ბოლო ზარი. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. დააწკაპუნეთ გადასარეკად"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"თქვენ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangout უკეთესად იმუშავებს იმ შემთხვევაში, თუ ტელეფონის ან ელფოსტის ველში პიროვნების Hangout-ის ინდენტიფიკატორს შეიყვანთ."</string>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index b8530ae..d202dd7 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"өткізіп алған"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"жақындағы қоңырау. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. кері қоңырау шалу үшін басыңыз"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Сіз: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts қолданбасы электрондық пошта өрісіне немесе телефон өрісіне адамның Hangouts идентификаторын енгізгенде жақсырақ жұмыс істейді."</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index ccaa34e..30ee19a 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ខកខាន​ទទួល"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"ការ​ហៅ​ថ្មី​។ <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ចុច​ដើម្បី​ហៅ​ត្រឡប់"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"អ្នក៖ <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts ដំណើរការបានយ៉ាងល្អ នៅពេលដែលអ្នកបញ្ចូលអត្តសញ្ញាណ Hangouts របស់បុគ្គលនោះទៅក្នុងប្រអប់អ៊ីម៉ែល ឬប្រអប់លេខទូរស័ព្ទ។"</string>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 866ee3b..b562771 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"ಸಂಸ್ಥೆಯನ್ನು ಸೇರಿಸಿ"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"ದಿನಾಂಕ"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"ಗುಂಪು ಹೆಸರು"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"ಬದಲಾಯಿಸು"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"ಪ್ರಾಥಮಿಕ ಫೋಟೋ"</string>
     <string name="description_star" msgid="2605854427360036550">"ಮೆಚ್ಚಿನ"</string>
     <string name="edit_contact" msgid="7529281274005689512">"ಸಂಪರ್ಕವನ್ನು ಸಂಪಾದಿಸು"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ತಪ್ಪಿಸಿಕೊಂಡ"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"ಇತ್ತೀಚಿನ ಕರೆ. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ಪುನಃ ಕರೆ ಮಾಡಲು ಕ್ಲಿಕ್ ಮಾಡಿ"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"ನೀವು: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"ಇಮೇಲ್ ಕ್ಷೇತ್ರ ಅಥವಾ ಫೋನ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ವ್ಯಕ್ತಿಯ Hangouts ಗುರುತಿಸುವಿಕೆಯನ್ನು ನೀವು ನಮೂದಿಸಿದಾಗ Hangouts ಉತ್ತಮವಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ."</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 2085660..6cbdfee 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"조직 추가"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"날짜"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"그룹 이름"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"변경"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"기본 사진"</string>
     <string name="description_star" msgid="2605854427360036550">"즐겨찾기"</string>
     <string name="edit_contact" msgid="7529281274005689512">"연락처 수정"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"부재중"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"최근 통화내역은 다음과 같습니다. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. 연락 온 번호로 다시 전화하려면 클릭하세요."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"내가 보낸 메시지: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"사용자의 행아웃 식별자를 이메일 입력란 또는 휴대전화 입력란에 입력하면 행아웃이 더 잘 작동합니다."</string>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index 2141783..3688d70 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -338,6 +338,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"жооп берилбей калган"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"акыркы чалуу. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. кайра чалуу үчүн чыкылдатыңыз"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Сиз: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Кимдир-бирөөнүн Hangouts аныктагычы электрондук почта же телефон талаасына киргизилгенде Hangouts жакшыраак иштейт."</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index cf6850f..cb7704a 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ບໍ່​ໄດ້​ຮັບ"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"ການ​ໂທຫຼ້າ​ສຸດ. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ຄລິກ​ເພື່ອ​ໂທ​ກັບ"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"​ທ່ານ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts ເຮັດ​ວຽກ​ໄດ້​ດີ​ຂຶ້ນ ເມື່ອ​ທ່ານ​ປ້ອນ​ຕົວ​ລະ​ບຸ​ Hangouts ຂອງ​ບຸກ​ຄົນ​ໃສ່​ບ່ອນ​ໃສ່ອີເມວ ຫຼື​ບ່ອນ​ໃສ່​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ."</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 068a770..7f35f16 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Pridėti organizaciją"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Grupės pavad."</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Pakeisti"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Pagrindinė nuotrauka"</string>
     <string name="description_star" msgid="2605854427360036550">"įtraukti į adresyną"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Redaguoti kontaktą"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"praleistieji"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Neseniai skambino. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Spustelėkite, kad atskambintumėte."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"„Hangout“ veikia geriau įvedus asmens „Hangout“ identifikatorių el. pašto ar telefono numerio lauke."</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 76e3c90..93a0ca2 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Pievienot organizāciju"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datums"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Grupas nosaukums"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Mainīt"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Galvenais foto"</string>
     <string name="description_star" msgid="2605854427360036550">"izlase"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Kontaktpersonu rediģēšana"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"neatbildēts"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Nesen saņemts zvans. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Noklikšķiniet, lai atzvanītu."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Jūs: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Funkcija Hangouts darbojas precīzāk, ja e-pasta vai tālruņa laukā ievadāt personas Hangouts identifikatoru."</string>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 15570cc..8dd7c75 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропуштен"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"неодамнешен повик. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. кликни за да повикаш назад"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Вие: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts работат подобро кога во полето за е-пошта или за телефон ќе го внесете идентификаторот на Hangouts за лицето."</string>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 787e065..82f3b17 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"ഓർഗനൈസേഷൻ ചേർക്കുക"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"തീയതി"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"ഗ്രൂപ്പിന്റെ പേര്"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"മാറ്റുക"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"പ്രാഥമിക ഫോട്ടോ"</string>
     <string name="description_star" msgid="2605854427360036550">"പ്രിയപ്പെട്ടതാക്കുക"</string>
     <string name="edit_contact" msgid="7529281274005689512">"കോൺടാക്റ്റ് എഡിറ്റുചെയ്യുക"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"മിസ്‌ഡ് കോളുകൾ"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"പുതിയ കോൾ. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. തിരികെ വിളിക്കാൻ ക്ലിക്കുചെയ്യുക"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"നിങ്ങൾ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"ഇമെയിൽ ഫീൽഡിലോ ഫോൺ ഫീൽഡിലോ വ്യക്തിയുടെ Hangouts ഐഡന്റിഫയർ നൽകുമ്പോൾ, Hangouts മികച്ചതായി പ്രവർത്തിക്കുന്നു."</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 9f9fad4..e7c4857 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Байгууллага нэмэх"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Огноо"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Бүлгэмийн нэр"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Солих"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Ерөнхий зураг"</string>
     <string name="description_star" msgid="2605854427360036550">"дуртай"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Харилцагчийг засварлах"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"аваагүй"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"саяхны дуудлага. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. буцааж залгахын тулд товшино уу"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Та: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts апликейшн нь таныг найзуудынхаа мэдээллийг харилцагчийн и-мэйл эсвэл гар утасны талбарт оруулбал илүү сайн ажилладаг."</string>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index ff0ccd8..40342e5 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"संस्‍था जोडा"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"तारीख"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"गट नाव"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"बदला"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"प्राथमिक फोटो"</string>
     <string name="description_star" msgid="2605854427360036550">"आवडते"</string>
     <string name="edit_contact" msgid="7529281274005689512">"संपर्क संपादित करा"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"सुटलेले"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"अलीकडील कॉल. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. परत कॉल करण्यासाठी क्लिक करा"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"आपण: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"आपण ईमेल फिल्डमध्ये किंवा फोन फिल्डमध्ये एखाद्या व्यक्तीचे Hangouts अभिज्ञापक प्रविष्ट करता तेव्हा Hangouts उत्कृष्ट कार्य करते."</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 934588d..b3f3d57 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Tambah organisasi"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Tarikh"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nama kumpulan"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Tukar"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Foto utama"</string>
     <string name="description_star" msgid="2605854427360036550">"kegemaran"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Edit kenalan"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"tidak dijawab"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"panggilan terbaharu. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik untuk memanggil balik"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Anda: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts berfungsi lebih baik apabila anda memasukkan pengecam Hangouts individu itu ke dalam medan e-mel atau telefon."</string>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 4a94a2a..03468a7 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"အဖွဲ့အစည်းထည့်ရန်"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"ရက်စွဲ"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"အုပ်စုနာမည်"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"ပြောင်းရန်"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"အဓိက ဓာတ်ပုံ"</string>
     <string name="description_star" msgid="2605854427360036550">"အနှစ်သက်ဆုံး"</string>
     <string name="edit_contact" msgid="7529281274005689512">"အဆက်အသွယ်အားပြင်ရန်"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"လွတ်သွား"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"မကြာမီက ခေါ်ဆိုမှု။ <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ပြန်ခေါ်ရန် ကလစ်ပါ"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"သင်: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"အီးမေးအကွက် သို့မဟုတ် ဖုန်းနံပါတ် အကွက်တွင် တစ်ခြားသူ၏ Hangouts  အမှတ်သညာအား သင်ရိုက်ထည့်သည့်အခါ Hangouts ပိုမိုလွယ်ကူကောင်းမွန်စွာ အလုပ်လုပ်သည်။"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9a0e248..ae105b5 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Legg til organisasjon"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dato"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Gruppenavn"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Endre"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Hovedbilde"</string>
     <string name="description_star" msgid="2605854427360036550">"favoritt"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Rediger kontakt"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"tapte"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"nylig oppringning. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klikk for å ringe tilbake"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Du: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts fungerer bedre når du går inn i personenes Hangouts-identifikatorer i e-postfeltet eller telefonfeltet."</string>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index d143288..5141e1a 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"छुटेको"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"हालैको कल। <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. कल फिर्ता गर्न क्लिक गर्नुहोस्"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"तपाईँ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"तपाईंले इमेल क्षेत्र वा फोन क्षेत्रमा व्यक्तिको Hangouts परिचायक प्रविष्ट गर्नु हुँदा Hangouts राम्रो काम गर्दछ।"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 4539c1d..34609fa 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"gemist"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"recente oproep. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. klik om terug te bellen"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"U: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts werkt beter wanneer u de Hangouts-ID van de betreffende persoon in het veld \'E-mail\' of \'Telefoon\' opgeeft."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 668a4e3..0729ecc 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Dodaj organizację"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nazwa grupy"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Zmień"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Główne zdjęcie"</string>
     <string name="description_star" msgid="2605854427360036550">"ulubione"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Edytuj kontakt"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"nieodebrane"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"ostatnie połączenie. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknij, by oddzwonić"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Ty: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"W przypadku Hangouts lepiej wpisać identyfikator danej osoby w polu adresu e-mail lub telefonu."</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index f7b50c8..d7f1485 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Adicionar entidade"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nome do grupo"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Alterar"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Fot. principal"</string>
     <string name="description_star" msgid="2605854427360036550">"favorito"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Editar contacto"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"não atendida"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para ligar de volta"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"O utilizador: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"O Hangouts funciona melhor quando introduz o identificador do Hangouts da pessoa no campo do email ou no campo do telefone."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 0701cfe..44735f5 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Adicionar organização"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Data"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nome do grupo"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Alterar"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Foto principal"</string>
     <string name="description_star" msgid="2605854427360036550">"favorito"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Editar contato"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"perdida"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"chamada recente. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. clique para retornar a chamada"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Você: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"O Hangouts funciona melhor quando você insere o identificador do Hangouts da pessoa no campo de e-mail ou de telefone."</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6e010c5..e666a85 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Adăugaţi o organizaţie"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dată"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Nume grup"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Modificați"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Foto. de bază"</string>
     <string name="description_star" msgid="2605854427360036550">"preferate"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Editaţi informaţiile despre persoana din agendă"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"pierdut"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"apel recent. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. dați clic pentru a apela"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Dvs.: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts funcționează mai bine când introduceți identificatorul Hangouts al persoanei în câmpul pentru adresa de e-mail sau în câmpul pentru numărul de telefon."</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index a3ebce3..ffaccb8 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Добавить организацию"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Дата"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Название группы"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Изменить"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Основное фото"</string>
     <string name="description_star" msgid="2605854427360036550">"избранное"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Изменить контакт"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропущенный"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Недавний вызов. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Нажмите, чтобы перезвонить."</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Вы: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Чтобы обеспечить надежную работу Hangouts, указывайте вместо адреса электронной почты или номера телефона идентификатор пользователя в Hangouts."</string>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index 450d202..b029132 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"හමු නොවී යන ලදි"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"මෑත අමන්තුම්. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. ආපසු ඇමතිමට ක්ලික් කරන්න"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"ඔබ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"ඔබ පුද්ගලයාගේ Hangouts හඳුන්වනය ඊ-තැපැල් හෝ දුරකථන ක්ෂේත්‍රයට ඇතුළත් කළ විටHangouts වඩා හොඳින් ක්‍රියා කරයි."</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d4e7cdf..789d958 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Pridať organizáciu"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Dátum"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Názov skupiny"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Zmeniť"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Hlavná fotka"</string>
     <string name="description_star" msgid="2605854427360036550">"zaradiť medzi obľúbené"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Upraviť kontakt"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"zmeškaný"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"nedávny hovor. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknutím zavoláte späť"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Vy: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Služba Hangouts funguje lepšie, keď do poľa pre e-mailovú adresu alebo telefón zadáte identifikátor osoby v službe Hangouts."</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index e6cb4cc..986d818 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Dodaj organizacijo"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Ime skupine"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Spremeni"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Glavna fotogr."</string>
     <string name="description_star" msgid="2605854427360036550">"priljubljeno"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Uredi stik"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"Zgrešeni"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"nedavni klic. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. kliknite, če želite poklicati nazaj"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Vi: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Pogovori Hangouts delujejo bolje, če v polje za e-pošto ali polje za telefon vnesete identifikator osebe za pogovore Hangouts."</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 331c720..b9547ea 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Додај организацију"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Датум"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Назив групе"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Промени"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Главна слика"</string>
     <string name="description_star" msgid="2605854427360036550">"омиљено"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Измени контакт"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропуштени"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Недавни позив. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Кликните за повратни позив"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Ви: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts ради боље кад унесете Hangouts идентификатор особе у поље за имејл адресу или број телефона."</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8109875..2c66c69 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Lägg till organisation"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Datum"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Gruppnamn"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Ändra"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Primärt foto"</string>
     <string name="description_star" msgid="2605854427360036550">"favorit"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Redigera kontakt"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"missade"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"samtal. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. Klicka om du vill ringa upp"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Du: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts fungerar bättre när du anger personens identifierare i Hangouts i e-postfältet eller mobilfältet."</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 377cc65..995948d 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Ongeza shirika"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Tarehe"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Jina la kikundi"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Badilisha"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Picha ya msingi"</string>
     <string name="description_star" msgid="2605854427360036550">"kipendwa"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Hariri anwani"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ulizokosa kupokea"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"simu ya hivi karibuni. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. bofya ili upige simu"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Wewe: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangout hufanya kazi vizuri zaidi unapoweka nambari ya mtu ya utambulisho wa Hangout katika sehemu ya anwani ya barua pepe au sehemu ya nambari ya simu."</string>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index bd7efe2..039d44d 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"நிறுவனத்தைச் சேர்"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"தேதி"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"குழு பெயர்"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"மாற்று"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"முதன்மை படம்"</string>
     <string name="description_star" msgid="2605854427360036550">"பிடித்தது"</string>
     <string name="edit_contact" msgid="7529281274005689512">"தொடர்பைத் திருத்து"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"தவறிய அழைப்பு"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"சமீபத்திய அழைப்பு. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. திரும்ப அழைக்க, கிளிக் செய்க"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"நீங்கள்: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"பிறரின் Hangouts அடையாளத்தை மின்னஞ்சல் அல்லது ஃபோன் புலத்தில் உள்ளிடும் போது, Hangouts இன்னும் சிறப்பாகச் செயல்படும்."</string>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 7626889..b6ebc04 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"సంస్థను జోడించు"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"తేదీ"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"సమూహం పేరు"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"మార్చు"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"ప్రాథమిక ఫోటో"</string>
     <string name="description_star" msgid="2605854427360036550">"ఇష్టంగా గుర్తించు"</string>
     <string name="edit_contact" msgid="7529281274005689512">"పరిచయాన్ని సవరించు"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"మిస్డ్"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"ఇటీవలి కాల్. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. తిరిగి కాల్ చేయడానికి క్లిక్ చేయండి"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"మీరు: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"మీరు ఇమెయిల్ ఫీల్డ్ లేదా ఫోన్ ఫీల్డ్‌లో వ్యక్తి యొక్క Hangouts ఐడెంటిఫైయర్‌ని నమోదు చేసినప్పుడు Hangouts ఉత్తమంగా పని చేస్తాయి."</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 09a8295..e5634a0 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"เพิ่มองค์กร"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"วันที่"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"ชื่อกลุ่ม"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"เปลี่ยน"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"รูปภาพหลัก"</string>
     <string name="description_star" msgid="2605854427360036550">"รายการโปรด"</string>
     <string name="edit_contact" msgid="7529281274005689512">"แก้ไขรายชื่อติดต่อ"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"ไม่ได้รับ"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"โทรล่าสุด <xliff:g id="CALL_TYPE">%s</xliff:g> <xliff:g id="PHONE_NUMBER">%s</xliff:g> <xliff:g id="DATE">%s</xliff:g> คลิกเพื่อโทรกลับ"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"คุณ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"แฮงเอาท์ทำงานได้ดียิ่งขึ้นเมื่อคุณป้อนตัวระบุแฮงเอาท์ของบุคคลที่ต้องการลงในช่องอีเมลหรือช่องโทรศัพท์"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 7a8d826..c72ba47 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Magdagdag ng samahan"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Petsa"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Pangalan ng pangkat"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Baguhin"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Pangunahing larawan"</string>
     <string name="description_star" msgid="2605854427360036550">"paborito"</string>
     <string name="edit_contact" msgid="7529281274005689512">"I-edit ang Contact"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"hindi nasagot"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"kamakailang tawag. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. mag-click upang tumawag"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Ikaw: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Gagana nang mas maayos ang Hangouts kapag inilagay mo ang identifier sa Hangouts ng isang tao sa field ng email o sa field ng telepono."</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 4db8337..fb0eb49 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"Kuruluş ekle"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"Tarih"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"Grup adı"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"Değiştir"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"Birincil fotoğraf"</string>
     <string name="description_star" msgid="2605854427360036550">"favori"</string>
     <string name="edit_contact" msgid="7529281274005689512">"Kişiyi düzenle"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"cevapsız"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"son gelen çağrı. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. geri aramak için dokunun"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Siz: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Kişinin Hangouts tanımlayıcısını e-posta veya telefon alanına girdiğinizde Hangouts daha iyi çalışır."</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 184b790..ada8bc7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"пропущені дзвінки"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"Останній дзвінок: <xliff:g id="CALL_TYPE">%s</xliff:g>, <xliff:g id="PHONE_NUMBER">%s</xliff:g>, <xliff:g id="DATE">%s</xliff:g>. Натисніть, щоб зателефонувати"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Ви: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Щоб сервіс Hangouts працював краще, введіть свій ідентифікатор Hangouts у поле \"Електронна адреса\" або \"Телефон\"."</string>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index e1e0c5b..3ed0c5d 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"تنظیم شامل کریں"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"تاریخ"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"گروپ کا نام"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"تبدیل کریں"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"بنیادی تصویر"</string>
     <string name="description_star" msgid="2605854427360036550">"پسندیدہ"</string>
     <string name="edit_contact" msgid="7529281274005689512">"رابطہ میں ترمیم کریں"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"چھوٹی ہوئی"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"حالیہ کال۔ <xliff:g id="CALL_TYPE">%s</xliff:g>۔ <xliff:g id="PHONE_NUMBER">%s</xliff:g>۔ <xliff:g id="DATE">%s</xliff:g>۔ واپسی کال کرنے کیلئے کلک کریں"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"آپ: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"‏جب آپ کسی شخص کا Hangouts شناخت کنندہ ای میل فیلڈ یا فون فیلڈ میں داخل کرتے ہیں تو Hangouts بہتر کام کرتا ہے۔"</string>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 14dac5d..f6b4b50 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"javobsiz"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"so‘nggi qo‘ng‘iroq. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. qaytarib qo‘ng‘iroq qilish uchun bosing"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Siz: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts yanada yaxshi ishlashi uchun e-pochta yoki telefon raqami maydoniga foydalanuvchining Hangouts identifikatorini kiriting."</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 21bea5f..d5dec90 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"cuộc gọi bị nhỡ"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"cuộc gọi gần đây. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. nhấp để gọi lại"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Bạn: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"Hangouts hoạt động tốt hơn khi bạn nhập số nhận dạng Hangouts của người đó vào trường email hoặc trường điện thoại."</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index acf1778..478d056 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"添加工作单位"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"日期"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"群组名称"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"更改"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"主照片"</string>
     <string name="description_star" msgid="2605854427360036550">"收藏"</string>
     <string name="edit_contact" msgid="7529281274005689512">"编辑联系人"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"未接电话"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"近期通话:<xliff:g id="CALL_TYPE">%s</xliff:g>,<xliff:g id="PHONE_NUMBER">%s</xliff:g>,<xliff:g id="DATE">%s</xliff:g>。点按可回拨。"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"您:<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"请将联系人的环聊帐户信息输入到电子邮件地址字段或电话号码字段,以便获得更佳的环聊使用体验。"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 89c819e..aede0d4 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"新增機構"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"日期"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"群組名稱"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"變更"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"主要相片"</string>
     <string name="description_star" msgid="2605854427360036550">"我的最愛"</string>
     <string name="edit_contact" msgid="7529281274005689512">"編輯聯絡人"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"未接來電"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"最近通話 (<xliff:g id="CALL_TYPE">%s</xliff:g>、<xliff:g id="PHONE_NUMBER">%s</xliff:g>、<xliff:g id="DATE">%s</xliff:g>)。按一下即可回電"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"您:<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"當您在電郵欄或手機欄中輸入個人的 Hangouts 識別碼時,Hangouts 會提供更卓越的服務。"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 36ea16f..cff2ef9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -156,10 +156,8 @@
     <string name="add_organization" msgid="7311893231158291197">"填寫聯絡人任職單位"</string>
     <string name="event_edit_field_hint_text" msgid="5794424930242630477">"日期"</string>
     <string name="group_edit_field_hint_text" msgid="3966441850870457808">"群組名稱"</string>
-    <!-- no translation found for change_photo (8530597935483526383) -->
-    <skip />
-    <!-- no translation found for primary_photo (8517942231868516999) -->
-    <skip />
+    <string name="change_photo" msgid="8530597935483526383">"變更"</string>
+    <string name="primary_photo" msgid="8517942231868516999">"主要相片"</string>
     <string name="description_star" msgid="2605854427360036550">"我的收藏"</string>
     <string name="edit_contact" msgid="7529281274005689512">"編輯聯絡人"</string>
   <plurals name="merge_info">
@@ -262,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"未接來電"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"近期通話。<xliff:g id="CALL_TYPE">%s</xliff:g>。<xliff:g id="PHONE_NUMBER">%s</xliff:g>。<xliff:g id="DATE">%s</xliff:g>。按一下即可回電"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"您:<xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"如果您在電子郵件欄位或電話欄位中輸入聯絡人的 Hangouts 識別碼,可讓 Hangouts 的運作效能更佳。"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6d8a087..f425e62 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -260,6 +260,5 @@
     <string name="content_description_recent_call_type_missed" msgid="7371810920196048204">"akuphuthele"</string>
     <string name="content_description_recent_call" msgid="5183800406316723676">"ikholi yakamuva. <xliff:g id="CALL_TYPE">%s</xliff:g>. <xliff:g id="PHONE_NUMBER">%s</xliff:g>. <xliff:g id="DATE">%s</xliff:g>. chofoza ukuze uphinde ushaye"</string>
     <string name="message_from_you_prefix" msgid="7180706529908434482">"Wena: <xliff:g id="SMS_BODY">%s</xliff:g>"</string>
-    <!-- no translation found for contact_editor_hangouts_im_alert (114855385615225735) -->
-    <skip />
+    <string name="contact_editor_hangouts_im_alert" msgid="114855385615225735">"I-Hangouts isebenza kangcono uma ufaka isikhombi somuntu se-Hangouts kunkambu ye-imeyili noma kunkambu yefoni."</string>
 </resources>
diff --git a/src/com/android/contacts/ContactSaveService.java b/src/com/android/contacts/ContactSaveService.java
index bdd2dd0..02a2471 100644
--- a/src/com/android/contacts/ContactSaveService.java
+++ b/src/com/android/contacts/ContactSaveService.java
@@ -514,6 +514,9 @@
     private long getInsertedRawContactId(
             final ArrayList<ContentProviderOperation> diff,
             final ContentProviderResult[] results) {
+        if (results == null) {
+            return -1;
+        }
         final int diffSize = diff.size();
         final int numResults = results.length;
         for (int i = 0; i < diffSize && i < numResults; i++) {
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
index 55f2ad0..a5057d3 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1083,7 +1083,7 @@
         final MenuItem ringToneMenu = menu.findItem(R.id.menu_set_ringtone);
         final MenuItem deleteMenu = menu.findItem(R.id.menu_delete);
         deleteMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        deleteMenu.setIcon(R.drawable.ic_trash_white_24);
+        deleteMenu.setIcon(R.drawable.ic_delete_white_24dp);
 
         // Set visibility of menus
         doneMenu.setVisible(false);
diff --git a/src/com/android/contacts/list/JoinContactListFragment.java b/src/com/android/contacts/list/JoinContactListFragment.java
index 3e42fdf..89b02da 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -129,7 +129,9 @@
     private void showTargetContactName(String displayName) {
         Activity activity = getActivity();
         TextView blurbView = (TextView) activity.findViewById(R.id.join_contact_blurb);
-        String blurb = activity.getString(R.string.blurbJoinContactDataWith, displayName);
+        final String name = !TextUtils.isEmpty(displayName) ? displayName
+            : activity.getString(R.string.missing_name);
+        String blurb = activity.getString(R.string.blurbJoinContactDataWith, name);
         blurbView.setText(blurb);
     }
 
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 1da010c..849bae3 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2344,7 +2344,9 @@
                 deleteContact();
                 return true;
             case R.id.menu_share:
-                shareContact();
+                if (isContactShareable()) {
+                    shareContact();
+                }
                 return true;
             case R.id.menu_create_contact_shortcut:
                 createLauncherShortcutWithContact();