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

chrome/app/generated_resources.grd

 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
 This file contains definitions of resources that will be translated for each
 locale. OS values are passed through from Python's sys.platform:
 
   win32 - Windows
   darwin - Mac
   linux2 - Linux (both Views and GTK+)
 
@@ skipping 10562 matching lines @@
       </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.">

[Charlie Lee, 2011/06/01 23:03:06]

delete wpa and rsn?

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

Done.

         WPA
       </message>
       <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>
       <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SSID" desc="In settings Internet options, a string telling the user where the network certificate is installed to.">
         SSID
       </message>
       <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SHOWPASSWORD" desc="In settings Internet options, a string telling the user where the network certificate is installed to.">
         Show password
       </message>
       <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_STATUS_TITLE" desc="In settings Internet options, Title of the overlay when the user is connected.">
@@ skipping 2047 matching lines @@
     </includes>
     <structures fallback_to_english="true">
       <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type="dialog" >
       </structure>
       <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" type="dialog" >
       </structure>
     </structures>
 
   </release>
 </grit>