Merge "Avoid spawning extraneous threads in CallLogAdapter."
diff --git a/res/drawable-hdpi/aggregation_suggestions_bg.9.png b/res/drawable-hdpi/aggregation_suggestions_bg.9.png
index 687cc08..d279fb1 100644
--- a/res/drawable-hdpi/aggregation_suggestions_bg.9.png
+++ b/res/drawable-hdpi/aggregation_suggestions_bg.9.png
Binary files differ
diff --git a/res/drawable-mdpi/aggregation_suggestions_bg.9.png b/res/drawable-mdpi/aggregation_suggestions_bg.9.png
index 687cc08..6cce274 100644
--- a/res/drawable-mdpi/aggregation_suggestions_bg.9.png
+++ b/res/drawable-mdpi/aggregation_suggestions_bg.9.png
Binary files differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 8ee0547..a4e3bc0 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -245,7 +245,8 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> sal binnekort uitgevoer word."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard-uitvoerversoek is verwerp. Probeer asseblief later."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontak"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <!-- no translation found for percentage (1044592438199055502) -->
+ <skip />
<string name="confirm_export_title" msgid="6834385377255286349">"Voer kontakte uit?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Jou kontaklys sal uitgevoer word na die lêer: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Kon nie uitvoer nie"</string>
@@ -402,7 +403,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Sien kontakname as"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Voornaam eerste"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Van eerste"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Deursoek kontakte"</string>
<string name="take_photo" msgid="7496128293167402354">"Neem foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Neem nuwe foto"</string>
<string name="pick_photo" msgid="3746334626214970837">"Kies foto ui die galery"</string>
@@ -486,7 +486,8 @@
<string name="clear_default" msgid="7193185801596678067">"Vee verstek uit"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Teks gekopieer"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Verwerp jou veranderings?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"Stel my profiel op"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Voer persoon se naam in"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Sien opdaterings"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 0ccb1fc..07bc31a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> ከአፍታ ቆይታ በኋላ ይላካል።"</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"የvCard ላክ ጥየቃ ውድቅ ተደርጓል። እባክህ ትንሽ ቆይተህ ሞክር።"</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"እውቅያ"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"እውቅያዎች ላክ"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"የእውቂያ ዝርዝርህ ወደዚህ ፋይል ይላካል: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"ወደ ውጭ መላክ አልተቻለም"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"የእውቂያ ስሞችን እንደ እይ"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"መጠሪያ ስም መጀመሪያ"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"የቤተሰብ መነሻስም"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"እውቅያዎችዎን ይፈልጉ"</string>
<string name="take_photo" msgid="7496128293167402354">"ፎቶ አንሳ"</string>
<string name="take_new_photo" msgid="7341354729436576304">"አዲስ ፎቶ አንሳ"</string>
<string name="pick_photo" msgid="3746334626214970837">"ፎቶ ከማዕከለ ስዕላት ምረጥ"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"ነባሪ አጥራ"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"ፅሁፍ ገልብጧል"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">" ለውጦችህ ይወገዱ?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g><xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"መገለጫዬን አዘጋጅ"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"የግለሰቡን ስም ተይብ"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"አዘምኖችን ዕይ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index d69b061..c44eb32 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"سيتم تصدير <xliff:g id="FILENAME">%s</xliff:g> بعد قليل."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"تم رفض طلب تصدير vCard. أعد المحاولة لاحقًا."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"جهة اتصال"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"تصدير جهات الاتصال؟"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"سيتم تصدير قائمة جهات الاتصال إلى الملف: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"تعذر التصدير"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"عرض أسماء جهات الاتصال كـ"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"الاسم الممنوح أولاً"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"الاسم العائلة أولاً"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"البحث في جهات الاتصال"</string>
<string name="take_photo" msgid="7496128293167402354">"التقاط صورة"</string>
<string name="take_new_photo" msgid="7341354729436576304">"التقاط صورة جديدة"</string>
<string name="pick_photo" msgid="3746334626214970837">"اختيار صورة من المعرض"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"محو الإعدادات الافتراضية"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"تم نسخ النص"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"هل تريد تجاهل التغييرات؟"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"إعداد الملف الشخصي"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"اكتب اسم الشخص"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"عرض التحديثات"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 48e2d00..ebd12de 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Файл <xliff:g id="FILENAME">%s</xliff:g> будзе экспартаваны ў бліжэйшы час."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Запыт экспарту vCard адхілены. Паспрабуйце пазней."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"кантакт"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Экспартаваць кантакты?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Спіс кантактаў будзе экспартавацца ў файл <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Не атрымалася экспартаваць"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Паглядзець імёны кантактаў як"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Спачатку імя"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Спачатку прозвішча"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Шукаць у кантактах"</string>
<string name="take_photo" msgid="7496128293167402354">"Зрабіць фота"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Зрабiце новую фатаграфію"</string>
<string name="pick_photo" msgid="3746334626214970837">"Выберыце фатаграфію з галерэі"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Скінуць налады па змаўчанні"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Тэкст скапіяваны"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Адмяніць змены?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g><xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Наладзіць мой профіль"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Тып імя чалавека"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Прагл. абнаўленняў"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0ee7060..2156058 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> ще се експортира скоро."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Заявката за експортиране на vCard бе отхвърлена. Опитайте отново по-късно."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"контакт"</string>
- <!-- no translation found for percentage (1887004062152632812) -->
+ <!-- no translation found for percentage (1044592438199055502) -->
<skip />
<string name="confirm_export_title" msgid="6834385377255286349">"Да се експортират ли контактите?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Списъкът ви с контакти ще се експортира във файла: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
@@ -403,7 +403,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Преглед на имената на контакти като"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Първо собственото име"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Първо фамилията"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Търсене в контактите"</string>
<string name="take_photo" msgid="7496128293167402354">"Снимане"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Заснемане на нова снимка"</string>
<string name="pick_photo" msgid="3746334626214970837">"Избор на снимка от галерията"</string>
@@ -487,7 +486,8 @@
<string name="clear_default" msgid="7193185801596678067">"Изчистване на стандартната настройка"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Текстът бе копиран"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Да се отхвърлят ли направените от вас промени?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"Настройка на потребителския ми профил"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Въведете името на човека"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Актуализации"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 825f4c4..033f9d3 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> s\'exportarà en breu."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"S\'ha rebutjat la sol·licitud per exportar vCard. Torna-ho a provar més tard."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contacte"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportació contactes"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"La llista de contactes s\'exportarà al fitxer: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Error en exportar"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Visualitza els noms dels contactes com a"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nom primer"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Cognoms primer"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Cerca als contactes"</string>
<string name="take_photo" msgid="7496128293167402354">"Fes una foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Fes una foto nova"</string>
<string name="pick_photo" msgid="3746334626214970837">"Tria una foto de la galeria"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Esborra els valors predeterminats"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Text copiat"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Vols descartar els canvis?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Configura el meu perfil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Escriu el nom de la persona"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Mostra actualitzac."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 30e9381..8e50695 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Soubor <xliff:g id="FILENAME">%s</xliff:g> bude za okamžik exportován."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Požadavek na export souborů vCard byl zamítnut. Zkuste to prosím později."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportovat kontakty?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Seznam kontaktů bude exportován do souboru <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Export se nezdařil"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Zobrazení jmen kontaktů"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nejprve křestní jméno"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nejprve příjmení"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Vyhledat kontakty"</string>
<string name="take_photo" msgid="7496128293167402354">"Vyfotit"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Pořídit novou fotografii"</string>
<string name="pick_photo" msgid="3746334626214970837">"Vybrat fotografii z Galerie"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Vymazat výchozí nastavení"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Text zkopírován"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Zrušit změny?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Nastavit profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Zadejte jméno osoby"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Zobrazit aktualizace"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c068de3..d481a9f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> eksporteres om et øjeblik."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Anmodningen om eksport af vCard blev afvist. Prøv igen senere."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksporter kontakter?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Listen over dine kontaktpersoner eksporteres til filen: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Eksport ikke mulig"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Vis personers navne som"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Fornavn først"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Efternavn først"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Søg i kontakter"</string>
<string name="take_photo" msgid="7496128293167402354">"Tag billede"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tag nyt billede"</string>
<string name="pick_photo" msgid="3746334626214970837">"Vælg billede fra Galleri"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Ryd standarder"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Kopieret tekst"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Skal ændringerne slettes?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Opret min profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Indtast personens navn"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Se opdateringer"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index fe9fb45..22af407 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> wird demnächst exportiert."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Die vCard-Exportanfrage wurde abgelehnt. Bitte versuchen Sie es später erneut."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"Kontakt"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Kontakte exportieren?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Ihre Kontaktliste wird in die Datei \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\" exportiert."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Export nicht möglich"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Kontaktnamen-Anzeige:"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Vorname zuerst"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nachname zuerst"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"In Kontakten suchen"</string>
<string name="take_photo" msgid="7496128293167402354">"Foto machen"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Neues Foto aufnehmen"</string>
<string name="pick_photo" msgid="3746334626214970837">"Foto aus Galerie auswählen"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Als Standard löschen"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Text kopiert"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Sollen die Änderungen verworfen werden?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g><xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Mein Profil einrichten"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Name der Person eingeben"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Updates anzeigen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 620429c..1d3def3 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Η <xliff:g id="FILENAME">%s</xliff:g> θα εξαχθεί σύντομα."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Το αίτημα εξαγωγής vCard απορρίφθηκε. Δοκιμάστε ξανά αργότερα."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"επαφή"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Εξαγωγή επαφών;"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Η λίστα επαφών σας θα εξαχθεί στο αρχείο: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Αδυναμία εξαγωγής"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Προβολή ονομάτων επαφών ως"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Πρώτα το όνομα"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Πρώτα το επίθετο"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Αναζήτηση επαφών"</string>
<string name="take_photo" msgid="7496128293167402354">"Λήψη φωτογραφίας"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Λήψη νέας φωτογραφίας"</string>
<string name="pick_photo" msgid="3746334626214970837">"Επιλογή φωτογραφιών από τη Συλλογή"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Εκκαθάριση προεπιλεγμένων"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Το κείμενο αντιγράφηκε"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Να απορριφθούν οι αλλαγές σας;"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Ρύθμιση του προφίλ μου"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Πληκτρολογήστε το όνομα του ατόμου"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Προβολή ενημερώσεων"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index f24853d..6bede9f 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> will be exported shortly."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard export request was rejected. Try again later."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contact"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Export contacts?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Your contact list will be exported to file: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Couldn\'t export"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"View contact names as"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"First name first"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Surname first"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Search contacts"</string>
<string name="take_photo" msgid="7496128293167402354">"Take photo"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Take new photo"</string>
<string name="pick_photo" msgid="3746334626214970837">"Choose photo from Gallery"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Clear default"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Text copied"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Discard your changes?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Set up my profile"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Type person\'s name"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"View updates"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 28d8aa2..d7e15df 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> se exportará en breve."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Se rechazó la solicitud de exportación de la vCard. Vuelve a intentarlo más tarde."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contacto"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"¿Exportar contactos?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Tu lista de contactos se exportará al archivo: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"No se pudo exportar"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Mostrar contactos por"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nombre Apellido"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apellido Nombre"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Buscar contactos"</string>
<string name="take_photo" msgid="7496128293167402354">"Tomar foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tomar nueva foto"</string>
<string name="pick_photo" msgid="3746334626214970837">"Elige una foto de la Galería."</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Eliminar predeterminado"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Texto copiado"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"¿Deseas descartar los cambios?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g><xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Configurar mi perfil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Escribe el nombre de la persona."</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Ver actualizaciones"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index e0af950..a16e1ce 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> se exportará en breve."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Se ha rechazado la solicitud de exportación de vCard. Inténtalo de nuevo más tarde."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contacto"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"¿Exportar contactos?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Tu lista de contactos se exportará al archivo <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Error al exportar"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Ver nombres de contactos por"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nombre primero"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apellidos primero"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Buscar contactos"</string>
<string name="take_photo" msgid="7496128293167402354">"Hacer una foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Hacer una foto nueva"</string>
<string name="pick_photo" msgid="3746334626214970837">"Seleccionar foto de la galería"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Borrar predeterminado"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Texto copiado"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"¿Seguro que quieres descartar los cambios?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Configurar mi perfil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Escribe el nombre de la persona"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Ver actualizaciones"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 173bb46..0779700 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Fail <xliff:g id="FILENAME">%s</xliff:g> eksporditakse peagi."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCardi eksportimistaotlus lükati tagasi. Proovige hiljem uuesti."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksportida kontakt?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Teie kontaktide loend eksporditakse faili: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Eksport ebaõnnestus"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Kuva kontaktinimed:"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Eesnimi kõigepealt"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Perekonnanimi kõigepealt"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Otsi kontakte"</string>
<string name="take_photo" msgid="7496128293167402354">"Tee foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tee uus foto"</string>
<string name="pick_photo" msgid="3746334626214970837">"Vali foto galeriist"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Kustuta vaikeseaded"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Tekst on kopeeritud"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Kas loobute oma muudatustest?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g><xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Minu profiili seadistamine"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Sisestage isiku nimi"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Kuva värskendused"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index dbc876e..5bbb887 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> به زودی صادر می شود."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"درخواست صدور کارت ویزیت رد شد. لطفاً بعداً امتحان کنید."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"مخاطب"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"مخاطبین صادر شوند؟"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"لیست مخاطبین شما به این فایل صادر میشود: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"صادر نمیشود"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"مشاهده نام های مخاطب بعنوان"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"ابتدا نام"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"ابتدا نام خانوادگی"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"جستجوی مخاطبین"</string>
<string name="take_photo" msgid="7496128293167402354">"عکسبرداری"</string>
<string name="take_new_photo" msgid="7341354729436576304">"گرفتن عکس جدید"</string>
<string name="pick_photo" msgid="3746334626214970837">"انتخاب عکس از گالری"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"پاک کردن پیش فرضها"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"متن کپی شده"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"از تغییرات شما صرفنظر شود؟"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g><xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"راهاندازی نمایه من"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"نام شخص را تایپ کنید"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"مشاهده بهروزرسانیها"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 92945fb..21055e5 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> viedään pian."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard-vientipyyntö hylättiin. Yritä myöhemmin uudelleen."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"yhteystieto"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Vie yhteystietoja?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Yhteystietoluettelosi viedään tiedostoon: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Vieminen epäonnistui"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Näytä yhteystietojen nimet"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Etunimi ensin"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Sukunimi ensin"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Hae yhteystiedoista"</string>
<string name="take_photo" msgid="7496128293167402354">"Ota valokuva"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ota uusi kuva"</string>
<string name="pick_photo" msgid="3746334626214970837">"Valitse valokuva galleriasta"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Poista oletus"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Teksti kopioitu"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Hylätäänkö muutokset?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Luo profiili"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Kirjoita henkilön nimi"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Näytä päivitykset"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 64d7a6b..cb74cf6 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -245,7 +245,8 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Exportation du fichier <xliff:g id="FILENAME">%s</xliff:g> imminente"</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"La demande d\'exportation du fichier vCard a été rejetée. Veuillez réessayer ultérieurement."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contact"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <!-- no translation found for percentage (1044592438199055502) -->
+ <skip />
<string name="confirm_export_title" msgid="6834385377255286349">"Exporter contacts ?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Votre liste de contacts va être exportée vers le fichier \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Échec exportation"</string>
@@ -402,7 +403,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Afficher les contacts par"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Le prénom en premier"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Le nom en premier"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Rechercher..."</string>
<string name="take_photo" msgid="7496128293167402354">"Prendre une photo"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Prendre une autre photo"</string>
<string name="pick_photo" msgid="3746334626214970837">"Sélectionner une photo dans la galerie"</string>
@@ -486,7 +486,8 @@
<string name="clear_default" msgid="7193185801596678067">"Effacer les valeurs par défaut"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Texte copié"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Annuler les modifications ?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g> "</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"Configurer mon profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Saisissez le nom de la personne"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Afficher mises à jour"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 8ea4de8..121a56e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> को जल्दी ही निर्यात किया जाएगा."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard आयात अनुरोध अस्वीकार हो गया था. बाद में पुन: प्रयास करें."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"संपर्क"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"संपर्क निर्यात करें?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"आपकी संपर्क सूची इस फ़ाइल में निर्यात कर दी जाएगी: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"निर्यात नहीं कर सका"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"संपर्क नामों को इस रूप में देखें"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"दिया गया नाम पहले"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"कुलनाम पहले"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"संपर्क खोजें"</string>
<string name="take_photo" msgid="7496128293167402354">"फ़ोटो लें"</string>
<string name="take_new_photo" msgid="7341354729436576304">"नया फ़ोटो लें"</string>
<string name="pick_photo" msgid="3746334626214970837">"गैलरी से फ़ोटो चुनें"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"डिफ़ॉल्ट साफ़ करें"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"पाठ की प्रतिलिपि बनाई गई"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"आपके परिवर्तन छोड़ें?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"मेरी प्रोफ़ाइल सेट करें"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"व्यक्ति का नाम लिखें"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"अपडेट देखें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 034b53e..86c3131 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> uskoro će biti izvezena."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Zahtjev za izvoz formata vCard odbijen je. Pokušajte ponovo kasnije."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Izvesti kontakte?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Vaš popis kontakata bit će izvezen u datoteku: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Izvoz nije uspio"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Prikaži nazive kontakata kao"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najprije ime"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najprije prezime"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Pretraži kontakte"</string>
<string name="take_photo" msgid="7496128293167402354">"Snimi fotografiju"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Snimi novu fotografiju"</string>
<string name="pick_photo" msgid="3746334626214970837">"Iz Galerije odaberite fotografiju"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Izbriši zadano"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Tekst kopiran"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Odbaciti promjene?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g><xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Postavi moj profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Upišite ime osobe"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Prikaži ažuriranja"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2d731c0..db09620 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"A(z) <xliff:g id="FILENAME">%s</xliff:g> hamarosan exportálásra kerül."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"A vCard-exportálási kérelem elutasítva. Próbálja újra később."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kapcsolat"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportálni szeretné?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"A névjegyek listájának exportálása a(z) <xliff:g id="VCARD_FILENAME">%s</xliff:g> fájlba."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Sikertelen export"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Nevek megtekintése mint"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Utónév előre"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Vezetéknév elöl"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Keresés a névjegyek között"</string>
<string name="take_photo" msgid="7496128293167402354">"Fotó készítése"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Új fénykép készítése"</string>
<string name="pick_photo" msgid="3746334626214970837">"Fotó kiválasztása a Galériából"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Alapértelmezés törlése"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Másolt szöveg"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Elveti a módosításokat?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> -- <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Saját profil beállítása"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Írja be a személy nevét"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Frissítések"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 25f8d8c..9424992 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> akan segera diekspor."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Permintaan ekspor vCard ditolak. Coba lagi nanti."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kenalan"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Ekspor data kenalan?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Daftar data kenalan Anda akan diekspor ke berkas: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Tak dapat mengekspor"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Tampilkan nama kenalan sebagai"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nama depan pertama"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nama keluarga pertama"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Telusuri kenalan"</string>
<string name="take_photo" msgid="7496128293167402354">"Ambil foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ambil foto baru"</string>
<string name="pick_photo" msgid="3746334626214970837">"Pilih foto dari Galeri"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Hapus bawaan"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Teks disalin"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Buang perubahan Anda?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Siapkan profil saya"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Ketik nama seseorang"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Lihat pembaruan"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 0a5e9a9..da8554c 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"La vCard <xliff:g id="FILENAME">%s</xliff:g> verrà esportata a breve."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Richiesta esportazione vCard rifiutata. Riprova più tardi."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contatto"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Esportare contatti?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"L\'elenco dei contatti verrà esportato nel file: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Impossibile esportare"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Visualizza nomi contatti con"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Prima il nome"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Prima il cognome"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Cerca contatti"</string>
<string name="take_photo" msgid="7496128293167402354">"Scatta foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Scatta nuova foto"</string>
<string name="pick_photo" msgid="3746334626214970837">"Scegli la foto dalla Galleria"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Cancella impostazione predefinita"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Testo copiato"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Annullare le modifiche?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g> "</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Imposta il mio profilo"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Digita il nome della persona"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Visualizza aggiornamenti"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 2359bf0..cf08ffa 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"הייצוא של <xliff:g id="FILENAME">%s</xliff:g> יתבצע תוך זמן קצר."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"הבקשה לייצוא ה-vCard נדחתה. נסה שוב מאוחר יותר."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"איש קשר"</string>
- <!-- no translation found for percentage (1887004062152632812) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"לייצא את אנשי הקשר?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"רשימת אנשי הקשר שלך תיוצא לקובץ: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"לא ניתן לייצא"</string>
@@ -403,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"הצג שמות אנשי קשר בתור"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"תחילה שם פרטי"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"שם משפחה תחילה"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"חפש אנשי קשר"</string>
<string name="take_photo" msgid="7496128293167402354">"צלם תמונה"</string>
<string name="take_new_photo" msgid="7341354729436576304">"צלם תמונה חדשה"</string>
<string name="pick_photo" msgid="3746334626214970837">"בחר תמונה מתוך \'גלריה\'"</string>
@@ -487,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"נקה ברירת מחדל"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"טקסט שהועתק"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"למחוק את השינויים שביצעת?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"הגדר את הפרופיל שלי"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"הקלד שם של אדם"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"הצג עדכונים"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 08ade99..ba2246a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -245,7 +245,8 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g>はまもなくエクスポートされます。"</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCardのエクスポートリクエストは拒否されました。しばらくしてからもう一度お試しください。"</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"連絡先"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <!-- no translation found for percentage (1044592438199055502) -->
+ <skip />
<string name="confirm_export_title" msgid="6834385377255286349">"エクスポートしますか？"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"連絡先リストをファイル「<xliff:g id="VCARD_FILENAME">%s</xliff:g>」にエクスポートします。"</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"エクスポート失敗"</string>
@@ -402,7 +403,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"名前の表示形式"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"名が先"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓が先"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"連絡先を検索"</string>
<string name="take_photo" msgid="7496128293167402354">"写真を撮影"</string>
<string name="take_new_photo" msgid="7341354729436576304">"新しい写真を撮る"</string>
<string name="pick_photo" msgid="3746334626214970837">"ギャラリーから画像を選ぶ"</string>
@@ -486,7 +486,8 @@
<string name="clear_default" msgid="7193185801596678067">"デフォルトを解除"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"テキストをコピーしました"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"変更を破棄しますか？"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"プロフィールを設定"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"名前を入力"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"更新情報を表示"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a291f32..9249fdf 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g>을(를) 곧 내보냅니다."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard 내보내기 요청이 거부되었습니다. 나중에 다시 시도해 주세요."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"연락처"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"주소록을 내보내시겠습니까?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"연락처 목록을 <xliff:g id="VCARD_FILENAME">%s</xliff:g> 파일로 내보냅니다."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"내보내기 실패"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"연락처 이름 표시 방법:"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"이름 먼저 표시"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"성 먼저 표시"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"연락처 검색"</string>
<string name="take_photo" msgid="7496128293167402354">"사진 찍기"</string>
<string name="take_new_photo" msgid="7341354729436576304">"새 사진 가져오기"</string>
<string name="pick_photo" msgid="3746334626214970837">"갤러리에서 사진 선택"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"기본 설정 지우기"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"텍스트 복사됨"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"변경사항을 삭제하시겠습니까?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g> "</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"내 프로필 설정"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"이름 입력"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"업데이트 보기"</string>
@@ -528,11 +527,11 @@
<string name="description_call_log_voicemail" msgid="4600798771975158948">"음성사서함"</string>
<string name="description_add_contact" msgid="3103414772502485851">"연락처 추가"</string>
<string name="description_view_contact" msgid="5205669345700598415">"<xliff:g id="NAME">%1$s</xliff:g>님의 연락처 보기"</string>
- <string name="description_call" msgid="3443678121983852666">"<xliff:g id="NAME">%1$s</xliff:g>님에게 전화걸기"</string>
+ <string name="description_call" msgid="3443678121983852666">"전화하기:<xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_send_text_message" msgid="7803126439934046891">"<xliff:g id="NAME">%1$s</xliff:g>님에게 문자 메시지 보내기"</string>
<string name="description_call_log_unheard_voicemail" msgid="118101684236996786">"듣지 않은 음성사서함"</string>
<string name="description_send_message" msgid="6046623392322890962">"<xliff:g id="NAME">%1$s</xliff:g>님에게 메시지 보내기"</string>
- <string name="description_dial_phone_number" msgid="8831647331642648637">"<xliff:g id="NAME">%1$s</xliff:g>님에게 전화걸기"</string>
+ <string name="description_dial_phone_number" msgid="8831647331642648637">"전화하기:<xliff:g id="NAME">%1$s</xliff:g>"</string>
<string name="description_quick_contact_for" msgid="6737516415168327789">"<xliff:g id="NAME">%1$s</xliff:g>님의 빠른 주소록"</string>
<string name="call_log_empty_gecode" msgid="5588904744812100846">"-"</string>
<string name="user_profile_contacts_list_header" msgid="5582421742835006940">"나"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e4b0b1e..b1fc4a0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> bus netrukus eksportuotas."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"El. vizitinės kortelės eksportavimo užklausa buvo atmesta. Bandykite vėliau."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontaktas"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksp. kontaktus?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Jūsų kontaktų sąrašas bus eksportuotas į failą „<xliff:g id="VCARD_FILENAME">%s</xliff:g>“."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Nepavyko eksportuoti"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Žiūrėti adresatų vardus kaip"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Pirmiausia suteiktas pavadinimas"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Pirmiausia pavardė"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Ieškoti adresatų"</string>
<string name="take_photo" msgid="7496128293167402354">"Fotografuoti"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Iš naujo fotografuoti"</string>
<string name="pick_photo" msgid="3746334626214970837">"Pasirinkti nuotrauką iš galerijos."</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Išvalyti numatytuosius nustatymus"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Tekstas nukopijuotas"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Atmesti pakeitimus?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Nustatyti mano profilį"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Įveskite asmens vardą ir (arba) pavardę"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Žiūrėti naujinius"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b662a04..9edc90e 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Fails <xliff:g id="FILENAME">%s</xliff:g> tiks drīzumā eksportēts."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Tika noraidīts vCard faila eksportēšanas pieprasījums. Vēlāk mēģiniet vēlreiz."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontaktpersona"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Vai eksp. kontaktp.?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Kontaktpersonu saraksts tiks eksportēts uz failu <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Nevarēja eksportēt"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Kontaktpersonu vārdu attēlošana:"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Vispirms rādīt vārdu"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Vispirms rādīt uzvārdu"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Meklēt kontaktpersonas"</string>
<string name="take_photo" msgid="7496128293167402354">"Uzņemt fotoattēlu"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Uzņemt jaunu fotoattēlu"</string>
<string name="pick_photo" msgid="3746334626214970837">"Izvēlēties fotoattēlu no galerijas"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Notīrīt noklusējuma iestatījumus"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Teksts ir nokopēts"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Vai atmest veiktās izmaiņas?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g><xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> — <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Iestatīt savu profilu"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Rakstiet personas vārdu."</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Skatīt atjaunināj."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index ea09fbb..2d52f8d 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -247,7 +247,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> akan dieksport sebentar lagi."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Permintaan eksport vCard telah ditolak. Cuba lagi nanti."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kenalan"</string>
- <!-- no translation found for percentage (1887004062152632812) -->
+ <!-- no translation found for percentage (1044592438199055502) -->
<skip />
<string name="confirm_export_title" msgid="6834385377255286349">"Eksport kenalan?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Senarai kenalan anda akan dieksport ke: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
@@ -405,7 +405,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Lihat nama kenalan sebagai"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nama berian dahulu"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Nama keluarga dahulu"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Cari dalam kenalan"</string>
<string name="take_photo" msgid="7496128293167402354">"Ambil foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ambil foto baru"</string>
<string name="pick_photo" msgid="3746334626214970837">"Pilih foto dari Galeri"</string>
@@ -489,7 +488,8 @@
<string name="clear_default" msgid="7193185801596678067">"Kosongkan lalai"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Teks disalin"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Buang perubahan anda?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"Sediakan profil saya"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Taip nama orang"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Lihat kemas kini"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9994ce8..2cf4799 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> vil eksporteres snart."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Forespørselen om eksport av vCard ble avvist. Prøv på nytt senere."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Eksp. kontaktene?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Kontaktlisten din blir eksportert til: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Eksport mislyktes"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Vis kontaktnavn som"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Fornavn først"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Etternavn først"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Søk etter kontakter"</string>
<string name="take_photo" msgid="7496128293167402354">"Ta bilde"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ta nytt bilde"</string>
<string name="pick_photo" msgid="3746334626214970837">"Velg bilde fra galleriet"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Fjern som standard"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Tekst kopiert"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Vil du forkaste endringene?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Konfigurer profilen min"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Tast inn personens navn"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Se oppdateringer"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9d67eec..bc4d0fd 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> wordt binnenkort geëxporteerd."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Verzoek voor vCard-export is geweigerd. Probeer het later opnieuw."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contact"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Contacten export.?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Uw lijst met contacten wordt geëxporteerd naar het bestand: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Kan niet exporteren"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Contactnamen weergeven als"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Roepnaam eerst"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Achternaam eerst"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Contacten zoeken"</string>
<string name="take_photo" msgid="7496128293167402354">"Foto maken"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Nieuwe foto nemen"</string>
<string name="pick_photo" msgid="3746334626214970837">"Foto kiezen in Galerij"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Standaardwaarden wissen"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Tekst gekopieerd"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Uw wijzigingen annuleren?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Mijn profiel instellen"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Typ de naam van de persoon"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Updates bekijken"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index cbe931c..d5abdb6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -245,7 +245,8 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Plik <xliff:g id="FILENAME">%s</xliff:g> zostanie za chwilę wyeksportowany."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Żądanie eksportu danych vCard zostało odrzucone. Spróbuj ponownie później."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <!-- no translation found for percentage (1044592438199055502) -->
+ <skip />
<string name="confirm_export_title" msgid="6834385377255286349">"Eksport kontaktów?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Lista kontaktów zostanie wyeksportowana do pliku: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Eksport nieudany"</string>
@@ -402,7 +403,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Wyświetl nazwy kontaktów jako"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najpierw imię"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najpierw nazwisko"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Szukaj kontaktów"</string>
<string name="take_photo" msgid="7496128293167402354">"Zrób zdjęcie"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Zrób nowe zdjęcie"</string>
<string name="pick_photo" msgid="3746334626214970837">"Wybierz zdjęcie z galerii"</string>
@@ -486,7 +486,8 @@
<string name="clear_default" msgid="7193185801596678067">"Wyczyść wartość domyślną"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Tekst skopiowany"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Odrzucić zmiany?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"Konfiguruj profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Wpisz imię osoby"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Pokaż aktualizacje"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 223a2ce..2ddb7ff 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> será exportado em breve."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"O pedido de exportação do vCard foi rejeitado. Tente novamente mais tarde."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contacto"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportar contactos?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"A sua lista de contactos será exportada para o ficheiro: <xliff:g id="VCARD_FILENAME">%s</xliff:g> ."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Impossível exportar"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Visualizar nomes de contactos como"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nome próprio em primeiro lugar"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apelido em primeiro lugar"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Pesquisar contactos"</string>
<string name="take_photo" msgid="7496128293167402354">"Tirar fotografia"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tirar nova fotografia"</string>
<string name="pick_photo" msgid="3746334626214970837">"Escolher fotografia da Galeria"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Limpar predefinição"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Texto copiado"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Rejeitar as suas alterações?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149"></string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Configurar o meu perfil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Introduza o nome da pessoa"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Ver atualizações"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9a9287b..44bc223 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> será exportado em breve."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Pedido de exportação vCard foi rejeitado. Tente novamente mais tarde."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contato"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportar contatos?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Sua lista de contatos será exportada para o arquivo: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Não foi possível exportar"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Visualizar nomes de contato como"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Nome primeiro"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Sobrenome primeiro"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Pesquisar contatos"</string>
<string name="take_photo" msgid="7496128293167402354">"Tirar foto"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Tirar outra foto"</string>
<string name="pick_photo" msgid="3746334626214970837">"Escolha fotos da Galeria"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Limpar padrão"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Texto copiado"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Descartar as alterações?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g> "</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Configurar meu perfil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Digite o nome da pessoa"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Ver atualizações"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 58d1659..9a556e0 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -266,9 +266,7 @@
<string name="description_contact_photo" msgid="3387458082667894062">"foto dal contact"</string>
<string name="description_minus_button" msgid="387136707700230172">"minus"</string>
<string name="description_plus_button" msgid="515164827856229880">"plus"</string>
- <!-- no translation found for description_view_contact_detail (9133251213656414807) -->
- <!-- no translation found for description_view_contact_detail (2795575601596468581) -->
- <skip />
+ <string name="description_view_contact_detail" msgid="9133251213656414807">"Mussar il contact"</string>
<!-- no translation found for no_sdcard_message (5242558018442357189) -->
<skip />
<!-- no translation found for no_sdcard_message (3357810406684913482) -->
@@ -338,7 +336,7 @@
<skip />
<!-- no translation found for vcard_unknown_filename (7171709890959915954) -->
<skip />
- <!-- no translation found for percentage (1887004062152632812) -->
+ <!-- no translation found for percentage (1044592438199055502) -->
<skip />
<!-- no translation found for confirm_export_title (6834385377255286349) -->
<skip />
@@ -547,7 +545,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Mussar ils nums da contacts sco"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"L\'emprim il prenum"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"L\'emprim il num da famiglia"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Retschertgar ils contacts"</string>
<string name="take_photo" msgid="7496128293167402354">"Far ina foto"</string>
<!-- no translation found for take_new_photo (7341354729436576304) -->
<skip />
@@ -680,7 +677,7 @@
<skip />
<!-- no translation found for cancel_confirmation_dialog_message (5885724679874403115) -->
<skip />
- <!-- no translation found for call_type_and_date (1766269584078149149) -->
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
<skip />
<!-- no translation found for profile_display_name (4127389543625918771) -->
<skip />
@@ -799,9 +796,7 @@
<skip />
<!-- no translation found for add_new_account (5748627740680940264) -->
<skip />
- <!-- no translation found for dialog_phone_call_prohibited_message (6554711866586660441) -->
- <!-- no translation found for dialog_phone_call_prohibited_message (4313552620858880999) -->
- <skip />
+ <string name="dialog_phone_call_prohibited_message" msgid="6554711866586660441">"Il clom n\'è betg vegnì exequì."</string>
<!-- no translation found for dialog_voicemail_not_ready_message (4384716252789515378) -->
<skip />
<!-- no translation found for dialog_voicemail_airplane_mode_message (530922773669546093) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7e2eb45..6625ebe 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> va fi exportat în curând."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Solicitarea de exportare a fişierului vCard a fost respinsă. Încercaţi din nou mai târziu."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contact"</string>
- <!-- no translation found for percentage (1887004062152632812) -->
+ <!-- no translation found for percentage (1044592438199055502) -->
<skip />
<string name="confirm_export_title" msgid="6834385377255286349">"Exportaţi Agenda?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Lista dvs. cu persoane de contact va fi exportată în fişierul: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
@@ -403,7 +403,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Vizualizaţi numele persoanei din agendă ca"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Întâi prenumele"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Întâi numele de familie"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Căutaţi în persoanele din agendă"</string>
<string name="take_photo" msgid="7496128293167402354">"Fotografiaţi"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Creaţi o fotografie nouă"</string>
<string name="pick_photo" msgid="3746334626214970837">"Alegeţi o fotografie din Galerie"</string>
@@ -487,7 +486,8 @@
<string name="clear_default" msgid="7193185801596678067">"Ştergeţi datele prestabilite"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Text copiat"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Renunţaţi la modificări?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"Configuraţi profilul"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Introduceţi numele persoanei"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Afişaţi actualizări"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 86398c8..ec4b1e9 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -245,7 +245,8 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Экспорт <xliff:g id="FILENAME">%s</xliff:g> начнется в ближайшее время."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Запрос на экспорт данных vCard отклонен. Повторите попытку позже."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"контакт"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <!-- no translation found for percentage (1044592438199055502) -->
+ <skip />
<string name="confirm_export_title" msgid="6834385377255286349">"Экспорт контактов"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Список контактов будет экспортирован в файл \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Сбой экспорта"</string>
@@ -402,7 +403,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Показывать в контактах"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Сначала имя"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Сначала фамилию"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Поиск в контактах"</string>
<string name="take_photo" msgid="7496128293167402354">"Сфотографировать"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Создать новое фото"</string>
<string name="pick_photo" msgid="3746334626214970837">"Выбрать фото из галереи"</string>
@@ -486,7 +486,8 @@
<string name="clear_default" msgid="7193185801596678067">"Удалить настройки по умолчанию"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Текст скопирован"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Отменить изменения?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g>, <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"Настроить профиль"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Имя контакта"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Обновления"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 2399b57..7801de8 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -245,7 +245,8 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Vizitka <xliff:g id="FILENAME">%s</xliff:g> bude čoskoro exportovaná."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Žiadosť o exportovanie vizitky vCard bola odmietnutá. Skúste to znova neskôr."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <!-- no translation found for percentage (1044592438199055502) -->
+ <skip />
<string name="confirm_export_title" msgid="6834385377255286349">"Exportovať kontakty?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Váš zoznam kontaktov bude exportovaný do súboru: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Export sa nepodaril"</string>
@@ -402,7 +403,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Zobrazenie mien kontaktov"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najskôr krstné meno"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najskôr priezvisko"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Hľadať v kontaktoch"</string>
<string name="take_photo" msgid="7496128293167402354">"Zaznamenať fotografiu"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Urobiť novú fotografiu"</string>
<string name="pick_photo" msgid="3746334626214970837">"Vybrať fotografiu z Galérie"</string>
@@ -486,7 +486,8 @@
<string name="clear_default" msgid="7193185801596678067">"Vymazať predvolené nastavenia"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Text bol skopírovaný"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Zahodiť zmeny?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"Nastaviť môj profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Zadajte meno osoby"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Zobraziť aktualizácie"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 6dfe6b7..4cbe938 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Dat. <xliff:g id="FILENAME">%s</xliff:g> bo kmalu izvožena."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Zahteva za izvoz datoteke vCard je bila zavrnjena. Poskusite znova pozneje."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"stik"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Želite izvoz. stike?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Seznam stikov bo izvožen v datoteko: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Izvoz ni mogoč"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Prikaži imena stikov kot"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Najprej ime"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Najprej priimek"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Iskanje stikov"</string>
<string name="take_photo" msgid="7496128293167402354">"Posnemi fotografijo"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Posnemi novo fotografijo"</string>
<string name="pick_photo" msgid="3746334626214970837">"Izberite fotografijo iz galerije"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Počisti privzeto"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Besedilo kopirano"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Ali želite zavreči spremembe?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Nastavi moj profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Vnesite ime osebe"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Prikaz posodobitev"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index d42d84f..c77bdb0 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Датотека <xliff:g id="FILENAME">%s</xliff:g> ће ускоро бити извезена."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Захтев за извоз vCard датотеке је одбијен. Покушајте касније."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"контакт"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Желите ли да извезете контакте?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Листа контаката ће бити извезена у датотеку: <xliff:g id="VCARD_FILENAME">%s</xliff:g> ."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Није могуће извести"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Прикажи имена контаката као"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Најпре име"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Прво презиме"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Претражи контакте"</string>
<string name="take_photo" msgid="7496128293167402354">"Сними фотографију"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Направи нову фотографију"</string>
<string name="pick_photo" msgid="3746334626214970837">"Изаберите фотографију из Галерије"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Обриши подразумевану вредност"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Текст је копиран"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Желите ли да одбаците промене?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Подеси мој профил"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Унесите име особе"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Прикажи ажурирања"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 2d966ce..0dceb7a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> exporteras snart."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Begäran om vCard-export avvisades. Försök igen vid ett senare tillfälle."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportera kontakter?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Kontaktlistan exporteras till filen: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Kunde inte exportera"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Visa kontaktnamn som"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Förnamn först"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Efternamn först"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Sök efter kontakter"</string>
<string name="take_photo" msgid="7496128293167402354">"Ta en bild"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Ta ny bild"</string>
<string name="pick_photo" msgid="3746334626214970837">"Välj ett foto från galleriet"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Rensa standardinställningar"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Texten har kopierats"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Vill du ta bort ändringarna?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Skapa min profil"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Ange personens namn"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Visa uppdateringar"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index bb32630..7e5e3b4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -247,7 +247,8 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> itahamishwa hivi karibuni."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Ombi la kuhamishwa kwa vCard limekataliwa. Jaribu tena baadaye."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"anwani"</string>
- <string name="percentage" msgid="1887004062152632812">"Kishika nafasi <xliff:g id="PERCENTAGE">%s</xliff:g> <xliff:g id="PERCENTSIGN">%%</xliff:g> "</string>
+ <!-- no translation found for percentage (1044592438199055502) -->
+ <skip />
<string name="confirm_export_title" msgid="6834385377255286349">"Hamisha anwani?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Orodha yako ya anwani itahamishwa kwa faili: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Imeshindwa kuhamisha"</string>
@@ -404,7 +405,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Tazama majina ya anwani kama"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Jina ulilopewa kwanza"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Jina la familia kwanza"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Tafuta anwani"</string>
<string name="take_photo" msgid="7496128293167402354">"Piga picha"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Piga picha mpya"</string>
<string name="pick_photo" msgid="3746334626214970837">"Chagua picha kutoka kwa Ghala"</string>
@@ -488,7 +488,8 @@
<string name="clear_default" msgid="7193185801596678067">"Ondoa chaguo-msingi"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Maandishi yamenakiliwa"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Tupa mabadiliko yako?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"Kishika nafasi <xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"Sanidi maelezo yangu mafupi"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Charaza jina la mtu"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Tazama visasisho"</string>
@@ -520,7 +521,7 @@
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Anwani imepokewa kupitia NFC"</string>
<string name="menu_show_voicemails_only" msgid="1898421289561435703">"Onyesha barua za sauti pekee"</string>
<string name="menu_show_all_calls" msgid="7560347482073345885">"Onyesha simu zote"</string>
- <string name="status_available" msgid="5586870015822828392">"Anapatikana"</string>
+ <string name="status_available" msgid="5586870015822828392">"Nipo"</string>
<string name="status_away" msgid="1838861100379804730">"Mbali"</string>
<string name="status_busy" msgid="9147992455450257136">"Ana shughuli"</string>
<string name="description_call_log_play_button" msgid="651182125650429846">"Cheza barua ya sauti"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 3acc4ac..91f7886 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"การส่งออก <xliff:g id="FILENAME">%s</xliff:g> จะเกิดขึ้นในไม่ช้า"</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"คำขอส่งออก vCard ถูกปฏิเสธ ลองใหม่ภายหลัง"</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"สมุดโทรศัพท์"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"ส่งออกรายชื่อติดต่อ"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"รายชื่อติดต่อของคุณจะถูกส่งออกเป็นไฟล์: <xliff:g id="VCARD_FILENAME">%s</xliff:g>"</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"ไม่สามารถส่งออก"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"ดูชื่อของรายชื่อเป็น"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"ขึ้นต้นด้วยชื่อ"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"ขึ้นต้นด้วยนามสกุล"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"ค้นหารายชื่อในสมุดโทรศัพท์"</string>
<string name="take_photo" msgid="7496128293167402354">"ถ่ายภาพ"</string>
<string name="take_new_photo" msgid="7341354729436576304">"ถ่ายภาพใหม่"</string>
<string name="pick_photo" msgid="3746334626214970837">"เลือกรูปภาพจากแกลเลอรี"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"ล้างจากค่าเริ่มต้น"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"คัดลอกข้อความแล้ว"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"ยกเลิกการเปลี่ยนแปลงหรือไม่"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"ตั้งค่าโปรไฟล์ของฉัน"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"พิมพ์ชื่อของบุคคล"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"ดูการอัปเดต"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4b4fdbd..c7c0480 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Mae-export ang <xliff:g id="FILENAME">%s</xliff:g> sa ilang saglit."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Tinanggihan ang kahilingan sa pag-export ng vCard. Subukang muli sa ibang pagkakataon."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contact"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"I-export ang mga contact?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Ang listahan ng iyong contact ay ie-export sa file: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Hindi ma-export"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Tingnan ang mga pangalan ng contact bilang"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Pangalan muna"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Apelyido muna"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Maghanap ng mga contact"</string>
<string name="take_photo" msgid="7496128293167402354">"Kumuha ng larawan"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Kumuha ng bagong larawan"</string>
<string name="pick_photo" msgid="3746334626214970837">"Pumili ng larawan mula sa Gallery"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"I-clear ang default"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Kinopya ang teksto"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Itapon ang iyong mga pagbabago?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"I-set up ang aking profile"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"I-type ang pangalan ng tao"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Tingnan ang mga update"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index fdb658e..13e2dce 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> kısa bir süre içinde dışa aktarılacak."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard\'ı dışa aktarma isteği reddedildi. Daha sonra tekrar deneyin."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kişi"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTSIGN">%%</xliff:g><xliff:g id="PERCENTAGE">%s</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Kişileri dışa aktar?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Kişi listeniz şu dosyaya aktarılacak: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Dışa aktarılamadı"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Kişi adlarını görüntüleme şekli:"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Önce adı"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Önce soyadı"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Kişileri ara"</string>
<string name="take_photo" msgid="7496128293167402354">"Fotoğraf çek"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Yeni fotoğraf çek"</string>
<string name="pick_photo" msgid="3746334626214970837">"Galeri\'den fotoğraf seçin"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Varsayılanları temizle"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Metin kopyalandı"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Değişiklikleriniz silinsin mi?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Profilimi ayarla"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Kişinin adını yazın"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Gncellmlri görüntüle"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index eb64fc8..82ccbca 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Файл <xliff:g id="FILENAME">%s</xliff:g> незабаром буде експортовано."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Запит на експорт файлу vCard відхилено. Повторіть спробу пізніше."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"контакт"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Експортув. контакти?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Ваш список контактів буде експортовано у файл: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Помилка експорту"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Див. імена контактів як"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Спочатку ім\'я"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Спочатку прізвище"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Пошук контактів"</string>
<string name="take_photo" msgid="7496128293167402354">"Зробити фото"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Зробити нове фото"</string>
<string name="pick_photo" msgid="3746334626214970837">"Вибрати фото з галереї"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Очистити налаштування за умовчанням"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Текст скопійовано"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Відхилити зміни?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Налаштувати профіль"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Введіть ім’я особи"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Переглян. оновлення"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index c48b62e..4e10839 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> sẽ sớm được xuất."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Yêu cầu xuất vCard bị từ chối. Hãy thử lại sau."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"địa chỉ liên hệ"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Xuất danh bạ?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Danh sách địa chỉ liên hệ của bạn sẽ được xuất sang tệp: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Không thể xuất"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Xem tên liên hệ dưới dạng"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Tên trước tiên"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Họ trước tiên"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Tìm kiếm trong danh bạ"</string>
<string name="take_photo" msgid="7496128293167402354">"Chụp ảnh"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Chụp ảnh mới"</string>
<string name="pick_photo" msgid="3746334626214970837">"Chọn ảnh từ Thư viện"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Xóa mặc định"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Đã sao chép văn bản"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Hủy các thay đổi của bạn?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Thiết lập tiểu sử của tôi"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Nhập tên của người này"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Xem thông tin c.nhật"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 147d2ab..50a70ad 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> 将在稍后导出。"</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard 导出请求遭拒，请稍后重试。"</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"联系人"</string>
- <!-- no translation found for percentage (1887004062152632812) -->
+ <!-- no translation found for percentage (1044592438199055502) -->
<skip />
<string name="confirm_export_title" msgid="6834385377255286349">"要导出联系人吗？"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"系统会将您的联系人列表导出到以下文件：<xliff:g id="VCARD_FILENAME">%s</xliff:g>。"</string>
@@ -403,7 +403,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"联系人姓名的显示方式"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"名字在前"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓氏在前"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"搜索联系人"</string>
<string name="take_photo" msgid="7496128293167402354">"拍照"</string>
<string name="take_new_photo" msgid="7341354729436576304">"拍摄新照片"</string>
<string name="pick_photo" msgid="3746334626214970837">"从图库中选择照片"</string>
@@ -487,7 +486,8 @@
<string name="clear_default" msgid="7193185801596678067">"清除默认值"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"文本已复制"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"要舍弃您所做的更改吗？"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <!-- no translation found for call_type_and_date (747163730039311423) -->
+ <skip />
<string name="profile_display_name" msgid="4127389543625918771">"设置我的个人资料"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"键入联系人的姓名"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"查看更新"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index a42a94b..2b24950 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -245,7 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> 將在稍後匯出。"</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"vCard 匯出要求遭到拒絕，請稍後再試。"</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"聯絡人"</string>
- <string name="percentage" msgid="1887004062152632812">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"確定要匯出聯絡人？"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"您的聯絡人清單即將匯出至以下檔案：<xliff:g id="VCARD_FILENAME">%s</xliff:g>。"</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"無法匯出"</string>
@@ -402,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"聯絡人姓名顯示方式"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"名字在前"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"姓氏在前"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"搜尋聯絡人"</string>
<string name="take_photo" msgid="7496128293167402354">"拍照"</string>
<string name="take_new_photo" msgid="7341354729436576304">"拍攝新相片"</string>
<string name="pick_photo" msgid="3746334626214970837">"從圖片庫選擇相片"</string>
@@ -486,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"清除預設值"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"文字已複製"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"確定要捨棄變更？"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"設定我的個人資料"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"輸入聯絡人的名稱"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"查看更新"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index fa0672b..252e45d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -245,8 +245,7 @@
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"i-<xliff:g id="FILENAME">%s</xliff:g> izothekeliswa maduze nje."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Isicelo sokuthekelisa i-vCard sinqatshelwe. Sicela uzame futhi emva kwesikhathi."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"othintana nabo"</string>
- <!-- no translation found for percentage (1887004062152632812) -->
- <skip />
+ <string name="percentage" msgid="1044592438199055502">"<xliff:g id="PERCENTAGE">%s</xliff:g><xliff:g id="PERCENTSIGN">%%</xliff:g>"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Thekelisa othintana nabo"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Uhlu loxhumana nabo luyothunyelw efayelini: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Yehlulekile ukuthumela"</string>
@@ -403,7 +402,6 @@
<string name="display_options_view_names_as" msgid="18022868169627979">"Buka amagama othintana nabo njenge"</string>
<string name="display_options_view_given_name_first" msgid="6968288511197363292">"Igama elinikeziwe kuqala"</string>
<string name="display_options_view_family_name_first" msgid="1447288164951453714">"Igama lomkhaya kuqala"</string>
- <string name="search_bar_hint" msgid="1012756309632856553">"Sesha othintana nabo"</string>
<string name="take_photo" msgid="7496128293167402354">"Thatha isithombe"</string>
<string name="take_new_photo" msgid="7341354729436576304">"Thatha isithombe esisha"</string>
<string name="pick_photo" msgid="3746334626214970837">"Khetha isithombe kwiGalari"</string>
@@ -487,7 +485,7 @@
<string name="clear_default" msgid="7193185801596678067">"Sula okuzenzakalelayo"</string>
<string name="toast_text_copied" msgid="5143776250008541719">"Umbhalo okopishiwe"</string>
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Lahla izinguquko ozenzile?"</string>
- <string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
+ <string name="call_type_and_date" msgid="747163730039311423">"<xliff:g id="CALL_TYPE">%1$s</xliff:g> <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Misa iphrofayli yami"</string>
<string name="enter_contact_name" msgid="1738391320566349924">"Thayipha igama lomuntu"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Buka Okwenziwe Kabusha"</string>
diff --git a/src/com/android/contacts/ContactLoader.java b/src/com/android/contacts/ContactLoader.java
index 685bd7d..e85f5f5 100644
--- a/src/com/android/contacts/ContactLoader.java
+++ b/src/com/android/contacts/ContactLoader.java
@@ -28,6 +28,7 @@
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import android.content.AsyncTaskLoader;
import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
@@ -35,14 +36,12 @@
import android.content.Entity;
import android.content.Entity.NamedContentValues;
import android.content.Intent;
-import android.content.Loader;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.AssetFileDescriptor;
import android.content.res.Resources;
import android.database.Cursor;
import android.net.Uri;
-import android.os.AsyncTask;
import android.provider.ContactsContract;
import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
import android.provider.ContactsContract.CommonDataKinds.Photo;
@@ -70,7 +69,7 @@
/**
* Loads a single Contact and all it constituent RawContacts.
*/
-public class ContactLoader extends Loader<ContactLoader.Result> {
+public class ContactLoader extends AsyncTaskLoader<ContactLoader.Result> {
private static final String TAG = "ContactLoader";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -82,13 +81,26 @@
private final boolean mLoadInvitableAccountTypes;
private Result mContact;
private ForceLoadContentObserver mObserver;
- private boolean mDestroyed;
private final Set<Long> mNotifiedRawContactIds = Sets.newHashSet();
public interface Listener {
public void onContactLoaded(Result contact);
}
+ public ContactLoader(Context context, Uri lookupUri) {
+ this(context, lookupUri, false, false, false);
+ }
+
+ public ContactLoader(Context context, Uri lookupUri, boolean loadGroupMetaData,
+ boolean loadStreamItems, boolean loadInvitableAccountTypes) {
+ super(context);
+ mLookupUri = lookupUri;
+ mRequestedUri = lookupUri;
+ mLoadGroupMetaData = loadGroupMetaData;
+ mLoadStreamItems = loadStreamItems;
+ mLoadInvitableAccountTypes = loadInvitableAccountTypes;
+ }
+
/**
* The result of a load operation. Contains all data necessary to display the contact.
*/
@@ -670,498 +682,495 @@
public final static int FAVORITES = 7;
}
- private final class LoadContactTask extends AsyncTask<Void, Void, Result> {
-
- @Override
- protected Result doInBackground(Void... args) {
- try {
- final ContentResolver resolver = getContext().getContentResolver();
- final Uri uriCurrentFormat = ContactLoaderUtils.ensureIsContactUri(
- resolver, mLookupUri);
- Result result = loadContactEntity(resolver, uriCurrentFormat);
- if (!result.isNotFound()) {
- if (result.isDirectoryEntry()) {
- loadDirectoryMetaData(result);
- } else if (mLoadGroupMetaData) {
- loadGroupMetaData(result);
- }
- if (mLoadStreamItems) {
- loadStreamItems(result);
- }
- loadPhotoBinaryData(result);
-
- // Note ME profile should never have "Add connection"
- if (mLoadInvitableAccountTypes && !result.isUserProfile()) {
- loadInvitableAccountTypes(result);
- }
+ @Override
+ public Result loadInBackground() {
+ try {
+ final ContentResolver resolver = getContext().getContentResolver();
+ final Uri uriCurrentFormat = ContactLoaderUtils.ensureIsContactUri(
+ resolver, mLookupUri);
+ Result result = loadContactEntity(resolver, uriCurrentFormat);
+ if (!result.isNotFound()) {
+ if (result.isDirectoryEntry()) {
+ loadDirectoryMetaData(result);
+ } else if (mLoadGroupMetaData) {
+ loadGroupMetaData(result);
}
- return result;
- } catch (Exception e) {
- Log.e(TAG, "Error loading the contact: " + mLookupUri, e);
- return Result.forError(mRequestedUri, e);
+ if (mLoadStreamItems) {
+ loadStreamItems(result);
+ }
+ loadPhotoBinaryData(result);
+
+ // Note ME profile should never have "Add connection"
+ if (mLoadInvitableAccountTypes && !result.isUserProfile()) {
+ loadInvitableAccountTypes(result);
+ }
}
+ return result;
+ } catch (Exception e) {
+ Log.e(TAG, "Error loading the contact: " + mLookupUri, e);
+ return Result.forError(mRequestedUri, e);
+ }
+ }
+
+ private Result loadContactEntity(ContentResolver resolver, Uri contactUri) {
+ Uri entityUri = Uri.withAppendedPath(contactUri, Contacts.Entity.CONTENT_DIRECTORY);
+ Cursor cursor = resolver.query(entityUri, ContactQuery.COLUMNS, null, null,
+ Contacts.Entity.RAW_CONTACT_ID);
+ if (cursor == null) {
+ Log.e(TAG, "No cursor returned in loadContactEntity");
+ return Result.forNotFound(mRequestedUri);
}
- private Result loadContactEntity(ContentResolver resolver, Uri contactUri) {
- Uri entityUri = Uri.withAppendedPath(contactUri, Contacts.Entity.CONTENT_DIRECTORY);
- Cursor cursor = resolver.query(entityUri, ContactQuery.COLUMNS, null, null,
- Contacts.Entity.RAW_CONTACT_ID);
- if (cursor == null) {
- Log.e(TAG, "No cursor returned in loadContactEntity");
+ try {
+ if (!cursor.moveToFirst()) {
+ cursor.close();
return Result.forNotFound(mRequestedUri);
}
- try {
- if (!cursor.moveToFirst()) {
- cursor.close();
- return Result.forNotFound(mRequestedUri);
+ long currentRawContactId = -1;
+ Entity entity = null;
+ Result result = loadContactHeaderData(cursor, contactUri);
+ ArrayList<Entity> entities = result.getEntities();
+ LongSparseArray<DataStatus> statuses = result.getStatuses();
+ for (; !cursor.isAfterLast(); cursor.moveToNext()) {
+ long rawContactId = cursor.getLong(ContactQuery.RAW_CONTACT_ID);
+ if (rawContactId != currentRawContactId) {
+ currentRawContactId = rawContactId;
+ entity = new android.content.Entity(loadRawContact(cursor));
+ entities.add(entity);
}
+ if (!cursor.isNull(ContactQuery.DATA_ID)) {
+ ContentValues data = loadData(cursor);
+ entity.addSubValue(ContactsContract.Data.CONTENT_URI, data);
- long currentRawContactId = -1;
- Entity entity = null;
- Result result = loadContactHeaderData(cursor, contactUri);
- ArrayList<Entity> entities = result.getEntities();
- LongSparseArray<DataStatus> statuses = result.getStatuses();
- for (; !cursor.isAfterLast(); cursor.moveToNext()) {
- long rawContactId = cursor.getLong(ContactQuery.RAW_CONTACT_ID);
- if (rawContactId != currentRawContactId) {
- currentRawContactId = rawContactId;
- entity = new android.content.Entity(loadRawContact(cursor));
- entities.add(entity);
- }
- if (!cursor.isNull(ContactQuery.DATA_ID)) {
- ContentValues data = loadData(cursor);
- entity.addSubValue(ContactsContract.Data.CONTENT_URI, data);
-
- if (!cursor.isNull(ContactQuery.PRESENCE)
- || !cursor.isNull(ContactQuery.STATUS)) {
- final DataStatus status = new DataStatus(cursor);
- final long dataId = cursor.getLong(ContactQuery.DATA_ID);
- statuses.put(dataId, status);
- }
+ if (!cursor.isNull(ContactQuery.PRESENCE)
+ || !cursor.isNull(ContactQuery.STATUS)) {
+ final DataStatus status = new DataStatus(cursor);
+ final long dataId = cursor.getLong(ContactQuery.DATA_ID);
+ statuses.put(dataId, status);
}
}
-
- return result;
- } finally {
- cursor.close();
}
+
+ return result;
+ } finally {
+ cursor.close();
}
+ }
- /**
- * Looks for the photo data item in entities. If found, creates a new Bitmap instance. If
- * not found, returns null
- */
- private void loadPhotoBinaryData(Result contactData) {
+ /**
+ * Looks for the photo data item in entities. If found, creates a new Bitmap instance. If
+ * not found, returns null
+ */
+ private void loadPhotoBinaryData(Result contactData) {
- // If we have a photo URI, try loading that first.
- String photoUri = contactData.getPhotoUri();
- if (photoUri != null) {
+ // If we have a photo URI, try loading that first.
+ String photoUri = contactData.getPhotoUri();
+ if (photoUri != null) {
+ try {
+ AssetFileDescriptor fd = getContext().getContentResolver()
+ .openAssetFileDescriptor(Uri.parse(photoUri), "r");
+ byte[] buffer = new byte[16 * 1024];
+ FileInputStream fis = fd.createInputStream();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
- AssetFileDescriptor fd = getContext().getContentResolver()
- .openAssetFileDescriptor(Uri.parse(photoUri), "r");
- byte[] buffer = new byte[16 * 1024];
- FileInputStream fis = fd.createInputStream();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ int size;
+ while ((size = fis.read(buffer)) != -1) {
+ baos.write(buffer, 0, size);
+ }
+ contactData.setPhotoBinaryData(baos.toByteArray());
+ } finally {
+ fis.close();
+ fd.close();
+ }
+ return;
+ } catch (IOException ioe) {
+ // Just fall back to the case below.
+ }
+ }
+
+ // If we couldn't load from a file, fall back to the data blob.
+ final long photoId = contactData.getPhotoId();
+ if (photoId <= 0) {
+ // No photo ID
+ return;
+ }
+
+ for (Entity entity : contactData.getEntities()) {
+ for (NamedContentValues subValue : entity.getSubValues()) {
+ final ContentValues entryValues = subValue.values;
+ final long dataId = entryValues.getAsLong(Data._ID);
+ if (dataId == photoId) {
+ final String mimeType = entryValues.getAsString(Data.MIMETYPE);
+ // Correct Data Id but incorrect MimeType? Don't load
+ if (!Photo.CONTENT_ITEM_TYPE.equals(mimeType)) {
+ return;
+ }
+ contactData.setPhotoBinaryData(entryValues.getAsByteArray(Photo.PHOTO));
+ break;
+ }
+ }
+ }
+ }
+
+ /**
+ * Sets the "invitable" account types to {@link Result#mInvitableAccountTypes}.
+ */
+ private void loadInvitableAccountTypes(Result contactData) {
+ Map<AccountTypeWithDataSet, AccountType> invitables =
+ AccountTypeManager.getInstance(getContext()).getUsableInvitableAccountTypes();
+ if (invitables.isEmpty()) {
+ return;
+ }
+
+ Map<AccountTypeWithDataSet, AccountType> result = Maps.newHashMap(invitables);
+
+ // Remove the ones that already have a raw contact in the current contact
+ for (Entity entity : contactData.getEntities()) {
+ final ContentValues values = entity.getEntityValues();
+ final AccountTypeWithDataSet type = AccountTypeWithDataSet.get(
+ values.getAsString(RawContacts.ACCOUNT_TYPE),
+ values.getAsString(RawContacts.DATA_SET));
+ result.remove(type);
+ }
+
+ // Set to mInvitableAccountTypes
+ contactData.mInvitableAccountTypes.addAll(result.values());
+ }
+
+ /**
+ * Extracts Contact level columns from the cursor.
+ */
+ private Result loadContactHeaderData(final Cursor cursor, Uri contactUri) {
+ final String directoryParameter =
+ contactUri.getQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY);
+ final long directoryId = directoryParameter == null
+ ? Directory.DEFAULT
+ : Long.parseLong(directoryParameter);
+ final long contactId = cursor.getLong(ContactQuery.CONTACT_ID);
+ final String lookupKey = cursor.getString(ContactQuery.LOOKUP_KEY);
+ final long nameRawContactId = cursor.getLong(ContactQuery.NAME_RAW_CONTACT_ID);
+ final int displayNameSource = cursor.getInt(ContactQuery.DISPLAY_NAME_SOURCE);
+ final String displayName = cursor.getString(ContactQuery.DISPLAY_NAME);
+ final String altDisplayName = cursor.getString(ContactQuery.ALT_DISPLAY_NAME);
+ final String phoneticName = cursor.getString(ContactQuery.PHONETIC_NAME);
+ final long photoId = cursor.getLong(ContactQuery.PHOTO_ID);
+ final String photoUri = cursor.getString(ContactQuery.PHOTO_URI);
+ final boolean starred = cursor.getInt(ContactQuery.STARRED) != 0;
+ final Integer presence = cursor.isNull(ContactQuery.CONTACT_PRESENCE)
+ ? null
+ : cursor.getInt(ContactQuery.CONTACT_PRESENCE);
+ final boolean sendToVoicemail = cursor.getInt(ContactQuery.SEND_TO_VOICEMAIL) == 1;
+ final String customRingtone = cursor.getString(ContactQuery.CUSTOM_RINGTONE);
+ final boolean isUserProfile = cursor.getInt(ContactQuery.IS_USER_PROFILE) == 1;
+
+ Uri lookupUri;
+ if (directoryId == Directory.DEFAULT || directoryId == Directory.LOCAL_INVISIBLE) {
+ lookupUri = ContentUris.withAppendedId(
+ Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey), contactId);
+ } else {
+ lookupUri = contactUri;
+ }
+
+ return new Result(mRequestedUri, contactUri, lookupUri, directoryId, lookupKey,
+ contactId, nameRawContactId, displayNameSource, photoId, photoUri, displayName,
+ altDisplayName, phoneticName, starred, presence, sendToVoicemail,
+ customRingtone, isUserProfile);
+ }
+
+ /**
+ * Extracts RawContact level columns from the cursor.
+ */
+ private ContentValues loadRawContact(Cursor cursor) {
+ ContentValues cv = new ContentValues();
+
+ cv.put(RawContacts._ID, cursor.getLong(ContactQuery.RAW_CONTACT_ID));
+
+ cursorColumnToContentValues(cursor, cv, ContactQuery.ACCOUNT_NAME);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.ACCOUNT_TYPE);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SET);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.ACCOUNT_TYPE_AND_DATA_SET);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DIRTY);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.VERSION);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.SOURCE_ID);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.SYNC1);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.SYNC2);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.SYNC3);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.SYNC4);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DELETED);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.CONTACT_ID);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.STARRED);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.NAME_VERIFIED);
+
+ return cv;
+ }
+
+ /**
+ * Extracts Data level columns from the cursor.
+ */
+ private ContentValues loadData(Cursor cursor) {
+ ContentValues cv = new ContentValues();
+
+ cv.put(Data._ID, cursor.getLong(ContactQuery.DATA_ID));
+
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA1);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA2);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA3);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA4);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA5);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA6);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA7);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA8);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA9);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA10);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA11);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA12);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA13);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA14);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA15);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SYNC1);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SYNC2);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SYNC3);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SYNC4);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_VERSION);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.IS_PRIMARY);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.IS_SUPERPRIMARY);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.MIMETYPE);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.RES_PACKAGE);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.GROUP_SOURCE_ID);
+ cursorColumnToContentValues(cursor, cv, ContactQuery.CHAT_CAPABILITY);
+
+ return cv;
+ }
+
+ private void cursorColumnToContentValues(
+ Cursor cursor, ContentValues values, int index) {
+ switch (cursor.getType(index)) {
+ case Cursor.FIELD_TYPE_NULL:
+ // don't put anything in the content values
+ break;
+ case Cursor.FIELD_TYPE_INTEGER:
+ values.put(ContactQuery.COLUMNS[index], cursor.getLong(index));
+ break;
+ case Cursor.FIELD_TYPE_STRING:
+ values.put(ContactQuery.COLUMNS[index], cursor.getString(index));
+ break;
+ case Cursor.FIELD_TYPE_BLOB:
+ values.put(ContactQuery.COLUMNS[index], cursor.getBlob(index));
+ break;
+ default:
+ throw new IllegalStateException("Invalid or unhandled data type");
+ }
+ }
+
+ private void loadDirectoryMetaData(Result result) {
+ long directoryId = result.getDirectoryId();
+
+ Cursor cursor = getContext().getContentResolver().query(
+ ContentUris.withAppendedId(Directory.CONTENT_URI, directoryId),
+ DirectoryQuery.COLUMNS, null, null, null);
+ if (cursor == null) {
+ return;
+ }
+ try {
+ if (cursor.moveToFirst()) {
+ final String displayName = cursor.getString(DirectoryQuery.DISPLAY_NAME);
+ final String packageName = cursor.getString(DirectoryQuery.PACKAGE_NAME);
+ final int typeResourceId = cursor.getInt(DirectoryQuery.TYPE_RESOURCE_ID);
+ final String accountType = cursor.getString(DirectoryQuery.ACCOUNT_TYPE);
+ final String accountName = cursor.getString(DirectoryQuery.ACCOUNT_NAME);
+ final int exportSupport = cursor.getInt(DirectoryQuery.EXPORT_SUPPORT);
+ String directoryType = null;
+ if (!TextUtils.isEmpty(packageName)) {
+ PackageManager pm = getContext().getPackageManager();
try {
- int size;
- while ((size = fis.read(buffer)) != -1) {
- baos.write(buffer, 0, size);
- }
- contactData.setPhotoBinaryData(baos.toByteArray());
- } finally {
- fis.close();
- fd.close();
- }
- return;
- } catch (IOException ioe) {
- // Just fall back to the case below.
- }
- }
-
- // If we couldn't load from a file, fall back to the data blob.
- final long photoId = contactData.getPhotoId();
- if (photoId <= 0) {
- // No photo ID
- return;
- }
-
- for (Entity entity : contactData.getEntities()) {
- for (NamedContentValues subValue : entity.getSubValues()) {
- final ContentValues entryValues = subValue.values;
- final long dataId = entryValues.getAsLong(Data._ID);
- if (dataId == photoId) {
- final String mimeType = entryValues.getAsString(Data.MIMETYPE);
- // Correct Data Id but incorrect MimeType? Don't load
- if (!Photo.CONTENT_ITEM_TYPE.equals(mimeType)) {
- return;
- }
- contactData.setPhotoBinaryData(entryValues.getAsByteArray(Photo.PHOTO));
- break;
+ Resources resources = pm.getResourcesForApplication(packageName);
+ directoryType = resources.getString(typeResourceId);
+ } catch (NameNotFoundException e) {
+ Log.w(TAG, "Contact directory resource not found: "
+ + packageName + "." + typeResourceId);
}
}
+
+ result.setDirectoryMetaData(
+ displayName, directoryType, accountType, accountName, exportSupport);
}
+ } finally {
+ cursor.close();
}
+ }
- /**
- * Sets the "invitable" account types to {@link Result#mInvitableAccountTypes}.
- */
- private void loadInvitableAccountTypes(Result contactData) {
- Map<AccountTypeWithDataSet, AccountType> invitables =
- AccountTypeManager.getInstance(getContext()).getUsableInvitableAccountTypes();
- if (invitables.isEmpty()) {
- return;
- }
-
- Map<AccountTypeWithDataSet, AccountType> result = Maps.newHashMap(invitables);
-
- // Remove the ones that already have a raw contact in the current contact
- for (Entity entity : contactData.getEntities()) {
- final ContentValues values = entity.getEntityValues();
- final AccountTypeWithDataSet type = AccountTypeWithDataSet.get(
- values.getAsString(RawContacts.ACCOUNT_TYPE),
- values.getAsString(RawContacts.DATA_SET));
- result.remove(type);
- }
-
- // Set to mInvitableAccountTypes
- contactData.mInvitableAccountTypes.addAll(result.values());
- }
-
- /**
- * Extracts Contact level columns from the cursor.
- */
- private Result loadContactHeaderData(final Cursor cursor, Uri contactUri) {
- final String directoryParameter =
- contactUri.getQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY);
- final long directoryId = directoryParameter == null
- ? Directory.DEFAULT
- : Long.parseLong(directoryParameter);
- final long contactId = cursor.getLong(ContactQuery.CONTACT_ID);
- final String lookupKey = cursor.getString(ContactQuery.LOOKUP_KEY);
- final long nameRawContactId = cursor.getLong(ContactQuery.NAME_RAW_CONTACT_ID);
- final int displayNameSource = cursor.getInt(ContactQuery.DISPLAY_NAME_SOURCE);
- final String displayName = cursor.getString(ContactQuery.DISPLAY_NAME);
- final String altDisplayName = cursor.getString(ContactQuery.ALT_DISPLAY_NAME);
- final String phoneticName = cursor.getString(ContactQuery.PHONETIC_NAME);
- final long photoId = cursor.getLong(ContactQuery.PHOTO_ID);
- final String photoUri = cursor.getString(ContactQuery.PHOTO_URI);
- final boolean starred = cursor.getInt(ContactQuery.STARRED) != 0;
- final Integer presence = cursor.isNull(ContactQuery.CONTACT_PRESENCE)
- ? null
- : cursor.getInt(ContactQuery.CONTACT_PRESENCE);
- final boolean sendToVoicemail = cursor.getInt(ContactQuery.SEND_TO_VOICEMAIL) == 1;
- final String customRingtone = cursor.getString(ContactQuery.CUSTOM_RINGTONE);
- final boolean isUserProfile = cursor.getInt(ContactQuery.IS_USER_PROFILE) == 1;
-
- Uri lookupUri;
- if (directoryId == Directory.DEFAULT || directoryId == Directory.LOCAL_INVISIBLE) {
- lookupUri = ContentUris.withAppendedId(
- Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey), contactId);
- } else {
- lookupUri = contactUri;
- }
-
- return new Result(mRequestedUri, contactUri, lookupUri, directoryId, lookupKey,
- contactId, nameRawContactId, displayNameSource, photoId, photoUri, displayName,
- altDisplayName, phoneticName, starred, presence, sendToVoicemail,
- customRingtone, isUserProfile);
- }
-
- /**
- * Extracts RawContact level columns from the cursor.
- */
- private ContentValues loadRawContact(Cursor cursor) {
- ContentValues cv = new ContentValues();
-
- cv.put(RawContacts._ID, cursor.getLong(ContactQuery.RAW_CONTACT_ID));
-
- cursorColumnToContentValues(cursor, cv, ContactQuery.ACCOUNT_NAME);
- cursorColumnToContentValues(cursor, cv, ContactQuery.ACCOUNT_TYPE);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SET);
- cursorColumnToContentValues(cursor, cv, ContactQuery.ACCOUNT_TYPE_AND_DATA_SET);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DIRTY);
- cursorColumnToContentValues(cursor, cv, ContactQuery.VERSION);
- cursorColumnToContentValues(cursor, cv, ContactQuery.SOURCE_ID);
- cursorColumnToContentValues(cursor, cv, ContactQuery.SYNC1);
- cursorColumnToContentValues(cursor, cv, ContactQuery.SYNC2);
- cursorColumnToContentValues(cursor, cv, ContactQuery.SYNC3);
- cursorColumnToContentValues(cursor, cv, ContactQuery.SYNC4);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DELETED);
- cursorColumnToContentValues(cursor, cv, ContactQuery.CONTACT_ID);
- cursorColumnToContentValues(cursor, cv, ContactQuery.STARRED);
- cursorColumnToContentValues(cursor, cv, ContactQuery.NAME_VERIFIED);
-
- return cv;
- }
-
- /**
- * Extracts Data level columns from the cursor.
- */
- private ContentValues loadData(Cursor cursor) {
- ContentValues cv = new ContentValues();
-
- cv.put(Data._ID, cursor.getLong(ContactQuery.DATA_ID));
-
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA1);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA2);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA3);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA4);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA5);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA6);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA7);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA8);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA9);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA10);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA11);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA12);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA13);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA14);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA15);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SYNC1);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SYNC2);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SYNC3);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_SYNC4);
- cursorColumnToContentValues(cursor, cv, ContactQuery.DATA_VERSION);
- cursorColumnToContentValues(cursor, cv, ContactQuery.IS_PRIMARY);
- cursorColumnToContentValues(cursor, cv, ContactQuery.IS_SUPERPRIMARY);
- cursorColumnToContentValues(cursor, cv, ContactQuery.MIMETYPE);
- cursorColumnToContentValues(cursor, cv, ContactQuery.RES_PACKAGE);
- cursorColumnToContentValues(cursor, cv, ContactQuery.GROUP_SOURCE_ID);
- cursorColumnToContentValues(cursor, cv, ContactQuery.CHAT_CAPABILITY);
-
- return cv;
- }
-
- private void cursorColumnToContentValues(
- Cursor cursor, ContentValues values, int index) {
- switch (cursor.getType(index)) {
- case Cursor.FIELD_TYPE_NULL:
- // don't put anything in the content values
- break;
- case Cursor.FIELD_TYPE_INTEGER:
- values.put(ContactQuery.COLUMNS[index], cursor.getLong(index));
- break;
- case Cursor.FIELD_TYPE_STRING:
- values.put(ContactQuery.COLUMNS[index], cursor.getString(index));
- break;
- case Cursor.FIELD_TYPE_BLOB:
- values.put(ContactQuery.COLUMNS[index], cursor.getBlob(index));
- break;
- default:
- throw new IllegalStateException("Invalid or unhandled data type");
- }
- }
-
- private void loadDirectoryMetaData(Result result) {
- long directoryId = result.getDirectoryId();
-
- Cursor cursor = getContext().getContentResolver().query(
- ContentUris.withAppendedId(Directory.CONTENT_URI, directoryId),
- DirectoryQuery.COLUMNS, null, null, null);
- if (cursor == null) {
- return;
- }
- try {
- if (cursor.moveToFirst()) {
- final String displayName = cursor.getString(DirectoryQuery.DISPLAY_NAME);
- final String packageName = cursor.getString(DirectoryQuery.PACKAGE_NAME);
- final int typeResourceId = cursor.getInt(DirectoryQuery.TYPE_RESOURCE_ID);
- final String accountType = cursor.getString(DirectoryQuery.ACCOUNT_TYPE);
- final String accountName = cursor.getString(DirectoryQuery.ACCOUNT_NAME);
- final int exportSupport = cursor.getInt(DirectoryQuery.EXPORT_SUPPORT);
- String directoryType = null;
- if (!TextUtils.isEmpty(packageName)) {
- PackageManager pm = getContext().getPackageManager();
- try {
- Resources resources = pm.getResourcesForApplication(packageName);
- directoryType = resources.getString(typeResourceId);
- } catch (NameNotFoundException e) {
- Log.w(TAG, "Contact directory resource not found: "
- + packageName + "." + typeResourceId);
- }
- }
-
- result.setDirectoryMetaData(
- displayName, directoryType, accountType, accountName, exportSupport);
+ /**
+ * Loads groups meta-data for all groups associated with all constituent raw contacts'
+ * accounts.
+ */
+ private void loadGroupMetaData(Result result) {
+ StringBuilder selection = new StringBuilder();
+ ArrayList<String> selectionArgs = new ArrayList<String>();
+ for (Entity entity : result.mEntities) {
+ ContentValues values = entity.getEntityValues();
+ String accountName = values.getAsString(RawContacts.ACCOUNT_NAME);
+ String accountType = values.getAsString(RawContacts.ACCOUNT_TYPE);
+ String dataSet = values.getAsString(RawContacts.DATA_SET);
+ if (accountName != null && accountType != null) {
+ if (selection.length() != 0) {
+ selection.append(" OR ");
}
- } finally {
- cursor.close();
- }
- }
+ selection.append(
+ "(" + Groups.ACCOUNT_NAME + "=? AND " + Groups.ACCOUNT_TYPE + "=?");
+ selectionArgs.add(accountName);
+ selectionArgs.add(accountType);
- /**
- * Loads groups meta-data for all groups associated with all constituent raw contacts'
- * accounts.
- */
- private void loadGroupMetaData(Result result) {
- StringBuilder selection = new StringBuilder();
- ArrayList<String> selectionArgs = new ArrayList<String>();
- for (Entity entity : result.mEntities) {
- ContentValues values = entity.getEntityValues();
- String accountName = values.getAsString(RawContacts.ACCOUNT_NAME);
- String accountType = values.getAsString(RawContacts.ACCOUNT_TYPE);
- String dataSet = values.getAsString(RawContacts.DATA_SET);
- if (accountName != null && accountType != null) {
- if (selection.length() != 0) {
- selection.append(" OR ");
- }
- selection.append(
- "(" + Groups.ACCOUNT_NAME + "=? AND " + Groups.ACCOUNT_TYPE + "=?");
- selectionArgs.add(accountName);
- selectionArgs.add(accountType);
-
- if (dataSet != null) {
- selection.append(" AND " + Groups.DATA_SET + "=?");
- selectionArgs.add(dataSet);
- } else {
- selection.append(" AND " + Groups.DATA_SET + " IS NULL");
- }
- selection.append(")");
- }
- }
- Cursor cursor = getContext().getContentResolver().query(Groups.CONTENT_URI,
- GroupQuery.COLUMNS, selection.toString(), selectionArgs.toArray(new String[0]),
- null);
- try {
- while (cursor.moveToNext()) {
- final String accountName = cursor.getString(GroupQuery.ACCOUNT_NAME);
- final String accountType = cursor.getString(GroupQuery.ACCOUNT_TYPE);
- final String dataSet = cursor.getString(GroupQuery.DATA_SET);
- final long groupId = cursor.getLong(GroupQuery.ID);
- final String title = cursor.getString(GroupQuery.TITLE);
- final boolean defaultGroup = cursor.isNull(GroupQuery.AUTO_ADD)
- ? false
- : cursor.getInt(GroupQuery.AUTO_ADD) != 0;
- final boolean favorites = cursor.isNull(GroupQuery.FAVORITES)
- ? false
- : cursor.getInt(GroupQuery.FAVORITES) != 0;
-
- result.addGroupMetaData(new GroupMetaData(
- accountName, accountType, dataSet, groupId, title, defaultGroup,
- favorites));
- }
- } finally {
- cursor.close();
- }
- }
-
- /**
- * Loads all stream items and stream item photos belonging to this contact.
- */
- private void loadStreamItems(Result result) {
- Cursor cursor = getContext().getContentResolver().query(
- Contacts.CONTENT_LOOKUP_URI.buildUpon()
- .appendPath(result.getLookupKey())
- .appendPath(Contacts.StreamItems.CONTENT_DIRECTORY).build(),
- null, null, null, null);
- LongSparseArray<StreamItemEntry> streamItemsById =
- new LongSparseArray<StreamItemEntry>();
- ArrayList<StreamItemEntry> streamItems = new ArrayList<StreamItemEntry>();
- try {
- while (cursor.moveToNext()) {
- StreamItemEntry streamItem = new StreamItemEntry(cursor);
- streamItemsById.put(streamItem.getId(), streamItem);
- streamItems.add(streamItem);
- }
- } finally {
- cursor.close();
- }
-
- // Pre-decode all HTMLs
- final long start = System.currentTimeMillis();
- for (StreamItemEntry streamItem : streamItems) {
- streamItem.decodeHtml(getContext());
- }
- final long end = System.currentTimeMillis();
- if (DEBUG) {
- Log.d(TAG, "Decoded HTML for " + streamItems.size() + " items, took "
- + (end - start) + " ms");
- }
-
- // Now retrieve any photo records associated with the stream items.
- if (!streamItems.isEmpty()) {
- if (result.isUserProfile()) {
- // If the stream items we're loading are for the profile, we can't bulk-load the
- // stream items with a custom selection.
- for (StreamItemEntry entry : streamItems) {
- Cursor siCursor = getContext().getContentResolver().query(
- Uri.withAppendedPath(
- ContentUris.withAppendedId(
- StreamItems.CONTENT_URI, entry.getId()),
- StreamItems.StreamItemPhotos.CONTENT_DIRECTORY),
- null, null, null, null);
- try {
- while (siCursor.moveToNext()) {
- entry.addPhoto(new StreamItemPhotoEntry(siCursor));
- }
- } finally {
- siCursor.close();
- }
- }
+ if (dataSet != null) {
+ selection.append(" AND " + Groups.DATA_SET + "=?");
+ selectionArgs.add(dataSet);
} else {
- String[] streamItemIdArr = new String[streamItems.size()];
- StringBuilder streamItemPhotoSelection = new StringBuilder();
- streamItemPhotoSelection.append(StreamItemPhotos.STREAM_ITEM_ID + " IN (");
- for (int i = 0; i < streamItems.size(); i++) {
- if (i > 0) {
- streamItemPhotoSelection.append(",");
- }
- streamItemPhotoSelection.append("?");
- streamItemIdArr[i] = String.valueOf(streamItems.get(i).getId());
- }
- streamItemPhotoSelection.append(")");
- Cursor sipCursor = getContext().getContentResolver().query(
- StreamItems.CONTENT_PHOTO_URI,
- null, streamItemPhotoSelection.toString(), streamItemIdArr,
- StreamItemPhotos.STREAM_ITEM_ID);
+ selection.append(" AND " + Groups.DATA_SET + " IS NULL");
+ }
+ selection.append(")");
+ }
+ }
+ Cursor cursor = getContext().getContentResolver().query(Groups.CONTENT_URI,
+ GroupQuery.COLUMNS, selection.toString(), selectionArgs.toArray(new String[0]),
+ null);
+ try {
+ while (cursor.moveToNext()) {
+ final String accountName = cursor.getString(GroupQuery.ACCOUNT_NAME);
+ final String accountType = cursor.getString(GroupQuery.ACCOUNT_TYPE);
+ final String dataSet = cursor.getString(GroupQuery.DATA_SET);
+ final long groupId = cursor.getLong(GroupQuery.ID);
+ final String title = cursor.getString(GroupQuery.TITLE);
+ final boolean defaultGroup = cursor.isNull(GroupQuery.AUTO_ADD)
+ ? false
+ : cursor.getInt(GroupQuery.AUTO_ADD) != 0;
+ final boolean favorites = cursor.isNull(GroupQuery.FAVORITES)
+ ? false
+ : cursor.getInt(GroupQuery.FAVORITES) != 0;
+
+ result.addGroupMetaData(new GroupMetaData(
+ accountName, accountType, dataSet, groupId, title, defaultGroup,
+ favorites));
+ }
+ } finally {
+ cursor.close();
+ }
+ }
+
+ /**
+ * Loads all stream items and stream item photos belonging to this contact.
+ */
+ private void loadStreamItems(Result result) {
+ Cursor cursor = getContext().getContentResolver().query(
+ Contacts.CONTENT_LOOKUP_URI.buildUpon()
+ .appendPath(result.getLookupKey())
+ .appendPath(Contacts.StreamItems.CONTENT_DIRECTORY).build(),
+ null, null, null, null);
+ LongSparseArray<StreamItemEntry> streamItemsById =
+ new LongSparseArray<StreamItemEntry>();
+ ArrayList<StreamItemEntry> streamItems = new ArrayList<StreamItemEntry>();
+ try {
+ while (cursor.moveToNext()) {
+ StreamItemEntry streamItem = new StreamItemEntry(cursor);
+ streamItemsById.put(streamItem.getId(), streamItem);
+ streamItems.add(streamItem);
+ }
+ } finally {
+ cursor.close();
+ }
+
+ // Pre-decode all HTMLs
+ final long start = System.currentTimeMillis();
+ for (StreamItemEntry streamItem : streamItems) {
+ streamItem.decodeHtml(getContext());
+ }
+ final long end = System.currentTimeMillis();
+ if (DEBUG) {
+ Log.d(TAG, "Decoded HTML for " + streamItems.size() + " items, took "
+ + (end - start) + " ms");
+ }
+
+ // Now retrieve any photo records associated with the stream items.
+ if (!streamItems.isEmpty()) {
+ if (result.isUserProfile()) {
+ // If the stream items we're loading are for the profile, we can't bulk-load the
+ // stream items with a custom selection.
+ for (StreamItemEntry entry : streamItems) {
+ Cursor siCursor = getContext().getContentResolver().query(
+ Uri.withAppendedPath(
+ ContentUris.withAppendedId(
+ StreamItems.CONTENT_URI, entry.getId()),
+ StreamItems.StreamItemPhotos.CONTENT_DIRECTORY),
+ null, null, null, null);
try {
- while (sipCursor.moveToNext()) {
- long streamItemId = sipCursor.getLong(
- sipCursor.getColumnIndex(StreamItemPhotos.STREAM_ITEM_ID));
- StreamItemEntry streamItem = streamItemsById.get(streamItemId);
- streamItem.addPhoto(new StreamItemPhotoEntry(sipCursor));
+ while (siCursor.moveToNext()) {
+ entry.addPhoto(new StreamItemPhotoEntry(siCursor));
}
} finally {
- sipCursor.close();
+ siCursor.close();
}
}
- }
-
- // Set the sorted stream items on the result.
- Collections.sort(streamItems);
- result.mStreamItems.addAll(streamItems);
- }
-
- @Override
- protected void onPostExecute(Result result) {
- unregisterObserver();
-
- // The creator isn't interested in any further updates
- if (mDestroyed || result == null) {
- return;
- }
-
- mContact = result;
-
- if (result.isLoaded()) {
- mLookupUri = result.getLookupUri();
-
- if (!result.isDirectoryEntry()) {
- Log.i(TAG, "Registering content observer for " + mLookupUri);
- if (mObserver == null) {
- mObserver = new ForceLoadContentObserver();
+ } else {
+ String[] streamItemIdArr = new String[streamItems.size()];
+ StringBuilder streamItemPhotoSelection = new StringBuilder();
+ streamItemPhotoSelection.append(StreamItemPhotos.STREAM_ITEM_ID + " IN (");
+ for (int i = 0; i < streamItems.size(); i++) {
+ if (i > 0) {
+ streamItemPhotoSelection.append(",");
}
- getContext().getContentResolver().registerContentObserver(
- mLookupUri, true, mObserver);
+ streamItemPhotoSelection.append("?");
+ streamItemIdArr[i] = String.valueOf(streamItems.get(i).getId());
}
+ streamItemPhotoSelection.append(")");
+ Cursor sipCursor = getContext().getContentResolver().query(
+ StreamItems.CONTENT_PHOTO_URI,
+ null, streamItemPhotoSelection.toString(), streamItemIdArr,
+ StreamItemPhotos.STREAM_ITEM_ID);
+ try {
+ while (sipCursor.moveToNext()) {
+ long streamItemId = sipCursor.getLong(
+ sipCursor.getColumnIndex(StreamItemPhotos.STREAM_ITEM_ID));
+ StreamItemEntry streamItem = streamItemsById.get(streamItemId);
+ streamItem.addPhoto(new StreamItemPhotoEntry(sipCursor));
+ }
+ } finally {
+ sipCursor.close();
+ }
+ }
+ }
- // inform the source of the data that this contact is being looked at
- postViewNotificationToSyncAdapter();
+ // Set the sorted stream items on the result.
+ Collections.sort(streamItems);
+ result.mStreamItems.addAll(streamItems);
+ }
+
+ @Override
+ public void deliverResult(Result result) {
+ unregisterObserver();
+
+ // The creator isn't interested in any further updates
+ if (isReset() || result == null) {
+ return;
+ }
+
+ mContact = result;
+
+ if (result.isLoaded()) {
+ mLookupUri = result.getLookupUri();
+
+ if (!result.isDirectoryEntry()) {
+ Log.i(TAG, "Registering content observer for " + mLookupUri);
+ if (mObserver == null) {
+ mObserver = new ForceLoadContentObserver();
+ }
+ getContext().getContentResolver().registerContentObserver(
+ mLookupUri, true, mObserver);
}
- deliverResult(mContact);
+ // inform the source of the data that this contact is being looked at
+ postViewNotificationToSyncAdapter();
}
+
+ super.deliverResult(mContact);
}
/**
@@ -1205,20 +1214,6 @@
}
}
- public ContactLoader(Context context, Uri lookupUri) {
- this(context, lookupUri, false, false, false);
- }
-
- public ContactLoader(Context context, Uri lookupUri, boolean loadGroupMetaData,
- boolean loadStreamItems, boolean loadInvitableAccountTypes) {
- super(context);
- mLookupUri = lookupUri;
- mRequestedUri = lookupUri;
- mLoadGroupMetaData = loadGroupMetaData;
- mLoadStreamItems = loadStreamItems;
- mLoadInvitableAccountTypes = loadInvitableAccountTypes;
- }
-
/**
* Sets whether to load stream items. Will trigger a reload if the value has changed.
* At the moment, this is only used for debugging purposes
@@ -1250,15 +1245,15 @@
}
@Override
- protected void onForceLoad() {
- final LoadContactTask task = new LoadContactTask();
- task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[])null);
+ protected void onStopLoading() {
+ cancelLoad();
}
@Override
protected void onReset() {
+ super.onReset();
+ cancelLoad();
unregisterObserver();
mContact = null;
- mDestroyed = true;
}
}
diff --git a/src/com/android/contacts/ContactPhotoManager.java b/src/com/android/contacts/ContactPhotoManager.java
index cb0dc78..35585a6 100644
--- a/src/com/android/contacts/ContactPhotoManager.java
+++ b/src/com/android/contacts/ContactPhotoManager.java
@@ -255,6 +255,11 @@
private final LruCache<Object, BitmapHolder> mBitmapHolderCache;
/**
+ * {@code true} if ALL entries in {@link #mBitmapHolderCache} are NOT fresh.
+ */
+ private volatile boolean mBitmapHolderCacheAllUnfresh = true;
+
+ /**
* Cache size threshold at which bitmaps will not be preloaded.
*/
private final int mBitmapHolderCacheRedZoneBytes;
@@ -460,7 +465,12 @@
@Override
public void refreshCache() {
+ if (mBitmapHolderCacheAllUnfresh) {
+ if (DEBUG) Log.d(TAG, "refreshCache -- no fresh entries.");
+ return;
+ }
if (DEBUG) Log.d(TAG, "refreshCache");
+ mBitmapHolderCacheAllUnfresh = true;
for (BitmapHolder holder : mBitmapHolderCache.snapshot().values()) {
holder.fresh = false;
}
@@ -666,7 +676,6 @@
Log.d(TAG, "Caching data: key=" + key + ", " + btk(bytes.length));
}
BitmapHolder holder = new BitmapHolder(bytes);
- holder.fresh = true;
// Unless this image is being preloaded, decode it right away while
// we are still on the background thread.
@@ -675,6 +684,7 @@
}
mBitmapHolderCache.put(key, holder);
+ mBitmapHolderCacheAllUnfresh = false;
}
@Override
@@ -682,6 +692,7 @@
Request request = Request.createFromUri(photoUri, true, false, DEFAULT_AVATAR);
BitmapHolder holder = new BitmapHolder(photoBytes);
mBitmapHolderCache.put(request.getKey(), holder);
+ mBitmapHolderCacheAllUnfresh = false;
mBitmapCache.put(request.getKey(), bitmap);
}
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 2806830..04782fa 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -28,6 +28,9 @@
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+ <uses-permission android:name="android.permission.READ_PROFILE" />
+ <uses-permission android:name="android.permission.READ_SOCIAL_STREAM" />
+
<application>
<uses-library android:name="android.test.runner" />
<meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" />
