Bug 957918 - Port chat/ changes from Instantbird to comm-central - 7 - Bug 955720 - Fix up Yahoo strings, r=fqueze.

chat/locales/en-US/yahoo.properties

@@ -7,21 +7,19 @@ login.error.accountLockedFailed=Account locked due to too many failed login atte
 login.error.accountLockedGeneral=Account locked due to too many login attempts.
 login.error.accountDeactivated=Account has been deactivated.
 login.error.usernameNotExist=The username does not exist.
-login.error.unknown=Unknown Error %S
-
+# The %S will be an error code returned by the server.
+login.error.unknown=Unknown error: %S
 network.error.http=HTTP connection error.
 
 conference.invite.message=Join my conference.
 
 # Some options are commented out because they aren't used. We do the same thing
 # to their description strings.
-options.pagerPort=Pager port
+options.pagerPort=Port
 options.transferHost=File transfer server
 options.transferPort=File transfer port
-#options.chatLocale=Chat room locale
 options.chatEncoding=Encoding
 options.ignoreInvites=Ignore conference invitations
-#options.proxySSL=Use account proxy for HTTP and HTTPS connections
 
 # In this message, %S is replaced with the username of the user who left.
 system.message.conferenceLogoff=%S has left the conference.

chat/protocols/yahoo/yahoo-session.jsm

@@ -584,7 +584,7 @@ YahooLoginHelper.prototype = {
 
   _onHttpError: function(aError, aStatusText, aXHR) {
     this._session.onSessionError(Ci.prplIAccount.NETWORK_ERROR,
-                               _("network.error.http"));
+                                 _("network.error.http"));
   },
 
   // HTTP Response Callbacks.

chat/protocols/yahoo/yahoo.js

@@ -530,12 +530,10 @@ YahooProtocol.prototype = {
   get iconBaseURI() "chrome://prpl-yahoo/skin/",
   options: {
     port: {get label() _("options.pagerPort"), default: 5050},
-    xfer_host: {get label() _("options.transferHost"), default: "filetransfer.msg.yahoo.com"},
-    xfer_port: {get label() _("options.transferPort"), default: 80},
-    //room_list_locale: {get label() _("options.chatLocale"), default: "us"},
+    //xfer_host: {get label() _("options.transferHost"), default: "filetransfer.msg.yahoo.com"},
+    //xfer_port: {get label() _("options.transferPort"), default: 80},
     local_charset: {get label() _("options.chatEncoding"), default: "UTF-8"},
     ignore_invites: {get label() _("options.ignoreInvites"), default: false}
-    //proxy_ssl: {get label() _("options.proxySSL"), default: false}
   },
   commands: [
     {