am b9cc1faf: am 4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev

* commit 'b9cc1faf129d1d583bd5c541fe2ab1526032d559':
  Wording change for Daydream setting
This commit is contained in:
Daniel Sandler
2012-10-26 05:50:20 -07:00
committed by Android Git Automerger

View File

@@ -1786,7 +1786,7 @@
<!-- Wallpaper settings fragment title [CHAR LIMIT=30] --> <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
<string name="wallpaper_settings_fragment_title">Choose wallpaper from</string> <string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
<!-- Display settings screen, trigger for screen saver options --> <!-- Display settings screen, trigger for screen saver options -->
<string name="screensaver_settings_title">Daydreams</string> <string name="screensaver_settings_title">Daydream</string>
<!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked --> <!-- 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> <string name="screensaver_settings_summary_either_long">When docked or asleep and charging</string>
<!-- Dream settings screen, dialog option, activated on sleep or docked --> <!-- Dream settings screen, dialog option, activated on sleep or docked -->