diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 09d94de..7bb93bd 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -112,7 +112,7 @@
     <!-- Security settings.  The delay after screen is turned off until device locks. 
          These are shown in a list dialog. -->
     <string-array name="lock_after_timeout_entries">
-        <item>immediately</item>
+        <item>Immediately</item>
         <item>5 seconds</item>
         <item>15 seconds</item>
         <item>30 seconds</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c9bfb7f..37f6657 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -625,7 +625,7 @@
     <!-- Security settings screen, setting option name to change screen timeout -->
     <string name="lock_after_timeout">Automatically lock</string>
     <!-- Security settings screen, setting option summary to change screen timeout -->
-    <string name="lock_after_timeout_summary">After <xliff:g id="timeout_string">%1$s</xliff:g> of sleep</string>
+    <string name="lock_after_timeout_summary"><xliff:g id="timeout_string">%1$s</xliff:g> after sleep</string>
     <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
     <string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
     <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
@@ -749,14 +749,14 @@
 
     <!-- Security Picker --><skip />
     <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
-    <string name="lock_settings_picker_title">Configure lock screen</string>
+    <string name="lock_settings_picker_title">Screen lock</string>
 
     <!--  Main Security lock settings --><skip />
     <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
-    <string name="unlock_set_unlock_launch_picker_title">Configure lock screen</string>
+    <string name="unlock_set_unlock_launch_picker_title">Screen lock</string>
 
     <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
-    <string name="unlock_set_unlock_launch_picker_change_title">Change screen lock</string>
+    <string name="unlock_set_unlock_launch_picker_change_title">Change lock screen</string>
 
     <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
     <string name="unlock_set_unlock_launch_picker_change_summary">Change or disable pattern, PIN, or password security</string>
@@ -765,37 +765,37 @@
     <string name="unlock_set_unlock_launch_picker_enable_summary">Choose a method to lock the screen</string>
 
     <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
-    <string name="unlock_set_unlock_off_title">Off</string>
+    <string name="unlock_set_unlock_off_title">None</string>
     <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_off_summary">Never lock the screen</string>
+    <string name="unlock_set_unlock_off_summary"></string>
 
     <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
-    <string name="unlock_set_unlock_none_title">Not secured</string>
+    <string name="unlock_set_unlock_none_title">Slide</string>
     <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
-    <string name="unlock_set_unlock_none_summary">Don\u0027t require a pattern, PIN, or password to unlock the screen</string>
+    <string name="unlock_set_unlock_none_summary"></string>
 
     <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
     <string name="unlock_set_unlock_pattern_title">Pattern</string>
     <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_pattern_summary">Require a pattern to unlock the screen</string>
+    <string name="unlock_set_unlock_pattern_summary"></string>
 
     <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_pin_title">PIN</string>
     <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_pin_summary">Require a numeric PIN to unlock the screen</string>
+    <string name="unlock_set_unlock_pin_summary"></string>
 
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
     <string name="unlock_set_unlock_password_title">Password</string>
     <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_password_summary">Require a password to unlock the screen</string>
+    <string name="unlock_set_unlock_password_summary"></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>
 
     <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_mode_off">Off</string>
+    <string name="unlock_set_unlock_mode_off">None</string>
     <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
-    <string name="unlock_set_unlock_mode_none">No security</string>
+    <string name="unlock_set_unlock_mode_none">Slide</string>
     <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
     <string name="unlock_set_unlock_mode_pattern">Secured with pattern</string>
     <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
@@ -2126,7 +2126,7 @@
 
     <!-- Lock Pattern settings -->
     <!-- Security & location settings screen, header -->
-    <string name="lock_settings_title">Lock screen</string>
+    <string name="lock_settings_title">Screen security</string>
     <!-- Security & location settings screen, setting option name -->
     <string name="lockpattern_change_lock_pattern_label">Change unlock pattern</string>
     <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
@@ -2167,9 +2167,9 @@
     <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
     <string name="lockpattern_settings_enable_summary">Must draw pattern to unlock screen</string>
     <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
-    <string name="lockpattern_settings_enable_visible_pattern_title">Use visible pattern</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title">Make pattern visible</string>
     <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
-    <string name="lockpattern_settings_enable_tactile_feedback_title">Use tactile feedback</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title">Vibrate on touch</string>
     <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
     <string name="lockpattern_settings_choose_lock_pattern">Set unlock pattern</string>
     <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
@@ -2509,9 +2509,9 @@
     <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
     <string name="auto_punctuate_summary">Press Space key twice to insert \u0022.\u0022</string>
     <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
-    <string name="show_password">Visible passwords</string>
+    <string name="show_password">Make passwords visible</string>
     <!-- On Security & location settings screen, setting check box summary. Summary for the visible passwords setting. -->
-    <string name="show_password_summary">Show password as you type</string>
+    <string name="show_password_summary"></string>
     <!-- Warning message about security implications of enabling an input method, displayed as a dialog
          message when the user selects to enable an IME. -->
     <string name="ime_security_warning">This input method may be able to collect
@@ -2749,8 +2749,8 @@
     <string name="accessibility_script_injection_security_warning">Do you want applications to install
         scripts from Google that will make their content more accessible?</string>
     <!-- Warning message that the interaction model changes on enabling touch exploration. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_touch_exploration_warning">Enabling explore by touch
-        changes how the devices respons to touch. Enable explore by touch?</string>
+    <string name="accessibility_touch_exploration_warning">This feature changes the
+        way your device responds to touch. Turn on?</string>
     <!-- Default description for an accessiiblity serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
     <string name="accessibility_service_default_description">This accessibility service has no
         description.\n\nAccessibility services provide various types of feedback when you interact