Merge "API level 30 upgrade: AOSP Contacts" am: 98adb72d18
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/1787028
Change-Id: I0d9f2ee895d89a289392b8298fceccc83e4b2110
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 7cc9320..1711751 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -425,7 +425,7 @@
<string name="vcard_unknown_filename" msgid="8320954544777782497">"contact"</string>
<string name="caching_vcard_message" msgid="1879339732783666517">"Mise en cache des fichiers vCard dans l\'espace de stockage temporaire local. L\'importation va bientôt démarrer."</string>
<string name="vcard_import_failed" msgid="37313715326741013">"Impossible d\'importer le fichier vCard."</string>
- <string name="nfc_vcard_file_name" msgid="2113518216329123152">"Contact reçu par NFC"</string>
+ <string name="nfc_vcard_file_name" msgid="2113518216329123152">"Contact reçu par CCP"</string>
<string name="caching_vcard_title" msgid="6333926052524937628">"Mise en cache…"</string>
<string name="progress_notifier_message" msgid="8522060892889599746">"Importation <xliff:g id="CURRENT_NUMBER">%1$s</xliff:g> sur <xliff:g id="TOTAL_NUMBER">%2$s</xliff:g> (<xliff:g id="NAME">%3$s</xliff:g>)"</string>
<string name="export_to_vcf_file" msgid="3096479544575798192">"Exporter en format .vcf"</string>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 5e91f0c..832bf07 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -161,8 +161,8 @@
<string name="action_menu_back_from_edit_select" msgid="7911226757462657242">"બંધ કરો"</string>
<string name="aggregation_suggestion_edit_dialog_message" msgid="4339333746086996062">"પસંદ કરેલ સંપર્કોને સંપાદિત કરવા પર સ્વિચ કરીએ? તમે અત્યાર સુધીમાં દાખલ કરેલી માહિતીને કૉપિ કરાશે."</string>
<string name="contact_directory_description" msgid="1773630547110881835">"નિર્દેશિકા <xliff:g id="TYPE">%1$s</xliff:g>"</string>
- <string name="activity_title_settings" msgid="4004290638426915162">"સેટિંગ્સ"</string>
- <string name="menu_settings" msgid="3524924670246877187">"સેટિંગ્સ"</string>
+ <string name="activity_title_settings" msgid="4004290638426915162">"સેટિંગ"</string>
+ <string name="menu_settings" msgid="3524924670246877187">"સેટિંગ"</string>
<string name="menu_help" msgid="287801702920372292">"સહાય અને પ્રતિસાદ"</string>
<string name="organization_company_and_title" msgid="7197631449041284518">"<xliff:g id="COMPANY_0">%2$s</xliff:g>, <xliff:g id="COMPANY_1">%1$s</xliff:g>"</string>
<string name="non_phone_caption" msgid="7343449684187013327">"ફોન નંબર"</string>
@@ -470,7 +470,7 @@
<string name="send_and_call_button" msgid="4851257959568592699">"મોકલો અને કૉલ કરો"</string>
<string name="call_subject_limit" msgid="5679166729627777474">"<xliff:g id="COUNT">%1$s</xliff:g> / <xliff:g id="LIMIT">%2$s</xliff:g>"</string>
<string name="call_subject_type_and_number" msgid="134754147019287616">"<xliff:g id="TYPE">%1$s</xliff:g> • <xliff:g id="NUMBER">%2$s</xliff:g>"</string>
- <string name="about_build_version" msgid="5870642814752351712">"બિલ્ડ સંસ્કરણ"</string>
+ <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>