diff options
98 files changed, 422 insertions, 84 deletions
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml index 69ea777c9f2..f0dda9da158 100644 --- a/res/layout/bluetooth_pin_confirm.xml +++ b/res/layout/bluetooth_pin_confirm.xml @@ -19,6 +19,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" android:layout_width="match_parent" android:paddingTop="@dimen/bluetooth_dialog_padding_top"> @@ -30,6 +31,18 @@ android:orientation="vertical"> <TextView + android:id="@+id/pairing_confirmation_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/bluetooth_dialog_padding" + android:layout_marginBottom="12dp" + android:layout_marginStart="@dimen/bluetooth_dialog_padding" + android:layout_marginEnd="@dimen/bluetooth_dialog_padding" + android:gravity="center_vertical" + android:visibility="gone" + android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" /> + + <TextView android:id="@+id/pairing_caption" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -110,6 +123,33 @@ android:contentDescription="@string/bluetooth_pairing_phonebook_toggle_text" android:switchMinWidth="48dp" /> </LinearLayout> - </LinearLayout> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp" + android:layout_marginStart="@dimen/bluetooth_dialog_padding" + android:layout_marginEnd="@dimen/bluetooth_dialog_padding"> + <Button + android:id="@+id/negative_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + android:text="@string/bluetooth_pairing_decline" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + style="@style/ActionPrimaryButton"/> + <Button + android:id="@+id/positive_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" + android:text="@string/bluetooth_pairing_accept" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + style="@style/ActionPrimaryButton"/> + </androidx.constraintlayout.widget.ConstraintLayout> + </LinearLayout> </ScrollView> diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml index 83ebd872a3c..43638933d7f 100644 --- a/res/layout/bluetooth_pin_entry.xml +++ b/res/layout/bluetooth_pin_entry.xml @@ -19,6 +19,7 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" android:layout_width="match_parent"> @@ -86,6 +87,30 @@ android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1" android:textColor="?android:attr/textColorSecondary"/> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="16dp" + android:layout_marginStart="@dimen/bluetooth_pairing_padding" + android:layout_marginEnd="@dimen/bluetooth_pairing_padding"> + <Button + android:id="@+id/negative_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@android:string/cancel" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + style="@style/ActionPrimaryButton"/> + <Button + android:id="@+id/positive_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@android:string/ok" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + style="@style/ActionPrimaryButton"/> + </androidx.constraintlayout.widget.ConstraintLayout> </LinearLayout> - </ScrollView> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 69a647a42eb..aa4464174e1 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Laat toegang tot jou kontakte en oproepgeskiedenis toe"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Gee ook toegang tot kontakte en oproepgeskiedenis"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Inligting sal vir oproepaankondigings en meer gebruik word"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Gaan saambindkodes na"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Kyk of hierdie kode ooreenstem met die een op <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nJy moet hierdie kode om veiligheidsredes nêrens invoer nie."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Kon nie aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koppel nie."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Beskikbare toestelle"</string> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index d9eb0de3ddc..4cf964d02ab 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"የእርስዎን የእውቂያዎች እና የጥሪ ታሪክ መዳረሻ ይፍቀዱ"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"እንዲሁም ለዕውቂያዎች እና ለጥሪ ታሪክ መዳረሻ ይፍቀዱ"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"መረጃው ለደውል ማስታወቂያዎች እና ለሌሎችም ጥቅም ላይ ይውላል"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"የማጣመሪያ ኮዶችን በመፈተሽ ላይ"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ይህ ኮድ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ላይ ካለው ጋር እንደሚዛመድ ይፈትሹ።\n\nለእርስዎ ደህንነት ሲባል ይህን ኮድ የትም ቦታ አያስገቡ።"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"ወደ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ማገናኘት አልተቻለም።"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"የሚገኙ መሣሪያዎች"</string> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 08e8d3a63c3..ef8573b4cf6 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"السماح بالوصول إلى جهات الاتصال وسجلّ المكالمات"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"السماح أيضًا بالوصول إلى جهات الاتصال وسجلّ المكالمات"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"سيتم استخدام المعلومات في إشعارات المكالمات وغير ذلك"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"التحقُّق من رموز الإقران"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"يُرجى التأكُّد من تطابُق هذا الرمز مع الرمز المعروض على \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\".\n\nللحفاظ على أمانك، يجب عدم إدخال هذا الرمز في أي مكان."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"تعذر الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"الأجهزة المتاحة"</string> diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index 2541da46c35..992d32ad8a0 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"আপোনাৰ সম্পৰ্কসূচী আৰু কলৰ ইতিহাস এক্সেছ কৰিবলৈ অনুমতি দিয়ক"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"লগতে আপোনাৰ সম্পৰ্কসমূহ আৰু কলৰ ইতিহাস এক্সেছ কৰিবলৈ অনুমতি দিয়ক"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"এই তথ্য কল ঘোষণা আৰু অধিক কাৰ্যৰ বাবে ব্যৱহাৰ কৰা হ’ব"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"পেয়াৰ কৰাৰ ক’ড পৰীক্ষা কৰক"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"এই ক’ডটো <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ত থকাটোৰ সৈতে মিলে নেকি পৰীক্ষা কৰক।\n\nআপোনাৰ সুৰক্ষাৰ বাবে এই ক’ডটো ক’তো নিদিব।"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰিব পৰা নগ\'ল।"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"উপলব্ধ ডিভাইচসমূ্হ"</string> diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index e314f2df7c6..81b2c3e3ba5 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Kontaktlar və zəng tarixçəsinə giriş icazəsi verin"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Kontaktlar və zəng tarixçəsinə də giriş imkanı verin"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Məlumat zəng elanı və s. üçün istifadə ediləcək"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Qoşulma kodlarını yoxlayın"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Bu kodun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazındakı ilə uyğun olub-olmadığını yoxlayın.\n\nTəhlükəsizliyiniz üçün bu kodu heç bir yerə daxil etməyin."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> cihazına qoşula bilmədi."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Əlçatan cihazlar"</string> diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 35c16b3738c..b3c56127d64 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dozvoli pristup kontaktima i istoriji poziva"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Dozvoli i pristup kontaktima i istoriji poziva"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Informacije će se koristiti za obaveštenja o pozivima i drugo"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Proverite kôd za uparivanje"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Proverite da li se ovaj kôd podudara sa onim na uređaju <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nIz bezbednosnih razloga ne unosite nigde ovaj kôd."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nije moguće povezati se sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dostupni uređaji"</string> diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index dacfc6fd74b..4429d215685 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дазволіць доступ да сваіх кантактаў і гісторыі выклікаў"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Дазволіць доступ таксама да кантактаў і гісторыі выклікаў"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Гэта інфармацыя будзе выкарыстоўвацца для апавяшчэнняў аб выкліках і іншых функцый"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Праверце коды спалучэння"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Праверце, ці супадае гэты код з кодам на прыладзе \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\".\n\nУ мэтах бяспекі нікуды не ўводзьце гэты код."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Не атрымалася падключыцца да прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Даступныя прылады"</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index e1bd5d43c2c..45b8f1bf050 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Разрешаване на достъпа до контактите и историята на обажданията ви"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Разрешаване и на достъпа до контактите и историята на обажданията"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Информацията ще се ползва за обявяване на обажданията и др."</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Проверка на кодовете за сдвояване"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Проверете дали кодът съответства на този на <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nОт съображения за сигурност не въвеждайте кода никъде."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Не можа да се установи връзка със: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Налични устройства"</string> diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index 8bfb84d64c5..9d9188c540e 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"আপনার পরিচিতি এবং কল ইতিহাস অ্যাক্সেসের অনুমতি দিন"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"এছাড়াও পরিচিতি ও কলের ইতিহাস অ্যাক্সেস করার অনুমতি দিন"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"কল সম্পর্কিত ঘোষণা ও আরও অনেক কিছুর জন্য তথ্য ব্যবহার করা হবে"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"পেয়ারিং কোড দেখুন"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"এই কোড <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-এর কোডের সাথে মিলছে কিনা তা দেখুন।\n\nআপনার নিরাপত্তার জন্য, এই কোড কোথাও লিখবেন না।"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এ কানেকশন করতে পারেনি।"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"উপলভ্য ডিভাইস"</string> diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index a82e1e17326..d55625267da 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dozvoli pristup kontaktima i historiji poziva"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Također dozvoli pristup kontaktima i historiji poziva"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Podaci će se koristiti za obavještenja o pozivu i drugo"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Provjerite kôd za uparivanje"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Provjerite podudara li se ovaj kôd s kodom na uređaju <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nRadi sigurnosti nemojte unositi ovaj kôd nigdje."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nije uspjelo povezivanje sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dostupni uređaji"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index c7e4f04cd7e..da781b96492 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permet l\'accés als contactes i a l\'historial de trucades"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Permet també l\'accés als contactes i a l\'historial de trucades"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"La informació s\'utilitzarà per als avisos de trucades i més"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Comprova els codis de vinculació"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Comprova si aquest codi coincideix amb el de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPer a la teva seguretat, no introdueixis aquest codi enlloc."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"No s\'ha pogut connectar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dispositius disponibles"</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 565b67bfee6..9f14b26801f 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Povolit přístup ke kontaktům a historii volání"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Povolit také přístup ke kontaktům a historii volání"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Informace se budou používat k oznamování hovorů a k dalším účelům"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Zkontrolujte párovací kódy"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Zkontrolujte, jestli se tento kód shoduje s kódem na zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nKvůli své bezpečnosti ho nikde nezadávejte."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"K zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> se nelze připojit."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dostupná zařízení"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 2df832850ee..e384bf7fa4e 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Giv adgang til dine kontakter og din opkaldshistorik"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Tillad også adgang til kontakter og opkaldshistorik"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Oplysningerne bruges til opkaldsmeddelelser m.m."</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Tjek parringskoder"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Tjek, om denne kode stemmer overens med den på <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nAf sikkerhedsmæssige årsager bør du ikke indtaste denne kode andre steder."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Der kunne ikke oprettes forbindelse til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Tilgængelige enheder"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index c16a9139d8b..499c01ba4ff 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Zugriff auf meine Kontakte und meine Anrufliste zulassen"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Auch den Zugriff auf Kontakte und Anruflisten erlauben"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Die Daten werden für Anrufbenachrichtigungen und anderes verwendet"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Kopplungscodes prüfen"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Prüfe, ob dieser Code mit dem auf dem Gerät „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ übereinstimmt.\n\nGib diesen Code aus Sicherheitsgründen nirgendwo ein."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Keine Verbindung zu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> möglich"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Verfügbare Geräte"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 0ea7ae04ad6..988ef118780 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Να επιτρέπεται η πρόσβαση στις επαφές σας και στο ιστορικό κλήσεων"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Επιτρέψτε επίσης την πρόσβαση στις επαφές και το ιστορικό κλήσεων"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Οι πληροφορίες θα χρησιμοποιούνται για ανακοινώσεις κλήσεων κ.ά."</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Έλεγχος κωδικών σύζευξης"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Ελέγξτε αν αυτός ο κωδικός αντιστοιχεί με αυτόν στη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nΓια την ασφάλειά σας, μην εισαγάγετε αυτόν τον κωδικό πουθενά."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Δεν ήταν δυνατή η σύνδεση με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Διαθέσιμες συσκευές"</string> diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 6e9b73b11d3..8951afe0a4f 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Also allow access to contacts and call history"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Info will be used for call announcements and more"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Check pairing codes"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Check if this code matches the one on <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nFor your security, do not enter this code anywhere."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Couldn\'t connect to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Available devices"</string> diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index 543bb380308..98d1484be1e 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Also allow access to contacts and call history"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Info will be used for call announcements and more"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Check pairing codes"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Check if this code matches the one on <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nFor your security, do not enter this code anywhere."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Couldn’t connect to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Available devices"</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 29b9ca1095a..8e6ada0ad5e 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Also allow access to contacts and call history"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Info will be used for call announcements and more"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Check pairing codes"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Check if this code matches the one on <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nFor your security, do not enter this code anywhere."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Couldn\'t connect to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Available devices"</string> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index bd156c836da..4c7e40f5246 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Allow access to your contacts and call history"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Also allow access to contacts and call history"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Info will be used for call announcements and more"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Check pairing codes"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Check if this code matches the one on <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nFor your security, do not enter this code anywhere."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Couldn\'t connect to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Available devices"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 6450cc66038..a3e6a3cc51b 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir el acceso a tus contactos y al historial de llamadas"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"También permitir acceder a los contactos y el historial de llamadas"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"La información se usará para anuncios de llamadas y otras funciones"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Verifica los códigos de vinculación"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Verifica si este código coincide con el que aparece en <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPor tu seguridad, no ingreses este código en ningún lugar."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"No se pudo establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dispositivos disponibles"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 51a0397a928..f2b547f6e1d 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir acceso a tus contactos y al historial de llamadas"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Permitir también acceder a los contactos y al historial de llamadas"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"La información se usará para avisos de llamada y más"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Comprobar códigos de emparejamiento"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Comprueba si este código coincide con el del <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPor tu seguridad, no introduzcas este código en ningún sitio."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"No se ha podido establecer conexión con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dispositivos disponibles"</string> diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index fa7b9c493c5..7294a2d84ae 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Luba juurdepääs kontaktidele ja kõneajaloole"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Luba juurdepääs ka kontaktidele ja kõneajaloole"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Teavet kasutatakse kõne teadaannete ja muu jaoks."</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Sidumiskoodide kontrollimine"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Kontrollige, kas see kood vastab sellele, mis on seadmes <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nTurvalisuse huvides ärge sisestage seda koodi kuhugi."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei saanud ühendust."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Saadaval seadmed"</string> diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index c295bfbcd4c..d4b8d435d57 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Eman kontaktuak eta deien historia erabiltzeko baimena"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Eman kontaktuak eta deien historia erabiltzeko baimena ere"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Deiak iragartzeko eta beste gauza batzuetarako erabiliko da informazioa"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Egiaztatu parekatze-kodeak"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Egiaztatu kode hau bat datorrela <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuan agertzen denarekin.\n\nZure segurtasuna bermatzeko, ez idatzi kode hau inon ere."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailura konektatu."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Gailu erabilgarriak"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 6e9034afd2c..82ec59d6039 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"اجازه دسترسی به مخاطبین و سابقه تماس"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"دسترسی به مخاطبین و سابقه تماس نیز مجاز شود"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"از اطلاعات برای اعلام تماسها و موارد دیگر استفاده خواهد شد"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"بررسی کردن کدهای جفتسازی"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"مطمئن شوید که این کد با کد نمایش دادهشده در <xliff:g id="DEVICE_NAME">%1$s</xliff:g> مطابقت دارد.\n\nبرای حفظ امنیت، این کد را در هیچجا وارد نکنید."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"اتصال به <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ممکن نیست."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"دستگاههای در دسترس"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 5406aede225..66f196391bd 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Anna pääsyoikeus yhteystietoihisi ja puheluhistoriaasi"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Salli myös pääsy yhteystietoihin ja soittohistoriaan"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Tietoja käytetään esimerkiksi puheluilmoituksiin"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Yhdistämiskoodien tarkistaminen"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Tarkista, vastaako tämä koodi laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> koodia.\n\nTurvallisuussyistä älä lisää tätä koodia mihinkään."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Yhteyden muodostaminen laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> epäonnistui."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Saatavilla olevat laitteet"</string> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 29042811e80..4cf78ad79ac 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Autoriser l\'accès à vos contacts et à l\'historique des appels"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Autoriser également l\'accès aux contacts et à l\'historique des appels"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Ces informations seront utilisées pour les annonces d\'appels et plus"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Vérifier les codes d\'association"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Vérifiez si ce code correspond à celui de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPour votre sécurité, n\'entrez ce code nulle part."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Impossible de se connecter à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Appareils détectés"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3b43b268442..1bd329be26f 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Autoriser l\'accès à vos contacts et à l\'historique de vos appels"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Autoriser l\'accès aux contacts et à l\'historique des appels"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Ces infos seront utilisées pour les notifications d\'appels, entre autres"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Vérifier les codes d\'association"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Vérifiez si ce code correspond à celui indiqué sur l\'appareil <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPour des raisons de sécurité, ne saisissez pas ce code ailleurs."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Impossible de se connecter à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Appareils disponibles"</string> diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 2ad049963a8..06df3376266 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acceso aos teus contactos e ao historial de chamadas"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Permitir tamén o acceso aos contactos e ao historial de chamadas"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"A información empregarase para avisos de chamadas e moito máis"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Comprobar os códigos de vinculación"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Comproba se este código coincide co do dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPola túa seguranza, non escribas o código en ningún lugar."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Non se puido conectar a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dispositivos dispoñibles"</string> diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index dd69071d586..43b08d57c3d 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"તમારા સંપર્કો અને કૉલ ઇતિહાસના ઍક્સેસની મંજૂરી આપો"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"સંપર્કો અને કૉલ ઇતિહાસના ઍક્સેસની પણ મંજૂરી આપો"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"માહિતીનો ઉપયોગ કૉલની ઘોષણાઓ અને વધુ બાબતો માટે કરવામાં આવશે"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"જોડાણ કરવાના કોડ ચેક કરો"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"આ કોડ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> પરના કોડ સાથે મેળ ખાય છે કે નહીં તે ચેક કરો.\n\nતમારી સુરક્ષા માટે, આ કોડ ક્યાંય પણ દાખલ કરશો નહીં."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે કનેક્ટ કરી શકાયું નથી."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"ઉપલબ્ધ ડિવાઇસ"</string> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 97dcfb9c690..dae68251282 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"अपने संपर्क और कॉल इतिहास देखने की मंज़ूरी दें"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"संपर्क और कॉल इतिहास को ऐक्सेस करने की भी अनुमति दें"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"इस जानकारी का इस्तेमाल, कॉल की सूचना देने वगैरह के लिए किया जाएगा"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"जोड़ने के कोड का मिलान करें"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"देखें कि यह कोड, <xliff:g id="DEVICE_NAME">%1$s</xliff:g> के कोड से मेल खाता है या नहीं.\n\nसुरक्षा को ध्यान में रखते हुए, इस कोड को कहीं और इस्तेमाल न करें."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से कनेक्ट नहीं किया जा सका."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"उपलब्ध ब्लूटूथ डिवाइस"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index f853415ce7b..f694f08e3d4 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dopuštam pristup kontaktima i povijesti poziva"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Dopusti i pristup kontaktima i povijesti poziva"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Podaci će se koristiti za najave poziva i drugo"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Provjerite kodove za uparivanje"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Provjerite podudara li se ovaj kôd s kodom na uređaju <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nRadi vlastite sigurnosti, kôd nemojte nigdje unositi."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nije moguće povezati se na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dostupni uređaji"</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index cbe6ccb481a..204a0fd99d9 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Hozzáférést biztosít névjegyeihez és híváslistájához"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Hozzáférés engedélyezése a névjegyekhez és a híváslistához is"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Az információkat a hívások bejelentéséhez és egyebekhez használjuk majd fel."</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Párosítókódok ellenőrzése"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Ellenőrizze, hogy ez a kód egyezik-e a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközön lévővel.\n\nA biztonság érdekében ne adja meg ezt a kódot sehol sem."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nem sikerült csatlakozni a következőhöz: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Rendelkezésre álló eszközök"</string> diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index e7e5a1d7457..f1f7ad6a820 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Թույլատրել կոնտակտների ու զանգերի պատմության հասանելիությունը"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Նաև հասանելի դարձնել կոնտակտները և զանգերի պատմությունը"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Տեղեկությունները կօգտագործվեն զանգերի մասին ծանուցումների համար և այլ նպատակներով"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Ստուգեք զուգակցման կոդերը"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Ստուգեք՝ արդյոք այս կոդը համընկնում է <xliff:g id="DEVICE_NAME">%1$s</xliff:g> սարքում նշվածի հետ։\n\nԱնվտանգության նկատառումներից ելնելով՝ այս կոդը ոչ մի տեղ մի մուտքագրեք։"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Հնարավոր չեղավ միանալ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ին:"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Հասանելի սարքեր"</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 0b616da8cfa..d9ee758e815 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Izinkan akses ke kontak dan histori panggilan Anda"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Juga izinkan akses ke kontak dan histori panggilan"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Info akan digunakan untuk pengumuman panggilan dan lain-lain"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Periksa kode penyambungan"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Periksa apakah kode ini cocok dengan kode yang ada di <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nDemi keamanan Anda, jangan masukkan kode ini di mana pun."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Tidak dapat terhubung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Perangkat yang tersedia"</string> diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index cae9d8cf6cf..6abf2d00824 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Veita aðgang að tengiliðum þínum og símtalaferli"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Veita einnig aðgang að tengiliðum og símtalaferli"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Upplýsingar verða notaðar fyrir símtalatilkynningar og fleira"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Kanna pörunarkóða"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Kannaðu hvort þessi kóði passar við kóðann í <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nÞér til öryggis skaltu ekki slá þennan kóða inn neins staðar."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Ekki tókst að tengjast <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Tæki í boði"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 85fd8e6bd3d..531c25f36ea 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Consenti l\'accesso ai tuoi contatti e alla cronologia chiamate"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Consenti anche l\'accesso ai contatti e alla cronologia delle chiamate"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Le informazioni saranno utilizzate per gli annunci delle chiamate e altro ancora"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Controlla i codici di accoppiamento"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Verifica se questo codice corrisponde a quello su <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPer motivi di sicurezza, non inserire questo codice da nessuna parte."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Impossibile collegarsi a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dispositivi disponibili"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 6fab67bbefb..7ec012d6f10 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"אישור גישה אל אנשי הקשר והיסטוריית השיחות"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"אישור גישה אל אנשי הקשר והיסטוריית השיחות"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"המידע הזה ישמש למשל כדי להשמיע התראות על שיחות נכנסות"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"צריך לבדוק את קודי ההתאמה"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"הקוד הזה והקוד במכשיר <xliff:g id="DEVICE_NAME">%1$s</xliff:g> חייבים להיות זהים.\n\nמטעמי אבטחה, חשוב לא להזין את הקוד הזה בשום מקום."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"לא הייתה אפשרות להתחבר אל <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"מכשירים זמינים"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 18d612b56ea..5e16d444fc7 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"連絡先と通話履歴へのアクセスを許可する"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"連絡先と通話履歴へのアクセスも許可"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"情報は着信の通知などに使用されます"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"ペア設定コードの確認"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"このコードが <xliff:g id="DEVICE_NAME">%1$s</xliff:g> のコードと一致していることを確認してください。\n\n安全のため、このコードをどこにも入力しないでください。"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>に接続できませんでした。"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"使用可能なデバイス"</string> diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 22b9ec7f0db..b5f2a83f5c6 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"კონტაქტებსა და საუბრის ისტორიაზე წვდომის დაშვება"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"დაუშვით წვდომა კონტაქტებსა და საუბრის ისტორიაზეც"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"ინფორმაცია გამოიყენება განცხადებების გამოცხადებისა და სხვა მოქმედებებისთვის"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"დაკავშირების კოდების შემოწმება"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"შეამოწმეთ, ემთხვევა თუ არა ეს კოდი <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ისას.\n\nთქვენი უსაფრთხოებისთვის, ეს კოდი არსად არ შეიყვანოთ."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან დაკავშირება ვერ მოხერხდა."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"ხელმისაწვდომი მოწყობილობები"</string> diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index e9672f11c0e..a28cb7f3b54 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Контактілер мен қоңыраулар тарихына кіруге рұқсат беру"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Сондай-ақ контактілерге және қоңыраулар тарихына кіруге рұқсат беру"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Ақпарат қоңырау туралы хабарландырулар және т.б. үшін пайдаланылады."</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Жұптау кодтарын тексеріңіз"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Бұл кодтың <xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысындағы кодпен бірдей екенін тексеріңіз.\n\nҚауіпсіздікті сақтау үшін бұл кодты басқа жерде енгізбеңіз."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысына жалғану мүмкін болмады."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Қолжетімді құрылғылар"</string> diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 21dcaf4e083..6e84975939b 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ផ្ដល់សិទ្ធិអនុញ្ញាតចូលប្រើទំនាក់ទំនង និងប្រវត្តិហៅទូរសព្ទរបស់អ្នក"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"អនុញ្ញាតឱ្យចូលប្រើប្រាស់ប្រវត្តិហៅទូរសព្ទ និងទំនាក់ទំនងផងដែរ"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"ព័ត៌មាននឹងត្រូវបានប្រើសម្រាប់ការប្រកាសអំពីការហៅទូរសព្ទ និងអ្វីៗជាច្រើនទៀត"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"ពិនិត្យមើលកូដផ្គូផ្គង"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ពិនិត្យមើលថាតើកូដនេះត្រូវគ្នានឹងកូដនៅលើ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>។\n\nសម្រាប់សុវត្ថិភាពរបស់អ្នក សូមកុំបញ្ចូលកូដនេះនៅកន្លែងណាមួយឱ្យសោះ។"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"មិនអាចតភ្ជាប់ទៅ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"ឧបករណ៍ដែលអាចភ្ជាប់បាន"</string> diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index e435760c242..bfd31c48ec6 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಿ"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆ ಇತಿಹಾಸಕ್ಕೆ ಆ್ಯಕ್ಸೆಸ್ ಅನ್ನು ಸಹ ಅನುಮತಿಸಿ"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"ಮಾಹಿತಿಯನ್ನು ಕರೆ ಪ್ರಕಟಣೆಗಳು ಮತ್ತು ಹೆಚ್ಚಿನವುಗಳಿಗಾಗಿ ಬಳಸಲಾಗುತ್ತದೆ"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"ಪೇರಿಂಗ್ ಕೋಡ್ಗಳನ್ನು ಪರಿಶೀಲಿಸಿ"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ಈ ಕೋಡ್ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ನಲ್ಲಿರುವ ಕೋಡ್ಗೆ ಹೊಂದಿಕೆಯಾಗುತ್ತದೆಯೇ ಎಂದು ಪರಿಶೀಲಿಸಿ.\n\nನಿಮ್ಮ ಸುರಕ್ಷತೆಗಾಗಿ, ಈ ಕೋಡ್ ಅನ್ನು ಎಲ್ಲಿಯೂ ನಮೂದಿಸಬೇಡಿ."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"ಲಭ್ಯವಿರುವ ಸಾಧನಗಳು"</string> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 22eedcd8d54..9c71b8427ef 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"연락처 및 통화 기록 액세스 허용"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"연락처 및 통화 기록에 대한 액세스도 허용합니다."</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"정보는 전화 알림 등에 사용됩니다."</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"페어링 코드를 확인하세요"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"이 코드가 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>에 표시된 코드와 일치하는지 확인하세요.\n\n보안을 위해 이 코드를 어디에도 입력하지 마세요."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에 연결할 수 없습니다."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"사용할 수 있는 기기"</string> diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 53192042eb3..bfe19a4c02f 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Байланыштар менен чалууларды жеткиликтүү кылуу"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Байланыштарды жана чалуу таржымалын жеткиликтүү кыласыз"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Маалымат чалуу тууралуу билдирмелер жана башкалар үчүн колдонулат"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Байланыштыруучу коддорду текшериңиз"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Бул код <xliff:g id="DEVICE_NAME">%1$s</xliff:g> түзмөгүндөгү кодго дал келерин текшериңиз.\n\nКоопсуздугуңуз үчүн бул кодду эч жерге киргизбеңиз."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен байланыша албай жатат."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Жеткиликтүү түзмөктөр"</string> diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index 7259d3f241c..838960a301d 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ອະນຸຍາດໃຫ້ເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ປະຫວັດການໂທຂອງທ່ານ"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"ອະນຸຍາດໃຫ້ເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ປະຫວັດການໂທນຳ"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"ຂໍ້ມູນຈະຖືກໃຊ້ສຳລັບປະກາດການໂທ ແລະ ອື່ນໆ"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"ກວດເບິ່ງລະຫັດການຈັບຄູ່"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ກວດເບິ່ງວ່າລະຫັດນີ້ກົງກັບອັນທີ່ຢູ່ໃນ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຫຼືບໍ່.\n\nເພື່ອຄວາມປອດໄພຂອງທ່ານ, ຢ່າປ້ອນລະຫັດນີ້ໃສ່ບ່ອນໃດໆ."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"ບໍ່ສາມາດເຊື່ອມຕໍ່ຫາ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ໄດ້."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"ອຸປະກອນທີ່ສາມາດໃຊ້ໄດ້"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 618f58bab06..d2917011e14 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Leisti pasiekti jūsų kontaktus ir skambučių istoriją"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Taip pat leiskite pasiekti kontaktus ir skambučių istoriją"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Informacija bus naudojama skambučių pranešimams ir kt."</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Patikrinkite susiejimo kodus"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Patikrinkite, ar šis kodas atitinka kodą „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ įrenginyje.\n\nSaugos sumetimais niekur neįveskite šio kodo."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nepavyko prisijungti prie „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Pasiekiami įrenginiai"</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 788d4e7c3b1..bb3de2a511d 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Atļaut piekļuvi jūsu kontaktpersonām un zvanu vēsturei"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Atļaut arī piekļuvi kontaktpersonām un zvanu vēsturei"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Informācija tiks izmantota paziņojumiem par zvaniem un citām funkcijām"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Pārbaudiet kodus savienošanai pārī"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Pārbaudiet, vai šis kods atbilst kodam, kas redzams ierīcē <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nDrošības nolūkos nekur neievadiet šo kodu."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nevarēja izveidot savienojumu ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Pieejamās ierīces"</string> diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 580c20e7249..9c9cbbb7ce9 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволете пристап до вашите контакти и историјата на повици"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Дозволи и пристап до контактите и историјата на повици"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Податоците ќе се користат за известувања за повици и друго"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Проверете ги кодовите за спарување"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Проверете дали кодов се совпаѓа со оној на <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nЗа ваша безбедност, не внесувајте го кодов никаде."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Не може да се поврзе со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Достапни уреди"</string> diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index 116a67dd103..47c614bf734 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"കോൺടാക്റ്റുകളിലേക്കും കോൾ ചരിത്രത്തിലേക്കും ആക്സസ് അനുവദിക്കുക"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"കോൺടാക്റ്റുകളിലേക്കും കോൾ ചരിത്രത്തിലേക്കും ആക്സസ് അനുവദിക്കുകയും ചെയ്യുക"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"വിവരങ്ങൾ, കോൾ അറിയിപ്പുകൾക്കും മറ്റും ഉപയോഗിക്കും"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"ജോടിയാക്കൽ കോഡ് പരിശോധിക്കുക"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്നതിലുള്ള കോഡുമായി ഈ കോഡ് പൊരുത്തപ്പെടുന്നുണ്ടോയെന്ന് പരിശോധിക്കുക.\n\nനിങ്ങളുടെ സുരക്ഷയ്ക്കായി, ഈ കോഡ് എവിടെയും നൽകരുത്."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്നതിലേക്ക് കണക്റ്റുചെയ്യാനായില്ല."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"ലഭ്യമായ ഉപകരണങ്ങൾ"</string> diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 3c25c680d31..28cf988156e 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Харилцагч болон дуудлагын түүхийн хандалтыг зөвшөөрөх"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Мөн харилцагчид болон дуудлагын түүхэд хандахыг зөвшөөрнө үү"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Мэдээллийг дуудлагын мэдэгдэл болон бусад зүйлд ашиглана"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Хослуулах кодуудыг шалгана уу"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Энэ код <xliff:g id="DEVICE_NAME">%1$s</xliff:g> дээрх кодтой таарч байгаа эсэхийг шалгана уу.\n\nАюулгүй байдлынхаа үүднээс энэ кодыг хаана ч бүү оруулаарай."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-д холбогдож чадсангүй."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Боломжтой төхөөрөмжүүд"</string> diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index e9c16182efb..d78f2231211 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"तुमच्या संपर्क आणि कॉल इतिहासातील अॅक्सेसची अनुमती द्या"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"संपर्क आणि कॉल इतिहासाच्या अॅक्सेसचीदेखील अनुमती द्या"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"कॉल घोषणा आणि आणखी बऱ्याच गोष्टींसाठी माहिती वापरली जाईल"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"पेअरिंग कोड तपासणे"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"हा कोड <xliff:g id="DEVICE_NAME">%1$s</xliff:g> वर असणाऱ्या कोडशी जुळतो की नाही ते तपासा.\n\nतुमच्या सुरक्षिततेसाठी, हा कोड कुठेही टाकू नका."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सह कनेक्ट करणे शक्य झाले नाही."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"उपलब्ध डिव्हाइस"</string> diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 8e147e9febf..d33dc75e1d8 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Benarkan akses kepada kenalan dan sejarah panggilan anda"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Benarkan juga akses kepada kenalan dan sejarah panggilan"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Maklumat akan digunakan untuk pengumuman panggilan dan pelbagai lagi"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Semak kod gandingan"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Semak sama ada kod ini sepadan dengan kod pada <xliff:g id="DEVICE_NAME">%1$s</xliff:g> atau tidak.\n\nUntuk keselamatan anda, jangan masukkan kod ini di mana-mana tempat lain."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Tidak dapat menyambung ke <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Peranti yang tersedia"</string> diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 5be84f03756..da96bd2968e 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"သင်၏ အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းကို ကြည့်ခွင့်ပြုသည်"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းကိုလည်း သုံးခွင့်ပေးရန်"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"အချက်အလက်ကို ဖုန်းခေါ်ဆိုမှု ကြေညာချက်နှင့် အခြားအရာများအတွက် သုံးမည်"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"တွဲချိတ်ကုဒ်များကို စစ်ဆေးပါ"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ဤကုဒ်သည် <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ရှိ ကုဒ်နှင့် တူမတူ စစ်ကြည့်ပါ။\n\nသင့်လုံခြုံမှုအတွက် ဤကုဒ်ကို မည်သည့်နေရာတွင်မျှ မထည့်ပါနှင့်။"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ကို ချိတ်ဆက်မရပါ။"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"ရနိုင်သည့် စက်များ"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 9597d01790d..cadaa9b0a8a 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Gi tilgang til kontakter og anropslogg"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Gi også tilgang til kontakter og anropsloggen"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Informasjonen brukes for anropskunngjøringer med mer"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Sjekk sammenkoblingskoder"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Sjekk om denne koden samsvarer med koden på <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nAv sikkerhetshensyn må du ikke skrive inn denne koden noe sted."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Kunne ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Tilgjengelige enheter"</string> diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index f86ba4fc2a5..5b28d645f30 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"आफ्ना कन्ट्याक्ट र कल हिष्ट्री हेर्ने अनुमति दिनुहोस्"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"कन्ट्याक्ट र कल हिस्ट्री हेर्ने र प्रयोग गर्ने अनुमति पनि दिनुहोस्"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"यो जानकारीको प्रयोग कल आएको जानकारी दिने लगायतका कुराका लागि प्रयोग गरिने छ"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"कनेक्सन कोडहरू जाँच्नुहोस्"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"यो कोड <xliff:g id="DEVICE_NAME">%1$s</xliff:g> मा भएको कोडसँग ठ्याक्कै मिल्छ कि मिल्दैन जाँच्नुहोस्।\n\nतपाईंको सुरक्षाका लागि जुनसुकै ठाउँमा यो कोड नहाल्नुहोस्।"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> उपकरणसँग जडान गर्न सकेन।"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"उपलब्ध डिभाइस"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 7f19edfc003..c286d85e87d 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Toegang geven tot je contacten en gespreksgeschiedenis"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Ook toegang geven tot contacten en gespreksgeschiedenis"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"De informatie wordt onder andere gebruikt voor gespreksaankondigingen"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Koppelingscodes checken"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Check of deze code overeenkomt met de code op de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nVoer deze code nergens in."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Kan geen verbinding maken met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Beschikbare apparaten"</string> diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index c5f193c097b..2318dbfa925 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ଆପଣଙ୍କ କଣ୍ଟାକ୍ଟ ଓ କଲ ହିଷ୍ଟୋରୀକୁ ଆକ୍ସେସ କରିବାର ଅନୁମତି ଦିଅନ୍ତୁ"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"କଣ୍ଟାକ୍ଟ ଏବଂ କଲ ଇତିହାସକୁ ଆକ୍ସେସ କରିବା ପାଇଁ ମଧ୍ୟ ଅନୁମତି ଦିଅନ୍ତୁ"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"ସୂଚନାକୁ କଲ ଘୋଷଣା ଏବଂ ଆହୁରି ଅନେକ କିଛି ପାଇଁ ବ୍ୟବହାର କରାଯିବ"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"ପେୟାରିଂ କୋଡଗୁଡ଼ିକୁ ଯାଞ୍ଚ କରନ୍ତୁ"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ଏହି କୋଡଟି <xliff:g id="DEVICE_NAME">%1$s</xliff:g>ରେ ଥିବା କୋଡ ସହ ମେଳ ଖାଉଛି ନା ନାହିଁ ତାହା ଯାଞ୍ଚ କରନ୍ତୁ।\n\nଆପଣଙ୍କ ସୁରକ୍ଷା ପାଇଁ, ଏହି କୋଡକୁ ଯେ କୌଣସି ସ୍ଥାନରେ ଲେଖନ୍ତୁ ନାହିଁ।"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ସହ ସଂଯୋଗ ସ୍ଥାପନା କରିପାରୁନାହିଁ।"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"ଉପଲବ୍ଧ ଡିଭାଇସ"</string> diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index fda46ccc0ea..07a3a481cf0 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ \'ਤੇ ਪਹੁੰਚ ਕਰਨ ਦਿਓ"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"ਸੰਪਰਕਾਂ ਅਤੇ ਕਾਲ ਇਤਿਹਾਸ ਤੱਕ ਵੀ ਪਹੁੰਚ ਦੀ ਆਗਿਆ ਦਿਓ"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"ਜਾਣਕਾਰੀ ਦੀ ਵਰਤੋਂ ਕਾਲ ਘੋਸ਼ਣਾਵਾਂ ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ ਲਈ ਕੀਤੀ ਜਾਵੇਗੀ"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"ਜੋੜਾਬੱਧਕਰਨ ਕੋਡਾਂ ਦੀ ਜਾਂਚ ਕਰੋ"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ਜਾਂਚ ਕਰੋ ਕਿ ਕੀ ਇਹ ਕੋਡ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> \'ਤੇ ਮੌਜੂਦ ਕੋਡ ਨਾਲ ਮੇਲ ਖਾਉਂਦਾ ਹੈ ਜਾਂ ਨਹੀਂ।\n\nਆਪਣੀ ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਕੋਡ ਨੂੰ ਕਿਤੇ ਵੀ ਦਾਖਲ ਨਾ ਕਰੋ।"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"ਉਪਲਬਧ ਡੀਵਾਈਸ"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index a2baa0d6cf9..91451a73415 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Zezwól na dostęp do kontaktów i historii połączeń"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Zezwalaj również na dostęp do kontaktów i historii połączeń"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Informacje zostaną wykorzystane m.in. do powiadomień o połączeniach"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Sprawdź kody parowania"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Sprawdź, czy ten kod jest taki sam, jak na urządzeniu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nZe względów bezpieczeństwa nie wpisuj nigdzie tego kodu."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nie udało się nawiązać połączenia z <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dostępne urządzenia"</string> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index d5132152b5f..e6bb1233b77 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir acesso a seus contatos e histórico de ligações"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Permitir o acesso a contatos e ao histórico de ligações também"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"As informações serão usadas para fazer o anúncio de ligações e muito mais"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Verificar códigos de pareamento"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Verifique se o código é igual ao que aparece no <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPara sua segurança, não digite esse código em nenhum lugar."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Não foi possível conectar ao <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dispositivos encontrados"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 0ada28d8fb2..8f020167956 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir o acesso aos contactos e ao histórico de chamadas"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Permitir também o acesso aos contactos e ao histórico de chamadas"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"As informações vão ser usadas para anúncios por chamadas e outros"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Verifique os códigos de sincronização"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Verifique se este código corresponde ao que está no dispositivo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPara sua segurança, não introduza este código em lado algum."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Não foi possível ligar a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dispositivos disponíveis"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index d5132152b5f..e6bb1233b77 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permitir acesso a seus contatos e histórico de ligações"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Permitir o acesso a contatos e ao histórico de ligações também"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"As informações serão usadas para fazer o anúncio de ligações e muito mais"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Verificar códigos de pareamento"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Verifique se o código é igual ao que aparece no <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPara sua segurança, não digite esse código em nenhum lugar."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Não foi possível conectar ao <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dispositivos encontrados"</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index e3e37cfd867..1a3d9920e7e 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Permite accesul la agendă și la istoricul apelurilor"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"În plus, permite accesul la agendă și la istoricul apelurilor"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Informațiile vor fi folosite pentru notificări privind apelurile și altele"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Verifică codurile de conectare"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Verifică dacă acest cod corespunde cu cel de pe <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPentru siguranța ta, nu introduce acest cod nicăieri."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nu s-a putut conecta la <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dispozitive disponibile"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 44e910d978a..9bf1c9ca780 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Разрешить доступ к контактам и журналу звонков"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Разрешить доступ к контактам и журналу звонков"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Эта информация будет использоваться для оповещений о звонках и других функций"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Сравните коды подключения"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Проверьте, совпадает ли ваш код с кодом на устройстве \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\".\n\nВ целях безопасности нигде не вводите этот код."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Не удалось подключиться к <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Доступные устройства"</string> diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index ddab401c828..4e1087095a1 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ඔබගේ සම්බන්ධතා සහ ඇමතුම් ඉතිහාසය වෙත ප්රවේශ විමට ඉඩ දෙන්න"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"සම්බන්ධතා සහ ඇමතුම් ඉතිහාසය වෙත ප්රවේශ වීමට ද ඉඩ දෙන්න"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"ඇමතුම් නිවේදන සහ තවත් දේ සඳහා තතු භාවිත කෙරේ"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"යුගල කිරීමේ කේත පරීක්ෂා කරන්න"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"මෙම කේතය <xliff:g id="DEVICE_NAME">%1$s</xliff:g> හි ඇති එකට ගැළපෙනවා දැයි පරීක්ෂා කරන්න.\n\nඔබේ ආරක්ෂාව සඳහා, මෙම කේතය කොතැනකවත් ඇතුළු නොකරන්න."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> වෙත සම්බන්ධ වීමට නොහැකි විය."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"තිබෙන උපාංග"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 5af5484245c..5d89950f9f7 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Povoliť prístup ku kontaktom a histórii hovorov"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Povoliť aj prístup ku kontaktom a histórii hovorov"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Informácie budú použité na účely oznámení hovorov a ďalších funkcií"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Skontrolujte párovacie kódy"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Skontrolujte, či sa tento kód zhoduje s kódom v zariadení <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nV záujme svojej bezpečnosti tento kód nikde nezadávajte."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nepodarilo sa pripojiť k zariadeniu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Dostupné zariadenia"</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 19d45a507d8..a3e23d53099 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Dovoli dostop do stikov in zgodovine klicev"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Dovoli tudi dostop do stikov in zgodovine klicev"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Podatki bodo uporabljeni za najave klicev in drugo"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Preverjanje kod za seznanjanje"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Preverite, ali se ta koda ujema s kodo v napravi <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nZaradi varnosti te kode ne vnašajte nikjer."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Povezave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ni bilo mogoče vzpostaviti."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Razpoložljive naprave"</string> diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 2b9dae1ae1c..238471d44e7 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Lejo qasjen te kontaktet dhe historiku i telefonatave"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Lejo gjithashtu qasjen te kontaktet dhe historiku i telefonatave"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Informacionet do të përdoren për njoftimet për telefonatat etj."</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Kontrollo kodet e çiftimit"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Kontrollo nëse ky kod përputhet me kodin në <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPër sigurinë tënde, mos e fut askund këtë kod."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Nuk mundi të lidhej me <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Pajisjet që ofrohen"</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 96bf966d0ff..c6215e34b74 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволи приступ контактима и историји позива"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Дозволи и приступ контактима и историји позива"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Информације ће се користити за обавештења о позивима и друго"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Проверите кôд за упаривање"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Проверите да ли се овај кôд подудара са оним на уређају <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nИз безбедносних разлога не уносите нигде овај кôд."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Није могуће повезати се са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Доступни уређаји"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 948cec13041..3ff5465235b 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Tillåt åtkomst till kontakter och sökhistorik"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Ge även åtkomst till kontakter och samtalshistorik"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Uppgifterna används för samtalsaviseringar med mera"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Kontrollera kopplingskoder"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Kontrollera att koden stämmer överens med den på <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nAnge inte den här koden någonstans av säkerhetsskäl."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Det gick inte att ansluta till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Tillgängliga enheter"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index a654beedae0..26a5b5a4e1a 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Ruhusu ufikiaji wa anwani na historia ya simu ulizopiga"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Ruhusu pia ufikiaji wa anwani na rekodi ya simu zilizopigwa"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Maelezo yatatumiwa kutaarifu kuhusu simu na zaidi"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Angalia misimbo ya kuunganisha"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Angalia kama msimbo huu unalingana na ulio kwenye <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nKwa usalama wako, usiweke msimbo huu popote."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Haikuweza kuunganisha kwa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Vifaa vinavyopatikana"</string> diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index e4a2ee344d7..f6a23b4a12f 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"உங்கள் தொடர்புகள் மற்றும் அழைப்புப் பதிவை அணுக அனுமதிக்கவும்"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"தொடர்புகளுக்கும் அழைப்புப் பதிவுகளுக்கும் அனுமதி அளித்தல்"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"அழைப்பு அறிவிப்புகளுக்கும் பலவற்றுக்கும் தகவல் பயன்படுத்தப்படும்"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"இணைத்தல் குறியீடுகளைச் சரிபார்த்தல்"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"இந்தக் குறியீடு <xliff:g id="DEVICE_NAME">%1$s</xliff:g> சாதனத்தில் உள்ள குறியீட்டுடன் பொருந்துகிறதா எனப் பார்க்கவும்.\n\nஉங்கள் பாதுகாப்பிற்காக, இந்தக் குறியீட்டை வேறெங்கும் டைப் செய்ய வேண்டாம்."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க முடியவில்லை."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"கிடைக்கும் சாதனங்கள்"</string> diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 72644676759..173953a5225 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"మీ కాంటాక్ట్లకు, కాల్ హిస్టరీకి యాక్సెస్ను అనుమతించండి"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"కాంటాక్ట్లకు, కాల్ హిస్టరీకి కూడా యాక్సెస్ను అనుమతించండి"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"సమాచారం, కాల్ అనౌన్స్మెంట్లు, ఇంకా మరిన్నింటి కోసం ఉపయోగించబడుతుంది"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"పెయిరింగ్ కోడ్లను చెక్ చేయండి"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ఈ కోడ్, <xliff:g id="DEVICE_NAME">%1$s</xliff:g>లో ఉన్న దానితో సరిపోతుందో లేదో చెక్ చేయండి.\n\nమీ భద్రతా కారణాల దృష్ట్యా, ఈ కోడ్ను ఎక్కడా ఎంటర్ చేయకండి."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>కి కనెక్ట్ చేయడం సాధ్యపడలేదు."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"అందుబాటులో ఉన్న పరికరాలు"</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 712156e7266..ba108bac7ec 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"ให้สิทธิ์เข้าถึงรายชื่อติดต่อและประวัติการโทร"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"อนุญาตให้เข้าถึงรายชื่อติดต่อและประวัติการโทรด้วย"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"ข้อมูลนี้จะถูกใช้เพื่อแจ้งการโทรและอื่นๆ"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"ตรวจสอบรหัสการจับคู่"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"ตรวจสอบว่ารหัสนี้ตรงกับรหัสใน <xliff:g id="DEVICE_NAME">%1$s</xliff:g> หรือไม่\n\nเพื่อความปลอดภัย โปรดอย่าป้อนรหัสนี้ที่ใดก็ตาม"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"ไม่สามารถเชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"อุปกรณ์ที่ใช้ได้"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 85e986288c5..ac9c5a562e8 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Payagan ang access sa iyong mga contact at history ng tawag"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Payagan din ang access sa mga contact at history ng tawag"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Gagamitin ang impormasyon para sa mga anunsyo sa tawag at higit pa"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Tingnan ang mga code ng pagpapares"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Tingnan kung tumutugma ang code na ito sa code na nasa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nPara sa iyong seguridad, huwag ilagay ang code na ito kahit saan."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Hindi makakonekta sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Mga available na device"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 18d8c17618d..7c08be34358 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Kişilerime ve çağrı geçmişime erişime izin ver"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Kişilere ve çağrı geçmişine erişim izni de ver"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Bilgiler, arama duyuruları ve diğer özellikler için kullanılacak"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Eşleme kodlarını kontrol edin"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Bu kodun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> adlı cihazdaki kodla eşleşip eşleşmediğini kontrol edin.\n\nGüvenliğiniz için bu kodu hiçbir yere girmeyin."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> adlı cihaza bağlanılamadı."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Kullanılabilir cihazlar"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 746f1d98daa..71b0e82f68c 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Дозволити доступ до контактів та історії викликів"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Надати доступ також до контактів і історії викликів"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Інформація використовуватиметься для сповіщень про виклики тощо"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Перевірте коди зв’язування"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Перевірте, чи цей код збігається з кодом на пристрої \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\".\n\nЗ міркувань безпеки ніде не вводьте цей код."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Не вдалося з’єднатися з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Доступні пристрої"</string> diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 74178cb1948..6c6ed76e6cb 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"اپنے رابطوں اور کال کی سرگزشت تک رسائی کی اجازت دیں"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"رابطوں اور کال کی سرگزشت تک رسائی کی بھی اجازت دیں"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"معلومات کو کال کے اعلانات اور مزید کے لیے استعمال کیا جائے گا"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"جوڑا بنانے کے کوڈز چیک کریں"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"چیک کریں کہ آیا یہ کوڈ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> پر موجود کوڈ سے مماثل ہے۔\n\nاپنی سیکیورٹی کیلئے، یہ کوڈ کسی بھی جگہ درج نہ کریں۔"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> سے مربوط نہیں ہو سکا۔"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"دستیاب آلات"</string> diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index de13d498ccc..6ba4535a0ee 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Kontakt va chaqiruvlar tarixiga ruxsat berish"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Shuningdek, kontaktlar va chaqiruvlar tarixiga kirish uchun ruxsat bering"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Maʼlumotlar chaqiruvlar haqida xabar berish uchun ishlatiladi"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Ulanish kodlarini tekshirish"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Bu kod <xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasidagi kod bilan mos kelishini tekshiring.\n\nXavfsizligingiz uchun bu kodni hech qayerga kiritmang."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ga o‘zaro bog‘lanmadi."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Mavjud qurilmalar"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 471b194de29..2115e78932b 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Cho phép truy cập vào danh bạ và nhật ký cuộc gọi của bạn"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Cho phép truy cập cả danh bạ và nhật ký cuộc gọi"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Thông tin sẽ được sử dụng cho tính năng thông báo cuộc gọi và nhiều tính năng khác"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Kiểm tra mã ghép nối"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Kiểm tra xem mã này có khớp với mã trên <xliff:g id="DEVICE_NAME">%1$s</xliff:g> hay không.\n\nĐể bảo mật, bạn không nên nhập mã này ở bất cứ đâu."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Không thể kết nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Thiết bị có sẵn"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 441bcdb92ad..cddd822f801 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"允许访问您的通讯录和通话记录"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"同时允许访问通讯录和通话记录"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"相关信息将用于来电通知等用途"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"检查配对码"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"请检查此代码是否与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”上的代码相符。\n\n为安全起见，请勿在任何位置输入此代码。"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"无法连接到<xliff:g id="DEVICE_NAME">%1$s</xliff:g>。"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"可用的设备"</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 0ae3cd77a08..7111652f41f 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"允許存取你的聯絡人和通話記錄"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"亦允許存取通訊錄和通話記錄"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"資訊將用於來電通知等用途"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"檢查配對碼"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"檢查此配對碼是否與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」上的相符。\n\n為安全起見，請勿在任何地方輸入此配對碼。"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"無法連接「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"可用的裝置"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 554e27e370c..c232bb64d6d 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"允許存取你的聯絡人和通話記錄"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"也允許存取聯絡人和通話記錄"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"資訊將用於來電通知等用途"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"檢查配對碼"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"請檢查這組代碼是否與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」上的代碼相符。\n\n為了安全起見，請勿在任何地方輸入這組代碼。"</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"無法連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"可用的裝置"</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index fbc50a23fac..785f76c4f9a 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -928,6 +928,8 @@ <string name="bluetooth_pairing_shares_phonebook" msgid="4329325125260724843">"Vumela ukufinyelela koxhumana nabo nomlando wekholi"</string> <string name="bluetooth_pairing_phonebook_toggle_text" msgid="2474015367387690034">"Phinda futhi uvumele ukufinyelela koxhumana nabo nomlando wekholi"</string> <string name="bluetooth_pairing_phonebook_toggle_details" msgid="1367197978487212581">"Ulwazi luzosetshenziselwa izimemezelo zekholi nokunye okwengeziwe"</string> + <string name="bluetooth_pairing_confirmation_title" msgid="3359642089708714808">"Hlola amakhodi okubhangqa"</string> + <string name="bluetooth_pairing_confirmation_msg" msgid="8204761740738350792">"Maka uma le khodi iqondana naleyo eku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>.\n\nUkuze uphephe, ungayifaki noma kuphi le khodi."</string> <string name="bluetooth_error_title" msgid="2284738188253690278"></string> <string name="bluetooth_connecting_error_message" msgid="3941893154784152112">"Ayikwazanga ukuxhuma ku-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_preference_found_media_devices" msgid="830061195998352840">"Amadivayisi atholakalayo"</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 774e776022b..6a716d146e5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2066,6 +2066,12 @@ <!-- Phonebook sharing toggle detailed message in pairing dialogs. [CHAR LIMIT=NONE] --> <string name="bluetooth_pairing_phonebook_toggle_details">Info will be used for call announcements and more</string> + <!-- Title for the dialog to confirm PIN. [CHAR LIMIT=40] --> + <string name="bluetooth_pairing_confirmation_title">Check pairing codes</string> + + <!-- Message for the dialog to confirm PIN. [CHAR LIMIT=NONE] --> + <string name="bluetooth_pairing_confirmation_msg">Check if this code matches the one on <xliff:g id="device_name" example="device_name">%1$s</xliff:g>.\n\nFor your security, do not enter this code anywhere.</string> + <!-- Title for BT error dialogs. --> <string name="bluetooth_error_title"></string> diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java index c4c8dc0f7ed..e4765d8ea0d 100644 --- a/src/com/android/settings/biometrics/BiometricEnrollBase.java +++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java @@ -182,7 +182,12 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity { EXTRA_LAUNCHED_POSTURE_GUIDANCE); mNextLaunched = savedInstanceState.getBoolean(EXTRA_KEY_NEXT_LAUNCHED); } - mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId()); + final String callingPackage = getLaunchedFromPackage(); + if (callingPackage == null || !getPackageName().equals(callingPackage)) { + mUserId = UserHandle.myUserId(); + } else { + mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId()); + } mPostureGuidanceIntent = FeatureFactory.getFeatureFactory() .getFaceFeatureProvider().getPostureGuidanceIntent(getApplicationContext()); diff --git a/src/com/android/settings/biometrics/face/FaceEnroll.kt b/src/com/android/settings/biometrics/face/FaceEnroll.kt index 74f1613aafe..48ea527c032 100644 --- a/src/com/android/settings/biometrics/face/FaceEnroll.kt +++ b/src/com/android/settings/biometrics/face/FaceEnroll.kt @@ -20,6 +20,7 @@ import android.app.ComponentCaller import android.content.Intent import android.os.Bundle import android.util.Log +import androidx.annotation.VisibleForTesting import androidx.appcompat.app.AppCompatActivity import com.android.settings.biometrics.BiometricEnrollBase.RESULT_FINISHED import com.android.settings.biometrics.combination.CombinedBiometricStatusUtils @@ -38,6 +39,9 @@ class FaceEnroll: AppCompatActivity() { private val enrollActivityProvider: FaceEnrollActivityClassProvider get() = featureFactory.faceFeatureProvider.enrollActivityClassProvider + @VisibleForTesting + var launchedFromProvider: () -> String? = { launchedFromPackage } + private var isLaunched = false override fun onCreate(savedInstanceState: Bundle?) { @@ -56,6 +60,11 @@ class FaceEnroll: AppCompatActivity() { Log.d("FaceEnroll", "forward to $nextActivityClass") val nextIntent = Intent(this, nextActivityClass) nextIntent.putExtras(intent) + + // drop extras that are not allowed from external packages before launching + if (launchedFromProvider() != packageName) { + nextIntent.removeExtra(Intent.EXTRA_USER_ID) + } startActivityForResult(nextIntent, 0) isLaunched = true diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index 946d9b3eb25..f5944561580 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -239,9 +239,8 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { if (token != null) { intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token); } - final int userId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId()); - if (userId != UserHandle.USER_NULL) { - intent.putExtra(Intent.EXTRA_USER_ID, userId); + if (mUserId != UserHandle.USER_NULL) { + intent.putExtra(Intent.EXTRA_USER_ID, mUserId); } BiometricUtils.copyMultiBiometricExtras(getIntent(), intent); intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, true); diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java index 476f00206fe..5079c03ca35 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java @@ -18,8 +18,6 @@ package com.android.settings.bluetooth; import android.app.Dialog; import android.app.settings.SettingsEnums; import android.content.Context; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; import android.os.Bundle; import android.text.Editable; import android.text.InputFilter; @@ -47,7 +45,7 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; * for the bluetooth device. */ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment implements - TextWatcher, OnClickListener { + TextWatcher { private static final String TAG = "BTPairingDialogFragment"; @@ -108,22 +106,19 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i @Override public void afterTextChanged(Editable s) { // enable the positive button when we detect potentially valid input - Button positiveButton = mDialog.getButton(DialogInterface.BUTTON_POSITIVE); - if (positiveButton != null) { - positiveButton.setEnabled(mPairingController.isPasskeyValid(s)); - } + mDialog.findViewById(R.id.positive_button).setEnabled(mPairingController.isPasskeyValid(s)); // notify the controller about user input mPairingController.updateUserInput(s.toString()); } - @Override - public void onClick(DialogInterface dialog, int which) { - if (which == DialogInterface.BUTTON_POSITIVE) { - mPositiveClicked = true; - mPairingController.onDialogPositiveClick(this); - } else if (which == DialogInterface.BUTTON_NEGATIVE) { - mPairingController.onDialogNegativeClick(this); - } + protected void onAcceptButtonClicked() { + mPositiveClicked = true; + mPairingController.onDialogPositiveClick(this); + mPairingDialogActivity.dismiss(); + } + + protected void onDeclineButtonClicked() { + mPairingController.onDialogNegativeClick(this); mPairingDialogActivity.dismiss(); } @@ -224,12 +219,10 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i mBuilder.setTitle(getString(R.string.bluetooth_pairing_request, mPairingController.getDeviceName())); mBuilder.setView(createPinEntryView()); - mBuilder.setPositiveButton(getString(android.R.string.ok), this); - mBuilder.setNegativeButton(getString(android.R.string.cancel), this); AlertDialog dialog = mBuilder.create(); dialog.setOnShowListener(d -> { if (TextUtils.isEmpty(getPairingViewText())) { - mDialog.getButton(Dialog.BUTTON_POSITIVE).setEnabled(false); + mDialog.findViewById(R.id.positive_button).setEnabled(false); } if (mPairingView != null && mPairingView.requestFocus()) { InputMethodManager imm = (InputMethodManager) @@ -294,6 +287,11 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i pairingView.setFilters(new InputFilter[]{ new LengthFilter(maxLength)}); + Button negativeButton = view.findViewById(R.id.negative_button); + negativeButton.setOnClickListener(v -> onDeclineButtonClicked()); + Button positiveButton = view.findViewById(R.id.positive_button); + positiveButton.setOnClickListener(v -> onAcceptButtonClicked()); + return view; } @@ -301,13 +299,13 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i * Creates a dialog with UI elements that allow the user to confirm a pairing request. */ private AlertDialog createConfirmationDialog() { - mBuilder.setTitle(getString(R.string.bluetooth_pairing_request, - mPairingController.getDeviceName())); + if (mPairingController.hasPairingContent()) { + mBuilder.setTitle(getString(R.string.bluetooth_pairing_confirmation_title)); + } else { + mBuilder.setTitle(getString(R.string.bluetooth_pairing_request, + mPairingController.getDeviceName())); + } mBuilder.setView(createView()); - mBuilder.setPositiveButton( - getString(com.android.settingslib.R.string.bluetooth_pairing_accept), this); - mBuilder.setNegativeButton( - getString(com.android.settingslib.R.string.bluetooth_pairing_decline), this); AlertDialog dialog = mBuilder.create(); return dialog; } @@ -327,7 +325,6 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i mBuilder.setTitle(getString(R.string.bluetooth_pairing_request, mPairingController.getDeviceName())); mBuilder.setView(createView()); - mBuilder.setNegativeButton(getString(android.R.string.cancel), this); AlertDialog dialog = mBuilder.create(); // Tell the controller the dialog has been created. @@ -342,6 +339,8 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i */ private View createView() { View view = getActivity().getLayoutInflater().inflate(R.layout.bluetooth_pin_confirm, null); + TextView pairingConfirmationHint = + (TextView) view.findViewById(R.id.pairing_confirmation_hint); TextView pairingViewCaption = (TextView) view.findViewById(R.id.pairing_caption); TextView pairingViewContent = (TextView) view.findViewById(R.id.pairing_subhead); TextView messagePairing = (TextView) view.findViewById(R.id.pairing_code_message); @@ -356,11 +355,20 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i messagePairing.setVisibility(mPairingController.isDisplayPairingKeyVariant() ? View.VISIBLE : View.GONE); if (mPairingController.hasPairingContent()) { - pairingViewCaption.setVisibility(View.VISIBLE); + if (mPairingController.isDisplayPairingKeyVariant()) { + pairingViewCaption.setVisibility(View.VISIBLE); + } else { + pairingConfirmationHint.setText( + getString( + R.string.bluetooth_pairing_confirmation_msg, + mPairingController.getDeviceName())); + pairingConfirmationHint.setVisibility(View.VISIBLE); + } pairingViewContent.setVisibility(View.VISIBLE); pairingViewContent.setText(mPairingController.getPairingContent()); } final TextView messagePairingSet = (TextView) view.findViewById(R.id.pairing_group_message); + if (mPairingController.isLateBonding()) { messagePairingSet.setText(getString(R.string.bluetooth_pairing_group_late_bonding)); } @@ -369,6 +377,16 @@ public class BluetoothPairingDialogFragment extends InstrumentedDialogFragment i mPairingController.isCoordinatedSetMemberDevice() || mPairingController.isLateBonding(); messagePairingSet.setVisibility(setPairingMessage ? View.VISIBLE : View.GONE); + + Button negativeButton = view.findViewById(R.id.negative_button); + negativeButton.setVisibility(View.VISIBLE); + negativeButton.setOnClickListener(v -> onDeclineButtonClicked()); + if (mPairingController.getDialogType() == BluetoothPairingController.CONFIRMATION_DIALOG) { + Button positiveButton = view.findViewById(R.id.positive_button); + positiveButton.setVisibility(View.VISIBLE); + positiveButton.setOnClickListener(v -> onAcceptButtonClicked()); + } + return view; } } diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index 1f5374dac8a..f263884d72f 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -63,7 +63,8 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { TipType.BATTERY_DEFENDER, TipType.DOCK_DEFENDER, TipType.INCOMPATIBLE_CHARGER, - TipType.BATTERY_WARNING + TipType.BATTERY_WARNING, + TipType.BATTERY_HEALTH }) public @interface TipType { int SMART_BATTERY_MANAGER = 0; @@ -78,24 +79,26 @@ public abstract class BatteryTip implements Comparable<BatteryTip>, Parcelable { int DOCK_DEFENDER = 9; int INCOMPATIBLE_CHARGER = 10; int BATTERY_WARNING = 11; + int BATTERY_HEALTH = 12; } @VisibleForTesting static final SparseIntArray TIP_ORDER; static { TIP_ORDER = new SparseIntArray(); - TIP_ORDER.append(TipType.BATTERY_SAVER, 0); - TIP_ORDER.append(TipType.LOW_BATTERY, 1); - TIP_ORDER.append(TipType.BATTERY_DEFENDER, 2); - TIP_ORDER.append(TipType.DOCK_DEFENDER, 3); - TIP_ORDER.append(TipType.INCOMPATIBLE_CHARGER, 4); - TIP_ORDER.append(TipType.APP_RESTRICTION, 5); - TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 6); - TIP_ORDER.append(TipType.SUMMARY, 7); - TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 8); - TIP_ORDER.append(TipType.REDUCED_BATTERY, 9); - TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 10); - TIP_ORDER.append(TipType.BATTERY_WARNING, 11); + TIP_ORDER.append(TipType.BATTERY_HEALTH, 0); + TIP_ORDER.append(TipType.BATTERY_SAVER, 1); + TIP_ORDER.append(TipType.LOW_BATTERY, 2); + TIP_ORDER.append(TipType.BATTERY_DEFENDER, 3); + TIP_ORDER.append(TipType.DOCK_DEFENDER, 4); + TIP_ORDER.append(TipType.INCOMPATIBLE_CHARGER, 5); + TIP_ORDER.append(TipType.APP_RESTRICTION, 6); + TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 7); + TIP_ORDER.append(TipType.SUMMARY, 8); + TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 9); + TIP_ORDER.append(TipType.REDUCED_BATTERY, 10); + TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 11); + TIP_ORDER.append(TipType.BATTERY_WARNING, 12); } private static final String KEY_PREFIX = "key_battery_tip"; diff --git a/src/com/android/settings/nfc/DefaultPaymentSettings.java b/src/com/android/settings/nfc/DefaultPaymentSettings.java index ddac08beb00..440f09e3d9b 100644 --- a/src/com/android/settings/nfc/DefaultPaymentSettings.java +++ b/src/com/android/settings/nfc/DefaultPaymentSettings.java @@ -17,7 +17,6 @@ package com.android.settings.nfc; import android.app.settings.SettingsEnums; -import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; @@ -45,6 +44,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; /** * DefaultPaymentSettings handles the NFC default payment app selection. @@ -53,7 +55,7 @@ public class DefaultPaymentSettings extends DefaultAppPickerFragment { public static final String TAG = "DefaultPaymentSettings"; private PaymentBackend mPaymentBackend; - private List<PaymentAppInfo> mAppInfos; + private Map<String, PaymentAppInfo> mAppInfos; private FooterPreference mFooterPreference; @Override @@ -67,22 +69,19 @@ public class DefaultPaymentSettings extends DefaultAppPickerFragment { } @Override + @SuppressWarnings("NullAway") protected String getDefaultKey() { PaymentAppInfo defaultAppInfo = mPaymentBackend.getDefaultApp(); - if (defaultAppInfo != null) { - return defaultAppInfo.componentName.flattenToString() + " " - + defaultAppInfo.userHandle.getIdentifier(); - } - return null; + if (defaultAppInfo == null) return null; + return defaultAppInfo.getKey(); } @Override protected boolean setDefaultKey(String key) { - String[] keys = key.split(" "); - if (keys.length >= 2) { - mPaymentBackend.setDefaultPaymentApp(ComponentName.unflattenFromString(keys[0]), - Integer.parseInt(keys[1])); - } + PaymentAppInfo appInfo = mAppInfos.get(key); + if (appInfo == null) return true; + mPaymentBackend.setDefaultPaymentApp( + appInfo.componentName, appInfo.userHandle.getIdentifier()); return true; } @@ -90,7 +89,9 @@ public class DefaultPaymentSettings extends DefaultAppPickerFragment { public void onAttach(Context context) { super.onAttach(context); mPaymentBackend = new PaymentBackend(getActivity()); - mAppInfos = mPaymentBackend.getPaymentAppInfos(); + mAppInfos = mPaymentBackend.getPaymentAppInfos() + .stream() + .collect(Collectors.toMap(PaymentAppInfo::getKey, Function.identity())); } @Override @@ -147,7 +148,7 @@ public class DefaultPaymentSettings extends DefaultAppPickerFragment { @Override protected List<? extends CandidateInfo> getCandidates() { final List<NfcPaymentCandidateInfo> candidates = new ArrayList<>(); - for (PaymentAppInfo appInfo: mAppInfos) { + for (PaymentAppInfo appInfo: mAppInfos.values()) { UserManager um = getContext().createContextAsUser( appInfo.userHandle, /*flags=*/0).getSystemService(UserManager.class); boolean isManagedProfile = um.isManagedProfile(appInfo.userHandle.getIdentifier()); diff --git a/src/com/android/settings/nfc/PaymentBackend.java b/src/com/android/settings/nfc/PaymentBackend.java index 021d673e152..de733081a1d 100644 --- a/src/com/android/settings/nfc/PaymentBackend.java +++ b/src/com/android/settings/nfc/PaymentBackend.java @@ -36,6 +36,7 @@ import com.android.internal.content.PackageMonitor; import java.util.ArrayList; import java.util.List; +import java.util.Objects; public class PaymentBackend { public static final String TAG = "Settings.PaymentBackend"; @@ -52,6 +53,24 @@ public class PaymentBackend { public ComponentName settingsComponent; public UserHandle userHandle; public Drawable icon; + + public String getKey() { + return Integer.toString(hashCode()); + } + + @Override + public int hashCode() { + return Objects.hash(componentName, userHandle); + } + + @Override + public boolean equals(Object o) { + if (o == this) return true; + if (!(o instanceof PaymentAppInfo)) return false; + PaymentAppInfo appInfo = (PaymentAppInfo) o; + return componentName.equals(appInfo.componentName) + && userHandle.equals(appInfo.userHandle); + } } /** diff --git a/tests/robotests/src/com/android/settings/biometrics/MultiBiometricEnrollHelperTest.java b/tests/robotests/src/com/android/settings/biometrics/MultiBiometricEnrollHelperTest.java index 03b3b48461d..76a1e346669 100644 --- a/tests/robotests/src/com/android/settings/biometrics/MultiBiometricEnrollHelperTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/MultiBiometricEnrollHelperTest.java @@ -140,9 +140,16 @@ public class MultiBiometricEnrollHelperTest { final ShadowPackageManager shadowPackageManager = shadowOf(mContext.getPackageManager()); shadowPackageManager.setSystemFeature(PackageManager.FEATURE_FACE, true); ShadowUtils.setFaceManager(mFaceManager); - ActivityController.of(new FaceEnrollIntroduction(), mFaceIntent) + ActivityController.of(new TestFaceEnrollIntroduction(), mFaceIntent) .create(mFaceIntent.getExtras()).get(); verify(mFaceManager).generateChallenge(eq(mUserId), any()); } + + private static class TestFaceEnrollIntroduction extends FaceEnrollIntroduction { + @Override + public String getLaunchedFromPackage() { + return getPackageName(); + } + } } diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java index 984073f19b5..7d3aee92ba2 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollIntroductionTest.java @@ -182,6 +182,11 @@ public class FaceEnrollIntroductionTest { public boolean isInMultiWindowMode() { return mIsMultiWindowMode; } + + @Override + public String getLaunchedFromPackage() { + return getPackageName(); + } } @Before diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollTest.kt b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollTest.kt index f4786388f50..ad4605aff98 100644 --- a/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollTest.kt +++ b/tests/robotests/src/com/android/settings/biometrics/face/FaceEnrollTest.kt @@ -21,11 +21,10 @@ import android.content.Intent import com.android.settings.overlay.FeatureFactory import com.android.settings.testutils.FakeFeatureFactory import com.google.common.truth.Truth.assertThat -import com.google.common.truth.Truth import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mockito.Mockito +import org.mockito.Mockito.`when` as whenever import org.robolectric.Robolectric import org.robolectric.RobolectricTestRunner import org.robolectric.Shadows @@ -39,6 +38,7 @@ class FaceEnrollTest { const val INTENT_VALUE = "testValue" val INTENT = Intent().apply { putExtra(INTENT_KEY, INTENT_VALUE) + putExtra(Intent.EXTRA_USER_ID, 11) } } @@ -47,30 +47,45 @@ class FaceEnrollTest { @Before fun setUp() { featureFactory = FakeFeatureFactory.setupForTest() - Mockito.`when`(featureFactory.faceFeatureProvider.enrollActivityClassProvider) + whenever(featureFactory.faceFeatureProvider.enrollActivityClassProvider) .thenReturn(activityProvider) } - private fun setupActivity(activityClass: Class<out FaceEnroll>): FaceEnroll { - return Robolectric.buildActivity(activityClass, INTENT).create().get() + private fun setupActivity( + activityClass: Class<out FaceEnroll>, + launchedFrom: String? = null, + ): FaceEnroll { + val activityController = Robolectric.buildActivity(activityClass, INTENT) + activityController.get().launchedFromProvider = { + launchedFrom ?: activityController.get().packageName + } + return activityController.create().get() } @Test fun testFinishAndLaunchDefaultActivity() { - // Run val activity = setupActivity(FaceEnroll::class.java) - // Verify - verifyLaunchNextActivity(activity, activityProvider.next) + val nextActivityIntent = activity.asShadow().nextStartedActivity + assertThat(nextActivityIntent.component!!.className).isEqualTo(activityProvider.next.name) + assertThat(nextActivityIntent.extras!!.size()).isEqualTo(2) + assertThat(nextActivityIntent.getStringExtra(INTENT_KEY)).isEqualTo(INTENT_VALUE) + assertThat(nextActivityIntent.hasExtra(Intent.EXTRA_USER_ID)).isTrue() } - private fun verifyLaunchNextActivity( - currentActivityInstance : FaceEnroll, - nextActivityClass: Class<out Activity> - ) { - val nextActivityIntent = Shadows.shadowOf(currentActivityInstance).nextStartedActivity - assertThat(nextActivityIntent.component!!.className).isEqualTo(nextActivityClass.name) + @Test + fun testFinishAndLaunchDefaultActivity_fromExternal_dropUser() { + val activity = setupActivity( + FaceEnroll::class.java, + launchedFrom = "com.foo.bar" + ) + + val nextActivityIntent = activity.asShadow().nextStartedActivity + assertThat(nextActivityIntent.component!!.className).isEqualTo(activityProvider.next.name) assertThat(nextActivityIntent.extras!!.size()).isEqualTo(1) assertThat(nextActivityIntent.getStringExtra(INTENT_KEY)).isEqualTo(INTENT_VALUE) + assertThat(nextActivityIntent.hasExtra(Intent.EXTRA_USER_ID)).isFalse() } -}
\ No newline at end of file +} + +private fun Activity.asShadow() = Shadows.shadowOf(this) diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java index 20448813a89..be30836a038 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Dialog; import android.content.Context; import android.text.SpannableStringBuilder; import android.text.TextUtils; @@ -108,7 +107,7 @@ public class BluetoothPairingDialogTest { // test that the positive button is enabled when passkey is valid frag.afterTextChanged(new SpannableStringBuilder(FILLER)); - View button = frag.getmDialog().getButton(AlertDialog.BUTTON_POSITIVE); + View button = frag.getmDialog().findViewById(R.id.positive_button); assertThat(button).isNotNull(); assertThat(button.getVisibility()).isEqualTo(View.VISIBLE); } @@ -176,7 +175,7 @@ public class BluetoothPairingDialogTest { // get the relevant views View messagePairing = frag.getmDialog().findViewById(R.id.pairing_code_message); TextView pairingViewContent = frag.getmDialog().findViewById(R.id.pairing_subhead); - View pairingViewCaption = frag.getmDialog().findViewById(R.id.pairing_caption); + TextView pairingViewCaption = frag.getmDialog().findViewById(R.id.pairing_caption); // check that the relevant views are visible and that the passkey is shown assertThat(messagePairing.getVisibility()).isEqualTo(View.VISIBLE); @@ -208,7 +207,7 @@ public class BluetoothPairingDialogTest { BluetoothPairingDialogFragment frag = makeFragment(); // click the button and verify that the controller hook was called - frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_POSITIVE); + frag.onAcceptButtonClicked(); verify(controller, times(1)).onDialogPositiveClick(any()); } @@ -224,7 +223,7 @@ public class BluetoothPairingDialogTest { BluetoothPairingDialogFragment frag = makeFragment(); // click the button and verify that the controller hook was called - frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_NEGATIVE); + frag.onDeclineButtonClicked(); verify(controller, times(1)).onDialogNegativeClick(any()); } @@ -269,7 +268,8 @@ public class BluetoothPairingDialogTest { // test that the positive button is enabled when passkey is valid frag.afterTextChanged(new SpannableStringBuilder(FILLER)); - View button = frag.getmDialog().getButton(AlertDialog.BUTTON_POSITIVE); + View button = frag.getmDialog().findViewById(R.id.positive_button); + assertThat(button).isNotNull(); assertThat(button.isEnabled()).isFalse(); } @@ -379,7 +379,7 @@ public class BluetoothPairingDialogTest { BluetoothPairingDialogFragment frag = makeFragment(); // click the button and verify that the controller hook was called - frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_POSITIVE); + frag.onAcceptButtonClicked(); verify(controller, times(1)).onDialogPositiveClick(any()); verify(dialogActivity, times(1)).dismiss(); @@ -397,7 +397,7 @@ public class BluetoothPairingDialogTest { BluetoothPairingDialogFragment frag = makeFragment(); // click the button and verify that the controller hook was called - frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_NEGATIVE); + frag.onDeclineButtonClicked(); verify(controller, times(1)).onDialogNegativeClick(any()); verify(dialogActivity, times(1)).dismiss(); @@ -405,6 +405,24 @@ public class BluetoothPairingDialogTest { @Ignore @Test + public void confirmationDialog_showConfirmationMessage() { + when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG); + when(controller.getDeviceName()).thenReturn("Device"); + when(controller.hasPairingContent()).thenReturn(true); + when(controller.getPairingContent()).thenReturn(FILLER); + + // build the fragment + BluetoothPairingDialogFragment frag = makeFragment(); + + TextView pairingConfirmationHint = + frag.getmDialog().findViewById(R.id.pairing_confirmation_hint); + assertThat(pairingConfirmationHint.getText()) + .isEqualTo(frag.getString(R.string.bluetooth_pairing_confirmation_msg, "Device")); + assertThat(pairingConfirmationHint.getVisibility()).isEqualTo(View.VISIBLE); + } + + @Ignore + @Test public void rotateDialog_nullPinText_okButtonEnabled() { userEntryDialogExistingTextTest(null); } @@ -465,7 +483,7 @@ public class BluetoothPairingDialogTest { AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog(); assertThat(dialog).isNotNull(); boolean expected = !TextUtils.isEmpty(existingText); - assertThat(dialog.getButton(Dialog.BUTTON_POSITIVE).isEnabled()).isEqualTo(expected); + assertThat(dialog.findViewById(R.id.positive_button).isEnabled()).isEqualTo(expected); } private void setupFragment(BluetoothPairingDialogFragment frag) { |