diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-08-19 16:04:44 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-19 16:04:44 -0700 |
| commit | 905e2864eb196cfd70d498a941318297fcfbdc1e (patch) | |
| tree | 97c3c7f837c168ed3b52dfc717258647df1c9d81 /res/values | |
| parent | 154305019c83fea91460c3d10a4a25793b5fc6f3 (diff) | |
| parent | d621e0930032e06de37fe3b76c6c373a2d64547a (diff) | |
| download | packages_apps_Settings-905e2864eb196cfd70d498a941318297fcfbdc1e.tar.gz packages_apps_Settings-905e2864eb196cfd70d498a941318297fcfbdc1e.tar.bz2 packages_apps_Settings-905e2864eb196cfd70d498a941318297fcfbdc1e.zip | |
Merge "Changing wifi connection dialog per UX"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/arrays.xml | 8 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 7bb93bd45..9a8484525 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -457,13 +457,13 @@ <!-- Note that adding/removing/moving items will need wifi settings code change. --> <string-array name="wifi_network_setup"> <!-- Manual wifi configuration [CHAR LIMIT=25]--> - <item>Manual</item> + <item>Off</item> <!-- WPS is a new standard that allowes secure connection establishment to a home wireless network using a simplified process. WPS push button based configuration involves pushing a button on the router and the device [CHAR LIMIT=25]--> - <item>WPS push button</item> + <item>Push button</item> <!-- WPS pin method based configuration. This requires entering a pin obtained from the access point [CHAR LIMIT=25] --> - <item>WPS pin from access point</item> + <item>Pin from access point</item> <!-- WPS pin method based configuration. This requires generating a pin from this device [CHAR LIMIT=25] --> - <item>WPS pin from this device</item> + <item>Pin from this device</item> </string-array> <!-- Wi-Fi IP settings. --> diff --git a/res/values/strings.xml b/res/values/strings.xml index eb1fe351c..8b305370f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1164,8 +1164,10 @@ <string name="wifi_empty_list_wifi_off">To see available networks, turn Wi-Fi on.</string> <!-- Dialog for Access Points --> <skip /> + <!-- Label to show/hide advanced options --> + <string name="wifi_show_advanced">Show advanced options</string> <!-- Label for network setup [CHAR LIMIT=50] --> - <string name="wifi_network_setup">Network Setup</string> + <string name="wifi_network_setup">WPS</string> <!-- Label for the text view for WPS pin input [CHAR LIMIT=50] --> <string name="wifi_wps_pin">Enter pin from access point</string> <!-- Title for the WPS setup dialog [CHAR LIMIT=50] --> |