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

Commit 86e134ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Merge Android10 QPR1 into AOSP master"

parents a0998522 c19d9dd4

res/values-af-television/strings.xml

+9 −9
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="5694574989758145558">"Weier en moenie weer vra nie"</string>

    <string name="grant_dialog_how_to_change" msgid="615414835189256888">"Jy kan dit later verander in Instellings &gt; Programme"</string>

    <string name="current_permission_template" msgid="4793247012451594523">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="7330308025768596149">"Wys stelselprogramme"</string>

    <string name="app_permissions_decor_title" msgid="1461057434211920209">"Programtoestemmings"</string>

    <string name="manage_permissions_decor_title" msgid="4823785025722958092">"Programtoestemmings"</string>

    <string name="permission_apps_decor_title" msgid="3644363529649579576">"<xliff:g id="PERMISSION">%1$s</xliff:g>toestemmings"</string>

    <string name="additional_permissions_decor_title" msgid="7000432624396037882">"Bykomende toestemmings"</string>

    <string name="system_apps_decor_title" msgid="5292119639812561805">"<xliff:g id="PERMISSION">%1$s</xliff:g>toestemmings"</string>

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="7721279038965659947">"Weier en moenie weer vra nie"</string>

    <string name="grant_dialog_how_to_change" msgid="1457823911185462983">"Jy kan dit later verander in Instellings &gt; Programme"</string>

    <string name="current_permission_template" msgid="4118665041847213236">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="4678781389736017160">"Wys stelselprogramme"</string>

    <string name="app_permissions_decor_title" msgid="6741131742122538279">"Programtoestemmings"</string>

    <string name="manage_permissions_decor_title" msgid="2141772075499530041">"Programtoestemmings"</string>

    <string name="permission_apps_decor_title" msgid="8174296221656857830">"<xliff:g id="PERMISSION">%1$s</xliff:g>-toestemmings"</string>

    <string name="additional_permissions_decor_title" msgid="481207295679483982">"Bykomende toestemmings"</string>

    <string name="system_apps_decor_title" msgid="6907923614189992830">"<xliff:g id="PERMISSION">%1$s</xliff:g>-toestemmings"</string>

</resources>

res/values-af-watch/strings.xml

+6 −6
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="5828565432145544298">"Weier; moenie weer vra nie"</string>

    <string name="current_permission_template" msgid="6691830243038105737">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="7042886929865431207">"Wys stelselprogramme"</string>

    <string name="permission_summary_enforced_by_policy" msgid="9002523259681588936">"Onveranderbaar"</string>

    <string name="generic_yes" msgid="3394094077553763689">"Ja"</string>

    <string name="generic_cancel" msgid="6384078447202012984">"Kanselleer"</string>

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="2362190433398675134">"Weier; moenie weer vra nie"</string>

    <string name="current_permission_template" msgid="2021373647237300894">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="4294454268471039411">"Wys stelselprogramme"</string>

    <string name="permission_summary_enforced_by_policy" msgid="4585829669508910191">"Onveranderbaar"</string>

    <string name="generic_yes" msgid="4382007256855869198">"Ja"</string>

    <string name="generic_cancel" msgid="1201376302604725627">"Kanselleer"</string>

</resources>