Merge "Character limit updates" into lmp-dev

This commit is contained in:
PauloftheWest
2014-07-23 17:14:50 +00:00
committed by Android (Google) Code Review

View File

@@ -654,7 +654,7 @@
<string name="sms_messages_title">SMS Messages</string> <string name="sms_messages_title">SMS Messages</string>
<!-- check box cellular data summary [CHAR LIMIT=41] --> <!-- check box cellular data summary [CHAR LIMIT=41] -->
<string name="cellular_data_summary">Allow data usage over cellular network</string> <string name="cellular_data_summary">Allow data usage over cellular network</string>
<!-- check box to allow data usage when roaming [CHAR LIMIT=30] --> <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
<string name="allow_data_usage_title">Allow data usage when roaming</string> <string name="allow_data_usage_title">Allow data usage when roaming</string>
<!-- mobile network settings screen, setting check box title --> <!-- mobile network settings screen, setting check box title -->
<string name="roaming">Data roaming</string> <string name="roaming">Data roaming</string>
@@ -5305,7 +5305,7 @@
<!-- Extreme threats title. [CHAR LIMIT=30] --> <!-- Extreme threats title. [CHAR LIMIT=30] -->
<string name="extreme_threats_title">Extreme threats</string> <string name="extreme_threats_title">Extreme threats</string>
<!-- Extreme threats summary. [CHAR LIMIT=60] --> <!-- Extreme threats summary. [CHAR LIMIT=62] -->
<string name="extreme_threats_summary">Receive alerts for extreme threats to life and property</string> <string name="extreme_threats_summary">Receive alerts for extreme threats to life and property</string>
<!-- Severe threats title. [CHAR LIMIT=30] --> <!-- Severe threats title. [CHAR LIMIT=30] -->
<string name="severe_threats_title">Severe threats</string> <string name="severe_threats_title">Severe threats</string>