summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-07-24 15:26:16 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-23 18:31:55 +0000
commita8e0a5b5f9a1d9fbade91909d57eb431fed69a86 (patch)
tree2f0cd934d49c58604d97863142ba9930fe5925d1 /res
parente68f5224e4359aef7f62c94130d5b9b221bee389 (diff)
parent1b821ffad4cb000a1a201b61b89014d95191b686 (diff)
downloadpackages_apps_Settings-a8e0a5b5f9a1d9fbade91909d57eb431fed69a86.zip
packages_apps_Settings-a8e0a5b5f9a1d9fbade91909d57eb431fed69a86.tar.gz
packages_apps_Settings-a8e0a5b5f9a1d9fbade91909d57eb431fed69a86.tar.bz2
Merge "Settings: Add to the zen alarm string." into lmp-dev
Diffstat (limited to 'res')
-rw-r--r--res/values/strings.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1d91076..587bc6a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5784,8 +5784,8 @@
<!-- [CHAR LIMIT=30] Zen mode settings: From option value: Starred contacts -->
<string name="zen_mode_from_starred">Starred contacts only</string>
- <!-- [CHAR LIMIT=60] Zen mode settings: Reminder text about alarms -->
- <string name="zen_mode_alarm_info">Alarms are always priority interruptions</string>
+ <!-- [CHAR LIMIT=80] Zen mode settings: Reminder text about alarms -->
+ <string name="zen_mode_alarm_info">Alarms and other personal reminders are priority interruptions</string>
<!-- [CHAR LIMIT=20] Zen mode settings: When option -->
<string name="zen_mode_when">Automatically turn on</string>