Merge "Update Security & screen lock preference"

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

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 651670c..7cd9ae4 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -744,13 +744,15 @@
     <string name="account_settings_title">Accounts</string>
     <!-- Main Settings screen setting option title for the item to take you to the security screen -->
     <string name="security_settings_title">Security &amp; screen lock</string>
+    <!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->
+    <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>
 
     <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
     <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>
     <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
     <string name="cdma_security_settings_summary">Set My Location, screen unlock, credential storage lock</string>
     <!-- In the security screen, the header title for settings related to  Passwords-->
-    <string name="security_passwords_title">Passwords</string>
+    <string name="security_passwords_title">Privacy</string>
     <!-- Summary for settings preference disabled by administrator [CHAR LIMIT=50] -->
     <string name="disabled_by_administrator_summary">Disabled by administrator</string>
     <!-- In the security screen, the header title for security statuses -->