am bed3a7b6: Merge "Increase string lengths for translation" into lmp-dev

* commit 'bed3a7b6aa64a82504057a10a1c38a82feffcc38':
  Increase string lengths for translation
This commit is contained in:
Amith Yamasani
2014-07-27 11:30:12 +00:00
committed by Android Git Automerger

View File

@@ -5230,17 +5230,17 @@
<!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] --> <!-- 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">Ending the guest session will remove local data.</string>
<!-- Title of preference to enable calling[CHAR LIMIT=35] --> <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
<string name="user_enable_calling">Allow phone calls</string> <string name="user_enable_calling">Allow phone calls</string>
<!-- Title of preference to enable calling and SMS [CHAR LIMIT=35] --> <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
<string name="user_enable_calling_sms">Allow phone calls and SMS</string> <string name="user_enable_calling_sms">Allow phone calls and SMS</string>
<!-- Title of preference to remove the user [CHAR LIMIT=35] --> <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
<string name="user_remove_user">Remove user</string> <string name="user_remove_user">Remove user</string>
<!-- Title for confirmation of turning on calls [CHAR LIMIT=35] --> <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
<string name="user_enable_calling_confirm_title">Allow phone calls?</string> <string name="user_enable_calling_confirm_title">Allow phone calls?</string>
<!-- Message for confirmation of turning on calls [CHAR LIMIT=none] --> <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
<string name="user_enable_calling_confirm_message">Call history will be shared with this user.</string> <string name="user_enable_calling_confirm_message">Call history will be shared with this user.</string>
<!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=35] --> <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
<string name="user_enable_calling_sms_confirm_title">Allow phone calls and SMS?</string> <string name="user_enable_calling_sms_confirm_title">Allow phone calls and SMS?</string>
<!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] --> <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
<string name="user_enable_calling_sms_confirm_message">Call and SMS history will be shared with this user.</string> <string name="user_enable_calling_sms_confirm_message">Call and SMS history will be shared with this user.</string>