Replace WPA and RSN with PSK in Other Wi-Fi network UI.

chrome/app/generated_resources.grd

Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1851bc197ca8e7e15d6df78bc0e5f800f90d4d04..af1dff0c01e835054b64437207c39d7846b4c77c 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -10586,6 +10586,9 @@ 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_SECURITY_RSN" desc="In settings Internet options, a string specifying security RSN.">
         RSN
       </message>
+      <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)

[James Cook, 2011/06/01 23:24:22]

End-user documentation about Wi-Fi security often refers to "WPA" or "WPA2" as a
choice when connecting to a network.  I think it would be a good idea to have an
item in the menu labeled "WPA" or "WPA-PSK".  Regardless of how it's implemented
under the hood, end users are going to look for matching strings.  Are you sure
these options need to be collapsed together?

For example, here's what Netgear's Wi-Fi router config page looks like:
http://support.netgear.com/app/answers/detail/a_id/112

[stevenjb, 2011/06/01 23:34:37]

Sam and I went back and forth on this. It's confusing any way you do it. If we
have "WPA" and "PSK" and the user is looking for "WPA-PSK" that's also
confusing.

We ended up with one entry that includes "PSK", "WPA", and "RSN", so hopefully
anyone setting up a hidden network will recognize one of those and choose that
option.

It is entirely possible that we will iterate on this based on feedback.

+      </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
       </message>