Merge "Move to INetworkStatsSession with lifecycle."
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 285b6e6..cf0eaa2 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -726,7 +726,7 @@
</string-array>
<!-- User content ratings for restricted users [CHAR LIMIT=30] -->
- <string-array name="user_content_ratings_entries">
+ <string-array name="user_content_ratings_entries" translatable="false">
<item>Ascended being</item>
<item>Human</item>
<item>Neanderthal</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 16b383e..44a7b03 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3892,14 +3892,14 @@
<string name="user_name_title">Name</string>
<!-- User restrictions section title [CHAR LIMIT=30] -->
<string name="user_restrictions_heading">Content restrictions</string>
- <!-- User restrictions, does market require PIN protection [CHAR LIMIT=25] -->
- <string name="user_market_requires_pin">Downloads require PIN</string>
+ <!-- User restrictions, does market require PIN protection [CHAR LIMIT=30] -->
+ <string name="user_market_requires_pin">Require PIN</string>
<!-- User restrictions, maximum content rating for apps [CHAR LIMIT=25] -->
<string name="user_max_content_rating">Content rating</string>
<!-- Section title for list of system apps [CHAR LIMIT=30] -->
- <string name="user_system_apps_heading">System apps to enable</string>
+ <string name="user_system_apps_heading">System apps</string>
<!-- Section title for list of downloaded apps [CHAR LIMIT=30] -->
- <string name="user_market_apps_heading">Installed apps to enable</string>
+ <string name="user_market_apps_heading">Installed apps</string>
<!-- User details discard user menu [CHAR LIMIT=20] -->
<string name="user_discard_user_menu">Discard</string>
<!-- User details remove user menu [CHAR LIMIT=20] -->