Bug 957918 - Port chat/ changes from Instantbird to comm-central - 7 - Bug 955720 - Fix up Yahoo strings, r=fqueze.
authorPatrick Cloke <clokep@gmail.com>
Wed, 04 Dec 2013 18:47:23 -0500
changeset 8128 9d197689352bdec14f4d5bdf0fceeeb79be3dd0c
parent 8127 15d9e344418fac92e2bcb629308bb7f5bdf3e757
child 8129 67192f92c58e9db6fc2821246fdb56284408b5fb
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
reviewersfqueze
bugs957918, 955720
Bug 957918 - Port chat/ changes from Instantbird to comm-central - 7 - Bug 955720 - Fix up Yahoo strings, r=fqueze. X-Channel-Repo: comm-central X-Channel-Converted-Revision: 1b7f677bf70461a992b1d364554b10276ee33afa
chat/yahoo.properties
--- a/chat/yahoo.properties
+++ b/chat/yahoo.properties
@@ -2,31 +2,29 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 login.error.badCredentials=Username or password is incorrect.
 login.error.accountLockedFailed=Account locked due to too many failed login attempts.
 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.
 system.message.conferenceLogon=%S has joined the conference.
 
 command.help.invite=/invite &lt;user1&gt;[,&lt;user2&gt;,...] [&lt;invite message&gt;]: invite one or more users into this conference chat.
 # LOCALIZATION NOTE (command.feedback.invite):
 #   %S is the user, or comma separated list of users, invited to the conference.