Merge "Follow framework API changes." into ics-mr1
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5a97092..91f4183 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -99,7 +99,7 @@
<string name="noMatchingContacts" msgid="4266283206853990471">"Geen passende kontakte gevind nie."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Geen kontakte met foonnommers nie."</string>
<string name="emptyGroup" msgid="7502116218697177370">"Geen mense in hierdie groep nie."</string>
- <string name="addPeopleToGroup" msgid="7879585947222263516">"Om paar by te voeg, wysig die groep."</string>
+ <string name="addPeopleToGroup" msgid="7879585947222263516">"Om \'n paar by te voeg, wysig die groep."</string>
<string name="savingContact" msgid="4075751076741924939">"Stoor tans kontak..."</string>
<string name="savingDisplayGroups" msgid="2133152192716475939">"Stoor tans vertoonopsies..."</string>
<string name="contactSavedToast" msgid="7152589189385441091">"Kontak gestoor."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 51d0daa..59127b0 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -418,7 +418,7 @@
<string name="pick_new_photo" msgid="7962368009197147617">"Selecciona una foto nova de la galeria"</string>
<string name="locale_change_in_progress" msgid="7583992153091537467">"S\'actualitza la llista de contactes per reflectir el canvi d\'idioma."</string>
<string name="upgrade_in_progress" msgid="474511436863451061">"S\'actualitza la llista de contactes."</string>
- <string name="upgrade_out_of_memory" msgid="1209994418877625940">"S\'estan actualitzant els contactes. "\n\n"El procés d\'actualització requereix aproximadament <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MB d\'l\'emmagatzematge intern."\n\n"Tria una de les opcions següents:"</string>
+ <string name="upgrade_out_of_memory" msgid="1209994418877625940">"S\'estan actualitzant els contactes. "\n\n"El procés d\'actualització requereix aproximadament <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MB de l\'emmagatzematge intern."\n\n"Tria una de les opcions següents:"</string>
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Desinstal·leu aplicacions"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Torna a provar d\'actualitzar"</string>
<string name="search_results_searching" msgid="3984833028938569930">"S\'està cercant..."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 896449c..3846714 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -163,10 +163,10 @@
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Nemáte uloženy žádné kontakty, které by bylo možno zobrazit."</string>
<string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"Nemáte žádné kontakty, které by bylo možné zobrazit."\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s tabletem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit zcela nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo exportovat"</b></font>", pokud chcete importovat kontakty z karty SIM nebo SD."\n</li></string>
<string name="noContactsHelpText" product="default" msgid="4405064135698982080">"Nemáte žádné kontakty, které by bylo možné zobrazit."\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s telefonem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit zcela nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo exportovat"</b></font>", pokud chcete importovat kontakty z karty SIM nebo SD."\n</li></string>
- <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"Nemáte žádné účty, které by bylo možné zobrazit. (Pokud jste právě přidali účet, může synchronizace kontaktů trvat několik minut.)"\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s tabletem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Možnosti zobrazení"</b></font>", pokud chcete změnit, které kontakty budou zobrazeny;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit úplně nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo Exportovat"</b></font>", pokud chcete importovat kontakty z karty SIM nebo SD."\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"Nemáte žádné kontakty, které by bylo možné zobrazit. (Pokud jste právě přidali účet, může synchronizace kontaktů trvat několik minut.)"\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s tabletem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Možnosti zobrazení"</b></font>", pokud chcete změnit, které kontakty budou zobrazeny;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit úplně nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo Exportovat"</b></font>", pokud chcete importovat kontakty z karty SIM nebo SD."\n</li></string>
<string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"Nemáte žádné kontakty, které by bylo možné zobrazit. (Pokud jste právě přidali účet, může synchronizace kontaktů trvat několik minut.)"\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" a potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s telefonem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Možnosti zobrazení"</b></font>", pokud chcete změnit, které kontakty budou zobrazeny;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit úplně nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo exportovat"</b></font>", pokud chcete importovat kontakty z karty SIM nebo SD."\n</li></string>
<string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"Nemáte žádné kontakty, které by bylo možné zobrazit."\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" a potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s tabletem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit úplně nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo exportovat"</b></font>", pokud chcete importovat kontakty z karty SD."\n</li></string>
- <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Nemáte žádné kontakty, které by bylo možné zobrazit."\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s telefonem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit zcela nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo exportovat"</b></font>", pokud chcete importovat kontakty z karty SIM nebo SD."\n</li></string>
+ <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Nemáte žádné kontakty, které by bylo možné zobrazit."\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s telefonem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit zcela nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo exportovat"</b></font>", pokud chcete importovat kontakty z karty SD."\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"Nemáte žádné kontakty, které by bylo možné zobrazit. (Pokud jste právě přidali účet, může synchronizace kontaktů trvat několik minut.)"\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>", potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s tabletem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Možnosti zobrazení"</b></font>", pokud chcete změnit, které kontakty budou zobrazeny;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"/}Nový kontakt"</b></font>", pokud chcete vytvořit úplně nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo exportovat"</b></font>", pokud chcete importovat kontakty z karty SD."\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"Nemáte žádné kontakty, které by bylo možné zobrazit. (Pokud jste právě přidali účet, může synchronizace kontaktů trvat několik minut.)"\n\n"Chcete-li přidat kontakty, dotkněte se možnosti "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" a potom se dotkněte položky:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Účty"</b></font>", pokud chcete přidat nebo nastavit účet a kontakty v něm synchronizovat s telefonem;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Možnosti zobrazení"</b></font>", pokud chcete změnit, které kontakty budou zobrazeny;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Nový kontakt"</b></font>", pokud chcete vytvořit úplně nový kontakt;"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importovat nebo exportovat"</b></font>", pokud chcete importovat kontakty z karty SD."\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"Nemáte žádné oblíbené kontakty."\n\n"Přidání kontaktu do seznamu oblíbených:"\n\n" "<li>"Dotkněte se karty "<b>"Kontakty"</b>"."\n</li>" "\n<li>"Dotkněte se kontaktu, který chcete přidat mezi oblíbené."\n</li>" "\n<li>"Dotkněte se hvězdičky vedle jména kontaktu."\n</li></string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 7741604..a93c094 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -48,7 +48,7 @@
<string name="menu_deleteContact" msgid="6788644058868189393">"Löschen"</string>
<string name="menu_call" msgid="3992595586042260618">"Kontakt anrufen"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"SMS an Kontakt"</string>
- <string name="menu_splitAggregate" msgid="8368636463748691868">"Teilen"</string>
+ <string name="menu_splitAggregate" msgid="8368636463748691868">"Aufteilen"</string>
<string name="menu_editGroup" msgid="5062005185370983720">"Bearbeiten"</string>
<string name="menu_deleteGroup" msgid="3486380004411482874">"Löschen"</string>
<string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Neu"</string>
@@ -65,7 +65,7 @@
<string name="deleteConfirmation_title" msgid="1418215926447642260">"Kontakt löschen?"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Klingeltonwahl"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Alle Anrufe an Mailbox"</string>
- <string name="readOnlyContactWarning" msgid="7808825687289848259">"Sie können keine Kontakte aus schreibgeschützten Konten löschen. Sie können sie jedoch in Ihren Kontaktlisten ausblenden."</string>
+ <string name="readOnlyContactWarning" msgid="7808825687289848259">"Sie können keine Kontakte aus schreibgeschützten Konten löschen. Sie können sie aber in Ihren Kontaktlisten ausblenden."</string>
<string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"Dieser Kontakt enthält Informationen aus mehreren Konten. Informationen aus schreibgeschützten Konten werden nicht gelöscht, sondern in Ihren Kontaktlisten ausgeblendet."</string>
<string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"Wenn Sie diesen Kontakt löschen, werden Informationen aus mehreren Konten gelöscht."</string>
<string name="deleteConfirmation" msgid="811706994761610640">"Dieser Kontakt wird gelöscht."</string>
@@ -248,9 +248,9 @@
<string name="importing_vcard_canceled_title" msgid="2147475978165599336">"Import von <xliff:g id="FILENAME">%s</xliff:g> abgebrochen"</string>
<string name="vcard_import_will_start_message" msgid="2804911199145873396">"<xliff:g id="FILENAME">%s</xliff:g> wird demnächst importiert."</string>
<string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"Die Datei wird in Kürze importiert."</string>
- <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"Die vCard-Importanfrage wurde abgelehnt. Versuchen Sie es später noch einmal."</string>
+ <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"Die vCard-Importanfrage wurde abgelehnt. Bitte versuchen Sie es später noch einmal."</string>
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> wird demnächst exportiert."</string>
- <string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Die vCard-Exportanfrage wurde abgelehnt. Versuchen Sie es später noch einmal."</string>
+ <string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Die vCard-Exportanfrage wurde abgelehnt. Bitte versuchen Sie es später noch einmal."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"Kontakt"</string>
<string name="percentage" msgid="34897865327092209">"%s %%"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Kontakte exportieren?"</string>
@@ -458,7 +458,7 @@
<string name="list_filter_phones" msgid="735313795643493365">"Alle Kontakte mit Telefonnummern"</string>
<string name="list_filter_single" msgid="5871400283515893087">"Kontakt"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Ansicht festlegen"</string>
- <string name="contact_list_loading" msgid="5488620820563977329">"Laden..."</string>
+ <string name="contact_list_loading" msgid="5488620820563977329">"Wird geladen…"</string>
<string name="activity_title_settings" msgid="5464130076132770781">"Einstellungen"</string>
<string name="activity_title_contacts_filter" msgid="8275542497615516969">"Kontakte zum Anzeigen"</string>
<string name="menu_settings" msgid="377929915873428211">"Einstellungen"</string>
@@ -472,7 +472,7 @@
<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>
<string name="social_widget_label" msgid="6378905543028924592">"Kontakt"</string>
- <string name="social_widget_loading" msgid="5327336597364074608">"Laden..."</string>
+ <string name="social_widget_loading" msgid="5327336597364074608">"Wird geladen…"</string>
<string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Neuen Kontakt erstellen"</string>
<string name="contacts_unavailable_add_account" msgid="7911101713860139754">"In einem Konto anmelden"</string>
<string name="contacts_unavailable_import_contacts" msgid="4456440183590517471">"Kontakte aus einer Datei importieren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 11c4c89..15b7b91 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -161,12 +161,12 @@
<string name="simContacts_title" msgid="27341688347689769">"Επαφές στην κάρτα SIM"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Δεν υπάρχουν επαφές για προβολή. (Εάν προσθέσατε τώρα ένα λογαριασμό, ο συγχρονισμός των επαφών μπορεί να καθυστερήσει μερικά λεπτά.)"</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Δεν υπάρχουν επαφές για προβολή."</string>
- <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"Δεν υπάρχουν επαφές προς εμφάνιση."\n\n"Για να προσθέσετε επαφές, αγγίξτε το στοιχείο "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και έπειτα:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για να προσθέσετε ή να ρυθμίσετε έναν λογαριασμό με επαφές τις οποίες μπορείτε να συγχρονίσετε με το tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για να δημιουργήσετε μαι νέα επαφή"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα σας SIM ή SD"\n</li></string>
+ <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"Δεν υπάρχουν επαφές προς εμφάνιση."\n\n"Για να προσθέσετε επαφές, αγγίξτε το στοιχείο "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και έπειτα:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για να προσθέσετε ή να ρυθμίσετε έναν λογαριασμό με επαφές τις οποίες μπορείτε να συγχρονίσετε με το tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για να δημιουργήσετε μαι νέα επαφή"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα SIM ή SD"\n</li></string>
<string name="noContactsHelpText" product="default" msgid="4405064135698982080">"Δεν υπάρχουν επαφές προς εμφάνιση."\n\n"Για να προσθέσετε επαφές, αγγίξτε το στοιχείο "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και έπειτα:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για να προσθέσετε ή να ρυθμίσετε έναν λογαριασμό με επαφές τις οποίες μπορείτε να συγχρονίσετε με το τηλέφωνο"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για να δημιουργήσετε μαι νέα επαφή"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα σας SIM ή SD"\n</li></string>
<string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"Δεν έχετε επαφές προς προβολή. (Αν προσθέσατε κάποιον λογαριασμό μόλις τώρα, θα χρειαστούν λίγα λεπτά έως ότου γίνει ο συγχρονισμός.)"\n\n"Για την προσθήκη επαφών, πατήστε "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και αγγίξτε την επιλογή:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για την προσθήκη ή ρύθμιση λογαριασμού με επαφές τις οποίες μπορείτε να συγχρονίσετε στο tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Προβολή επιλογών"</b></font>", για να αλλάξετε τις επαφές που είναι ορατές"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για δημιουργία νέας επαφής"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα SIM ή SD"\n</li></string>
<string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"Δεν έχετε επαφές προς προβολή. (Αν προσθέσατε κάποιον λογαριασμό μόλις τώρα, θα χρειαστούν λίγα λεπτά έως ότου γίνει ο συγχρονισμός.)"\n\n"Για την προσθήκη επαφών, πατήστε "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και αγγίξτε την επιλογή:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για την προσθήκη ή ρύθμιση λογαριασμού με επαφές τις οποίες μπορείτε να συγχρονίσετε στο τηλέφωνο"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Προβολή επιλογών"</b></font>", για να αλλάξετε τις επαφές που είναι ορατές"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για δημιουργία νέας επαφής"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα SIM ή SD"\n</li></string>
<string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"Δεν υπάρχουν επαφές προς εμφάνιση."\n\n"Για να προσθέσετε επαφές, αγγίξτε το στοιχείο "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και έπειτα:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για να προσθέσετε ή να ρυθμίσετε έναν λογαριασμό με επαφές τις οποίες μπορείτε να συγχρονίσετε με το tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για να δημιουργήσετε μαι νέα επαφή"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα σας SD"\n</li></string>
- <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Δεν υπάρχουν επαφές προς εμφάνιση."\n\n"Για να προσθέσετε επαφές, αγγίξτε το στοιχείο "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και έπειτα:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για να προσθέσετε ή να ρυθμίσετε έναν λογαριασμό με επαφές τις οποίες μπορείτε να συγχρονίσετε με το τηλέφωνο"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για να δημιουργήσετε μαι νέα επαφή"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα σας SD"\n</li></string>
+ <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Δεν υπάρχουν επαφές προς εμφάνιση."\n\n"Για να προσθέσετε επαφές, αγγίξτε το στοιχείο "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και έπειτα:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για να προσθέσετε ή να ρυθμίσετε έναν λογαριασμό με επαφές τις οποίες μπορείτε να συγχρονίσετε με το τηλέφωνο"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για να δημιουργήσετε μαι νέα επαφή"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα SD"\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"Δεν έχετε επαφές προς προβολή. (Αν προσθέσατε κάποιον λογαριασμό μόλις τώρα, θα χρειαστούν λίγα λεπτά έως ότου γίνει ο συγχρονισμός.)"\n\n"Για την προσθήκη επαφών, πατήστε "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και αγγίξτε την επιλογή:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για την προσθήκη ή ρύθμιση λογαριασμού με επαφές τις οποίες μπορείτε να συγχρονίσετε στο tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Προβολή επιλογών"</b></font>", για να αλλάξετε τις επαφές που είναι ορατές"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για δημιουργία νέας επαφής"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα SD"\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"Δεν έχετε επαφές προς προβολή. (Αν προσθέσατε κάποιον λογαριασμό μόλις τώρα, θα χρειαστούν λίγα λεπτά έως ότου γίνει ο συγχρονισμός.)"\n\n"Για την προσθήκη επαφών, πατήστε "<font fgcolor="#ffffffff"><b>"Μενού"</b></font>" και αγγίξτε την επιλογή:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Λογαριασμοί"</b></font>", για την προσθήκη ή ρύθμιση λογαριασμού με επαφές τις οποίες μπορείτε να συγχρονίσετε στο τηλέφωνο"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Προβολή επιλογών"</b></font>", για να αλλάξετε τις επαφές που είναι ορατές"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Νέα επαφή"</b></font>", για δημιουργία νέας επαφής"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Εισαγωγή/Εξαγωγή"</b></font>" για την εισαγωγή επαφών από την κάρτα SD"\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"Δεν έχετε αγαπημένα."\n\n"Για προσθήκη επαφής στη λίστα των αγαπημένων σας:"\n\n" "<li>"Αγγίξτε την καρτέλα "<b>"Επαφές"</b>\n</li>" "\n<li>"Αγγίξτε το όνομα της επαφής που θέλετε να προσθέσετε στα αγαπημένα σας"\n</li>" "\n<li>"Αγγίξτε το αστέρι πλάι στο όνομα της επαφής"\n</li></string>
@@ -268,7 +268,7 @@
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Δεν ήταν δυνατή η έναρξη του εξαγωγέα: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"Προέκυψε κάποιο σφάλμα κατά την εξαγωγή: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"Δεν ήταν δυνατή η λήψη πληροφοριών βάσης δεδομένων."</string>
- <string name="composer_has_no_exportable_contact" product="tablet" msgid="6991449891825077743">"Δεν υπάρχουν επαφές προς εξαγωγή. Αν υπάρχουν επαφές στο tablet σας, ορισμένοι πάροχοι δεδομένων ενδέχεται να μην επιτρέπουν την εξαγωγή επαφών από το tablet."</string>
+ <string name="composer_has_no_exportable_contact" product="tablet" msgid="6991449891825077743">"Δεν υπάρχουν επαφές προς εξαγωγή. Αν υπάρχουν επαφές στο tablet, ορισμένοι πάροχοι δεδομένων ενδέχεται να μην επιτρέπουν την εξαγωγή επαφών από το tablet."</string>
<string name="composer_has_no_exportable_contact" product="default" msgid="3296493229040294335">"Δεν υπάρχουν επαφές προς εξαγωγή. Αν υπάρχουν επαφές στο τηλέφωνό σας, ορισμένοι πάροχοι δεδομένων ενδέχεται να μην επιτρέπουν την εξαγωγή των επαφών από το τηλέφωνο."</string>
<string name="composer_not_initialized" msgid="2321648986367005254">"Η έναρξη της vCard δεν ήταν σωστή."</string>
<string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Δεν ήταν δυνατό το άνοιγμα του αρχείου \"<xliff:g id="FILE_NAME">%s</xliff:g>\": <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
@@ -516,7 +516,7 @@
<string name="call_log_new_header" msgid="846546437517724715">"Νέο"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"Παλαιότερα"</string>
<string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"Αδυναμία σύνδεσης με τον διακομιστή αυτόματου τηλεφωνητή."</string>
- <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Αδύν. η σύνδ. με διακομ. αυτόμ. τηλεφ. Υπάρχ. νέα μην. αυτ. τηλ."</string>
+ <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Αδύν. η σύνδ. με διακομ. αυτόμ. τηλεφ. Υπάρχ. νέα μηνύματα."</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"Ρύθμιση του τηλεφωνητή σας."</string>
<string name="voicemail_status_audio_not_available" msgid="3369618334553341626">"Ο ήχος δεν είναι διαθέσιμος."</string>
<string name="voicemail_status_action_configure" msgid="8671796489912239589">"Ρύθμιση"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 8dbd08b..15799e7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -146,7 +146,7 @@
<string name="recentCalls_trashVoicemail" msgid="7604696960787435655">"Eliminar mensaje de voz"</string>
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Compartir mensaje de voz"</string>
<string name="recentCalls_empty" msgid="247053222448663107">"El registro de llamadas está vacío."</string>
- <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"¿Borrar reg de llam?"</string>
+ <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"¿Borrar registro?"</string>
<string name="clearCallLogConfirmation" msgid="5043563133171583152">"Se eliminarán todos tus registros de llamadas."</string>
<string name="clearCallLogProgress_title" msgid="8365943000154295771">"Borrando registro de llamadas..."</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
@@ -161,14 +161,14 @@
<string name="simContacts_title" msgid="27341688347689769">"Contactos de tarjeta SIM"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"No tienes ningún contacto para mostrar. (Si has agregado una cuenta recientemente, la sincronización de los contactos puede demorar algunos minutos)."</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"No tienes ningún contacto para mostrar."</string>
- <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"No tienes contactos para mostrar."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>" Menú"</b></font>" y luego toca: "\n\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en la tableta"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde de cero"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de la tarjeta SIM o SD"\n</li></string>
+ <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"No tienes contactos para mostrar."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>" Menú"</b></font>", y luego: "\n\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en la tableta"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde de cero"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de la tarjeta SIM o SD"\n</li></string>
<string name="noContactsHelpText" product="default" msgid="4405064135698982080">"No tienes contactos para mostrar."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>" Menú"</b></font>" y luego toca: "\n\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedes sincronizar con el teléfono"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde de cero"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de la tarjeta SIM o SD"\n</li></string>
<string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"No tienes contactos para mostrar. (Si agregaste una cuenta, la sincronización de contactos puede demorar algunos minutos)."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>"Menú"</b></font>", y luego:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en la tableta"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Mostrar opciones"</b></font>" para cambiar los contactos que sean visibles"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde cero"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de tu tarjeta SIM o SD"\n</li></string>
<string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"No tienes contactos para mostrar. (Si agregaste una cuenta, la sincronización de contactos puede demorar algunos minutos)."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>"Menú"</b></font>", y luego:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en el teléfono"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Mostrar opciones"</b></font>" para cambiar los contactos que sean visibles"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde cero"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de tu tarjeta SIM o SD"\n</li></string>
<string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"No tienes contactos para mostrar."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>"Menú"</b></font>", y luego:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en la tableta"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde cero"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de la tarjeta SD"\n</li></string>
- <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"No tienes contactos para mostrar."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>"Menú"</b></font>", y luego toca: "\n\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en el teléfono"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde cero"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de la tarjeta SD"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"No tienes contactos para mostrar. (Si agregaste una cuenta, la sincronización de contactos puede demorar algunos minutos)"\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>"Menú"</b></font>", y luego:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en la tableta"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Mostrar opciones"</b></font>" para cambiar los contactos que sean visibles"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde cero"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de tu tarjeta SD"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"No tienes contactos para mostrar. (Si agregaste una cuenta, la sincronización de contactos puede demorar algunos minutos)."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>"Menú"</b></font>", y luego:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en el teléfono."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Mostrar opciones"</b></font>" para cambiar los contactos que sean visibles."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde cero."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de tu tarjeta SD."\n</li></string>
+ <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"No tienes contactos para mostrar."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>"Menú"</b></font>", y luego: "\n\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en el teléfono"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde cero"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de la tarjeta SD"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"No tienes contactos para mostrar. (Si agregaste una cuenta, la sincronización de contactos puede demorar algunos minutos)."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>"Menú"</b></font>" y luego toca:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en la tableta"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Mostrar opciones"</b></font>" para cambiar los contactos que sean visibles"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde cero"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de tu tarjeta SD"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"No tienes contactos para mostrar. (Si agregaste una cuenta, la sincronización de contactos puede demorar algunos minutos)."\n\n"Para agregar contactos, toca "<font fgcolor="#ffffffff"><b>"Menú"</b></font>", y luego:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Cuentas"</b></font>" para agregar o configurar una cuenta con contactos que puedas sincronizar en el teléfono"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Mostrar opciones"</b></font>" para cambiar los contactos que sean visibles"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Contacto nuevo"</b></font>" para crear un nuevo contacto desde cero"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contactos de tu tarjeta SD"\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"No tienes ningún favorito."\n\n"Para agregar un contacto a tu lista de favoritos:"\n\n<li>"toca la pestaña "<b>"Contactos"</b>" "\n</li>" "\n<li>"toca el contacto que deseas agregar a tus favoritos"\n</li>" "\n<li>"toca el asterisco situado junto al nombre del contacto"\n</li></string>
<string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Usar teclado de tonos del teléfono"</string>
<string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"Regresar a la llamada en curso"</string>
@@ -237,7 +237,7 @@
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="6427931733267328564">"No se pudieron recopilar los metadatos de los archivos vCard proporcionados."</string>
<string name="fail_reason_failed_to_read_files" msgid="5823434810622484922">"No se pudieron importar uno o más archivos (%s)."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Error desconocido"</string>
- <string name="select_vcard_title" msgid="7791371083694672861">"Sel. archivo vCard"</string>
+ <string name="select_vcard_title" msgid="7791371083694672861">"Selec. archivo vCard"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Almacenando en caché"</string>
<string name="caching_vcard_message" msgid="4926308675041506756">"Almacenando vCard(s) en caché local temporal. La importación comenzará pronto."</string>
<string name="progress_notifier_message" msgid="2311011466908220528">"Importando <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
@@ -264,9 +264,9 @@
<string name="exporting_vcard_finished_title" msgid="4767045779458185251">"Finalizó la exportación de <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Se canceló la exportación de <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Exportando datos de contacto"</string>
- <string name="exporting_contact_list_message" msgid="7181663157672374569">"Los datos de tu contacto se están exportando a: <xliff:g id="FILE_NAME">%s</xliff:g>"</string>
+ <string name="exporting_contact_list_message" msgid="7181663157672374569">"Los datos de tu contacto se están exportando a: <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"No se pudo iniciar el exportador: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
- <string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"Se produjo un error durante la exportación: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
+ <string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"Se produjo un error durante la exportación: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"No se pudo obtener la información de la base de datos."</string>
<string name="composer_has_no_exportable_contact" product="tablet" msgid="6991449891825077743">"No hay contactos exportables. Si tienes contactos en la tableta, es posible que algunos proveedores de datos no permitan la exportación de contactos desde la tableta."</string>
<string name="composer_has_no_exportable_contact" product="default" msgid="3296493229040294335">"No hay contactos exportables. Si tienes contactos en el teléfono, es posible que algunos proveedores de datos no permitan la exportación de contactos desde el teléfono."</string>
@@ -516,7 +516,7 @@
<string name="call_log_new_header" msgid="846546437517724715">"Nuevo"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"Más antigua"</string>
<string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"No se puede conectar al servidor del buzón de voz."</string>
- <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"No se establ conex c serv del buzón de vos. Nvos mjes en espera."</string>
+ <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"No se puede conectar al buzón de voz. Nuevos mensajes en espera."</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"Configura tu buzón de voz."</string>
<string name="voicemail_status_audio_not_available" msgid="3369618334553341626">"Audio no disponible"</string>
<string name="voicemail_status_action_configure" msgid="8671796489912239589">"Configurar"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0654a97..087fb7a 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -147,7 +147,7 @@
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Jaga kõneposti"</string>
<string name="recentCalls_empty" msgid="247053222448663107">"Kõnelogi on tühi."</string>
<string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Kustutada kõnelogi?"</string>
- <string name="clearCallLogConfirmation" msgid="5043563133171583152">"Kõik teie kõnesalvestused kustutatakse."</string>
+ <string name="clearCallLogConfirmation" msgid="5043563133171583152">"Kõik teie kõnesalvestised kustutatakse."</string>
<string name="clearCallLogProgress_title" msgid="8365943000154295771">"Kõnelogi kustutamine ..."</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
<string name="meid" msgid="6210568493746275750">"MEID"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ec7ee55..f1254d2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -105,7 +105,7 @@
<string name="contactSavedToast" msgid="7152589189385441091">"مخاطب ذخیره شد."</string>
<string name="contactSavedErrorToast" msgid="3207250533172944892">"تغییرات مخاطب ذخیره نمیشود."</string>
<string name="groupSavedToast" msgid="1168756874239833756">"گروه ذخیره شد."</string>
- <string name="groupSavedErrorToast" msgid="7984466936615304740">"تغییرات گروه ذخیره نمیشود."</string>
+ <string name="groupSavedErrorToast" msgid="7984466936615304740">"ذخیره تغییرات گروه انجام نشد."</string>
<plurals name="listTotalPhoneContacts">
<item quantity="one" msgid="3015357862286673986">"1 مخاطب با شماره تلفن"</item>
<item quantity="other" msgid="3299954047880968205">"<xliff:g id="COUNT">%d</xliff:g> مخاطب دارای شماره تلفن"</item>
@@ -161,14 +161,14 @@
<string name="simContacts_title" msgid="27341688347689769">"مخاطبین سیم کارت"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"شما مخاطبی برای نمایش ندارید. (در صورتی که اکنون یک حساب را اضافه کردید، همگام سازی مخاطبین چند دقیقه طول می کشد.)"</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"شما مخاطبی برای نمایش ندارید."</string>
- <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"شما مخاطبی برای نمایش دادن ندارید."\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با رایانه لوحی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
- <string name="noContactsHelpText" product="default" msgid="4405064135698982080">"شما مخاطبی برای نمایش دادن ندارید."\n\n"برای افزودن مخاطب، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با گوشی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
- <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"شما مخاطبی برای نمایش ندارید. (در صورتی که اکنون یک حساب اضافه کردهاید، همگامسازی مخاطبین چند دقیقه طول میکشد.)"\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را فشار داده و این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا پیکربندی یک حساب با مخاطبینی که میتوانید در رایانه لوحی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"گزینههای نمایش"</b></font>" برای تغییر مخاطبینی که قابل مشاهده هستند"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
- <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"شما مخاطبی برای نمایش ندارید. (در صورتی که اکنون یک حساب اضافه کردهاید، همگامسازی مخاطبین چند دقیقه طول میکشد.)"\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را فشار داده و این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با گوشی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"گزینههای نمایش"</b></font>" برای تغییر مخاطبینی که قابل مشاهده هستند"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
- <string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"شما مخاطبی برای نمایش دادن ندارید."\n\n"برای افزودن مخاطب، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با رایانه لوحی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
- <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"شما مخاطبی برای نمایش دادن ندارید."\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با گوشی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از کارت SD شما"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"شما مخاطبی برای نمایش ندارید. (در صورتی که اکنون یک حساب اضافه کردهاید، همگامسازی مخاطبین چند دقیقه طول میکشد.)"\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را فشار داده و این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا پیکربندی یک حساب با مخاطبینی که میتوانید در رایانه لوحی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"گزینههای نمایش"</b></font>" برای تغییر مخاطبینی که قابل مشاهده هستند"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از کارت SD شما"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"شما مخاطبی برای نمایش ندارید. (در صورتی که اکنون یک حساب اضافه کردهاید، همگامسازی مخاطبین چند دقیقه طول میکشد.)"\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را فشار داده و این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با گوشی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"گزینههای نمایش"</b></font>" برای تغییر مخاطبینی که قابل مشاهده هستند"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از کارت SD شما"\n</li></string>
+ <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"شما مخاطبی برای نمایش ندارید."\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با رایانه لوحی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
+ <string name="noContactsHelpText" product="default" msgid="4405064135698982080">"شما مخاطبی برای نمایش ندارید."\n\n"برای افزودن مخاطب، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با گوشی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"شما مخاطبی برای نمایش ندارید. (در صورتی که اکنون یک حساب اضافه کردهاید، همگامسازی مخاطبین چند دقیقه طول میکشد.)"\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمی کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا پیکربندی یک حساب با مخاطبینی که میتوانید در رایانه لوحی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"گزینههای نمایش"</b></font>" برای تغییر مخاطبینی که قابل مشاهده هستند"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"شما مخاطبی برای نمایش ندارید. (در صورتی که اکنون یک حساب اضافه کردهاید، همگامسازی مخاطبین چند دقیقه طول میکشد.)"\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با گوشی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"گزینههای نمایش"</b></font>" برای تغییر مخاطبینی که قابل مشاهده هستند"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
+ <string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"شما مخاطبی برای نمایش ندارید."\n\n"برای افزودن مخاطب، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با رایانه لوحی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از سیم کارت یا کارت SD شما"\n</li></string>
+ <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"شما مخاطبی برای نمایش ندارید."\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با گوشی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از کارت SD شما"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"شما مخاطبی برای نمایش ندارید. (در صورتی که اکنون یک حساب اضافه کردهاید، همگامسازی مخاطبین چند دقیقه طول میکشد.)"\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا پیکربندی یک حساب با مخاطبینی که میتوانید در رایانه لوحی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"گزینههای نمایش"</b></font>" برای تغییر مخاطبینی که قابل مشاهده هستند"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از کارت SD شما"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"شما مخاطبی برای نمایش ندارید. (در صورتی که اکنون یک حساب اضافه کردهاید، همگامسازی مخاطبین چند دقیقه طول میکشد.)"\n\n"برای افزودن مخاطبین، "<font fgcolor="#ffffffff"><b>"منو"</b></font>" را لمس کرده و سپس این موارد را لمس کنید:"\n" "\n<li><font fgcolor="#ffffffff"><b>"حسابها"</b></font>" برای افزودن یا تنظیم یک حساب با مخاطبینی که میتوانید با گوشی همگامسازی کنید"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"گزینههای نمایش"</b></font>" برای تغییر مخاطبینی که قابل مشاهده هستند"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"مخاطب جدید"</b></font>" برای ایجاد یک مخاطب جدید از ابتدا"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"وارد کردن/صادر کردن"</b></font>" برای وارد کردن مخاطبین از کارت SD شما"\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"شما هیچ مورد دلخواهی ندارید."\n\n"برای افزودن یک مخاطب به لیست موارد دلخواه خود: "\n\n" "<li>"برگه "<b>"مخاطبین"</b>\n</li>" را لمس کنید"\n<li>"مخاطبی را که می خواهید به لیست موارد دلخواه خود اضافه کنید لمس کنید"\n</li>" "\n<li>"ستاره واقع در کنار نام مخاطب را لمس کنید"\n</li></string>
<string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"استفاده از صفحه کلید لمسی"</string>
<string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"برگشت به تماس در حال انجام"</string>
@@ -229,11 +229,11 @@
<string name="scanning_sdcard_failed_message" product="default" msgid="189023067829510792">"کارت SD نمیتواند بررسی شود. (علت: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")"</string>
<string name="fail_reason_io_error" msgid="6748358842976073255">"خطای ورودی/خروجی"</string>
<string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"حافظه کافی نیست. ممکن است فایل بسیار بزرگ باشد."</string>
- <string name="fail_reason_vcard_parse_error" msgid="888263542360355784">"تفسیر کارت ویزیت به دلیل پیش بینی نشدهای ممکن نیست."</string>
+ <string name="fail_reason_vcard_parse_error" msgid="888263542360355784">"تفسیر کارت ویزیت به دلیل پیشبینی نشدهای ممکن نیست."</string>
<string name="fail_reason_not_supported" msgid="8219562769267148825">"قالب پشتیبانی نمیشود."</string>
- <string name="vcard_import_failed" msgid="5223531255894842406">"وارد کردن کارت ویزیت ممکن نیست."</string>
- <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"فایل کارت ویزیت در حافظه یافت نشد."</string>
- <string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"فایل کارت ویزیتی در کارت SD یافت نشد."</string>
+ <string name="vcard_import_failed" msgid="5223531255894842406">"وارد کردن کارت ویزیت انجام نشد."</string>
+ <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"هیچ فایل کارت ویزیتی در حافظه یافت نشد."</string>
+ <string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"هیچ فایل کارت ویزیتی در کارت SD یافت نشد."</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="6427931733267328564">"نمیتوان اطلاعات متای فایل کارت ویزیت داده شده را جمعآوری کرد."</string>
<string name="fail_reason_failed_to_read_files" msgid="5823434810622484922">"نمیتوان یک یا چند فایل را وارد کرد (%s)."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"خطای ناشناخته."</string>
@@ -269,14 +269,14 @@
<string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"خطایی در هنگام صادر کردن روی داد: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\""</string>
<string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"نمیتوان اطلاعات پایگاه داده را دریافت کرد."</string>
<string name="composer_has_no_exportable_contact" product="tablet" msgid="6991449891825077743">"مخاطب قابل صدوری وجود ندارد. اگر بر روی رایانه لوحی خود مخاطبینی دارید، بعضی از ارائهدهندگان داده ممکن است اجازه ندهند مخاطبین از رایانه لوحی صادر شوند."</string>
- <string name="composer_has_no_exportable_contact" product="default" msgid="3296493229040294335">"هیچ مخاطب قابل صادر کردنی وجود ندارد. اگر در گوشی خود مخاطبینی دارید، بعضی از ارائهدهندگان داده ممکن است اجازه ندهند تا مخاطبین از گوشی صادر شوند."</string>
+ <string name="composer_has_no_exportable_contact" product="default" msgid="3296493229040294335">"هیچ مخاطب قابل صدوری وجود ندارد. اگر در گوشی خود مخاطبینی دارید، بعضی از ارائهدهندگان داده ممکن است اجازه ندهند تا مخاطبین از گوشی صادر شوند."</string>
<string name="composer_not_initialized" msgid="2321648986367005254">"سازنده فایل کارت ویزیت به درستی اجرا نشد."</string>
<string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"\"<xliff:g id="FILE_NAME">%s</xliff:g>\" باز نشد: <xliff:g id="EXACT_REASON">%s</xliff:g>."</string>
<string name="exporting_contact_list_progress" msgid="560522409559101193">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g> از <xliff:g id="TOTAL_NUMBER">%s</xliff:g> مخاطب"</string>
<string name="cancel_import_confirmation_title" msgid="5578683596010294836">"لغو وارد کردن کارت ویزیت"</string>
<string name="cancel_import_confirmation_message" msgid="3929951040347726757">"وارد کردن <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string>
<string name="cancel_export_confirmation_title" msgid="6516467140276768528">"لغو صادر کردن کارت ویزیت"</string>
- <string name="cancel_export_confirmation_message" msgid="1995462401949262638">"صادر کردن به <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string>
+ <string name="cancel_export_confirmation_message" msgid="1995462401949262638">"صادر کردن <xliff:g id="FILENAME">%s</xliff:g> لغو شود؟"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"نمیتوان وارد کردن/ صادر کردن کارت ویزیت را لغو کرد"</string>
<string name="search_settings_description" msgid="2675223022992445813">"نام های مخاطبین شما"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"افزودن یک مکث 2 ثانیه ای"</string>
@@ -285,7 +285,7 @@
<string name="call_settings" msgid="7666474782093693667">"تنظیمات"</string>
<string name="sms_disambig_title" msgid="4675399294513152364">"ارسال متن با استفاده از"</string>
<string name="make_primary" msgid="5829291915305113983">"این گزینه را به خاطر بسپار"</string>
- <string name="quickcontact_missing_app" msgid="358168575340921552">"برنامهای برای انجام این عملکرد موجود نیست."</string>
+ <string name="quickcontact_missing_app" msgid="358168575340921552">"برنامهای برای انجام این عملکرد یافت نشد."</string>
<string name="missing_name" msgid="8745511583852904385">"(بدون نام)"</string>
<string name="menu_accounts" msgid="8499114602017077970">"حسابها"</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"مخاطبین جهت نمایش"</string>
@@ -515,7 +515,7 @@
<string name="voicemail_fetching_timout" msgid="6691792377574905201">"واکشی پست صوتی ممکن نیست."</string>
<string name="call_log_new_header" msgid="846546437517724715">"جدید"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"قدیمیتر"</string>
- <string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"اتصال به سرور پست صوتی امکان پذیر نیست."</string>
+ <string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"اتصال به سرور پست صوتی امکانپذیر نیست."</string>
<string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"اتصال به سرور پست صوتی امکان پذیر نیست. پستهای صوتی جدید در انتظارند."</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"پست صوتی خود را تنظیم کنید."</string>
<string name="voicemail_status_audio_not_available" msgid="3369618334553341626">"صدا موجود نیست."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 8227ee7..0fefde3 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -290,7 +290,7 @@
<string name="menu_accounts" msgid="8499114602017077970">"Comptes"</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"Contacts à afficher"</string>
<string name="menu_import_export" msgid="26217871113229507">"Importer/Exporter"</string>
- <string name="dialog_import_export" msgid="4360648034889921624">"Importer/Exporter contacts"</string>
+ <string name="dialog_import_export" msgid="4360648034889921624">"Import/Export contacts"</string>
<string name="menu_share" msgid="943789700636542260">"Partager"</string>
<string name="menu_all_contacts" msgid="5101735431586050711">"Tous les contacts"</string>
<string name="share_via" msgid="563121028023030093">"Partager contact via"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 355a248..9a3e819 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -163,12 +163,12 @@
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"प्रदर्शन के लिए आपके पास कोई भी संपर्क नहीं है."</string>
<string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है."\n\n"संपर्क जोड़ने के लिए "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप टेबलेट पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SIM या SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
<string name="noContactsHelpText" product="default" msgid="4405064135698982080">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है."\n\n"संपर्क जोड़ने के लिए, "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप फ़ोन पर समन्वयित कर सकें"\n</li>" प्रारंभ से कोई नया संपर्क बनाने के लिए"\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" स्पर्श करें"\n</li>" अपने SIM या SD कार्ड से संपर्क आयात करने के लिए"\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" स्पर्श करें"\n</li></string>
- <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है. (यदि आपने अभी-अभी कोई खाता जोड़ा है, तो संपर्कों को समन्वयित करने में, उसे कुछ मिनट लग सकते हैं.)"\n\n"संपर्क जोड़ने के लिए "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप टेबलेट पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"प्रदर्शन विकल्प"</b></font>" को यह बदलने के लिए स्पर्श करें कि कौन से संपर्क दृश्यमान हैं"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SIM या SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
- <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है. (यदि आपने अभी-अभी कोई खाता जोड़ा है, तो संपर्कों को समन्वयित करने में, उसे कुछ मिनट लग सकते हैं.)"\n\n"संपर्क जोड़ने के लिए "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप फ़ोन पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"प्रदर्शन विकल्प"</b></font>" को यह बदलने के लिए स्पर्श करें कि कौन से संपर्क दृश्यमान हैं"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SIM या SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है. (यदि आपने अभी-अभी कोई खाता जोड़ा है, तो संपर्कों को समन्वयित करने में, उसे कुछ मिनट लग सकते हैं.)"\n\n"संपर्क जोड़ने के लिए "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप टेबलेट पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"प्रदर्शन विकल्प"</b></font>" को यह बदलने के लिए स्पर्श करें कि कौन से संपर्क दृश्यमान हों"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SIM या SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है. (यदि आपने अभी-अभी कोई खाता जोड़ा है, तो संपर्कों को समन्वयित करने में, उसे कुछ मिनट लग सकते हैं.)"\n\n"संपर्क जोड़ने के लिए "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप फ़ोन पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"प्रदर्शन विकल्प"</b></font>" को यह बदलने के लिए स्पर्श करें कि कौन से संपर्क दृश्यमान हों"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SIM या SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
<string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है."\n\n"संपर्क जोड़ने के लिए "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप टेबलेट पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
<string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है."\n\n"संपर्क जोड़ने के लिए, "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप फ़ोन पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है. (यदि आपने अभी-अभी कोई खाता जोड़ा है, तो संपर्कों को समन्वयित करने में, उसे कुछ मिनट लग सकते हैं.)"\n\n"संपर्क जोड़ने के लिए, "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप टेबलेट पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"प्रदर्शन विकल्प"</b></font>" को यह बदलने के लिए स्पर्श करें कि कौन से संपर्क दृश्यमान हैं"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है. (यदि आपने अभी-अभी कोई खाता जोड़ा है, तो संपर्कों को समन्वयित करने में, उसे कुछ मिनट लग सकते हैं.)"\n\n"संपर्क जोड़ने के लिए "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप फ़ोन पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"प्रदर्शन विकल्प"</b></font>" को यह बदलने के लिए स्पर्श करें कौन से संपर्क दृश्यमान हैं"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है. (यदि आपने अभी-अभी कोई खाता जोड़ा है, तो संपर्कों को समन्वयित करने में उसे कुछ मिनट लग सकते हैं.)"\n\n"संपर्क जोड़ने के लिए, "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप टेबलेट पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"प्रदर्शन विकल्प"</b></font>" को यह बदलने के लिए स्पर्श करें कि कौन से संपर्क दृश्यमान हों"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"आपके पास प्रदर्शित करने के लिए कोई संपर्क नहीं है. (यदि आपने अभी-अभी कोई खाता जोड़ा है, तो संपर्कों को समन्वयित करने में, उसे कुछ मिनट लग सकते हैं.)"\n\n"संपर्क जोड़ने के लिए "<font fgcolor="#ffffffff"><b>"मेनू"</b></font>" स्पर्श करें, फिर उन संपर्कों के साथ कोई खाता जोड़ने या सेट करने के लिए:"\n" "\n<li><font fgcolor="#ffffffff"><b>"खाते"</b></font>" स्पर्श करें जिन्हें आप फ़ोन पर समन्वयित कर सकें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"प्रदर्शन विकल्प"</b></font>" को यह बदलने के लिए स्पर्श करें कौन से संपर्क दृश्यमान हों"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"नया संपर्क"</b></font>" को प्रारंभ से कोई नया संपर्क बनाने के लिए स्पर्श करें"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"आयात/निर्यात"</b></font>" को अपने SD कार्ड से संपर्क आयात करने के लिए स्पर्श करें"\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"आपके पास कोई भी पसंदीदा नहीं है."\n\n"अपने पसंदीदा की सूची में कोई संपर्क जोड़ने के लिए:"\n\n" "<li>" "<b>"संपर्क"</b>" टैब स्पर्श करें"\n</li>" "\n<li>"उस संपर्क को स्पर्श करें जिसे आप अपने पसंदीदा में जोड़ना चाहते हैं"\n</li>" "\n<li>"संपर्क के नाम के पास वाले तारे को स्पर्श करें"\n</li></string>
<string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"टच टोन कीपैड का उपयोग करें"</string>
<string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"कॉल पर लौटना प्रगति पर है"</string>
@@ -450,7 +450,7 @@
<string name="contact_directory_description" msgid="683398073603909119">"निर्देशिका <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="directory_search_label" msgid="1887759056597975053">"निर्देशिका"</string>
<string name="local_search_label" msgid="2551177578246113614">"सभी संपर्क"</string>
- <string name="toast_making_personal_copy" msgid="288549957278065542">"कोई व्यक्तिगत प्रतिलिपि बना रहा है…"</string>
+ <string name="toast_making_personal_copy" msgid="288549957278065542">"एक व्यक्तिगत प्रतिलिपि बना रहा है…"</string>
<string name="list_filter_all_accounts" msgid="8908683398914322369">"सभी संपर्क"</string>
<string name="list_filter_all_starred" msgid="5031734941601931356">"तारांकित"</string>
<string name="list_filter_custom" msgid="8910173055702057002">"कस्टम"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 21785fa..da85680 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -65,7 +65,7 @@
<string name="deleteConfirmation_title" msgid="1418215926447642260">"Izbrisati kontakt?"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Postavi zvuk zvona"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Svi pozivi na govornu poštu"</string>
- <string name="readOnlyContactWarning" msgid="7808825687289848259">"Ne možete izbrisati kontakte s računa samo za čitanje, ali ih možete sakriti na svojim popisima kontakata."</string>
+ <string name="readOnlyContactWarning" msgid="7808825687289848259">"Ne možete izbrisati kontakte s računa samo za čitanje, ali možete ih sakriti na svojim popisima kontakata."</string>
<string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"Ovaj kontakt sadrži informacije iz više računa. Informacije iz računa koji su samo za čitanje bit će skrivene na popise kontakata, a ne izbrisane."</string>
<string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"Brisanjem ovog kontakta izbrisat ćete podatke s više računa."</string>
<string name="deleteConfirmation" msgid="811706994761610640">"Ovaj će kontakt biti izbrisan."</string>
@@ -243,14 +243,14 @@
<string name="progress_notifier_message" msgid="2311011466908220528">"Uvoz <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="importing_vcard_description" msgid="4245275224298571351">"Uvoz <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="reading_vcard_failed_title" msgid="4251647443358422855">"Čitanje podataka vCarda nije uspjelo"</string>
- <string name="reading_vcard_canceled_title" msgid="1925216585981542019">"Čitanje podataka vCard je otkazano"</string>
+ <string name="reading_vcard_canceled_title" msgid="1925216585981542019">"Čitanje podataka vCard otkazano je"</string>
<string name="importing_vcard_finished_title" msgid="3341541727268747967">"Završetak uvoza kartice vCard <xliff:g id="FILENAME">%s</xliff:g>"</string>
- <string name="importing_vcard_canceled_title" msgid="2147475978165599336">"Uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je otkazan"</string>
+ <string name="importing_vcard_canceled_title" msgid="2147475978165599336">"Uvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> otkazan je"</string>
<string name="vcard_import_will_start_message" msgid="2804911199145873396">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> uskoro će biti uvezena."</string>
<string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"Datoteka će uskoro biti uvezena."</string>
- <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"Zahtjev za uvoz formata vCard je odbijen. Pokušajte ponovo kasnije."</string>
+ <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"Zahtjev za uvoz formata vCard odbijen je. Pokušajte ponovo kasnije."</string>
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Datoteka <xliff:g id="FILENAME">%s</xliff:g> uskoro će biti izvezena."</string>
- <string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Zahtjev za izvoz formata vCard je odbijen. Pokušajte ponovo kasnije."</string>
+ <string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Zahtjev za izvoz formata vCard odbijen je. Pokušajte ponovo kasnije."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Izvesti kontakte?"</string>
@@ -260,13 +260,13 @@
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Nema kontakata koji se mogu izvoziti."</string>
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="590645599157376285">"Previše je vCard datoteka u pohrani."</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="4887177369627277474">"Previše vCard datoteka na SD kartici."</string>
- <string name="fail_reason_too_long_filename" msgid="3393764245254738333">"Obavezan naziv datoteke je predug (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
+ <string name="fail_reason_too_long_filename" msgid="3393764245254738333">"Obavezan naziv datoteke predug je (\"<xliff:g id="FILENAME">%s</xliff:g>\")."</string>
<string name="exporting_vcard_finished_title" msgid="4767045779458185251">"Završetak izvoza datoteke <xliff:g id="FILENAME">%s</xliff:g>."</string>
- <string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> je otkazan."</string>
+ <string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Izvoz datoteke <xliff:g id="FILENAME">%s</xliff:g> otkazan je."</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Izvoz podataka o kontaktu"</string>
<string name="exporting_contact_list_message" msgid="7181663157672374569">"Vaši podaci o kontaktu izvoze se u datoteku <xliff:g id="FILE_NAME">%s</xliff:g>."</string>
<string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Alat za izvoz ne može se pokrenuti; razlog: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
- <string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"Tijekom izvoza došlo je do pogreške radi: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
+ <string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"Tijekom izvoza došlo je do pogreške zbog: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\"."</string>
<string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"Dohvaćanje podataka iz baze podataka nije uspjelo."</string>
<string name="composer_has_no_exportable_contact" product="tablet" msgid="6991449891825077743">"Nema kontakata koji se mogu izvoziti. Ako na svojem tabletnom računalu imate kontakte, neki davatelji podataka možda ne dopuštaju izvoz kontakata s tog tabletnog računala."</string>
<string name="composer_has_no_exportable_contact" product="default" msgid="3296493229040294335">"Nema kontakata koji se mogu izvoziti. Ako na svojem telefonu imate kontakte, neki davatelji podataka možda ne dopuštaju izvoz kontakata s tog telefona."</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 0b4273b..0f99b0f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -53,7 +53,7 @@
<string name="menu_deleteGroup" msgid="3486380004411482874">"Törlés"</string>
<string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Új"</string>
<string name="menu_new_group_action_bar" msgid="5055346725617932394">"Új"</string>
- <string name="splitConfirmation_title" msgid="633640935430370530">"Névjegy szétvál.?"</string>
+ <string name="splitConfirmation_title" msgid="633640935430370530">"Szétválasztja?"</string>
<string name="splitConfirmation" msgid="740190210499587175">"Ezt a névjegyet több névjegyre osztja."</string>
<string name="menu_joinAggregate" msgid="5027981918265667970">"Összekapcsolás"</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Névjegyek összekapcsolása"</string>
@@ -62,7 +62,7 @@
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Javasolt névjegyek"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Összes névjegy"</string>
<string name="contactsJoinedMessage" msgid="7208148163607047389">"A névjegyek összekapcsolása megtörtént"</string>
- <string name="deleteConfirmation_title" msgid="1418215926447642260">"Névjegy törlése?"</string>
+ <string name="deleteConfirmation_title" msgid="1418215926447642260">"Törli a névjegyet?"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Csengőhang"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Minden hívás a hangpostára"</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Írásvédett fiókból nem törölhet névjegyet, de saját címtárában elrejtheti azokat."</string>
@@ -76,7 +76,7 @@
<string name="label_sip_address" msgid="124073911714324974">"Internetes hívás"</string>
<string name="ghostData_company" msgid="5414421120553765775">"Cég"</string>
<string name="ghostData_title" msgid="7496735200318496110">"Beosztás"</string>
- <string name="invalidContactMessage" msgid="8215051456181842274">"A kapcsolat nem létezik."</string>
+ <string name="invalidContactMessage" msgid="8215051456181842274">"A névjegy nem létezik."</string>
<string name="pickerNewContactHeader" msgid="7750705279843568147">"Új névjegy létrehozása"</string>
<string name="pickerNewContactText" msgid="6166997164401048211">"Új névjegy létrehozása"</string>
<string name="phoneLabelsGroup" msgid="6468091477851199285">"Telefon"</string>
@@ -146,8 +146,8 @@
<string name="recentCalls_trashVoicemail" msgid="7604696960787435655">"Hangposta törlése"</string>
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Hangposta megosztása"</string>
<string name="recentCalls_empty" msgid="247053222448663107">"A híváslista üres."</string>
- <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Híváslista törlése?"</string>
- <string name="clearCallLogConfirmation" msgid="5043563133171583152">"Minden telefonhívás törlődik."</string>
+ <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Törli a híváslistát?"</string>
+ <string name="clearCallLogConfirmation" msgid="5043563133171583152">"Minden telefonhívás törlésre kerül."</string>
<string name="clearCallLogProgress_title" msgid="8365943000154295771">"Híváslista törlése..."</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
<string name="meid" msgid="6210568493746275750">"MEID"</string>
@@ -253,7 +253,7 @@
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"A vCard-exportálási kérelem elutasítva. Próbálja újra később."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kapcsolat"</string>
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
- <string name="confirm_export_title" msgid="6834385377255286349">"Névj. exportálása?"</string>
+ <string name="confirm_export_title" msgid="6834385377255286349">"Exportálni szeretné?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"A névjegyek listájának exportálása a(z) <xliff:g id="VCARD_FILENAME">%s</xliff:g> fájlba."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Sikertelen export"</string>
<string name="exporting_contact_failed_message" msgid="4938527850142003141">"Nem sikerült a névjegyadatok exportálása."\n"Ok: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
@@ -483,7 +483,7 @@
<item quantity="one" msgid="2944819210288517794">"1 csoport"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> csoport"</item>
</plurals>
- <string name="delete_group_dialog_message" msgid="7586856514337560529">"Törli a következő csoportot \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\"? (Maguk a névjegyek nem törlődnek.)"</string>
+ <string name="delete_group_dialog_message" msgid="7586856514337560529">"Törli a következő csoportot \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\"? (Maguk a névjegyek nem kerülnek törlésre.)"</string>
<plurals name="num_contacts_in_group">
<item quantity="one" msgid="1352418549951013448">"<xliff:g id="COUNT_0">%1$d</xliff:g> személy ebben: <xliff:g id="ACCOUNT_TYPE">%2$s</xliff:g>"</item>
<item quantity="other" msgid="8146027769011086349">"<xliff:g id="COUNT_0">%1$d</xliff:g> személy ebben: <xliff:g id="ACCOUNT_TYPE">%2$s</xliff:g>"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 468a802..32b8522 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -146,7 +146,7 @@
<string name="recentCalls_trashVoicemail" msgid="7604696960787435655">"Elimina messaggio vocale"</string>
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Condividi messaggio vocale"</string>
<string name="recentCalls_empty" msgid="247053222448663107">"Il registro chiamate è vuoto."</string>
- <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Cancellare reg. chiamate?"</string>
+ <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Cancellare registro?"</string>
<string name="clearCallLogConfirmation" msgid="5043563133171583152">"Tutte le voci nel registro chiamate verranno eliminate."</string>
<string name="clearCallLogProgress_title" msgid="8365943000154295771">"Cancellazione registro chiamate..."</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
@@ -516,7 +516,7 @@
<string name="call_log_new_header" msgid="846546437517724715">"Nuovi"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"Precedenti"</string>
<string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"Impossibile collegarsi al server della segreteria."</string>
- <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Impossibile collegarsi a server segret. Nuovi msg vocali in attesa."</string>
+ <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Impossibile collegarsi al server. Nuovi mess. vocali in attesa."</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"Imposta la tua segreteria."</string>
<string name="voicemail_status_audio_not_available" msgid="3369618334553341626">"Audio non disponibile."</string>
<string name="voicemail_status_action_configure" msgid="8671796489912239589">"Imposta"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index a70a62c..a96f32c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -280,7 +280,7 @@
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"vCardインポート/エクスポート取り消し不可"</string>
<string name="search_settings_description" msgid="2675223022992445813">"連絡先の名前"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"2秒間の停止を追加"</string>
- <string name="add_wait" msgid="3360818652790319634">"着信を追加"</string>
+ <string name="add_wait" msgid="3360818652790319634">"待機を追加"</string>
<string name="call_disambig_title" msgid="1911302597959335178">"使用している発信"</string>
<string name="call_settings" msgid="7666474782093693667">"設定"</string>
<string name="sms_disambig_title" msgid="4675399294513152364">"使用しているSMS"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a1fb2f3..ebe4909 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -225,7 +225,7 @@
<string name="searching_vcard_message" product="default" msgid="3962269894118092049">"SD 카드의 vCard 데이터 검색 중..."</string>
<string name="scanning_sdcard_failed_title" product="nosdcard" msgid="4944932641334764942">"저장소를 검색하지 못했습니다."</string>
<string name="scanning_sdcard_failed_title" product="default" msgid="6664940444476572612">"SD 카드를 검색하지 못했습니다."</string>
- <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="7221682312959229201">"저장공간을 검색할 수 없습니다(이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')."</string>
+ <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="7221682312959229201">"저장소를 검색할 수 없습니다(이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')."</string>
<string name="scanning_sdcard_failed_message" product="default" msgid="189023067829510792">"SD 카드를 검색할 수 없습니다(이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')."</string>
<string name="fail_reason_io_error" msgid="6748358842976073255">"I/O 오류"</string>
<string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"메모리가 부족합니다. 파일이 너무 크기 때문일 수 있습니다."</string>
@@ -239,7 +239,7 @@
<string name="fail_reason_unknown" msgid="1714092345030570863">"알 수 없는 오류입니다."</string>
<string name="select_vcard_title" msgid="7791371083694672861">"vCard 파일 선택"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"캐시"</string>
- <string name="caching_vcard_message" msgid="4926308675041506756">"vCard를 로컬 임시 저장공간에 캐시하는 중입니다. 곧 실제 가져오기가 시작됩니다."</string>
+ <string name="caching_vcard_message" msgid="4926308675041506756">"vCard를 로컬 임시 저장공간에 캐시하는 중입니다. 곧 가져오기가 시작됩니다."</string>
<string name="progress_notifier_message" msgid="2311011466908220528">"<xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g> 가져오는 중: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="importing_vcard_description" msgid="4245275224298571351">"<xliff:g id="NAME">%s</xliff:g> 가져오는 중"</string>
<string name="reading_vcard_failed_title" msgid="4251647443358422855">"vCard 데이터를 읽지 못했습니다."</string>
@@ -255,7 +255,7 @@
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"주소록을 내보내시겠습니까?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"연락처 목록을 <xliff:g id="VCARD_FILENAME">%s</xliff:g> 파일로 내보냅니다."</string>
- <string name="exporting_contact_failed_title" msgid="4892358112409576342">"내보내지 못함"</string>
+ <string name="exporting_contact_failed_title" msgid="4892358112409576342">"내보내기 실패"</string>
<string name="exporting_contact_failed_message" msgid="4938527850142003141">"주소록 데이터를 내보내지 못했습니다."\n"(이유: \'<xliff:g id="FAIL_REASON">%s</xliff:g>\')"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"내보낼 수 있는 연락처가 없습니다."</string>
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="590645599157376285">"저장공간에 vCard 파일이 너무 많습니다."</string>
@@ -418,7 +418,7 @@
<string name="pick_new_photo" msgid="7962368009197147617">"갤러리에서 새 사진 선택"</string>
<string name="locale_change_in_progress" msgid="7583992153091537467">"변경된 언어를 반영하도록 주소록을 업데이트하는 중입니다. 잠시 기다려 주세요."</string>
<string name="upgrade_in_progress" msgid="474511436863451061">"주소록을 업데이트하고 있습니다."</string>
- <string name="upgrade_out_of_memory" msgid="1209994418877625940">"주소록을 업그레이드하는 중입니다. "\n\n"업그레이드 프로세스에는 약 <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g>MB의 내부 저장공간이 필요합니다."\n\n"다음 옵션 중 하나를 선택하세요."</string>
+ <string name="upgrade_out_of_memory" msgid="1209994418877625940">"주소록을 업그레이드하는 중입니다. "\n\n"업그레이드 하려면 약 <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g>MB의 내부 저장공간이 필요합니다."\n\n"다음 옵션 중 하나를 선택하세요."</string>
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"일부 애플리케이션 제거"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"업그레이드 다시 시도"</string>
<string name="search_results_searching" msgid="3984833028938569930">"검색 중…"</string>
@@ -483,7 +483,7 @@
<item quantity="one" msgid="2944819210288517794">"그룹 1개"</item>
<item quantity="other" msgid="1276758425904917367">"그룹 <xliff:g id="COUNT">%0$d</xliff:g>개"</item>
</plurals>
- <string name="delete_group_dialog_message" msgid="7586856514337560529">"\'<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\' 그룹을 삭제하시겠습니까(주소록은 삭제되지 않음)?"</string>
+ <string name="delete_group_dialog_message" msgid="7586856514337560529">"\'<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\' 그룹을 삭제하시겠습니까? (연락처는 삭제되지 않음)"</string>
<plurals name="num_contacts_in_group">
<item quantity="one" msgid="1352418549951013448">"<xliff:g id="ACCOUNT_TYPE">%2$s</xliff:g> 소속(<xliff:g id="COUNT_0">%1$d</xliff:g>명)"</item>
<item quantity="other" msgid="8146027769011086349">"<xliff:g id="ACCOUNT_TYPE">%2$s</xliff:g> 소속(<xliff:g id="COUNT_0">%1$d</xliff:g>명)"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 4d78f36..0145168 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -231,15 +231,15 @@
<string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"Nepakanka atminties. Gali būti, kad failas per didelis."</string>
<string name="fail_reason_vcard_parse_error" msgid="888263542360355784">"Dėl netikėtos priežasties nepavyko išanalizuoti el. vizitinės kortelės."</string>
<string name="fail_reason_not_supported" msgid="8219562769267148825">"Formatas nepalaikomas."</string>
- <string name="vcard_import_failed" msgid="5223531255894842406">"Nepavyko importuoti el. vizitinės kortelės."</string>
+ <string name="vcard_import_failed" msgid="5223531255894842406">"Nepavyko importuoti el. vizit. kortelės."</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"Atmintinėje nerasta jokių el. vizitinių kortelių failų."</string>
<string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"SD kortelėje nerasta jokių el. vizitinių kortelių failų."</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="6427931733267328564">"Nepavyko surinkti pateikto (-ų) „vCard“ failo (-ų) metainformacijos."</string>
<string name="fail_reason_failed_to_read_files" msgid="5823434810622484922">"Nepavyko importuoti vieno ar daugiau failų (%s)."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Nežinoma klaida."</string>
- <string name="select_vcard_title" msgid="7791371083694672861">"Pasirinkti el. vizitinės kortelės failą"</string>
+ <string name="select_vcard_title" msgid="7791371083694672861">"Rink. el. v. k. failą"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Dedama į talpyklą…"</string>
- <string name="caching_vcard_message" msgid="4926308675041506756">"El. vizitinė (-ės) kortelė (-ės) padedama (-os) į vietinę laikinąją atmintinę. Netrukus bus pradėtas tikrasis eksportavimas."</string>
+ <string name="caching_vcard_message" msgid="4926308675041506756">"El. vizitinė (-ės) kortelė (-ės) padedama (-os) į vietinę laikinąją atmintinę. Netrukus bus pradėtas tikrasis importavimas."</string>
<string name="progress_notifier_message" msgid="2311011466908220528">"Importuojama <xliff:g id="CURRENT_NUMBER">%s</xliff:g> / <xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="importing_vcard_description" msgid="4245275224298571351">"Importuojama <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="reading_vcard_failed_title" msgid="4251647443358422855">"Nepavyko nuskaityti „vCard“ duomenų"</string>
@@ -248,7 +248,7 @@
<string name="importing_vcard_canceled_title" msgid="2147475978165599336">"Atšauktas <xliff:g id="FILENAME">%s</xliff:g> importavimas"</string>
<string name="vcard_import_will_start_message" msgid="2804911199145873396">"<xliff:g id="FILENAME">%s</xliff:g> bus netrukus importuotas."</string>
<string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"Failas bus netrukus importuotas."</string>
- <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"El. vizitinės kortelės importavimo užklausa buvo atmesta. Bandykite vėliau."</string>
+ <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"El. vizitinės kortelės importavimo užklausa atmesta. Bandykite vėliau."</string>
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> bus netrukus eksportuotas."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"El. vizitinės kortelės eksportavimo užklausa buvo atmesta. Bandykite vėliau."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontaktas"</string>
@@ -290,7 +290,7 @@
<string name="menu_accounts" msgid="8499114602017077970">"Paskyros"</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"Pateiktini kontaktai"</string>
<string name="menu_import_export" msgid="26217871113229507">"Importuoti / eksportuoti"</string>
- <string name="dialog_import_export" msgid="4360648034889921624">"Importuoti / eksportuoti kontaktus"</string>
+ <string name="dialog_import_export" msgid="4360648034889921624">"Import. / eksport. kont."</string>
<string name="menu_share" msgid="943789700636542260">"Bendrinti"</string>
<string name="menu_all_contacts" msgid="5101735431586050711">"Visi kontaktai"</string>
<string name="share_via" msgid="563121028023030093">"Bendrinti adresatą naudojant"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5f9e426..37e4946 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -53,8 +53,8 @@
<string name="menu_deleteGroup" msgid="3486380004411482874">"Slett"</string>
<string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Ny"</string>
<string name="menu_new_group_action_bar" msgid="5055346725617932394">"Ny"</string>
- <string name="splitConfirmation_title" msgid="633640935430370530">"Del opp kontakt?"</string>
- <string name="splitConfirmation" msgid="740190210499587175">"Denne kontakten vil bli delt opp i flere kontakter."</string>
+ <string name="splitConfirmation_title" msgid="633640935430370530">"Dele opp kontakt?"</string>
+ <string name="splitConfirmation" msgid="740190210499587175">"Denne kontakten kommer til å deles opp i flere kontakter."</string>
<string name="menu_joinAggregate" msgid="5027981918265667970">"Foren"</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Slå sammen kontakter"</string>
<string name="blurbJoinContactDataWith" msgid="8736488417422708236">"Velg kontakten du vil slå sammen med <xliff:g id="NAME">%s</xliff:g>:"</string>
@@ -146,9 +146,9 @@
<string name="recentCalls_trashVoicemail" msgid="7604696960787435655">"Slett talepost"</string>
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Del talepost"</string>
<string name="recentCalls_empty" msgid="247053222448663107">"Anropsloggen er tom."</string>
- <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Tøm samtaleloggen?"</string>
- <string name="clearCallLogConfirmation" msgid="5043563133171583152">"Alle samtalelogger vil bli slettet."</string>
- <string name="clearCallLogProgress_title" msgid="8365943000154295771">"Tømmer anropslogg …"</string>
+ <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Tømme samtaleloggen?"</string>
+ <string name="clearCallLogConfirmation" msgid="5043563133171583152">"Alle samtalelogger kommer til å slettes."</string>
+ <string name="clearCallLogProgress_title" msgid="8365943000154295771">"Tømmer anropsloggen …"</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
<string name="meid" msgid="6210568493746275750">"MEID"</string>
<string name="voicemail" msgid="3851469869202611441">"Telefonsvarer"</string>
@@ -253,7 +253,7 @@
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Forespørselen om eksport av vCard ble avvist. Prøv på nytt senere."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"kontakt"</string>
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
- <string name="confirm_export_title" msgid="6834385377255286349">"Eksport. kontaktene?"</string>
+ <string name="confirm_export_title" msgid="6834385377255286349">"Eksp. kontaktene?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Kontaktlisten din blir eksportert til: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Eksport mislyktes"</string>
<string name="exporting_contact_failed_message" msgid="4938527850142003141">"Kontaktdataene ble ikke eksportert."\n"Grunn: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
@@ -290,7 +290,7 @@
<string name="menu_accounts" msgid="8499114602017077970">"Kontoer"</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"Kontakter i visning"</string>
<string name="menu_import_export" msgid="26217871113229507">"Importér/eksportér"</string>
- <string name="dialog_import_export" msgid="4360648034889921624">"Import./eksp. kontakter"</string>
+ <string name="dialog_import_export" msgid="4360648034889921624">"Imp./eksp. kontakter"</string>
<string name="menu_share" msgid="943789700636542260">"Del"</string>
<string name="menu_all_contacts" msgid="5101735431586050711">"Alle kontakter"</string>
<string name="share_via" msgid="563121028023030093">"Del kontakt via"</string>
@@ -492,7 +492,7 @@
<item quantity="one" msgid="3323065321661972446">"<xliff:g id="COUNT">%1$d</xliff:g> person"</item>
<item quantity="other" msgid="6251996206137048525">"<xliff:g id="COUNT">%1$d</xliff:g> personer"</item>
</plurals>
- <string name="toast_join_with_empty_contact" msgid="2238581529864542985">"Skriv inn kontaktens navn før du slår den sammen med en annen."</string>
+ <string name="toast_join_with_empty_contact" msgid="2238581529864542985">"Skriv inn kontaktens navn før du slår vedkommende sammen med en annen."</string>
<string name="copy_text" msgid="3257145021583508761">"Kopier til utklippstavlen"</string>
<string name="set_default" msgid="4417505153468300351">"Angi som standard"</string>
<string name="clear_default" msgid="7193185801596678067">"Fjern som standard"</string>
@@ -525,7 +525,7 @@
<string name="voicemail_speed_slower" msgid="1508601287347216244">"Lav hastighet"</string>
<string name="voicemail_speed_normal" msgid="9033988544627228892">"Normal hastighet"</string>
<string name="voicemail_speed_faster" msgid="2019965121475935488">"Høy hastighet"</string>
- <string name="voicemail_speed_fastest" msgid="5758712343491183292">"Raskeste hastighet"</string>
+ <string name="voicemail_speed_fastest" msgid="5758712343491183292">"Høyeste hastighet"</string>
<string name="call_log_item_count_and_date" msgid="7641933305703520787">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
<string name="group_name_hint" msgid="238359485263401293">"Gruppens navn"</string>
<string name="nfc_vcard_file_name" msgid="2823095213265993609">"Kontakt mottatt per NFC"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3412c40..de6c6bd 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -146,7 +146,7 @@
<string name="recentCalls_trashVoicemail" msgid="7604696960787435655">"Usuń pocztę głosową"</string>
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Udostępnij pocztę głosową"</string>
<string name="recentCalls_empty" msgid="247053222448663107">"Rejestr połączeń jest pusty."</string>
- <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Usunąć rejestr poł.?"</string>
+ <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Usunąć rejestr połączeń?"</string>
<string name="clearCallLogConfirmation" msgid="5043563133171583152">"Wszystkie dane połączeń zostaną usunięte."</string>
<string name="clearCallLogProgress_title" msgid="8365943000154295771">"Czyszczenie rejestru połączeń…"</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8c69bda..4457755 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -57,7 +57,7 @@
<string name="splitConfirmation" msgid="740190210499587175">"Este contato será separado em vários contatos."</string>
<string name="menu_joinAggregate" msgid="5027981918265667970">"Unir"</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Unir contatos"</string>
- <string name="blurbJoinContactDataWith" msgid="8736488417422708236">"Selecione o contato que deseja mesclar com <xliff:g id="NAME">%s</xliff:g>."</string>
+ <string name="blurbJoinContactDataWith" msgid="8736488417422708236">"Selecione o contato que deseja mesclar com <xliff:g id="NAME">%s</xliff:g>:"</string>
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Mostrar todos os contatos"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Contatos sugeridos"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Todos os contatos"</string>
@@ -65,7 +65,7 @@
<string name="deleteConfirmation_title" msgid="1418215926447642260">"Excluir contato?"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Definir toque"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Todas as cham. p/ correio voz"</string>
- <string name="readOnlyContactWarning" msgid="7808825687289848259">"Não é possível excluir os contatos das contas somente de leitura, mas você pode ocultá-los nas suas listas de contatos."</string>
+ <string name="readOnlyContactWarning" msgid="7808825687289848259">"Não é possível excluir os contatos das contas somente leitura, mas você pode ocultá-los nas suas listas de contatos."</string>
<string name="readOnlyContactDeleteConfirmation" msgid="2137170726670196909">"Este contato contém informações de diversas contas. As informações de contas somente de leitura ficarão ocultas nas suas listas de contatos, mas não serão excluídas."</string>
<string name="multipleContactDeleteConfirmation" msgid="938900978442960800">"Excluir este contato irá excluir informações de várias contas."</string>
<string name="deleteConfirmation" msgid="811706994761610640">"Este contato será excluído."</string>
@@ -116,8 +116,8 @@
<item quantity="other" msgid="3578469907265375314">"<xliff:g id="COUNT">%d</xliff:g> contatos"</item>
</plurals>
<string name="listTotalAllContactsZero" msgid="5513001821794568211">"Nenhum contato."</string>
- <string name="listTotalAllContactsZeroCustom" msgid="5004974705699445044">"Não há contatos visíveis"</string>
- <string name="listTotalAllContactsZeroStarred" msgid="3173820905501592808">"Nenhum favorito"</string>
+ <string name="listTotalAllContactsZeroCustom" msgid="5004974705699445044">"Não há contatos visíveis."</string>
+ <string name="listTotalAllContactsZeroStarred" msgid="3173820905501592808">"Nenhum favorito."</string>
<string name="listTotalAllContactsZeroGroup" msgid="5448979458248027615">"Nenhum contato em <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="listAllContactsInAccount" msgid="7496143179265311758">"Contatos em <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="listSingleContact" msgid="6067813698903535563">"Único contato"</string>
@@ -161,14 +161,14 @@
<string name="simContacts_title" msgid="27341688347689769">"Contatos do cartão SIM"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Você não tem contatos para exibir. Se você acabou de adicionar uma conta, pode levar alguns minutos para sincronizar os contatos."</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Você não tem contatos para exibir."</string>
- <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"Você não tem nenhum contato para mostrar. "\n" "\n" Para adicionar contatos, toque "<font fgcolor="#ffffffff">" "<b>" menu "</b>" "</font>", em seguida, toque: "\n" "\n" "<li>" "<font fgcolor="#ffffffff">" "<b>" contas "</b>" "</font>" para adicionar ou configurar uma conta com contatos que você pode sincronizar com o tablet "\n" "</li>" "\n" "<li>" "<font fgcolor="#ffffffff">" "<b>" Novo contato "</b>" "</font>" para criar um novo contato a partir do zero "\n" "</li>" "\n" "<li>" "<font fgcolor="#ffffffff">" "<b>" Importação/exportação "</b>" "</font>" para importar contatos do SIM ou do cartão SD "\n" "</li></string>
- <string name="noContactsHelpText" product="default" msgid="4405064135698982080">"Você não tem nenhum contato para exibir."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e, a seguir, toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o telefone"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do seu cartão SIM ou SD"\n</li></string>
- <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"Você não tem contatos para exibir. Se acabou de adicionar uma conta, pode levar alguns minutos para sincronizar os contatos."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opções de exibição"</b></font>" para alterar quais contatos serão visíveis"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD ou SIM"\n</li></string>
- <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"Você não tem contatos para exibir. Se acabou de adicionar uma conta, pode levar alguns minutos para sincronizar os contatos."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opções de exibição"</b></font>" para alterar quais contatos serão visíveis"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD ou SIM"\n</li></string>
- <string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"Você não tem nenhum contato para exibir."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e, a seguir, toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD"\n</li></string>
- <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Você não tem nenhum contato para exibir."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e, a seguir, toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o telefone"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"Você não tem contatos para exibir. Se acabou de adicionar uma conta, pode levar alguns minutos para sincronizar os contatos."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opções de exibição"</b></font>" para alterar quais contatos serão visíveis"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"Você não tem contatos para exibir. Se acabou de adicionar uma conta, pode levar alguns minutos para sincronizar os contatos."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opções de exibição"</b></font>" para alterar quais contatos serão visíveis"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD"\n</li></string>
+ <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"Você não tem nenhum contato para mostrar. "\n" "\n" Para adicionar contatos, toque "<font fgcolor="#ffffffff">" "<b>" menu "</b>" "</font>", em seguida, toque: "\n" "\n" "<li>" "<font fgcolor="#ffffffff">" "<b>" Contas "</b>" "</font>" para adicionar ou configurar uma conta com contatos que você pode sincronizar com o tablet "\n" "</li>" "\n" "<li>" "<font fgcolor="#ffffffff">" "<b>" Novo contato "</b>" "</font>" para criar um novo contato a partir do zero "\n" "</li>" "\n" "<li>" "<font fgcolor="#ffffffff">" "<b>" Importação/exportação "</b>" "</font>" para importar contatos do SIM ou do cartão SD "\n" "</li></string>
+ <string name="noContactsHelpText" product="default" msgid="4405064135698982080">"Você não tem nenhum contato para exibir."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e, a seguir, toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o telefone"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do seu cartão SIM ou SD"\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"Você não tem contatos para exibir. Se acabou de adicionar uma conta, pode levar alguns minutos para sincronizar os contatos."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opções de exibição"</b></font>" para alterar quais contatos serão visíveis"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD ou SIM"\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"Você não tem contatos para exibir. Se acabou de adicionar uma conta, pode levar alguns minutos para sincronizar os contatos."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opções de exibição"</b></font>" para alterar quais contatos serão visíveis"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD ou SIM"\n</li></string>
+ <string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"Você não tem nenhum contato para exibir."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e, a seguir, toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD"\n</li></string>
+ <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Você não tem nenhum contato para exibir."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e, a seguir, toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o telefone"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"Você não tem contatos para exibir. Se acabou de adicionar uma conta, pode levar alguns minutos para sincronizar os contatos."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opções de exibição"</b></font>" para alterar quais contatos serão visíveis"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"Você não tem contatos para exibir. Se acabou de adicionar uma conta, pode levar alguns minutos para sincronizar os contatos."\n\n"Para adicionar contatos, toque em "<font fgcolor="#ffffffff"><b>"Menu"</b></font>" e toque em:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Contas"</b></font>" para adicionar ou configurar uma conta com contatos que possam ser sincronizados com o tablet"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Opções de exibição"</b></font>" para alterar quais contatos serão visíveis"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Novo contato"</b></font>" para criar um novo contato do início"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importar/Exportar"</b></font>" para importar contatos do cartão SD"\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"Você não tem nenhum favorito."\n\n"Para adicionar um contato à sua lista de favoritos:"\n\n" "<li>"Toque na guia "<b>"Contatos"</b>\n</li>" "\n<li>"Toque no contato que deseja adicionar aos seus favoritos"\n</li>" "\n<li>"Toque na estrela ao lado do nome do contato"\n</li></string>
<string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Usar teclado multifrequencial"</string>
<string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"Retornar para a chamada em espera"</string>
@@ -233,7 +233,7 @@
<string name="fail_reason_not_supported" msgid="8219562769267148825">"O formato não é suportado."</string>
<string name="vcard_import_failed" msgid="5223531255894842406">"Não foi possível importar o vCard."</string>
<string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"Nenhum arquivo de vCard encontrado no armazenamento."</string>
- <string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"Nenhum arquivo de vCard encontrado no cartão SD"</string>
+ <string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"Nenhum arquivo de vCard encontrado no cartão SD."</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="6427931733267328564">"Não foi possível coletar informações meta de determinados arquivos vCard."</string>
<string name="fail_reason_failed_to_read_files" msgid="5823434810622484922">"Um ou mais arquivos não puderam ser importados (%s)."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Erro desconhecido."</string>
@@ -248,13 +248,13 @@
<string name="importing_vcard_canceled_title" msgid="2147475978165599336">"Importação de <xliff:g id="FILENAME">%s</xliff:g> cancelada"</string>
<string name="vcard_import_will_start_message" msgid="2804911199145873396">"<xliff:g id="FILENAME">%s</xliff:g> será importado em breve."</string>
<string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"O arquivo será importado em breve."</string>
- <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"Pedido de importação vCard foi rejeitado. Tente novamente mais tarde."</string>
+ <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"O pedido de importação vCard foi rejeitado. Tente novamente mais tarde."</string>
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"<xliff:g id="FILENAME">%s</xliff:g> será exportado em breve."</string>
<string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Pedido de exportação vCard foi rejeitado. Tente novamente mais tarde."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"contato"</string>
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Exportar contatos?"</string>
- <string name="confirm_export_message" msgid="2423421354816428708">"Sua lista de contatos será exportada para o arquivo: <xliff:g id="VCARD_FILENAME">%s</xliff:g> ."</string>
+ <string name="confirm_export_message" msgid="2423421354816428708">"Sua lista de contatos será exportada para o arquivo: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Não foi possível exportar"</string>
<string name="exporting_contact_failed_message" msgid="4938527850142003141">"Os dados de contato não foram exportados."\n"Motivo: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Não há contato exportáveis."</string>
@@ -286,7 +286,7 @@
<string name="sms_disambig_title" msgid="4675399294513152364">"Enviar SMS usando"</string>
<string name="make_primary" msgid="5829291915305113983">"Lembrar desta escolha"</string>
<string name="quickcontact_missing_app" msgid="358168575340921552">"Nenhum aplicativo foi encontrado para executar esta ação."</string>
- <string name="missing_name" msgid="8745511583852904385">"(Sem nome)"</string>
+ <string name="missing_name" msgid="8745511583852904385">"Sem nome"</string>
<string name="menu_accounts" msgid="8499114602017077970">"Contas"</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"Contatos para exibição"</string>
<string name="menu_import_export" msgid="26217871113229507">"Importar/exportar"</string>
@@ -404,7 +404,7 @@
<string name="use_photo_as_primary" msgid="8807110122951157246">"Usar esta foto"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Não pode ser editado neste aplicativo."</string>
<string name="no_contact_details" msgid="6636856378019344497">"Não há informações adicionais para este contato."</string>
- <string name="group_read_only" msgid="1061762906115697637">"Não é possível editar neste dispositivo"</string>
+ <string name="group_read_only" msgid="1061762906115697637">"Não é possível editar neste dispositivo."</string>
<string name="display_options_sort_list_by" msgid="6080091755852211076">"Classificar lista por"</string>
<string name="display_options_sort_by_given_name" msgid="184916793466387067">"Nome"</string>
<string name="display_options_sort_by_family_name" msgid="7857986975275712622">"Sobrenome"</string>
@@ -483,7 +483,7 @@
<item quantity="one" msgid="2944819210288517794">"Um grupo"</item>
<item quantity="other" msgid="1276758425904917367">"<xliff:g id="COUNT">%0$d</xliff:g> grupos"</item>
</plurals>
- <string name="delete_group_dialog_message" msgid="7586856514337560529">"Excluir o grupo \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\"? (Os contatos não serão apagados)"</string>
+ <string name="delete_group_dialog_message" msgid="7586856514337560529">"Excluir o grupo \"<xliff:g id="GROUP_LABEL">%1$s</xliff:g>\"? Os contatos não serão apagados."</string>
<plurals name="num_contacts_in_group">
<item quantity="one" msgid="1352418549951013448">"<xliff:g id="COUNT_0">%1$d</xliff:g> pessoa de <xliff:g id="ACCOUNT_TYPE">%2$s</xliff:g>"</item>
<item quantity="other" msgid="8146027769011086349">"<xliff:g id="COUNT_0">%1$d</xliff:g> pessoas de <xliff:g id="ACCOUNT_TYPE">%2$s</xliff:g>"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b1c0ae2..0133be3 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -53,7 +53,7 @@
<string name="menu_deleteGroup" msgid="3486380004411482874">"Ştergeţi"</string>
<string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Nouă"</string>
<string name="menu_new_group_action_bar" msgid="5055346725617932394">"Nou"</string>
- <string name="splitConfirmation_title" msgid="633640935430370530">"Separ. pers.din ag.?"</string>
+ <string name="splitConfirmation_title" msgid="633640935430370530">"Intrare separată?"</string>
<string name="splitConfirmation" msgid="740190210499587175">"Această persoană de contact va fi separată în mai multe intrări în Agendă."</string>
<string name="menu_joinAggregate" msgid="5027981918265667970">"Alăturaţi-vă"</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Asociaţi intrările din Agendă"</string>
@@ -62,7 +62,7 @@
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Persoane din agendă sugerate"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Toate persoanele din agendă"</string>
<string name="contactsJoinedMessage" msgid="7208148163607047389">"Persoanele din agendă au fost unite"</string>
- <string name="deleteConfirmation_title" msgid="1418215926447642260">"Şt. pers. de cont.?"</string>
+ <string name="deleteConfirmation_title" msgid="1418215926447642260">"Ştergeţi contactul?"</string>
<string name="menu_set_ring_tone" msgid="8728345772068064946">"Setaţi ton apel"</string>
<string name="menu_redirect_calls_to_vm" msgid="4181789196416396656">"Toate apel. către mesag. voc."</string>
<string name="readOnlyContactWarning" msgid="7808825687289848259">"Nu puteţi şterge persoane din agendă, din conturi cu permisiuni doar de citire, însă puteţi să le ascundeţi în lista dvs. de persoane din agendă."</string>
@@ -127,7 +127,7 @@
<item quantity="other" msgid="3852668542926965042">"Au fost găsite <xliff:g id="COUNT">%d</xliff:g> (de) persoane din agendă"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"S-au găsit peste <xliff:g id="COUNT">%d</xliff:g> (de) persoane din agendă."</string>
- <string name="listFoundAllContactsZero" msgid="7132202364587656501">"Nu s-au găsit pers.din agendă."</string>
+ <string name="listFoundAllContactsZero" msgid="7132202364587656501">"Nu s-au găsit contacte."</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"A fost găsită 1 persoană din agendă"</item>
<item quantity="other" msgid="7988132539476575389">"Au fost găsite <xliff:g id="COUNT">%d</xliff:g> (de) persoane din agendă"</item>
@@ -146,7 +146,7 @@
<string name="recentCalls_trashVoicemail" msgid="7604696960787435655">"Ştergeţi mesajul vocal"</string>
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Distribuiţi mesajul vocal"</string>
<string name="recentCalls_empty" msgid="247053222448663107">"Jurnalul de apeluri este gol."</string>
- <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Şterg.jurn.de apel.?"</string>
+ <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Ştergeţi apelurile?"</string>
<string name="clearCallLogConfirmation" msgid="5043563133171583152">"Toate înregistrările apelurilor dvs. vor fi şterse."</string>
<string name="clearCallLogProgress_title" msgid="8365943000154295771">"Se goleşte jurnalul de apeluri..."</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
@@ -227,7 +227,7 @@
<string name="scanning_sdcard_failed_title" product="default" msgid="6664940444476572612">"Nu s-a putut scana cardul SD"</string>
<string name="scanning_sdcard_failed_message" product="nosdcard" msgid="7221682312959229201">"Stocarea nu s-a putut scana. (Motivul: „<xliff:g id="FAIL_REASON">%s</xliff:g>”)"</string>
<string name="scanning_sdcard_failed_message" product="default" msgid="189023067829510792">"Cardul SD nu a putut fi scanat. (Motivul: „<xliff:g id="FAIL_REASON">%s</xliff:g>”)"</string>
- <string name="fail_reason_io_error" msgid="6748358842976073255">"Eroare I/I (intrare/ieşire)"</string>
+ <string name="fail_reason_io_error" msgid="6748358842976073255">"Eroare I/O"</string>
<string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"Memoria este insuficientă (probabil fişierul este prea mare)."</string>
<string name="fail_reason_vcard_parse_error" msgid="888263542360355784">"Nu s-au putut analiza datele de pe vCard dintr-un motiv neaşteptat."</string>
<string name="fail_reason_not_supported" msgid="8219562769267148825">"Formatul nu este acceptat."</string>
@@ -290,7 +290,7 @@
<string name="menu_accounts" msgid="8499114602017077970">"Conturi"</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"Persoane de contact de afişat"</string>
<string name="menu_import_export" msgid="26217871113229507">"Importaţi/exportaţi"</string>
- <string name="dialog_import_export" msgid="4360648034889921624">"Imp./exp. pers. agendă"</string>
+ <string name="dialog_import_export" msgid="4360648034889921624">"Import/export contacte"</string>
<string name="menu_share" msgid="943789700636542260">"Distribuiţi"</string>
<string name="menu_all_contacts" msgid="5101735431586050711">"Toată agenda"</string>
<string name="share_via" msgid="563121028023030093">"Distribuiţi persoana din agendă prin"</string>
@@ -307,7 +307,7 @@
<string name="menu_sync_remove" msgid="3266725887008450161">"Eliminaţi grup de sincronizare"</string>
<string name="dialog_sync_add" msgid="8267045393119375803">"Adăugaţi grup de sincronizare"</string>
<string name="display_more_groups" msgid="2682547080423434170">"Mai multe grupuri..."</string>
- <string name="display_ungrouped" msgid="6885954210243119591">"Toate celel.pers.din ag."</string>
+ <string name="display_ungrouped" msgid="6885954210243119591">"Toate celelalte contacte"</string>
<string name="display_all_contacts" msgid="2031647544742889505">"Toată Agenda"</string>
<string name="display_warn_remove_ungrouped" msgid="8872290721676651414">"Eliminarea grupului „<xliff:g id="GROUP">%s</xliff:g>” din sincronizare va elimina, de asemenea, orice persoană din agendă care nu face parte dintr-un grup."</string>
<string name="account_phone" product="tablet" msgid="7946049152658522054">"Numai pe tabletă, nesincronizată"</string>
@@ -403,7 +403,7 @@
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Utilizaţi această fotografie"</string>
<string name="contact_read_only" msgid="7421346527289472273">"Nu se poate edita din această aplicaţie"</string>
- <string name="no_contact_details" msgid="6636856378019344497">"Nu există inform. suplim. pt. această persoană de contact."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Nu există informaţii suplimentare pentru acest contact."</string>
<string name="group_read_only" msgid="1061762906115697637">"Nu poate fi editat pe acest dispozitiv."</string>
<string name="display_options_sort_list_by" msgid="6080091755852211076">"Sortaţi lista după"</string>
<string name="display_options_sort_by_given_name" msgid="184916793466387067">"Prenume"</string>
@@ -516,7 +516,7 @@
<string name="call_log_new_header" msgid="846546437517724715">"Noi"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"Mai vechi"</string>
<string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"Nu se poate realiza conectarea la serverul de mesagerie vocală."</string>
- <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Nu se poate conecta la serv. mes. voc. Mes. voc. noi în aştept."</string>
+ <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Nu se conectează server mesagerie vocală. Aşteaptă mesaje noi."</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"Configuraţi mesageria vocală."</string>
<string name="voicemail_status_audio_not_available" msgid="3369618334553341626">"Componenta audio nu este disponibilă."</string>
<string name="voicemail_status_action_configure" msgid="8671796489912239589">"Configuraţi"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 78ec39b..7fc0976 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -21,7 +21,7 @@
<string name="contactsList" msgid="8661624236494819731">"Контакты"</string>
<string name="shortcutContact" msgid="749243779392912958">"Контакт"</string>
<string name="shortcutDialContact" msgid="746622101599186779">"Быстрый звонок"</string>
- <string name="shortcutMessageContact" msgid="2460337253595976198">"Быстрое сообщение"</string>
+ <string name="shortcutMessageContact" msgid="2460337253595976198">"Быстрое SMS"</string>
<string name="shortcutActivityTitle" msgid="6642877210643565436">"Выбрать контакт для быстрого вызова"</string>
<string name="callShortcutActivityTitle" msgid="6065749861423648991">"Выберите номер для вызова"</string>
<string name="messageShortcutActivityTitle" msgid="3084542316620335911">"Выбрать номер для отправки сообщения"</string>
@@ -48,16 +48,16 @@
<string name="menu_deleteContact" msgid="6788644058868189393">"Удалить"</string>
<string name="menu_call" msgid="3992595586042260618">"Позвонить"</string>
<string name="menu_sendSMS" msgid="5535886767547006515">"Отправить SMS/MMS"</string>
- <string name="menu_splitAggregate" msgid="8368636463748691868">"Отделить"</string>
+ <string name="menu_splitAggregate" msgid="8368636463748691868">"Разделить"</string>
<string name="menu_editGroup" msgid="5062005185370983720">"Изменить"</string>
<string name="menu_deleteGroup" msgid="3486380004411482874">"Удалить"</string>
<string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Добавить"</string>
<string name="menu_new_group_action_bar" msgid="5055346725617932394">"Новая группа"</string>
<string name="splitConfirmation_title" msgid="633640935430370530">"Разделение контакта"</string>
- <string name="splitConfirmation" msgid="740190210499587175">"Этот контакт будет разделен на несколько частей."</string>
- <string name="menu_joinAggregate" msgid="5027981918265667970">"Присоединить"</string>
+ <string name="splitConfirmation" msgid="740190210499587175">"Этот контакт будет разделен."</string>
+ <string name="menu_joinAggregate" msgid="5027981918265667970">"Объединить"</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Объединить контакты"</string>
- <string name="blurbJoinContactDataWith" msgid="8736488417422708236">"Выберите контакт для объединения с контактом \"<xliff:g id="NAME">%s</xliff:g>\":"</string>
+ <string name="blurbJoinContactDataWith" msgid="8736488417422708236">"Выберите контакт, который хотите объединить с \"<xliff:g id="NAME">%s</xliff:g>\":"</string>
<string name="showAllContactsJoinItem" msgid="2189695051430392383">"Показать все контакты"</string>
<string name="separatorJoinAggregateSuggestions" msgid="2831414448851313345">"Предлагаемые контакты"</string>
<string name="separatorJoinAggregateAll" msgid="7939932265026181043">"Все контакты"</string>
@@ -76,9 +76,9 @@
<string name="label_sip_address" msgid="124073911714324974">"Интернет-вызов"</string>
<string name="ghostData_company" msgid="5414421120553765775">"Компания"</string>
<string name="ghostData_title" msgid="7496735200318496110">"Название"</string>
- <string name="invalidContactMessage" msgid="8215051456181842274">"Контакт не существует."</string>
+ <string name="invalidContactMessage" msgid="8215051456181842274">"Контакт удален."</string>
<string name="pickerNewContactHeader" msgid="7750705279843568147">"Создать новый контакт"</string>
- <string name="pickerNewContactText" msgid="6166997164401048211">"Создать контакт"</string>
+ <string name="pickerNewContactText" msgid="6166997164401048211">"Добавить контакт"</string>
<string name="phoneLabelsGroup" msgid="6468091477851199285">"Телефон"</string>
<string name="emailLabelsGroup" msgid="8389931313045344406">"Адрес электронной почты"</string>
<string name="imLabelsGroup" msgid="3898238486262614027">"Чат"</string>
@@ -95,7 +95,7 @@
<string name="removePhoto" msgid="4898105274130284565">"Удалить фото"</string>
<string name="noContacts" msgid="8579310973261953559">"Нет контактов."</string>
<string name="noGroups" msgid="8614664663561385253">"Нет групп."</string>
- <string name="noAccounts" msgid="7768267764545265909">"Для создания групп необходим аккаунт."</string>
+ <string name="noAccounts" msgid="7768267764545265909">"Для создания групп нужен аккаунт."</string>
<string name="noMatchingContacts" msgid="4266283206853990471">"Подходящие контакты не найдены."</string>
<string name="noContactsWithPhoneNumbers" msgid="1605457050218824269">"Нет контактов с номерами телефонов."</string>
<string name="emptyGroup" msgid="7502116218697177370">"Здесь пока никого нет."</string>
@@ -103,9 +103,9 @@
<string name="savingContact" msgid="4075751076741924939">"Контакт сохраняется..."</string>
<string name="savingDisplayGroups" msgid="2133152192716475939">"Варианты отображения сохраняются..."</string>
<string name="contactSavedToast" msgid="7152589189385441091">"Контакт сохранен."</string>
- <string name="contactSavedErrorToast" msgid="3207250533172944892">"Не удалось сохранить изменения для контакта."</string>
+ <string name="contactSavedErrorToast" msgid="3207250533172944892">"Не удалось сохранить изменения."</string>
<string name="groupSavedToast" msgid="1168756874239833756">"Группа сохранена."</string>
- <string name="groupSavedErrorToast" msgid="7984466936615304740">"Не удалось сохранить изменения группы."</string>
+ <string name="groupSavedErrorToast" msgid="7984466936615304740">"Не удалось сохранить изменения."</string>
<plurals name="listTotalPhoneContacts">
<item quantity="one" msgid="3015357862286673986">"Контакты с номерами телефона: 1"</item>
<item quantity="other" msgid="3299954047880968205">"Контакты с номерами телефонов: <xliff:g id="COUNT">%d</xliff:g>"</item>
@@ -115,9 +115,9 @@
<item quantity="one" msgid="3405747744700823280">"Контактов: 1"</item>
<item quantity="other" msgid="3578469907265375314">"Контактов: <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
- <string name="listTotalAllContactsZero" msgid="5513001821794568211">"Контактов нет."</string>
+ <string name="listTotalAllContactsZero" msgid="5513001821794568211">"Нет контактов"</string>
<string name="listTotalAllContactsZeroCustom" msgid="5004974705699445044">"Нет видимых контактов."</string>
- <string name="listTotalAllContactsZeroStarred" msgid="3173820905501592808">"Избранных контактов нет."</string>
+ <string name="listTotalAllContactsZeroStarred" msgid="3173820905501592808">"Нет контактов"</string>
<string name="listTotalAllContactsZeroGroup" msgid="5448979458248027615">"Нет контактов в: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="listAllContactsInAccount" msgid="7496143179265311758">"Контакты в <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="listSingleContact" msgid="6067813698903535563">"1 контакт"</string>
@@ -146,7 +146,7 @@
<string name="recentCalls_trashVoicemail" msgid="7604696960787435655">"Удалить голосовое сообщение"</string>
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Поделиться"</string>
<string name="recentCalls_empty" msgid="247053222448663107">"Список вызовов пуст."</string>
- <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Очистить?"</string>
+ <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Удаление данных"</string>
<string name="clearCallLogConfirmation" msgid="5043563133171583152">"Журнал звонков будет очищен."</string>
<string name="clearCallLogProgress_title" msgid="8365943000154295771">"Очистка списка вызовов..."</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
@@ -161,14 +161,14 @@
<string name="simContacts_title" msgid="27341688347689769">"Контакты на SIM-карте"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"Отсутствуют контакты для отображения. (Если аккаунт был только что добавлен, потребуется несколько минут для синхронизации контактов.)"</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"Отсутствуют контакты для отображения."</string>
- <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"Нет контактов для показа."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n" "\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, котоые можно синхронизировать с планшетным ПК."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": создание контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SIM- или SD-карты."\n</li></string>
- <string name="noContactsHelpText" product="default" msgid="4405064135698982080">"Нет контактов для показа."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n" "\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с телефоном."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": создание контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SIM-или SD-карты."\n</li></string>
- <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"Нет контактов для показа. (Если вы только что добавили аккаунт, синхронизация контактов может занять несколько минут.) "\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с планшетным ПК."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Варианты отображения"</b></font>": настройка параметров показа контактов."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": создание контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SIM- или SD-карты."\n</li></string>
- <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"Нет контактов для показа. (Если вы только что добавили аккаунт, синхронизация контактов может занять несколько минут.) "\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с телефоном."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Варианты отображения"</b></font>": настройка параметров показа контактов."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": создание контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SIM- или SD-карты."\n</li></string>
- <string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"Нет контактов для показа."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n" "\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с планшетным ПК."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": создание контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SD-карты."\n</li></string>
- <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Нет контактов для показа."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n" "\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, котоые можно синхронизировать с телефоном."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": создание контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SD-карты."\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"Нет контактов для показа. (Если вы только что добавили аккаунт, синхронизация контактов может занять несколько минут.) "\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с планшетным ПК."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Варианты отображения"</b></font>": настройка параметров показа контактов."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": создание контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SD-карты."\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"Нет контактов для показа. (Если вы только что добавили аккаунт, синхронизация контактов может занять несколько минут.) "\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с телефоном."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Варианты отображения"</b></font>": настройка параметров показа контактов."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": создание контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SD-карты."\n</li></string>
+ <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"Нет контактов для показа."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n" "\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с планшетным ПК."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": добавление контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SIM- или SD-карты."\n</li></string>
+ <string name="noContactsHelpText" product="default" msgid="4405064135698982080">"Нет контактов для показа."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n" "\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с телефоном."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": добавление контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SIM- или SD-карты."\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"Нет контактов для показа. Если вы только что добавили аккаунт, синхронизация контактов может занять несколько минут."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с планшетным ПК."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Фильтр контактов"</b></font>": настройка параметров показа контактов."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": добавление контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SIM- или SD-карты."\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"Нет контактов для показа. Если вы только что добавили аккаунт, синхронизация контактов может занять несколько минут."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с телефоном."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Фильтр контактов"</b></font>": настройка параметров показа контактов."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": добавление контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SIM- или SD-карты."\n</li></string>
+ <string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"Нет контактов для показа."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n" "\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с планшетным ПК."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": добавление контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SD-карты."\n</li></string>
+ <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Нет контактов для показа."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n" "\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с телефоном."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": добавление контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SD-карты."\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"Нет контактов для показа. Если вы только что добавили аккаунт, синхронизация контактов может занять несколько минут."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с планшетным ПК."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Фильтр контактов"</b></font>": настройка параметров показа контактов."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": добавление контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SD-карты."\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"Нет контактов для показа. Если вы только что добавили аккаунт, синхронизация контактов может занять несколько минут."\n\n"Чтобы добавить контакты, нажмите "<font fgcolor="#ffffffff"><b>"Меню"</b></font>" и выберите один из вариантов."\n\n<li><font fgcolor="#ffffffff"><b>"Аккаунты"</b></font>": добавление или настройка аккаунта с контактами, которые можно синхронизировать с телефоном."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Фильтр контактов"</b></font>": настройка параметров показа контактов."\n</li>\n<li><font fgcolor="#ffffffff"><b>"Новый контакт"</b></font>": добавление контакта."\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Импорт/экспорт"</b></font>": импорт контактов с SD-карты."\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"У вас нет избранных контактов."\n\n"Чтобы сделать контакт избранным,"\n\n" "<li>"нажмите вкладку "<b>"Контакты"</b>";"\n</li>" "\n<li>"нажмите контакт, который нужно сделать избранным;"\n</li>" "\n<li>"нажмите звездочку возле имени контакта."\n</li></string>
<string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Использовать тональный набор"</string>
<string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"Вернуться к ожидающему вызову"</string>
@@ -225,21 +225,21 @@
<string name="searching_vcard_message" product="default" msgid="3962269894118092049">"Поиск данных vCard на SD-карте..."</string>
<string name="scanning_sdcard_failed_title" product="nosdcard" msgid="4944932641334764942">"Накопитель не просканирован"</string>
<string name="scanning_sdcard_failed_title" product="default" msgid="6664940444476572612">"SD-карта не просканирована"</string>
- <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="7221682312959229201">"Не удалось проверить накопитель (причина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")."</string>
- <string name="scanning_sdcard_failed_message" product="default" msgid="189023067829510792">"Не удалось проверить SD-карту (причина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\")."</string>
+ <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="7221682312959229201">"Не удалось просканировать накопитель. Причина: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="189023067829510792">"Не удалось просканировать SD-карту. Причина: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
<string name="fail_reason_io_error" msgid="6748358842976073255">"Ошибка ввода-вывода"</string>
<string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"Недостаточно памяти. Возможно, файл слишком большой."</string>
- <string name="fail_reason_vcard_parse_error" msgid="888263542360355784">"Не удалось выполнить синтаксический анализ vCard."</string>
+ <string name="fail_reason_vcard_parse_error" msgid="888263542360355784">"Не удалось проанализировать файл vCard."</string>
<string name="fail_reason_not_supported" msgid="8219562769267148825">"Формат не поддерживается."</string>
- <string name="vcard_import_failed" msgid="5223531255894842406">"Не удалось импортировать vCard."</string>
- <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"На накопителе отсутствуют файлы vCard."</string>
- <string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"На SD-карте не найдены файлы VCard."</string>
+ <string name="vcard_import_failed" msgid="5223531255894842406">"Не удалось импортировать данные vCard."</string>
+ <string name="import_failure_no_vcard_file" product="nosdcard" msgid="2071820850017305867">"На накопителе нет файлов vCard."</string>
+ <string name="import_failure_no_vcard_file" product="default" msgid="1754014167874286173">"На SD-карте нет файлов VCard."</string>
<string name="fail_reason_failed_to_collect_vcard_meta_info" msgid="6427931733267328564">"Не удалось собрать метаданные файлов VCard."</string>
<string name="fail_reason_failed_to_read_files" msgid="5823434810622484922">"Не удалось импортировать один или несколько файлов (%s)."</string>
<string name="fail_reason_unknown" msgid="1714092345030570863">"Неизвестная ошибка"</string>
<string name="select_vcard_title" msgid="7791371083694672861">"Выбор файла vCard"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кэширование"</string>
- <string name="caching_vcard_message" msgid="4926308675041506756">"Выполняется кэширование файлов vCard в локальное временное хранилище. Импорт начнется в ближайшее время."</string>
+ <string name="caching_vcard_message" msgid="4926308675041506756">"Выполняется кэширование файлов vCard в локальное временное хранилище. Импорт скоро начнется."</string>
<string name="progress_notifier_message" msgid="2311011466908220528">"Импорт <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="importing_vcard_description" msgid="4245275224298571351">"Импорт: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="reading_vcard_failed_title" msgid="4251647443358422855">"Ошибка чтения vCard-файла"</string>
@@ -248,30 +248,30 @@
<string name="importing_vcard_canceled_title" msgid="2147475978165599336">"Импорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" отменен"</string>
<string name="vcard_import_will_start_message" msgid="2804911199145873396">"Импорт <xliff:g id="FILENAME">%s</xliff:g> начнется в ближайшее время."</string>
<string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"Файл будет импортирован в ближайшее время."</string>
- <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"Запрос на импорт vCard отклонен. Повторите попытку позже."</string>
+ <string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"Запрос на импорт данных vCard отклонен. Повторите попытку позже."</string>
<string name="vcard_export_will_start_message" msgid="2210241345252081463">"Экспорт <xliff:g id="FILENAME">%s</xliff:g> начнется в ближайшее время."</string>
- <string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Запрос на экспорт vCard отклонен. Повторите попытку позже."</string>
+ <string name="vcard_export_request_rejected_message" msgid="2844874826431327531">"Запрос на экспорт данных vCard отклонен. Повторите попытку позже."</string>
<string name="vcard_unknown_filename" msgid="7171709890959915954">"контакт"</string>
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Экспорт контактов"</string>
- <string name="confirm_export_message" msgid="2423421354816428708">"Список контактов будет экспортирован в файл <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
+ <string name="confirm_export_message" msgid="2423421354816428708">"Список контактов будет экспортирован в файл \"<xliff:g id="VCARD_FILENAME">%s</xliff:g>\"."</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"Сбой экспорта"</string>
- <string name="exporting_contact_failed_message" msgid="4938527850142003141">"Не удалось экспортировать контактные данные."\n"Причина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
- <string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Контакты для экспорта не найдены."</string>
+ <string name="exporting_contact_failed_message" msgid="4938527850142003141">"Не удалось экспортировать данные."\n"Причина: <xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Нет контактов для экспорта."</string>
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="590645599157376285">"Слишком много файлов vCard в хранилище."</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="4887177369627277474">"Слишком много файлов VCard на SD-карте."</string>
- <string name="fail_reason_too_long_filename" msgid="3393764245254738333">"Слишком длинное название файла (<xliff:g id="FILENAME">%s</xliff:g>)."</string>
+ <string name="fail_reason_too_long_filename" msgid="3393764245254738333">"Слишком длинное название: <xliff:g id="FILENAME">%s</xliff:g>."</string>
<string name="exporting_vcard_finished_title" msgid="4767045779458185251">"Экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" завершен."</string>
- <string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" отменен."</string>
+ <string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"Экспорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\" отменен."</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"Экспорт данных контакта"</string>
<string name="exporting_contact_list_message" msgid="7181663157672374569">"Контактные данные экспортируются в файл \"<xliff:g id="FILE_NAME">%s</xliff:g>\"."</string>
- <string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Не удалось запустить функцию экспорта (причина: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\")."</string>
- <string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"Произошла ошибка при экспорте (причина: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\")."</string>
- <string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"Не удалось получить сведения из базы данных."</string>
- <string name="composer_has_no_exportable_contact" product="tablet" msgid="6991449891825077743">"Не найдены контакты для экспорта. Экспорт контактов с планшетного ПК может не поддерживаться поставщиком услуг передачи данных."</string>
- <string name="composer_has_no_exportable_contact" product="default" msgid="3296493229040294335">"Не найдены контакты для экспорта. Экспорт контактов с телефона может не поддерживаться поставщиком услуг передачи данных."</string>
- <string name="composer_not_initialized" msgid="2321648986367005254">"Сбой запуска инструмента для создания vCard."</string>
- <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Не удалось открыть файл \"<xliff:g id="FILE_NAME">%s</xliff:g>\" (причина: \"<xliff:g id="EXACT_REASON">%s</xliff:g>\")."</string>
+ <string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"Не удалось запустить функцию экспорта. Причина: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"Ошибка при экспорте. Причина: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
+ <string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"База данных недоступна."</string>
+ <string name="composer_has_no_exportable_contact" product="tablet" msgid="6991449891825077743">"Не найдены контакты для экспорта. Возможно, экспорт контактов с планшетного ПК не поддерживается поставщиком услуг передачи данных."</string>
+ <string name="composer_has_no_exportable_contact" product="default" msgid="3296493229040294335">"Не найдены контакты для экспорта. Возможно, экспорт контактов с телефона не поддерживается поставщиком услуг передачи данных."</string>
+ <string name="composer_not_initialized" msgid="2321648986367005254">"Сбой при запуске редактора vCard."</string>
+ <string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"Не удалось открыть файл \"<xliff:g id="FILE_NAME">%s</xliff:g>\". Причина: <xliff:g id="EXACT_REASON">%s</xliff:g>"</string>
<string name="exporting_contact_list_progress" msgid="560522409559101193">"Контакт <xliff:g id="CURRENT_NUMBER">%s</xliff:g> из <xliff:g id="TOTAL_NUMBER">%s</xliff:g>"</string>
<string name="cancel_import_confirmation_title" msgid="5578683596010294836">"Отмена импорта vCard"</string>
<string name="cancel_import_confirmation_message" msgid="3929951040347726757">"Отменить импорт файла \"<xliff:g id="FILENAME">%s</xliff:g>\"?"</string>
@@ -285,8 +285,8 @@
<string name="call_settings" msgid="7666474782093693667">"Настройки"</string>
<string name="sms_disambig_title" msgid="4675399294513152364">"Отправить SMS с помощью"</string>
<string name="make_primary" msgid="5829291915305113983">"Запомнить выбранное"</string>
- <string name="quickcontact_missing_app" msgid="358168575340921552">"Приложение для обработки этого действия не найдено."</string>
- <string name="missing_name" msgid="8745511583852904385">"Без имени"</string>
+ <string name="quickcontact_missing_app" msgid="358168575340921552">"Действие не поддерживается ни в одном приложении."</string>
+ <string name="missing_name" msgid="8745511583852904385">"Имя не указано"</string>
<string name="menu_accounts" msgid="8499114602017077970">"Аккаунты"</string>
<string name="menu_contacts_filter" msgid="2165153460860262501">"Фильтр контактов"</string>
<string name="menu_import_export" msgid="26217871113229507">"Импорт/экспорт"</string>
@@ -294,7 +294,7 @@
<string name="menu_share" msgid="943789700636542260">"Отправить"</string>
<string name="menu_all_contacts" msgid="5101735431586050711">"Все контакты"</string>
<string name="share_via" msgid="563121028023030093">"Способ отправки"</string>
- <string name="share_error" msgid="948429331673358107">"Не удалось поделиться контактом."</string>
+ <string name="share_error" msgid="948429331673358107">"Не удалось передать данные."</string>
<string name="nameLabelsGroup" msgid="2034640839640477827">"Имя"</string>
<string name="nicknameLabelsGroup" msgid="2891682101053358010">"Псевдоним"</string>
<string name="organizationLabelsGroup" msgid="2478611760751832035">"Организация"</string>
@@ -309,7 +309,7 @@
<string name="display_more_groups" msgid="2682547080423434170">"Другие группы..."</string>
<string name="display_ungrouped" msgid="6885954210243119591">"Все остальные контакты"</string>
<string name="display_all_contacts" msgid="2031647544742889505">"Все контакты"</string>
- <string name="display_warn_remove_ungrouped" msgid="8872290721676651414">"Исключение группы \"<xliff:g id="GROUP">%s</xliff:g>\" из синхронизации приведет к удалению из нее всех контактов, не относящихся к какой-либо группе."</string>
+ <string name="display_warn_remove_ungrouped" msgid="8872290721676651414">"Вместе с группой \"<xliff:g id="GROUP">%s</xliff:g>\" перестанут синхронизироваться контакты, не добавленные в группы."</string>
<string name="account_phone" product="tablet" msgid="7946049152658522054">"Только для планшетных ПК, без синхронизации"</string>
<string name="account_phone" product="default" msgid="3682950835276226870">"Только телефон, без синхронизации"</string>
<string name="call_custom" msgid="7756571794763171802">"Позвонить (<xliff:g id="CUSTOM">%s</xliff:g>)"</string>
@@ -402,9 +402,9 @@
<!-- no translation found for from_account_format (4469138575127580203) -->
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Использовать эту фотографию"</string>
- <string name="contact_read_only" msgid="7421346527289472273">"Изменение в этом приложении невозможно."</string>
- <string name="no_contact_details" msgid="6636856378019344497">"Нет дополнительной информации об этом контакте."</string>
- <string name="group_read_only" msgid="1061762906115697637">"Доступно только для чтения."</string>
+ <string name="contact_read_only" msgid="7421346527289472273">"Здесь доступно только для чтения."</string>
+ <string name="no_contact_details" msgid="6636856378019344497">"Нет других данных об этом контакте."</string>
+ <string name="group_read_only" msgid="1061762906115697637">"Здесь доступно только для чтения."</string>
<string name="display_options_sort_list_by" msgid="6080091755852211076">"Упорядочить контакты"</string>
<string name="display_options_sort_by_given_name" msgid="184916793466387067">"По имени"</string>
<string name="display_options_sort_by_family_name" msgid="7857986975275712622">"По фамилии"</string>
@@ -418,7 +418,7 @@
<string name="pick_new_photo" msgid="7962368009197147617">"Выбрать новое фото из Галереи"</string>
<string name="locale_change_in_progress" msgid="7583992153091537467">"Список контактов обновляется после смены языка интерфейса."</string>
<string name="upgrade_in_progress" msgid="474511436863451061">"Список контактов обновляется..."</string>
- <string name="upgrade_out_of_memory" msgid="1209994418877625940">"Идет обновление контактов."\n\n"Для этого требуется около <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> МБ внутренней памяти."\n\n"Выберите один из следующих вариантов:"</string>
+ <string name="upgrade_out_of_memory" msgid="1209994418877625940">"Контакты обновляются."\n\n"Для этого требуется около <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> МБ внутренней памяти."\n\n"Выберите подходящую опцию:"</string>
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"Удалить некоторые приложения"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"Повторить попытку обновления"</string>
<string name="search_results_searching" msgid="3984833028938569930">"Поиск…"</string>
@@ -427,7 +427,7 @@
<string name="menu_select_all" msgid="621719255150713545">"Выбрать все"</string>
<string name="menu_select_none" msgid="7093222469852132345">"Снять все выделения"</string>
<string name="no_contacts_selected" msgid="5877803471037324613">"Контакты не выбраны."</string>
- <string name="add_field" msgid="2384260056674995230">"Добавить другое поле"</string>
+ <string name="add_field" msgid="2384260056674995230">"Добавить поле"</string>
<string name="add_new_entry_for_section" msgid="5223080690667565044">"Добавить"</string>
<string name="add_organization" msgid="7311893231158291197">"Добавить организацию"</string>
<string name="event_edit_field_hint_text" msgid="5794424930242630477">"Дата"</string>
@@ -450,11 +450,11 @@
<string name="contact_directory_description" msgid="683398073603909119">"Каталог <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="directory_search_label" msgid="1887759056597975053">"Каталог"</string>
<string name="local_search_label" msgid="2551177578246113614">"Все контакты"</string>
- <string name="toast_making_personal_copy" msgid="288549957278065542">"Создание личной копии..."</string>
+ <string name="toast_making_personal_copy" msgid="288549957278065542">"Копирование..."</string>
<string name="list_filter_all_accounts" msgid="8908683398914322369">"Все контакты"</string>
<string name="list_filter_all_starred" msgid="5031734941601931356">"Помеченные"</string>
<string name="list_filter_custom" msgid="8910173055702057002">"Пользовательские"</string>
- <string name="list_filter_customize" msgid="4789963356004169321">"Персонализированный"</string>
+ <string name="list_filter_customize" msgid="4789963356004169321">"Настроить"</string>
<string name="list_filter_phones" msgid="735313795643493365">"Все контакты с номерами телефонов"</string>
<string name="list_filter_single" msgid="5871400283515893087">"Контакт"</string>
<string name="custom_list_filter" msgid="7836035257402013957">"Настройка отображения"</string>
@@ -492,7 +492,7 @@
<item quantity="one" msgid="3323065321661972446">"<xliff:g id="COUNT">%1$d</xliff:g> чел."</item>
<item quantity="other" msgid="6251996206137048525">"<xliff:g id="COUNT">%1$d</xliff:g> чел."</item>
</plurals>
- <string name="toast_join_with_empty_contact" msgid="2238581529864542985">"Прежде чем объединять этот контакт с другим, укажите его имя."</string>
+ <string name="toast_join_with_empty_contact" msgid="2238581529864542985">"Укажите имя контакта, который хотите объединить."</string>
<string name="copy_text" msgid="3257145021583508761">"Копировать в буфер обмена"</string>
<string name="set_default" msgid="4417505153468300351">"Установить по умолчанию"</string>
<string name="clear_default" msgid="7193185801596678067">"Удалить настройки по умолчанию"</string>
@@ -501,7 +501,7 @@
<string name="cancel_confirmation_dialog_message" msgid="5885724679874403115">"Отменить изменения?"</string>
<string name="call_type_and_date" msgid="1766269584078149149">"<xliff:g id="CALL_TYPE">%1$s</xliff:g>, <xliff:g id="CALL_SHORT_DATE">%2$s</xliff:g>"</string>
<string name="profile_display_name" msgid="4127389543625918771">"Настроить профиль"</string>
- <string name="enter_contact_name" msgid="1738391320566349924">"Укажите имя контакта"</string>
+ <string name="enter_contact_name" msgid="1738391320566349924">"Имя контакта"</string>
<string name="view_updates_from_group" msgid="1782685984905600034">"Обновления"</string>
<plurals name="notification_voicemail_title">
<item quantity="one" msgid="1746619685488504230">"Голосовая почта"</item>
@@ -516,14 +516,14 @@
<string name="call_log_new_header" msgid="846546437517724715">"Новые"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"Раньше"</string>
<string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"Не удалось подключиться к серверу голосовой почты."</string>
- <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Не удается подключиться к серверу голосовой почты. Есть новые сообщения."</string>
+ <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Не удалось подключиться к серверу. Есть новые сообщения."</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"Настройте голосовую почту."</string>
<string name="voicemail_status_audio_not_available" msgid="3369618334553341626">"Аудио недоступно."</string>
<string name="voicemail_status_action_configure" msgid="8671796489912239589">"Настройка"</string>
<string name="voicemail_status_action_call_server" msgid="1824816252288551794">"Получить почту"</string>
<string name="voicemail_speed_slowest" msgid="1733460666177707312">"Минимальная скорость"</string>
<string name="voicemail_speed_slower" msgid="1508601287347216244">"Низкая скорость"</string>
- <string name="voicemail_speed_normal" msgid="9033988544627228892">"Обычная скорость"</string>
+ <string name="voicemail_speed_normal" msgid="9033988544627228892">"Средняя скорость"</string>
<string name="voicemail_speed_faster" msgid="2019965121475935488">"Высокая скорость"</string>
<string name="voicemail_speed_fastest" msgid="5758712343491183292">"Максимальная скорость"</string>
<string name="call_log_item_count_and_date" msgid="7641933305703520787">"(<xliff:g id="COUNT">%1$d</xliff:g>) <xliff:g id="DATE">%2$s</xliff:g>"</string>
@@ -563,5 +563,5 @@
<string name="add_new_account" msgid="5748627740680940264">"Добавить аккаунт"</string>
<string name="dialog_phone_call_prohibited_title" msgid="2111395432187079579">"Вызов не осуществляется"</string>
<string name="dialog_voicemail_not_ready_title" msgid="7258109862329777060">"Номер недоступен"</string>
- <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Чтобы настроить голосовую почту, выберите \"Меню\" > \"Настройки\"."</string>
+ <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"Чтобы настроить голосовую почту, выберите \"Меню > Настройки\"."</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f6ff29b..5b85e52 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -53,7 +53,7 @@
<string name="menu_deleteGroup" msgid="3486380004411482874">"Избриши"</string>
<string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Ново"</string>
<string name="menu_new_group_action_bar" msgid="5055346725617932394">"Нова"</string>
- <string name="splitConfirmation_title" msgid="633640935430370530">"Желите ли да раздвојите контакт?"</string>
+ <string name="splitConfirmation_title" msgid="633640935430370530">"Раздвојити контакт?"</string>
<string name="splitConfirmation" msgid="740190210499587175">"Овај контакт ће бити раздвојен у више контаката."</string>
<string name="menu_joinAggregate" msgid="5027981918265667970">"Придружи"</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Придруживање контаката"</string>
@@ -146,7 +146,7 @@
<string name="recentCalls_trashVoicemail" msgid="7604696960787435655">"Избриши говорну поруку"</string>
<string name="recentCalls_shareVoicemail" msgid="1416112847592942840">"Дели говорну поруку"</string>
<string name="recentCalls_empty" msgid="247053222448663107">"Евиденција позива је празна."</string>
- <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Желите ли да обришете евиденцију позива?"</string>
+ <string name="clearCallLogConfirmation_title" msgid="6427524640461816332">"Обрисати евиденцију позива?"</string>
<string name="clearCallLogConfirmation" msgid="5043563133171583152">"Све евиденције позива ће бити избрисане."</string>
<string name="clearCallLogProgress_title" msgid="8365943000154295771">"Брисање евиденције позива..."</string>
<string name="imei" msgid="3045126336951684285">"IMEI"</string>
@@ -239,7 +239,7 @@
<string name="fail_reason_unknown" msgid="1714092345030570863">"Непозната грешка."</string>
<string name="select_vcard_title" msgid="7791371083694672861">"Изаберите vCard датотеку"</string>
<string name="caching_vcard_title" msgid="1226272312940516605">"Кеширање..."</string>
- <string name="caching_vcard_message" msgid="4926308675041506756">"Кеширање vCard датотеке у локалну привремену меморију. Стварни увоз ће ускоро започети."</string>
+ <string name="caching_vcard_message" msgid="4926308675041506756">"Кеширање vCard датотеке у локалну привремену меморију. Увоз ће ускоро започети."</string>
<string name="progress_notifier_message" msgid="2311011466908220528">"Увоз <xliff:g id="CURRENT_NUMBER">%s</xliff:g>/<xliff:g id="TOTAL_NUMBER">%s</xliff:g>: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="importing_vcard_description" msgid="4245275224298571351">"Увоз <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="reading_vcard_failed_title" msgid="4251647443358422855">"Није било могуће читати vCard податке"</string>
@@ -402,7 +402,7 @@
<!-- no translation found for from_account_format (4469138575127580203) -->
<skip />
<string name="use_photo_as_primary" msgid="8807110122951157246">"Користи ову фотографију"</string>
- <string name="contact_read_only" msgid="7421346527289472273">"Не може се мењати из ове апликације."</string>
+ <string name="contact_read_only" msgid="7421346527289472273">"Не може да се измени из ове апликације."</string>
<string name="no_contact_details" msgid="6636856378019344497">"Нема додатних информацијa за овај контакт."</string>
<string name="group_read_only" msgid="1061762906115697637">"Не може да се мења на овом уређају."</string>
<string name="display_options_sort_list_by" msgid="6080091755852211076">"Сортирај листу према"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 8a22ca8..09f3ead 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -164,7 +164,7 @@
<string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"Det finns inga kontakter att visa."\n\n"Om du vill lägga till kontakter trycker du på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" och sedan på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Konton"</b></font>" om du vill lägga till eller konfigurera ett konto med kontakter som du kan synkronisera med pekdatorn"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" om du vill skapa en ny kontakt från grunden"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importera/exportera"</b></font>" om du vill importera kontakter från SIM- eller SD-kortet"\n</li></string>
<string name="noContactsHelpText" product="default" msgid="4405064135698982080">"Det finns inga kontakter att visa."\n\n"Om du vill lägga till kontakter trycker du på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" och sedan på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Konton"</b></font>" om du vill lägga till eller konfigurera ett konto med kontakter som du kan synkronisera med mobilen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" om du vill skapa en ny kontakt från grunden"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importera/exportera"</b></font>" om du vill importera kontakter från SIM- eller SD-kortet"\n</li></string>
<string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"Det finns inga kontakter att visa (Om du nyss har lagt till ett konto kan det ta några minuter att synkronisera kontakterna.)"\n\n"Om du vill lägga till kontakter trycker du på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" och sedan på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Konton"</b></font>" om du vill lägga till eller konfigurera ett konto med kontakter som kan synkroniseras med pekdatorn"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativ"</b></font>" om du vill ändra vilka kontakter som är synliga"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" om du vill skapa en ny kontakt från grunden"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importera/exportera"</b></font>" om du vill importera kontakter från SIM- eller SD-kortet"\n</li></string>
- <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"Det finns inga kontakter att visa (Om du nyss har lagt till ett konto kan det ta några minuter att synkronisera kontakterna.)"\n\n"Om du vill lägga till kontakter trycker du på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" och sedan på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Konton"</b></font>" om du vill lägga till eller konfigurera ett konto med kontakter som kan synkroniseras med mobilen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativ"</b></font>" om du vill ändra vilka kontakter som är synliga"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" om du vill skapa en ny kontakt från grunden"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importera/exportera"</b></font>" om du vill importera kontakter från SIM- eller SD-kortet"\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"Det finns inga kontakter att visa (Om du nyss har lagt till ett konto kan det ta några minuter att synkronisera kontakterna.)"\n\n"Om du vill lägga till kontakter trycker du på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" och sedan på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Konton"</b></font>" om du vill lägga till eller konfigurera ett konto med kontakter som kan synkroniseras med mobilen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativ"</b></font>" om du vill ändra vilka kontakter som är synliga"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" om du vill skapa en ny kontakt från grunden"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importera/exportera"</b></font>" om du vill importera kontakter från SIM- eller SD-kortet"\n</li></string>
<string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"Det finns inga kontakter att visa."\n\n"Om du vill lägga till kontakter trycker du på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" och sedan på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Konton"</b></font>" om du vill lägga till eller konfigurera ett konto med kontakter som du kan synkronisera med pekdatorn"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" om du vill skapa en ny kontakt från grunden"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importera/exportera"</b></font>" om du vill importera kontakter från SD-kortet"\n</li></string>
<string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Det finns inga kontakter att visa."\n\n"Om du vill lägga till kontakter trycker du på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" och sedan på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Konton"</b></font>" om du vill lägga till eller konfigurera ett konto med kontakter som du kan synkronisera med mobilen"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>" om du vill skapa en ny kontakt från grunden"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importera/exportera"</b></font>" om du vill importera kontakter från SD-kortet"\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"Det finns inga kontakter att visa. (Om du nyss har lagt till ett konto kan det ta några minuter att synkronisera kontakterna.)"\n\n"Om du vill lägga till kontakter trycker du på "<font fgcolor="#ffffffff"><b>"Meny"</b></font>" och sedan på:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Konton"</b></font>" om du vill lägga till eller konfigurera ett konto med kontakter som kan synkroniseras med pekdatorn"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Visningsalternativ"</b></font>" om du vill ändra vilka kontakter som är synliga"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Ny kontakt"</b></font>"om du vill skapa en ny kontakt från grunden"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Importera/exportera"</b></font>" om du vill importera kontakter från SD-kortet"\n</li></string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b4c0361..b494a42 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -169,7 +169,7 @@
<string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"Hauna anwani zozote za kuonyesha."\n\n"Ili kuongeza anwani, gusa "<font fgcolor="#ffffffff"><b>" Menyu "</b></font>", kisha uguse: "\n" "\n<li><font fgcolor="#ffffffff"><b>"Akaunti"</b></font>" kuongeza au kusanidi akaunti yenye anwani unazoweza kulandanisha kwa simu "\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Anwani mpya"</b></font>" Ili kuunda anwani mpya kutoka mwanzo "\n</li>" "\n<li><font fgcolor="#ffffffff"><b>" Leta/Hamisha "</b></font>" ili kuhamisha anwani kutoka kwa kadi yako ya SD"\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"Hauna anwani zozote za kuonyesha. (Kama umeongeza akaunti sasa hivi tu, inaweza kuchukua dakika chache kulandanisha anwani.)"\n\n"Ili kuongeza anwani, gusa "<font fgcolor="#ffffffff"><b>"Menyu"</b></font>",kisha uguse:"\n" "\n<li><font fgcolor="#ffffffff"><b>"Akaunti"</b></font>" ili kuongeza au kusanidi akaunti na anwani unazoweza kulandanisha kwenye kompyuta ndogo"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Onyesha chaguo"</b></font>" ili kubadilisha anwani zinazoonekana"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Anwani mpya"</b></font>" ili kuunda anwani mpya kutoka mwanzo"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Leta/Hamisha"</b></font>" ili kuleta anwani kutoka kwa kadi yako ya SD"\n</li></string>
<string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"Hauna anwani zozote za kuonyesha. (Kama umeongeza akaunti sasa hivi, inaweza kuchukua dakika chache kulandanisha anwani.)"\n\n"Kuongeza anwani, gusa "<font fgcolor="#ffffffff"><b>"Menyu"</b></font>",kisha uguse:{"\n" "\n<li><font fgcolor="#ffffffff"><b>"Akaunti"</b></font>" ili kuongeza au kuanzisha akaunti yenye anwani unazoweza kulandanisha kwenye simu"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Onyesha uchaguzi"</b></font>" kwa kubadilisha anwani gani zinazoonekana"\n</li>" "\n<li><font fgcolor="#ffffffff"><b>"Anwani mpya"</b></font>"ili kuunda anwani mpya kutoka mwanzo"\n</li>\n<li><font fgcolor="#ffffffff"><b>"Leta/Hamisha"</b></font>" ili kuleta anwani kutoka kwa kadi yako ya SD"\n</li></string>
- <!-- syntax error in translation for noFavoritesHelpText (3744655776704833277) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:167 in java.io.StringReader@5f934ad) -->
+ <!-- syntax error in translation for noFavoritesHelpText (3744655776704833277) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:167 in java.io.StringReader@1c691f36) -->
<string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"Tumia kibao cha kuchapa cha sauti na kugusa"</string>
<string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"Rudi kwa simu inayoendelea"</string>
<string name="dialer_addAnotherCall" msgid="4205688819890074468">"Ongeza simu"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 80baf7d..dbc26fa 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -54,7 +54,7 @@
<string name="menu_new_contact_action_bar" msgid="8887818026717394343">"Новий"</string>
<string name="menu_new_group_action_bar" msgid="5055346725617932394">"Нова"</string>
<string name="splitConfirmation_title" msgid="633640935430370530">"Розділити контакт?"</string>
- <string name="splitConfirmation" msgid="740190210499587175">"Цей контакт буде розділен1 на декілька контактів."</string>
+ <string name="splitConfirmation" msgid="740190210499587175">"Цей контакт буде розділено на декілька контактів."</string>
<string name="menu_joinAggregate" msgid="5027981918265667970">"Приєдн."</string>
<string name="titleJoinContactDataWith" msgid="7684875775798635354">"Об\'єдн. контакти"</string>
<string name="blurbJoinContactDataWith" msgid="8736488417422708236">"Виберіть контакт, який треба об’єднати з <xliff:g id="NAME">%s</xliff:g>:"</string>
@@ -127,7 +127,7 @@
<item quantity="other" msgid="3852668542926965042">"Знайдено <xliff:g id="COUNT">%d</xliff:g>"</item>
</plurals>
<string name="foundTooManyContacts" msgid="5163335650920020220">"Знайдено понад <xliff:g id="COUNT">%d</xliff:g>."</string>
- <string name="listFoundAllContactsZero" msgid="7132202364587656501">"Немає жодного."</string>
+ <string name="listFoundAllContactsZero" msgid="7132202364587656501">"Не знайдено."</string>
<plurals name="searchFoundContacts">
<item quantity="one" msgid="4826918429708286628">"Знайдено 1"</item>
<item quantity="other" msgid="7988132539476575389">"Знайдено <xliff:g id="COUNT">%d</xliff:g>"</item>
@@ -255,7 +255,7 @@
<string name="percentage" msgid="34897865327092209">"%s%%"</string>
<string name="confirm_export_title" msgid="6834385377255286349">"Експортув. контакти?"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"Ваш список контактів буде експортовано у файл: <xliff:g id="VCARD_FILENAME">%s</xliff:g>."</string>
- <string name="exporting_contact_failed_title" msgid="4892358112409576342">"Не вдалось експорт."</string>
+ <string name="exporting_contact_failed_title" msgid="4892358112409576342">"Помилка експорту"</string>
<string name="exporting_contact_failed_message" msgid="4938527850142003141">"Контактні дані не експортовано."\n"Причина: \"<xliff:g id="FAIL_REASON">%s</xliff:g>\""</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"Немає контакту, який можна експортувати."</string>
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="590645599157376285">"Забагато файлів vCard у пам’яті."</string>
@@ -516,7 +516,7 @@
<string name="call_log_new_header" msgid="846546437517724715">"Нові"</string>
<string name="call_log_old_header" msgid="6262205894314263629">"Старіші"</string>
<string name="voicemail_status_voicemail_not_available" msgid="3021980206152528883">"Неможливо під’єднатися до сервера голосової пошти."</string>
- <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Не вдається з’єдн. із сервером голос. пошти. Є нова голос.пошта."</string>
+ <string name="voicemail_status_messages_waiting" msgid="7113421459602803605">"Помилка з’єднання із сервером голосової пошти. Є нова пошта."</string>
<string name="voicemail_status_configure_voicemail" msgid="3738537770636895689">"Налаштуйте свою голосову пошту."</string>
<string name="voicemail_status_audio_not_available" msgid="3369618334553341626">"Аудіо недоступне."</string>
<string name="voicemail_status_action_configure" msgid="8671796489912239589">"Налаштувати"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 1253bbb..072daec 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -161,14 +161,14 @@
<string name="simContacts_title" msgid="27341688347689769">"SIM 卡聯絡人"</string>
<string name="noContactsHelpTextWithSyncForCreateShortcut" msgid="801504710275614594">"您沒有任何聯絡人可供顯示 (如果您剛剛才新增帳戶，系統需要幾分鐘的時間才能同步聯絡人資訊)。"</string>
<string name="noContactsHelpTextForCreateShortcut" msgid="3081286388667108335">"您沒有任何聯絡人可供顯示。"</string>
- <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"您沒有任何聯絡人可供顯示。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定含有聯絡人的帳戶，其中必須含有可同步至平板電腦的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SIM 卡或 SD 卡匯入聯絡人"\n</li></string>
- <string name="noContactsHelpText" product="default" msgid="4405064135698982080">"您沒有任何聯絡人可供顯示。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定帳戶，其中必須含有可同步至手機的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SIM 卡或 SD 卡匯入聯絡人"\n</li></string>
- <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"您沒有任何聯絡人可供顯示 (如果您剛新增帳戶，系統可能需要幾分鐘同步處理通訊錄)。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定含有聯絡人的帳戶，其中必須含有可同步至平板電腦的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[顯示選項]"<b></b></font>" 變更要顯示哪些聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SIM 卡或 SD 卡匯入聯絡人"\n</li></string>
- <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"您沒有任何聯絡人可供顯示 (如果您剛新增帳戶，系統可能需要幾分鐘同步處理處理通訊錄)。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定含有聯絡人的帳戶，其中必須含有可同步至手機的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[顯示選項]"<b></b></font>" 變更要顯示哪些聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SIM 卡或 SD 卡匯入聯絡人"\n</li></string>
- <string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"您沒有任何聯絡人可供顯示。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定含有聯絡人的帳戶，其中必須含有可同步至平板電腦的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SD 卡匯入聯絡人"\n</li></string>
- <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"您沒有任何聯絡人可供顯示。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定含有聯絡人的帳戶，其中必須含有可同步至手機的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SD 卡匯入聯絡人"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"您沒有任何聯絡人可供顯示 (如果您剛新增帳戶，系統可能需要幾分鐘同步處理通訊錄)。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定含有聯絡人的帳戶，其中必須含有可同步至平板電腦的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[顯示選項]"<b></b></font>" 變更要顯示哪些聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SD 卡匯入聯絡人"\n</li></string>
- <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"您沒有任何聯絡人可供顯示 (如果您剛新增帳戶，系統可能需要幾分鐘同步處理通訊錄)。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定含有聯絡人的帳戶，其中必須含有可同步至手機的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[顯示選項]"<b></b></font>" 變更要顯示哪些聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SD 卡匯入聯絡人"\n</li></string>
+ <string name="noContactsHelpText" product="tablet" msgid="6226271923423236696">"您沒有任何聯絡人可供顯示。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定帳戶，其中含有可和平板電腦保持同步的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SIM 卡或 SD 卡匯入聯絡人"\n</li></string>
+ <string name="noContactsHelpText" product="default" msgid="4405064135698982080">"您沒有任何聯絡人可供顯示。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定帳戶，其中含有可和手機保持同步的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SIM 卡或 SD 卡匯入聯絡人"\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="tablet" msgid="6773195806404659174">"您沒有任何聯絡人可供顯示 (如果您剛新增帳戶，系統可能需要幾分鐘同步處理通訊錄)。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定帳戶，其中含有可和平板電腦保持同步的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[顯示選項]"<b></b></font>" 變更所要顯示的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SIM 卡或 SD 卡匯入聯絡人"\n</li></string>
+ <string name="noContactsHelpTextWithSync" product="default" msgid="7016825676090327312">"您沒有任何聯絡人可供顯示 (如果您剛新增帳戶，系統可能需要幾分鐘同步處理處理通訊錄)。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定帳戶，其中含有可和手機保持同步的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[顯示選項]"<b></b></font>" 變更所要顯示的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SIM 卡或 SD 卡匯入聯絡人"\n</li></string>
+ <string name="noContactsNoSimHelpText" product="tablet" msgid="7823757505923033456">"您沒有任何聯絡人可供顯示。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定帳戶，其中含有可和平板電腦保持同步的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SD 卡匯入聯絡人"\n</li></string>
+ <string name="noContactsNoSimHelpText" product="default" msgid="6224952277619986841">"您沒有任何聯絡人可供顯示。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定帳戶，其中含有可和手機保持同步的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SD 卡匯入聯絡人"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="tablet" msgid="5415762667445638265">"您沒有任何聯絡人可供顯示 (如果您剛新增帳戶，系統可能需要幾分鐘同步處理通訊錄)。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定帳戶，其中含有可和平板電腦保持同步的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[顯示選項]"<b></b></font>" 變更所要顯示的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SD 卡匯入聯絡人"\n</li></string>
+ <string name="noContactsNoSimHelpTextWithSync" product="default" msgid="7443705129830284440">"您沒有任何聯絡人可供顯示 (如果您剛新增帳戶，系統可能需要幾分鐘同步處理通訊錄)。"\n\n"如要新增聯絡人，請輕觸"<font fgcolor="#ffffffff"><b>"選單鍵"</b></font>"，然後輕觸："\n\n<li><font fgcolor="#ffffffff">"[帳戶]"<b></b></font>" 新增或設定帳戶，其中含有可和手機保持同步的聯絡人資料"\n</li>" "\n<li><font fgcolor="#ffffffff">"[顯示選項]"<b></b></font>" 變更所要顯示的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[新增聯絡人]"<b></b></font>" 從頭開始建立新的聯絡人"\n</li>" "\n<li><font fgcolor="#ffffffff">"[匯入/匯出]"<b></b></font>" 從 SD 卡匯入聯絡人"\n</li></string>
<string name="noFavoritesHelpText" msgid="3744655776704833277">"您沒有任何最愛。"\n\n"如要將聯絡人新增至最愛清單："\n\n<li>"輕觸 [聯絡人"<b></b>"] 標籤"\n</li>" "\n<li>"輕觸要新增至最愛的聯絡人"\n</li>" "\n<li>"輕觸聯絡人名稱旁邊的星號圖示"\n</li></string>
<string name="dialer_useDtmfDialpad" msgid="1707548397435075040">"使用觸控音按鍵"</string>
<string name="dialer_returnToInCallScreen" msgid="3719386377550913067">"返回進行中的通話"</string>
@@ -225,8 +225,8 @@
<string name="searching_vcard_message" product="default" msgid="3962269894118092049">"正在 SD 卡上搜尋 vCard 資料…"</string>
<string name="scanning_sdcard_failed_title" product="nosdcard" msgid="4944932641334764942">"無法掃描儲存裝置"</string>
<string name="scanning_sdcard_failed_title" product="default" msgid="6664940444476572612">"無法掃描 SD 卡"</string>
- <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="7221682312959229201">"無法掃描儲存裝置 (原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」)。"</string>
- <string name="scanning_sdcard_failed_message" product="default" msgid="189023067829510792">"無法掃描 SD 卡 (原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」)。"</string>
+ <string name="scanning_sdcard_failed_message" product="nosdcard" msgid="7221682312959229201">"無法掃描儲存裝置 (原因：<xliff:g id="FAIL_REASON">%s</xliff:g>)。"</string>
+ <string name="scanning_sdcard_failed_message" product="default" msgid="189023067829510792">"無法掃描 SD 卡 (原因：<xliff:g id="FAIL_REASON">%s</xliff:g>)。"</string>
<string name="fail_reason_io_error" msgid="6748358842976073255">"I/O 錯誤"</string>
<string name="fail_reason_low_memory_during_import" msgid="875222757734882898">"記憶體不足，檔案可能過大。"</string>
<string name="fail_reason_vcard_parse_error" msgid="888263542360355784">"由於意外因素，導致無法剖析 vCard。"</string>
@@ -245,7 +245,7 @@
<string name="reading_vcard_failed_title" msgid="4251647443358422855">"無法讀取 vCard 資料"</string>
<string name="reading_vcard_canceled_title" msgid="1925216585981542019">"已取消讀取 vCard 資料"</string>
<string name="importing_vcard_finished_title" msgid="3341541727268747967">"已完成匯入 vCard 的 <xliff:g id="FILENAME">%s</xliff:g>"</string>
- <string name="importing_vcard_canceled_title" msgid="2147475978165599336">"已取消匯入「<xliff:g id="FILENAME">%s</xliff:g>」"</string>
+ <string name="importing_vcard_canceled_title" msgid="2147475978165599336">"已取消匯入 <xliff:g id="FILENAME">%s</xliff:g>"</string>
<string name="vcard_import_will_start_message" msgid="2804911199145873396">"<xliff:g id="FILENAME">%s</xliff:g> 將在稍後匯入。"</string>
<string name="vcard_import_will_start_message_with_default_name" msgid="1022969530654129470">"稍候即將匯入該檔案。"</string>
<string name="vcard_import_request_rejected_message" msgid="2890471184508516011">"vCard 匯入要求遭到拒絕，請稍後再試。"</string>
@@ -256,27 +256,27 @@
<string name="confirm_export_title" msgid="6834385377255286349">"確定要匯出聯絡人？"</string>
<string name="confirm_export_message" msgid="2423421354816428708">"您的聯絡人清單即將匯出至以下檔案：<xliff:g id="VCARD_FILENAME">%s</xliff:g>。"</string>
<string name="exporting_contact_failed_title" msgid="4892358112409576342">"無法匯出"</string>
- <string name="exporting_contact_failed_message" msgid="4938527850142003141">"聯絡人資料未匯出。"\n"原因：「<xliff:g id="FAIL_REASON">%s</xliff:g>」"</string>
+ <string name="exporting_contact_failed_message" msgid="4938527850142003141">"聯絡人資料未匯出。"\n"原因：<xliff:g id="FAIL_REASON">%s</xliff:g>"</string>
<string name="fail_reason_no_exportable_contact" msgid="8728506011371262065">"沒有可匯出的聯絡人。"</string>
<string name="fail_reason_too_many_vcard" product="nosdcard" msgid="590645599157376285">"儲存裝置中的 vCard 檔案過多。"</string>
<string name="fail_reason_too_many_vcard" product="default" msgid="4887177369627277474">"SD 卡上的 vCard 檔案過多。"</string>
- <string name="fail_reason_too_long_filename" msgid="3393764245254738333">"要求的檔案名稱過長 (「<xliff:g id="FILENAME">%s</xliff:g>」)。"</string>
+ <string name="fail_reason_too_long_filename" msgid="3393764245254738333">"要求的檔案名稱過長 (<xliff:g id="FILENAME">%s</xliff:g>)。"</string>
<string name="exporting_vcard_finished_title" msgid="4767045779458185251">"已完成 <xliff:g id="FILENAME">%s</xliff:g> 匯出作業。"</string>
- <string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"已取消匯出「<xliff:g id="FILENAME">%s</xliff:g>」。"</string>
+ <string name="exporting_vcard_canceled_title" msgid="2652222370493306887">"已取消匯出 <xliff:g id="FILENAME">%s</xliff:g>。"</string>
<string name="exporting_contact_list_title" msgid="9072240631534457415">"正在匯出聯絡人資料"</string>
<string name="exporting_contact_list_message" msgid="7181663157672374569">"正在將您的聯絡人資料匯出至：<xliff:g id="FILE_NAME">%s</xliff:g>。"</string>
- <string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"無法啟動匯出程式：「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
- <string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"匯出時發生錯誤：「<xliff:g id="EXACT_REASON">%s</xliff:g>」。"</string>
+ <string name="fail_reason_could_not_initialize_exporter" msgid="707260459259688510">"無法啟動匯出程式：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
+ <string name="fail_reason_error_occurred_during_export" msgid="3018855323913649063">"匯出時發生錯誤：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
<string name="composer_failed_to_get_database_infomation" msgid="1765944280846236723">"無法取得資料庫資訊。"</string>
- <string name="composer_has_no_exportable_contact" product="tablet" msgid="6991449891825077743">"沒有可匯出的聯絡人。如果您的平板電腦中確實有聯絡人資料，則可能是部分資料提供者不允許您將聯絡人資料從平板電腦匯出。"</string>
- <string name="composer_has_no_exportable_contact" product="default" msgid="3296493229040294335">"沒有可匯出的聯絡人。如果您的手機中確實有聯絡人資料，則可能是部分資料提供者不允許您將聯絡人資料從手機中匯出。"</string>
+ <string name="composer_has_no_exportable_contact" product="tablet" msgid="6991449891825077743">"沒有可匯出的聯絡人。如果您的平板電腦中確實有聯絡人資料，那麼可能是部分資料提供者不允許您將聯絡人資料從平板電腦匯出。"</string>
+ <string name="composer_has_no_exportable_contact" product="default" msgid="3296493229040294335">"沒有可匯出的聯絡人。如果您的手機中確實有聯絡人資料，那麼可能是部分資料提供者不允許您將聯絡人資料從手機中匯出。"</string>
<string name="composer_not_initialized" msgid="2321648986367005254">"vCard 編輯器並未正確啟動。"</string>
<string name="fail_reason_could_not_open_file" msgid="2067725459821997463">"無法開啟「<xliff:g id="FILE_NAME">%s</xliff:g>」：<xliff:g id="EXACT_REASON">%s</xliff:g>。"</string>
<string name="exporting_contact_list_progress" msgid="560522409559101193">"第 <xliff:g id="CURRENT_NUMBER">%s</xliff:g> 位聯絡人，共 <xliff:g id="TOTAL_NUMBER">%s</xliff:g> 位"</string>
<string name="cancel_import_confirmation_title" msgid="5578683596010294836">"取消匯入 vCard"</string>
- <string name="cancel_import_confirmation_message" msgid="3929951040347726757">"確定要取消匯入「<xliff:g id="FILENAME">%s</xliff:g>」？"</string>
+ <string name="cancel_import_confirmation_message" msgid="3929951040347726757">"確定要取消匯入 <xliff:g id="FILENAME">%s</xliff:g>？"</string>
<string name="cancel_export_confirmation_title" msgid="6516467140276768528">"取消匯出 vCard"</string>
- <string name="cancel_export_confirmation_message" msgid="1995462401949262638">"確定要取消匯出「<xliff:g id="FILENAME">%s</xliff:g>」？"</string>
+ <string name="cancel_export_confirmation_message" msgid="1995462401949262638">"確定要取消匯出 <xliff:g id="FILENAME">%s</xliff:g>？"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="6139900383366166706">"無法取消匯入/匯出 vCard"</string>
<string name="search_settings_description" msgid="2675223022992445813">"您的聯絡人姓名"</string>
<string name="add_2sec_pause" msgid="9214012315201040129">"新增 2 秒暫停功能"</string>
@@ -374,7 +374,7 @@
<string name="chat_icq" msgid="8438405386153745775">"使用 ICQ 進行即時通訊"</string>
<string name="chat_jabber" msgid="7561444230307829609">"使用 Jabber 進行即時通訊"</string>
<string name="chat" msgid="9025361898797412245">"即時通訊"</string>
- <string name="audio_chat" msgid="2535716629358298691">"語音即時通訊"</string>
+ <string name="audio_chat" msgid="2535716629358298691">"語音通訊"</string>
<string name="video_chat" msgid="1872255818640336072">"語音通訊"</string>
<string name="postal_address" msgid="8765560217149624536">"地址"</string>
<string name="postal_street" msgid="8133143961580058972">"街道"</string>
@@ -418,7 +418,7 @@
<string name="pick_new_photo" msgid="7962368009197147617">"從圖片庫選取新相片"</string>
<string name="locale_change_in_progress" msgid="7583992153091537467">"正在更新聯絡人清單以反映語言變更。"</string>
<string name="upgrade_in_progress" msgid="474511436863451061">"正在更新聯絡人清單。"</string>
- <string name="upgrade_out_of_memory" msgid="1209994418877625940">"正在升級通訊錄。"\n\n"升級程序需要大約 <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MB 的內部儲存空間。"\n\n"請選擇下列其中一個選項："</string>
+ <string name="upgrade_out_of_memory" msgid="1209994418877625940">"正在升級通訊錄。"\n\n"升級程序大約需要 <xliff:g id="SIZE_IN_MEGABYTES">%s</xliff:g> MB 的內部儲存空間。"\n\n"請選擇下列其中一個選項："</string>
<string name="upgrade_out_of_memory_uninstall" msgid="1721798828992091432">"解除安裝一些應用程式"</string>
<string name="upgrade_out_of_memory_retry" msgid="8431289830472724609">"重試升級"</string>
<string name="search_results_searching" msgid="3984833028938569930">"搜尋中…"</string>
diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index 3098864..ac13ba3 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -209,6 +209,9 @@
}
}, FOCUS_DELAY);
}
+
+ // Clear focus and suppress keyboard show-up.
+ mSearchView.clearFocus();
}
@Override
@@ -223,19 +226,6 @@
}
@Override
- public void onStart() {
- super.onStart();
-
- if (mSearchView != null && mSearchView.getVisibility() == View.VISIBLE) {
- if (mSearchView.hasFocus()) {
- showInputMethod(mSearchView.findFocus());
- } else {
- mSearchView.requestFocus();
- }
- }
- }
-
- @Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
diff --git a/src/com/android/contacts/format/DisplayNameFormatter.java b/src/com/android/contacts/format/DisplayNameFormatter.java
deleted file mode 100644
index 2099c53..0000000
--- a/src/com/android/contacts/format/DisplayNameFormatter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.format;
-
-import com.android.contacts.widget.TextWithHighlighting;
-import com.android.contacts.widget.TextWithHighlightingFactory;
-
-import android.database.CharArrayBuffer;
-import android.widget.TextView;
-
-/**
- * Sets the content of the given text view, to contain the formatted display name, with a
- * prefix if necessary.
- */
-public final class DisplayNameFormatter {
- private final CharArrayBuffer mNameBuffer = new CharArrayBuffer(128);
- private final CharArrayBuffer mAlternateNameBuffer = new CharArrayBuffer(128);
- private final PrefixHighlighter mPrefixHighlighter;
-
- private TextWithHighlightingFactory mTextWithHighlightingFactory;
- private TextWithHighlighting mTextWithHighlighting;
- private CharSequence mUnknownNameText;
-
- public DisplayNameFormatter(PrefixHighlighter prefixHighlighter) {
- mPrefixHighlighter = prefixHighlighter;
- }
-
- public CharArrayBuffer getNameBuffer() {
- return mNameBuffer;
- }
-
- public CharArrayBuffer getAlternateNameBuffer() {
- return mAlternateNameBuffer;
- }
-
- public void setUnknownNameText(CharSequence unknownNameText) {
- mUnknownNameText = unknownNameText;
- }
-
- public void setDisplayName(TextView view, int displayOrder,
- boolean highlightingEnabled, char[] highlightedPrefix) {
- view.setText(getDisplayName(displayOrder, highlightingEnabled, highlightedPrefix));
- }
-
- public CharSequence getDisplayName(int displayOrder, boolean highlightingEnabled,
- char[] highlightedPrefix) {
- int size = mNameBuffer.sizeCopied;
- if (size == 0) {
- return mUnknownNameText;
- }
-
- CharSequence text;
- if (highlightingEnabled) {
- if (mTextWithHighlighting == null) {
- mTextWithHighlighting =
- mTextWithHighlightingFactory.createTextWithHighlighting();
- }
- mTextWithHighlighting.setText(mNameBuffer, mAlternateNameBuffer);
- text = mTextWithHighlighting;
- } else {
- text = FormatUtils.charArrayBufferToString(mNameBuffer);
- }
- if (highlightedPrefix != null) {
- text = mPrefixHighlighter.apply(text, highlightedPrefix);
- }
- return text;
- }
-}
diff --git a/src/com/android/contacts/list/ContactListAdapter.java b/src/com/android/contacts/list/ContactListAdapter.java
index bc988e4..1592004 100644
--- a/src/com/android/contacts/list/ContactListAdapter.java
+++ b/src/com/android/contacts/list/ContactListAdapter.java
@@ -38,63 +38,62 @@
*/
public abstract class ContactListAdapter extends ContactEntryListAdapter {
- protected static final String[] PROJECTION_CONTACT = new String[] {
- Contacts._ID, // 0
- Contacts.DISPLAY_NAME_PRIMARY, // 1
- Contacts.DISPLAY_NAME_ALTERNATIVE, // 2
- Contacts.CONTACT_PRESENCE, // 3
- Contacts.CONTACT_STATUS, // 4
- Contacts.PHOTO_ID, // 5
- Contacts.PHOTO_THUMBNAIL_URI, // 6
- Contacts.LOOKUP_KEY, // 7
- Contacts.IS_USER_PROFILE, // 8
- };
+ protected static class ContactQuery {
+ public static final String[] PROJECTION_CONTACT = new String[] {
+ Contacts._ID, // 0
+ Contacts.DISPLAY_NAME_PRIMARY, // 1
+ Contacts.DISPLAY_NAME_ALTERNATIVE, // 2
+ Contacts.CONTACT_PRESENCE, // 3
+ Contacts.CONTACT_STATUS, // 4
+ Contacts.PHOTO_ID, // 5
+ Contacts.PHOTO_THUMBNAIL_URI, // 6
+ Contacts.LOOKUP_KEY, // 7
+ Contacts.IS_USER_PROFILE, // 8
+ };
- protected static final String[] PROJECTION_DATA = new String[] {
- Data.CONTACT_ID, // 0
- Data.DISPLAY_NAME_PRIMARY, // 1
- Data.DISPLAY_NAME_ALTERNATIVE, // 2
- Data.CONTACT_PRESENCE, // 3
- Data.CONTACT_STATUS, // 4
- Data.PHOTO_ID, // 5
- Data.PHOTO_THUMBNAIL_URI, // 6
- Data.LOOKUP_KEY, // 7
- };
+ public static final String[] PROJECTION_DATA = new String[] {
+ Data.CONTACT_ID, // 0
+ Data.DISPLAY_NAME_PRIMARY, // 1
+ Data.DISPLAY_NAME_ALTERNATIVE, // 2
+ Data.CONTACT_PRESENCE, // 3
+ Data.CONTACT_STATUS, // 4
+ Data.PHOTO_ID, // 5
+ Data.PHOTO_THUMBNAIL_URI, // 6
+ Data.LOOKUP_KEY, // 7
+ };
- protected static final String[] FILTER_PROJECTION = new String[] {
- Contacts._ID, // 0
- Contacts.DISPLAY_NAME_PRIMARY, // 1
- Contacts.DISPLAY_NAME_ALTERNATIVE, // 2
- Contacts.CONTACT_PRESENCE, // 3
- Contacts.CONTACT_STATUS, // 4
- Contacts.PHOTO_ID, // 5
- Contacts.PHOTO_THUMBNAIL_URI, // 6
- Contacts.LOOKUP_KEY, // 7
- Contacts.IS_USER_PROFILE, // 8
- SearchSnippetColumns.SNIPPET, // 9
- };
+ public static final String[] FILTER_PROJECTION = new String[] {
+ Contacts._ID, // 0
+ Contacts.DISPLAY_NAME_PRIMARY, // 1
+ Contacts.DISPLAY_NAME_ALTERNATIVE, // 2
+ Contacts.CONTACT_PRESENCE, // 3
+ Contacts.CONTACT_STATUS, // 4
+ Contacts.PHOTO_ID, // 5
+ Contacts.PHOTO_THUMBNAIL_URI, // 6
+ Contacts.LOOKUP_KEY, // 7
+ Contacts.IS_USER_PROFILE, // 8
+ SearchSnippetColumns.SNIPPET, // 9
+ };
- protected static final int CONTACT_ID_COLUMN_INDEX = 0;
- protected static final int CONTACT_DISPLAY_NAME_PRIMARY_COLUMN_INDEX = 1;
- protected static final int CONTACT_DISPLAY_NAME_ALTERNATIVE_COLUMN_INDEX = 2;
- protected static final int CONTACT_PRESENCE_STATUS_COLUMN_INDEX = 3;
- protected static final int CONTACT_CONTACT_STATUS_COLUMN_INDEX = 4;
- protected static final int CONTACT_PHOTO_ID_COLUMN_INDEX = 5;
- protected static final int CONTACT_PHOTO_URI_COLUMN_INDEX = 6;
- protected static final int CONTACT_LOOKUP_KEY_COLUMN_INDEX = 7;
- protected static final int CONTACT_IS_USER_PROFILE = 8;
- protected static final int CONTACT_SNIPPET_COLUMN_INDEX = 9;
+ public static final int CONTACT_ID = 0;
+ public static final int CONTACT_DISPLAY_NAME_PRIMARY = 1;
+ public static final int CONTACT_DISPLAY_NAME_ALTERNATIVE = 2;
+ public static final int CONTACT_PRESENCE_STATUS = 3;
+ public static final int CONTACT_CONTACT_STATUS = 4;
+ public static final int CONTACT_PHOTO_ID = 5;
+ public static final int CONTACT_PHOTO_URI = 6;
+ public static final int CONTACT_LOOKUP_KEY = 7;
+ public static final int CONTACT_IS_USER_PROFILE = 8;
+ public static final int CONTACT_SNIPPET = 9;
+ }
private CharSequence mUnknownNameText;
private int mDisplayNameColumnIndex;
- private int mAlternativeDisplayNameColumnIndex;
private long mSelectedContactDirectoryId;
private String mSelectedContactLookupKey;
private long mSelectedContactId;
- private ContactListFilter mFilter;
-
public ContactListAdapter(Context context) {
super(context);
@@ -137,11 +136,9 @@
public void setContactNameDisplayOrder(int displayOrder) {
super.setContactNameDisplayOrder(displayOrder);
if (getContactNameDisplayOrder() == ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY) {
- mDisplayNameColumnIndex = CONTACT_DISPLAY_NAME_PRIMARY_COLUMN_INDEX;
- mAlternativeDisplayNameColumnIndex = CONTACT_DISPLAY_NAME_ALTERNATIVE_COLUMN_INDEX;
+ mDisplayNameColumnIndex = ContactQuery.CONTACT_DISPLAY_NAME_PRIMARY;
} else {
- mDisplayNameColumnIndex = CONTACT_DISPLAY_NAME_ALTERNATIVE_COLUMN_INDEX;
- mAlternativeDisplayNameColumnIndex = CONTACT_DISPLAY_NAME_PRIMARY_COLUMN_INDEX;
+ mDisplayNameColumnIndex = ContactQuery.CONTACT_DISPLAY_NAME_ALTERNATIVE;
}
}
@@ -156,8 +153,8 @@
}
public Uri getContactUri(int partitionIndex, Cursor cursor) {
- long contactId = cursor.getLong(CONTACT_ID_COLUMN_INDEX);
- String lookupKey = cursor.getString(CONTACT_LOOKUP_KEY_COLUMN_INDEX);
+ long contactId = cursor.getLong(ContactQuery.CONTACT_ID);
+ String lookupKey = cursor.getString(ContactQuery.CONTACT_LOOKUP_KEY);
Uri uri = Contacts.getLookupUri(contactId, lookupKey);
long directoryId = ((DirectoryPartition)getPartition(partitionIndex)).getDirectoryId();
if (directoryId != Directory.DEFAULT) {
@@ -180,12 +177,12 @@
}
String lookupKey = getSelectedContactLookupKey();
if (lookupKey != null && TextUtils.equals(lookupKey,
- cursor.getString(CONTACT_LOOKUP_KEY_COLUMN_INDEX))) {
+ cursor.getString(ContactQuery.CONTACT_LOOKUP_KEY))) {
return true;
}
return directoryId != Directory.DEFAULT && directoryId != Directory.LOCAL_INVISIBLE
- && getSelectedContactId() == cursor.getLong(CONTACT_ID_COLUMN_INDEX);
+ && getSelectedContactId() == cursor.getLong(ContactQuery.CONTACT_ID);
}
@Override
@@ -204,7 +201,7 @@
Placement placement = getItemPlacementInSection(position);
// First position, set the contacts number string
- if (position == 0 && cursor.getInt(CONTACT_IS_USER_PROFILE) == 1) {
+ if (position == 0 && cursor.getInt(ContactQuery.CONTACT_IS_USER_PROFILE) == 1) {
view.setCountView(getContactsCount());
} else {
view.setCountView(null);
@@ -226,32 +223,31 @@
// Set the photo, if available
long photoId = 0;
- if (!cursor.isNull(CONTACT_PHOTO_ID_COLUMN_INDEX)) {
- photoId = cursor.getLong(CONTACT_PHOTO_ID_COLUMN_INDEX);
+ if (!cursor.isNull(ContactQuery.CONTACT_PHOTO_ID)) {
+ photoId = cursor.getLong(ContactQuery.CONTACT_PHOTO_ID);
}
if (photoId != 0) {
getPhotoLoader().loadPhoto(view.getPhotoView(), photoId, false, false);
} else {
- final String photoUriString = cursor.getString(CONTACT_PHOTO_URI_COLUMN_INDEX);
+ final String photoUriString = cursor.getString(ContactQuery.CONTACT_PHOTO_URI);
final Uri photoUri = photoUriString == null ? null : Uri.parse(photoUriString);
getPhotoLoader().loadPhoto(view.getPhotoView(), photoUri, false, false);
}
}
protected void bindName(final ContactListItemView view, Cursor cursor) {
- view.showDisplayName(cursor, mDisplayNameColumnIndex, mAlternativeDisplayNameColumnIndex,
- false, getContactNameDisplayOrder());
+ view.showDisplayName(cursor, mDisplayNameColumnIndex, getContactNameDisplayOrder());
// Note: we don't show phonetic any more (See issue 5265330)
}
protected void bindPresenceAndStatusMessage(final ContactListItemView view, Cursor cursor) {
- view.showPresenceAndStatusMessage(cursor, CONTACT_PRESENCE_STATUS_COLUMN_INDEX,
- CONTACT_CONTACT_STATUS_COLUMN_INDEX);
+ view.showPresenceAndStatusMessage(cursor, ContactQuery.CONTACT_PRESENCE_STATUS,
+ ContactQuery.CONTACT_CONTACT_STATUS);
}
protected void bindSearchSnippet(final ContactListItemView view, Cursor cursor) {
- view.showSnippet(cursor, CONTACT_SNIPPET_COLUMN_INDEX);
+ view.showSnippet(cursor, ContactQuery.CONTACT_SNIPPET);
}
public int getSelectedContactPosition() {
@@ -282,7 +278,7 @@
int offset = -1;
while (cursor.moveToNext()) {
if (mSelectedContactLookupKey != null) {
- String lookupKey = cursor.getString(CONTACT_LOOKUP_KEY_COLUMN_INDEX);
+ String lookupKey = cursor.getString(ContactQuery.CONTACT_LOOKUP_KEY);
if (mSelectedContactLookupKey.equals(lookupKey)) {
offset = cursor.getPosition();
break;
@@ -290,7 +286,7 @@
}
if (mSelectedContactId != 0 && (mSelectedContactDirectoryId == Directory.DEFAULT
|| mSelectedContactDirectoryId == Directory.LOCAL_INVISIBLE)) {
- long contactId = cursor.getLong(CONTACT_ID_COLUMN_INDEX);
+ long contactId = cursor.getLong(ContactQuery.CONTACT_ID);
if (contactId == mSelectedContactId) {
offset = cursor.getPosition();
break;
@@ -342,7 +338,7 @@
// Check if a profile exists
if (cursor != null && cursor.getCount() > 0) {
cursor.moveToFirst();
- setProfileExists(cursor.getInt(CONTACT_IS_USER_PROFILE) == 1);
+ setProfileExists(cursor.getInt(ContactQuery.CONTACT_IS_USER_PROFILE) == 1);
}
}
}
diff --git a/src/com/android/contacts/list/ContactListItemView.java b/src/com/android/contacts/list/ContactListItemView.java
index 5617664..4390d78 100644
--- a/src/com/android/contacts/list/ContactListItemView.java
+++ b/src/com/android/contacts/list/ContactListItemView.java
@@ -19,7 +19,6 @@
import com.android.contacts.ContactPresenceIconUtil;
import com.android.contacts.ContactStatusUtil;
import com.android.contacts.R;
-import com.android.contacts.format.DisplayNameFormatter;
import com.android.contacts.format.PrefixHighlighter;
import android.content.Context;
@@ -36,7 +35,7 @@
import android.provider.ContactsContract;
import android.provider.ContactsContract.Contacts;
import android.text.Spannable;
-import android.text.SpannableStringBuilder;
+import android.text.SpannableString;
import android.text.TextUtils;
import android.text.TextUtils.TruncateAt;
import android.util.AttributeSet;
@@ -188,8 +187,14 @@
private int mLabelAndDataViewMaxHeight;
private OnClickListener mCallButtonClickListener;
- private CharArrayBuffer mDataBuffer = new CharArrayBuffer(128);
- private CharArrayBuffer mPhoneticNameBuffer = new CharArrayBuffer(128);
+ // TODO: some TextView fields are using CharArrayBuffer while some are not. Determine which is
+ // more efficient for each case or in general, and simplify the whole implementation.
+ // Note: if we're sure MARQUEE will be used every time, there's no reason to use
+ // CharArrayBuffer, since MARQUEE requires Span and thus we need to copy characters inside the
+ // buffer to Spannable once, while CharArrayBuffer is for directly applying char array to
+ // TextView without any modification.
+ private final CharArrayBuffer mDataBuffer = new CharArrayBuffer(128);
+ private final CharArrayBuffer mPhoneticNameBuffer = new CharArrayBuffer(128);
private boolean mActivatedStateSupported;
@@ -197,8 +202,7 @@
/** A helper used to highlight a prefix in a text field. */
private PrefixHighlighter mPrefixHighligher;
- /** A helper used to format display names. */
- private DisplayNameFormatter mDisplayNameFormatter;
+ private CharSequence mUnknownNameText;
/**
* Special class to allow the parent to be pressed without being pressed itself.
@@ -295,8 +299,6 @@
if (mActivatedBackgroundDrawable != null) {
mActivatedBackgroundDrawable.setCallback(this);
}
-
- mDisplayNameFormatter = new DisplayNameFormatter(mPrefixHighligher);
}
/**
@@ -307,7 +309,7 @@
}
public void setUnknownNameText(CharSequence unknownNameText) {
- mDisplayNameFormatter.setUnknownNameText(unknownNameText);
+ mUnknownNameText = unknownNameText;
}
public void setQuickContactEnabled(boolean flag) {
@@ -790,7 +792,7 @@
mHeaderDivider.setBackgroundColor(mHeaderUnderlineColor);
addView(mHeaderDivider);
}
- mHeaderTextView.setText(getMarqueeText(title));
+ setMarqueeText(mHeaderTextView, title);
mHeaderTextView.setVisibility(View.VISIBLE);
mHeaderDivider.setVisibility(View.VISIBLE);
mHeaderTextView.setAllCaps(true);
@@ -936,7 +938,7 @@
}
} else {
getPhoneticNameTextView();
- mPhoneticNameTextView.setText(getMarqueeText(text, size));
+ setMarqueeText(mPhoneticNameTextView, text, size);
mPhoneticNameTextView.setVisibility(VISIBLE);
}
}
@@ -967,22 +969,7 @@
}
} else {
getLabelView();
- mLabelView.setText(getMarqueeText(text));
- mLabelView.setVisibility(VISIBLE);
- }
- }
-
- /**
- * Adds or updates a text view for the data label.
- */
- public void setLabel(char[] text, int size) {
- if (text == null || size == 0) {
- if (mLabelView != null) {
- mLabelView.setVisibility(View.GONE);
- }
- } else {
- getLabelView();
- mLabelView.setText(getMarqueeText(text, size));
+ setMarqueeText(mLabelView, text);
mLabelView.setVisibility(VISIBLE);
}
}
@@ -1017,28 +1004,31 @@
if (mDataView != null) {
mDataView.setVisibility(View.GONE);
}
- return;
} else {
getDataView();
- mDataView.setText(getMarqueeText(text, size));
+ setMarqueeText(mDataView, text, size);
mDataView.setVisibility(VISIBLE);
}
}
- private CharSequence getMarqueeText(char[] text, int size) {
- return getMarqueeText(new String(text, 0, size));
+ private void setMarqueeText(TextView textView, char[] text, int size) {
+ if (getTextEllipsis() == TruncateAt.MARQUEE) {
+ setMarqueeText(textView, new String(text, 0, size));
+ } else {
+ textView.setText(text, 0, size);
+ }
}
- private CharSequence getMarqueeText(CharSequence text) {
+ private void setMarqueeText(TextView textView, CharSequence text) {
if (getTextEllipsis() == TruncateAt.MARQUEE) {
// To show MARQUEE correctly (with END effect during non-active state), we need
// to build Spanned with MARQUEE in addition to TextView's ellipsize setting.
- final SpannableStringBuilder builder = new SpannableStringBuilder(text);
- builder.setSpan(TruncateAt.MARQUEE, 0, builder.length(),
+ final SpannableString spannable = new SpannableString(text);
+ spannable.setSpan(TruncateAt.MARQUEE, 0, spannable.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
- return builder;
+ textView.setText(spannable);
} else {
- return text;
+ textView.setText(text);
}
}
@@ -1128,7 +1118,7 @@
}
} else {
getCountView();
- mCountView.setText(getMarqueeText(text));
+ setMarqueeText(mCountView, text);
mCountView.setTextSize(TypedValue.COMPLEX_UNIT_PX, mCountViewTextSize);
mCountView.setGravity(Gravity.CENTER_VERTICAL);
mCountView.setTextColor(mContactsCountTextColor);
@@ -1146,7 +1136,7 @@
}
} else {
getStatusView();
- mStatusView.setText(getMarqueeText(text));
+ setMarqueeText(mStatusView, text);
mStatusView.setVisibility(VISIBLE);
}
}
@@ -1174,16 +1164,14 @@
return TruncateAt.MARQUEE;
}
- public void showDisplayName(Cursor cursor, int nameColumnIndex, int alternativeNameColumnIndex,
- boolean highlightingEnabled, int displayOrder) {
- // Copy out the display name and alternate display name.
- cursor.copyStringToBuffer(nameColumnIndex, mDisplayNameFormatter.getNameBuffer());
- cursor.copyStringToBuffer(alternativeNameColumnIndex,
- mDisplayNameFormatter.getAlternateNameBuffer());
-
- CharSequence displayName = mDisplayNameFormatter.getDisplayName(
- displayOrder, highlightingEnabled, mHighlightedPrefix);
- getNameTextView().setText(getMarqueeText(displayName));
+ public void showDisplayName(Cursor cursor, int nameColumnIndex, int displayOrder) {
+ CharSequence name = cursor.getString(nameColumnIndex);
+ if (!TextUtils.isEmpty(name)) {
+ name = mPrefixHighligher.apply(name, mHighlightedPrefix);
+ } else {
+ name = mUnknownNameText;
+ }
+ setMarqueeText(getNameTextView(), name);
// Since the quick contact content description is derived from the display name and there is
// no guarantee that when the quick contact is initialized the display name is already set,
diff --git a/src/com/android/contacts/list/DefaultContactListAdapter.java b/src/com/android/contacts/list/DefaultContactListAdapter.java
index 3409f56..deab8ab 100644
--- a/src/com/android/contacts/list/DefaultContactListAdapter.java
+++ b/src/com/android/contacts/list/DefaultContactListAdapter.java
@@ -72,7 +72,7 @@
// Regardless of the directory, we don't want anything returned,
// so let's just send a "nothing" query to the local directory.
loader.setUri(Contacts.CONTENT_URI);
- loader.setProjection(PROJECTION_CONTACT);
+ loader.setProjection(ContactQuery.PROJECTION_CONTACT);
loader.setSelection("0");
} else {
Builder builder = Contacts.CONTENT_FILTER_URI.buildUpon();
@@ -87,7 +87,7 @@
SNIPPET_ARGS);
builder.appendQueryParameter(SearchSnippetColumns.DEFERRED_SNIPPETING_KEY,"1");
loader.setUri(builder.build());
- loader.setProjection(FILTER_PROJECTION);
+ loader.setProjection(ContactQuery.FILTER_PROJECTION);
}
} else {
configureUri(loader, directoryId, filter);
@@ -139,9 +139,9 @@
protected void configureProjection(
CursorLoader loader, long directoryId, ContactListFilter filter) {
if (filter != null && filter.filterType == ContactListFilter.FILTER_TYPE_GROUP) {
- loader.setProjection(PROJECTION_DATA);
+ loader.setProjection(ContactQuery.PROJECTION_DATA);
} else {
- loader.setProjection(PROJECTION_CONTACT);
+ loader.setProjection(ContactQuery.PROJECTION_CONTACT);
}
}
@@ -228,9 +228,8 @@
bindSectionHeaderAndDivider(view, position, cursor);
if (isQuickContactEnabled()) {
- bindQuickContact(view, partition, cursor,
- CONTACT_PHOTO_ID_COLUMN_INDEX, CONTACT_ID_COLUMN_INDEX,
- CONTACT_LOOKUP_KEY_COLUMN_INDEX);
+ bindQuickContact(view, partition, cursor, ContactQuery.CONTACT_PHOTO_ID,
+ ContactQuery.CONTACT_ID, ContactQuery.CONTACT_LOOKUP_KEY);
} else {
bindPhoto(view, partition, cursor);
}
diff --git a/src/com/android/contacts/list/EmailAddressListAdapter.java b/src/com/android/contacts/list/EmailAddressListAdapter.java
index 52daaa0..e0c561f 100644
--- a/src/com/android/contacts/list/EmailAddressListAdapter.java
+++ b/src/com/android/contacts/list/EmailAddressListAdapter.java
@@ -34,27 +34,34 @@
*/
public class EmailAddressListAdapter extends ContactEntryListAdapter {
- static final String[] EMAILS_PROJECTION = new String[] {
- Email._ID, // 0
- Email.TYPE, // 1
- Email.LABEL, // 2
- Email.DATA, // 3
- Email.DISPLAY_NAME_PRIMARY, // 4
- Email.DISPLAY_NAME_ALTERNATIVE, // 5
- Email.PHOTO_ID, // 6
- };
+ protected static class EmailQuery {
+ private static final String[] PROJECTION_PRIMARY = new String[] {
+ Email._ID, // 0
+ Email.TYPE, // 1
+ Email.LABEL, // 2
+ Email.DATA, // 3
+ Email.PHOTO_ID, // 4
+ Email.DISPLAY_NAME_PRIMARY, // 5
+ };
- protected static final int EMAIL_ID_COLUMN_INDEX = 0;
- protected static final int EMAIL_TYPE_COLUMN_INDEX = 1;
- protected static final int EMAIL_LABEL_COLUMN_INDEX = 2;
- protected static final int EMAIL_ADDRESS_COLUMN_INDEX = 3;
- protected static final int EMAIL_PRIMARY_DISPLAY_NAME_COLUMN_INDEX = 4;
- protected static final int EMAIL_ALTERNATIVE_DISPLAY_NAME_COLUMN_INDEX = 5;
- protected static final int EMAIL_PHOTO_ID_COLUMN_INDEX = 6;
+ private static final String[] PROJECTION_ALTERNATIVE = new String[] {
+ Email._ID, // 0
+ Email.TYPE, // 1
+ Email.LABEL, // 2
+ Email.DATA, // 3
+ Email.PHOTO_ID, // 4
+ Email.DISPLAY_NAME_ALTERNATIVE, // 5
+ };
- private CharSequence mUnknownNameText;
- private int mDisplayNameColumnIndex;
- private int mAlternativeDisplayNameColumnIndex;
+ public static final int EMAIL_ID = 0;
+ public static final int EMAIL_TYPE = 1;
+ public static final int EMAIL_LABEL = 2;
+ public static final int EMAIL_ADDRESS = 3;
+ public static final int EMAIL_PHOTO_ID = 4;
+ public static final int EMAIL_DISPLAY_NAME = 5;
+ }
+
+ private final CharSequence mUnknownNameText;
public EmailAddressListAdapter(Context context) {
super(context);
@@ -75,7 +82,12 @@
builder.appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
String.valueOf(directoryId));
loader.setUri(builder.build());
- loader.setProjection(EMAILS_PROJECTION);
+
+ if (getContactNameDisplayOrder() == ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY) {
+ loader.setProjection(EmailQuery.PROJECTION_PRIMARY);
+ } else {
+ loader.setProjection(EmailQuery.PROJECTION_ALTERNATIVE);
+ }
if (getSortOrder() == ContactsContract.Preferences.SORT_ORDER_PRIMARY) {
loader.setSortOrder(Email.SORT_KEY_PRIMARY);
@@ -91,19 +103,7 @@
@Override
public String getContactDisplayName(int position) {
- return ((Cursor)getItem(position)).getString(mDisplayNameColumnIndex);
- }
-
- @Override
- public void setContactNameDisplayOrder(int displayOrder) {
- super.setContactNameDisplayOrder(displayOrder);
- if (getContactNameDisplayOrder() == ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY) {
- mDisplayNameColumnIndex = EMAIL_PRIMARY_DISPLAY_NAME_COLUMN_INDEX;
- mAlternativeDisplayNameColumnIndex = EMAIL_ALTERNATIVE_DISPLAY_NAME_COLUMN_INDEX;
- } else {
- mDisplayNameColumnIndex = EMAIL_ALTERNATIVE_DISPLAY_NAME_COLUMN_INDEX;
- mAlternativeDisplayNameColumnIndex = EMAIL_PRIMARY_DISPLAY_NAME_COLUMN_INDEX;
- }
+ return ((Cursor) getItem(position)).getString(EmailQuery.EMAIL_DISPLAY_NAME);
}
/**
@@ -111,7 +111,7 @@
* position.
*/
public Uri getDataUri(int position) {
- long id = ((Cursor)getItem(position)).getLong(EMAIL_ID_COLUMN_INDEX);
+ long id = ((Cursor)getItem(position)).getLong(EmailQuery.EMAIL_ID);
return ContentUris.withAppendedId(Data.CONTENT_URI, id);
}
@@ -135,15 +135,15 @@
protected void bindEmailAddress(ContactListItemView view, Cursor cursor) {
CharSequence label = null;
- if (!cursor.isNull(EMAIL_TYPE_COLUMN_INDEX)) {
- final int type = cursor.getInt(EMAIL_TYPE_COLUMN_INDEX);
- final String customLabel = cursor.getString(EMAIL_LABEL_COLUMN_INDEX);
+ if (!cursor.isNull(EmailQuery.EMAIL_TYPE)) {
+ final int type = cursor.getInt(EmailQuery.EMAIL_TYPE);
+ final String customLabel = cursor.getString(EmailQuery.EMAIL_LABEL);
// TODO cache
label = Email.getTypeLabel(getContext().getResources(), type, customLabel);
}
view.setLabel(label);
- view.showData(cursor, EMAIL_ADDRESS_COLUMN_INDEX);
+ view.showData(cursor, EmailQuery.EMAIL_ADDRESS);
}
protected void bindSectionHeaderAndDivider(final ContactListItemView view, int position) {
@@ -165,14 +165,13 @@
}
protected void bindName(final ContactListItemView view, Cursor cursor) {
- view.showDisplayName(cursor, mDisplayNameColumnIndex, mAlternativeDisplayNameColumnIndex,
- false, getContactNameDisplayOrder());
+ view.showDisplayName(cursor, EmailQuery.EMAIL_DISPLAY_NAME, getContactNameDisplayOrder());
}
protected void bindPhoto(final ContactListItemView view, Cursor cursor) {
long photoId = 0;
- if (!cursor.isNull(EMAIL_PHOTO_ID_COLUMN_INDEX)) {
- photoId = cursor.getLong(EMAIL_PHOTO_ID_COLUMN_INDEX);
+ if (!cursor.isNull(EmailQuery.EMAIL_PHOTO_ID)) {
+ photoId = cursor.getLong(EmailQuery.EMAIL_PHOTO_ID);
}
getPhotoLoader().loadPhoto(view.getPhotoView(), photoId, false, false);
diff --git a/src/com/android/contacts/list/JoinContactListAdapter.java b/src/com/android/contacts/list/JoinContactListAdapter.java
index 73bca52..b81dd3b 100644
--- a/src/com/android/contacts/list/JoinContactListAdapter.java
+++ b/src/com/android/contacts/list/JoinContactListAdapter.java
@@ -43,15 +43,12 @@
private long mTargetContactId;
- private int mShowAllContactsViewType;
-
public JoinContactListAdapter(Context context) {
super(context);
setPinnedPartitionHeadersEnabled(true);
setSectionHeaderDisplayEnabled(true);
setIndexedPartition(PARTITION_ALL_CONTACTS);
setDirectorySearchMode(DirectoryListLoader.SEARCH_MODE_NONE);
- mShowAllContactsViewType = getViewTypeCount() - 1;
}
@Override
@@ -86,7 +83,7 @@
loader.setSuggestionUri(builder.build());
// TODO simplify projection
- loader.setProjection(PROJECTION_CONTACT);
+ loader.setProjection(ContactQuery.PROJECTION_CONTACT);
Uri allContactsUri = buildSectionIndexerUri(Contacts.CONTENT_URI).buildUpon()
.appendQueryParameter(
ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT))
@@ -193,16 +190,16 @@
}
public Cursor getShowAllContactsLabelCursor() {
- MatrixCursor matrixCursor = new MatrixCursor(PROJECTION_CONTACT);
- Object[] row = new Object[PROJECTION_CONTACT.length];
+ MatrixCursor matrixCursor = new MatrixCursor(ContactQuery.PROJECTION_CONTACT);
+ Object[] row = new Object[ContactQuery.PROJECTION_CONTACT.length];
matrixCursor.addRow(row);
return matrixCursor;
}
@Override
public Uri getContactUri(int partitionIndex, Cursor cursor) {
- long contactId = cursor.getLong(CONTACT_ID_COLUMN_INDEX);
- String lookupKey = cursor.getString(CONTACT_LOOKUP_KEY_COLUMN_INDEX);
+ long contactId = cursor.getLong(ContactQuery.CONTACT_ID);
+ String lookupKey = cursor.getString(ContactQuery.CONTACT_LOOKUP_KEY);
return Contacts.getLookupUri(contactId, lookupKey);
}
}
diff --git a/src/com/android/contacts/list/LegacyContactListAdapter.java b/src/com/android/contacts/list/LegacyContactListAdapter.java
index b21d484..dbdce5e 100644
--- a/src/com/android/contacts/list/LegacyContactListAdapter.java
+++ b/src/com/android/contacts/list/LegacyContactListAdapter.java
@@ -85,7 +85,7 @@
}
protected void bindName(final ContactListItemView view, Cursor cursor) {
- view.showDisplayName(cursor, PERSON_DISPLAY_NAME_COLUMN_INDEX, 0, false,
+ view.showDisplayName(cursor, PERSON_DISPLAY_NAME_COLUMN_INDEX,
getContactNameDisplayOrder());
view.showPhoneticName(cursor, PERSON_PHONETIC_NAME_COLUMN_INDEX);
}
diff --git a/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java b/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java
index 547650d..1ef106a 100644
--- a/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java
+++ b/src/com/android/contacts/list/LegacyPhoneNumberListAdapter.java
@@ -89,8 +89,7 @@
}
protected void bindName(final ContactListItemView view, Cursor cursor) {
- view.showDisplayName(cursor, PHONE_DISPLAY_NAME_COLUMN_INDEX, 0, false,
- getContactNameDisplayOrder());
+ view.showDisplayName(cursor, PHONE_DISPLAY_NAME_COLUMN_INDEX, getContactNameDisplayOrder());
view.showPhoneticName(cursor, PHONE_PHONETIC_NAME_COLUMN_INDEX);
}
diff --git a/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java b/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java
index 48b3f0c..91a0e3b 100644
--- a/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java
+++ b/src/com/android/contacts/list/LegacyPostalAddressListAdapter.java
@@ -90,7 +90,7 @@
}
protected void bindName(final ContactListItemView view, Cursor cursor) {
- view.showDisplayName(cursor, POSTAL_DISPLAY_NAME_COLUMN_INDEX, 0, false,
+ view.showDisplayName(cursor, POSTAL_DISPLAY_NAME_COLUMN_INDEX,
getContactNameDisplayOrder());
view.showPhoneticName(cursor, POSTAL_PHONETIC_NAME_COLUMN_INDEX);
}
diff --git a/src/com/android/contacts/list/PhoneNumberListAdapter.java b/src/com/android/contacts/list/PhoneNumberListAdapter.java
index 459d232..d55787b 100644
--- a/src/com/android/contacts/list/PhoneNumberListAdapter.java
+++ b/src/com/android/contacts/list/PhoneNumberListAdapter.java
@@ -22,7 +22,6 @@
import android.net.Uri;
import android.net.Uri.Builder;
import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.provider.ContactsContract.ContactCounts;
import android.provider.ContactsContract.Contacts;
@@ -43,31 +42,40 @@
public class PhoneNumberListAdapter extends ContactEntryListAdapter {
private static final String TAG = PhoneNumberListAdapter.class.getSimpleName();
- protected static final String[] PHONES_PROJECTION = new String[] {
- Phone._ID, // 0
- Phone.TYPE, // 1
- Phone.LABEL, // 2
- Phone.NUMBER, // 3
- Phone.DISPLAY_NAME_PRIMARY, // 4
- Phone.DISPLAY_NAME_ALTERNATIVE, // 5
- Phone.CONTACT_ID, // 6
- Phone.LOOKUP_KEY, // 7
- Phone.PHOTO_ID, // 8
- };
+ protected static class PhoneQuery {
+ private static final String[] PROJECTION_PRIMARY = new String[] {
+ Phone._ID, // 0
+ Phone.TYPE, // 1
+ Phone.LABEL, // 2
+ Phone.NUMBER, // 3
+ Phone.CONTACT_ID, // 4
+ Phone.LOOKUP_KEY, // 5
+ Phone.PHOTO_ID, // 6
+ Phone.DISPLAY_NAME_PRIMARY, // 7
+ };
- protected static final int PHONE_ID_COLUMN_INDEX = 0;
- protected static final int PHONE_TYPE_COLUMN_INDEX = 1;
- protected static final int PHONE_LABEL_COLUMN_INDEX = 2;
- protected static final int PHONE_NUMBER_COLUMN_INDEX = 3;
- protected static final int PHONE_PRIMARY_DISPLAY_NAME_COLUMN_INDEX = 4;
- protected static final int PHONE_ALTERNATIVE_DISPLAY_NAME_COLUMN_INDEX = 5;
- protected static final int PHONE_CONTACT_ID_COLUMN_INDEX = 6;
- protected static final int PHONE_LOOKUP_KEY_COLUMN_INDEX = 7;
- protected static final int PHONE_PHOTO_ID_COLUMN_INDEX = 8;
+ private static final String[] PROJECTION_ALTERNATIVE = new String[] {
+ Phone._ID, // 0
+ Phone.TYPE, // 1
+ Phone.LABEL, // 2
+ Phone.NUMBER, // 3
+ Phone.CONTACT_ID, // 4
+ Phone.LOOKUP_KEY, // 5
+ Phone.PHOTO_ID, // 6
+ Phone.DISPLAY_NAME_ALTERNATIVE, // 7
+ };
- private CharSequence mUnknownNameText;
- private int mDisplayNameColumnIndex;
- private int mAlternativeDisplayNameColumnIndex;
+ public static final int PHONE_ID = 0;
+ public static final int PHONE_TYPE = 1;
+ public static final int PHONE_LABEL = 2;
+ public static final int PHONE_NUMBER = 3;
+ public static final int PHONE_CONTACT_ID = 4;
+ public static final int PHONE_LOOKUP_KEY = 5;
+ public static final int PHONE_PHOTO_ID = 6;
+ public static final int PHONE_DISPLAY_NAME = 7;
+ }
+
+ private final CharSequence mUnknownNameText;
private ContactListItemView.PhotoPosition mPhotoPosition;
@@ -102,8 +110,6 @@
builder.appendQueryParameter(ContactsContract.DIRECTORY_PARAM_KEY,
String.valueOf(directoryId));
uri = builder.build();
- // TODO a projection that includes the search snippet
- loader.setProjection(PHONES_PROJECTION);
} else {
uri = Phone.CONTENT_URI.buildUpon().appendQueryParameter(
ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT))
@@ -111,14 +117,18 @@
if (isSectionHeaderDisplayEnabled()) {
uri = buildSectionIndexerUri(uri);
}
-
- loader.setProjection(PHONES_PROJECTION);
configureSelection(loader, directoryId, getFilter());
}
loader.setUri(uri);
- // TODO: we probably want to use default sort order in search mode.
+ // TODO a projection that includes the search snippet
+ if (getContactNameDisplayOrder() == ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY) {
+ loader.setProjection(PhoneQuery.PROJECTION_PRIMARY);
+ } else {
+ loader.setProjection(PhoneQuery.PROJECTION_ALTERNATIVE);
+ }
+
if (getSortOrder() == ContactsContract.Preferences.SORT_ORDER_PRIMARY) {
loader.setSortOrder(Phone.SORT_KEY_PRIMARY);
} else {
@@ -180,19 +190,7 @@
@Override
public String getContactDisplayName(int position) {
- return ((Cursor)getItem(position)).getString(mDisplayNameColumnIndex);
- }
-
- @Override
- public void setContactNameDisplayOrder(int displayOrder) {
- super.setContactNameDisplayOrder(displayOrder);
- if (getContactNameDisplayOrder() == ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY) {
- mDisplayNameColumnIndex = PHONE_PRIMARY_DISPLAY_NAME_COLUMN_INDEX;
- mAlternativeDisplayNameColumnIndex = PHONE_ALTERNATIVE_DISPLAY_NAME_COLUMN_INDEX;
- } else {
- mDisplayNameColumnIndex = PHONE_ALTERNATIVE_DISPLAY_NAME_COLUMN_INDEX;
- mAlternativeDisplayNameColumnIndex = PHONE_PRIMARY_DISPLAY_NAME_COLUMN_INDEX;
- }
+ return ((Cursor) getItem(position)).getString(PhoneQuery.PHONE_DISPLAY_NAME);
}
/**
@@ -203,7 +201,7 @@
public Uri getDataUri(int position) {
Cursor cursor = ((Cursor)getItem(position));
if (cursor != null) {
- long id = cursor.getLong(PHONE_ID_COLUMN_INDEX);
+ long id = cursor.getLong(PhoneQuery.PHONE_ID);
return ContentUris.withAppendedId(Data.CONTENT_URI, id);
} else {
Log.w(TAG, "Cursor was null in getDataUri() call. Returning null instead.");
@@ -233,16 +231,16 @@
cursor.moveToPosition(position);
boolean isFirstEntry = true;
boolean showBottomDivider = true;
- final long currentContactId = cursor.getLong(PHONE_CONTACT_ID_COLUMN_INDEX);
+ final long currentContactId = cursor.getLong(PhoneQuery.PHONE_CONTACT_ID);
if (cursor.moveToPrevious() && !cursor.isBeforeFirst()) {
- final long previousContactId = cursor.getLong(PHONE_CONTACT_ID_COLUMN_INDEX);
+ final long previousContactId = cursor.getLong(PhoneQuery.PHONE_CONTACT_ID);
if (currentContactId == previousContactId) {
isFirstEntry = false;
}
}
cursor.moveToPosition(position);
if (cursor.moveToNext() && !cursor.isAfterLast()) {
- final long nextContactId = cursor.getLong(PHONE_CONTACT_ID_COLUMN_INDEX);
+ final long nextContactId = cursor.getLong(PhoneQuery.PHONE_CONTACT_ID);
if (currentContactId == nextContactId) {
// The following entry should be in the same group, which means we don't want a
// divider between them.
@@ -257,9 +255,8 @@
if (isFirstEntry) {
bindName(view, cursor);
if (isQuickContactEnabled()) {
- bindQuickContact(view, partition, cursor,
- PHONE_PHOTO_ID_COLUMN_INDEX, PHONE_CONTACT_ID_COLUMN_INDEX,
- PHONE_LOOKUP_KEY_COLUMN_INDEX);
+ bindQuickContact(view, partition, cursor, PhoneQuery.PHONE_PHOTO_ID,
+ PhoneQuery.PHONE_CONTACT_ID, PhoneQuery.PHONE_LOOKUP_KEY);
} else {
bindPhoto(view, cursor);
}
@@ -274,15 +271,15 @@
protected void bindPhoneNumber(ContactListItemView view, Cursor cursor) {
CharSequence label = null;
- if (!cursor.isNull(PHONE_TYPE_COLUMN_INDEX)) {
- final int type = cursor.getInt(PHONE_TYPE_COLUMN_INDEX);
- final String customLabel = cursor.getString(PHONE_LABEL_COLUMN_INDEX);
+ if (!cursor.isNull(PhoneQuery.PHONE_TYPE)) {
+ final int type = cursor.getInt(PhoneQuery.PHONE_TYPE);
+ final String customLabel = cursor.getString(PhoneQuery.PHONE_LABEL);
// TODO cache
label = Phone.getTypeLabel(getContext().getResources(), type, customLabel);
}
view.setLabel(label);
- view.showData(cursor, PHONE_NUMBER_COLUMN_INDEX);
+ view.showData(cursor, PhoneQuery.PHONE_NUMBER);
}
protected void bindSectionHeaderAndDivider(final ContactListItemView view, int position) {
@@ -297,8 +294,7 @@
}
protected void bindName(final ContactListItemView view, Cursor cursor) {
- view.showDisplayName(cursor, mDisplayNameColumnIndex, mAlternativeDisplayNameColumnIndex,
- false, getContactNameDisplayOrder());
+ view.showDisplayName(cursor, PhoneQuery.PHONE_DISPLAY_NAME, getContactNameDisplayOrder());
// Note: we don't show phonetic names any more (see issue 5265330)
}
@@ -308,8 +304,8 @@
protected void bindPhoto(final ContactListItemView view, Cursor cursor) {
long photoId = 0;
- if (!cursor.isNull(PHONE_PHOTO_ID_COLUMN_INDEX)) {
- photoId = cursor.getLong(PHONE_PHOTO_ID_COLUMN_INDEX);
+ if (!cursor.isNull(PhoneQuery.PHONE_PHOTO_ID)) {
+ photoId = cursor.getLong(PhoneQuery.PHONE_PHOTO_ID);
}
getPhotoLoader().loadPhoto(view.getPhotoView(), photoId, false, false);
diff --git a/src/com/android/contacts/list/PostalAddressListAdapter.java b/src/com/android/contacts/list/PostalAddressListAdapter.java
index 7e58a8e..e9bd11a 100644
--- a/src/com/android/contacts/list/PostalAddressListAdapter.java
+++ b/src/com/android/contacts/list/PostalAddressListAdapter.java
@@ -32,27 +32,34 @@
*/
public class PostalAddressListAdapter extends ContactEntryListAdapter {
- static final String[] POSTALS_PROJECTION = new String[] {
- StructuredPostal._ID, // 0
- StructuredPostal.TYPE, // 1
- StructuredPostal.LABEL, // 2
- StructuredPostal.DATA, // 3
- StructuredPostal.DISPLAY_NAME_PRIMARY, // 4
- StructuredPostal.DISPLAY_NAME_ALTERNATIVE, // 5
- StructuredPostal.PHOTO_ID, // 6
- };
+ protected static class PostalQuery {
+ private static final String[] PROJECTION_PRIMARY = new String[] {
+ StructuredPostal._ID, // 0
+ StructuredPostal.TYPE, // 1
+ StructuredPostal.LABEL, // 2
+ StructuredPostal.DATA, // 3
+ StructuredPostal.PHOTO_ID, // 4
+ StructuredPostal.DISPLAY_NAME_PRIMARY, // 5
+ };
- protected static final int POSTAL_ID_COLUMN_INDEX = 0;
- protected static final int POSTAL_TYPE_COLUMN_INDEX = 1;
- protected static final int POSTAL_LABEL_COLUMN_INDEX = 2;
- protected static final int POSTAL_ADDRESS_COLUMN_INDEX = 3;
- protected static final int POSTAL_PRIMARY_DISPLAY_NAME_COLUMN_INDEX = 4;
- protected static final int POSTAL_ALTERNATIVE_DISPLAY_NAME_COLUMN_INDEX = 5;
- protected static final int POSTAL_PHOTO_ID_COLUMN_INDEX = 6;
+ private static final String[] PROJECTION_ALTERNATIVE = new String[] {
+ StructuredPostal._ID, // 0
+ StructuredPostal.TYPE, // 1
+ StructuredPostal.LABEL, // 2
+ StructuredPostal.DATA, // 3
+ StructuredPostal.PHOTO_ID, // 4
+ StructuredPostal.DISPLAY_NAME_ALTERNATIVE, // 5
+ };
- private CharSequence mUnknownNameText;
- private int mDisplayNameColumnIndex;
- private int mAlternativeDisplayNameColumnIndex;
+ public static final int POSTAL_ID = 0;
+ public static final int POSTAL_TYPE = 1;
+ public static final int POSTAL_LABEL = 2;
+ public static final int POSTAL_ADDRESS = 3;
+ public static final int POSTAL_PHOTO_ID = 4;
+ public static final int POSTAL_DISPLAY_NAME = 5;
+ }
+
+ private final CharSequence mUnknownNameText;
public PostalAddressListAdapter(Context context) {
super(context);
@@ -64,7 +71,12 @@
public void configureLoader(CursorLoader loader, long directoryId) {
Uri uri = buildSectionIndexerUri(StructuredPostal.CONTENT_URI);
loader.setUri(uri);
- loader.setProjection(POSTALS_PROJECTION);
+
+ if (getContactNameDisplayOrder() == ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY) {
+ loader.setProjection(PostalQuery.PROJECTION_PRIMARY);
+ } else {
+ loader.setProjection(PostalQuery.PROJECTION_ALTERNATIVE);
+ }
if (getSortOrder() == ContactsContract.Preferences.SORT_ORDER_PRIMARY) {
loader.setSortOrder(StructuredPostal.SORT_KEY_PRIMARY);
@@ -80,19 +92,7 @@
@Override
public String getContactDisplayName(int position) {
- return ((Cursor)getItem(position)).getString(mDisplayNameColumnIndex);
- }
-
- @Override
- public void setContactNameDisplayOrder(int displayOrder) {
- super.setContactNameDisplayOrder(displayOrder);
- if (getContactNameDisplayOrder() == ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY) {
- mDisplayNameColumnIndex = POSTAL_PRIMARY_DISPLAY_NAME_COLUMN_INDEX;
- mAlternativeDisplayNameColumnIndex = POSTAL_ALTERNATIVE_DISPLAY_NAME_COLUMN_INDEX;
- } else {
- mDisplayNameColumnIndex = POSTAL_ALTERNATIVE_DISPLAY_NAME_COLUMN_INDEX;
- mAlternativeDisplayNameColumnIndex = POSTAL_PRIMARY_DISPLAY_NAME_COLUMN_INDEX;
- }
+ return ((Cursor) getItem(position)).getString(PostalQuery.POSTAL_DISPLAY_NAME);
}
/**
@@ -100,7 +100,7 @@
* position.
*/
public Uri getDataUri(int position) {
- long id = ((Cursor)getItem(position)).getLong(POSTAL_ID_COLUMN_INDEX);
+ long id = ((Cursor)getItem(position)).getLong(PostalQuery.POSTAL_ID);
return ContentUris.withAppendedId(Data.CONTENT_URI, id);
}
@@ -124,15 +124,15 @@
protected void bindPostalAddress(ContactListItemView view, Cursor cursor) {
CharSequence label = null;
- if (!cursor.isNull(POSTAL_TYPE_COLUMN_INDEX)) {
- final int type = cursor.getInt(POSTAL_TYPE_COLUMN_INDEX);
- final String customLabel = cursor.getString(POSTAL_LABEL_COLUMN_INDEX);
+ if (!cursor.isNull(PostalQuery.POSTAL_TYPE)) {
+ final int type = cursor.getInt(PostalQuery.POSTAL_TYPE);
+ final String customLabel = cursor.getString(PostalQuery.POSTAL_LABEL);
// TODO cache
label = StructuredPostal.getTypeLabel(getContext().getResources(), type, customLabel);
}
view.setLabel(label);
- view.showData(cursor, POSTAL_ADDRESS_COLUMN_INDEX);
+ view.showData(cursor, PostalQuery.POSTAL_ADDRESS);
}
protected void bindSectionHeaderAndDivider(final ContactListItemView view, int position) {
@@ -154,14 +154,13 @@
}
protected void bindName(final ContactListItemView view, Cursor cursor) {
- view.showDisplayName(cursor, mDisplayNameColumnIndex, mAlternativeDisplayNameColumnIndex,
- false, getContactNameDisplayOrder());
+ view.showDisplayName(cursor, PostalQuery.POSTAL_DISPLAY_NAME, getContactNameDisplayOrder());
}
protected void bindPhoto(final ContactListItemView view, Cursor cursor) {
long photoId = 0;
- if (!cursor.isNull(POSTAL_PHOTO_ID_COLUMN_INDEX)) {
- photoId = cursor.getLong(POSTAL_PHOTO_ID_COLUMN_INDEX);
+ if (!cursor.isNull(PostalQuery.POSTAL_PHOTO_ID)) {
+ photoId = cursor.getLong(PostalQuery.POSTAL_PHOTO_ID);
}
getPhotoLoader().loadPhoto(view.getPhotoView(), photoId, false, false);
diff --git a/tests/src/com/android/contacts/format/DisplayNameFormatterTest.java b/tests/src/com/android/contacts/format/DisplayNameFormatterTest.java
deleted file mode 100644
index 4dc932b..0000000
--- a/tests/src/com/android/contacts/format/DisplayNameFormatterTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2011 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.contacts.format;
-
-
-import android.provider.ContactsContract;
-import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.widget.TextView;
-
-/**
- * Unit tests for {@link DisplayNameFormatter}.
- */
-@SmallTest
-public class DisplayNameFormatterTest extends AndroidTestCase {
- private static final int TEST_PREFIX_HIGHLIGHT_COLOR = 0xFF0000;
- /** The HTML code used to mark the start of the highlighted part. */
- private static final String START = "<font color =\"#1ff0000\">";
- /** The HTML code used to mark the end of the highlighted part. */
- private static final String END = "</font>";
-
- private PrefixHighlighter mPrefixHighlighter;
- /** The object under test. */
- private DisplayNameFormatter mDisplayNameFormatter;
- /** The view to on which the text is set. */
- private TextView mView;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mPrefixHighlighter = new PrefixHighlighter(TEST_PREFIX_HIGHLIGHT_COLOR);
- mDisplayNameFormatter = new DisplayNameFormatter(mPrefixHighlighter);
- mView = new TextView(getContext());
- // This guarantees that the text will be stored as a Spannable so that we can determine
- // which styles have been applied to it.
- mView.setText("", TextView.BufferType.SPANNABLE);
- }
-
- public void testSetDisplayName_Simple() {
- setNames("John Doe", "Doe John");
- setDisplayName();
- SpannedTestUtils.checkHtmlText("John Doe", mView);
- setNames("Jean Pierre Doe", "Doe Jean Pierre");
- setDisplayName();
- SpannedTestUtils.checkHtmlText("Jean Pierre Doe", mView);
- setNames("John Doe Smith", "Doe Smith John");
- setDisplayName();
- SpannedTestUtils.checkHtmlText("John Doe Smith", mView);
- }
- public void testSetDisplayName_AccidentalOverlap() {
- // This is probably not what we want, but we assume that the two names differ only in the
- // order in which the two components are listed.
- setNames("Johnson John", "Johnson Smith");
- setDisplayName();
- SpannedTestUtils.checkHtmlText("Johnson John", mView);
- }
-
- public void testSetDisplayName_Reversed() {
- setNames("John Doe", "Doe John");
- setDisplayNameReversed();
- SpannedTestUtils.checkHtmlText("John Doe", mView);
- setNames("Jean Pierre Doe", "Doe Jean Pierre");
- setDisplayNameReversed();
- SpannedTestUtils.checkHtmlText("Jean Pierre Doe", mView);
- setNames("John Doe Smith", "Doe Smith John");
- setDisplayNameReversed();
- SpannedTestUtils.checkHtmlText("John Doe Smith", mView);
- }
-
- public void testSetDisplayName_NoOverlap() {
- setNames("John Smith", "Doe Albert");
- setDisplayName();
- SpannedTestUtils.checkHtmlText("John Smith", mView);
- }
-
- public void testSetDisplayName_Prefix() {
- setNames("John Doe", "Doe John");
- setDisplayNameWithPrefix("DO");
- SpannedTestUtils.checkHtmlText("John " + START + "Do" + END + "e", mView);
- }
-
- public void testSetDisplayName_PrefixFirstName() {
- setNames("John Doe", "Doe John");
- setDisplayNameWithPrefix("JO");
- SpannedTestUtils.checkHtmlText(START + "Jo" + END + "hn Doe", mView);
- }
-
- public void testSetDisplayName_PrefixMiddleName() {
- setNames("John Paul Doe", "Doe John Paul");
- setDisplayNameWithPrefix("PAU");
- SpannedTestUtils.checkHtmlText("John " + START + "Pau" + END + "l Doe",
- mView);
- }
-
- public void testSetDisplayName_ReversedPrefix() {
- setNames("John Doe", "Doe John");
- setDisplayNameReversedWithPrefix("DO");
- SpannedTestUtils.checkHtmlText("John " + START + "Do" + END + "e", mView);
- }
-
- public void testSetDisplayName_Empty() {
- setNames("", "");
- setDisplayName();
- SpannedTestUtils.checkHtmlText("", mView);
- }
-
- public void testSetDisplayName_Unknown() {
- mDisplayNameFormatter.setUnknownNameText("unknown");
- setNames("", "");
- setDisplayName();
- SpannedTestUtils.checkHtmlText("unknown", mView);
- }
-
- /**
- * Sets the name and alternate name on the formatter.
- *
- * @param name the name to be display
- * @param alternateName the alternate name to be displayed
- */
- private void setNames(String name, String alternateName) {
- FormatUtils.copyToCharArrayBuffer(name, mDisplayNameFormatter.getNameBuffer());
- FormatUtils.copyToCharArrayBuffer(alternateName,
- mDisplayNameFormatter.getAlternateNameBuffer());
- }
-
- /**
- * Sets the display name on the text view.
- */
- private void setDisplayName() {
- mDisplayNameFormatter.setDisplayName(mView,
- ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY, false, null);
- }
-
- /**
- * Sets the display name on the text view using the reverted order.
- */
- private void setDisplayNameReversed() {
- mDisplayNameFormatter.setDisplayName(mView,
- ContactsContract.Preferences.DISPLAY_ORDER_ALTERNATIVE, false, null);
- }
-
- /**
- * Sets the display name on the text view with prefix highlighting enabled.
- */
- private void setDisplayNameWithPrefix(String prefix) {
- mDisplayNameFormatter.setDisplayName(mView,
- ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY, false, prefix.toCharArray());
- }
-
- /**
- * Sets the display name reversed on the text view with prefix highlighting enabled.
- */
- private void setDisplayNameReversedWithPrefix(String prefix) {
- mDisplayNameFormatter.setDisplayName(mView,
- ContactsContract.Preferences.DISPLAY_ORDER_ALTERNATIVE, false,
- prefix.toCharArray());
- }
-
- /**
- * Sets the display name on the text view with highlighting enabled.
- */
- private void setDisplayNameWithHighlighting() {
- mDisplayNameFormatter.setDisplayName(mView,
- ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY, true, null);
- }
-}
diff --git a/tests/src/com/android/contacts/list/ContactListItemViewTest.java b/tests/src/com/android/contacts/list/ContactListItemViewTest.java
index aaf7521..82305d5 100644
--- a/tests/src/com/android/contacts/list/ContactListItemViewTest.java
+++ b/tests/src/com/android/contacts/list/ContactListItemViewTest.java
@@ -64,8 +64,7 @@
Cursor cursor = createCursor("John Doe", "Doe John");
ContactListItemView view = createView();
- view.showDisplayName(cursor, 0, 1, false,
- ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY);
+ view.showDisplayName(cursor, 0, ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY);
SpannedTestUtils.checkHtmlText("John Doe", view.getNameTextView());
}
@@ -75,8 +74,7 @@
ContactListItemView view = createView();
view.setUnknownNameText("unknown");
- view.showDisplayName(cursor, 0, 1, false,
- ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY);
+ view.showDisplayName(cursor, 0, ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY);
SpannedTestUtils.checkHtmlText("unknown", view.getNameTextView());
}
@@ -86,8 +84,7 @@
ContactListItemView view = createView();
view.setHighlightedPrefix("DOE".toCharArray());
- view.showDisplayName(cursor, 0, 1, false,
- ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY);
+ view.showDisplayName(cursor, 0, ContactsContract.Preferences.DISPLAY_ORDER_PRIMARY);
SpannedTestUtils.checkHtmlText("John " + START + "Doe" + END,
view.getNameTextView());
@@ -98,8 +95,7 @@
ContactListItemView view = createView();
view.setHighlightedPrefix("DOE".toCharArray());
- view.showDisplayName(cursor, 0, 1, false,
- ContactsContract.Preferences.DISPLAY_ORDER_ALTERNATIVE);
+ view.showDisplayName(cursor, 0, ContactsContract.Preferences.DISPLAY_ORDER_ALTERNATIVE);
SpannedTestUtils.checkHtmlText("John " + START + "Doe" + END,
view.getNameTextView());