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

Unverified Commit 65427ac5 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

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

Android 11.0.0 Release 38 (RQ3A.210605.005)

* tag 'android-11.0.0_r38':
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Merge "Fix flaky tests by require root for minadbd_tests" am: f820e627 am: d66516ea
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE
  Import translations. DO NOT MERGE ANYWHERE

Change-Id: Iae8edafc5e141de76e21e0f8f9026df0b25d4027
parents 5b3c1e31 3978fd10

minadbd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -135,4 +135,5 @@ cc_test { 
    test_suites: [

        "device-tests",

    ],

    require_root: true,

}

minadbd/AndroidTest.xml

+2 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
        <option name="cleanup" value="true" />

        <option name="push" value="minadbd_test->/data/local/tmp/minadbd_test" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer"/>

    <option name="test-suite-tag" value="apct" />

    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

tools/recovery_l10n/res/values-iw/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

    <string name="recovery_installing" msgid="2013591905463558223">"מתקין עדכון מערכת"</string>

    <string name="recovery_erasing" msgid="7334826894904037088">"מוחק"</string>

    <string name="recovery_erasing" msgid="7334826894904037088">"מתבצעת מחיקה"</string>

    <string name="recovery_no_command" msgid="4465476568623024327">"אין פקודה"</string>

    <string name="recovery_error" msgid="5748178989622716736">"שגיאה!"</string>

    <string name="recovery_installing_security" msgid="9184031299717114342">"מתקין עדכון אבטחה"</string>

    <string name="recovery_installing_security" msgid="9184031299717114342">"התקנת עדכון אבטחה מתבצעת"</string>

    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"‏לא ניתן לטעון את מערכת Android. ייתכן שהנתונים שלך פגומים. אם הודעה זו תופיע שוב, ייתכן שיהיה עליך לבצע איפוס לנתוני היצרן ולמחוק את כל נתוני המשתמש ששמורים במכשיר זה."</string>

    <string name="recovery_try_again" msgid="7168248750158873496">"ניסיון נוסף"</string>

    <string name="recovery_factory_data_reset" msgid="7321351565602894783">"איפוס לנתוני היצרן"</string>

tools/recovery_l10n/res/values-ky/strings.xml

+3 −3
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="recovery_installing" msgid="2013591905463558223">"Тутум жаңыртуусу орнотулууда"</string>

    <string name="recovery_installing" msgid="2013591905463558223">"Тутум жаңырууда"</string>

    <string name="recovery_erasing" msgid="7334826894904037088">"Тазаланууда"</string>

    <string name="recovery_no_command" msgid="4465476568623024327">"Буйрук берилген жок"</string>

    <string name="recovery_error" msgid="5748178989622716736">"Ката!"</string>

    <string name="recovery_installing_security" msgid="9184031299717114342">"Коопсуздук жаңыртуусу орнотулууда"</string>

    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Android тутуму жүктөлбөй жатат. Дайын-даректериңиз бузук болушу мүмкүн. Бул билдирүү дагы деле келе берсе, түзмөктү кайра башынан жөндөп, анда сакталган бардык колдонуучу дайындарын тазалашыңыз керек."</string>

    <string name="recovery_installing_security" msgid="9184031299717114342">"Коопсуздук жаңырууда"</string>

    <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"Android системасы жүктөлбөй жатат. Дайын-даректериңиз бузук болушу мүмкүн. Бул билдирүү дагы деле келе берсе, түзмөктү кайра башынан жөндөп, анда сакталган бардык колдонуучу дайындарын тазалашыңыз керек."</string>

    <string name="recovery_try_again" msgid="7168248750158873496">"Кайталоо"</string>

    <string name="recovery_factory_data_reset" msgid="7321351565602894783">"Кайра башынан жөндөө"</string>

    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Колдонуучу дайындарынын баары жашырылсынбы?\n\n МУНУ АРТКА КАЙТАРУУ МҮМКҮН ЭМЕС!"</string>