Merge "Display -> Screen"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 49d939c..39aa0cc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -466,7 +466,7 @@
<!-- The title of the activity to see battery info. -->
<string name="battery_info_label">Battery info</string>
<!-- The title of the activity to adjust display settings -->
- <string name="display_label">Display</string>
+ <string name="display_label">Screen</string>
<!-- The title of the activity to see phone info -->
<string name="phone_info_label" product="tablet">Tablet info</string>
<!-- The title of the activity to see phone info -->
@@ -1405,7 +1405,7 @@
<!-- Display settings -->
<!-- Sound & display settings screen, section header for settings related to display -->
- <string name="display_settings">Display settings</string>
+ <string name="display_settings">Screen settings</string>
<!-- Sound & display settings screen, animations check box label -->
<string name="animations_title">Animation</string>
<!-- Sound & display settings screen, animations option summary text when check box is selected -->
@@ -2601,7 +2601,7 @@
<string name="packages_subtitle">Included packages</string>
<!-- Label for power consumed by the screen -->
- <string name="power_screen">Display</string>
+ <string name="power_screen">Screen</string>
<!-- Label for power consumed by WiFi -->
<string name="power_wifi">Wi-Fi</string>
<!-- Label for power consumed by Bluetooth -->
@@ -2648,7 +2648,7 @@
<!-- Label for app settings action -->
<string name="battery_action_app_settings">Application settings</string>
<!-- Label for display settings -->
- <string name="battery_action_display">Display settings</string>
+ <string name="battery_action_display">Screen settings</string>
<!-- Label for wifi settings -->
<string name="battery_action_wifi">Wi-Fi settings</string>
<!-- Label for bluetooth settings -->