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

Commit 9aece63f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed some strings for automotive." into sc-v2-dev am: e25bce2d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16279685

Change-Id: I7e448921ef3a23619a101e9e4ce109d1fbc5574c
parents d3aaca69 e25bce2d

core/res/res/values/strings.xml

+14 −1
Original line number Original line Diff line number Diff line
@@ -2012,6 +2012,10 @@ 
    typed when unlocking the screen, and lock your Android TV device or erase all your Android TV device\'s

    typed when unlocking the screen, and lock your Android TV device or erase all your Android TV device\'s

    data if too many incorrect passwords are typed.</string>

    data if too many incorrect passwords are typed.</string>

    <!-- Description of policy access to watch user login attempts -->

    <!-- Description of policy access to watch user login attempts -->

    <string name="policydesc_watchLogin" product="automotive">Monitor the number of incorrect passwords

    typed. when unlocking the screen, and lock the infotainment system or erase all the infotainment system\'s

    data if too many incorrect passwords are typed.</string>

    <!-- Description of policy access to watch user login attempts -->

    <string name="policydesc_watchLogin" product="default">Monitor the number of incorrect passwords

    <string name="policydesc_watchLogin" product="default">Monitor the number of incorrect passwords

    typed. when unlocking the screen, and lock the phone or erase all the phone\'s

    typed. when unlocking the screen, and lock the phone or erase all the phone\'s

    data if too many incorrect passwords are typed.</string>

    data if too many incorrect passwords are typed.</string>
@@ -2021,6 +2025,9 @@ 
    <string name="policydesc_watchLogin_secondaryUser" product="tv">Monitor the number of incorrect passwords

    <string name="policydesc_watchLogin_secondaryUser" product="tv">Monitor the number of incorrect passwords

    typed when unlocking the screen, and lock your Android TV device or erase all this user\'s data

    typed when unlocking the screen, and lock your Android TV device or erase all this user\'s data

    if too many incorrect passwords are typed.</string>

    if too many incorrect passwords are typed.</string>

    <string name="policydesc_watchLogin_secondaryUser" product="automotive">Monitor the number of incorrect passwords

    typed when unlocking the screen, and lock the infotainment system or erase all this profile\'s data

    if too many incorrect passwords are typed.</string>

    <string name="policydesc_watchLogin_secondaryUser" product="default">Monitor the number of incorrect passwords

    <string name="policydesc_watchLogin_secondaryUser" product="default">Monitor the number of incorrect passwords

    typed when unlocking the screen, and lock the phone or erase all this user\'s data

    typed when unlocking the screen, and lock the phone or erase all this user\'s data

    if too many incorrect passwords are typed.</string>

    if too many incorrect passwords are typed.</string>
@@ -2039,14 +2046,20 @@ 
    <!-- Description of policy access to wipe the user's data -->

    <!-- Description of policy access to wipe the user's data -->

    <string name="policydesc_wipeData" product="tv">Erase your Android TV device\'s data without warning by performing a factory data reset.</string>

    <string name="policydesc_wipeData" product="tv">Erase your Android TV device\'s data without warning by performing a factory data reset.</string>

    <!-- Description of policy access to wipe the user's data -->

    <!-- Description of policy access to wipe the user's data -->

    <string name="policydesc_wipeData" product="automotive">Erase the infotainment system\'s data without warning by performing a factory data reset.</string>

    <!-- Description of policy access to wipe the user's data -->

    <string name="policydesc_wipeData" product="default">Erase the phone\'s data without warning by performing a factory data reset.</string>

    <string name="policydesc_wipeData" product="default">Erase the phone\'s data without warning by performing a factory data reset.</string>

    <!-- Title of policy access to wipe secondary user's data -->

    <!-- Title of policy access to wipe secondary user's data -->

    <string name="policylab_wipeData_secondaryUser">Erase user data</string>

    <string name="policylab_wipeData_secondaryUser" product="automotive">Erase profile data</string>

    <!-- Title of policy access to wipe secondary user's data -->

    <string name="policylab_wipeData_secondaryUser" product="default">Erase user data</string>

    <!-- Description of policy access to wipe the user's data -->

    <!-- Description of policy access to wipe the user's data -->

    <string name="policydesc_wipeData_secondaryUser" product="tablet">Erase this user\'s data on this tablet without warning.</string>

    <string name="policydesc_wipeData_secondaryUser" product="tablet">Erase this user\'s data on this tablet without warning.</string>

    <!-- Description of policy access to wipe the user's data -->

    <!-- Description of policy access to wipe the user's data -->

    <string name="policydesc_wipeData_secondaryUser" product="tv">Erase this user\'s data on this Android TV device without warning.</string>

    <string name="policydesc_wipeData_secondaryUser" product="tv">Erase this user\'s data on this Android TV device without warning.</string>

    <!-- Description of policy access to wipe the user's data -->

    <!-- Description of policy access to wipe the user's data -->

    <string name="policydesc_wipeData_secondaryUser" product="automotive">Erase this profile\'s data on this infotainment system without warning.</string>

    <!-- Description of policy access to wipe the user's data -->

    <string name="policydesc_wipeData_secondaryUser" product="default">Erase this user\'s data on this phone without warning.</string>

    <string name="policydesc_wipeData_secondaryUser" product="default">Erase this user\'s data on this phone without warning.</string>

    <!-- Title of policy access to set global proxy -->

    <!-- Title of policy access to set global proxy -->

    <string name="policylab_setGlobalProxy">Set the device global proxy</string>

    <string name="policylab_setGlobalProxy">Set the device global proxy</string>