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

Merge "Changed wifi status lines per UX consult"

Browse Source
This commit is contained in:
Irfan Sheriff
2011-08-16 20:48:45 -07:00
committed by Android (Google) Code Review
parent 38853a202f 8b2bf2e538
commit 40515882cd
5 changed files with 176 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/values/arrays.xml
View File

@@ -291,16 +291,27 @@
</string-array>
<!-- Match this with the constants in AccessPoint. --> <skip />
<!-- Wi-Fi settings. The type of security a Wi-Fi network has. -->
<!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
<string-array name="wifi_security">
<!-- The Wi-Fi network does not have any security. -->
<item>Open</item>
<item>@string/wifi_security_none</item>
<!-- Do not translate. -->
<item>WEP</item>
<item>@string/wifi_security_wep</item>
<!-- Do not translate. -->
<item>WPA/WPA2 PSK</item>
<item>@string/wifi_security_psk_generic</item>
<!-- Do not translate. -->
<item>802.1x EAP</item>
<item>@string/wifi_security_eap</item>
</string-array>
<!-- Match this with the constants in AccessPoint. --> <skip />
<!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
<string-array name="wifi_security_no_eap">
<!-- The Wi-Fi network does not have any security. -->
<item>@string/wifi_security_none</item>
<!-- Do not translate. -->
<item>@string/wifi_security_wep</item>
<!-- Do not translate. -->
<item>@string/wifi_security_psk_generic</item>
</string-array>
<!-- Wi-Fi AP settings. The type of security a Wi-Fi AP supports. -->

62
res/values/strings.xml
View File

@@ -1213,19 +1213,59 @@
<!-- Hint for unspecified fields -->
<string name="wifi_unspecified">(unspecified)</string>
<!-- Summary for the remembered network. -->
<string name="wifi_remembered">Remembered</string>
<!-- Summary for the disabled network. -->
<string name="wifi_disabled">Disabled</string>
<string name="wifi_remembered">Saved</string>
<!-- Status for networks disabled for unknown reason -->
<string name="wifi_disabled_generic">Disabled</string>
<!-- Status for networked disabled from a DNS or DHCP failure -->
<string name="wifi_disabled_network_failure">Avoided poor connection</string>
<!-- Status for networks disabled from authentication failure (wrong password
or certificate). -->
<string name="wifi_disabled_password_failure">Authentication problem</string>
<!-- Summary for the remembered network but currently not in range. -->
<string name="wifi_not_in_range">Not in range</string>
<!-- Summary for an open network with WPS being available [CHAR LIMIT=50]-->
<string name="wifi_open_with_wps">WPS available</string>
<!-- Summary for the secured network. -->
<string name="wifi_secured">Secured with <xliff:g id="wifi_security">%1$s</xliff:g></string>
<!-- Summary for the secured network with WPS being available [CHAR LIMIT=50]-->
<string name="wifi_secured_with_wps">Secured with <xliff:g id="wifi_security">%1$s</xliff:g> (WPS available)</string>
<!-- Summary for the secured and remembered network. Status can be "Remembered", "Disabled" or "Not in range". -->
<string name="wifi_secured_with_status"><xliff:g id="wifi_status">%2$s</xliff:g>, secured with <xliff:g id="wifi_security">%1$s</xliff:g></string>
<!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
string is listed first -->
<string name="wifi_wps_available_first_item">WPS available</string>
<!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
string is listed after a wifi_secured_* string-->
<string name="wifi_wps_available_second_item">\u0020(WPS available)</string>
<!-- Substring of wifi status for wifi with authentication. This version is for when the
string is first in the list (titlecase in english) -->
<string name="wifi_secured_first_item">Secured with <xliff:g id="wifi_security_short">%1$s</xliff:g></string>
<!-- Substring of wifi status for wifi with authentication. This version is for when the
string is not first in the list (lowercase in english) -->
<string name="wifi_secured_second_item">, secured with <xliff:g id="wifi_security_short">%1$s</xliff:g></string>
<!-- Do not translate. Concise terminology for wifi with WEP security -->
<string name="wifi_security_short_wep">WEP</string>
<!-- Do not translate. Concise terminology for wifi with WPA security -->
<string name="wifi_security_short_wpa">WPA</string>
<!-- Do not translate. Concise terminology for wifi with WPA2 security -->
<string name="wifi_security_short_wpa2">WPA2</string>
<!-- Do not translate. Concise terminology for wifi with both WPA/WPA2 security -->
<string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
<!-- Do not translate. Concise terminology for wifi with unknown PSK type -->
<string name="wifi_security_short_psk_generic">@string/wifi_security_short_wpa_wpa2</string>
<!-- Do not translate. Concise terminology for wifi with 802.1x EAP security -->
<string name="wifi_security_short_eap">802.1x</string>
<!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
<string name="wifi_security_none">None</string>
<!-- Do not translate. Terminology for wifi with WEP security -->
<string name="wifi_security_wep">WEP</string>
<!-- Do not translate. Terminology for wifi with WPA security -->
<string name="wifi_security_wpa">WPA PSK</string>
<!-- Do not translate. Terminology for wifi with WPA2 security -->
<string name="wifi_security_wpa2">WPA2 PSK</string>
<!-- Do not translate. Terminology for wifi with both WPA/WPA2 security, or unknown -->
<string name="wifi_security_wpa_wpa2">WPA/WPA2 PSK</string>
<!-- Do not translate. Terminology for wifi with unknown PSK type -->
<string name="wifi_security_psk_generic">@string/wifi_security_wpa_wpa2</string>
<!-- Do not translate. Concise terminology for wifi with 802.1x EAP security -->
<string name="wifi_security_eap">802.1x EAP</string>
<!-- Button label to connect to a Wi-Fi network -->
<string name="wifi_connect">Connect</string>
<!-- Button label to delete a Wi-Fi network -->