Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b466322a authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12 QPR 3"

parents 01cef9a2 0f251848
Loading
Loading
Loading
Loading
+112 −112

File changed.

Preview size limit exceeded, changes collapsed.

+12 −12
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="pbap_session_key_dialog_title" msgid="5103201901254778256">"Tipe-sessiesleutel vir %1$s"</string>
    <string name="pbap_session_key_dialog_title" msgid="3580996574333882561">"Tipe-sessiesleutel vir %1$s"</string>
    <string name="pbap_session_key_dialog_header" msgid="5073165544713355581">"Bluetooth-sessiesleutel benodig"</string>
    <string name="pbap_session_key_dialog_header" msgid="2772472422782758981">"Bluetooth-sessiesleutel benodig"</string>
    <string name="pbap_acceptance_timeout_message" msgid="3071798915563151284">"Die tyd het verstryk om verbinding met %1$s te aanvaar"</string>
    <string name="pbap_acceptance_timeout_message" msgid="1107401415099814293">"Die tyd het verstryk om verbinding met %1$s te aanvaar"</string>
    <string name="pbap_authentication_timeout_message" msgid="2089914949828656737">"Die invoer-sessiesleutel met %1$s het uitgetel"</string>
    <string name="pbap_authentication_timeout_message" msgid="4166979525521902687">"Die invoer-sessiesleutel met %1$s het uitgetel"</string>
    <string name="auth_notif_ticker" msgid="7344125635314034621">"Obex-stawingsversoek"</string>
    <string name="auth_notif_ticker" msgid="1575825798053163744">"Obex-stawingsversoek"</string>
    <string name="auth_notif_title" msgid="6639277119990416473">"Sessiesleutel"</string>
    <string name="auth_notif_title" msgid="7599854855681573258">"Sessiesleutel"</string>
    <string name="auth_notif_message" msgid="7044369885874418693">"Tik sessiesleutel vir %1$s"</string>
    <string name="auth_notif_message" msgid="6667218116427605038">"Tik sessiesleutel vir %1$s"</string>
    <string name="defaultname" msgid="6200530814398805541">"Motortoebehore"</string>
    <string name="defaultname" msgid="4821590500649090078">"Motortoebehore"</string>
    <string name="unknownName" msgid="6755061296103155293">"Onbekende naam"</string>
    <string name="unknownName" msgid="2841414754740600042">"Onbekende naam"</string>
    <string name="localPhoneName" msgid="9119254982537191352">"My naam"</string>
    <string name="localPhoneName" msgid="2349001318925409159">"My naam"</string>
    <string name="defaultnumber" msgid="5348816189286607406">"000000"</string>
    <string name="defaultnumber" msgid="8520116145890867338">"000000"</string>
    <string name="pbap_notification_group" msgid="4215789331721465381">"Bluetooth-kontakdeling"</string>
    <string name="pbap_notification_group" msgid="8487669554703627168">"Bluetooth-kontakdeling"</string>
</resources>
</resources>
+1 −1
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="pbap_account_type" msgid="7595186298710257905">"com.android.bluetooth.pbapsink"</string>
    <string name="pbap_account_type" msgid="6257077123906049322">"com.android.bluetooth.pbapsink"</string>
</resources>
</resources>
+6 −6
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="bluetooth_sap_notif_title" msgid="7854456947435963346">"Bluetooth-SIM-toegang"</string>
    <string name="bluetooth_sap_notif_title" msgid="6877860822993195074">"Bluetooth-SIM-toegang"</string>
    <string name="bluetooth_sap_notif_ticker" msgid="7295825445933648498">"Bluetooth-SIM-toegang"</string>
    <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"Bluetooth-SIM-toegang"</string>
    <string name="bluetooth_sap_notif_message" msgid="1004269289836361678">"Versoek kliënt om te ontkoppel?"</string>
    <string name="bluetooth_sap_notif_message" msgid="7138657801087500690">"Versoek kliënt om te ontkoppel?"</string>
    <string name="bluetooth_sap_notif_disconnecting" msgid="6041257463440623400">"Wag tans dat kliënt ontkoppel"</string>
    <string name="bluetooth_sap_notif_disconnecting" msgid="819150843490233288">"Wag tans dat kliënt ontkoppel"</string>
    <string name="bluetooth_sap_notif_disconnect_button" msgid="3059012556387692616">"Ontkoppel"</string>
    <string name="bluetooth_sap_notif_disconnect_button" msgid="3678476872583356919">"Ontkoppel"</string>
    <string name="bluetooth_sap_notif_force_disconnect_button" msgid="2239425242376623998">"Dwing ontkoppeling"</string>
    <string name="bluetooth_sap_notif_force_disconnect_button" msgid="8144086340185532030">"Dwing ontkoppeling"</string>
</resources>
</resources>
+9 −9
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android"
<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="app_name" msgid="7766152617107310582">"Bluetooth"</string>
    <string name="app_name" msgid="6006644116867509664">"Bluetooth"</string>
    <string name="insert_record" msgid="4024416351836939752">"Voeg rekord in"</string>
    <string name="insert_record" msgid="1450997173838378132">"Voeg rekord in"</string>
    <string name="update_record" msgid="7201772850942641237">"Bevestig rekord"</string>
    <string name="update_record" msgid="2480425402384910635">"Bevestig rekord"</string>
    <string name="ack_record" msgid="2404738476192250210">"Ack-rekord"</string>
    <string name="ack_record" msgid="6716152390978472184">"Ack-rekord"</string>
    <string name="deleteAll_record" msgid="7932073446547882011">"Vee alle rekords uit"</string>
    <string name="deleteAll_record" msgid="4383349788485210582">"Vee alle rekords uit"</string>
    <string name="ok_button" msgid="719865942400179601">"OK"</string>
    <string name="ok_button" msgid="6519033415223065454">"OK"</string>
    <string name="delete_record" msgid="5713885957446255270">"Vee rekord uit"</string>
    <string name="delete_record" msgid="4645040331967533724">"Vee rekord uit"</string>
    <string name="start_server" msgid="134483798422082514">"Begin TCP-bediener"</string>
    <string name="start_server" msgid="9034821924409165795">"Begin TCP-bediener"</string>
    <string name="notify_server" msgid="8832385166935137731">"Stel TCP-bediener in kennis"</string>
    <string name="notify_server" msgid="4369106744022969655">"Stel TCP-bediener in kennis"</string>
</resources>
</resources>
Loading