Mark AP3A.240905.001 as merged in aosp-main-future am: 825c21c0ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Contacts/+/28708963
Change-Id: I43c26ebfa60d1bb9047b376f12a2976ba24311ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index edd74e7..d406a8d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -45,7 +45,7 @@
<string name="menu_addContactsToGroup" msgid="4549318978482280577">"Дадаць кантакты"</string>
<string name="menu_removeFromGroup" msgid="8753799091967887958">"Выдаліць з меткі"</string>
<string name="menu_new_group_action_bar" msgid="1670312283925872483">"Стварыць метку"</string>
- <string name="splitConfirmation" msgid="4750158900636307469">"Раз’яднаць гэты кантакт на некалькі кантактаў?"</string>
+ <string name="splitConfirmation" msgid="4750158900636307469">"Раз\'яднаць гэты кантакт на некалькі кантактаў?"</string>
<string name="splitConfirmation_positive_button" msgid="3109235536045409854">"Раз\'яднаць"</string>
<string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"Жадаеце захаваць змяненні, якія вы ўжо зрабілі, і развязаць гэты кантакт на некалькі кантактаў?"</string>
<string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"Захаваць і развязаць"</string>
@@ -96,7 +96,7 @@
<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>
- <string name="contactUnlinkedToast" msgid="6791720274141804377">"Кантакты раз’яднаны"</string>
+ <string name="contactUnlinkedToast" msgid="6791720274141804377">"Кантакты раз\'яднаны"</string>
<string name="contactSavedErrorToast" msgid="3213619905154956918">"Не ўдалося захаваць змены кантакту"</string>
<string name="contactUnlinkErrorToast" msgid="7289356996668886841">"Не ўдалося скасаваць сувязь з кантактам"</string>
<string name="contactJoinErrorToast" msgid="1222155997933362787">"Не ўдалося звязаць кантакт"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6d33fc5..ac394fd 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -26,7 +26,7 @@
<string name="contactInsertOrEditActivityTitle" msgid="1788154962629911262">"Añadir a un contacto"</string>
<string name="contactPickerActivityTitle" msgid="1842634991247618890">"Elige un contacto"</string>
<string name="groupMemberPickerActivityTitle" msgid="8745419913947478380">"Seleccionar"</string>
- <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Crear contacto"</string>
+ <string name="header_entry_contact_list_adapter_header_title" msgid="4098233078586958762">"Crear nuevo contacto"</string>
<string name="searchHint" msgid="1487501532610025473">"Buscar contactos"</string>
<string name="menu_addStar" msgid="4903812703386825130">"Añadir a Favoritos"</string>
<string name="menu_removeStar" msgid="3707373931808303701">"Eliminar de Favoritos"</string>
@@ -189,7 +189,7 @@
<string name="add_account" msgid="3071396624500839020">"Añadir cuenta"</string>
<string name="add_new_account" msgid="573368229646104110">"Añadir cuenta"</string>
<string name="menu_export_database" msgid="1658249125751926885">"Exportar archivos de base de datos"</string>
- <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Crear contacto"</string>
+ <string name="action_menu_add_new_contact_button" msgid="1201339383074001291">"Crear un contacto"</string>
<string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"Ver más"</string>
<string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"Ver menos"</string>
<string name="about_card_title" msgid="6635849009952435700">"Información"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index d7deb2d..be57b04 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -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>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index dc3e534..c7f349f 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -48,7 +48,7 @@
<string name="splitConfirmation" msgid="4750158900636307469">"ಬಹು ಸಂಪರ್ಕಗಳಲ್ಲಿನ ಈ ಸಂಪರ್ಕವನ್ನು ಅನ್ಲಿಂಕ್ ಮಾಡಬೇಕೆ?"</string>
<string name="splitConfirmation_positive_button" msgid="3109235536045409854">"ಅನ್ಲಿಂಕ್"</string>
<string name="splitConfirmationWithPendingChanges" msgid="8617395780141069527">"ನೀವು ಈಗಾಗಲೇ ಮಾಡಲಾದ ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲು ಮತ್ತು ಬಹು ಸಂಪರ್ಕಗಳಲ್ಲಿನ ಈ ಸಂಪರ್ಕವನ್ನು ಲಿಂಕ್ ರದ್ದುಮಾಡಲು ಬಯಸುವಿರಾ?"</string>
- <string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"ಸೇವ್ ಮಾಡಿ ಮತ್ತು ಅನ್ಲಿಂಕ್ ಮಾಡಿ"</string>
+ <string name="splitConfirmationWithPendingChanges_positive_button" msgid="131293000921403021">"ಉಳಿಸಿ ಮತ್ತು ಅನ್ಲಿಂಕ್ ಮಾಡಿ"</string>
<string name="joinConfirmation" msgid="1245184431169363397">"ನೀವು ಈಗಾಗಲೇ ಮಾಡಲಾದ ಬದಲಾವಣೆಗಳನ್ನು ಉಳಿಸಲು ಮತ್ತು ಆಯ್ಕೆ ಮಾಡಲಾದ ಸಂಪರ್ಕದ ಜೊತೆಗೆ ಲಿಂಕ್ ಮಾಡಲು ಬಯಸುವಿರಾ?"</string>
<string name="joinConfirmation_positive_button" msgid="8300713422725610480">"ಸೇವ್ ಮಾಡಿ ಮತ್ತು ಲಿಂಕ್ ಮಾಡಿ"</string>
<string name="contacts_linking_progress_bar" msgid="7922930766022513619">"ಲಿಂಕ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -366,7 +366,7 @@
<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="dialog_new_contact_account" msgid="5652018124788855057">"ಆಮದಾದ ಸಂಪರ್ಕಗಳನ್ನು ಇಲ್ಲಿ ಸೇವ್ ಮಾಡಿ:"</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>
<string name="import_from_sim_secondary_contact_count_fmt" msgid="4406774701661271748">"{count,plural, =1{# ಸಂಪರ್ಕ}one{# ಸಂಪರ್ಕಗಳು}other{# ಸಂಪರ್ಕಗಳು}}"</string>