summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2012-09-25 18:17:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-25 18:17:15 -0700
commit12fda43f8564968cc93d0f8b5839fd520d33577d (patch)
tree22211555b95eab7f113ea83054dceaa38c10c6a6 /res/values
parent0d9179c47338532bb2995130d07e458ab12bcb5c (diff)
parent263f7442374f30038b7c6cf712efee6720af4148 (diff)
downloadpackages_apps_Settings-12fda43f8564968cc93d0f8b5839fd520d33577d.zip
packages_apps_Settings-12fda43f8564968cc93d0f8b5839fd520d33577d.tar.gz
packages_apps_Settings-12fda43f8564968cc93d0f8b5839fd520d33577d.tar.bz2
Merge "Show long message for a new user only once." into jb-mr1-dev
Diffstat (limited to 'res/values')
-rw-r--r--res/values/strings.xml6
1 files changed, 4 insertions, 2 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9d5f4cf..fb1de52 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4268,8 +4268,10 @@
<string name="user_nickname">Nickname</string>
<!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
<string name="user_add_user_title">Add new user</string>
- <!-- Message for add user confirmation dialog [CHAR LIMIT=none] -->
- <string name="user_add_user_message">Each user you add can go to their own space from the lock screen and perform most routine tasks such as installing, updating, or uninstalling apps. After you create a new user, that person needs to go through a setup process.</string>
+ <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+ <string name="user_add_user_message_long">You can share this device with other people by creating additional users. Each user has their own space, which they can customize with their own apps, wallpaper, and so on. Users can also adjust tablet settings like Wi-Fi that affect everyone.\n\nAfter you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users.</string>
+ <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+ <string name="user_add_user_message_short">After you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users.</string>
<!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
<string name="user_setup_dialog_title">Set up user now?</string>
<!-- Message in dialog to setup a new user after creation [CHAR LIMIT=none] -->