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

Commit f4546b13 authored by Michael Bestas's avatar Michael Bestas
Browse files

Partially revert "Merge tag 'android-6.0.1_r22' of... 

Partially revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/Bluetooth into cm-13.0"

This reverts commit c2731fa8, reversing
changes made to 14a2811d.

Change-Id: Ib503192648ac768ee69adca4c5f5b1435dbe60d7
parent 2c9c5455

res/values-af/strings.xml

+8 −1
Original line number Diff line number Diff line
@@ -110,7 +110,14 @@ 
    <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Alle items sal uit die lys verwyder word."</string>

    <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth-deling: Gestuurde lêers"</string>

    <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth-deling: Ontvangde lêers"</string>

    <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> suksesvol, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> onsuksesvol."</string>

    <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">

      <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> onsuksesvol.</item>

      <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> onsuksesvol.</item>

    </plurals>

    <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">

      <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> suksesvol, %2$s</item>

      <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> suksesvol, %2$s</item>

    </plurals>

    <string name="transfer_menu_clear_all" msgid="790017462957873132">"Vee lys uit"</string>

    <string name="transfer_menu_open" msgid="3368984869083107200">"Open"</string>

    <string name="transfer_menu_clear" msgid="5854038118831427492">"Verwyder uit lys"</string>

res/values-am/strings.xml

+8 −1
Original line number Diff line number Diff line
@@ -110,7 +110,14 @@ 
    <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"ሁሉም ዓይነቶች ከዝርዝር ውስጥ ይሰረዛሉ።"</string>

    <string name="outbound_noti_title" msgid="8051906709452260849">"ብሉቱዝ ማጋሪያ፡ የተላኩ ፋይሎች"</string>

    <string name="inbound_noti_title" msgid="4143352641953027595">"ብሉቱዝ ማጋሪያ፡ የደረሱ ፋይሎች"</string>

    <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> የተሳካ፣ <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> ያልተሳካ።"</string>

    <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">

      <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> አልተሳኩም።</item>

      <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> አልተሳኩም።</item>

    </plurals>

    <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">

      <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ተሳክተዋል፣ %2$s</item>

      <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> ተሳክተዋል፣ %2$s</item>

    </plurals>

    <string name="transfer_menu_clear_all" msgid="790017462957873132">"ዝርዝር አጽዳ"</string>

    <string name="transfer_menu_open" msgid="3368984869083107200">"ክፈት"</string>

    <string name="transfer_menu_clear" msgid="5854038118831427492">"ከዝርዝር አጽዳ"</string>

res/values-ar/strings.xml

+16 −1
Original line number Diff line number Diff line
@@ -110,7 +110,22 @@ 
    <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"سيتم محو جميع العناصر من القائمة."</string>

    <string name="outbound_noti_title" msgid="8051906709452260849">"مشاركة البلوتوث: الملفات المرسلة"</string>

    <string name="inbound_noti_title" msgid="4143352641953027595">"مشاركة البلوتوث: الملفات المستلمة"</string>

    <string name="noti_caption" msgid="7508708288885707365">"تم <xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> بنجاح وأخفق <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g>."</string>

    <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">

      <item quantity="zero">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> من العناصر.</item>

      <item quantity="two">أخفق إرسال عنصرين (<xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g>).</item>

      <item quantity="few">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> عناصر.</item>

      <item quantity="many">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> عنصرًا.</item>

      <item quantity="other">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> من العناصر.</item>

      <item quantity="one">أخفق إرسال <xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> عنصر.</item>

    </plurals>

    <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">

      <item quantity="zero">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> من العناصر، %2$s</item>

      <item quantity="two">‏نجح إرسال عنصرين (<xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g>)، %2$s</item>

      <item quantity="few">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> عناصر، %2$s</item>

      <item quantity="many">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> عنصرًا، %2$s</item>

      <item quantity="other">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> من العناصر، %2$s</item>

      <item quantity="one">‏نجح إرسال <xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> عنصر، %2$s</item>

    </plurals>

    <string name="transfer_menu_clear_all" msgid="790017462957873132">"محو القائمة"</string>

    <string name="transfer_menu_open" msgid="3368984869083107200">"فتح"</string>

    <string name="transfer_menu_clear" msgid="5854038118831427492">"محو من القائمة"</string>

res/values-az-rAZ/strings.xml

+19 −4
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
    <string name="permdesc_bluetoothShareManager" msgid="8930572979123190223">"Tətbiq BluetoothPaylaşım menecerinə daxil ola və faylları ötürmək üçün ondan istifadə edə bilər."</string>

    <string name="permlab_bluetoothWhitelist" msgid="7091552898592306386">"Bluetooth cihazına girişi ağ siyahıya salın."</string>

    <string name="permdesc_bluetoothWhitelist" msgid="5494513855192170109">"Tətbiq Bluetooth cihazını müvəqqəti olaraq ağ siyahıya daxil edə bilər, bununla həmin cihaz istifadəçi təsdiqi olmadan bu cihaza fayllar göndərə biləcək."</string>

    <string name="permlab_handoverStatus" msgid="7316032998801933554">"BT transfer təhvili yayımlarını əldə edin."</string>

    <string name="permdesc_handoverStatus" msgid="4752738070064786310">"Bluetooth\'dan transferin təhvil statusu haqqında məlumat əldə etməyə imkan verir."</string>

    <string name="bt_share_picker_label" msgid="6268100924487046932">"Bluetooth"</string>

    <string name="unknown_device" msgid="9221903979877041009">"Naməlum cihaz"</string>

    <string name="unknownNumber" msgid="4994750948072751566">"Naməlum"</string>
@@ -33,7 +31,7 @@ 
    <string name="bt_enable_cancel" msgid="1988832367505151727">"Ləğv et"</string>

    <string name="bt_enable_ok" msgid="3432462749994538265">"Yandır"</string>

    <string name="incoming_file_confirm_title" msgid="8139874248612182627">"Fayl transferi"</string>

    <string name="incoming_file_confirm_content" msgid="6673812334377911289">"\"<xliff:g id="SENDER">%1$s</xliff:g>\" Sizə <xliff:g id="FILE">%2$s</xliff:g> (<xliff:g id="SIZE">%3$s</xliff:g>) faylını göndərmək istəyir. \n \n Faylı qəbul edirsinizl?"</string>

    <string name="incoming_file_confirm_content" msgid="2752605552743148036">"Gələn fayl qəbul edilsin?"</string>

    <string name="incoming_file_confirm_cancel" msgid="2973321832477704805">"İmtina edin"</string>

    <string name="incoming_file_confirm_ok" msgid="281462442932231475">"Qəbul edirəm"</string>

    <string name="incoming_file_confirm_timeout_ok" msgid="1414676773249857278">"OK"</string>
@@ -56,6 +54,9 @@ 
    <string name="download_line5" msgid="3069560415845295386">"Fayl qəbulu edilir..."</string>

    <string name="download_cancel" msgid="9177305996747500768">"Dayandır"</string>

    <string name="download_ok" msgid="5000360731674466039">"Gizlət"</string>

    <string name="incoming_line1" msgid="2127419875681087545">"Kimdən"</string>

    <string name="incoming_line2" msgid="3348994249285315873">"Fayl adı"</string>

    <string name="incoming_line3" msgid="7954237069667474024">"Ölçü"</string>

    <string name="download_fail_line1" msgid="3846450148862894552">"Fayl qəbul edilmədi"</string>

    <string name="download_fail_line2" msgid="8950394574689971071">"Fayl: <xliff:g id="FILE">%1$s</xliff:g>"</string>

    <string name="download_fail_line3" msgid="3451040656154861722">"Səbəb: <xliff:g id="REASON">%1$s</xliff:g>"</string>
@@ -109,9 +110,23 @@ 
    <string name="transfer_clear_dlg_msg" msgid="1712376797268438075">"Bütün məlumatlar siyahıdan silinəcək."</string>

    <string name="outbound_noti_title" msgid="8051906709452260849">"Bluetooth paylaşım: Göndərilmiş fayllar"</string>

    <string name="inbound_noti_title" msgid="4143352641953027595">"Bluetooth paylaşım: Qəbul edilən fayllar"</string>

    <string name="noti_caption" msgid="7508708288885707365">"<xliff:g id="SUCCESSFUL_NUMBER_0">%1$s</xliff:g> uğurlu, <xliff:g id="UNSUCCESSFUL_NUMBER">%2$s</xliff:g> uğursuz."</string>

    <plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">

      <item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> uğursuz.</item>

      <item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> uğursuz.</item>

    </plurals>

    <plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">

      <item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> uğurlu, %2$s</item>

      <item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> uğurlu, %2$s</item>

    </plurals>

    <string name="transfer_menu_clear_all" msgid="790017462957873132">"Siyahını silin"</string>

    <string name="transfer_menu_open" msgid="3368984869083107200">"Açın"</string>

    <string name="transfer_menu_clear" msgid="5854038118831427492">"Siyahıdan silin"</string>

    <string name="transfer_clear_dlg_title" msgid="2953444575556460386">"Silin"</string>

    <string name="bluetooth_map_settings_save" msgid="7635491847388074606">"Yadda saxlayın"</string>

    <string name="bluetooth_map_settings_cancel" msgid="9205350798049865699">"Ləğv edin"</string>

    <string name="bluetooth_map_settings_intro" msgid="6793938602201480648">"Bluetooth vasitəsilə bölüşmək istəyirəm hesabı seçin. Siz hələ birləşdirən zaman hesablarına hər hansı bir acceess qəbul etmək lazımdır."</string>

    <string name="bluetooth_map_settings_count" msgid="4557473074937024833">"Qalmış slotlar:"</string>

    <string name="bluetooth_map_settings_app_icon" msgid="7105805610929114707">"Tətbiq ikonası"</string>

    <string name="bluetooth_map_settings_title" msgid="7420332483392851321">"Bluetooth Mesaj Paylaşma Ayarları"</string>

    <string name="bluetooth_map_settings_no_account_slots_left" msgid="1796029082612965251">"Hesab seçmək olmur. 0 slot qalıb"</string>

</resources>

res/values-az-rAZ/strings_sap.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="bluetooth_sap_notif_title" msgid="6877860822993195074">"Bluetooth SIM girişi"</string>

    <string name="bluetooth_sap_notif_ticker" msgid="6807778527893726699">"Bluetooth SIM Access"</string>

    <string name="bluetooth_sap_notif_message" msgid="7138657801087500690">"Müştəri ayırmaq tələb?"</string>

    <string name="bluetooth_sap_notif_disconnecting" msgid="819150843490233288">"Ayırmaq üçün müştəri gözləyir"</string>

    <string name="bluetooth_sap_notif_disconnect_button" msgid="3678476872583356919">"Bağlantını kəsin"</string>

    <string name="bluetooth_sap_notif_force_disconnect_button" msgid="8144086340185532030">"Force ayırmaq"</string>

</resources>