am 0e62c43d: am 66926227: am d0a057cc: Merge "Improvements to user settings" into lmp-dev

* commit '0e62c43d72c1c66c6f9790c8771d5e2c465d8f75':
  Improvements to user settings
This commit is contained in:
Amith Yamasani
2014-07-18 15:10:35 +00:00
committed by Android Git Automerger
65 changed files with 362 additions and 18 deletions

View File

@@ -5169,6 +5169,12 @@
<string name="user_delete_button">Delete</string>
<!-- Title for Guest user [CHAR LIMIT=35] -->
<string name="user_guest">Guest</string>
<!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
<string name="user_exit_guest_title">Exit guest</string>
<!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
<string name="user_exit_guest_confirm_title">Exiting guest session?</string>
<!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
<string name="user_exit_guest_confirm_message">Ending the guest session will remove local data.</string>
<!-- Title of preference to enable calling[CHAR LIMIT=35] -->
<string name="user_enable_calling">Enable phone calls?</string>