Merge "Screen saver string fixes" into nyc-dev am: 990ef94b64

am: fcc592c6ac

* commit 'fcc592c6ac60402642ebebc7317ecf28293a0f7a':
  Screen saver string fixes

Change-Id: I83b1657abcce0ed9cc685f36bbd95eab4bb390ba
This commit is contained in:
Jason Monk
2016-04-21 16:00:25 +00:00
committed by android-build-merger

View File

@@ -2138,7 +2138,7 @@
<!-- Dream settings screen, caption for when dreams are disabled --> <!-- 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 screen saver on.</string> <string name="screensaver_settings_disabled_prompt">To control what happens when the phone is docked and/or sleeping, turn screen saver on.</string>
<!-- Dream settings screen, action label, when to dream --> <!-- Dream settings screen, action label, when to dream -->
<string name="screensaver_settings_when_to_dream">When to turn screen saver on</string> <string name="screensaver_settings_when_to_dream">When to start screen saver</string>
<!-- Dream settings screen, button label to start dreaming --> <!-- Dream settings screen, button label to start dreaming -->
<string name="screensaver_settings_dream_start">Start now</string> <string name="screensaver_settings_dream_start">Start now</string>
<!-- Dream settings screen, button label for settings for a specific screensaver --> <!-- Dream settings screen, button label for settings for a specific screensaver -->