am 28c116f0: am fc4be385: Merge "Update a few dream setting strings to ease translation." into jb-mr1.1-dev

* commit '28c116f0c22c8a31a4053fa72a73eaa0f4cbf30e':
  Update a few dream setting strings to ease translation.
This commit is contained in:
John Spurlock
2012-11-28 06:33:53 -08:00
committed by Android Git Automerger

View File

@@ -1775,11 +1775,11 @@
<string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
<!-- Display settings screen, trigger for screen saver options -->
<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 when docked or asleep and charging -->
<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 when docked or asleep and charging -->
<string name="screensaver_settings_summary_either_short">Either</string>
<!-- Display settings screen, summary fragment for screen saver options, activated on sleep -->
<!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
<string name="screensaver_settings_summary_sleep">While charging</string>
<!-- Display settings screen, summary fragment for screen saver options, activated when docked -->
<string name="screensaver_settings_summary_dock">While docked</string>