Merge "Disabling transition animation when view has size=0"
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 3bef15e..4a75c19 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"V telefonu nejsou žádné fotografie."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"V telefonu nejsou žádné fotografie."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Vlastní název štítku"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Možnosti zobrazení"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Přesměrovat hovory přímo do hlasové schránky"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Výchozí nastavení"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Odebrat fotografii"</string>
<string name="noContacts" msgid="8579310973261953559">"Žádné kontakty."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Nebyly nalezeny žádné odpovídající kontakty."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Ke kontaktům nejsou přiřazena žádná telefonní čísla."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Čtení dat vizitky vCard bylo zrušeno"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Import vizitky vCard byl dokončen"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Čtení dat vizitky vCard bylo zrušeno"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Nástroj pro import vizitky vCard byl spuštěn."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"Nástroj pro import vizitek vCard za okamžik importuje vizitku vCard."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s %%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Potvrdit export"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Opravdu chcete exportovat seznam kontaktů do souboru <xliff:g id="VCARD_FILENAME">%s</xliff:g>?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"V úložišti USB je příliš mnoho souborů vCard"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Na kartě SD je příliš mnoho souborů vCard"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Požadovaný název souboru (<xliff:g id="FILENAME">%s</xliff:g>) je příliš dlouhý"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Nástroj pro export vizitky vCard byl spuštěn."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Export vizitky vCard byl dokončen"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Export dat kontaktů"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Probíhá export dat kontaktů do souboru <xliff:g id="FILE_NAME">%s</xliff:g>"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organizace"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Webové stránky"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Událost"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Vztah"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Skupiny"</string>
<string name="type_short_home" msgid="7770424864090605384">"D"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Vyhledat kontakty"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Vyhledat všechny kontakty"</string>
<string name="take_photo" msgid="7496128293167402354">"Vyfotit"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Pořídit novou fotografii"</string>
<string name="pick_photo" msgid="448886509158039462">"Vybrat fotografii z galerie"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Vybrat novou fotografii z Galerie"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"V souvislosti se změnou jazyka probíhá aktualizace seznamu kontaktů."\n\n"Čekejte prosím..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Aktualizace seznamu kontaktů."\n\n"Čekejte prosím..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Probíhá upgrade kontaktů. "\n\n"Upgrade vyžaduje přibližně <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB vnitřní paměti telefonu. "\n\n"Zvolte jednu z následujících možností:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"sloučeno ze <xliff:g id="COUNT">%0$d</xliff:g> zdrojů"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Ostatní"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Spojit kontakty"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Spojit aktuální kontakt s vybraným kontaktem?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Upravit vybrané kontakty"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Přepnout do režimu úpravy vybraného kontaktu? Doposud zadané informace budou zkopírovány."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Zkopírovat do mých kontaktů"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"z adresáře: <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"od <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Vlastní"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Přizpůsobit..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Kontakty s telefonním číslem"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Kontakt"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Definice vlastního zobrazení"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Nastavení"</string>
<string name="menu_settings" msgid="377929915873428211">"Nastavení"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Telefonní číslo"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Přidat do kontaktů"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Zavřít"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Uvést rok"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 47809c3..e426a11 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Der er ingen tilgængelige billeder på telefonen."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Der er ingen tilgængelige billeder på telefonen."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Navn på tilpasset etiket"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Indstillinger for visning"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Send opkald direkte til voicemail"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Standard"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Fjern billede"</string>
<string name="noContacts" msgid="8579310973261953559">"Der er ingen kontakter."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Der blev ikke fundet nogen matchende kontakter."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Der er ingen kontakter med telefonnumre."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Læsning af vCard-data blev annulleret"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Import af vCard afsluttet"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Læsning af vCard-data blev annulleret"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Import af vCard startet."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"vCard-importøren importerer vCard-filen efter et stykke tid."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Bekræft eksport"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Er du sikker på, at du vil eksportere listen over kontaktpersoner til \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Der er for mange vCard-filer i USB-lager"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Der er for mange vCard-data på SD-kortet"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Det krævede filnavn er for langt (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Eksport af vCard startet."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Eksport af vCard afsluttet"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Eksporterer kontaktdata"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Kontaktdata eksporteres til \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisation"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Websted"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Begivenhed"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Forhold"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Grupper"</string>
<string name="type_short_home" msgid="7770424864090605384">"H"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Søg i kontakter"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Søg efter alle kontaktpersoner"</string>
<string name="take_photo" msgid="7496128293167402354">"Tag billede"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Tag nyt billede"</string>
<string name="pick_photo" msgid="448886509158039462">"Vælg foto fra Galleri"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Vælg nyt billede fra Galleri"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Kontaktlisten opdateres for at afspejle ændringen af sprog."\n\n"Vent et øjeblik..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Listen over kontaktpersoner opdateres."\n\n"Vent et øjeblik ..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Kontaktpersonerne er ved at blive opgraderet. "\n\n"Opgraderingen kræver ca. <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB intern lagerplads på telefonen."\n\n"Vælg et af følgende:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"flettet fra <xliff:g id="COUNT">%0$d</xliff:g> kilder"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Andre"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Saml kontaktpersoner"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Forbind den aktuelle kontaktperson med den valgte kontaktperson?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Rediger valgte kontaktpersoner"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Vil du redigere den valgte kontaktperson? Dine indtastninger kopieres."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Kopier til mine kontaktpersoner"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"fra <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"fra <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Tilpasset"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Tilpas..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Kontaktpersoner med telefonnumre"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Kontaktperson"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Angiv tilpasset visning"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Indstillinger"</string>
<string name="menu_settings" msgid="377929915873428211">"Indstillinger"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Telefonnummer"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Føj til kontaktpersoner"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Luk"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Angiv et år"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f17ddfd..fc761fe 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Auf dem Telefon sind keine Bilder verfügbar."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Auf dem Telefon sind keine Bilder verfügbar."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Name des benutzerdef. Labels"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Anzeigeoptionen"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Anrufe direkt an Mailbox senden"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Standard"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Foto entfernen"</string>
<string name="noContacts" msgid="8579310973261953559">"Keine Kontakte"</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Keine passenden Kontakte gefunden"</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Keine Kontakte mit Telefonnummern"</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Lesen von vCard-Daten abgebrochen"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Import der vCard abgeschlossen"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Lesen von vCard-Daten abgebrochen"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"vCard-Importprogramm gestartet"</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"Das vCard-Importprogramm importiert nach kurzer Zeit die vCard."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s %%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Export bestätigen"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Soll Ihre Kontaktliste wirklich an \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\" exportiert werden?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Zu viele vCard-Dateien im USB-Speicher"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Zu viele vCard-Dateien auf der SD-Karte"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Erforderlicher Dateiname ist zu lang (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"vCard-Exportprogramm gestartet"</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Export der vCard abgeschlossen"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Kontaktdaten werden exportiert."</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Kontaktdaten werden in \"<xliff:g id="FILE_NAME">%s</xliff:g>\" exportiert."</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Firma/Organisation"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Website"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Termin"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Beziehung"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Gruppen"</string>
<string name="type_short_home" msgid="7770424864090605384">"P"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Kontakte durchsuchen"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"In allen Kontakten suchen"</string>
<string name="take_photo" msgid="7496128293167402354">"Foto machen"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Neues Foto aufnehmen"</string>
<string name="pick_photo" msgid="448886509158039462">"Foto aus Galerie auswählen"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Neues Foto aus Galerie auswählen"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Die Kontaktliste wird an die geänderte Sprache angepasst."\n\n"Bitte warten..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Die Kontaktliste wird aktualisiert."\n\n"Bitte warten..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Kontakte werden gerade aktualisiert. "\n\n"Das Upgrade erfordert etwa <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB des internen Telefonspeichers."\n\n"Wählen Sie eine der folgenden Optionen:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"aus <xliff:g id="COUNT">%0$d</xliff:g> Quellen zusammengeführt"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Sonstige"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Kontakte zusammenführen"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Aktuellen Kontakt mit ausgewähltem Kontakt zusammenführen?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Ausgewählte Kontakte bearbeiten"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Zur Bearbeitung des ausgewählten Kontakts wechseln? Die bisher eingegebenen Informationen werden kopiert."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"In meine Kontakte kopieren"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"von <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"von <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Benutzerdefiniert"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Wird angepasst..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Kontakte mit Telefonnummern"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Kontakt"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Benutzerdefinierte Ansicht festlegen"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Einstellungen"</string>
<string name="menu_settings" msgid="377929915873428211">"Einstellungen"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Telefonnummer"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Zu Kontakten hinzufügen"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Schließen"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Jahr angeben"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 95ab9b7..4581251 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Δεν υπάρχουν διαθέσιμες εικόνες στο τηλέφωνο."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Δεν υπάρχουν διαθέσιμες εικόνες στο τηλέφωνο."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Προσαρμοσμένο όνομα ετικέτας"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Επιλογές προβολής"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Αποστολή κλήσεων απευθείας στον αυτόματο τηλεφωνητή"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Προεπιλογή"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Κατάργηση εικόνας"</string>
<string name="noContacts" msgid="8579310973261953559">"Δεν υπάρχουν επαφές."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Δεν βρέθηκαν επαφές που να αντιστοιχούν."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Δεν υπάρχουν επαφές με αριθμούς τηλεφώνου."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Η ανάγνωση των δεδομένων vCard ακυρώθηκε"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Η εισαγωγή vCard ολοκληρώθηκε"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Η ανάγνωση των δεδομένων vCard ακυρώθηκε"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Έγινε εκκίνηση του προγράμματος εισαγωγής vCard."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"Το πρόγραμμα εισαγωγής vCard θα εισαγάγει την vCard μετά από λίγο."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Επιβεβαίωση εξαγωγής"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Είστε σίγουροι ότι θέλετε να εξαγάγετε τη λίστα των επαφών σας στο \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\";"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Υπερβολικά μεγάλος όγκος αρχείων VCard στον αποθηκευτικό χώρο USB"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Υπερβολικά μεγάλος όγκος αρχείων VCard στην κάρτα SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Το απαιτούμενο όνομα αρχείου είναι υπερβολικά μεγάλο (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Εκκινήθηκε το πρόγραμμα εξαγωγής vCard."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Η εξαγωγή της vCard ολοκληρώθηκε"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Εξαγωγή δεδομένων επαφών"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Εξαγωγή δεδομένων επαφών προς \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Οργανισμός"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Ιστότοπος"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Συμβάν"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Σχέση"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Ομάδες"</string>
<string name="type_short_home" msgid="7770424864090605384">"Ο"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"Κ"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Αναζήτηση επαφών"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Αναζήτηση σε όλες τις επαφές"</string>
<string name="take_photo" msgid="7496128293167402354">"Λήψη φωτογραφίας"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Λήψη νέας φωτογραφίας"</string>
<string name="pick_photo" msgid="448886509158039462">"Επιλογή φωτογραφίας από τη συλλογή"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Επιλογή νέας φωτογραφίας από το Gallery"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Η λίστα επαφών ενημερώνεται ώστε να αντικατοπτρίζει την αλλαγή γλώσσας."\n\n"Περιμένετε..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Γίνεται ενημέρωση της λίστας επαφών."\n\n"Περιμένετε..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Γίνεται αναβάθμιση των επαφών. "\n\n"Η διαδικασία αναβάθμισης απαιτεί περίπου <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>Mb από τον εσωτερικό χώρο αποθήκευσης του τηλεφώνου."\n\n"Ορίστε μία από τις παρακάτω επιλογές:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"συγχώνευση από <xliff:g id="COUNT">%0$d</xliff:g> προελεύσεις"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Άλλο"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Ένωση επαφών"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Να γίνει ένωση της τρέχουσας επαφής με την επιλεγμένη επαφή;"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Επεξεργασία επιλεγμένων επαφών"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Να γίνει μετάβαση σε επεξεργασία της επιλεγμένης επαφής; Θα γίνει αντιγραφή των στοιχείων που έχετε εισαγάγει μέχρι τώρα."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Αντιγραφή στις επαφές μου"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"από <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"από <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Προσαρμοσμένη"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Προσαρμογή..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Επαφές με αριθμούς τηλεφώνου"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Επαφή"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Ορισμός προσαρμοσμένης προβολής"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Ρυθμίσεις"</string>
<string name="menu_settings" msgid="377929915873428211">"Ρυθμίσεις"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Αριθμός τηλεφώνου"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Προσθήκη στις επαφές"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Κλείσιμο"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Εισαγάγετε έτος"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8152c0f..b230fce 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"No hay imágenes disponibles en el teléfono."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"No hay imágenes disponibles en el teléfono."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Nombre personalizado de etiqueta"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Mostrar opciones"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Enviar llamadas directamente al correo de voz"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Predeterminado"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Eliminar foto"</string>
<string name="noContacts" msgid="8579310973261953559">"No hay contactos."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"No se encontraron contactos coincidentes."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"No hay contactos con números de teléfono."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Se canceló la lectura de datos de la vCard"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Finalizó la importación de la vCard"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Se canceló la lectura de datos de la vCard"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Importador de vCard iniciado."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"El Importador de vCard importará la vCard en un momento."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Confirmar exportación"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"¿Estás seguro de que deseas exportar tu lista de contactos a \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Demasiados archivos de vCard en el almacenamiento USB"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Demasiados archivos de vCard en la tarjeta SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"El nombre de archivo requerido es demasiado largo (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Exportador de vCard iniciado."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Finalizó la importación de vCard"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportando datos de contacto"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportando datos de contacto a \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organización"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Sitio web"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Evento"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relación"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Grupos"</string>
<string name="type_short_home" msgid="7770424864090605384">"H"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"Lun."</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Buscar contactos"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Buscar todos los contactos"</string>
<string name="take_photo" msgid="7496128293167402354">"Tomar foto"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Tomar nueva foto"</string>
<string name="pick_photo" msgid="448886509158039462">"Seleccionar foto de la galería"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Seleccionar nueva foto de galería"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"La lista de contactos se está actualizando para reflejar el cambio de idioma."\n\n" Espera."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"La lista de contactos se está actualizando."\n\n" Espera..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"La actualización de los contactos está en proceso. "\n\n"El proceso de actualización requiere aproximadamente <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mb de almacenamiento interno en el teléfono."\n\n" Elije una de las siguientes opciones:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"combinado a partir de fuentes <xliff:g id="COUNT">%0$d</xliff:g>"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Otro"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Unirse a contactos"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"¿Unir contacto actual a contacto seleccionado?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Modificar contactos seleccionados"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"¿Optar por modificar contacto seleccionado? Se copiará la información que ingresaste hasta ahora."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Copiar a mis contactos"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"de <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"de <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,25 +449,18 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Personalizado"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Personalizar..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Contactos con números de teléfono"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Contacto"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Definir vista personalizada"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Configuraciones"</string>
<string name="menu_settings" msgid="377929915873428211">"Configuraciones"</string>
<string name="preference_displayOptions" msgid="1341720270148252393">"Mostrar opciones"</string>
<string name="organization_company_and_title" msgid="6718207751363732025">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
- <!-- no translation found for hint_findContacts (1808681193458772072) -->
- <skip />
- <!-- no translation found for non_phone_caption (1541655052330027380) -->
- <skip />
- <!-- no translation found for non_phone_add_to_contacts (6590985286250471169) -->
- <skip />
- <!-- no translation found for non_phone_close (7608506439725515667) -->
- <skip />
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="hint_findContacts" msgid="1808681193458772072">"Buscar contactos"</string>
+ <string name="non_phone_caption" msgid="1541655052330027380">"Núm. de tel."</string>
+ <string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Agregar a contactos"</string>
+ <string name="non_phone_close" msgid="7608506439725515667">"Cerrar"</string>
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Brindar un año"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index db4115d..255c17c 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -47,7 +47,7 @@
<string name="menu_sendEmail" msgid="7293508859242926187">"Enviar email"</string>
<string name="menu_viewAddress" msgid="1814744325763202024">"Dirección en mapa"</string>
<string name="menu_makeDefaultNumber" msgid="4838759253316649534">"Convertir en número predeterminado"</string>
- <string name="menu_makeDefaultEmail" msgid="2599044610375789994">"Establecer como dirección de correo electrónico predeterminada"</string>
+ <string name="menu_makeDefaultEmail" msgid="2599044610375789994">"Establecer como dirección de email predeterminada"</string>
<string name="menu_splitAggregate" msgid="8368636463748691868">"Dividir"</string>
<string name="splitConfirmation_title" msgid="6716467920283502570">"Dividir contacto"</string>
<string name="splitConfirmation" msgid="1150797297503944823">"¿Estás seguro de que quieres dividir este contacto único en varios contactos (uno para cada conjunto de información que se añadió a él)?"</string>
@@ -79,7 +79,7 @@
<string name="invalidContactMessage" msgid="5816991830260044593">"Ese contacto no existe."</string>
<string name="pickerNewContactHeader" msgid="7750705279843568147">"Crear contacto nuevo"</string>
<string name="phoneLabelsGroup" msgid="6468091477851199285">"Teléfono"</string>
- <string name="emailLabelsGroup" msgid="8389931313045344406">"Correo electrónico"</string>
+ <string name="emailLabelsGroup" msgid="8389931313045344406">"Email"</string>
<string name="imLabelsGroup" msgid="3898238486262614027">"MI"</string>
<!-- outdated translation 1618078212734693682 --> <string name="postalLabelsGroup" msgid="3487738141112589324">"Dirección postal"</string>
<string-array name="otherLabels">
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"No hay ninguna imagen disponible en el teléfono."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"No hay ninguna imagen disponible en el teléfono."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Nombre de etiqueta personalizada"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Opciones de visualización"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Enviar llamadas directamente al buzón de voz"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Predeterminado"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Eliminar foto"</string>
<string name="noContacts" msgid="8579310973261953559">"No hay ningún contacto."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"No se ha encontrado ningún contacto coincidente."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"No hay ningún contacto con número de teléfono."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Lectura de vCard cancelada"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Importación de vCard terminada"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Lectura de vCard cancelada"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Importador de vCard iniciado"</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"El importador de vCard importará vCard transcurrido un tiempo."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Confirmar la exportación"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"¿Estás seguro de que quieres exportar tu lista de contactos a \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Hay demasiados archivos de vCard en el almacenamiento USB."</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Hay demasiados archivos de vCard en la tarjeta SD."</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"El nombre de archivo necesario es demasiado largo (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Exportador de vCard iniciado"</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Exportación de vCard finalizada"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportando datos de contacto"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportando datos de contacto a \"<xliff:g id="FILE_NAME">%s</xliff:g>\"..."</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organización"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Sitio web"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Evento"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relación"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Grupos"</string>
<string name="type_short_home" msgid="7770424864090605384">"H"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -352,9 +355,9 @@
<string name="sms_mms" msgid="4069352461380762677">"Enviar un mensaje de texto a MMS"</string>
<string name="email_home" msgid="8573740658148184279">"Enviar email a casa"</string>
<string name="email_mobile" msgid="2042889209787989814">"Enviar email al móvil"</string>
- <string name="email_work" msgid="2807430017302722689">"Enviar email a trabajo"</string>
+ <string name="email_work" msgid="2807430017302722689">"Enviar email al trabajo"</string>
<string name="email_other" msgid="3454004077967657109">"Enviar email"</string>
- <string name="email_custom" msgid="7548003991586214105">"Correo electrónico <xliff:g id="CUSTOM">%s</xliff:g>"</string>
+ <string name="email_custom" msgid="7548003991586214105">"Enviar email a <xliff:g id="CUSTOM">%s</xliff:g>"</string>
<string name="email" msgid="5668400997660065897">"Email"</string>
<string name="map_home" msgid="1243547733423343982">"Ver dirección de casa"</string>
<string name="map_work" msgid="1360474076921878088">"Ver dirección del trabajo"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Buscar contactos"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Buscar todos los contactos"</string>
<string name="take_photo" msgid="7496128293167402354">"Hacer una foto"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Hacer una foto nueva"</string>
<string name="pick_photo" msgid="448886509158039462">"Seleccionar foto de la galería"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Seleccionar nueva foto de la galería"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"La lista de contactos se está actualizando para reflejar el cambio de idioma."\n\n"Por favor, espera..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"La lista de contactos se está actualizando."\n\n"Por favor, espera..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Los contactos se están actualizando. "\n\n"El proceso de actualización necesita aproximadamente <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB de almacenamiento interno."\n\n"Selecciona una de las siguientes opciones:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"fusionados desde <xliff:g id="COUNT">%0$d</xliff:g> fuentes"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Otro"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Agrupar contactos"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"¿Deseas agrupar el contacto actual con el contacto seleccionado?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Editar contactos seleccionados"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"¿Deseas editar el contacto seleccionado? Se copiará la información que hayas introducido hasta el momento."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Copiar a mis contactos"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"de <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"de <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Personalizar"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Personalizar..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Contactos con números de teléfono"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Contacto"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Definición de vista personalizada"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Ajustes"</string>
<string name="menu_settings" msgid="377929915873428211">"Ajustes"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Número de teléfono"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Añadir a contactos"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Cerrar"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Introducir un año"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 61a2f53..1e8d101 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Aucune image disponible sur le téléphone."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Aucune image disponible sur le téléphone."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Libellé personnalisé"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Options d\'affichage"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Renvoyer les appels directement vers la messagerie vocale"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Par défaut"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Supprimer la photo"</string>
<string name="noContacts" msgid="8579310973261953559">"Aucun contact."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Aucun contact correspondant n\'a été trouvé."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Aucun contact disposant d\'un numéro téléphone."</string>
@@ -160,12 +159,12 @@
<string name="simContacts_title" msgid="27341688347689769">"Contacts de carte SIM"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Vous n\'avez aucun contact à afficher. Si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes."</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Vous n\'avez aucun contact à afficher."</string>
- <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:620 in java.io.StringReader@5a8a0d5d) -->
- <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:567 in java.io.StringReader@1d73831b) -->
+ <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:620 in java.io.StringReader@22c84d9) -->
+ <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:567 in java.io.StringReader@38c5c3ac) -->
<!-- outdated translation 3017521127042216243 --> <string name="noContactsHelpTextWithSync" product="tablet" msgid="2364665535969139880">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SIM ou SD."\n</li></string>
<string name="noContactsHelpTextWithSync" product="default" msgid="3017521127042216243">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SIM ou SD."\n</li></string>
- <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:624 in java.io.StringReader@18e2b22) -->
- <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:571 in java.io.StringReader@1cb1c5fa) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:624 in java.io.StringReader@3fb16e52) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /b read: font (position:END_TAG </font>@1:571 in java.io.StringReader@19c1ea29) -->
<!-- outdated translation 9040060730467973050 --> <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="6222739731808897565">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SD."\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="default" msgid="9040060730467973050">"Vous n\'avez aucun contact à afficher (si vous venez d\'ajouter un compte, la synchronisation des contacts peut prendre quelques minutes)."\n\n"Pour ajouter des contacts, appuyez sur "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" et sélectionnez :"\n" "\n<li><font fgcolor="#ffffffff"><b>"Comptes"</b></font>" pour ajouter ou configurer un compte dont vous pourrez synchroniser les contacts sur le téléphone ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Options d\'affichage"</b></font>" pour modifier le paramètre de visibilité des contacts ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nouveau contact"</b></font>" pour créer un contact ;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importer/Exporter"</b></font>" pour importer des contacts depuis votre carte SD."\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"Vous ne disposez d\'aucun favoris."\n\n"Pour ajouter un contact à la liste de favoris :"\n\n" "<li>"Appuyez sur l\'onglet "<b>"Contacts"</b>"."\n</li>" "\n<li>"Appuyez sur le contact à ajouter à vos favoris."\n</li>" "\n<li>"Appuyez sur l\'étoile en regard du nom du contact."\n</li></string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Lecture des données vCard annulée"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Importation du fichier vCard annulée"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Lecture des données vCard annulée"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Programme d\'importation de fichiers vCard démarré"</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"Le fichier vCard sera importé dans quelques instants."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Confirmer l\'exportation"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Voulez-vous vraiment exporter la liste de contacts vers \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\" ?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"La mémoire de stockage USB contient trop de fichiers VCard."</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"La carte SD contient trop de fichiers VCard."</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Le nom de fichier requis est trop long (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Programme d\'exportation de fichiers vCard démarré"</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Exportation du fichier vCard interrompue"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportation des données des contacts"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportation des données des contacts vers \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisation"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Site Web"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Événement"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relation"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Groupes"</string>
<string name="type_short_home" msgid="7770424864090605384">"D"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Rechercher..."</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Rechercher tous les contacts"</string>
<string name="take_photo" msgid="7496128293167402354">"Prendre une photo"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Prendre une autre photo"</string>
<string name="pick_photo" msgid="448886509158039462">"Sélectionner une photo dans la galerie"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Sélectionner une autre photo dans la galerie"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Mise à jour de la liste des contacts en cours suite au changement de langue."\n\n"Veuillez patienter..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Mise à jour de la liste des contacts en cours."\n\n"Veuillez patienter..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Les contacts sont en cours de mise à niveau. "\n\n"La mise à niveau requiert environ <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> Mo de mémoire interne du téléphone."\n\n"Choisissez l\'une des options suivantes :"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"1 contact fusionné à partir de <xliff:g id="COUNT">%0$d</xliff:g> sources"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Autre"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Joindre les contacts"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Associer ce contact au contact sélectionné ?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Modifier les contacts sélectionnés"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Modifier le contact sélectionné ? Les informations saisies jusqu\'ici seront copiées."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Copier dans Mes contacts"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"dans <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"dans <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Personnalisé"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Personnaliser..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Contacts avec numéro de téléphone"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Contact"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Définir un affichage personnalisé"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Paramètres"</string>
<string name="menu_settings" msgid="377929915873428211">"Paramètres"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Numéro de téléphone"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Ajouter aux contacts"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Fermer"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Indiquer une année"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 38b6ff2..83ef739 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Nessuna foto disponibile."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Nessuna foto disponibile."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Nome etichetta personalizzata"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Opzioni di visualizzazione"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Inoltra chiamate direttamente alla segreteria"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Predefinita"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Rimuovi foto"</string>
<string name="noContacts" msgid="8579310973261953559">"Nessun contatto."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Nessun contatto corrispondente trovato."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Nessun contatto con numeri di telefono."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Lettura dati vCard annullata"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Importazione vCard terminata"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Lettura dati vCard annullata"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Importazione vCard avviata."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"La vCard verrà importata successivamente."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Conferma esportazione"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Esportare l\'elenco di contatti in \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Troppi file vCard nell\'archivio USB"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Troppi dati vCard sulla scheda SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Il nome file richiesto è troppo lungo (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Esportazione vCard avviata."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Esportazione vCard terminata"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Esportazione dati di contatto"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Esportazione dati di contatto in \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organizzazione"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Sito web"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Evento"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relazione"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Gruppi"</string>
<string name="type_short_home" msgid="7770424864090605384">"H"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Cerca contatti"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Cerca tutti i contatti"</string>
<string name="take_photo" msgid="7496128293167402354">"Scatta foto"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Scatta nuova foto"</string>
<string name="pick_photo" msgid="448886509158039462">"Seleziona foto da galleria"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Seleziona nuova foto da galleria"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"L\'elenco contatti verrà aggiornato per rispecchiare il cambio di lingua."\n\n"Attendi..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Elenco contatti in fase di aggiornamento."\n\n"Attendi..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Contatti in fase di aggiornamento. "\n\n"Il processo di aggiornamento richiede circa <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB di memoria interna del telefono."\n\n"Scegli una delle seguenti opzioni:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"uniti da <xliff:g id="COUNT">%0$d</xliff:g> origini"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Altro"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Unisci contatti"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Unire il contatto corrente al contatto selezionato?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Modifica i contatti selezionati"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Passare alla modifica del contatto selezionato? Le informazioni inserite finora verranno copiate."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Copia nei miei contatti"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"da <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"da <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Personalizzato"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Personalizza..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Contatti con numeri di telefono"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Contatto"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Definisci visualizzazione personalizzata"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Impostazioni"</string>
<string name="menu_settings" msgid="377929915873428211">"Impostazioni"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Numero di telefono"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Aggiungi a contatti"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Chiudi"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Specifica un anno"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 91b1f4f..5007887 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"画像がありません。"</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"画像がありません。"</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"新しいラベル名"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"表示オプション"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"ボイスメールに自動転送する"</string>
<string name="default_ringtone" msgid="9099988849649827972">"プリセット着信音"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"写真を削除"</string>
<string name="noContacts" msgid="8579310973261953559">"連絡先がありません。"</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"一致する連絡先が見つかりません。"</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"電話番号付きの連絡先はありません。"</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"vCardの読み取りがキャンセルされました"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"vCardのインポートを停止しました"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"vCardの読み取りがキャンセルされました"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"vCardインポータが起動しました。"</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"vCardは後ほどvCardインポータによってインポートされます。"</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"エクスポートの確認"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"連絡先リストを「<xliff:g id="VCARD_FILENAME">%s</xliff:g>」にエクスポートしますか？"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"USBストレージ内のvCardファイルが多すぎます"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SDカードのvCardファイルが多すぎます"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"指定したファイル名が長すぎます（「<xliff:g id="FILENAME">%s</xliff:g>」）"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"vCardエクスポータが起動しました。"</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"vCardのエクスポートを停止しました"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"連絡先データのエクスポート"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"連絡先データを\"<xliff:g id="FILE_NAME">%s</xliff:g>\"にエクスポートしています"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"所属"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"ウェブサイト"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"予定"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"関係"</string>
<string name="groupsLabel" msgid="8573535366319059326">"グループ"</string>
<string name="type_short_home" msgid="7770424864090605384">"自宅"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"携帯"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"連絡先を検索"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"すべての連絡先を検索"</string>
<string name="take_photo" msgid="7496128293167402354">"写真を撮影"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"新しい写真を撮る"</string>
<string name="pick_photo" msgid="448886509158039462">"ギャラリーから写真を選ぶ"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"ギャラリーから新しい写真を選ぶ"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"言語の変更に伴い連絡先リストを更新しています。"\n\n"しばらくお待ちください..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"連絡先リストを更新しています。"\n\n"お待ちください..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"連絡先をアップグレードしています。"\n\n"アップグレード処理には約<xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MBの内部ストレージが必要です。"\n\n"次のいずれかのオプションを選択してください:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"<xliff:g id="COUNT">%0$d</xliff:g>件の連絡先が結合されました"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"その他"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"連絡先の統合"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"現在の連絡先を選択した連絡先に統合しますか？"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"選択した連絡先の編集"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"選択した連絡先の編集に切り替えますか？これまでに入力した情報はコピーされます。"</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Myコンタクトにコピー"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"<xliff:g id="TYPE">%1$s</xliff:g>内にあります"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"<xliff:g id="TYPE">%1$s</xliff:g>内にあります（<xliff:g id="NAME">%2$s</xliff:g>）"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"カスタム"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"カスタマイズ..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"電話番号のある連絡先"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"連絡先"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"カスタム表示の設定"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"設定"</string>
<string name="menu_settings" msgid="377929915873428211">"設定"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"電話番号"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"連絡先に追加"</string>
<string name="non_phone_close" msgid="7608506439725515667">"閉じる"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g>（<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>）"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"年を入力する"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a4a097c..921dfe1 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"휴대전화에 사진이 없습니다."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"휴대전화에 사진이 없습니다."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"라벨 이름 맞춤 설정"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"표시 옵션"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"수신전화를 바로 음성사서함으로 보내기"</string>
<string name="default_ringtone" msgid="9099988849649827972">"기본값"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"사진 삭제"</string>
<string name="noContacts" msgid="8579310973261953559">"주소록이 없습니다."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"일치하는 연락처가 없습니다."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"전화번호가 포함된 주소록이 없습니다."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"vCard 데이터 읽기가 취소되었습니다."</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"vCard 가져오기 완료됨"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"vCard 데이터 읽기가 취소되었습니다."</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"vCard 가져오기 도구가 시작되었습니다."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"잠시 후에 vCard 가져오기 도구가 vCard를 가져옵니다."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"내보내기 확인"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"\'<xliff:g id="VCARD_FILENAME">%s</xliff:g>\'(으)로 연락처 목록을 내보내시겠습니까?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"USB 저장소에 vCard 파일이 너무 많습니다."</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SD 카드에 vCard 파일이 너무 많습니다."</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"필수 파일 이름이 너무 깁니다(\'<xliff:g id="FILENAME">%s</xliff:g>\')."</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"vCard 내보내기 도구가 시작되었습니다."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"vCard 내보내기 완료됨"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"연락처 데이터 내보내기"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"연락처 데이터를 \'<xliff:g id="FILE_NAME">%s</xliff:g>\'(으)로 내보내는 중"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"조직"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"웹사이트"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"일정"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"관계"</string>
<string name="groupsLabel" msgid="8573535366319059326">"그룹"</string>
<string name="type_short_home" msgid="7770424864090605384">"H"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"연락처 검색"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"모든 연락처 검색"</string>
<string name="take_photo" msgid="7496128293167402354">"사진 찍기"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"새 사진 가져오기"</string>
<string name="pick_photo" msgid="448886509158039462">"갤러리에서 사진 선택"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"갤러리에서 새 사진 선택"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"변경된 언어를 반영하도록 연락처 목록을 업데이트하는 중입니다."\n\n"잠시 기다려 주세요."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"연락처 목록을 업데이트하고 있습니다."\n\n"잠시 기다려 주세요..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"주소록을 업그레이드하는 중입니다. "\n\n"업그레이드 프로세스에는 약 <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB의 휴대전화 내부 저장공간이 필요합니다."\n\n"다음 옵션 중 하나를 선택하세요."</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"<xliff:g id="COUNT">%0$d</xliff:g>개 출처에서 병합했습니다."</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"기타"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"연락처 통합"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"현재 연락처를 선택한 주소록에 통합하시겠습니까?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"선택한 주소록 수정"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"선택한 연락처를 수정하시겠습니까? 지금까지 입력하신 정보는 복사됩니다."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"내 주소록에 복사"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"연락처 출처: <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"연락처 출처: <xliff:g id="TYPE">%1$s</xliff:g>(<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"맞춤설정"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"맞춤설정..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"전화번호가 포함된 주소록"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"연락처"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"맞춤 보기 정의"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"설정"</string>
<string name="menu_settings" msgid="377929915873428211">"설정"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"전화번호"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"주소록에 추가"</string>
<string name="non_phone_close" msgid="7608506439725515667">"닫기"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g>(<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"출생연도 입력 선택"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3d6fb67..3de1237 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Det er ingen bilder på telefonen."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Det er ingen bilder på telefonen."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Egendefinert etikett"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Vis grupper"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Send anrop direkte til telefonsvarer."</string>
<string name="default_ringtone" msgid="9099988849649827972">"Standardvalg"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Fjern bilde"</string>
<string name="noContacts" msgid="8579310973261953559">"Ingen kontakter."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Fant ingen kontakter."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Ingen kontakter med telefonnummer."</string>
@@ -160,12 +159,12 @@
<string name="simContacts_title" msgid="27341688347689769">"Kontakter på SIM-kort"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Du har ingen kontakter å vise. (Hvis du nettopp har lagt til en konto, kan det ta noen minutter å synkronisere kontaktene.)"</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Du har ingen kontakter å vise."</string>
- <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:346 in java.io.StringReader@9e0bc08) -->
- <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:293 in java.io.StringReader@158b649) -->
+ <!-- syntax error in translation for noContactsHelpText (6450346791169710787) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:346 in java.io.StringReader@9f436f5) -->
+ <!-- syntax error in translation for noContactsHelpText (7633826236417884130) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:293 in java.io.StringReader@4413ee) -->
<!-- outdated translation 3017521127042216243 --> <string name="noContactsHelpTextWithSync" product="tablet" msgid="2364665535969139880">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer "</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til telefonen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importér/Eksportér"</b></font>" for å importere kontakter fra SIM- eller SD-kort"\n</li></string>
<string name="noContactsHelpTextWithSync" product="default" msgid="3017521127042216243">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer "</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til telefonen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importér/Eksportér"</b></font>" for å importere kontakter fra SIM- eller SD-kort"\n</li></string>
- <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:350 in java.io.StringReader@6ddf073d) -->
- <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@4d546e25) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (6031363021287849874) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:350 in java.io.StringReader@766e3d60) -->
+ <!-- syntax error in translation for noContactsNoSimHelpText (467658807711582876) org.xmlpull.v1.XmlPullParserException: expected: /li read: font (position:END_TAG </font>@1:297 in java.io.StringReader@3f7fa65e) -->
<!-- outdated translation 9040060730467973050 --> <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="6222739731808897565">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer "</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til telefonen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importér/eksportér"</b></font>" for å importere kontakter fra SD-kortet"\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="default" msgid="9040060730467973050">"Du har ingen kontakter å vise. (Hvis du nylig la til en konto, kan det ta noen minutter å synkronisere kontaktene.)"\n\n"Slik legger du til kontakter: Trykk på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" og trykk deretter på: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Kontoer "</b></font>" for å legge til eller konfigurere en konto med kontakter som kan synkroniseres til telefonen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativer"</b></font>" for å endre hvilke kontakter som vises"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" for å opprette en ny kontakt"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importér/eksportér"</b></font>" for å importere kontakter fra SD-kortet"\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"Du har ingen favoritter."\n\n"Slik legger du til en kontakt i favorittlisten:"\n\n" "<li>"Trykk på fanen "<b>"Kontakter"</b>" "\n</li>" "\n<li>"Trykk på kontakten du vil legge til i favoritter"\n</li>" "\n<li>"Trykk på stjernen ved siden av kontaktnavnet"\n</li></string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Lesing av vCard-data ble avbrutt"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Import av vCard-fil fullført"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Lesing av vCard-data ble avbrutt"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Importprogrammet for vCard er startet."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"Importprogrammet for vCard importerer vCard-filen etter kort tid."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Eksportbekreftelse"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Vil du eksportere kontaktlisten din til «<xliff:g id="VCARD_FILENAME">%s</xliff:g>»?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"For mange vCard-filer på USB-lagring"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"For mange VCard-datafiler på minnekortet"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"For langt filnavn kreves («<xliff:g id="FILENAME">%s</xliff:g>»)"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Eksportprogrammet for vCard er startet."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Eksport av vCard-fil fullført"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Eksporterer kontaktdata"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Eksporterer kontaktdata til «<xliff:g id="FILE_NAME">%s</xliff:g>»"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisering"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Nettsted"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Aktivitet"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relasjon"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Grupper"</string>
<string name="type_short_home" msgid="7770424864090605384">"H"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Søk etter kontakter"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Søk i alle kontakter"</string>
<string name="take_photo" msgid="7496128293167402354">"Ta bilde"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Ta nytt bilde"</string>
<string name="pick_photo" msgid="448886509158039462">"Velg bilde fra galleriet"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Velg nytt bilde fra galleriet"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Kontaktlisten er oppdatert med nytt språk."\n\n"Vent litt ..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Kontaktlisten oppdateres."\n\n"Vent litt ..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Oppgradering av kontakter pågår. "\n\n"Oppgraderingsprosessen krever cirka <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB internt minne på telefonen."\n\n"Velg ett av følgende alternativer:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"sammenslått fra <xliff:g id="COUNT">%0$d</xliff:g> kilder"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Andre"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Slå sammen kontakter"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Slå sammen gjeldende kontakt med valgt kontakt?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Rediger valgte kontakter"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Bytt til redigering av gjeldende kontakt? Informasjonen du har lagt til så langt blir kopiert."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Kopier til mine kontakter"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"fra <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"fra <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Egendefinert"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Tilpass"</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Kontakter med telefonnumre"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Kontakt"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Definer tilpasset visning"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Innstillinger"</string>
<string name="menu_settings" msgid="377929915873428211">"Innstillinger"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Telefonnummer"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Legg til i kontakter"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Lukk"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Oppgi år"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index e3c502e..799701a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Er zijn geen foto\'s beschikbaar op de telefoon."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Er zijn geen foto\'s beschikbaar op de telefoon."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Aangepaste labelnaam"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Weergaveopties"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Oproepen rechtstreeks naar voicemail verzenden"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Standaard"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Foto verwijderen"</string>
<string name="noContacts" msgid="8579310973261953559">"Geen contacten."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Kan geen overeenkomende contacten vinden."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Geen contacten met telefoonnummers."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Lezen van vCard-gegevens is geannuleerd"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Importeren van vCard voltooid"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Lezen van vCard-gegevens is geannuleerd"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"vCard-importer gestart."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"Na enige tijd wordt de vCard geïmporteerd door de vCard-importer."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Exporteren bevestigen"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Weet u zeker dat u uw lijst met contacten wilt exporteren naar \'<xliff:g id="VCARD_FILENAME">%s</xliff:g>\'?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Te veel vCard-bestanden in de USB-opslag"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Te veel vCard-gegevens op de SD-kaart"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Vereiste bestandsnaam is te lang (\'<xliff:g id="FILENAME">%s</xliff:g>\')"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"vCard-exporter gestart."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Exporteren van vCard voltooid"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Contactgegevens exporteren"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Contactgegevens exporteren naar \'<xliff:g id="FILE_NAME">%s</xliff:g>\'"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisatie"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Website"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Afspraak"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relatie"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Groepen"</string>
<string name="type_short_home" msgid="7770424864090605384">"H"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Contacten zoeken"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Alle contacten zoeken"</string>
<string name="take_photo" msgid="7496128293167402354">"Foto maken"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Nieuwe foto nemen"</string>
<string name="pick_photo" msgid="448886509158039462">"Foto selecteren in Galerij"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Nieuwe foto selecteren in Galerij"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Lijst met contacten wordt bijgewerkt om de gewijzigde taal te weerspiegelen."\n\n"Een ogenblik geduld..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Lijst met contacten wordt bijgewerkt."\n\n"Een ogenblik geduld..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Contacten worden bijgewerkt. "\n\n"Voor het upgradeproces is ongeveer <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB interne telefoonopslag vereist."\n\n"Kies een van de volgende opties:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"samengevoegd uit <xliff:g id="COUNT">%0$d</xliff:g> bronnen"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Overig"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Contacten samenvoegen"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Wilt u het huidige contact samenvoegen met het geselecteerde contact?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Geselecteerde contacten bewerken"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Wilt u overschakelen naar het bewerken van het geselecteerde contact? Gegevens die u tot nu toe heeft ingevoerd, worden gekopieerd."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Kopiëren naar mijn contacten"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"van <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"van <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Aangepast"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Aanpassen..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Contacten met telefoonnummers"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Contacten"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Aangepaste weergave definiëren"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Instellingen"</string>
<string name="menu_settings" msgid="377929915873428211">"Instellingen"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Telefoonnummer"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Toevoegen aan contacten"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Sluiten"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Een jaar opgeven"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8ff4b74..8500791 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"W telefonie brak dostępnych zdjęć."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"W telefonie brak dostępnych zdjęć."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Nazwa etykiety niestandardowej"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Opcje wyświetlania"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Przekieruj połączenia bezpośrednio na pocztę głosową"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Domyślny"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Usuń zdjęcie"</string>
<string name="noContacts" msgid="8579310973261953559">"Brak kontaktów"</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Nie znaleziono pasujących kontaktów."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Brak kontaktów z numerami telefonów"</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Odczytywanie danych kart vCard zostało anulowane"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Zakończono importowanie kart vCard"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Odczytywanie danych kart vCard zostało anulowane"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Uruchomiono program importujący karty vCard."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"Program importujący karty vCard zaimportuje za chwilę karty vCard."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Potwierdź eksport"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Czy na pewno chcesz wyeksportować listę kontaktów do pliku „<xliff:g id="VCARD_FILENAME">%s</xliff:g>”?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Zbyt wiele plików vCard na nośniku USB"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Zbyt dużo plików vCard na karcie SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Wymagana nazwa pliku jest zbyt długa („<xliff:g id="FILENAME">%s</xliff:g>”)"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Uruchomiono program eksportujący karty vCard."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Zakończono eksportowanie kart vCard"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Eksportowanie danych kontaktowych"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Eksportowanie danych kontaktowych do pliku „<xliff:g id="FILE_NAME">%s</xliff:g>”"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organizacja"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Adres witryny"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Wydarzenie"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relacja"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Grupy"</string>
<string name="type_short_home" msgid="7770424864090605384">"D"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"K"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Szukaj kontaktów"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Szukaj wszystkich kontaktów"</string>
<string name="take_photo" msgid="7496128293167402354">"Zrób zdjęcie"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Zrób nowe zdjęcie"</string>
<string name="pick_photo" msgid="448886509158039462">"Wybierz zdjęcie z galerii"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Wybierz nowe zdjęcie z galerii"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Lista kontaktów jest aktualizowana, aby odzwierciedlić zmianę języka."\n\n"Czekaj..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Lista kontaktów jest aktualizowana."\n\n"Czekaj..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Trwa proces uaktualniania kontaktów. "\n\n"Proces uaktualniania wymaga w przybliżeniu <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB wewnętrznej pamięci telefonu."\n\n"Wybierz jedną z następujących opcji:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"scalono z <xliff:g id="COUNT">%0$d</xliff:g> źródeł"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Inne"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Połącz kontakty"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Czy połączyć bieżący kontakt z wybranym?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Edytuj wybrane kontakty"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Czy chcesz edytować wybrany kontakt? Wprowadzone dotąd informacje zostaną skopiowane."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Kopiuj do moich kontaktów"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"z <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"z <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Niestandardowy"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Dostosuj..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Kontakty z numerami telefonów"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Kontakt"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Zdefiniuj widok niestandardowy"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Ustawienia"</string>
<string name="menu_settings" msgid="377929915873428211">"Ustawienia"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Numer telefonu"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Dodaj do kontaktów"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Zamknij"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Podaj rok"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 0df1312..c1dec10 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Não existem imagens disponíveis no telefone."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Não existem imagens disponíveis no telefone."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Nome da etiqueta personalizada"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Opções de visualização"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Enviar as chamadas directamente para o correio de voz"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Predefinido"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Remover fotografia"</string>
<string name="noContacts" msgid="8579310973261953559">"Sem contactos."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Não foram encontrados contactos correspondentes."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Sem contactos com números de telefone."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"A leitura de dados vCard foi cancelada"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"A importação do vCard terminou"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"A leitura de dados vCard foi cancelada"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Importador vCard iniciado."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"O importador vCard importará o vCard dentro de algum tempo."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Confirmar exportação"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Tem a certeza de que pretende exportar a lista de contactos para \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Existem demasiados ficheiros vCard no armazenamento USB"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Demasiados ficheiros vCard no cartão SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Nome de ficheiro demasiado longo (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Exportador vCard iniciado."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"A exportação do vCard terminou"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportar dados do contacto"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportar dados do contacto para \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organização"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Web site"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Evento"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relacionamento"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Grupos"</string>
<string name="type_short_home" msgid="7770424864090605384">"R"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"T"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Pesquisar contactos"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Pesquisar todos os contactos"</string>
<string name="take_photo" msgid="7496128293167402354">"Tirar fotografia"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Tirar nova fotografia"</string>
<string name="pick_photo" msgid="448886509158039462">"Seleccionar fotografia da Galeria"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Seleccionar nova fotografia da Galeria"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"A lista de contactos está a ser actualizada para reflectir a alteração do idioma."\n\n"Aguarde..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"A lista de contactos está a ser actualizada."\n\n"Aguarde..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Os contactos estão em processo de actualização. "\n\n"O processo de actualização requer aproximadamente <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB de armazenamento interno no telemóvel."\n\n"Escolha uma das seguintes opções:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"intercalado a partir de <xliff:g id="COUNT">%0$d</xliff:g> origens"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Outro"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Associar contactos"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Associar o contacto actual ao contacto seleccionado?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Editar contactos seleccionados"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Alternar para edição do contacto seleccionado? A informação introduzida até agora vai ser copiada."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Copiar para os meus contactos"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"de <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"de <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Personalizado"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Personalizar..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Contactos com números de telefone"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Contacto"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Definir vista personalizada"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Definições"</string>
<string name="menu_settings" msgid="377929915873428211">"Definições"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Número de telefone"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Adicionar aos contactos"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Fechar"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Indique um ano"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 613fcaf..8315090 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Nenhuma imagem disponível no telefone."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Nenhuma imagem disponível no telefone."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Personalizar nome do marcador"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Opções de exibição"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Enviar chamadas diretamente para o correio de voz"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Padrão"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Remover foto"</string>
<string name="noContacts" msgid="8579310973261953559">"Nenhum contato."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Nenhum contato correspondente foi encontrado."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Nenhum contato com números de telefone."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"A leitura dos dados do vCard foi cancelada"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Importação de vCard concluída"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"A leitura dos dados do vCard foi cancelada"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Importador de vCard iniciado."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"O importador de vCard importará o vCard depois de alguns instantes."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Confirmar exportação"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Tem certeza de que deseja exportar a sua lista de contatos para \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Muitos arquivos do vCard no armazenamento USB"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Muitos arquivos do vCard no cartão SD"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"O nome de arquivo exigido é muito longo (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Exportador de vCard iniciado."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Exportação de vCard concluída"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportando dados do contato"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportando dados do contato para \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organização"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Site"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Evento"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relacionamento"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Grupos"</string>
<string name="type_short_home" msgid="7770424864090605384">"H"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Pesquisar contatos"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Pesquisar em todos os contatos"</string>
<string name="take_photo" msgid="7496128293167402354">"Tirar foto"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Tirar outra foto"</string>
<string name="pick_photo" msgid="448886509158039462">"Selecionar foto da Galeria"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Selecionar nova foto da Galeria"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"A lista de contatos está sendo atualizada para refletir a alteração do idioma."\n\n"Aguarde..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"A lista de contatos está sendo atualizada."\n\n"Aguarde..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Os contatos estão sendo atualizados no momento. "\n\n"O processo de atualização requer aproximadamente <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB de armazenamento interno do telefone."\n\n"Escolha uma das seguintes opções:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"mesclado a partir de <xliff:g id="COUNT">%0$d</xliff:g> origens"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Outros"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Unir contatos"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Unir o contato atual ao contato selecionado?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Editar contatos selecionados"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Alternar para a edição do contato selecionado? As informações inseridas até agora serão copiadas."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Copiar para meus contatos"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"de <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"de <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Personalizado"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Personalizar..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Contatos com números de telefone"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Contato"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Definir exibição personalizada"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Configurações"</string>
<string name="menu_settings" msgid="377929915873428211">"Configurações"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Número de telefone"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Adicionar aos contatos"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Fechar"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Informe um ano"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 9ae9ff5..f535fc8 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -89,7 +89,7 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Nagin maletg disponibel sin il telefon."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Nagin maletg disponibel sin il telefon."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Num da l\'etichetta persunalisada"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Opziuns da vista"</string>
@@ -247,8 +247,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Interrut la lectura da datas vCard"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Terminà l\'import da la datoteca vCard"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Stizzà vCard en il process d\'importaziun"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Avià il program d\'importaziun da datotecas vCard"</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"La datoteca vCard vegn importada en pauc temp."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Confermar l\'export"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Vulais Vus propi exportar la glista da contacts en «<xliff:g id="VCARD_FILENAME">%s</xliff:g>»?"</string>
@@ -258,7 +264,6 @@
<!-- outdated translation 7084146295639672658 --> <string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"La carta SD cuntegna memia bleras datotecas vCard"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"La carta SD cuntegna memia bleras datotecas vCard"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Il num da datoteca necessari è memia lung («<xliff:g id="FILENAME">%s</xliff:g>»)"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Avià il program d\'exportaziun da datotecas vCard"</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Terminà l\'export da la datoteca vCard"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Datas da contact vegnan exportadas."</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exportaziun da las datas da contact en «<xliff:g id="FILE_NAME">%s</xliff:g>»"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 0dba97d..e2fdb6b 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"В телефоне нет картинок."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"В телефоне нет картинок."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Название ярлыка"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Варианты отображения"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Направлять вызовы в голосовую почту"</string>
<string name="default_ringtone" msgid="9099988849649827972">"По умолчанию"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Удалить фото"</string>
<string name="noContacts" msgid="8579310973261953559">"Нет контактов."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Подходящие контакты не найдены."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Нет контактов с номерами телефонов."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Чтение данных vCard отменено"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"Импорт файлов vCard завершен"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Чтение данных vCard отменено"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"Импорт файлов vCard запущен."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"Импортер vCard начнет передачу файлов в ближайшее время."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Подтверждение·экспорта"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Вы действительно хотите экспортировать контакты в файл <xliff:g id="VCARD_FILENAME">%s</xliff:g>?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"Слишком много файлов vCard на USB-накопителе"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"Слишком много файлов VCard на SD-карте."</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Название файла слишком длинное (<xliff:g id="FILENAME">%s</xliff:g>)."</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"Экспорт файлов vCard запущен."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"Экспорт файлов vCard завершен"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Экспорт данных контакта"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Экспорт данных контакта в \"<xliff:g id="FILE_NAME">%s</xliff:g>\""</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Организация"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Веб-сайт"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Мероприятие"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Отношения"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Группы"</string>
<string name="type_short_home" msgid="7770424864090605384">"Д"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"М"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Поиск контактов"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Поиск всех контактов"</string>
<string name="take_photo" msgid="7496128293167402354">"Сфотографировать"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Создать новое фото"</string>
<string name="pick_photo" msgid="448886509158039462">"Выбрать фото из галереи"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Выбрать новое фото из Галереи"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Выполняется обновление списка контактов, чтобы изменение языка вступило в силу."\n\n"Подождите..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Обновляется список контактов."\n\n"Подождите..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Контакты обновляются. "\n\n" Для обновления требуется около <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> МБ внутренней памяти телефона."\n\n"Выберите один из следующих вариантов:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"объединено из нескольких источников (<xliff:g id="COUNT">%0$d</xliff:g>)"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Другое"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Объединить контакты"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Объединить текущий контакт с выбранным контактом?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Редактировать выбранные контакты"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Переключиться на редактирование выбранного контакта? Введенная информация будет скопирована."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Копировать в контакты"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"из: <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"из: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Пользовательские"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Настроить..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Контакты с номерами телефонов"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Контакт"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Настройка отображения"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Настройки"</string>
<string name="menu_settings" msgid="377929915873428211">"Настройки"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Номер телефона"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Добавить в контакты"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Закрыть"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Указать год"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 4a933b0..1e4ed4f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Det finns inga bilder på telefonen."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Det finns inga bilder på telefonen."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Anpassat etikettsnamn"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Visningsalternativ"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Skicka samtal direkt till röstbrevlåda"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Standardinställning"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Ta bort foto"</string>
<string name="noContacts" msgid="8579310973261953559">"Inga kontakter."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Inga matchande kontakter hittades."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Inga kontakter med telefonnummer."</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"Läsning av vCard-data avbröts"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"vCard-importen har slutförts"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"Läsning av vCard-data avbröts"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"vCard-import har startat."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"Importfunktionen för vCard importerar vCard-filen efter en stund."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Bekräfta export"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Vill du exportera kontaktlistan till \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"För många vCard-filer på USB-lagringsenheten"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"För många vCard-filer på SD-kortet"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Det obligatoriska filnamnet är för långt (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"vCard-export har startat."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"vCard-exporten har slutförts"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exporterar kontaktuppgifter"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Exporterar kontaktuppgifter till: <xliff:g id="FILE_NAME">%s</xliff:g>"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Organisation"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Webbplats"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Händelse"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"Relation"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Grupper"</string>
<string name="type_short_home" msgid="7770424864090605384">"H"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Sök efter kontakter"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Sök efter alla kontakter"</string>
<string name="take_photo" msgid="7496128293167402354">"Ta en bild"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Ta ny bild"</string>
<string name="pick_photo" msgid="448886509158039462">"Välj ett foto från galleriet"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Välj nytt foto från galleriet"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Kontaktlistan uppdateras så att språkändringen visas."\n\n"Vänta..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Kontaktlistan uppdateras."\n\n"Vänta..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Kontakter håller på att uppgraderas. "\n\n"Uppgraderingen kräver ungefär <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g>MB av telefonens internminne."\n\n"Välj något av följande alternativ:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"kombinerade från <xliff:g id="COUNT">%0$d</xliff:g> källor"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Övrigt"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Kombinera kontakter"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Vill du kombinera kontakten med den markerade kontakten?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Redigera valda kontakter"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Vill du fortsätta att redigera den markerade kontakten? Information som du har angett hittills kommer att kopieras."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Kopiera till mina kontakter"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"från <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"från <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Anpassad"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Anpassa..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Kontakter med telefonnummer"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Kontakt"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Definiera anpassad visning"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Inställningar"</string>
<string name="menu_settings" msgid="377929915873428211">"Inställningar"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Telefonnummer"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Lägg till i Kontakter"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Stäng"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Ange ett år"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 54df8f9..73684c6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -37,7 +37,7 @@
<string name="menu_search" msgid="9147752853603483719">"Ara"</string>
<string name="menu_newContact" msgid="1209922412763274638">"Yeni kişi"</string>
<string name="menu_viewContact" msgid="2795575601596468581">"Kişiyi görüntüle"</string>
- <string name="menu_callNumber" msgid="5142851348489387516">"Şunu sesli ara: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="menu_callNumber" msgid="5142851348489387516">"Ara: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="menu_addStar" msgid="2908478235715404876">"Sık kullanılanlara ekle"</string>
<string name="menu_removeStar" msgid="5844227078364227030">"Sık kullanılanlardan kaldır"</string>
<string name="menu_editContact" msgid="3452858480713561396">"Kişiyi düzenle"</string>
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"Telefonda hiçbir resim yok."</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"Telefonda hiçbir resim yok."</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"Özel etiket adı"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"Seçenekleri görüntüle"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"Çağrıları doğrudan sesli mesaja gönder"</string>
<string name="default_ringtone" msgid="9099988849649827972">"Varsayılan"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"Fotoğrafı kaldır"</string>
<string name="noContacts" msgid="8579310973261953559">"Hiçbir kişi yok."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Eşleşen kişi bulunamadı."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Telefon numarası olan hiçbir kişi yok."</string>
@@ -140,7 +139,7 @@
<string name="liveFolderFavorites" msgid="3100957542927222282">"Yıldızlı kişiler"</string>
<string name="liveFolderPhone" msgid="3739376066610926780">"Telefon numarası olan kişiler"</string>
<string name="menu_sendTextMessage" msgid="6937343460284499306">"Kısa mesaj gönder"</string>
- <string name="recentCalls_callNumber" msgid="1756372533999226126">"Şunu sesli ara: <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="recentCalls_callNumber" msgid="1756372533999226126">"Ara: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="recentCalls_editNumberBeforeCall" msgid="7756171675833267857">"Önce numarayı düzenle"</string>
<string name="recentCalls_addToContact" msgid="1429899535546487008">"Kişilere ekle"</string>
<string name="recentCalls_removeFromRecentList" msgid="401662244636511330">"Çağrı kaydından kaldır"</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"vCard verilerini okuma işlemi iptal edildi."</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"vCard içe aktarma işlemi tamamlandı"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"vCard verilerini okuma işlemi iptal edildi."</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"vCard içe aktarma aracı başlatıldı."</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"vCard içe aktarma aracı vCard\'ı bir süre sonra içe aktaracaktır."</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"Dışa aktarımı onayla"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"Kişi listenizi \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\" için dışa aktarmak istediğinizden emin misiniz?"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"USB depolama biriminde çok fazla vCard dosyası var"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SD kartta çok fazla vCard dosyası var"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"Gereken dosya adı çok uzun (\"<xliff:g id="FILENAME">%s</xliff:g>\")"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"vCard dışa aktarma aracı başlatıldı."</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"vCard dışa aktarma işlemi tamamlandı"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Kişi verileri dışa aktarılıyor"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"Kişi verileri \"<xliff:g id="FILE_NAME">%s</xliff:g>\" dosyasına dışa aktarılıyor"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Kuruluş"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"Web sitesi"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"Etkinlik"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"İlişki"</string>
<string name="groupsLabel" msgid="8573535366319059326">"Gruplar"</string>
<string name="type_short_home" msgid="7770424864090605384">"E"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"M"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"Kişileri ara"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"Tüm kişilerde ara"</string>
<string name="take_photo" msgid="7496128293167402354">"Fotoğraf çek"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"Yeni fotoğraf çek"</string>
<string name="pick_photo" msgid="448886509158039462">"Galeri\'den fotoğraf seç"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"Galeri\'den yeni fotoğraf seç"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"Kişi listesi, dil değişikliğini yansıtmak üzere güncelleniyor."\n\n"Lütfen bekleyin..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"Kişi listesi güncelleniyor."\n\n"Lütfen bekleyin..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"Kişiler yeni sürüme geçiriliyor. "\n\n"Yeni sürüme geçirme işlemi yaklaşık <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB dahili telefon depolama alanı gerektirir."\n\n"Aşağıdaki seçeneklerden birini belirleyin:"</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"<xliff:g id="COUNT">%0$d</xliff:g> kaynaktan birleştirildi"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"Diğer"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"Kişileri birleştir"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"Mevcut kişi, seçili kişiyle birleştirilsin mi?"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"Seçili kişileri düzenle"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"Seçili kişiyi düzenlemeye geçilsin mi? Şimdiye kadar girdiğiniz bilgiler kopyalanacak."</string>
<string name="menu_copyContact" msgid="4401683725471696686">"Kişilerime kopyala"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"Kişinin bulunduğu dizin: <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"Kişinin bulunduğu dizin: <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"Özel"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"Özelleştir..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"Telefon numarası olan kişiler"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"Kişi"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Özel görünüm tanımla"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Ayarlar"</string>
<string name="menu_settings" msgid="377929915873428211">"Ayarlar"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"Telefon numarası"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"Kişilere ekle"</string>
<string name="non_phone_close" msgid="7608506439725515667">"Kapat"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"Yıl girin"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b471e8f..2a2305b 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"手机上没有照片。"</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"手机上没有照片。"</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"自定义标签名称"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"显示选项"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"直接将来电转到语音信箱"</string>
<string name="default_ringtone" msgid="9099988849649827972">"默认日历"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"删除照片"</string>
<string name="noContacts" msgid="8579310973261953559">"没有联系人。"</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"未找到匹配的联系人。"</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"没有联系人拥有电话号码。"</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"已取消读取 vCard 数据"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"导入 vCard 已完成"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"已取消读取 vCard 数据"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"vCard 导入程序已启动。"</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"vCard 导入程序会在稍后导入该 vCard。"</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"确认导出"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"确定要将您的联系人列表导出到“<xliff:g id="VCARD_FILENAME">%s</xliff:g>”中吗？"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"USB 存储设备中的 vCard 文件太多"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SD 卡中的 vCard 文件太多"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"所需文件名太长（“<xliff:g id="FILENAME">%s</xliff:g>”）"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"vCard 导出程序已启动。"</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"导出 vCard 已完成"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"正在导出联系人数据"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"正在向“<xliff:g id="FILE_NAME">%s</xliff:g>”导出联系人数据"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"组织"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"网站"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"活动"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"关系"</string>
<string name="groupsLabel" msgid="8573535366319059326">"群组"</string>
<string name="type_short_home" msgid="7770424864090605384">"住宅"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"手机"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"搜索联系人"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"搜索所有联系人"</string>
<string name="take_photo" msgid="7496128293167402354">"拍照"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"拍摄新照片"</string>
<string name="pick_photo" msgid="448886509158039462">"从图库中选择照片"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"从图库中选择新照片"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"正在更新联系人列表，以反映语言的变更。"\n\n"请稍候..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"正在更新联系人列表。"\n\n"请稍候..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"正在升级联系人。"\n\n"升级过程需要约 <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB 的手机内存。"\n\n"请选择以下选项之一："</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"合并自 <xliff:g id="COUNT">%0$d</xliff:g> 个来源"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"其他"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"合并联系人"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"要合并当前联系人与所选联系人吗？"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"编辑所选联系人"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"要切换至编辑所选联系人吗？系统会复制您到目前为止输入的所有信息。"</string>
<string name="menu_copyContact" msgid="4401683725471696686">"复制到我的联系人"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"来自<xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"来自<xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"自定义"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"自定义..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"有电话号码的联系人"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"联系人"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"定义自定义视图"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"设置"</string>
<string name="menu_settings" msgid="377929915873428211">"设置"</string>
@@ -463,10 +459,8 @@
<string name="non_phone_caption" msgid="1541655052330027380">"电话号码"</string>
<string name="non_phone_add_to_contacts" msgid="6590985286250471169">"添加到联系人"</string>
<string name="non_phone_close" msgid="7608506439725515667">"关闭"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"输入年份"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 53aecfe..e9489ba 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -88,14 +88,13 @@
</string-array>
<!-- outdated translation 431331662154342581 --> <string name="photoPickerNotFoundText" product="tablet" msgid="6247290728908599701">"手機上沒有相片 。"</string>
<string name="photoPickerNotFoundText" product="default" msgid="431331662154342581">"手機上沒有相片 。"</string>
- <!-- no translation found for contact_photo_dialog_title (7278034771040497884) -->
+ <!-- no translation found for attach_photo_dialog_title (5599827035558557169) -->
<skip />
<string name="customLabelPickerTitle" msgid="1081475101983255212">"自訂標籤名稱"</string>
<string name="menu_displayGroup" msgid="5655505437727616553">"顯示選項"</string>
<string name="send_to_voicemail_checkbox" msgid="9001686764070676353">"直接將來電轉到語音信箱"</string>
<string name="default_ringtone" msgid="9099988849649827972">"預設值"</string>
- <!-- no translation found for removePhoto (4898105274130284565) -->
- <skip />
+ <string name="removePhoto" msgid="4898105274130284565">"移除相片"</string>
<string name="noContacts" msgid="8579310973261953559">"沒有聯絡人。"</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"找不到符合的聯絡人。"</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"沒有包含電話號碼的聯絡人資訊。"</string>
@@ -245,8 +244,14 @@
<string name="reading_vcard_canceled_title" msgid="1770608329958463131">"已取消讀取 vCard 資料"</string>
<string name="importing_vcard_finished_title" msgid="3213257229785702182">"已結束 vCard 匯入作業"</string>
<string name="importing_vcard_canceled_title" msgid="2963132079200382269">"已取消讀取 vCard 資料"</string>
- <string name="vcard_importer_start_message" msgid="5520549352987753320">"vCard 匯入工具已啟動。"</string>
- <string name="vcard_importer_will_start_message" msgid="2055145402481822160">"vCard 匯入工具將於稍後匯入該 vCard。"</string>
+ <!-- no translation found for vcard_import_will_start_message (3676975052103703482) -->
+ <skip />
+ <!-- no translation found for vcard_import_request_rejected_message (2592424820635325951) -->
+ <skip />
+ <!-- no translation found for vcard_export_will_start_message (7029604268822049249) -->
+ <skip />
+ <!-- no translation found for vcard_export_request_rejected_message (8259494002258326330) -->
+ <skip />
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="7648747763127442983">"確認匯出"</string>
<string name="confirm_export_message" msgid="3875683519257829750">"確定要將聯絡人清單匯出至「<xliff:g id="VCARD_FILENAME">%s</xliff:g>」嗎？"</string>
@@ -256,7 +261,6 @@
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="2638638826954895225">"USB 儲存裝置中的 vCard 檔案過多"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="7084146295639672658">"SD 卡中的 VCard 檔案過多"</string>
<string name="fail_reason_too_long_filename" msgid="1915716071321839166">"要求的檔案名稱過長 (「<xliff:g id="FILENAME">%s</xliff:g>」)"</string>
- <string name="vcard_exporter_start_message" msgid="6497218576519292369">"vCard 匯出工具已啟動。"</string>
<string name="exporting_vcard_finished_title" msgid="1268425436375550862">"已結束 vCard 匯出作業"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"正在匯出聯絡人資料"</string>
<string name="exporting_contact_list_message" msgid="5640326540405486055">"正在將聯絡人資料匯出至「<xliff:g id="FILE_NAME">%s</xliff:g>」"</string>
@@ -291,8 +295,7 @@
<string name="organizationLabelsGroup" msgid="2478611760751832035">"機構"</string>
<string name="websiteLabelsGroup" msgid="4202998982804009261">"網站"</string>
<string name="eventLabelsGroup" msgid="8069912895912714412">"活動"</string>
- <!-- no translation found for relationLabelsGroup (1854373894284572781) -->
- <skip />
+ <string name="relationLabelsGroup" msgid="1854373894284572781">"關係"</string>
<string name="groupsLabel" msgid="8573535366319059326">"群組"</string>
<string name="type_short_home" msgid="7770424864090605384">"住家"</string>
<string name="type_short_mobile" msgid="1655473281466676216">"行動"</string>
@@ -400,11 +403,9 @@
<string name="search_bar_hint" msgid="1012756309632856553">"搜尋聯絡人"</string>
<string name="search_for_all_contacts" msgid="6644963335787294131">"搜尋所有聯絡人"</string>
<string name="take_photo" msgid="7496128293167402354">"拍照"</string>
- <!-- no translation found for take_new_photo (7341354729436576304) -->
- <skip />
+ <string name="take_new_photo" msgid="7341354729436576304">"拍攝新相片"</string>
<string name="pick_photo" msgid="448886509158039462">"從圖片庫選取相片"</string>
- <!-- no translation found for pick_new_photo (7962368009197147617) -->
- <skip />
+ <string name="pick_new_photo" msgid="7962368009197147617">"從圖片庫選取新相片"</string>
<string name="locale_change_in_progress" msgid="1124266507671178413">"正在更新聯絡人清單以反映語言變更。"\n\n"請稍候..."</string>
<string name="upgrade_in_progress" msgid="7530893673211750223">"正在更新聯絡人清單。"\n\n"請稍候..."</string>
<!-- outdated translation 6713914687111678777 --> <string name="upgrade_out_of_memory" product="tablet" msgid="3601759703058685675">"正在進行聯絡人升級。"\n\n"升級程序需要大約 <xliff:g id="SIZE_IN_MEGABYTES">%d</xliff:g> MB 的手機內部儲存空間。"\n\n"請選擇下列其中一個選項："</string>
@@ -431,14 +432,10 @@
<item quantity="other" msgid="425683718017380845">"從 <xliff:g id="COUNT">%0$d</xliff:g> 個來源合併"</item>
</plurals>
<string name="local_invisible_directory" msgid="6046691709127661065">"其他"</string>
- <!-- no translation found for aggregation_suggestion_join_dialog_title (5276699501316246253) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_join_dialog_message (3842757977671434836) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_title (1064042382692091314) -->
- <skip />
- <!-- no translation found for aggregation_suggestion_edit_dialog_message (6549585283910518095) -->
- <skip />
+ <string name="aggregation_suggestion_join_dialog_title" msgid="5276699501316246253">"合併聯絡人"</string>
+ <string name="aggregation_suggestion_join_dialog_message" msgid="3842757977671434836">"要將目前聯絡人與所選聯絡人合併嗎？"</string>
+ <string name="aggregation_suggestion_edit_dialog_title" msgid="1064042382692091314">"編輯所選聯絡人"</string>
+ <string name="aggregation_suggestion_edit_dialog_message" msgid="6549585283910518095">"要切換至編輯所選聯絡人嗎？系統會為您複製目前已輸入的資訊。"</string>
<string name="menu_copyContact" msgid="4401683725471696686">"複製到我的聯絡人"</string>
<string name="contact_directory_description" msgid="7071885390570890999">"來自 <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="contact_directory_account_description" msgid="7674700530474108835">"來自 <xliff:g id="TYPE">%1$s</xliff:g> (<xliff:g id="NAME">%2$s</xliff:g>)"</string>
@@ -452,8 +449,7 @@
<string name="list_filter_custom" msgid="8910173055702057002">"自訂"</string>
<string name="list_filter_customize" msgid="2035084418635775579">"自訂..."</string>
<string name="list_filter_phones" msgid="7905045603593508221">"包含電話號碼的聯絡人資訊"</string>
- <!-- no translation found for list_filter_single (5871400283515893087) -->
- <skip />
+ <string name="list_filter_single" msgid="5871400283515893087">"聯絡人"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"定義自訂檢視"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"設定"</string>
<string name="menu_settings" msgid="377929915873428211">"設定"</string>
@@ -461,12 +457,10 @@
<string name="organization_company_and_title" msgid="6718207751363732025">"<xliff:g id="COMPANY_1">%1$s</xliff:g> <xliff:g id="COMPANY_0">%2$s</xliff:g>"</string>
<string name="hint_findContacts" msgid="1808681193458772072">"尋找聯絡人"</string>
<string name="non_phone_caption" msgid="1541655052330027380">"電話號碼"</string>
- <string name="non_phone_add_to_contacts" msgid="6590985286250471169">"新增至聯絡人"</string>
+ <string name="non_phone_add_to_contacts" msgid="6590985286250471169">"新增至通訊錄"</string>
<string name="non_phone_close" msgid="7608506439725515667">"關閉"</string>
- <!-- no translation found for widget_name_and_phonetic (8739586586600099979) -->
- <skip />
- <!-- no translation found for date_year_toggle (7356532842767854606) -->
- <skip />
+ <string name="widget_name_and_phonetic" msgid="8739586586600099979">"<xliff:g id="DISPLAY_NAME">%1$s</xliff:g> (<xliff:g id="PHONETIC_NAME">%2$s</xliff:g>)"</string>
+ <string name="date_year_toggle" msgid="7356532842767854606">"提供年份"</string>
<!-- no translation found for social_widget_label (6378905543028924592) -->
<skip />
<!-- no translation found for social_widget_loading (3697996166985327861) -->
diff --git a/src/com/android/contacts/vcard/ExportProcessor.java b/src/com/android/contacts/vcard/ExportProcessor.java
index 5e0a19d..c54df49 100644
--- a/src/com/android/contacts/vcard/ExportProcessor.java
+++ b/src/com/android/contacts/vcard/ExportProcessor.java
@@ -39,18 +39,17 @@
* Class for processing one export request from a user. Dropped after exporting requested Uri(s).
* {@link VCardService} will create another object when there is another export request.
*/
-public class ExportProcessor implements Runnable {
+public class ExportProcessor extends ProcessorBase {
private static final String LOG_TAG = "VCardExport";
private final VCardService mService;
+ private final ContentResolver mResolver;
+ private final NotificationManager mNotificationManager;
+ private final ExportRequest mExportRequest;
+ private final int mJobId;
- private ContentResolver mResolver;
- private NotificationManager mNotificationManager;
-
- private volatile boolean mCanceled;
-
- private ExportRequest mExportRequest;
- private int mJobId;
+ private volatile boolean mCancelled;
+ private volatile boolean mDone;
public ExportProcessor(VCardService service, ExportRequest exportRequest, int jobId) {
mService = service;
@@ -62,6 +61,11 @@
}
@Override
+ public final int getType() {
+ return PROCESSOR_TYPE_EXPORT;
+ }
+
+ @Override
public void run() {
// ExecutorService ignores RuntimeException, so we need to show it here.
try {
@@ -69,6 +73,10 @@
} catch (RuntimeException e) {
Log.e(LOG_TAG, "RuntimeException thrown during export", e);
throw e;
+ } finally {
+ synchronized (this) {
+ mDone = true;
+ }
}
}
@@ -78,6 +86,10 @@
VCardComposer composer = null;
boolean successful = false;
try {
+ if (mCancelled) {
+ Log.i(LOG_TAG, "Export request is cancelled before handling the request");
+ return;
+ }
final Uri uri = request.destUri;
final OutputStream outputStream;
try {
@@ -135,7 +147,8 @@
int current = 1; // 1-origin
while (!composer.isAfterLast()) {
- if (mCanceled) {
+ if (mCancelled) {
+ Log.i(LOG_TAG, "Export request is cancelled during composing vCard");
return;
}
if (!composer.createOneEntry()) {
@@ -223,8 +236,23 @@
mNotificationManager.notify(VCardService.EXPORT_NOTIFICATION_ID, notification);
}
- public void cancel() {
+ @Override
+ public synchronized boolean cancel(boolean mayInterruptIfRunning) {
Log.i(LOG_TAG, "received cancel request");
- mCanceled = true;
+ if (mDone || mCancelled) {
+ return false;
+ }
+ mCancelled = true;
+ return true;
+ }
+
+ @Override
+ public synchronized boolean isCancelled() {
+ return mCancelled;
+ }
+
+ @Override
+ public synchronized boolean isDone() {
+ return mDone;
}
}
diff --git a/src/com/android/contacts/vcard/ImportProcessor.java b/src/com/android/contacts/vcard/ImportProcessor.java
index acb6792..049d0a9 100644
--- a/src/com/android/contacts/vcard/ImportProcessor.java
+++ b/src/com/android/contacts/vcard/ImportProcessor.java
@@ -48,22 +48,24 @@
* Class for processing one import request from a user. Dropped after importing requested Uri(s).
* {@link VCardService} will create another object when there is another import request.
*/
-public class ImportProcessor implements Runnable {
+public class ImportProcessor extends ProcessorBase {
private static final String LOG_TAG = "VCardImport";
private final VCardService mService;
private final ContentResolver mResolver;
private final NotificationManager mNotificationManager;
+ private final ImportRequest mImportRequest;
+ private final int mJobId;
- private final List<Uri> mFailedUris = new ArrayList<Uri>();
private final ImportProgressNotifier mNotifier = new ImportProgressNotifier();
+ // TODO: remove and show appropriate message instead.
+ private final List<Uri> mFailedUris = new ArrayList<Uri>();
+
private VCardParser mVCardParser;
- private ImportRequest mImportRequest;
- private int mJobId;
-
- private boolean mCanceled;
+ private volatile boolean mCancelled;
+ private volatile boolean mDone;
public ImportProcessor(final VCardService service, final ImportRequest request,
int jobId) {
@@ -76,6 +78,10 @@
mJobId = jobId;
}
+ @Override
+ public final int getType() {
+ return PROCESSOR_TYPE_IMPORT;
+ }
@Override
public void run() {
@@ -85,13 +91,17 @@
} catch (RuntimeException e) {
Log.e(LOG_TAG, "RuntimeException thrown during import", e);
throw e;
+ } finally {
+ synchronized (this) {
+ mDone = true;
+ }
}
}
private void runInternal() {
Log.i(LOG_TAG, String.format("vCard import (id: %d) has started.", mJobId));
final ImportRequest request = mImportRequest;
- if (mCanceled) {
+ if (mCancelled) {
Log.i(LOG_TAG, "Canceled before actually handling parameter (" + request.uri + ")");
return;
}
@@ -131,7 +141,13 @@
mService.handleFinishImportNotification(mJobId, successful);
if (successful) {
- Log.i(LOG_TAG, "Successfully finished importing one vCard file: " + uri);
+ // TODO: successful becomes true even when cancelled. Should return more appropriate
+ // value
+ if (isCancelled()) {
+ Log.i(LOG_TAG, "vCard import has been canceled (uri: " + uri + ")");
+ } else {
+ Log.i(LOG_TAG, "Successfully finished importing one vCard file: " + uri);
+ }
List<Uri> uris = committer.getCreatedUris();
if (uris != null && uris.size() > 0) {
doFinishNotification(uris.get(0));
@@ -166,7 +182,7 @@
final String title;
notification.flags |= Notification.FLAG_AUTO_CANCEL;
- if (isCanceled()) {
+ if (isCancelled()) {
notification.icon = android.R.drawable.stat_notify_error;
title = mService.getString(R.string.importing_vcard_canceled_title);
} else {
@@ -190,8 +206,7 @@
mNotificationManager.notify(VCardService.IMPORT_NOTIFICATION_ID, notification);
}
- // Make package private for testing use.
- /* package */ boolean readOneVCard(Uri uri, int vcardType, String charset,
+ private boolean readOneVCard(Uri uri, int vcardType, String charset,
final VCardInterpreter interpreter,
final int[] possibleVCardVersions) {
Log.i(LOG_TAG, "start importing one vCard (Uri: " + uri + ")");
@@ -216,7 +231,7 @@
mVCardParser = (vcardVersion == ImportVCardActivity.VCARD_VERSION_V30 ?
new VCardParser_V30(vcardType) :
new VCardParser_V21(vcardType));
- if (mCanceled) {
+ if (mCancelled) {
Log.i(LOG_TAG, "ImportProcessor already recieves cancel request, so " +
"send cancel request to vCard parser too.");
mVCardParser.cancel();
@@ -260,17 +275,29 @@
return successful;
}
- public boolean isCanceled() {
- return mCanceled;
- }
-
- public void cancel() {
+ @Override
+ public synchronized boolean cancel(boolean mayInterruptIfRunning) {
Log.i(LOG_TAG, "ImportProcessor received cancel request");
- mCanceled = true;
+ if (mDone || mCancelled) {
+ return false;
+ }
+ mCancelled = true;
synchronized (this) {
if (mVCardParser != null) {
mVCardParser.cancel();
}
}
+ return true;
+ }
+
+ @Override
+ public synchronized boolean isCancelled() {
+ return mCancelled;
+ }
+
+
+ @Override
+ public synchronized boolean isDone() {
+ return mDone;
}
}
diff --git a/src/com/android/contacts/vcard/ProcessorBase.java b/src/com/android/contacts/vcard/ProcessorBase.java
new file mode 100644
index 0000000..17ac6d3
--- /dev/null
+++ b/src/com/android/contacts/vcard/ProcessorBase.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.contacts.vcard;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A base processor class. One instance processes vCard one import/export request (imports a given
+ * vCard or exports a vCard). Expected to be used with {@link ExecutorService}.
+ *
+ * This instance starts itself with {@link #run()} method, and can be cancelled with
+ * {@link #cancel(boolean)}. Users can check the processor's status using {@link #isCancelled()}
+ * and {@link #isDone()} asynchronously.
+ *
+ * {@link #get()} and {@link #get(long, TimeUnit)}, which are form {@link Future}, aren't
+ * supported and {@link UnsupportedOperationException} will be just thrown when they are called.
+ */
+public abstract class ProcessorBase implements RunnableFuture<Object> {
+
+ public static final int PROCESSOR_TYPE_IMPORT = 1;
+ public static final int PROCESSOR_TYPE_EXPORT = 2;
+
+ /**
+ * @return the type of the processor. Must be {@link #PROCESSOR_TYPE_IMPORT} or
+ * {@link #PROCESSOR_TYPE_EXPORT}.
+ */
+ public abstract int getType();
+
+ public abstract void run();
+
+ /**
+ * Cancels this operation.
+ *
+ * @param mayInterruptIfRunning ignored. When this method is called, the instance
+ * stops processing and finish itself even if the thread is running.
+ *
+ * @see Future#cancel(boolean)
+ */
+ public abstract boolean cancel(boolean mayInterruptIfRunning);
+ public abstract boolean isCancelled();
+ public abstract boolean isDone();
+
+ /**
+ * Just throws {@link UnsupportedOperationException}.
+ */
+ @Override
+ public final Object get() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Just throws {@link UnsupportedOperationException}.
+ */
+ @Override
+ public final Object get(long timeout, TimeUnit unit) {
+ throw new UnsupportedOperationException();
+ }
+}
\ No newline at end of file
diff --git a/src/com/android/contacts/vcard/VCardService.java b/src/com/android/contacts/vcard/VCardService.java
index 77dc8bd..367634c 100644
--- a/src/com/android/contacts/vcard/VCardService.java
+++ b/src/com/android/contacts/vcard/VCardService.java
@@ -26,8 +26,6 @@
import android.util.Log;
import android.widget.Toast;
-import java.io.File;
-import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutorService;
@@ -55,7 +53,7 @@
/* package */ static final String CACHE_FILE_PREFIX = "import_tmp_";
- public class RequestHandler extends Handler {
+ private final Messenger mMessenger = new Messenger(new Handler() {
@Override
public void handleMessage(Message msg) {
switch (msg.what) {
@@ -78,19 +76,18 @@
}
}
}
- }
+ });
- private final Handler mHandler = new RequestHandler();
- private final Messenger mMessenger = new Messenger(mHandler);
// Should be single thread, as we don't want to simultaneously handle import and export
// requests.
- private ExecutorService mExecutorService = Executors.newSingleThreadExecutor();
+ private final ExecutorService mExecutorService = Executors.newSingleThreadExecutor();
private int mCurrentJobId;
- private final Map<Integer, ImportProcessor> mRunningJobMapForImport =
- new HashMap<Integer, ImportProcessor>();
- private final Map<Integer, ExportProcessor> mRunningJobMapForExport =
- new HashMap<Integer, ExportProcessor>();
+
+ // Stores all unfinished import/export jobs which will be executed by mExecutorService.
+ // Key is jobId.
+ private final Map<Integer, ProcessorBase> mRunningJobMap =
+ new HashMap<Integer, ProcessorBase>();
@Override
public int onStartCommand(Intent intent, int flags, int id) {
@@ -104,133 +101,141 @@
@Override
public void onDestroy() {
- Log.i(LOG_TAG, "VCardService is finishing()");
- cancelRequestsAndshutdown();
+ Log.i(LOG_TAG, "VCardService is being destroyed.");
+ cancelAllRequestsAndShutdown();
clearCache();
super.onDestroy();
}
private synchronized void handleImportRequest(ImportRequest request) {
- Log.i(LOG_TAG, String.format("Received vCard import request. id: %d", mCurrentJobId));
- final ImportProcessor importProcessor =
- new ImportProcessor(this, request, mCurrentJobId);
- try {
- mExecutorService.submit(importProcessor);
- } catch (RejectedExecutionException e) {
- Log.w(LOG_TAG, "vCard import request is rejected.", e);
- // TODO: a little unkind to show Toast in this case, which is shown just a moment.
- // Ideally we should show some persistent something users can notice more easily.
- Toast.makeText(this, getString(R.string.vcard_import_request_rejected_message),
- Toast.LENGTH_LONG).show();
- return;
- }
- mRunningJobMapForImport.put(mCurrentJobId, importProcessor);
- mCurrentJobId++;
- // TODO: Ideally we should detect the current status of import/export and show "started"
- // when we can import right now and show "will start" when we cannot.
- Toast.makeText(this, getString(R.string.vcard_import_will_start_message),
- Toast.LENGTH_LONG).show();
+ tryExecute(new ImportProcessor(this, request, mCurrentJobId),
+ R.string.vcard_import_will_start_message,
+ R.string.vcard_import_request_rejected_message);
}
private synchronized void handleExportRequest(ExportRequest request) {
- Log.i(LOG_TAG, String.format("Received vCard export request. id: %d", mCurrentJobId));
- final ExportProcessor exportProcessor =
- new ExportProcessor(this, request, mCurrentJobId);
+ tryExecute(new ExportProcessor(this, request, mCurrentJobId),
+ R.string.vcard_export_will_start_message,
+ R.string.vcard_export_request_rejected_message);
+ }
+
+ /**
+ * Tries to call {@link ExecutorService#execute(Runnable)} toward a given processor and
+ * shows appropriate Toast using given resource ids.
+ * Updates relevant instances when successful.
+ */
+ private synchronized void tryExecute(ProcessorBase processor,
+ int successfulMessageId, int rejectedMessageId) {
try {
- mExecutorService.submit(exportProcessor);
+ mExecutorService.execute(processor);
+ mRunningJobMap.put(mCurrentJobId, processor);
+ mCurrentJobId++;
+ // TODO: Ideally we should detect the current status of import/export and show
+ // "started" when we can import right now and show "will start" when we cannot.
+ Toast.makeText(this, getString(successfulMessageId), Toast.LENGTH_LONG).show();
} catch (RejectedExecutionException e) {
- Log.w(LOG_TAG, "vCard export request is rejected.", e);
- Toast.makeText(this, getString(R.string.vcard_export_request_rejected_message),
- Toast.LENGTH_LONG).show();
- return;
+ Log.w(LOG_TAG, "Failed to excetute a job.", e);
+ // TODO: a little unkind to show Toast in this case, which is shown just a moment.
+ // Ideally we should show some persistent something users can notice more easily.
+ Toast.makeText(this, getString(rejectedMessageId), Toast.LENGTH_LONG).show();
}
- mRunningJobMapForExport.put(mCurrentJobId, exportProcessor);
- mCurrentJobId++;
- // See the comment in handleImportRequest()
- Toast.makeText(this, getString(R.string.vcard_export_will_start_message),
- Toast.LENGTH_LONG).show();
}
- private synchronized void handleCancelAllImportRequest() {
+ private void handleCancelAllImportRequest() {
Log.i(LOG_TAG, "Received cancel import request.");
- cancelAllImportRequest();
- mRunningJobMapForImport.clear();
+ cancelAllImportRequests();
}
- private void cancelAllImportRequest() {
- for (final Map.Entry<Integer, ImportProcessor> entry :
- mRunningJobMapForImport.entrySet()) {
- final int jobId = entry.getKey();
- final ImportProcessor importProcessor = entry.getValue();
- importProcessor.cancel();
- Log.i(LOG_TAG, String.format("Canceling job %d", jobId));
+ private synchronized void cancelAllImportRequests() {
+ for (final Map.Entry<Integer, ProcessorBase> entry : mRunningJobMap.entrySet()) {
+ final ProcessorBase processor = entry.getValue();
+ if (processor.getType() == ProcessorBase.PROCESSOR_TYPE_IMPORT) {
+ final int jobId = entry.getKey();
+ processor.cancel(true);
+ mRunningJobMap.remove(jobId);
+ Log.i(LOG_TAG, String.format("Canceling job %d", jobId));
+ }
}
+ stopServiceWhenNoJob();
}
- private void cancelAllExportRequest() {
- for (final Map.Entry<Integer, ExportProcessor> entry :
- mRunningJobMapForExport.entrySet()) {
- final int jobId = entry.getKey();
- final ExportProcessor exportProcessor = entry.getValue();
- exportProcessor.cancel();
- Log.i(LOG_TAG, String.format("Canceling job %d", jobId));
+ private synchronized void cancelAllExportRequests() {
+ for (final Map.Entry<Integer, ProcessorBase> entry : mRunningJobMap.entrySet()) {
+ final ProcessorBase processor = entry.getValue();
+ if (processor.getType() == ProcessorBase.PROCESSOR_TYPE_EXPORT) {
+ final int jobId = entry.getKey();
+ processor.cancel(true);
+ mRunningJobMap.remove(jobId);
+ Log.i(LOG_TAG, String.format("Canceling job %d", jobId));
+ }
}
+ stopServiceWhenNoJob();
+ }
+
+ /**
+ * Checks job list and call {@link #stopSelf()} when there's no job now.
+ * A new job cannot be submitted any more after this call.
+ */
+ private synchronized void stopServiceWhenNoJob() {
+ if (mRunningJobMap.size() > 0) {
+ for (final Map.Entry<Integer, ProcessorBase> entry : mRunningJobMap.entrySet()) {
+ final int jobId = entry.getKey();
+ final ProcessorBase processor = entry.getValue();
+ if (processor.isDone()) {
+ mRunningJobMap.remove(jobId);
+ } else {
+ Log.i(LOG_TAG, String.format("Found unfinished job (id: %d)", jobId));
+ return;
+ }
+ }
+ }
+
+ Log.i(LOG_TAG, "No unfinished job. Stop this service.");
+ mExecutorService.shutdown();
+ stopSelf();
}
/* package */ synchronized void handleFinishImportNotification(
int jobId, boolean successful) {
- Log.i(LOG_TAG, String.format("Received vCard import finish notification (id: %d). "
+ Log.v(LOG_TAG, String.format("Received vCard import finish notification (id: %d). "
+ "Result: %b", jobId, (successful ? "success" : "failure")));
- if (mRunningJobMapForImport.remove(jobId) == null) {
+ if (mRunningJobMap.remove(jobId) == null) {
Log.w(LOG_TAG, String.format("Tried to remove unknown job (id: %d)", jobId));
}
+ stopServiceWhenNoJob();
}
/* package */ synchronized void handleFinishExportNotification(
int jobId, boolean successful) {
- Log.i(LOG_TAG, String.format("Received vCard export finish notification (id: %d). "
+ Log.v(LOG_TAG, String.format("Received vCard export finish notification (id: %d). "
+ "Result: %b", jobId, (successful ? "success" : "failure")));
- if (mRunningJobMapForExport.remove(jobId) == null) {
+ if (mRunningJobMap.remove(jobId) == null) {
Log.w(LOG_TAG, String.format("Tried to remove unknown job (id: %d)", jobId));
}
+ stopServiceWhenNoJob();
}
/**
- * Cancels all the import/export requests and call {@link ExecutorService#shutdown()}, which
- * means this Service becomes no longer ready for import/export requests. Mainly used in
- * onDestroy().
+ * Cancels all the import/export requests and calls {@link ExecutorService#shutdown()}, which
+ * means this Service becomes no longer ready for import/export requests.
+ *
+ * Mainly called from onDestroy().
*/
- private synchronized void cancelRequestsAndshutdown() {
- synchronized (this) {
- if (mRunningJobMapForImport.size() > 0) {
- Log.i(LOG_TAG,
- String.format("Cancel existing all import requests (remains: ",
- mRunningJobMapForImport.size()));
- cancelAllImportRequest();
- }
- if (mRunningJobMapForExport.size() > 0) {
- Log.i(LOG_TAG,
- String.format("Cancel existing all import requests (remains: ",
- mRunningJobMapForExport.size()));
- cancelAllExportRequest();
- }
- mExecutorService.shutdown();
+ private synchronized void cancelAllRequestsAndShutdown() {
+ for (final Map.Entry<Integer, ProcessorBase> entry : mRunningJobMap.entrySet()) {
+ entry.getValue().cancel(true);
}
+ mRunningJobMap.clear();
+ mExecutorService.shutdown();
}
/**
* Removes import caches stored locally.
*/
private void clearCache() {
- Log.i(LOG_TAG, "start removing cache files if exist.");
- final String[] fileLists = fileList();
- for (String fileName : fileLists) {
+ for (final String fileName : fileList()) {
if (fileName.startsWith(CACHE_FILE_PREFIX)) {
// We don't want to keep all the caches so we remove cache files old enough.
- // TODO: Ideally we should ask VCardService whether the file is being used or
- // going to be used.
- final Date now = new Date();
- final File file = getFileStreamPath(fileName);
Log.i(LOG_TAG, "Remove a temporary file: " + fileName);
deleteFile(fileName);
}