Merge "Add a warning message to the ASM toggle." into nyc-mr1-dev

[android-x86/packages-apps-Settings.git] / res / values / strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index be30e86..57c33b1 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1083,6 +1083,12 @@
     <!-- Title for preference that guides the user through creating a backup unlock password for fingerprint [CHAR LIMIT=45]-->
     <string name="fingerprint_unlock_set_unlock_password">Fingerprint + Password</string>
 
+    <!-- Title for preference that guides the user to skip fingerprint setup [CHAR LIMIT=60]-->
+    <string name="fingerprint_unlock_skip_fingerprint">Continue without fingerprint</string>
+
+    <!-- Message shown in screen lock picker while setting up the new screen lock with fingerprint option. [CHAR LIMIT=NONE]-->
+    <string name="fingerprint_unlock_title">You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.</string>
+
     <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
     <string name="unlock_set_unlock_disabled_summary">Disabled by administrator, encryption policy, or credential storage</string>
 
@@ -6200,13 +6206,14 @@
     </string>
 
     <!-- Title for what display preferences are applied when device is in VR mode -->
-    <string name="display_vr_pref_title">When device is in VR mode</string>
+    <string name="display_vr_pref_title">When device is in VR</string>
 
     <!-- [CHAR LIMIT=70] Put display into low-persistence mode, this decreases motion blur. -->
-    <string name="display_vr_pref_low_persistence">Use low motion blur settings</string>
+    <string name="display_vr_pref_low_persistence">Reduce blur (recommended)</string>
 
-    <!-- [CHAR LIMIT=70] Do not change display settings. -->
-    <string name="display_vr_pref_off">Do nothing</string>
+    <!-- [CHAR LIMIT=70] Do not change default display settings, this may reduce perceived screen
+         flicker while in VR mode. -->
+    <string name="display_vr_pref_off">Reduce flicker</string>
 
     <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
     <string name="manage_zen_access_title">Do Not Disturb access</string>
@@ -7827,4 +7834,7 @@
 
     <!-- Section title for the Domain URL app preference list [CHAR LIMIT=60]-->
     <string name="domain_url_section_title">Installed apps</string>
+
+    <!-- Warning when activating the automatic storage manager on legacy devices. [CHAR LIMIT=NONE] -->
+    <string name="automatic_storage_manager_activation_warning">Your storage is now being managed by the storage manager</string>
 </resources>