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

am: 86b6be0784

Change-Id: I66c100084a6986935a0707c5a11ea80729ea3b0e
This commit is contained in:
Sunny Shao
2019-04-11 00:33:50 -07:00
committed by android-build-merger

View File

@@ -2852,7 +2852,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 -->
@@ -2860,7 +2860,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] -->
@@ -9328,7 +9328,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>