bug 236933, add on patch to address l10n review comments, renames string ids

r=l10n

security/manager/locales/en-US/chrome/pipnss/pipnss.properties

@@ -330,9 +330,9 @@ UnknownCertOrg=(Unknown Organization)
 AVATemplate=%S = %S
 
 #for the next 3 lines, %1$S will be product name (e.g. Firefox), %2$S will be the www.example.com address we connect to
-SSLDisabled=%1$S can't connect securely to %2$S because the SSL protocol has been disabled.
-SSL2Disabled=%1$S can't connect securely to %2$S because the site uses an older, insecure version of the SSL protocol.
-SSLNoMatchingCiphers=%1$S can't connect securely to %2$S because the site uses a security protocol which isn't enabled.
+SSL_Disabled=%1$S can't connect securely to %2$S because the SSL protocol has been disabled.
+SSL2_Disabled=%1$S can't connect securely to %2$S because the site uses an older, insecure version of the SSL protocol.
+SSL_NoMatchingCiphers=%1$S can't connect securely to %2$S because the site uses a security protocol which isn't enabled.
 
 UsersCertRevoked=Could not establish an encrypted connection with %S because your certificate has been revoked.
 UsersCertExpired=Could not establish an encrypted connection with %S because your certificate is expired.

security/manager/ssl/src/nsNSSIOLayer.cpp

@@ -544,13 +544,13 @@ nsHandleSSLError(nsNSSSocketInfo *socketInfo, PRInt32 err)
   case SSL_ERROR_SSL_DISABLED:
     params[0] = brandShortName.get();
     params[1] = hostNameU.get();
-    nssComponent->PIPBundleFormatStringFromName("SSLDisabled",
+    nssComponent->PIPBundleFormatStringFromName("SSL_Disabled",
                                                 params, 2, formattedString);
     break;
   case SSL_ERROR_SSL2_DISABLED:
     params[0] = brandShortName.get();
     params[1] = hostNameU.get();
-    nssComponent->PIPBundleFormatStringFromName("SSL2Disabled",
+    nssComponent->PIPBundleFormatStringFromName("SSL2_Disabled",
                                                 params, 2, formattedString);
     break;
   case SSL_ERROR_EXPORT_ONLY_SERVER:
@@ -562,7 +562,7 @@ nsHandleSSLError(nsNSSSocketInfo *socketInfo, PRInt32 err)
   case SSL_ERROR_FORTEZZA_PQG:
     params[0] = brandShortName.get();
     params[1] = hostNameU.get();
-    nssComponent->PIPBundleFormatStringFromName("SSLNoMatchingCiphers",
+    nssComponent->PIPBundleFormatStringFromName("SSL_NoMatchingCiphers",
                                                 params, 2, formattedString);
                                                   
     break;