summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-02 00:34:52 +0000
committerstevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-02 00:34:52 +0000
commit5c7fda6f9387e3291f7334d0330e2db326c7b6b7 (patch)
treee2281fa5c899f2f638f0af2435585f97a9d14029 /chrome/app
parentaf63cc8b232c56e9e7d86e65fa3d67b918036e8e (diff)
downloadchromium_src-5c7fda6f9387e3291f7334d0330e2db326c7b6b7.zip
chromium_src-5c7fda6f9387e3291f7334d0330e2db326c7b6b7.tar.gz
chromium_src-5c7fda6f9387e3291f7334d0330e2db326c7b6b7.tar.bz2
Replace WPA and RSN with PSK in Other Wi-Fi network UI.
BUG=chromium-os:13333 TEST=Network Menu > Other Wi-Fi Network > Security should have WEP and PSK. Both should still work. PSK should work for both RSN and WPA networks. Review URL: http://codereview.chromium.org/7107005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87557 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index d0842e4..5c320af 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -10568,20 +10568,14 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_HARDWARE_ADDRESS" desc="In settings Internet options, the label hardware address.">
Hardware address:
</message>
- <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_SELECT" desc="In settings Internet options, a string specifying the specific security.">
- Security: <ph name="security">$1<ex>None</ex></ph>
- </message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_NONE" desc="In settings Internet options, a string specifying security none.">
None
</message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WEP" desc="In settings Internet options, a string specifying security WEP.">
WEP
</message>
- <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_WPA" desc="In settings Internet options, a string specifying security WPA.">
- WPA
- </message>
- <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_RSN" desc="In settings Internet options, a string specifying security RSN.">
- RSN
+ <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SECURITY_PSK" desc="In settings Internet options, a string specifying security PSK (either WPA-PSK or RSN-PSK).">
+ PSK (WPA or RSN)
</message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSWORD" desc="In settings Internet options, a string telling the user where the network certificate is installed to.">
Password