diff options
| author | Esteban Talavera <etalavera@google.com> | 2015-07-17 13:09:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 13:09:37 +0000 |
| commit | f1c2dc56011d7c6418584976a5dfe6c2d4a42e8b (patch) | |
| tree | 5fa5cb70e43911f91a35b754a48985b4c3e329fd | |
| parent | 139ca533d8ef96fc9b7db26045f837f0d3969c02 (diff) | |
| parent | 0e9f11836e66d87959a3cc30d62d225e6210e9f9 (diff) | |
| download | android_packages_apps_ManagedProvisioning-f1c2dc56011d7c6418584976a5dfe6c2d4a42e8b.tar.gz android_packages_apps_ManagedProvisioning-f1c2dc56011d7c6418584976a5dfe6c2d4a42e8b.tar.bz2 android_packages_apps_ManagedProvisioning-f1c2dc56011d7c6418584976a5dfe6c2d4a42e8b.zip | |
am 0e9f1183: Strings for the progress dialog shown when clearing FRP
* commit '0e9f11836e66d87959a3cc30d62d225e6210e9f9':
Strings for the progress dialog shown when clearing FRP
| -rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index ed40b323..df44514c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -17,8 +17,6 @@ */ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- TODO: Review all strings before launch --> - <!-- General provisioning strings used for both device owner and work profile provisioning --> <!-- Title of the provisioning error dialog. [CHAR LIMIT=45] --> @@ -146,6 +144,10 @@ <string name="device_owner_error_wifi">Couldn\'t connect to Wi-Fi</string> <!-- Message of the error dialog when passing factory reset protection fails. [CHAR LIMIT=NONE] --> <string name="device_owner_error_frp">This device is locked by factory reset protection. Contact your IT department.</string> + <!-- Message informing the user that the factory reset protection partition is being erased [CHAR LIMIT=30] --> + <string name="frp_clear_progress_title" >Erasing</string> + <!-- Progress screen text shown while erasing the factory reset protection partition [CHAR LIMIT=75] --> + <string name="frp_clear_progress_text">Please wait...</string> <!-- Message of the error dialog when data integrity check fails. [CHAR LIMIT=NONE] --> <string name="device_owner_error_hash_mismatch">Couldn\'t use the admin app due to a checksum error. Contact your IT department.</string> <!-- Message of the error dialog when device owner apk could not be downloaded. [CHAR LIMIT=NONE] --> |