diff options
author | Daniel Sandler <dsandler@android.com> | 2012-10-23 08:15:47 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-23 08:15:48 -0700 |
commit | 769b4711c94cc9093012e51e0101659d712b99ee (patch) | |
tree | c1ba552fbeac57598498f828355f20e850624423 /res | |
parent | b80b8bb2535504bada0664a7255b5fa61c2c3947 (diff) | |
parent | 3bdbf45316b3219580eb4e2c0afe20b8b21f4145 (diff) | |
download | packages_apps_settings-769b4711c94cc9093012e51e0101659d712b99ee.zip packages_apps_settings-769b4711c94cc9093012e51e0101659d712b99ee.tar.gz packages_apps_settings-769b4711c94cc9093012e51e0101659d712b99ee.tar.bz2 |
Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b39e8b5..25b9413 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1786,7 +1786,7 @@ <!-- Wallpaper settings fragment title [CHAR LIMIT=30] --> <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string> <!-- Display settings screen, trigger for screen saver options --> - <string name="screensaver_settings_title">Sleep Mode</string> + <string name="screensaver_settings_title">Daydreams</string> <!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked --> <string name="screensaver_settings_summary_either_long">When docked or asleep and charging</string> <!-- Dream settings screen, dialog option, activated on sleep or docked --> @@ -1800,9 +1800,9 @@ <!-- Dream settings screen, caption for when dreams are disabled --> <string name="screensaver_settings_disabled_prompt">To control what happens when the phone is docked and/or sleeping, turn Sleep Mode on.</string> <!-- Dream settings screen, action label, when to dream --> - <string name="screensaver_settings_when_to_dream">When to sleep</string> + <string name="screensaver_settings_when_to_dream">When to daydream</string> <!-- Dream settings screen, button label to start dreaming --> - <string name="screensaver_settings_dream_start">Sleep now</string> + <string name="screensaver_settings_dream_start">Start now</string> <!-- Dream settings screen, button label for settings for a specific screensaver --> <string name="screensaver_settings_button">Settings</string> <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions --> |