diff options
| author | Russell Brenner <russellbrenner@google.com> | 2012-09-27 11:37:54 -0700 |
|---|---|---|
| committer | Russell Brenner <russellbrenner@google.com> | 2012-09-28 10:51:31 -0700 |
| commit | 88c9f2889fafb53a2875418317ecd197d9aae883 (patch) | |
| tree | 7d562909f864afd052910f66e6069aae70fa0852 /res/values | |
| parent | 990c5f2432add56ce6a32cb7c40c4c8bff1e8e5c (diff) | |
| download | packages_apps_Settings-88c9f2889fafb53a2875418317ecd197d9aae883.zip packages_apps_Settings-88c9f2889fafb53a2875418317ecd197d9aae883.tar.gz packages_apps_Settings-88c9f2889fafb53a2875418317ecd197d9aae883.tar.bz2 | |
Show warnings when skipping Wi-Fi connection
If user skips over Wi-Fi, warn about possible carrier data charges or
inability to receive updates, depending on whether or not phone
service is available.
Note to translators: Some strings are being moved here from setup
wizard. They're tagged with their msgid's so as not to trigger
retranslation.
Bug: 7211786
Change-Id: Idec7863377bd453d1808b26ee3da75f8310b32e0
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 106d507..8084a07 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1443,6 +1443,23 @@ <string name="wifi_failed_save_message">Failed to save network</string> <!-- Button label to dismiss the dialog --> <string name="wifi_cancel">Cancel</string> + <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] --> + <string name="wifi_skip_anyway" msgid="5205612884736051138">Skip anyway</string> + <!-- Button for going to the previous screen or step [CHAR LIMIT=20] --> + <string name="wifi_dont_skip">Don\'t skip</string> + + <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]--> + <string name="wifi_skipped_message" product="tablet" msgid="6518433975501257341">WARNING: You may incur extra carrier data charges.\n\nTablet setup can require significant network activity.</string> + <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]--> + <string name="wifi_skipped_message" product="default" msgid="4376150150678208848">WARNING: You may incur extra carrier data charges.\n\nPhone setup can require significant network activity.</string> + <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] --> + <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5647058314212144925">WARNING: The tablet won\'t be able to verify that your software is up to date.</string> + <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] --> + <string name="wifi_and_mobile_skipped_message" product="default" msgid="1288483646141987070">WARNING: The phone won\'t be able to verify that your software is up to date.</string> + <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] --> + <string name="wifi_connect_failed_message" product="tablet" msgid="2006689630582761529">The tablet was unable to connect to this Wi-Fi network.</string> + <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] --> + <string name="wifi_connect_failed_message" product="default" msgid="8220901976514642385">The phone was unable to connect to this Wi-Fi network.</string> <!-- Wi-Fi Advanced Settings --> <skip /> <!-- Wi-Fi settings screen, advanced, settings section. This is a header shown above advanced wifi settings. --> @@ -1490,7 +1507,6 @@ <!-- Hint text for network prefix length --> <string name="wifi_network_prefix_length_hint" translatable="false">24</string> - <!-- Wi-Fi p2p / Wi-Fi Direct settings --> <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] --> <string name="wifi_p2p_settings_title">Wi-Fi Direct</string> |