PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop hijacking strings from Setup Wizard"

Browse Source
This commit is contained in:
Russell Brenner
2013-01-17 18:05:43 +00:00
committed by Android (Google) Code Review
parent f3e6c611be a70688feac
commit 7961b05e58
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -1445,22 +1445,22 @@
<!-- Button label to dismiss the dialog --> <!-- Button label to dismiss the dialog -->
<string name="wifi_cancel">Cancel</string> <string name="wifi_cancel">Cancel</string>
<!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] --> <!-- 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> <string name="wifi_skip_anyway">Skip anyway</string>
<!-- Button for going to the previous screen or step [CHAR LIMIT=20] --> <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
<string name="wifi_dont_skip">Don\'t skip</string> <string name="wifi_dont_skip">Don\'t skip</string>
<!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]--> <!-- 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> <string name="wifi_skipped_message" product="tablet">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]--> <!-- 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> <string name="wifi_skipped_message" product="default">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] --> <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
<string name="wifi_and_mobile_skipped_message" product="tablet">WARNING: Until you have an internet connection, the tablet won\'t be able to verify that your software is up to date.</string> <string name="wifi_and_mobile_skipped_message" product="tablet">WARNING: Until you have an internet connection, 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] --> <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
<string name="wifi_and_mobile_skipped_message" product="default">WARNING: Until you have an internet connection, the phone won\'t be able to verify that your software is up to date.</string> <string name="wifi_and_mobile_skipped_message" product="default">WARNING: Until you have an internet connection, 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] --> <!-- 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> <string name="wifi_connect_failed_message" product="tablet">The tablet was unable to connect to this Wi-Fi network.</string>
<!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] --> <!-- 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> <string name="wifi_connect_failed_message" product="default">The phone was unable to connect to this Wi-Fi network.</string>
<!-- Wi-Fi Advanced Settings --> <skip /> <!-- Wi-Fi Advanced Settings --> <skip />
<!-- Wi-Fi settings screen, advanced, settings section. This is a header shown above advanced wifi settings. --> <!-- Wi-Fi settings screen, advanced, settings section. This is a header shown above advanced wifi settings. -->