[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 7c61216975 -s ours
am skip reason: Merged-In I9021ae6328d3df47c61d42d44e33bceb2ea6b01a with SHA-1 9181793683 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/27273402
Change-Id: Ib27b159c7955b560a9e1c66bd18f1d5716c8c00d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e30046a..60261cf 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -289,7 +289,7 @@
<string name="missing_name" msgid="7970183292521946492">"(بلا اسم)"</string>
<string name="favoritesFrequentContacted" msgid="2885862854079966676">"يتم الاتصال بهم بشكل متكرر"</string>
<string name="list_filter_phones" msgid="6839133198968393843">"جميع جهات الاتصال التي لها أرقام هواتف"</string>
- <string name="list_filter_phones_work" msgid="5583425697781385616">"جهات الاتصال للملف الشخصي للعمل"</string>
+ <string name="list_filter_phones_work" msgid="5583425697781385616">"جهات الاتصال لملف العمل"</string>
<string name="view_updates_from_group" msgid="6233444629074835594">"عرض التحديثات"</string>
<string name="account_phone" msgid="8044426231251817556">"الجهاز"</string>
<string name="account_sim" msgid="3200457113308694663">"SIM"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 229416e..90d568c 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -260,7 +260,7 @@
<string name="sms_fax_home" msgid="6887675360794775735">"Sms til hjemmefax"</string>
<string name="sms_pager" msgid="1052540072760129272">"Sms til personsøger"</string>
<string name="sms_other" msgid="3584200156296349098">"Send sms"</string>
- <string name="sms_callback" msgid="6932315941997609031">"Send sms til mistede opkald"</string>
+ <string name="sms_callback" msgid="6932315941997609031">"Send sms til ubesvarede opkald"</string>
<string name="sms_car" msgid="6051606941547979352">"Sms til bil"</string>
<string name="sms_company_main" msgid="4801585186677340070">"Sms til arbejde (hovednummer)"</string>
<string name="sms_isdn" msgid="8093269429091061478">"Send sms til ISDN"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index df0753a..4eaccf0 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -152,7 +152,7 @@
<string name="contact_directory_description" msgid="1773630547110881835">"Hakemisto <xliff:g id="TYPE">%1$s</xliff:g>"</string>
<string name="activity_title_settings" msgid="4004290638426915162">"Asetukset"</string>
<string name="menu_settings" msgid="3524924670246877187">"Asetukset"</string>
- <string name="menu_help" msgid="287801702920372292">"Ohje ja palaute"</string>
+ <string name="menu_help" msgid="287801702920372292">"Ohjeet ja palaute"</string>
<string name="organization_entry_two_field" msgid="6034934619269052455">"<xliff:g id="FIRST">%1$s</xliff:g> • <xliff:g id="SECOND">%2$s</xliff:g>"</string>
<string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>
<string name="non_phone_caption" msgid="7343449684187013327">"Puhelinnumero"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 03a6557..84610c2 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -229,7 +229,7 @@
<string name="menu_title_filters" msgid="349866121417914494">"Računi"</string>
<string name="hamburger_feature_highlight_header" msgid="1786641424099282909">"Prijedlozi"</string>
<string name="hamburger_feature_highlight_body" msgid="782935036630531528">"Neka vaši kontakti budu organizirani i korisni"</string>
- <string name="undo" msgid="2446931036220975026">"Poništavanje"</string>
+ <string name="undo" msgid="2446931036220975026">"Poništi"</string>
<string name="call_custom" msgid="2844900154492073207">"Nazovite <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="call_home" msgid="2443904771140750492">"Nazovi kućni"</string>
<string name="call_mobile" msgid="6504312789160309832">"Nazovi mobitel"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9b649ec..1e6aba8 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -23,7 +23,7 @@
<string name="shortcutDialContact" msgid="155367248069127153">"Ring"</string>
<string name="shortcutMessageContact" msgid="9123517151981679277">"Send melding"</string>
<string name="shortcutActivityTitle" msgid="5407832911005090417">"Velg en kontakt"</string>
- <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Legg til kontakt"</string>
+ <string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Legg til i kontakt"</string>
<string name="contactPickerActivityTitle" msgid="1842634991247618890">"Velg en kontakt"</string>
<string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"Velg"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Opprett ny kontakt"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index aa91ddf..d6206c1 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -159,7 +159,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>
@@ -176,7 +176,7 @@
<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_title_new_contact" msgid="7534775011591770343">"नयाँ सम्पर्क बनाउने"</string>
@@ -186,8 +186,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>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 66db022..321a022 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -28,7 +28,7 @@
<string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"ఎంచుకోండి"</string>
<string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"కొత్త కాంటాక్ట్ క్రియేట్ చేయి"</string>
<string name="searchHint" msgid="1487501532610025473">"కాంటాక్ట్లను సెర్చ్ చేయండి"</string>
- <string name="menu_addStar" msgid="4903812703386825130">"ఇష్టమైనవాటికి జోడించండి"</string>
+ <string name="menu_addStar" msgid="4903812703386825130">"ఫేవరెట్స్కు జోడించండి"</string>
<string name="menu_removeStar" msgid="3707373931808303701">"ఇష్టమైనవాటి నుండి తీసివేయండి"</string>
<string name="description_action_menu_remove_star" msgid="4044390281910122890">"ఇష్టమైనవి నుండి తీసివేయబడింది"</string>
<string name="description_action_menu_add_star" msgid="7316521132809388851">"ఇష్టమైనవికి జోడించబడింది"</string>
@@ -157,7 +157,7 @@
<string name="organization_entry_all_field" msgid="6724345890324437167">"<xliff:g id="COMPANY">%1$s</xliff:g> • <xliff:g id="DEPARTMENT">%2$s</xliff:g> • <xliff:g id="TITLE">%3$s</xliff:g>"</string>
<string name="non_phone_caption" msgid="7343449684187013327">"ఫోన్ నంబర్"</string>
<string name="non_phone_add_to_contacts" msgid="5472784294274676663">"కాంటాక్ట్లకు జోడించండి"</string>
- <string name="non_phone_close" msgid="2792373584950696532">"మూసివేయి"</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_import_contacts" msgid="4914180876114104054">"దిగుమతి చేయండి"</string>
@@ -188,7 +188,7 @@
<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="menu_export_database" msgid="1658249125751926885">"డేటాబేస్ ఫైళ్లను ఎగుమతి చేయి"</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>
<string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"తక్కువ చూడండి"</string>
@@ -413,7 +413,7 @@
<string name="nfc_vcard_file_name" msgid="2113518216329123152">"కాంటాక్ట్ NFC ద్వారా స్వీకరించబడింది"</string>
<string name="caching_vcard_title" msgid="6333926052524937628">"కాష్ చేస్తోంది"</string>
<string name="progress_notifier_message" msgid="8522060892889599746">"<xliff:g id="TOTAL_NUMBER">%2$s</xliff:g>లో <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> దిగుమతి చేయబడుతోంది: <xliff:g id="NAME">%3$s</xliff:g>"</string>
- <string name="export_to_vcf_file" msgid="3096479544575798192">".vcf ఫైల్కు ఎగుమతి చేయి"</string>
+ <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>
@@ -442,7 +442,7 @@
<string name="hint_findContacts" msgid="5554298639062659655">"కాంటాక్ట్లను సెర్చ్ చేయండి"</string>
<string name="contactsFavoritesLabel" msgid="8339645684721732714">"ఇష్టమైనవి"</string>
<string name="menu_import" msgid="2206768098740726906">"దిగుమతి చేయండి"</string>
- <string name="menu_export" msgid="1217402092617629429">"ఎగుమతి చేయి"</string>
+ <string name="menu_export" msgid="1217402092617629429">"ఎగుమతి చేయండి"</string>
<string name="menu_blocked_numbers" msgid="7064680515202657609">"బ్లాక్ చేయబడిన నంబర్లు"</string>
<string name="contact_status_update_attribution" msgid="5051874518046969847">"<xliff:g id="SOURCE">%1$s</xliff:g> ద్వారా"</string>
<string name="contact_status_update_attribution_with_date" msgid="2195847657702455703">"<xliff:g id="SOURCE">%2$s</xliff:g> ద్వారా <xliff:g id="DATE">%1$s</xliff:g>"</string>