PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Daydream -> Screen saver" into nyc-dev am: ea80ebc am: 040acf7

Browse Source 
am: 36a3081447

* commit '36a30814476c1a182c0501af7a7f3721a3b8cfde':
  Daydream -> Screen saver

Change-Id: I6823cabfd270bed0698a926ceec6e2816b00b631
This commit is contained in:
Jason Monk
2016-04-21 03:26:43 +00:00
committed by android-build-merger
parent f4e4aebb18 36a3081447
commit 97f31d2942
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -2120,7 +2120,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">Daydream</string>
<string name="screensaver_settings_title">Screen saver</string>
<!-- 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 when docked or asleep and charging -->
@@ -2132,9 +2132,9 @@
<!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
<string name="screensaver_settings_summary_off">Off</string>
<!-- 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 Daydream 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 -->
<string name="screensaver_settings_when_to_dream">When to daydream</string>
<string name="screensaver_settings_when_to_dream">When to turn screen saver on</string>
<!-- Dream settings screen, button label to start dreaming -->
<string name="screensaver_settings_dream_start">Start now</string>
<!-- Dream settings screen, button label for settings for a specific screensaver -->