Merge "Fix inconsistent use of screenlock" into nyc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89dd47e..769fff4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3133,13 +3133,13 @@
<!-- Security & location settings screen, title when changing or confirming the work profile lock -->
<string name="lock_settings_profile_screen_lock_title">Work profile screen lock</string>
<!-- Security & location settings screen, setting option name to unify work and personal locks -->
- <string name="lock_settings_profile_unification_title">Use same screenlock</string>
+ <string name="lock_settings_profile_unification_title">Use same screen lock</string>
<!-- Security & location settings screen, setting option explanation to unify work and personal locks -->
<string name="lock_settings_profile_unification_summary">Change primary profile to match work profile</string>
<!-- Security & location settings screen, title of the dialog asking if the user wants to unify work and personal locks -->
- <string name="lock_settings_profile_unification_dialog_title">Use the same screenlock?</string>
+ <string name="lock_settings_profile_unification_dialog_title">Use the same screen lock?</string>
<!-- Security & location settings screen, explanation in the dialog asking if the user wants to unify work and personal locks -->
- <string name="lock_settings_profile_unification_dialog_body">You can use this lock for your device but it will include all screenlock related policies set by your IT admin on the work profile.\nDo you want to use the same screen lock for your device?</string>
+ <string name="lock_settings_profile_unification_dialog_body">You can use this lock for your device but it will include all screen lock related policies set by your IT admin on the work profile.\nDo you want to use the same screen lock for your device?</string>
<!-- Security & location settings screen, summary of the item that changes your work profile lock when it is unified with the personal lock -->
<string name="lock_settings_profile_unified_summary">Same as your device lock</string>