am e464811c: (-s ours) Import revised translations. DO NOT MERGE
* commit 'e464811c41bc9f1323ea60a144e96f18102162f1':
Import revised translations. DO NOT MERGE
diff --git a/res/drawable-xlarge-hdpi/panel_message.9.png b/res/drawable-hdpi/panel_message.9.png
similarity index 100%
rename from res/drawable-xlarge-hdpi/panel_message.9.png
rename to res/drawable-hdpi/panel_message.9.png
Binary files differ
diff --git a/res/drawable-xlarge-mdpi/panel_message.9.png b/res/drawable-mdpi/panel_message.9.png
similarity index 100%
rename from res/drawable-xlarge-mdpi/panel_message.9.png
rename to res/drawable-mdpi/panel_message.9.png
Binary files differ
diff --git a/res/layout/contact_browser.xml b/res/layout/contact_browser.xml
index 0b4bb63..8affd46 100644
--- a/res/layout/contact_browser.xml
+++ b/res/layout/contact_browser.xml
@@ -18,4 +18,25 @@
android:id="@+id/list_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
+ <FrameLayout
+ android:id="@+id/main_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+ <fragment
+ android:id="@+id/list_fragment"
+ class="com.android.contacts.list.DefaultContactBrowseListFragment"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ />
+ </FrameLayout>
+ <FrameLayout
+ android:id="@+id/contacts_unavailable_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone">
+ <FrameLayout
+ android:id="@+id/contacts_unavailable_container"
+ android:layout_height="match_parent"
+ android:layout_width="match_parent" />
+ </FrameLayout>
</FrameLayout>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 6b39924..6fb5b8a 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"إزالة بعض التطبيقات"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"إعادة محاولة الترقية"</string>
<string name="search_results_searching" msgid="7755623475227227314">"جارِ البحث..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"عرض العناصر المحددة"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"عرض الكل"</string>
- <string name="menu_select_all" msgid="621719255150713545">"تحديد الكل"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"إلغاء تحديد الكل"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"تم تحديد متلقٍ واحد"</item>
- <item quantity="other" msgid="4608837420986126229">"تم تحديد <xliff:g id="COUNT">%d</xliff:g> من المستلمين"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"لم يتم تحديد جهات اتصال."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"عرض العناصر المحددة"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"عرض الكل"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"تحديد الكل"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"إلغاء تحديد الكل"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"لم يتم تحديد جهات اتصال."</string>
<string name="add_field" msgid="2384260056674995230">"إضافة حقل آخر"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"عبر <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> عبر <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b63758b..ea351fb 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Деинсталиране на някои приложения"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Повторен опит за надстройка"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Търси се..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Показване на избраните"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Показване на всички"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Избиране на всички"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Премахване на избора от всички"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Избран е 1 получател"</item>
- <item quantity="other" msgid="4608837420986126229">"<xliff:g id="COUNT">%d</xliff:g> избрани получатели"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Няма избрани контакти."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Показване на избраните"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Показване на всички"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Избиране на всичко"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Премахване на избора от всички"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Няма избрани контакти."</string>
<string name="add_field" msgid="2384260056674995230">"Добавяне на друго поле"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"чрез <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> чрез <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 87a0cc5..4bdc97a 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Desinstal·leu aplicacions"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Torna a provar d\'actualitzar"</string>
<string name="search_results_searching" msgid="7755623475227227314">"S\'està cercant..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Mostra la selecció"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Mostra-ho tot"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Selecciona-ho tot"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Anul·la tota la selecció"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"1 destinatari seleccionat"</item>
- <item quantity="other" msgid="4608837420986126229">"<xliff:g id="COUNT">%d</xliff:g> destinataris seleccionats"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"No s\'ha seleccionat cap contacte."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Mostra la selecció"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Mostra-ho tot"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Selecciona-ho tot"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Anul·la tota la selecció"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"No s\'ha seleccionat cap contacte."</string>
<string name="add_field" msgid="2384260056674995230">"Afegeix un altre camp"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"mitjançant <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> mitjançant <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 47b95ec..e2212c8 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Uninstall some applications"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Retry upgrade"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Searching..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Show selected"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Show all"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Select all"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Unselect all"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"1 recipient selected"</item>
- <item quantity="other" msgid="4608837420986126229">"<xliff:g id="COUNT">%d</xliff:g> recipients selected"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"No contacts selected."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Show selected"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Show all"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Select all"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Unselect all"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"No contacts selected."</string>
<string name="add_field" msgid="2384260056674995230">"Add another field"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"via <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> via <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 1d1ed2d..a97b9a6 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"حذف نصب برخی از برنامه های کاربردی"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"امتحان مجدد برای ارتقا"</string>
<string name="search_results_searching" msgid="7755623475227227314">"در حال جستجو..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"نمایش موارد انتخاب شده"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"نمایش همه"</string>
- <string name="menu_select_all" msgid="621719255150713545">"انتخاب همه"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"لغو انتخاب همه موارد"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"1 گیرنده انتخاب شد"</item>
- <item quantity="other" msgid="4608837420986126229">"<xliff:g id="COUNT">%d</xliff:g> گیرنده انتخاب شد"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"مخاطبی انتخاب نشده است."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"نمایش موارد انتخاب شده"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"نمایش همه"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"انتخاب همه"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"لغو انتخاب همه موارد"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"مخاطبی انتخاب نشده است."</string>
<string name="add_field" msgid="2384260056674995230">"افزودن یک قسمت دیگر"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"از طریق <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> از طریق <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c4dbf42..de008cf 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Poista sovelluksia"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Yritä päivitystä uudelleen"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Haetaan…"</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Näytä valitut"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Näytä kaikki"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Valitse kaikki"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Poista kaikki valinnat"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"1 vastaanottaja valittu"</item>
- <item quantity="other" msgid="4608837420986126229">"<xliff:g id="COUNT">%d</xliff:g> vastaanottajaa valittu"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Ei valittuja yhteystietoja."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Näytä valitut"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Näytä kaikki"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Valitse kaikki"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Poista kaikki valinnat"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Ei valittuja yhteystietoja."</string>
<string name="add_field" msgid="2384260056674995230">"Lisää toinen kenttä"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"lähteestä: <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> lähteestä: <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f421898..010115e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -161,12 +161,12 @@
<string name="simContacts_title" msgid="27341688347689769">"Contacts de carte SIM"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Vous n\'avez aucun contact à afficher. Si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes."</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Vous n\'avez aucun contact à afficher."</string>
- <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:560 in java.io.StringReader@7a6d084b) -->
- <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:567 in java.io.StringReader@c3bb2b8) -->
+ <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:560 in java.io.StringReader@1948cc8c) -->
+ <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:567 in java.io.StringReader@7a6d084b) -->
<string name="noContactsHelpTextWithSync" product="tablet" msgid="2364665535969139880">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", puis sur :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts vers la tablette ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier les paramètres de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SIM ou SD."\n</li></string>
<string name="noContactsHelpTextWithSync" product="default" msgid="3017521127042216243">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SIM ou SD."\n</li></string>
- <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:565 in java.io.StringReader@2352544e) -->
- <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:571 in java.io.StringReader@721cdeff) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:565 in java.io.StringReader@721cdeff) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:571 in java.io.StringReader@457471e0) -->
<string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="6222739731808897565">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", puis sur :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts vers la tablette ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier les paramètres de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SD."\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="default" msgid="9040060730467973050">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SD."\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"Vous ne disposez d\'aucun favoris."\n\n"Pour ajouter un contact à la liste de favoris :"\n\n" "<li>"Appuyez sur l\'onglet "<b>"Contacts"</b>"."\n</li>" "\n<li>"Appuyez sur le contact à ajouter à vos favoris."\n</li>" "\n<li>"Appuyez sur l\'étoile en regard du nom du contact."\n</li></string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 3457279..4209837 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Deinstaliraj neke aplikacije"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Pokušaj ponovo nadogradnju"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Pretraživanje..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Prikaži odabrano"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Pokaži sve"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Odaberi sve"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Poništi odabir svega"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Odabran je 1 primatelj"</item>
- <item quantity="other" msgid="4608837420986126229">"Odabrano primatelja: <xliff:g id="COUNT">%d</xliff:g>"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Nije odabran nijedan kontakt."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Prikaži odabrano"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Pokaži sve"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Odaberi sve"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Poništi odabir svega"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Nije odabran nijedan kontakt."</string>
<string name="add_field" msgid="2384260056674995230">"Dodaj drugo polje"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"preko izvora <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> preko izvora <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2095015..f98bd08 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Távolítson el néhány alkalmazást"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Verziófrissítés újrapróbálása"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Keresés..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Kiválasztottak megjelenítése"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Összes megjelenítése"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Összes kijelölése"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Összes kijelölés megszüntetése"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"1 címzett kiválasztva"</item>
- <item quantity="other" msgid="4608837420986126229">"<xliff:g id="COUNT">%d</xliff:g> címzett kiválasztva"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Nincs kijelölt névjegy."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Kiválasztottak megjelenítése"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Összes megjelenítése"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Összes kijelölése"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Összes kijelölés megszüntetése"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Nincs kijelölt névjegy."</string>
<string name="add_field" msgid="2384260056674995230">"Más mező hozzáadása"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"- <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> - <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 56bc6d0..8a75f3a 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Copot pemasangan beberapa aplikasi"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Coba peningkatan versi sekali lagi"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Menelusuri..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Tampilkan yang dipilih"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Tampilkan semua"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Pilih semua"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Batal pilih semua"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"1 penerima dipilih"</item>
- <item quantity="other" msgid="4608837420986126229">"<xliff:g id="COUNT">%d</xliff:g> penerima dipilih"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Tidak ada kenalan yang dipilih."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Tampilkan yang dipilih"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Tampilkan semua"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Pilih semua"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Batal pilih semua"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Tidak ada kenalan yang dipilih."</string>
<string name="add_field" msgid="2384260056674995230">"Tambahkan bidang lain"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"melalui <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> melalui <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index cbae1a4..67198d3 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"הסר התקנה של יישומים מסוימים"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"נסה שוב לשדרג"</string>
<string name="search_results_searching" msgid="7755623475227227314">"מחפש..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"הצג פריטים שנבחרו"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"הצג הכל"</string>
- <string name="menu_select_all" msgid="621719255150713545">"בחר הכל"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"בטל בחירה של הכל"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"נבחר נמען אחד"</item>
- <item quantity="other" msgid="4608837420986126229">"<xliff:g id="COUNT">%d</xliff:g> נמענים נבחרו"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"לא נבחרו אנשי קשר."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"הצג פריטים שנבחרו"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"הצג הכל"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"בחר הכל"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"בטל את הבחירה של הכל"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"לא נבחרו אנשי קשר."</string>
<string name="add_field" msgid="2384260056674995230">"הוסף שדה נוסף"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"דרך <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> דרך <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 434d85d..7a0b34e 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Pašalinti kai kurias programas"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Bandyti naujovinti iš naujo"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Ieškoma..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Rodyti pasirinktus"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Rodyti visus"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Pasirinkti visus"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Atšaukti visų pasirinkimą"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Pasirinktas vienas gavėjas"</item>
- <item quantity="other" msgid="4608837420986126229">"Pasirinkta gavėjų: <xliff:g id="COUNT">%d</xliff:g>"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Nepasirinkote kontaktų."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Rodyti pasirinktus"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Rodyti viską"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Pasirinkti visus"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Atšaukti visų pasirinkimą"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Nepasirinkote kontaktų."</string>
<string name="add_field" msgid="2384260056674995230">"Pridėti kitą lauką"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"naudojant „<xliff:g id="SOURCE">%1$s</xliff:g>“"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> naudojant „<xliff:g id="SOURCE">%2$s</xliff:g>“"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b145c6f..8f89efe 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Atinstalēt dažas lietojumprogrammas"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Mēģināt jaunināt vēlreiz"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Notiek meklēšana..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Rādīt atlasi"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Rādīt visus"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Atlasīt visas"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Noņemt atlasi visam"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Ir atlasīts 1 adresāts"</item>
- <item quantity="other" msgid="4608837420986126229">"Ir atlasīti <xliff:g id="COUNT">%d</xliff:g> adresāti"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Nav atlasīta neviena kontaktpersona."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Parādīt atlasi"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Rādīt visu"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Atlasīt visu"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Noņemt atlasi visam"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Nav atlasīta neviena kontaktpersona."</string>
<string name="add_field" msgid="2384260056674995230">"Pievienot vēl vienu lauku"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"izmantojot <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g>, izmantojot <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index b22f0ab..74620ce 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -161,12 +161,12 @@
<string name="simContacts_title" msgid="27341688347689769">"Kontakter på SIM-kort"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Du har ingen kontakter å vise. (Hvis du nettopp har lagt til en konto, kan det ta noen minutter å synkronisere kontaktene.)"</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Du har ingen kontakter å vise."</string>
- <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:292 in java.io.StringReader@c3bb2b8) -->
- <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:293 in java.io.StringReader@2352544e) -->
+ <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:292 in java.io.StringReader@272d7a10) -->
+ <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:293 in java.io.StringReader@1aa8c488) -->
<string name="noContactsHelpTextWithSync" product="tablet" msgid="2364665535969139880">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>", og trykk deretter på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer"</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til nettbrettet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt fra grunnen av"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Eksporter"</b></font>" for å importere kontakter fra SIM- eller SD-kort"\n</li></string>
<string name="noContactsHelpTextWithSync" product="default" msgid="3017521127042216243">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer "</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til telefonen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importér/Eksportér"</b></font>" for å importere kontakter fra SIM- eller SD-kort"\n</li></string>
- <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@721cdeff) -->
- <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@457471e0) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@3dfeca64) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@22998b08) -->
<string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="6222739731808897565">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>", og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer"</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til nettbrettet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt fra grunnen av"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/eksporter"</b></font>" for å importere kontakter fra SD-kortet"\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="default" msgid="9040060730467973050">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer "</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til telefonen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importér/eksportér"</b></font>" for å importere kontakter fra SD-kortet"\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"Du har ingen favoritter."\n\n"Slik legger du til en kontakt i favorittlisten:"\n\n" "<li>"Trykk på fanen "<b>"Kontakter"</b>" "\n</li>" "\n<li>"Trykk på kontakten du vil legge til i favoritter"\n</li>" "\n<li>"Trykk på stjernen ved siden av kontaktnavnet"\n</li></string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 672dcfb..c75455e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Dezinstalaţi unele aplicaţii"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Încercaţi din nou trecerea la o versiune superioară"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Se caută..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Afişaţi elementele selectate"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Afişaţi-i pe toţi"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Selectaţi-le pe toate"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Deselectaţi-le pe toate"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"1 destinatar selectat"</item>
- <item quantity="other" msgid="4608837420986126229">"<xliff:g id="COUNT">%d</xliff:g> (de) destinatari selectaţi"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Nu aţi selectat nicio persoană din Agendă."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Afişaţi elementele selectate"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Afişaţi-le pe toate"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Selectaţi-le pe toate"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Deselectaţi-le pe toate"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Nu aţi selectat nicio persoană din Agendă."</string>
<string name="add_field" msgid="2384260056674995230">"Adăugaţi alt câmp"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"de pe <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"La ora <xliff:g id="DATE">%1$s</xliff:g> de pe <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c035ad7..d04baee 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -73,7 +73,7 @@
<string name="label_notes" msgid="8337354953278341042">"Примечания"</string>
<string name="label_sip_address" msgid="124073911714324974">"Интернет-вызов"</string>
<string name="label_ringtone" msgid="8833166825330686244">"Мелодия"</string>
- <string name="ghostData_phonetic_name" msgid="7852749081984070902">"Транскрипция имени"</string>
+ <string name="ghostData_phonetic_name" msgid="7852749081984070902">"Произношение имени"</string>
<string name="ghostData_company" msgid="5414421120553765775">"Компания"</string>
<string name="ghostData_title" msgid="7496735200318496110">"Название"</string>
<string name="invalidContactMessage" msgid="5816991830260044593">"Контакт не существует."</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d335a22..9387955 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Odinštalovať niektoré aplikácie"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Skúsiť inovovať znova"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Prebieha vyhľadávanie..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Zobraziť vybraté"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Zobraziť všetky"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Vybrať všetko"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Zrušiť výber všetkých"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Bol vybratý 1 príjemca"</item>
- <item quantity="other" msgid="4608837420986126229">"Počet vybratých príjemcov: <xliff:g id="COUNT">%d</xliff:g>"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Nie sú vybraté žiadne kontakty."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Zobraziť vybraté"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Zobraziť všetky"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Vybrať všetko"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Zrušiť výber všetkých"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Nie sú vybraté žiadne kontakty."</string>
<string name="add_field" msgid="2384260056674995230">"Pridať ďalšie pole"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">", zdroj: <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g>, zdroj: <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 1684cc2..3792f83 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Odstranite nekaj aplikacij"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Znova poskusi nadgraditi"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Iskanje ..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Pokaži izbrane"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Pokaži vse"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Izberi vse"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Prekliči izbor vseh"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Izbran je 1 prejemnik"</item>
- <item quantity="other" msgid="4608837420986126229">"Št. izbranih prejemnikov: <xliff:g id="COUNT">%d</xliff:g>"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Izbran ni noben stik."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Pokaži izbrane"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Pokaži vse"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Izberi vse"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Prekliči izbor vseh"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Izbran ni noben stik."</string>
<string name="add_field" msgid="2384260056674995230">"Dodaj drugo polje"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"prek <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> prek <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 609c91e..02b1e85 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Деинсталирајте неке апликације"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Поново покушај надоградњу"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Претраживање..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Прикажи изабрано"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Прикажи све"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Изабери све"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Поништи све изборе"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Изабран је 1 прималац"</item>
- <item quantity="other" msgid="4608837420986126229">"Изабрано прималаца: <xliff:g id="COUNT">%d</xliff:g>"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Није изабран ниједан контакт."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Прикажи изабрано"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Прикажи све"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Изабери све"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Поништи све изборе"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Није изабран ниједан контакт."</string>
<string name="add_field" msgid="2384260056674995230">"Додај друго поље"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"преко <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> преко <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 013633e..c31d0bc 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"ถอนการติดตั้งแอปพลิเคชันบางอย่าง"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"ลองอัปเกรดซ้ำ"</string>
<string name="search_results_searching" msgid="7755623475227227314">"กำลังค้นหา..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"แสดงรายการที่เลือก"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"แสดงทั้งหมด"</string>
- <string name="menu_select_all" msgid="621719255150713545">"เลือกทั้งหมด"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"ยกเลิกการเลือกทั้งหมด"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"เลือกผู้รับ 1 ราย"</item>
- <item quantity="other" msgid="4608837420986126229">"เลือกผู้รับไว้ <xliff:g id="COUNT">%d</xliff:g> คน"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"ไม่ได้เลือกสมุดโทรศัพท์ไว้"</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"แสดงรายการที่เลือก"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"แสดงทั้งหมด"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"เลือกทั้งหมด"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"ยกเลิกการเลือกทั้งหมด"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"ไม่ได้เลือกรายชื่อติดต่อไว้"</string>
<string name="add_field" msgid="2384260056674995230">"เพิ่มฟิลด์อื่น"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"ผ่านทาง <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> ผ่านทาง <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index b71ae1e..ffd4088 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"I-uninstall ang ilang application"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Muling subukan ang i-upgrade"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Naghahanap..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Ipakita ang napili"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Ipakita lahat"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Piliin lahat"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Alisin sa pagkakapili ang lahat"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Napili ang 1 recipient"</item>
- <item quantity="other" msgid="4608837420986126229">"Napili ang <xliff:g id="COUNT">%d</xliff:g> (na) recipient"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Walang napiling contact."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Ipakita ang napili"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Ipakita lahat"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Piliin lahat"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Alisin sa pagkakapili ang lahat"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Walang mga napiling kontrata."</string>
<string name="add_field" msgid="2384260056674995230">"Magdagdag ng ibang field"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"sa pamamagitan ng <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> sa pamamagitan ng <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index e0ab69b..2197a8f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Видалити деякі програми"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Повтор. оновл."</string>
<string name="search_results_searching" msgid="7755623475227227314">"Пошук..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Показати вибране"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Показати все"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Вибрати все"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Скасувати все"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Вибрано 1 отримувача"</item>
- <item quantity="other" msgid="4608837420986126229">"Вибрано отримувачів: <xliff:g id="COUNT">%d</xliff:g>"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Контакти не вибрано."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Показати вибране"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Показати все"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Вибрати все"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Відмінити все"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Контакти не вибрано."</string>
<string name="add_field" msgid="2384260056674995230">"Додати ще одне поле"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">"через <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> через <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 484b354..8267995 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -422,15 +422,12 @@
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Gỡ cài đặt một số ứng dụng"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Thử lại nâng cấp"</string>
<string name="search_results_searching" msgid="7755623475227227314">"Đang tìm kiếm..."</string>
- <string name="menu_display_selected" msgid="6470001164297969034">"Hiển thị mục đã chọn"</string>
- <string name="menu_display_all" msgid="8887488642609786198">"Hiển thị tất cả"</string>
- <string name="menu_select_all" msgid="621719255150713545">"Chọn tất cả"</string>
- <string name="menu_select_none" msgid="7093222469852132345">"Bỏ chọn tất cả"</string>
- <plurals name="multiple_picker_title">
- <item quantity="one" msgid="4761009734586319101">"Đã chọn 1 người nhận"</item>
- <item quantity="other" msgid="4608837420986126229">"Đã chọn <xliff:g id="COUNT">%d</xliff:g> người nhận"</item>
- </plurals>
- <string name="no_contacts_selected" msgid="5877803471037324613">"Không có địa chỉ liên hệ nào được chọn."</string>
+ <!-- outdated translation 7509416164257469826 --> <string name="menu_display_selected" msgid="6470001164297969034">"Hiển thị mục đã chọn"</string>
+ <!-- outdated translation 6157266246378155002 --> <string name="menu_display_all" msgid="8887488642609786198">"Hiển thị tất cả"</string>
+ <!-- outdated translation 6071138984118728586 --> <string name="menu_select_all" msgid="621719255150713545">"Chọn tất cả"</string>
+ <!-- outdated translation 6876179536556771017 --> <string name="menu_select_none" msgid="7093222469852132345">"Bỏ chọn tất cả"</string>
+ <!-- no translation found for multiple_picker_title:other (4608837420986126229) -->
+ <!-- outdated translation 2762557778532289842 --> <string name="no_contacts_selected" msgid="5877803471037324613">"Không có địa chỉ liên hệ nào được chọn."</string>
<string name="add_field" msgid="2384260056674995230">"Thêm trường khác"</string>
<string name="contact_status_update_attribution" msgid="752179367353018597">" qua <xliff:g id="SOURCE">%1$s</xliff:g>"</string>
<string name="contact_status_update_attribution_with_date" msgid="7358045508107825068">"<xliff:g id="DATE">%1$s</xliff:g> qua <xliff:g id="SOURCE">%2$s</xliff:g>"</string>
diff --git a/src/com/android/contacts/ContactsUtils.java b/src/com/android/contacts/ContactsUtils.java
index 0e75a7f..76cbc7d 100644
--- a/src/com/android/contacts/ContactsUtils.java
+++ b/src/com/android/contacts/ContactsUtils.java
@@ -16,6 +16,11 @@
package com.android.contacts;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+
import android.content.Context;
import android.content.Intent;
import android.location.CountryDetector;
@@ -114,9 +119,19 @@
if (dataParts1.length != dataParts2.length) {
return false;
}
+ PhoneNumberUtil util = PhoneNumberUtil.getInstance();
for (int i = 0; i < dataParts1.length; i++) {
- if (!PhoneNumberUtils.compare(context, dataParts1[i], dataParts2[i])) {
- return false;
+ try {
+ PhoneNumber phoneNumber1 = util.parse(dataParts1[i], "ZZ" /* Unknown */);
+ PhoneNumber phoneNumber2 = util.parse(dataParts2[i], "ZZ" /* Unknown */);
+ MatchType matchType = util.isNumberMatch(phoneNumber1, phoneNumber2);
+ if (matchType != MatchType.SHORT_NSN_MATCH) {
+ return false;
+ }
+ } catch (NumberParseException e) {
+ if (!TextUtils.equals(dataParts1[i], dataParts2[i])) {
+ return false;
+ }
}
}
diff --git a/src/com/android/contacts/interactions/PhoneNumberInteraction.java b/src/com/android/contacts/interactions/PhoneNumberInteraction.java
index 277fa56..4448e28 100644
--- a/src/com/android/contacts/interactions/PhoneNumberInteraction.java
+++ b/src/com/android/contacts/interactions/PhoneNumberInteraction.java
@@ -16,6 +16,11 @@
package com.android.contacts.interactions;
+import com.google.i18n.phonenumbers.NumberParseException;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+import com.google.i18n.phonenumbers.PhoneNumberUtil.MatchType;
+import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
+
import com.android.contacts.Collapser;
import com.android.contacts.Collapser.Collapsible;
import com.android.contacts.ContactSaveService;
@@ -46,7 +51,7 @@
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.RawContacts;
-import android.telephony.PhoneNumberUtils;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -112,8 +117,16 @@
}
public boolean shouldCollapseWith(PhoneItem phoneItem) {
- if (PhoneNumberUtils.compareStrictly(phoneNumber, phoneItem.phoneNumber)) {
- return true;
+ try {
+ PhoneNumberUtil util = PhoneNumberUtil.getInstance();
+ PhoneNumber phoneNumber1 = util.parse(phoneNumber, "ZZ" /* Unknown */);
+ PhoneNumber phoneNumber2 = util.parse(phoneItem.phoneNumber, "ZZ" /* Unknown */);
+ MatchType matchType = util.isNumberMatch(phoneNumber1, phoneNumber2);
+ if (matchType == MatchType.SHORT_NSN_MATCH) {
+ return true;
+ }
+ } catch (NumberParseException e) {
+ return TextUtils.equals(phoneNumber, phoneItem.phoneNumber);
}
return false;
}
diff --git a/src/com/android/contacts/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
index 67c9c4a..4bd4ed9 100644
--- a/src/com/android/contacts/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -28,6 +28,8 @@
import android.content.Intent;
import android.content.res.Resources;
import android.net.Uri;
+import android.provider.ContactsContract.Contacts;
+import android.provider.ContactsContract.RawContactsEntity;
import android.text.TextUtils;
import android.util.Log;
import android.widget.RemoteViews;
@@ -131,7 +133,13 @@
composer.addHandler(composer.new HandlerForOutputStream(outputStream));
- if (!composer.init()) {
+ final Uri contentUriForRawContactsEntity = RawContactsEntity.CONTENT_URI.buildUpon()
+ .appendQueryParameter(RawContactsEntity.FOR_EXPORT_ONLY, "1")
+ .build();
+ // TODO: should provide better selection.
+ if (!composer.init(Contacts.CONTENT_URI, new String[] {Contacts._ID},
+ null, null,
+ null, contentUriForRawContactsEntity)) {
final String errorReason = composer.getErrorReason();
Log.e(LOG_TAG, "initialization of vCard composer failed: " + errorReason);
final String translatedErrorReason =
@@ -157,7 +165,7 @@
Log.i(LOG_TAG, "Export request is cancelled during composing vCard");
return;
}
- if (!composer.createOneEntry()) {
+ if (!composer.createOneEntryLegacy()) {
final String errorReason = composer.getErrorReason();
Log.e(LOG_TAG, "Failed to read a contact: " + errorReason);
final String translatedErrorReason =
diff --git a/tests/src/com/android/contacts/EntityModifierTests.java b/tests/src/com/android/contacts/EntityModifierTests.java
index 4acaa92..f4b225c 100644
--- a/tests/src/com/android/contacts/EntityModifierTests.java
+++ b/tests/src/com/android/contacts/EntityModifierTests.java
@@ -81,45 +81,50 @@
MockContactsSource() {
this.accountType = TEST_ACCOUNT_TYPE;
+ final DataKind nameKind = new DataKind(StructuredName.CONTENT_ITEM_TYPE,
+ R.string.nameLabelsGroup, -1, -1, true);
+ nameKind.typeOverallMax = 1;
+ addKind(nameKind);
+
// Phone allows maximum 2 home, 1 work, and unlimited other, with
// constraint of 5 numbers maximum.
- DataKind kind = new DataKind(Phone.CONTENT_ITEM_TYPE, -1, -1, 10, true);
+ final DataKind phoneKind = new DataKind(Phone.CONTENT_ITEM_TYPE, -1, -1, 10, true);
- kind.typeOverallMax = 5;
- kind.typeColumn = Phone.TYPE;
- kind.typeList = Lists.newArrayList();
- kind.typeList.add(new EditType(Phone.TYPE_HOME, -1).setSpecificMax(2));
- kind.typeList.add(new EditType(Phone.TYPE_WORK, -1).setSpecificMax(1));
- kind.typeList.add(new EditType(Phone.TYPE_FAX_WORK, -1).setSecondary(true));
- kind.typeList.add(new EditType(Phone.TYPE_OTHER, -1));
+ phoneKind.typeOverallMax = 5;
+ phoneKind.typeColumn = Phone.TYPE;
+ phoneKind.typeList = Lists.newArrayList();
+ phoneKind.typeList.add(new EditType(Phone.TYPE_HOME, -1).setSpecificMax(2));
+ phoneKind.typeList.add(new EditType(Phone.TYPE_WORK, -1).setSpecificMax(1));
+ phoneKind.typeList.add(new EditType(Phone.TYPE_FAX_WORK, -1).setSecondary(true));
+ phoneKind.typeList.add(new EditType(Phone.TYPE_OTHER, -1));
- kind.fieldList = Lists.newArrayList();
- kind.fieldList.add(new EditField(Phone.NUMBER, -1, -1));
- kind.fieldList.add(new EditField(Phone.LABEL, -1, -1));
+ phoneKind.fieldList = Lists.newArrayList();
+ phoneKind.fieldList.add(new EditField(Phone.NUMBER, -1, -1));
+ phoneKind.fieldList.add(new EditField(Phone.LABEL, -1, -1));
- addKind(kind);
+ addKind(phoneKind);
// Email is unlimited
- kind = new DataKind(Email.CONTENT_ITEM_TYPE, -1, -1, 10, true);
- kind.typeOverallMax = -1;
- kind.fieldList = Lists.newArrayList();
- kind.fieldList.add(new EditField(Email.DATA, -1, -1));
- addKind(kind);
+ final DataKind emailKind = new DataKind(Email.CONTENT_ITEM_TYPE, -1, -1, 10, true);
+ emailKind.typeOverallMax = -1;
+ emailKind.fieldList = Lists.newArrayList();
+ emailKind.fieldList.add(new EditField(Email.DATA, -1, -1));
+ addKind(emailKind);
// IM is only one
- kind = new DataKind(Im.CONTENT_ITEM_TYPE, -1, -1, 10, true);
- kind.typeOverallMax = 1;
- kind.fieldList = Lists.newArrayList();
- kind.fieldList.add(new EditField(Im.DATA, -1, -1));
- addKind(kind);
+ final DataKind imKind = new DataKind(Im.CONTENT_ITEM_TYPE, -1, -1, 10, true);
+ imKind.typeOverallMax = 1;
+ imKind.fieldList = Lists.newArrayList();
+ imKind.fieldList.add(new EditField(Im.DATA, -1, -1));
+ addKind(imKind);
// Organization is only one
- kind = new DataKind(Organization.CONTENT_ITEM_TYPE, -1, -1, 10, true);
- kind.typeOverallMax = 1;
- kind.fieldList = Lists.newArrayList();
- kind.fieldList.add(new EditField(Organization.COMPANY, -1, -1));
- kind.fieldList.add(new EditField(Organization.TITLE, -1, -1));
- addKind(kind);
+ final DataKind orgKind = new DataKind(Organization.CONTENT_ITEM_TYPE, -1, -1, 10, true);
+ orgKind.typeOverallMax = 1;
+ orgKind.fieldList = Lists.newArrayList();
+ orgKind.fieldList.add(new EditField(Organization.COMPANY, -1, -1));
+ orgKind.fieldList.add(new EditField(Organization.TITLE, -1, -1));
+ addKind(orgKind);
}
@Override
@@ -330,7 +335,7 @@
// Test row that has type values, but core fields are empty
final EntityDelta state = getEntity(TEST_ID);
- final ValuesDelta values = EntityModifier.insertChild(state, kindPhone, typeHome);
+ EntityModifier.insertChild(state, kindPhone, typeHome);
// Build diff, expecting insert for data row and update enforcement
final ArrayList<ContentProviderOperation> diff = Lists.newArrayList();
@@ -420,7 +425,7 @@
public void testTrimEmptyUntouched() {
final AccountType source = getAccountType();
final DataKind kindPhone = source.getKindForMimetype(Phone.CONTENT_ITEM_TYPE);
- final EditType typeHome = EntityModifier.getType(kindPhone, Phone.TYPE_HOME);
+ EntityModifier.getType(kindPhone, Phone.TYPE_HOME);
// Build "before" that has empty row
final EntityDelta state = getEntity(TEST_ID);
@@ -497,7 +502,7 @@
final AccountType accountType = getAccountType();
final AccountTypeManager accountTypes = getAccountTypes(accountType);
final DataKind kindPhone = accountType.getKindForMimetype(Phone.CONTENT_ITEM_TYPE);
- final EditType typeHome = EntityModifier.getType(kindPhone, Phone.TYPE_HOME);
+ EntityModifier.getType(kindPhone, Phone.TYPE_HOME);
// Try creating a contact without any child entries
final EntityDelta state = getEntity(null);
@@ -528,7 +533,7 @@
// Try creating a contact with single empty entry
final EntityDelta state = getEntity(null);
- final ValuesDelta values = EntityModifier.insertChild(state, kindPhone, typeHome);
+ EntityModifier.insertChild(state, kindPhone, typeHome);
final EntityDeltaList set = EntityDeltaList.fromSingle(state);
// Build diff, expecting two insert operations
diff --git a/tests/src/com/android/contacts/activities/ContactBrowserActivityTest.java b/tests/src/com/android/contacts/activities/ContactBrowserActivityTest.java
index 912950f..88da971 100644
--- a/tests/src/com/android/contacts/activities/ContactBrowserActivityTest.java
+++ b/tests/src/com/android/contacts/activities/ContactBrowserActivityTest.java
@@ -16,6 +16,7 @@
package com.android.contacts.activities;
+import com.android.contacts.ContactPhotoManager;
import com.android.contacts.ContactsApplication;
import com.android.contacts.R;
import com.android.contacts.detail.ContactDetailFragment;
@@ -26,6 +27,7 @@
import com.android.contacts.test.InjectedServices;
import com.android.contacts.tests.mocks.ContactsMockContext;
import com.android.contacts.tests.mocks.MockAccountTypeManager;
+import com.android.contacts.tests.mocks.MockContactPhotoManager;
import com.android.contacts.tests.mocks.MockContentProvider;
import com.android.contacts.tests.mocks.MockContentProvider.Query;
import com.android.contacts.tests.mocks.MockSharedPreferences;
@@ -85,7 +87,8 @@
InjectedServices services = new InjectedServices();
services.setContentResolver(mContext.getContentResolver());
services.setSharedPreferences(new MockSharedPreferences());
-
+ services.setSystemService(ContactPhotoManager.CONTACT_PHOTO_SERVICE,
+ new MockContactPhotoManager());
AccountType accountType = new BaseAccountType();
accountType.accountType = TEST_ACCOUNT_TYPE;
diff --git a/tests/src/com/android/contacts/interactions/PhoneNumberInteractionTest.java b/tests/src/com/android/contacts/interactions/PhoneNumberInteractionTest.java
index 43e844e..c401a8c 100644
--- a/tests/src/com/android/contacts/interactions/PhoneNumberInteractionTest.java
+++ b/tests/src/com/android/contacts/interactions/PhoneNumberInteractionTest.java
@@ -124,6 +124,26 @@
assertEquals("sms:456", interaction.startedIntent.getDataString());
}
+ public void testShouldCollapseWith() {
+ PhoneNumberInteraction.PhoneItem phoneItem1 = new PhoneNumberInteraction.PhoneItem();
+ PhoneNumberInteraction.PhoneItem phoneItem2 = new PhoneNumberInteraction.PhoneItem();
+
+ phoneItem1.phoneNumber = "123";
+ phoneItem2.phoneNumber = "123";
+
+ assertTrue(phoneItem1.shouldCollapseWith(phoneItem2));
+
+ phoneItem1.phoneNumber = "123";
+ phoneItem2.phoneNumber = "456";
+
+ assertFalse(phoneItem1.shouldCollapseWith(phoneItem2));
+
+ phoneItem1.phoneNumber = "123#,123";
+ phoneItem2.phoneNumber = "123#,456";
+
+ assertFalse(phoneItem1.shouldCollapseWith(phoneItem2));
+ }
+
public void testCallNumberWhenThereAreDuplicates() {
Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, 13);
expectQuery(contactUri)
diff --git a/tests/src/com/android/contacts/tests/mocks/MockContactPhotoManager.java b/tests/src/com/android/contacts/tests/mocks/MockContactPhotoManager.java
new file mode 100644
index 0000000..6da205b
--- /dev/null
+++ b/tests/src/com/android/contacts/tests/mocks/MockContactPhotoManager.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.contacts.tests.mocks;
+
+import com.android.contacts.ContactPhotoManager;
+
+import android.net.Uri;
+import android.widget.ImageView;
+
+/**
+ * A photo preloader that always uses the "no contact" picture and never executes any real
+ * db queries
+ */
+public class MockContactPhotoManager extends ContactPhotoManager {
+ @Override
+ public void loadPhoto(ImageView view, long photoId) {
+ view.setImageResource(mDefaultResourceId);
+ }
+
+ @Override
+ public void loadPhoto(ImageView view, Uri photoUri) {
+ view.setImageResource(mDefaultResourceId);
+ }
+
+ @Override
+ public void pause() {
+ }
+
+ @Override
+ public void resume() {
+ }
+
+ @Override
+ public void refreshCache() {
+ }
+
+ @Override
+ public void preloadPhotosInBackground() {
+ }
+}
