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

Unverified Commit c04314fb authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-12.0.0_r29' into staging/lineage-19.0_merge-android-12.0.0_r29 

Android 12.0.0 Release 29 (SQ1D.220205.003)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCYfzJjgAKCRDorT+BmrEO
# eHLfAJ46QJRdfjQ7hik3uQ82Gcb47uC+ZACgjtzB/jCXlGC+Nf1BDjI5iYndVFQ=
# =V8aO
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Feb  4 08:37:02 2022 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1048 signatures in the past
#      3 months.  Encrypted 4 messages in the past 4 weeks.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Alex Johnston (1) and others
# Via Android Build Coastguard Worker
* tag 'android-12.0.0_r29':
  Add non system overlay flag to InstallCaCertificateWarning
  Import translations. DO NOT MERGE ANYWHERE
  Rephrase dialog message of clear storage dialog for security concern

Change-Id: Ib2a8c03b9dfc4a05862ca67050760920abc34f96
parents 79f68a4f 89847c90

res/values-af/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2093,7 +2093,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
@@ -2093,7 +2093,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
@@ -2189,7 +2189,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
@@ -2093,7 +2093,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
@@ -2093,7 +2093,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 edin"</string>

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