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

Commit 4cb8a7f1 authored by Xin Li's avatar Xin Li
Browse files

Merge 10952656 

Merged-In: I1e14b6e19277a185bc752d51368319d25ad5d6d6
Change-Id: I2ffe115c29f20088dc2611db8f5976d0838633dd
parents 6fab1914 1226832f

Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ android_test { 
    platform_apis: true,

    certificate: "platform",

    jacoco: {

        include_filter: ["com.android.server.telecom.*"],

        exclude_filter: ["com.android.server.telecom.tests.*"],

        include_filter: ["com.android.server.telecom.**"],

        exclude_filter: ["com.android.server.telecom.tests.**"],

    },

    test_suites: ["device-tests"],

    defaults: ["SettingsLibDefaults"],

res/values-af/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 
    <string name="notification_channel_background_calls" msgid="7785659903711350506">"Agtergrondoproepe"</string>

    <string name="notification_channel_disconnected_calls" msgid="8228636543997645757">"Oproepe is ontkoppel"</string>

    <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"Omgevalde foonprogramme"</string>

    <string name="notification_channel_call_streaming" msgid="5100510699787538991">"Oproepstroming"</string>

    <string name="alert_outgoing_call" msgid="5319895109298927431">"As jy hierdie oproep maak, sal dit jou <xliff:g id="OTHER_APP">%1$s</xliff:g>-oproep beëindig."</string>

    <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"Kies hoe om hierdie oproep te maak"</string>

    <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"Herlei oproep deur <xliff:g id="OTHER_APP">%1$s</xliff:g> te gebruik"</string>
@@ -131,7 +130,4 @@ 
    <string name="callendpoint_name_speaker" msgid="1971760468695323189">"Luidspreker"</string>

    <string name="callendpoint_name_streaming" msgid="2337595450408275576">"Ekstern"</string>

    <string name="callendpoint_name_unknown" msgid="2199074708477193852">"Onbekend"</string>

    <string name="call_streaming_notification_body" msgid="502216105683378263">"Stroom oudio na ander toestel"</string>

    <string name="call_streaming_notification_action_hang_up" msgid="7017663335289063827">"Beëindig oproep"</string>

    <string name="call_streaming_notification_action_switch_here" msgid="3524180754186221228">"Skakel hier oor"</string>

</resources>

res/values-am/strings.xml

+2 −6
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ 
    <string name="answering_ends_other_managed_video_call" msgid="1988508241432031327">"መመለስ እየተካሄደ ያለ የቪዲዮ ጥሪዎን ይጨርሳል"</string>

    <string name="answer_incoming_call" msgid="2045888814782215326">"ይመልሱ"</string>

    <string name="decline_incoming_call" msgid="922147089348451310">"አትቀበል"</string>

    <string name="cant_call_due_to_no_supported_service" msgid="1635626384149947077">"የዚህን ዓይነት ጥሪዎች የሚደግፉ መደወያ መለያዎች ስለሌሉ ጥሪ መደረግ አይችልም።"</string>

    <string name="cant_call_due_to_no_supported_service" msgid="1635626384149947077">"የዚህን አይነት ጥሪዎች የሚደግፉ መደወያ መለያዎች ስለሌሉ ጥሪ መደረግ አይችልም።"</string>

    <string name="cant_call_due_to_ongoing_call" msgid="8004235328451385493">"በ<xliff:g id="OTHER_CALL">%1$s</xliff:g> ጥሪዎ ምክንያት ጥሪ መደረግ አይችልም።"</string>

    <string name="cant_call_due_to_ongoing_calls" msgid="6379163795277824868">"በ<xliff:g id="OTHER_CALL">%1$s</xliff:g> ጥሪዎችዎ ምክንያት ጥሪዎች መደረግ አይችሉም።"</string>

    <string name="cant_call_due_to_ongoing_unknown_call" msgid="8243532328969433172">"በሌላ መተግበሪያ ውስጥ ባለ ጥሪ ምክንያት ጥሪ መደረግ አይችልም።"</string>
@@ -100,7 +100,6 @@ 
    <string name="notification_channel_background_calls" msgid="7785659903711350506">"የጀርባ ጥሪዎች"</string>

    <string name="notification_channel_disconnected_calls" msgid="8228636543997645757">"የተቋረጡ ጥሪዎች"</string>

    <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"የተበላሹ የስልክ መተግበሪያዎች"</string>

    <string name="notification_channel_call_streaming" msgid="5100510699787538991">"የጥሪ ዥረት"</string>

    <string name="alert_outgoing_call" msgid="5319895109298927431">"ይህን ጥሪ ማድረግ የ<xliff:g id="OTHER_APP">%1$s</xliff:g> ጥሪዎን ያቋርጣል።"</string>

    <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"ይህን ጥሪ እንዴት እንደሚያደርጉ ይምረጡ"</string>

    <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"<xliff:g id="OTHER_APP">%1$s</xliff:g>ን በመጠቀም አዘዋውር"</string>
@@ -128,10 +127,7 @@ 
    <string name="callendpoint_name_earpiece" msgid="7047285080319678594">"ማዳመጫ"</string>

    <string name="callendpoint_name_bluetooth" msgid="210210953208913172">"ብሉቱዝ"</string>

    <string name="callendpoint_name_wiredheadset" msgid="6860787176412079742">"ባለገመድ ማዳመጫ"</string>

    <string name="callendpoint_name_speaker" msgid="1971760468695323189">"ድምፅ ማውጫ"</string>

    <string name="callendpoint_name_speaker" msgid="1971760468695323189">"ድምጽ ማውጫ"</string>

    <string name="callendpoint_name_streaming" msgid="2337595450408275576">"ውጫዊ"</string>

    <string name="callendpoint_name_unknown" msgid="2199074708477193852">"ያልታወቀ"</string>

    <string name="call_streaming_notification_body" msgid="502216105683378263">"ኦዲዮን ወደ ሌላ መሣሪያ በመልቀቅ ላይ"</string>

    <string name="call_streaming_notification_action_hang_up" msgid="7017663335289063827">"ዝጋ"</string>

    <string name="call_streaming_notification_action_switch_here" msgid="3524180754186221228">"እዚህ ቀይር"</string>

</resources>

res/values-ar/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 
    <string name="notification_channel_background_calls" msgid="7785659903711350506">"مكالمات في الخلفية"</string>

    <string name="notification_channel_disconnected_calls" msgid="8228636543997645757">"المكالمات التي تم قطع الاتصال بها"</string>

    <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"تطبيقات الهواتف المعطّلة"</string>

    <string name="notification_channel_call_streaming" msgid="5100510699787538991">"بث المكالمات"</string>

    <string name="alert_outgoing_call" msgid="5319895109298927431">"يؤدي إجراء هذه المكالمة إلى إنهاء مكالمة <xliff:g id="OTHER_APP">%1$s</xliff:g>."</string>

    <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"اختيار كيفية إجراء هذه المكالمة"</string>

    <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"إعادة توجيه المكالمة باستخدام <xliff:g id="OTHER_APP">%1$s</xliff:g>"</string>
@@ -131,7 +130,4 @@ 
    <string name="callendpoint_name_speaker" msgid="1971760468695323189">"مكبّر صوت"</string>

    <string name="callendpoint_name_streaming" msgid="2337595450408275576">"المصادر الخارجية"</string>

    <string name="callendpoint_name_unknown" msgid="2199074708477193852">"غير معروف"</string>

    <string name="call_streaming_notification_body" msgid="502216105683378263">"بث الصوت على جهاز آخر"</string>

    <string name="call_streaming_notification_action_hang_up" msgid="7017663335289063827">"قطع الاتصال"</string>

    <string name="call_streaming_notification_action_switch_here" msgid="3524180754186221228">"الانتقال إلى هنا"</string>

</resources>

res/values-as/strings.xml

+1 −5
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ 
    <string name="notification_channel_background_calls" msgid="7785659903711350506">"নেপথ্যৰ কলসমূহ"</string>

    <string name="notification_channel_disconnected_calls" msgid="8228636543997645757">"সংযোগ বিচ্ছিন্ন কৰা কলসমূহ"</string>

    <string name="notification_channel_in_call_service_crash" msgid="7313237519166984267">"ক্ৰেশ্ব হোৱা ফ\'ন এপ্‌সমূহ"</string>

    <string name="notification_channel_call_streaming" msgid="5100510699787538991">"কল ষ্ট্ৰীমিং"</string>

    <string name="alert_outgoing_call" msgid="5319895109298927431">"এই কলটো কৰিলে আপোনাৰ <xliff:g id="OTHER_APP">%1$s</xliff:g> কলটোৰ অন্ত পৰিব।"</string>

    <string name="alert_redirect_outgoing_call_or_not" msgid="665409645789521636">"এই কলটো কেনেকৈ কৰা হ’ব সেয়া বাছনি কৰক"</string>

    <string name="alert_place_outgoing_call_with_redirection" msgid="5221065030959024121">"<xliff:g id="OTHER_APP">%1$s</xliff:g> ব্যৱহাৰ কৰি কল ৰিডাইৰেক্ট কৰক"</string>
@@ -109,7 +108,7 @@ 
    <string name="phone_settings_call_blocking_txt" msgid="7311523114822507178">"কল অৱৰোধ"</string>

    <string name="phone_settings_number_not_in_contact_txt" msgid="2602249106007265757">"আপোনাৰ সর্ম্পকসূচীত নথকা"</string>

    <string name="phone_settings_number_not_in_contact_summary_txt" msgid="963327038085718969">"আপোনাৰ সর্ম্পকসূচীত নথকা নম্বৰ অৱৰোধ কৰক"</string>

    <string name="phone_settings_private_num_txt" msgid="6339272760338475619">"ব্যক্তিগত"</string>

    <string name="phone_settings_private_num_txt" msgid="6339272760338475619">"ব্য়ক্তিগত"</string>

    <string name="phone_settings_private_num_summary_txt" msgid="6755758240544021037">"যিসকল কল কৰোঁতাই তেওঁলোকৰ নম্বৰ প্ৰকাশ নকৰে তেওঁলোকক অৱৰোধ কৰক"</string>

    <string name="phone_settings_payphone_txt" msgid="5003987966052543965">"পে\'ফ\'ন"</string>

    <string name="phone_settings_payphone_summary_txt" msgid="3936631076065563665">"পে\'ফ\'নৰ পৰা অহা কল অৱৰোধ কৰক"</string>
@@ -131,7 +130,4 @@ 
    <string name="callendpoint_name_speaker" msgid="1971760468695323189">"স্পীকাৰ"</string>

    <string name="callendpoint_name_streaming" msgid="2337595450408275576">"বাহ্যিক"</string>

    <string name="callendpoint_name_unknown" msgid="2199074708477193852">"অজ্ঞাত"</string>

    <string name="call_streaming_notification_body" msgid="502216105683378263">"অন্য এটা ডিভাইচলৈ অডিঅ’ ষ্ট্ৰীম কৰি থকা হৈছে"</string>

    <string name="call_streaming_notification_action_hang_up" msgid="7017663335289063827">"কলটো কাটি দিয়ক"</string>

    <string name="call_streaming_notification_action_switch_here" msgid="3524180754186221228">"ইয়াত সলনি কৰক"</string>

</resources>