Merge tm-qpr-dev-plus-aosp-without-vendor@9467136

Bug: 264720040
Merged-In: Ibd695efe6139b9558ca3b1210b48d42ccdb79ff1
Change-Id: Ic84beaaff12151a94cb938f8ae3562ef0fd3a661

3 files changed, 7 insertions, 7 deletions

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 5493e7e..babf254 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_name" msgid="170210454004696382">"কী চ্চেইন"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"প্ৰমাণপত্ৰ নিৰ্বাচন কৰক"</string>
     <string name="requesting_application" msgid="1589142627467598421">"%sএ এখন প্ৰমাণপত্ৰ বিচাৰিছে। আপুনি এখন প্ৰমাণপত্ৰ বাছনি কৰিলে এপটোৱে সেই পৰিচয়টো বৰ্তমান আৰু ভৱিষ্যতে ছাৰ্ভাৰৰ লগত যোগাযোগ কৰোতে ব্যৱহাৰ কৰিব।"</string>
-    <string name="requesting_server" msgid="5832565605998634370">"এপ্‌টোৱে অনুৰোধ কৰা ছাৰ্ভাৰটো %s হিচাপে চিহ্নিত কৰিছে, কিন্তু আপুনি এপ্‌টোক বিশ্বাস কৰিলেহে কেৱল এপ্‌টোক প্ৰমাণপত্ৰ এক্সেছ কৰিবলৈ দিয়া উচিত।"</string>
+    <string name="requesting_server" msgid="5832565605998634370">"এপ্‌টোৱে অনুৰোধ কৰা ছাৰ্ভাৰটো %s হিচাপে চিহ্নিত কৰিছে, কিন্তু আপুনি এপ্‌টোক বিশ্বাস কৰিলেহে কেৱল এপ্‌টোক প্ৰমাণপত্ৰত প্ৰৱেশ কৰিবলৈ দিয়া উচিত।"</string>
     <string name="install_new_cert_message" msgid="4451971501142085495">"আপুনি বাহ্যিক ষ্ট’ৰেজত থকা %1$s বা %2$s এক্সটেনশ্বনযুক্ত এটা PKCS#12 ফাইলৰ পৰা প্ৰমাণপত্ৰসমূহ ইনষ্টল কৰিব পাৰে।"</string>
     <string name="allow_button" msgid="3030990695030371561">"বাছনি কৰক"</string>
     <string name="deny_button" msgid="3766539809121892584">"প্ৰত্যাখ্যান কৰক"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index a40eeb0..4df0c2b 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="170210454004696382">"Key Chain"</string>
     <string name="title_select_cert" msgid="3588447616418041699">"Choose certificate"</string>
-    <string name="requesting_application" msgid="1589142627467598421">"The app %s has requested a certificate. Choosing a certificate will let the app use this identity with servers now and in the future."</string>
+    <string name="requesting_application" msgid="1589142627467598421">"The %s app has requested a certificate. Choosing a certificate will let the app use this identity with servers now and in the future."</string>
     <string name="requesting_server" msgid="5832565605998634370">"The app has identified the requesting server as %s, but you should only give the app access to the certificate if you trust the app."</string>
     <string name="install_new_cert_message" msgid="4451971501142085495">"You can install certificates from a PKCS#12 file with a %1$s or a %2$s extension located in external storage."</string>
     <string name="allow_button" msgid="3030990695030371561">"Select"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8e7b7f6..56f6f22 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,11 +17,11 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="170210454004696382">"Key Chain"</string>
-    <string name="title_select_cert" msgid="3588447616418041699">"Alege un certificat"</string>
+    <string name="title_select_cert" msgid="3588447616418041699">"Alegeți un certificat"</string>
     <string name="requesting_application" msgid="1589142627467598421">"Aplicația %s a solicitat un certificat. Alegerea unui certificat va permite aplicației să utilizeze această identitate în relația sa cu serverele, acum și în viitor."</string>
-    <string name="requesting_server" msgid="5832565605998634370">"Aplicația a identificat serverul solicitant drept %s, dar ar trebui să acorzi aplicației acces la certificat numai dacă ai încredere în aceasta."</string>
-    <string name="install_new_cert_message" msgid="4451971501142085495">"Poți instala certificate dintr-un fișier PKCS#12 cu o extensie %1$s sau %2$s care se află pe stocarea externă."</string>
-    <string name="allow_button" msgid="3030990695030371561">"Selectează"</string>
-    <string name="deny_button" msgid="3766539809121892584">"Refuză"</string>
+    <string name="requesting_server" msgid="5832565605998634370">"Aplicația a identificat serverul solicitant drept %s, dar ar trebui să acordați aplicației acces la certificat numai dacă aveți încredere în aceasta."</string>
+    <string name="install_new_cert_message" msgid="4451971501142085495">"Puteți instala certificate dintr-un fișier PKCS#12 cu o extensie %1$s sau %2$s care se află pe stocarea externă."</string>
+    <string name="allow_button" msgid="3030990695030371561">"Selectați"</string>
+    <string name="deny_button" msgid="3766539809121892584">"Refuzați"</string>
     <string name="loading_certs_message" msgid="2152223341043639547">"%s caută certificatul…"</string>
 </resources>