Merge "Update strings" into qt-dev

am: a4ea8e94a0

Change-Id: I98adc0b17087954fa8bb913ce4a99a3e9743c01e
This commit is contained in:
Fan Zhang
2019-04-04 18:30:52 -07:00
committed by android-build-merger

View File

@@ -2829,6 +2829,8 @@
<string name="screen_timeout_summary">After <xliff:g id="timeout_description">%1$s</xliff:g> of inactivity</string>
<!-- 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>
<!-- 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] -->
@@ -9303,6 +9305,9 @@
<!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
<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>
<!-- Summary for Display settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->
<string name="display_dashboard_nowallpaper_summary">Sleep, font size</string>
@@ -9439,10 +9444,10 @@
<string name="condition_night_display_summary">Screen tinted amber</string>
<!-- Title of condition that gray scale is on [CHAR LIMIT=NONE] -->
<string name="condition_grayscale_title">Greyscale</string>
<string name="condition_grayscale_title">Grayscale</string>
<!-- Summary of condition that gray scale is on [CHAR LIMIT=NONE] -->
<string name="condition_grayscale_summary">Display only in grey color</string>
<string name="condition_grayscale_summary">Display only in gray color</string>
<!-- Summary for the condition section on the dashboard, representing number of conditions. [CHAR LIMIT=10] -->
<string name="condition_summary" translatable="false"><xliff:g name="count" example="3">%1$d</xliff:g></string>