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

Commit 25608dd1 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am 769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev

* commit '769b4711':
  Dreams/Sleep Mode is now Daydreams.
parents 7ff9d5e1 769b4711
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -1786,7 +1786,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">Sleep Mode</string>
    <string name="screensaver_settings_title">Daydreams</string>
    <!-- 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>
    <!-- Dream settings screen, dialog option, activated on sleep or docked -->
@@ -1800,9 +1800,9 @@
    <!-- 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 Sleep Mode on.</string>
    <!-- Dream settings screen, action label, when to dream -->
    <string name="screensaver_settings_when_to_dream">When to sleep</string>
    <string name="screensaver_settings_when_to_dream">When to daydream</string>
    <!-- Dream settings screen, button label to start dreaming -->
    <string name="screensaver_settings_dream_start">Sleep now</string>
    <string name="screensaver_settings_dream_start">Start now</string>
    <!-- Dream settings screen, button label for settings for a specific screensaver -->
    <string name="screensaver_settings_button">Settings</string>
    <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->