Merge tag 'android-14.0.0_r17' into staging/lineage-21.0_merge-android-14.0.0_r17
Android 14.0.0 Release 17 (UQ1A.231205.015)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZXDPMgAKCRDorT+BmrEO
# eBEIAJ455l5vu/k1Leu+80le3BkwQh+96gCdGMObLlRpYy1FE5JhjcWWbgdCT1Y=
# =fe5u
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed Dec 6 21:44:50 2023 EET
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2186 signatures in the past
# 2 years. Encrypted 4 messages in the past 23 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Bill Yi (52) and John Shao (1)
# Via Automerger Merge Worker (169) and others
* tag 'android-14.0.0_r17': (53 commits)
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Import translations. DO NOT MERGE ANYWHERE
Don't allow importing contacts to accounts passed in by intent unless it is valid
...
Change-Id: Ice7fe6b62efefa2484576eef2a89fec0e25fd177
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index d95b2b2..03a8fab 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -364,7 +364,7 @@
<string name="display_more_groups" msgid="8398232980355188133">"ተጨማሪቡድኖች..."</string>
<string name="display_warn_remove_ungrouped" msgid="522866344738506017">"\'<xliff:g id="GROUP">%s</xliff:g>\' ከአሳምር ማስወገድ እንዲሁ ማንኛውም በተነጣጥል ያሉ ዕውቅያዎችን ከአሳምር ያስወግዳል።"</string>
<string name="savingDisplayGroups" msgid="6779839417901711381">"ማሳያ አማራጮችን በማስቀመጥ ላይ..."</string>
- <string name="listCustomView" msgid="5782275477737032610">"ብጁ እይታ"</string>
+ <string name="listCustomView" msgid="5782275477737032610">"ብጁ ዕይታ"</string>
<string name="dialog_new_contact_account" msgid="5652018124788855057">"እንዲመጡ የተደረጉ እውቂያዎችን አስቀምጥ ወደ፦"</string>
<string name="import_from_sim" msgid="7825280799813847991">"ሲም ካርድ"</string>
<string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"ሲም <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3810199..bc1826c 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -75,7 +75,7 @@
<string name="menu_unredirect_calls_to_vm" msgid="2294919685954790892">"Κατάργηση δρομ. σε τηλεφωνητή"</string>
<string name="readOnlyContactWarning" msgid="4158660823025751201">"Αυτή η επαφή είναι μόνο για ανάγνωση. Δεν μπορεί να διαγραφεί, αλλά μπορείτε να την αποκρύψετε."</string>
<string name="readOnlyContactWarning_positive_button" msgid="2602676689104338036">"Απόκρυψη επαφής"</string>
- <string name="readOnlyContactDeleteConfirmation" msgid="2759786078454970110">"Οι λογαριασμοί μόνο για ανάγνωση σε αυτήν την επαφή θα είναι κρυφοί, δεν θα διαγραφούν."</string>
+ <string name="readOnlyContactDeleteConfirmation" msgid="2759786078454970110">"Οι λογαριασμοί μόνο για ανάγνωση σε αυτή την επαφή θα είναι κρυφοί, δεν θα διαγραφούν."</string>
<string name="single_delete_confirmation" msgid="8260949300855537648">"Να διαγραφεί αυτή η επαφή;"</string>
<string name="batch_delete_confirmation" msgid="4149615167210863403">"Να διαγραφούν οι επιλεγμένες επαφές;"</string>
<string name="batch_delete_read_only_contact_confirmation" msgid="381691735715182700">"Δεν είναι δυνατή η διαγραφή επαφών από λογαριασμούς που προορίζονται μόνο για ανάγνωση, αλλά είναι δυνατή η απόκρυψή τους."</string>
@@ -91,7 +91,7 @@
<string name="customLabelPickerTitle" msgid="816694850254307154">"Προσαρμοσμένο όνομα ετικέτας"</string>
<string name="removePhoto" msgid="1190099414600730001">"Κατάργηση εικόνας"</string>
<string name="noContacts" msgid="3030512741779213810">"Η λίστα επαφών σας είναι άδεια"</string>
- <string name="emptyGroup" msgid="8598261660865081152">"Δεν υπάρχουν επαφές με αυτήν την εκτικέτα"</string>
+ <string name="emptyGroup" msgid="8598261660865081152">"Δεν υπάρχουν επαφές με αυτή την εκτικέτα"</string>
<string name="emptyAccount" msgid="7450843210977018582">"Δεν υπάρχουν επαφές σε αυτόν το λογαριασμό"</string>
<string name="emptyMainList" msgid="3266182207039677163">"Η λίστα επαφών σας είναι άδεια"</string>
<string name="contactSavedNamedToast" msgid="3067050290584834386">"Η επαφή \"<xliff:g id="DISPLAY_NAME">%s</xliff:g>\" αποθηκεύτηκε"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a613a85..6557812 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -482,7 +482,7 @@
<string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"Želite li uključiti automatsku sinkronizaciju?"</string>
<string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Izmjene koje unesete u aplikacije i na račune, ne samo na Google kontakte ažurirat će se na webu i vašim uređajima."</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Uključi"</string>
- <string name="connection_error_message" msgid="7446131881946138093">"Nema veze"</string>
+ <string name="connection_error_message" msgid="7446131881946138093">"Nema internetske veze"</string>
<string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
<string name="show_more_content_description" msgid="6298277298495491712">"Prikaži više"</string>
<string name="importing_sim_finished_title" msgid="6436721150882268416">"Dovršen je uvoz SIM kartice"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index d623661..990f24e 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -457,7 +457,7 @@
<string name="about_build_version" msgid="5870642814752351712">"Курама версиясы"</string>
<string name="about_open_source_licenses" msgid="1617836621315557445">"Баштапкы коду ачык программалардын уруксаттамалары"</string>
<string name="about_open_source_licenses_summary" msgid="4843627659117423491">"Баштапкы коду ачык программалардын уруксаттамаларынын чоо-жайы"</string>
- <string name="about_privacy_policy" msgid="4581488375200402678">"Купуялык саясаты"</string>
+ <string name="about_privacy_policy" msgid="4581488375200402678">"Купуялык эрежелери"</string>
<string name="about_terms_of_service" msgid="7419670771785057738">"Тейлөө шарттары"</string>
<string name="activity_title_licenses" msgid="6434398894019119709">"Баштапкы коду ачык программалардын уруксаттамалары"</string>
<string name="url_open_error_toast" msgid="4885855620824048385">"URL ачылбай койду."</string>
@@ -467,7 +467,7 @@
<string name="description_delete_contact" msgid="8110643050235441400">"Жок кылуу"</string>
<string name="description_no_name_header" msgid="8596201864512339003">"Эллипс"</string>
<string name="dynamic_shortcut_disabled_message" msgid="8770462908102469878">"Кыска жол өчүрүлдү"</string>
- <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"Байланыш алынып салынган"</string>
+ <string name="dynamic_shortcut_contact_removed_message" msgid="8331735243566193974">"Байланыш өчүрүлгөн"</string>
<string name="sim_import_button_text" msgid="2845608246304396009">"Өткөрүп алуу"</string>
<string name="sim_import_title_none_selected" msgid="3527680774575468781">"Байланыштарды тандоо"</string>
<string name="sim_import_empty_message" msgid="7238368542566545854">"SIM картаңызда байланыштар жок."</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 855fdee..790bec6 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -199,7 +199,7 @@
<string name="header_nickname_entry" msgid="1110276804512795150">"ਉਪਨਾਮ"</string>
<string name="header_note_entry" msgid="339680292368016788">"ਸੂਚਨਾ"</string>
<string name="header_website_entry" msgid="3618691707215428785">"ਵੈੱਬਸਾਈਟ"</string>
- <string name="header_event_entry" msgid="70962228694476731">"ਵਰਤਾਰਾ"</string>
+ <string name="header_event_entry" msgid="70962228694476731">"ਇਵੈਂਟ"</string>
<string name="header_relation_entry" msgid="993618132732521944">"ਰਿਸ਼ਤਾ"</string>
<string name="header_name_entry" msgid="2516776099121101578">"ਨਾਮ"</string>
<string name="header_email_entry" msgid="8653569770962542178">"ਈਮੇਲ"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 6b71fbf..2fb9814 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -45,7 +45,7 @@
<string name="menu_addContactsToGroup" msgid="4549318978482280577">"Adicionar contactos"</string>
<string name="menu_removeFromGroup" msgid="8753799091967887958">"Remover da etiqueta"</string>
<string name="menu_new_group_action_bar" msgid="1670312283925872483">"Criar etiqueta"</string>
- <string name="splitConfirmation" msgid="4750158900636307469">"Pretende desassociar este contacto em vários contactos?"</string>
+ <string name="splitConfirmation" msgid="4750158900636307469">"Quer desassociar este contacto em vários contactos?"</string>
<string name="splitConfirmation_positive_button" msgid="3109235536045409854">"Desassociar"</string>
<string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"Gostaria de guardar as alterações já efetuadas e desassociar este contacto em vários contactos?"</string>
<string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"Guardar e desassociar"</string>
@@ -57,7 +57,7 @@
<string name="menu_linkedContacts" msgid="6363718333551613063">"Ver contactos associados"</string>
<string name="menu_save" msgid="7204524700499687371">"Guardar"</string>
<string name="titleJoinContactDataWith" msgid="7342386037654890242">"Associar contactos"</string>
- <string name="blurbJoinContactDataWith" msgid="132105056919797709">"Escolha o contacto que pretende associar a <xliff:g id="NAME">%s</xliff:g>:"</string>
+ <string name="blurbJoinContactDataWith" msgid="132105056919797709">"Escolha o contacto que quer associar a <xliff:g id="NAME">%s</xliff:g>:"</string>
<string name="separatorJoinAggregateSuggestions" msgid="8347769365870796983">"Contactos sugeridos"</string>
<string name="separatorJoinAggregateAll" msgid="5378346138684490784">"Todos os contactos"</string>
<string name="contactsJoinedNamedMessage" msgid="8732933595873458166">"Contacto associado: <xliff:g id="NAME">%s</xliff:g>"</string>
@@ -170,7 +170,7 @@
<string name="cancel_confirmation_dialog_message" msgid="7486892574762212762">"Rejeitar alterações?"</string>
<string name="cancel_confirmation_dialog_cancel_editing_button" msgid="8280294641821133477">"Rejeitar"</string>
<string name="cancel_confirmation_dialog_keep_editing_button" msgid="7117943783437253341">"Cancelar"</string>
- <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Pretende rejeitar as personalizações?"</string>
+ <string name="leave_customize_confirmation_dialog_message" msgid="5330853530872707231">"Quer rejeitar as personalizações?"</string>
<string name="enter_contact_name" msgid="521859148893732679">"Pesquisar contactos"</string>
<string name="title_edit_group" msgid="4246193439931854759">"Remover contactos"</string>
<string name="local_profile_title" msgid="1613784248702623410">"O meu perfil local"</string>
@@ -372,7 +372,7 @@
<string name="import_from_sim_secondary_template" msgid="7574306746844258362">"{count,plural, =1{# contacto • <xliff:g id="PHONE_NUMBER_0">^1</xliff:g>}other{# contactos • <xliff:g id="PHONE_NUMBER_1">^1</xliff:g>}}"</string>
<string name="import_from_vcf_file" msgid="6776403212804361301">"Ficheiro .vcf"</string>
<string name="nothing_to_import_message" msgid="2594519620375509783">"Nada para importar"</string>
- <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"Pretende importar contactos do vCard?"</string>
+ <string name="import_from_vcf_file_confirmation_message" msgid="8579284961401472204">"Quer importar contactos do vCard?"</string>
<string name="cancel_import_confirmation_message" msgid="1007412828398265611">"Cancelar a importação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_export_confirmation_message" msgid="370693160959236239">"Cancelar a exportação de <xliff:g id="FILENAME">%s</xliff:g>?"</string>
<string name="cancel_vcard_import_or_export_failed" msgid="3041814872516288484">"Imposs. cancel. import./export. do vCard"</string>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 7ed5315..c92cd37 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -124,7 +124,7 @@
<string name="quickcontact_add_phone_number" msgid="1683577288080727862">"Shto një numër telefoni"</string>
<string name="quickcontact_add_email" msgid="1442894568471116797">"Shto një email"</string>
<string name="missing_app" msgid="5674389915738964148">"Nuk u gjet asnjë aplikacion për të menaxhuar këtë veprim"</string>
- <string name="menu_share" msgid="6343022811796001773">"Shpërndaj"</string>
+ <string name="menu_share" msgid="6343022811796001773">"Ndaj"</string>
<string name="menu_add_contact" msgid="5822356185421997656">"Shto te kontaktet"</string>
<string name="menu_add_contacts" msgid="7114262784903366463">"Shto"</string>
<string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{Ndaje kontaktin nëpërmjet}other{Ndaji kontaktet nëpërmjet}}"</string>
@@ -318,7 +318,7 @@
<string name="label_notes" msgid="7134226125644463585">"Shënimet"</string>
<string name="label_custom_field" msgid="4160584225306364924">"E personalizuar"</string>
<string name="label_sip_address" msgid="8876347942587537552">"SIP"</string>
- <string name="websiteLabelsGroup" msgid="114754928100220315">"Faqja e internetit"</string>
+ <string name="websiteLabelsGroup" msgid="114754928100220315">"Uebsajti"</string>
<string name="groupsLabel" msgid="5622154133880646122">"Emërtimet"</string>
<string name="email_home" msgid="1102791500866910269">"Dërgoji mail shtëpisë"</string>
<string name="email_mobile" msgid="6461172430397598705">"Dërgoji mail celularit"</string>
@@ -432,8 +432,8 @@
<string name="share_contacts_failure" msgid="1348777470180064086">"Ndarja e kontakteve dështoi."</string>
<string name="dialog_export" msgid="3497435010655060068">"Eksporto kontaktet"</string>
<string name="dialog_import" msgid="4590232235052756593">"Importo kontaktet nga"</string>
- <string name="share_error" msgid="4854612167186185739">"Ky kontakt nuk mund të shpërndahet"</string>
- <string name="no_contact_to_share" msgid="6285287228557175749">"Nuk ka kontakte për të shpërndarë"</string>
+ <string name="share_error" msgid="4854612167186185739">"Ky kontakt nuk mund të ndahet"</string>
+ <string name="no_contact_to_share" msgid="6285287228557175749">"Nuk ka kontakte për të ndarë"</string>
<string name="menu_contacts_filter" msgid="5854584270038139275">"Kontakte për t\'u shfaqur"</string>
<string name="activity_title_contacts_filter" msgid="6340531582631006680">"Kontakte për t\'u shfaqur"</string>
<string name="custom_list_filter" msgid="2544327670202891979">"Personalizo pamjen"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 9e5b9ae..a65218d 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -415,7 +415,7 @@
<string name="export_to_vcf_file" msgid="3096479544575798192">".vcf ఫైల్కు ఎగుమతి చేయి"</string>
<string name="display_options_sort_list_by" msgid="4333658089057400431">"ఇలా వర్గీకరించు"</string>
<string name="display_options_phonetic_name_fields" msgid="1857564544755287298">"ఫొనెటిక్ పేరు"</string>
- <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"ఎల్లప్పుడూ చూపు"</string>
+ <string name="editor_options_always_show_phonetic_names" msgid="3612488836474257715">"ఎల్లప్పుడూ చూపండి"</string>
<string name="editor_options_hide_phonetic_names_if_empty" msgid="2693314301550366143">"ఖాళీగా ఉంటే దాచు"</string>
<string name="display_options_sort_by_given_name" msgid="893781924536349248">"మొదటి పేరు"</string>
<string name="display_options_sort_by_family_name" msgid="1282763552330910876">"చివరి పేరు"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index db25cb7..3f74c89 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -314,7 +314,7 @@
<string name="postal_address" msgid="5031809899673855074">"Adres"</string>
<string name="ghostData_company" msgid="3873500610390675876">"Şirket"</string>
<string name="ghostData_department" msgid="8610642449404163799">"Bölüm"</string>
- <string name="ghostData_title" msgid="8584897460662904533">"Unvan"</string>
+ <string name="ghostData_title" msgid="8584897460662904533">"Ünvan"</string>
<string name="label_notes" msgid="7134226125644463585">"Notlar"</string>
<string name="label_custom_field" msgid="4160584225306364924">"Özel"</string>
<string name="label_sip_address" msgid="8876347942587537552">"SIP"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 154bce0..55c18be 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -75,12 +75,12 @@
<string name="menu_unredirect_calls_to_vm" msgid="2294919685954790892">"取消转接到语音信箱"</string>
<string name="readOnlyContactWarning" msgid="4158660823025751201">"这是只读联系人信息。您无法删除此联系人，但可以将其隐藏。"</string>
<string name="readOnlyContactWarning_positive_button" msgid="2602676689104338036">"隐藏联系人"</string>
- <string name="readOnlyContactDeleteConfirmation" msgid="2759786078454970110">"此联系人的只读帐号将被隐藏，而不会被删除。"</string>
+ <string name="readOnlyContactDeleteConfirmation" msgid="2759786078454970110">"此联系人的只读账号将被隐藏，而不会被删除。"</string>
<string name="single_delete_confirmation" msgid="8260949300855537648">"要删除此联系人吗？"</string>
<string name="batch_delete_confirmation" msgid="4149615167210863403">"要删除所选联系人吗？"</string>
- <string name="batch_delete_read_only_contact_confirmation" msgid="381691735715182700">"系统无法删除来自只读帐号的联系人信息，但可以将这些信息隐藏。"</string>
- <string name="batch_delete_multiple_accounts_confirmation" msgid="4547718538924570984">"您要删除的联系人信息包含来自多个帐号的详细信息。系统将隐藏来自只读帐号的详细信息，而不会删除这些信息。"</string>
- <string name="multipleContactDeleteConfirmation" msgid="2970218685653877287">"删除此联系人也将删除多个帐号中的相关详细信息。"</string>
+ <string name="batch_delete_read_only_contact_confirmation" msgid="381691735715182700">"系统无法删除来自只读账号的联系人信息，但可以将这些信息隐藏。"</string>
+ <string name="batch_delete_multiple_accounts_confirmation" msgid="4547718538924570984">"您要删除的联系人信息包含来自多个账号的详细信息。系统将隐藏来自只读账号的详细信息，而不会删除这些信息。"</string>
+ <string name="multipleContactDeleteConfirmation" msgid="2970218685653877287">"删除此联系人也将删除多个账号中的相关详细信息。"</string>
<string name="deleteConfirmation" msgid="3727809366015979585">"要删除此联系人吗？"</string>
<string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"删除"</string>
<string name="invalidContactMessage" msgid="6204402264821083362">"该联系人不存在。"</string>
@@ -92,7 +92,7 @@
<string name="removePhoto" msgid="1190099414600730001">"移除照片"</string>
<string name="noContacts" msgid="3030512741779213810">"联系人列表是空的"</string>
<string name="emptyGroup" msgid="8598261660865081152">"此标签下没有联系人"</string>
- <string name="emptyAccount" msgid="7450843210977018582">"此帐号中没有联系人"</string>
+ <string name="emptyAccount" msgid="7450843210977018582">"此账号中没有联系人"</string>
<string name="emptyMainList" msgid="3266182207039677163">"联系人列表是空的"</string>
<string name="contactSavedNamedToast" msgid="3067050290584834386">"已保存<xliff:g id="DISPLAY_NAME">%s</xliff:g>"</string>
<string name="contactSavedToast" msgid="4370392215196995301">"联系人已保存"</string>
@@ -128,7 +128,7 @@
<string name="menu_add_contact" msgid="5822356185421997656">"添加到通讯录"</string>
<string name="menu_add_contacts" msgid="7114262784903366463">"添加"</string>
<string name="title_share_via" msgid="3300082736229182956">"{count,plural, =1{通过以下应用分享联系人}other{通过以下应用分享联系人}}"</string>
- <string name="dialog_new_group_account" msgid="4326402875327788728">"选择帐号"</string>
+ <string name="dialog_new_group_account" msgid="4326402875327788728">"选择账号"</string>
<string name="group_name_dialog_insert_title" msgid="5495572488613178283">"创建标签"</string>
<string name="group_name_dialog_update_title" msgid="3955919589366745101">"重命名标签"</string>
<string name="group_name_dialog_hint" msgid="6023999218213062973">"标签名称"</string>
@@ -136,7 +136,7 @@
<string name="audio_chat" msgid="5921525823973697372">"语音聊天"</string>
<string name="video_chat" msgid="2477295971622477433">"视频聊天"</string>
<string name="account_type_format" msgid="4926968760755013450">"<xliff:g id="SOURCE">%1$s</xliff:g> 联系人"</string>
- <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g>帐号"</string>
+ <string name="google_account_type_format" msgid="4046692740262396811">"<xliff:g id="SOURCE">%1$s</xliff:g>账号"</string>
<string name="take_photo" msgid="820071555236547516">"拍照"</string>
<string name="take_new_photo" msgid="4383091978116875778">"拍摄新照片"</string>
<string name="pick_photo" msgid="2050859661654812588">"选择照片"</string>
@@ -158,7 +158,7 @@
<string name="non_phone_add_to_contacts" msgid="5472784294274676663">"添加到通讯录"</string>
<string name="non_phone_close" msgid="2792373584950696532">"关闭"</string>
<string name="date_year_toggle" msgid="8930759990426623823">"包含年份"</string>
- <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"添加帐号"</string>
+ <string name="contacts_unavailable_add_account" msgid="5196453892411710750">"添加账号"</string>
<string name="contacts_unavailable_import_contacts" msgid="4914180876114104054">"导入"</string>
<string name="create_group_item_label" msgid="921929508079162463">"新建…"</string>
<string name="delete_group_dialog_message" msgid="754082019928025404">"要删除“<xliff:g id="GROUP_LABEL">%1$s</xliff:g>”标签吗？（系统不会删除联系人。）"</string>
@@ -175,9 +175,9 @@
<string name="title_edit_group" msgid="4246193439931854759">"移除联系人"</string>
<string name="local_profile_title" msgid="1613784248702623410">"我的本地个人资料"</string>
<string name="external_profile_title" msgid="2706282819025406927">"我的<xliff:g id="EXTERNAL_SOURCE">%1$s</xliff:g>个人资料"</string>
- <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"请花一点时间添加帐号，以便将联系人备份到 Google。"</string>
+ <string name="contact_editor_prompt_zero_accounts" msgid="4468363031413457746">"请花一点时间添加账号，以便将联系人备份到 Google。"</string>
<string name="contact_editor_prompt_one_account" msgid="765343809177951169">"新建的联系人将保存到 <xliff:g id="ACCOUNT_NAME">%1$s</xliff:g>。"</string>
- <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"选择用来保存新建联系人的默认帐号："</string>
+ <string name="contact_editor_prompt_multiple_accounts" msgid="1543322760761168351">"选择用来保存新建联系人的默认账号："</string>
<string name="contact_editor_title_new_contact" msgid="7534775011591770343">"创建新联系人"</string>
<string name="contact_editor_title_existing_contact" msgid="3647774955741654029">"修改联系人"</string>
<string name="contact_editor_title_read_only_contact" msgid="5494810291515292596">"只能查看"</string>
@@ -185,8 +185,8 @@
<string name="contact_editor_pick_linked_contact_dialog_title" msgid="3332134735168016293">"已关联的联系人"</string>
<string name="contact_editor_add_linked_contact" msgid="2895453741206196138">"添加"</string>
<string name="contact_editor_unlink_contacts" msgid="8399419729744305687">"取消关联"</string>
- <string name="add_account" msgid="3071396624500839020">"添加帐号"</string>
- <string name="add_new_account" msgid="573368229646104110">"添加新帐号"</string>
+ <string name="add_account" msgid="3071396624500839020">"添加账号"</string>
+ <string name="add_new_account" msgid="573368229646104110">"添加新账号"</string>
<string name="menu_export_database" msgid="1658249125751926885">"导出数据库文件"</string>
<string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"创建新联系人"</string>
<string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"查看更多"</string>
@@ -225,7 +225,7 @@
<string name="navigation_drawer_close" msgid="3052989100471689722">"关闭抽屉式导航栏"</string>
<string name="navigation_drawer_label" msgid="8391863484838783638">"“<xliff:g id="LABEL_NAME">%s</xliff:g>”标签"</string>
<string name="menu_title_groups" msgid="3722199658759568221">"标签"</string>
- <string name="menu_title_filters" msgid="349866121417914494">"帐号"</string>
+ <string name="menu_title_filters" msgid="349866121417914494">"账号"</string>
<string name="hamburger_feature_highlight_header" msgid="1786641424099282909">"建议"</string>
<string name="hamburger_feature_highlight_body" msgid="782935036630531528">"让您的通讯录井井有条，方便使用"</string>
<string name="undo" msgid="2446931036220975026">"撤消"</string>
@@ -422,8 +422,8 @@
<string name="display_options_view_names_as" msgid="4060686468465916565">"姓名格式"</string>
<string name="display_options_view_given_name_first" msgid="383885125505521383">"名字在前"</string>
<string name="display_options_view_family_name_first" msgid="6597077054231296007">"姓氏在前"</string>
- <string name="settings_accounts" msgid="119582613811929994">"帐号"</string>
- <string name="default_editor_account" msgid="4810392921888877149">"用于保存新联系人的默认帐号"</string>
+ <string name="settings_accounts" msgid="119582613811929994">"账号"</string>
+ <string name="default_editor_account" msgid="4810392921888877149">"用于保存新联系人的默认账号"</string>
<string name="settings_my_info_title" msgid="6236848378653551341">"我的信息"</string>
<string name="set_up_profile" msgid="3554999219868611431">"设置您的个人资料"</string>
<string name="setting_about" msgid="2941859292287597555">"关于通讯录"</string>
@@ -447,7 +447,7 @@
<string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"时间：<xliff:g id="DATE">%1$s</xliff:g>，来源：<xliff:g id="SOURCE">%2$s</xliff:g>"</string>
<string name="action_menu_back_from_search" msgid="683765774264585732">"停止搜索"</string>
<string name="description_clear_search" msgid="1852934085825794095">"清除搜索内容"</string>
- <string name="select_account_dialog_title" msgid="5047523441152129207">"帐号"</string>
+ <string name="select_account_dialog_title" msgid="5047523441152129207">"账号"</string>
<string name="set_default_account" msgid="9194321110211682396">"一律使用这张卡进行通话"</string>
<string name="call_with_a_note" msgid="2463785820399287281">"拨打电话并发送备注"</string>
<string name="call_subject_hint" msgid="7056652101889538157">"输入要在拨打电话时发送的备注…"</string>
@@ -478,9 +478,9 @@
<string name="sim_import_cancel_content_description" msgid="4746065462808862682">"取消"</string>
<string name="auto_sync_off" msgid="7039314601316227882">"自动同步功能已关闭。点按即可开启。"</string>
<string name="dismiss_sync_alert" msgid="4057176963960104786">"关闭"</string>
- <string name="account_sync_off" msgid="6187683798342006021">"帐号同步功能已关闭。点按即可开启。"</string>
+ <string name="account_sync_off" msgid="6187683798342006021">"账号同步功能已关闭。点按即可开启。"</string>
<string name="turn_auto_sync_on_dialog_title" msgid="3812155064863594938">"要开启自动同步功能吗？"</string>
- <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"您对所有应用和帐号（不只是 Google 通讯录）所做的更改都会在网络和您的设备之间保持同步。"</string>
+ <string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"您对所有应用和账号（不只是 Google 通讯录）所做的更改都会在网络和您的设备之间保持同步。"</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"开启"</string>
<string name="connection_error_message" msgid="7446131881946138093">"无网络连接"</string>
<string name="single_sim_display_label" msgid="264062966309455515">"SIM 卡"</string>