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

Unverified Commit 34d1b0a1 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-11.0.0_r51' into staging/lineage-18.1_merge-android-security-11.0.0_r51 

Android security 11.0.0 release 51

* tag 'android-security-11.0.0_r51':
  Add non system overlay flag to InstallCaCertificateWarning
  Import translations. DO NOT MERGE ANYWHERE
  Rephrase dialog message of clear storage dialog for security concern
  RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission

Conflicts:
	res/values-mk/strings.xml
	res/values-ne/strings.xml
	res/values-uz/strings.xml

Change-Id: I00064ab349b27d5fe903c06ce4f8eff8c40bcbaf
parents 08c1661b 2250e143

res/values-af/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1930,7 +1930,7 @@ 
    <string name="internal_storage" msgid="999496851424448809">"Interne berging"</string>

    <string name="recompute_size" msgid="1098091228370999128">"Herbereken tans grootte…"</string>

    <string name="clear_data_dlg_title" msgid="180446967743732410">"Vee programdata uit?"</string>

    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Alle data van hierdie program sal permanent uitgevee word. Dit sluit alle lêers, instellings, rekeninge, databasisse ens. in."</string>

    <string name="clear_data_dlg_text" msgid="1107610960337399006">"Hierdie program se data sal permanent uitgevee word. Dit sluit lêers, instellings, databasisse en ander programdata in."</string>

    <string name="dlg_ok" msgid="1421350367857960997">"OK"</string>

    <string name="dlg_cancel" msgid="5164705061530774899">"Kanselleer"</string>

    <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>

res/values-am/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1930,7 +1930,7 @@ 
    <string name="internal_storage" msgid="999496851424448809">"የውስጥ ማከማቻ"</string>

    <string name="recompute_size" msgid="1098091228370999128">"መጠን ድጋሚ በማስላት ላይ..."</string>

    <string name="clear_data_dlg_title" msgid="180446967743732410">"መተግበሪያ ውሂብ ሰርዝ?"</string>

    <string name="clear_data_dlg_text" msgid="7870723948123690332">"የዚህ መተግበሪያ ውሂቦች ሁሉ በቋሚነት ይሰረዛሉ።እነዚህም ፋይሎችን፣ ቅንብሮችን፣ መለያዎችን፣ የውሂብ ጎታዎች እና የመሳሰሉትን ያካትታሉ።"</string>

    <string name="clear_data_dlg_text" msgid="1107610960337399006">"የዚህ መተግበሪያ ውሂብ እስከመጨረሻው ይሰረዛል። ይህ ፋይሎችን፣ ቅንብሮችን፣ የውሂብ ጎታን እና ሌላ የመተግበሪያ ውሂብን ያካትታል።"</string>

    <string name="dlg_ok" msgid="1421350367857960997">"እሺ"</string>

    <string name="dlg_cancel" msgid="5164705061530774899">"ይቅር"</string>

    <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>

res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2026,7 +2026,7 @@ 
    <string name="internal_storage" msgid="999496851424448809">"وحدة التخزين الداخلية"</string>

    <string name="recompute_size" msgid="1098091228370999128">"جارٍ إعادة حساب الحجم..."</string>

    <string name="clear_data_dlg_title" msgid="180446967743732410">"هل تريد حذف بيانات التطبيق؟"</string>

    <string name="clear_data_dlg_text" msgid="7870723948123690332">"سيتم حذف جميع بيانات هذا التطبيق نهائيًا. ويشمل ذلك جميع الملفات والإعدادات والحسابات وقواعد البيانات وما إلى ذلك."</string>

    <string name="clear_data_dlg_text" msgid="1107610960337399006">"سيتم حذف بيانات هذا التطبيق نهائيًا، بما في ذلك الملفات والإعدادات وقواعد البيانات وبيانات التطبيق الأخرى."</string>

    <string name="dlg_ok" msgid="1421350367857960997">"حسنًا"</string>

    <string name="dlg_cancel" msgid="5164705061530774899">"إلغاء"</string>

    <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>

res/values-as/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1930,7 +1930,7 @@ 
    <string name="internal_storage" msgid="999496851424448809">"আভ্যন্তৰীণ সঞ্চয়াগাৰ"</string>

    <string name="recompute_size" msgid="1098091228370999128">"এপৰ আকাৰ পুনঃগণনা কৰা হৈছে…"</string>

    <string name="clear_data_dlg_title" msgid="180446967743732410">"এপ্ ডেটা মচিবনে?"</string>

    <string name="clear_data_dlg_text" msgid="7870723948123690332">"এই এপটোৰ সকলো ডেটা চিৰদিনৰ বাবে মচা হ\'ব। সেই ডেটাসমূহৰ ভিতৰত ফাইল ছেটিং, একাউণ্ট, ডেটাবেইছ আদিসমূহ অন্তৰ্ভুক্ত।"</string>

    <string name="clear_data_dlg_text" msgid="1107610960337399006">"এই এপৰ ডেটাখিনি স্থায়ীভাৱে মচা হ’ব। ইয়াত ফাইল, ছেটিং, ডেটাবে’ছ আৰু অন্য এপৰ ডেটা অন্তৰ্ভুক্ত।"</string>

    <string name="dlg_ok" msgid="1421350367857960997">"ঠিক"</string>

    <string name="dlg_cancel" msgid="5164705061530774899">"বাতিল কৰক"</string>

    <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>

res/values-az/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1930,7 +1930,7 @@ 
    <string name="internal_storage" msgid="999496851424448809">"Daxili yaddaş"</string>

    <string name="recompute_size" msgid="1098091228370999128">"Ölçünü yenidən hesablayır..."</string>

    <string name="clear_data_dlg_title" msgid="180446967743732410">"Tətbiq məlumatları silinsin?"</string>

    <string name="clear_data_dlg_text" msgid="7870723948123690332">"Bu tətbiq datası həmişəlik silinəcək. Buraya bütün fayllar, ayarlar, hesablar, verilənlər bazası və sairləri aiddir."</string>

    <string name="clear_data_dlg_text" msgid="1107610960337399006">"Bu tətbiq datası həmişəlik silinəcək. Buraya fayllar, ayarlar, data bazaları və digər tətbiq datası daxildir."</string>

    <string name="dlg_ok" msgid="1421350367857960997">"OK"</string>

    <string name="dlg_cancel" msgid="5164705061530774899">"Ləğv et"</string>

    <string name="app_not_found_dlg_title" msgid="7122106240981109930"></string>