Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a60e5b52 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Daydream -> Screen saver" into nyc-dev

am: ea80ebcd

* commit 'ea80ebcd':
  Daydream -> Screen saver

Change-Id: Ia6454ece816ef711261094fceab046563c723514
parents 3c620915 ea80ebcd
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -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 -->