am 740afcb6: am f6d483e6: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '740afcb64bb967bb4eada7f7bb071706378d818a':
  Import translations. DO NOT MERGE

1 files changed, 24 insertions, 27 deletions

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 467c676..b36faa4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -507,7 +507,6 @@
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Search for displays"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Searching…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No nearby wireless displays were found."</string>
-    <string name="wifi_display_settings_empty_list_user_restricted" msgid="1920080628834632135">"This user is not allowed to configure wireless networks."</string>
     <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Paired displays"</string>
     <string name="wifi_display_available_devices" msgid="4558314642853513487">"Available devices"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connecting"</string>
@@ -573,6 +572,8 @@
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"To see available networks, turn Wi‑Fi on."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Searching for Wi‑Fi networks…"</string>
+    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
+    <skip />
     <string name="wifi_other_network" msgid="1048006316504242214">"Other network…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
@@ -1822,51 +1823,46 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
-    <!-- no translation found for user_list_title (7937158411137563543) -->
-    <skip />
-    <!-- no translation found for user_add_user_menu (3154537325132012954) -->
-    <skip />
-    <!-- no translation found for user_summary_restricted_profile (6354966213806839107) -->
-    <skip />
+    <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Add user or profile"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Restricted profile"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Not set up"</string>
-    <!-- no translation found for user_summary_restricted_not_set_up (1628116001964325544) -->
-    <skip />
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Not set up - Restricted profile"</string>
     <string name="user_owner" msgid="3879126011135546571">"Owner"</string>
-    <!-- no translation found for user_you (1639158809315025986) -->
-    <skip />
+    <string name="user_you" msgid="1639158809315025986">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
-    <!-- no translation found for user_add_user_type_title (2146438670792322349) -->
-    <skip />
-    <!-- no translation found for user_add_user_item_summary (4702776187132008661) -->
-    <skip />
-    <!-- no translation found for user_add_profile_item_summary (2505099177666579571) -->
-    <skip />
-    <!-- no translation found for user_add_user_item_title (8212199632466198969) -->
-    <skip />
-    <!-- no translation found for user_add_profile_item_title (8353515490730363621) -->
-    <skip />
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Add"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Users have their own apps and content"</string>
+    <string name="user_add_profile_item_summary" msgid="2505099177666579571">"Restricted profiles can only access the apps and content from your accounts"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Restricted profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Add new user"</string>
     <string name="user_add_user_message_long" msgid="3086244205384741788">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own apps, wallpaper and so on. Users can also adjust tablet settings like Wi‑Fi that affect everyone."\n\n"After you create a new user, that person needs to go through a set-up process."\n\n"Any user can accept updated app permissions on behalf of all other users."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"After you create a new user, that person needs to go through a setup process."\n\n"Any user can accept updated app permissions on behalf of all other users."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Set up user now?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Make sure the person is available to take the tablet and set up their space"</string>
-    <!-- no translation found for user_setup_profile_dialog_message (3896568553327558731) -->
-    <skip />
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Set up profile now?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Set up now"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Not now"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Only the phone\'s owner can manage users."</string>
-    <string name="user_cannot_add_accounts_message" msgid="1610930617977321638">"Limited users cannot add accounts"</string>
+    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
+    <skip />
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"New user"</string>
-    <!-- no translation found for user_new_profile_name (2632088404952119900) -->
-    <skip />
+    <string name="user_new_profile_name" msgid="2632088404952119900">"New profile"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Delete yourself?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remove user?"</string>
+    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
+    <skip />
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"You will lose your space and data on this tablet. You can\'t undo this action."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"You will lose your space and data on this phone. You can\'t undo this action."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"This user\'s space and data will disappear from this tablet. You can\'t undo this action."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"This user\'s space and data will disappear from this phone. You can\'t undo this action."</string>
+    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
+    <skip />
+    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
+    <skip />
     <string name="user_adding_new_user" msgid="1521674650874241407">"Adding new user…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Delete user"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Delete"</string>
@@ -1887,7 +1883,8 @@
     <string name="user_rename" msgid="8523499513614655279">"RENAME"</string>
     <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Set application limits"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"Controlled by <xliff:g id="APP">%1$s</xliff:g>"</string>
-    <string name="app_not_supported_in_limited" msgid="1514792872934755368">"This app is not supported in limited users"</string>
+    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
+    <skip />
     <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"This app can access your accounts"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi and Mobile"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Allow modification of Wi‑Fi and Mobile settings"</string>