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

Commit f1f1866e authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Automerger Merge Worker
Browse files

Merge changes Ifbb6579b,Ibf0ed0b8,I0f0decfb into rvc-dev am: 28d11e0b am:... 

Merge changes Ifbb6579b,Ibf0ed0b8,I0f0decfb into rvc-dev am: 28d11e0b am: e22051f4 am: 5460313e am: 395fb539

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

Change-Id: Iee2cf2f622ef18e7a0892c976b870fd40254600a
parents b9dbc568 395fb539

core/res/res/values/strings.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -1619,15 +1619,15 @@ 
    <string name="face_error_no_space">Can\u2019t store new face data. Delete an old one first.</string>

    <string name="face_error_no_space">Can\u2019t store new face data. Delete an old one first.</string>

    <!-- Generic error message shown when the face operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user. [CHAR LIMIT=50] -->

    <!-- Generic error message shown when the face operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user. [CHAR LIMIT=50] -->

    <string name="face_error_canceled">Face operation canceled.</string>

    <string name="face_error_canceled">Face operation canceled.</string>

    <!-- Generic error message shown when the face unlock operation is canceled due to user input. Generally not shown to the user [CHAR LIMIT=54] -->

    <!-- Generic error message shown when the face unlock operation is canceled due to user input. Generally not shown to the user [CHAR LIMIT=68] -->

    <string name="face_error_user_canceled">Face unlock canceled by user.</string>

    <string name="face_error_user_canceled">Face unlock canceled by user.</string>

    <!-- Generic error message shown when the face operation fails because too many attempts have been made. [CHAR LIMIT=50] -->

    <!-- Generic error message shown when the face operation fails because too many attempts have been made. [CHAR LIMIT=50] -->

    <string name="face_error_lockout">Too many attempts. Try again later.</string>

    <string name="face_error_lockout">Too many attempts. Try again later.</string>

    <!-- Generic error message shown when the face operation fails because strong authentication is required. [CHAR LIMIT=71] -->

    <!-- Generic error message shown when the face operation fails because strong authentication is required. [CHAR LIMIT=77] -->

    <string name="face_error_lockout_permanent">Too many attempts. Face unlock disabled.</string>

    <string name="face_error_lockout_permanent">Too many attempts. Face unlock disabled.</string>

    <!-- Generic error message shown when the face hardware can't recognize the face. [CHAR LIMIT=50] -->

    <!-- Generic error message shown when the face hardware can't recognize the face. [CHAR LIMIT=50] -->

    <string name="face_error_unable_to_process">Can\u2019t verify face. Try again.</string>

    <string name="face_error_unable_to_process">Can\u2019t verify face. Try again.</string>

    <!-- Generic error message shown when the user has no enrolled face. [CHAR LIMIT=52] -->

    <!-- Generic error message shown when the user has no enrolled face. [CHAR LIMIT=59] -->

    <string name="face_error_not_enrolled">You haven\u2019t set up face unlock.</string>

    <string name="face_error_not_enrolled">You haven\u2019t set up face unlock.</string>

    <!-- Generic error message shown when the app requests face unlock on a device without a sensor. [CHAR LIMIT=61] -->

    <!-- Generic error message shown when the app requests face unlock on a device without a sensor. [CHAR LIMIT=61] -->

    <string name="face_error_hw_not_present">Face unlock is not supported on this device.</string>

    <string name="face_error_hw_not_present">Face unlock is not supported on this device.</string>