commit 86b6be0784d05703639fd76e6a0041869efc7d4e
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 11 05:26:52 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 11 05:26:52 2019 +0000
tree 3f6067f122a18ebf0072521e58cc55f899067b9d
parent 3ef0e5fc4faad7f8c22cbe77196fd8d060ca6a95
parent ff7e7ad30db2c46cecccb84a90ed95f8d3eaae05

Merge "Update some wordings under the Display page" into qt-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d9d95b9..d7e5c84 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2846,7 +2846,7 @@
     <string name="night_display_not_currently_on">Night Light not currently on</string>
 
     <!-- Sound & display settings screen, setting option name to change screen timeout -->
-    <string name="screen_timeout">Sleep</string>
+    <string name="screen_timeout">Screen timeout</string>
     <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
     <string name="screen_timeout_title">Screen turns off</string>
     <!-- Sound & display settings screen, setting option summary to change screen timeout -->
@@ -2854,7 +2854,7 @@
     <!-- Wallpaper settings title [CHAR LIMIT=30] -->
     <string name="wallpaper_settings_title">Wallpaper</string>
     <!-- Styles & Wallpapers settings title [CHAR LIMIT=30] -->
-    <string name="style_and_wallpaper_settings_title">Styles &amp; Wallpapers</string>
+    <string name="style_and_wallpaper_settings_title">Styles &amp; wallpapers</string>
     <!-- Wallpaper settings summary when default wallpaper is used [CHAR LIMIT=NONE] -->
     <string name="wallpaper_settings_summary_default">Default</string>
     <!-- Wallpaper settings summary when wallpaper has been updated [CHAR LIMIT=NONE] -->
@@ -9322,7 +9322,7 @@
     <string name="display_dashboard_summary">Wallpaper, sleep, font size</string>
 
     <!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
-    <string name="display_dashboard_summary_with_style">Styles &amp; Wallpapers, sleep, font size</string>
+    <string name="display_dashboard_summary_with_style">Styles, wallpapers, screen timeout, font size</string>
 
     <!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
     <string name="display_dashboard_nowallpaper_summary">Sleep, font size</string>