Bug 812921 - Land in comm-central Instantbird's changes to chat/ - 4 - Bio 1727 - Separate strings for channel and user mode system messages, r=clokep.

chat/locales/en-US/irc.properties

@@ -84,9 +84,11 @@ message.kicked.you=You have been kicked by %1$S%2$S.
 message.kicked=%1$S has been kicked by %2$S%3$S.
 #    %S is the kick message
 message.kicked.reason=: %S
-#    %1$S is the nickname of the user or the channel name whose mode was
-#    changed, %2$S is the new mode and %3$S is who set the mode.
-message.mode=mode (%1$S %2$S) by %3$S.
+#    %1$S is the new mode, %2$S is the nickname of the user whose mode
+#    was changed, and %3$S is who set the mode.
+message.usermode=Mode %1$S for %2$S set by %3$S.
+#    %1$S is the new channel mode and %2$S is who set the mode.
+message.channelmode=Channel mode %1$S set by %2$S.
 #    %1$S is the old nick and %2$S is the new nick.
 message.nick=%1$S is now known as %2$S.
 #    %S is your new nick.

chat/protocols/irc/irc.js

@@ -440,7 +440,7 @@ ircChannel.prototype = {
     _setMode.call(this, addNewMode, channelModes);
 
     // Notify the UI of changes.
-    msg = _("message.mode", this.name, aNewMode[0] + channelModes.join(""),
+    msg = _("message.channelmode", aNewMode[0] + channelModes.join(""),
             aSetter);
     this.writeMessage(aSetter, msg, {system: true});
     this.checkTopicSettable();
@@ -509,8 +509,8 @@ ircParticipant.prototype = {
     _setMode.call(this, aAddNewMode, aNewModes);
 
     // Notify the UI of changes.
-    let msg = _("message.mode", this.name,
-                (aAddNewMode ? "+" : "-") + aNewModes.join(""), aSetter);
+    let msg = _("message.usermode", (aAddNewMode ? "+" : "-") + aNewModes.join(""),
+                this.name, aSetter);
     this._conv.writeMessage(aSetter, msg, {system: true});
     this._conv.notifyObservers(this, "chat-buddy-update");