Additional checkin for bug 236933, Patch 5 - strings,

in order to improve the error messages on weak crypto sites.
ui-r=beltzner, r=rrelyea


git-svn-id: svn://10.0.0.236/trunk@201405 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kaie%kuix.de 2006-07-01 03:18:34 +00:00
parent 9f6ce4bc5f
commit 8d9678439d
2 changed files with 12 additions and 7 deletions

View File

@ -328,9 +328,12 @@ ForcedBackup3=To make a copy, click OK. If possible, you should save your backup
UnknownCertIssuer=(Unknown Issuer)
UnknownCertOrg=(Unknown Organization)
AVATemplate=%S = %S
SSLDisabled=You cannot connect to %S because SSL is disabled.
SSL2Disabled=You cannot connect to %S because SSL version 2 is disabled.
SSLNoMatchingCiphers=%S and %S cannot communicate securely because they have no common encryption algorithms.
#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.
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.
UsersCertRejected=Could not establish an encrypted connection because your certificate was rejected by %S. Error Code: %S.

View File

@ -542,14 +542,16 @@ nsHandleSSLError(nsNSSSocketInfo *socketInfo, PRInt32 err)
switch (err) {
case SSL_ERROR_SSL_DISABLED:
params[0] = hostNameU.get();
params[0] = brandShortName.get();
params[1] = hostNameU.get();
nssComponent->PIPBundleFormatStringFromName("SSLDisabled",
params, 1, formattedString);
params, 2, formattedString);
break;
case SSL_ERROR_SSL2_DISABLED:
params[0] = hostNameU.get();
params[0] = brandShortName.get();
params[1] = hostNameU.get();
nssComponent->PIPBundleFormatStringFromName("SSL2Disabled",
params, 1, formattedString);
params, 2, formattedString);
break;
case SSL_ERROR_EXPORT_ONLY_SERVER:
case SSL_ERROR_US_ONLY_SERVER: