am d05dd864: Merge "Update strings for guest removal affordance and dialog" into lmp-dev

* commit 'd05dd864d6f26a1577cbcb25a43ddf9d3e638299':
  Update strings for guest removal affordance and dialog
This commit is contained in:
Amith Yamasani
2014-08-19 15:43:40 +00:00
committed by Android Git Automerger
2 changed files with 7 additions and 5 deletions

View File

@@ -5257,11 +5257,13 @@
<!-- 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>
<string name="user_exit_guest_title">Remove 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>
<string name="user_exit_guest_confirm_title">Remove guest?</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>
<string name="user_exit_guest_confirm_message">All apps and data in this session will be deleted.</string>
<!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
<string name="user_exit_guest_dialog_remove">Remove</string>
<!-- Title of preference to enable calling[CHAR LIMIT=40] -->
<string name="user_enable_calling">Allow phone calls</string>