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

Commit 747a761f authored by Xin Li's avatar Xin Li
Browse files

Merge sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: I70a309250eb926d9d9aa888d4aa4fd6579fdfe95
Change-Id: Idecd274de53d7e51328fd2115539dd5cb4441e1c
parents 699b1c90 98c136b9
Loading
Loading
Loading
Loading

.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line
.idea
*.iml
+1 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="telecommAppLabel" product="default" msgid="1825598513414129827">"Foonoproepe"</string>
    <string name="telecommAppLabel" product="default" msgid="3077225713817780583">"Oproepbestuur"</string>
    <string name="userCallActivityLabel" product="default" msgid="3605391260292846248">"Bel"</string>
    <string name="unknown" msgid="6993977514360123431">"Onbekend"</string>
    <string name="notification_missedCallTitle" msgid="5060387047205532974">"Gemiste oproep"</string>
@@ -114,15 +114,10 @@
    <string name="phone_settings_payphone_summary_txt" msgid="3936631076065563665">"Blokkeer oproepe vanaf telefoonhokkies"</string>
    <string name="phone_settings_unknown_txt" msgid="3577926178354772728">"Onbekend"</string>
    <string name="phone_settings_unknown_summary_txt" msgid="5446657192535779645">"Blokkeer oproepe vanaf onbekende bellers"</string>
    <!-- no translation found for phone_settings_unavailable_txt (825918186053980858) -->
    <skip />
    <!-- no translation found for phone_settings_unavailable_summary_txt (8221686031038282633) -->
    <skip />
    <string name="phone_strings_call_blocking_turned_off_notification_title_txt" msgid="2895809176537908791">"Oproepblokkering"</string>
    <string name="phone_strings_call_blocking_turned_off_notification_text_txt" msgid="1713632946174016619">"Oproepblokkering is gedeaktiveer"</string>
    <string name="phone_strings_emergency_call_made_dialog_title_txt" msgid="6629412508584507377">"Noodoproep gemaak"</string>
    <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt" msgid="3140411733995271126">"Oproepblokkering is gedeaktiveer sodat noodeenhede jou kan kontak."</string>
    <string name="developer_title" msgid="9146088855661672353">"Telecom-ontwikkelaarkieslys"</string>
    <string name="toast_emergency_can_not_pull_call" msgid="9074229465338410869">"Oproepe kan nie gedurende \'n noodoproep geneem word nie."</string>
    <string name="cancel" msgid="6733466216239934756">"Kanselleer"</string>
</resources>
+1 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="telecommAppLabel" product="default" msgid="1825598513414129827">"የስልክ ጥሪዎች"</string>
    <string name="telecommAppLabel" product="default" msgid="3077225713817780583">"የጥሪ አስተዳደር"</string>
    <string name="userCallActivityLabel" product="default" msgid="3605391260292846248">"ስልክ"</string>
    <string name="unknown" msgid="6993977514360123431">"ያልታወቀ"</string>
    <string name="notification_missedCallTitle" msgid="5060387047205532974">"ያመለጠጥሪ"</string>
@@ -114,15 +114,10 @@
    <string name="phone_settings_payphone_summary_txt" msgid="3936631076065563665">"የክፍያ ስልኮች የሚመጡ ጥሪዎችን አግድ"</string>
    <string name="phone_settings_unknown_txt" msgid="3577926178354772728">"ያልታወቀ"</string>
    <string name="phone_settings_unknown_summary_txt" msgid="5446657192535779645">"ካልታወቁ ደዋዮች የሚመጡ ጥሪዎችን አግድ"</string>
    <!-- no translation found for phone_settings_unavailable_txt (825918186053980858) -->
    <skip />
    <!-- no translation found for phone_settings_unavailable_summary_txt (8221686031038282633) -->
    <skip />
    <string name="phone_strings_call_blocking_turned_off_notification_title_txt" msgid="2895809176537908791">"ጥሪን ማገድ"</string>
    <string name="phone_strings_call_blocking_turned_off_notification_text_txt" msgid="1713632946174016619">"ጥሪ ማገድ ተሰናክሏል"</string>
    <string name="phone_strings_emergency_call_made_dialog_title_txt" msgid="6629412508584507377">"የአደጋ ጊዜ ጥሪ ተደርጓል"</string>
    <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt" msgid="3140411733995271126">"የአደጋ ጊዜ ምላሽ ሰጪዎች እርስዎን ለማግኘት እንዲችሉ ጥሪ ማገድ ተሰናክሏል።"</string>
    <string name="developer_title" msgid="9146088855661672353">"የቴሌኮም ገንቢ ምናሌ"</string>
    <string name="toast_emergency_can_not_pull_call" msgid="9074229465338410869">"ጥሪዎች በአደጋ ጊዜ ጥሪ ላይ ሊነሱ አይችሉም።"</string>
    <string name="cancel" msgid="6733466216239934756">"ይቅር"</string>
</resources>
+1 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="telecommAppLabel" product="default" msgid="1825598513414129827">"مكالمات هاتفية"</string>
    <string name="telecommAppLabel" product="default" msgid="3077225713817780583">"إدارة المكالمات"</string>
    <string name="userCallActivityLabel" product="default" msgid="3605391260292846248">"الهاتف"</string>
    <string name="unknown" msgid="6993977514360123431">"غير معروف"</string>
    <string name="notification_missedCallTitle" msgid="5060387047205532974">"مكالمة فائتة"</string>
@@ -114,15 +114,10 @@
    <string name="phone_settings_payphone_summary_txt" msgid="3936631076065563665">"حظر المكالمات من الهواتف المدفوعة"</string>
    <string name="phone_settings_unknown_txt" msgid="3577926178354772728">"غير معروف"</string>
    <string name="phone_settings_unknown_summary_txt" msgid="5446657192535779645">"حظر المكالمات من المتّصلين مجهولي الهوية"</string>
    <!-- no translation found for phone_settings_unavailable_txt (825918186053980858) -->
    <skip />
    <!-- no translation found for phone_settings_unavailable_summary_txt (8221686031038282633) -->
    <skip />
    <string name="phone_strings_call_blocking_turned_off_notification_title_txt" msgid="2895809176537908791">"حظر المكالمات"</string>
    <string name="phone_strings_call_blocking_turned_off_notification_text_txt" msgid="1713632946174016619">"تم إيقاف حظر المكالمات"</string>
    <string name="phone_strings_emergency_call_made_dialog_title_txt" msgid="6629412508584507377">"تم إجراء مكالمة طوارئ"</string>
    <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt" msgid="3140411733995271126">"تم إيقاف حظر المكالمات للسماح لمسؤولي استجابة الطوارئ بالاتصال بك."</string>
    <string name="developer_title" msgid="9146088855661672353">"قائمة مطوّر برامج الاتصالات"</string>
    <string name="toast_emergency_can_not_pull_call" msgid="9074229465338410869">"لا يمكن تلقّي المكالمات أثناء إجراء مكالمة طوارئ."</string>
    <string name="cancel" msgid="6733466216239934756">"إلغاء"</string>
</resources>
+1 −6
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

<resources xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
    <string name="telecommAppLabel" product="default" msgid="1825598513414129827">"ফ’ন কল"</string>
    <string name="telecommAppLabel" product="default" msgid="3077225713817780583">"কল পৰিচালনা"</string>
    <string name="userCallActivityLabel" product="default" msgid="3605391260292846248">"ফ’ন"</string>
    <string name="unknown" msgid="6993977514360123431">"অজ্ঞাত"</string>
    <string name="notification_missedCallTitle" msgid="5060387047205532974">"মিছ্ড কল"</string>
@@ -114,15 +114,10 @@
    <string name="phone_settings_payphone_summary_txt" msgid="3936631076065563665">"পে\'ফ\'নৰ পৰা অহা কল অৱৰোধ কৰক"</string>
    <string name="phone_settings_unknown_txt" msgid="3577926178354772728">"অজ্ঞাত"</string>
    <string name="phone_settings_unknown_summary_txt" msgid="5446657192535779645">"অচিনাক্ত কল কৰোঁতাৰ পৰা অহা কল অৱৰোধ কৰক"</string>
    <!-- no translation found for phone_settings_unavailable_txt (825918186053980858) -->
    <skip />
    <!-- no translation found for phone_settings_unavailable_summary_txt (8221686031038282633) -->
    <skip />
    <string name="phone_strings_call_blocking_turned_off_notification_title_txt" msgid="2895809176537908791">"কল অৱৰোধ"</string>
    <string name="phone_strings_call_blocking_turned_off_notification_text_txt" msgid="1713632946174016619">"কল অৱৰোধ সুবিধাটো অক্ষম কৰি থোৱা আছে"</string>
    <string name="phone_strings_emergency_call_made_dialog_title_txt" msgid="6629412508584507377">"জৰুৰীকালীন কল ম\'ড"</string>
    <string name="phone_strings_emergency_call_made_dialog_call_blocking_text_txt" msgid="3140411733995271126">"আপোনাক যাতে জৰুৰীকালীন সেৱা প্ৰদানকাৰীসকলে যোগাযোগ কৰিব পাৰে তাৰ বাবে কল অৱৰোধ সুবিধাটো অক্ষম কৰি থোৱা হৈছে।"</string>
    <string name="developer_title" msgid="9146088855661672353">"দূৰ-সংযোগ সম্পৰ্কীয় বিকাশকৰ্তাৰ মেনু"</string>
    <string name="toast_emergency_can_not_pull_call" msgid="9074229465338410869">"কোনো জৰুৰীকালীন কলত থাকিলে কলসমূহ গ্ৰহণ কৰিব নোৱাৰি।"</string>
    <string name="cancel" msgid="6733466216239934756">"বাতিল কৰক"</string>
</resources>
Loading