Merge "Update strings for the repair mode lock password screen" into udc-qpr-dev am: 2070808a62

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23874782

Change-Id: I72588a3e8ff494cd31f72531ada1baef867fb7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Rhed Jao
2023-07-06 02:51:45 +00:00
committed by Automerger Merge Worker

View File

@@ -3493,18 +3493,18 @@
<!-- Checkbox label to set password as new screen lock if remote device credential validation succeeds. [CHAR LIMIT=43] --> <!-- Checkbox label to set password as new screen lock if remote device credential validation succeeds. [CHAR LIMIT=43] -->
<string name="lockpassword_remote_validation_set_password_as_screenlock">Also use password to unlock this device</string> <string name="lockpassword_remote_validation_set_password_as_screenlock">Also use password to unlock this device</string>
<!-- Header shown when pattern needs to be solved before the device exits repair mode. [CHAR LIMIT=100] [DO NOT TRANSLATE] TODO(b/275677027): update with finalized UX string --> <!-- Header shown when pattern needs to be solved before the device exits repair mode. [CHAR LIMIT=40] -->
<string name="lockpassword_confirm_repair_mode_pattern_header">Verify pattern</string> <string name="lockpassword_confirm_repair_mode_pattern_header">Verify pattern</string>
<!-- Header shown when the pin needs to be solved before the device exits repair mode. [CHAR LIMIT=100] [DO NOT TRANSLATE] TODO(b/275677027): update with finalized UX string --> <!-- Header shown when the pin needs to be solved before the device exits repair mode. [CHAR LIMIT=40] -->
<string name="lockpassword_confirm_repair_mode_pin_header">Verify PIN</string> <string name="lockpassword_confirm_repair_mode_pin_header">Verify PIN</string>
<!-- Header shown when the password needs to be solved before the device exits repair mode. [CHAR LIMIT=100] [DO NOT TRANSLATE] TODO(b/275677027): update with finalized UX string --> <!-- Header shown when the password needs to be solved before the device exits repair mode. [CHAR LIMIT=40] -->
<string name="lockpassword_confirm_repair_mode_password_header">Verify password</string> <string name="lockpassword_confirm_repair_mode_password_header">Verify password</string>
<!-- An explanation text that the pattern needs to be solved before the device exits repair mode. [CHAR LIMIT=100] [DO NOT TRANSLATE] TODO(b/275677027): update with finalized UX string --> <!-- An explanation text that the pattern needs to be solved before the device exits repair mode. [CHAR LIMIT=100] -->
<string name="lockpassword_confirm_repair_mode_pattern_details" translatable="false">Enter your device pattern enrolled in normal mode to continue</string> <string name="lockpassword_confirm_repair_mode_pattern_details">Use your device pattern to continue</string>
<!-- An explanation text that the PIN needs to be solved before the device exits repair mode. [CHAR LIMIT=100] [DO NOT TRANSLATE] TODO(b/275677027): update with finalized UX string --> <!-- An explanation text that the PIN needs to be solved before the device exits repair mode. [CHAR LIMIT=100] -->
<string name="lockpassword_confirm_repair_mode_pin_details" translatable="false">Enter your device PIN enrolled in normal mode to continue</string> <string name="lockpassword_confirm_repair_mode_pin_details">Enter your device PIN to continue</string>
<!-- An explanation text that the password needs to be solved before the device exits repair mode. [CHAR LIMIT=100] [DO NOT TRANSLATE] TODO(b/275677027): update with finalized UX string --> <!-- An explanation text that the password needs to be solved before the device exits repair mode. [CHAR LIMIT=100] -->
<string name="lockpassword_confirm_repair_mode_password_details" translatable="false">Enter your device password enrolled in normal mode to continue</string> <string name="lockpassword_confirm_repair_mode_password_details">Enter your device password to continue</string>
<!-- Security & location settings screen, change security method screen instruction if user <!-- Security & location settings screen, change security method screen instruction if user
enters incorrect PIN [CHAR LIMIT=30] --> enters incorrect PIN [CHAR LIMIT=30] -->