diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-05 20:53:02 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-05 20:53:03 -0700 |
| commit | 0b146b238496fdb36ad575f9a0b96dc43f812aa3 (patch) | |
| tree | 948b5a9b99cec0dfb3bc680bbb2bd8e8026f26dc /res | |
| parent | 1f9a07b5e9b1868fc6741c99e74970aa0e9762fe (diff) | |
| parent | 21c2904ba32b33e5a43d33b9c46abc3ce9d6bbb0 (diff) | |
| download | packages_apps_settings-0b146b238496fdb36ad575f9a0b96dc43f812aa3.zip packages_apps_settings-0b146b238496fdb36ad575f9a0b96dc43f812aa3.tar.gz packages_apps_settings-0b146b238496fdb36ad575f9a0b96dc43f812aa3.tar.bz2 | |
Merge "Revert "Show warning dialog in a multiuser system when adding a new account."" into jb-mr1-dev
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 1343b67..853c273 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3765,10 +3765,7 @@ <string name="background_data_dialog_message">Disabling background data extends battery life and lowers data use. Some apps may still use the background data connection.</string> <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] --> <string name="sync_automatically">Auto-sync app data</string> - <!-- Account creation warning in multi-user tablets [CHAR LIMIT=none] --> - <string name="add_account_shared_system_warning" product="tablet">Reminder: As with any shared computer, there is some risk that other users may find a way to access your data on this tablet.</string> - <!-- Account creation warning in multi-user phones[CHAR LIMIT=none] --> - <string name="add_account_shared_system_warning" product="default">Reminder: As with any shared computer, there is some risk that other users may find a way to access your data on this phone.</string> + <!-- Sync status messages on Accounts & Synchronization settings --><skip /> <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] --> <string name="sync_enabled">Sync is ON</string> |