diff options
| author | Lucky Zhang <luckyzh@google.com> | 2014-11-21 23:13:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 23:13:37 +0000 |
| commit | 72c70cb0985e5bc9ca12cdb99940862ae8d42685 (patch) | |
| tree | 6fb0489260543c25f4c601be8e9194a6e8717ecc /res | |
| parent | a78fbb48ce6f7ee51a06181274524680e40f1c00 (diff) | |
| parent | d0d76e56af9c75b75d8f08c2ba77577e2745a382 (diff) | |
| download | packages_apps_Settings-72c70cb0985e5bc9ca12cdb99940862ae8d42685.zip packages_apps_Settings-72c70cb0985e5bc9ca12cdb99940862ae8d42685.tar.gz packages_apps_Settings-72c70cb0985e5bc9ca12cdb99940862ae8d42685.tar.bz2 | |
am d0d76e56: am 37c3cd63: am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev
* commit 'd0d76e56af9c75b75d8f08c2ba77577e2745a382':
[SetupWizard] Warn user of missing FRP if skipping wi-fi
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index f8cca08..79830bb 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1671,12 +1671,13 @@ <string name="wifi_skipped_message" product="device">WARNING: if you skip Wi\u2011Fi, your device will only use cellular data for initial downloads and updates. To avoid possible data charges, connect to Wi\u2011Fi.</string> <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]--> <string name="wifi_skipped_message" product="default">WARNING: if you skip Wi\u2011Fi, your phone will only use cellular data for initial downloads and updates. To avoid possible data charges, connect to Wi\u2011Fi.</string> + <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] --> - <string name="wifi_and_mobile_skipped_message" product="tablet">WARNING: If you skip Wi\u2011Fi, your tablet won\'t have an Internet connection to use for any initial downloads or updates.</string> + <string name="wifi_and_mobile_skipped_message" product="tablet">If you skip Wi\u2011Fi:\n\nYour tablet won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time.</string> <!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] --> - <string name="wifi_and_mobile_skipped_message" product="device">WARNING: If you skip Wi\u2011Fi, your device won\'t have an Internet connection to use for any initial downloads or updates.</string> + <string name="wifi_and_mobile_skipped_message" product="device">If you skip Wi\u2011Fi:\n\nYour device won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time.</string> <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] --> - <string name="wifi_and_mobile_skipped_message" product="default">WARNING: If you skip Wi\u2011Fi, your phone won\'t have an Internet connection to use for any initial downloads or updates.</string> + <string name="wifi_and_mobile_skipped_message" product="default">If you skip Wi\u2011Fi:\n\nYour phone won\'t have an Internet connection.\n\nYou won\'t get software updates until you connect to the Internet.\n\nYou can\'t activate device protection features at this time.</string> <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] --> <string name="wifi_connect_failed_message" product="tablet">The tablet was unable to connect to this Wi\u2011Fi network.</string> <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] --> |