diff options
| author | Jake Hamby <jhamby@google.com> | 2012-06-25 18:14:06 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2012-06-25 18:14:06 -0700 |
| commit | 9cc7ca29966903951b076867bcbc1fe6560fffe4 (patch) | |
| tree | b4b8ae56d7ca7b8fa8ca5ab6cd701bb23fa33cf5 /res/values | |
| parent | d6fd8d5e5b2751a35b9014e39a3070b322c5d802 (diff) | |
| parent | 8f12b1287f1a61cc3a3ba0cab6790c2e8dce19a7 (diff) | |
| download | packages_apps_Settings-9cc7ca29966903951b076867bcbc1fe6560fffe4.zip packages_apps_Settings-9cc7ca29966903951b076867bcbc1fe6560fffe4.tar.gz packages_apps_Settings-9cc7ca29966903951b076867bcbc1fe6560fffe4.tar.bz2 | |
resolved conflicts for merge of 8f12b128 to master
Change-Id: I35552dafc1fc7f128726504ea97b5c3e446ac0df
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 4f1dc97..947be3a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4099,9 +4099,14 @@ <string name="help_url_backup_reset" translatable="false"></string> <!-- Help URL, Tethering [DO NOT TRANSLATE] --> <string name="help_url_tether" translatable="false"></string> - + <!-- User account title [CHAR LIMIT=30] --> <string name="user_account_title">Account for content</string> <!-- User picture title [CHAR LIMIT=30] --> <string name="user_picture_title">Photo ID</string> + + <!-- Cell Broadcast settings title [CHAR LIMIT=50] --> + <string name="cell_broadcast_settings">Cell broadcasts</string> + <!-- Cell Broadcast settings description [CHAR LIMIT=100] --> + <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string> </resources> |