Adding upstream version 86.0.1.upstream/86.0.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

16 files changed, 929 insertions, 0 deletions

diff --git a/l10n-zh-CN/chat/accounts.dtd b/l10n-zh-CN/chat/accounts.dtd
new file mode 100644
index 0000000000..9b1a6d429b
--- /dev/null
+++ b/l10n-zh-CN/chat/accounts.dtd
@@ -0,0 +1,41 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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/. -->
+
+<!-- Account manager window for Instantbird -->
+<!ENTITY accounts.title                      "账号 - &brandShortName;">
+<!ENTITY accountManager.width                "450">
+<!-- Instant messaging account status window for Thunderbird -->
+<!ENTITY accountsWindow.title                "即时通信状态">
+<!ENTITY accountsWindow2.style               "width: 41em; height: 27em;">
+
+<!ENTITY accountManager.newAccount.label     "新账号">
+<!ENTITY accountManager.newAccount.accesskey "N">
+<!ENTITY accountManager.close.label          "关闭">
+<!ENTITY accountManager.close.accesskey      "l">
+<!-- This should match account.commandkey in instantbird.dtd -->
+<!ENTITY accountManager.close.commandkey     "a">
+<!-- This title must be short, displayed with a big font size -->
+<!ENTITY accountManager.noAccount.title      "还没有配置账号">
+<!ENTITY accountManager.noAccount.description "点击 &accountManager.newAccount.label; 按钮让 &brandShortName; 指导您的配置过程。">
+<!ENTITY account.autoSignOn.label     "启动时登录">
+<!ENTITY account.autoSignOn.accesskey "S">
+<!ENTITY account.connect.label        "连接">
+<!ENTITY account.connect.accesskey    "o">
+<!ENTITY account.disconnect.label     "断开">
+<!ENTITY account.disconnect.accesskey "i">
+<!ENTITY account.delete.label         "删除">
+<!ENTITY account.delete.accesskey     "D">
+<!ENTITY account.edit.label           "属性">
+<!ENTITY account.edit.accesskey       "P">
+<!ENTITY account.moveup.label         "上移">
+<!ENTITY account.movedown.label       "下移">
+<!ENTITY account.cancelReconnection.label         "取消重新连接">
+<!ENTITY account.cancelReconnection.accesskey     "A">
+<!ENTITY account.copyDebugLog.label     "复制调试日志">
+<!ENTITY account.copyDebugLog.accesskey "C">
+<!ENTITY account.showDebugLog.label     "显示调试日志">
+<!ENTITY account.showDebugLog.accesskey "H">
+<!ENTITY account.connecting           "正在连接…">
+<!ENTITY account.disconnecting        "正在断开…">
+<!ENTITY account.disconnected         "未连接">
diff --git a/l10n-zh-CN/chat/accounts.properties b/l10n-zh-CN/chat/accounts.properties
new file mode 100755
index 0000000000..67dd5e8beb
--- /dev/null
+++ b/l10n-zh-CN/chat/accounts.properties
@@ -0,0 +1,9 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (passwordPromptTitle, passwordPromptText):
+# %S is replaced with the name of the account
+passwordPromptTitle=%S 的密码
+passwordPromptText=请输入 %S 的密码以供连接。
+passwordPromptSaveCheckbox=使用密码管理器来记住这个密码。
diff --git a/l10n-zh-CN/chat/commands.properties b/l10n-zh-CN/chat/commands.properties
new file mode 100755
index 0000000000..92025fde28
--- /dev/null
+++ b/l10n-zh-CN/chat/commands.properties
@@ -0,0 +1,27 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (commands):
+#  %S is a comma separated list of command names.
+commands=命令: %S.\n使用 /help &lt;命令&gt;了解更多信息。
+# LOCALIZATION NOTE (noCommand, noHelp):
+#  %S is the command name the user typed.
+noCommand=没有“%S”命令。
+noHelp=抱歉，“%S”没有帮助信息。
+
+sayHelpString=say &lt;信息&gt;: 发送一条单纯的信息而不进行命令处理。
+rawHelpString=raw &lt;信息&gt;: 发送一条未进行 HTML 项目转义的信息。
+helpHelpString=help &lt;名称&gt;: 显示命令 &lt;命令名称&gt; 的帮助信息，如果不带参数使用，则显示可用的命令列表。
+
+# LOCALIZATION NOTE (statusCommand):
+#  %1$S is replaced with a status command name
+#   (one of "back", "away", "busy", "dnd", or "offline").
+#  %2$S is replaced with the localized version of that status type
+#   (one of the 5 strings below).
+statusCommand=%1$S &lt;状态信息&gt;: 用一个可选的状态信息将状态设置为 %2$S 。
+back=有空
+away=离开
+busy=忙碌
+dnd=忙碌
+offline=离线
diff --git a/l10n-zh-CN/chat/contacts.properties b/l10n-zh-CN/chat/contacts.properties
new file mode 100755
index 0000000000..ae848468f9
--- /dev/null
+++ b/l10n-zh-CN/chat/contacts.properties
@@ -0,0 +1,8 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (defaultGroup):
+# This is the name of the group that will automatically be created when adding a
+# buddy without specifying a group.
+defaultGroup=联系人
diff --git a/l10n-zh-CN/chat/conversations.properties b/l10n-zh-CN/chat/conversations.properties
new file mode 100755
index 0000000000..c404678a1e
--- /dev/null
+++ b/l10n-zh-CN/chat/conversations.properties
@@ -0,0 +1,85 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (targetChanged):
+#  %1$S is the new conversation title (display name of the new target),
+#  %2$S is the protocol name used for the new target.
+targetChanged=将会继续 %1$S 的会话，使用 %2$S 。
+
+# LOCALIZATION NOTE (statusChanged):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+statusChanged=%1$S 现在处于 %2$S 。
+# LOCALIZATION NOTE (statusChangedWithStatusText):
+#  %1$S is the display name of the contact.
+#  %2$S is the new status type (a value from status.properties).
+#  %3$S is the status text (eg. "I'm currently away from the computer").
+statusChangedWithStatusText=%1$S 现在处于 %2$S：%3$S 。
+# LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]):
+#  special case of the previous 2 strings for when the status was
+#  previously unknown. These 2 strings should not mislead the user
+#  into thinking the person's status has just changed.
+statusChangedFromUnknown=%1$S 正处于 %2$S 。
+statusChangedFromUnknownWithStatusText=%1$S 正处于 %2$S: %3$S.
+# LOCALIZATION NOTE (statusKnown[WithStatusText]):
+# special case of the previous 2 strings for when an account has just
+# been reconnected, so the status is now known. These 2 strings should not
+# mislead the user into thinking the person's status has just changed.
+statusKnown=你的账户已经重新连接（%1$S %2$S）。
+statusKnownWithStatusText=你的账户已经重新连接（%1$S %2$S：%3$S）。
+# LOCALIZATION NOTE (statusUnknown):
+#  %S is the display name of the contact.
+statusUnknown=您的账户已离线（无法得知 %S 的状态）。
+
+accountDisconnected=您的账户已离线。
+accountReconnected=你的账户已经重新连接。
+
+# LOCALIZATION NOTE (autoReply):
+#  %S is replaced by the text of a message that was sent as an automatic reply.
+autoReply=自动回复 - %S
+
+# LOCALIZATION NOTE (noTopic):
+# Displayed instead of the topic when no topic is set.
+noTopic=这个房间没有主题信息。
+
+# LOCALIZATION NOTE (topicSet):
+#  %1$S is the conversation name, %2$S is the topic.
+topicSet=%1$S 的话题为：%2$S。
+# LOCALIZATION NOTE (topicNotSet):
+#  %S is the conversation name.
+topicNotSet=没有 %S 相关的话题。
+# LOCALIZATION NOTE (topicChanged):
+#  %1$S is the user who changed the topic, %2$S is the new topic.
+topicChanged=%1$S 已将话题变更为：%2$S。
+# LOCALIZATION NOTE (topicCleared):
+#  %1$S is the user who cleared the topic.
+topicCleared=%1$S 已清除话题。
+
+# LOCALIZATION NOTE (nickSet):
+#   This is displayed as a system message when a participant changes his/her
+#   nickname in a conversation.
+#   %1$S is the old nick.
+#   %2$S is the new nick.
+nickSet=%1$S 现在的名字是 %2$S。
+# LOCALIZATION NOTE (nickSet.you):
+#   This is displayed as a system message when your nickname is changed.
+#   %S is your new nick.
+nickSet.you=您现在的名字是 %S。
+
+# LOCALIZATION NOTE (messenger.conversations.selections.ellipsis):
+#  ellipsis is used when copying a part of a message to show that the message was cut
+messenger.conversations.selections.ellipsis=[…]
+
+# LOCALIZATION NOTE (messenger.conversations.selections.{system,content,action}MessagesTemplate):
+#  These 3 templates are used to format selected messages before copying them.
+#  Do not translate the texts between % characters, but feel free to adjust
+#  whitespace and separators to make them fit your locale.
+messenger.conversations.selections.systemMessagesTemplate=%time% - %message%
+messenger.conversations.selections.contentMessagesTemplate=%time% - %sender%: %message%
+messenger.conversations.selections.actionMessagesTemplate=%time% * %sender% %message%
+
+# LOCALIZATION NOTE (message.status):
+#  This is used as title attribute for the visible lock icon in case a message
+#  was sent encrypted through the OTR protocol.
+message.status=消息已加密
diff --git a/l10n-zh-CN/chat/dateFormat.properties b/l10n-zh-CN/chat/dateFormat.properties
new file mode 100644
index 0000000000..bf5cc310ac
--- /dev/null
+++ b/l10n-zh-CN/chat/dateFormat.properties
@@ -0,0 +1,62 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+month.1.Mmm=1月
+month.2.Mmm=2月
+month.3.Mmm=3月
+month.4.Mmm=4月
+month.5.Mmm=5月
+month.6.Mmm=6月
+month.7.Mmm=7月
+month.8.Mmm=8月
+month.9.Mmm=9月
+month.10.Mmm=10月
+month.11.Mmm=11月
+month.12.Mmm=12月
+
+month.1.name=一月
+month.2.name=二月
+month.3.name=三月
+month.4.name=四月
+month.5.name=五月
+month.6.name=六月
+month.7.name=七月
+month.8.name=八月
+month.9.name=九月
+month.10.name=十月
+month.11.name=十一月
+month.12.name=十二月
+
+day.1.name=星期日
+day.2.name=星期一
+day.3.name=星期二
+day.4.name=星期三
+day.5.name=星期四
+day.6.name=星期五
+day.7.name=星期六
+
+day.1.Mmm=周日
+day.2.Mmm=周一
+day.3.Mmm=周二
+day.4.Mmm=周三
+day.5.Mmm=周四
+day.6.Mmm=周五
+day.7.Mmm=周六
+
+day.1.short=日
+day.2.short=一
+day.3.short=二
+day.4.short=三
+day.5.short=四
+day.6.short=五
+day.7.short=六
+
+noon=中午
+midnight=深夜
+
+AllDay=全天
+
+# LOCALIZATION NOTE (finduri-MonthYear):
+# %1$S is the month name, %2$S is the year (4 digits format).
+finduri-MonthYear=%2$S年%1$S
diff --git a/l10n-zh-CN/chat/facebook.properties b/l10n-zh-CN/chat/facebook.properties
new file mode 100755
index 0000000000..825cb87754
--- /dev/null
+++ b/l10n-zh-CN/chat/facebook.properties
@@ -0,0 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+facebook.chat.name=Facebook 聊天
+facebook.disabled=Facebook Chat 已不再支持，因为 Facebook 禁用了它们的 XMPP 网关。
diff --git a/l10n-zh-CN/chat/imtooltip.properties b/l10n-zh-CN/chat/imtooltip.properties
new file mode 100755
index 0000000000..0686372615
--- /dev/null
+++ b/l10n-zh-CN/chat/imtooltip.properties
@@ -0,0 +1,10 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+buddy.username=用户名
+buddy.account=账户
+contact.tags=标签
+
+otr.tag=OTR 状态
+message.status=消息已加密
diff --git a/l10n-zh-CN/chat/irc.properties b/l10n-zh-CN/chat/irc.properties
new file mode 100755
index 0000000000..8c2eb1b8dd
--- /dev/null
+++ b/l10n-zh-CN/chat/irc.properties
@@ -0,0 +1,209 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (irc.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring an IRC account.
+irc.usernameHint=昵称
+
+# LOCALIZATION NOTE (connection.error.*):
+#   These will show in the account manager if the account is
+#   disconnected because of an error.
+connection.error.lost=失去了与服务器的连接
+connection.error.timeOut=连接超时
+connection.error.invalidUsername=%S 是不允许使用的昵称。
+connection.error.invalidPassword=无效的服务器密码
+connection.error.passwordRequired=需要密码
+
+# LOCALIZATION NOTE (joinChat.*):
+#   These show up on the join chat menu. An underscore is for the access key.
+joinChat.channel=频道
+joinChat.password=密码
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.server=服务器
+options.port=端口
+options.ssl=使用 SSL
+options.encoding=字符集
+options.quitMessage=退出消息
+options.partMessage=离开消息
+options.showServerTab=显示来自服务器的消息
+options.alternateNicks=备用昵称
+
+# LOCALIZATION NOTE (ctcp.version):
+#   %1$S is the nickname of the user whose version was requested.
+#   %2$S is the version response from the client.
+ctcp.version=%1$S 使用“%2$S”
+# LOCALIZATION NOTE (ctcp.time):
+#   %1$S is the nickname of the user whose time was requested.
+#   %2$S is the time response.
+ctcp.time=%1$S 的时间为 %2$S 。
+
+# LOCALZIATION NOTE (command.*):
+#   These are the help messages for each command, the %S is the command name
+#   Each command first gives the parameter it accepts and then a description of
+#   the command.
+command.action=%S &lt;要执行的动作&gt;:执行一个动作。
+command.ban=%S &lt;nick!user@host&gt;：封禁符合指定模式的用户。
+command.ctcp=%S &lt;昵称&gt; &lt;消息&gt;：发送 CTCP 消息至昵称。
+command.chanserv=%S &lt;命令&gt;：发送命令至 ChanServ。
+command.deop=%S &lt;昵称1&gt;[,&lt;昵称2&gt;]*：移除某人的频道操作员状态。您必须为频道操作员才能这么做。
+command.devoice=%S &lt;昵称1&gt;[,&lt;昵称2&gt;]*：把某人的频道发言状态移除，用于阻止被主持(+m)频道中的某人说话。您必须为频道操作员才能这么做。
+command.invite2=%S &lt;nick&gt;[ &lt;nick&gt;]* [&lt;channel&gt;]: 用昵称邀请一个或者多个用户加入你当前所在频道，或者加入指定频道。
+command.join=%S &lt;房间1&gt;[,&lt;房间2&gt;]* [&lt;密钥1&gt;[,&lt;密钥2&gt;]*]：进入一个或者多个频道，可根据需要为每个房间提供频道密钥。
+command.kick=%S &lt;昵称&gt; [&lt;消息&gt;]：将某人从一个频道移除。您必须是频道操作员才能这么做。
+command.list=%S：显示网络的聊天室列表。警告，某些服务器可能会因此断开与您的连接。
+command.memoserv=%S &lt;命令&gt;：发送命令至 MemoServ。
+command.modeUser2=%S &lt;nick&gt; [(+|-)&lt;模式&gt;]：获取、设置或取消用户的模式。
+command.modeChannel2=%S [&lt;channel&gt;] [(+|-)&lt;新模式&gt; [&lt;参数&gt;][,&lt;参数&gt;]*]：获取、设置或取消频道模式。
+command.msg=%S &lt;昵称&gt; &lt;消息&gt;：发送私信至用户（相对于频道而言）。
+command.nick=%S &lt;新昵称&gt;：更改您的昵称。
+command.nickserv=%S &lt;命令&gt;：发送命令至 NickServ。
+command.notice=%S &lt;目标&gt; &lt;消息&gt;：发送通知至用户或频道。
+command.op=%S &lt;昵称1&gt;[,&lt;昵称2&gt;]*：授权某人为频道操作员。您必须是频道操作员才能这么做。
+command.operserv=%S &lt;命令&gt;：发送命令至 OperServ。
+command.part=%S [消息]：离开当前频道并留下消息（可选）。
+command.ping=%S [&lt;昵称&gt;]：询问用户（或者服务器-不指定的话）的延时。
+command.quit=%S &lt;消息&gt;：从服务器断开，并留下（可选）消息。
+command.quote=%S &lt;命令&gt;：向服务器发送一条原始命令。
+command.time=%S：显示当前 IRC 服务器的当地时间。
+command.topic=%S [&lt;新话题&gt;]：查看或者更改频道话题。
+command.umode=%S (+|-)&lt;新模式&gt;：设置或取消一个用户模式。
+command.version=%S &lt;昵称&gt;：请求用户客户端的版本信息。
+command.voice=%S &lt;昵称1&gt;[,&lt;昵称2&gt;]*：授权某人以频道发言状态。您必须为频道操作员才能这么做。
+command.whois2=%S [&lt;昵称&gt;]: 获取一个用户的信息。
+
+# LOCALIZATION NOTE (message.*):
+#    These are shown as system messages in the conversation.
+#    %1$S is the nick and %2$S is the nick and host of the user who joined.
+message.join=%1$S [%2$S] 进入了房间。
+message.rejoined=你已重新加入房间。
+#    %1$S is the nick of who kicked you.
+#    %2$S is message.kicked.reason, if a kick message was given.
+message.kicked.you=您被 %1$S%2$S 踢出了房间。
+#    %1$S is the nick that is kicked, %2$S the nick of the person who kicked
+#    %1$S. %3$S is message.kicked.reason, if a kick message was given.
+message.kicked=%1$S 被 %2$S%3$S 踢出了房间。
+#    %S is the kick message
+message.kicked.reason=: %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=%3$S 为 %2$S 设置了模式 %1$S 。
+#    %1$S is the new channel mode and %2$S is who set the mode.
+message.channelmode=%2$S 设置了频道模式 %1$S 。
+#    %S is the user's mode.
+message.yourmode=您的模式是 %S。
+#    Could not change the nickname. %S is the user's nick.
+message.nick.fail=无法使用指定的昵称。你的昵称依然是 %S 。
+#    The parameter is the message.parted.reason, if a part message is given.
+message.parted.you=您已离开房间 (离开%1$S)。
+#    %1$S is the user's nick, %2$S is message.parted.reason, if a part message is given.
+message.parted=%1$S 已离开房间 (离开%2$S)。
+#    %S is the part message supplied by the user.
+message.parted.reason=: %S
+#    %1$S is the user's nick, %2$S is message.quit2 if a quit message is given.
+message.quit=%1$S 已离开房间 (退出%2$S)。
+#    The parameter is the quit message given by the user.
+message.quit2=: %S
+#    %1$S is the nickname of the user that invited us, %2$S is the conversation
+#    name.
+message.inviteReceived=%1$S 已经邀请你到 %2$S 。
+#    %1$S is the nickname of the invited user, %2$S is the conversation name
+#    they were invited to.
+message.invited=%1$S 已被成功邀请至 %2$S。
+#    %1$S is the nickname of the invited user, %2$S is the conversation name
+#    they were invited to but are already in
+message.alreadyInChannel=%1$S 已经在 %2$S 。
+#    %S is the nickname of the user who was summoned.
+message.summoned=%S 已被召唤。
+#    %S is the nickname of the user whose WHOIS information follows this message.
+message.whois=%S 的 WHOIS 信息：
+#    %1$S is the nickname of the (offline) user whose WHOWAS information follows this message.
+message.whowas=%1$S 已离线。%1$S 的 WHOWAS 信息为：
+#    %1$S is the entry description (from tooltip.*), %2$S is its value.
+message.whoisEntry=\u00A0   %1$S: %2$S
+#    %S is the nickname that is not known to the server.
+message.unknownNick=%S 是未知的昵称。
+#    %1$S is the nickname of the user who changed the mode and %2$S is the new
+#    channel key (password).
+message.channelKeyAdded=%1$S 更改频道密码为 %2$S 。
+message.channelKeyRemoved=%S 移除频道密码。
+#    This will be followed by a list of ban masks.
+message.banMasks=来自以下位置的用户被 %S 屏蔽：
+message.noBanMasks=%S 没有屏蔽任何位置。
+message.banMaskAdded=来源地址匹配 %1$S 的用户被 %2$S 屏蔽。
+message.banMaskRemoved=来源地址匹配 %1$S 的用户不再被 %2$S 屏蔽。
+# LOCALIZATION NOTE (message.ping): Semi-colon list of plural forms.
+#  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+#   %1$S is the nickname of the user or the server that was pinged.
+#   #2 is the delay (in milliseconds).
+message.ping=于 #2 毫秒后收到来自 %1$S 的 Ping 回复。
+
+
+# LOCALIZATION NOTE (error.*):
+#    These are shown as error messages in the conversation or server tab.
+#    %S is the channel name.
+error.noChannel=无此频道：%S。
+error.tooManyChannels=无法加入 %S; 您已经加入了过多的频道。
+#    %1$S is your new nick, %2$S is the kill message from the server.
+error.nickCollision=昵称已被使用，修改昵称为 %1$S [%2$S]。
+error.erroneousNickname=%S 是不允许使用的昵称。
+error.banned=您被禁止访问此服务器。
+error.bannedSoon=您将会很快被禁止访问此服务器。
+error.mode.wrongUser=您无法修改其他用户的模式。
+#    %S is the nickname or channel name that isn't available.
+error.noSuchNick=%S 不在线。
+error.wasNoSuchNick=没有这个昵称：%S
+error.noSuchChannel=无此频道：%S。
+error.unavailable=%S 暂时不可用。
+#    %S is the channel name.
+error.channelBanned=您已被 %S 封禁。
+error.cannotSendToChannel=您无法发送消息至 %S。
+error.channelFull=频道 %S 已满。
+error.inviteOnly=您必须被邀请才能加入 %S。
+error.nonUniqueTarget=%S 不是一个唯一的 user@host 或者短名称，或者您一次性进入了过多的频道。
+error.notChannelOp=您不是 %S 的频道操作员。
+error.notChannelOwner=你不是 %S 频道的拥有者。
+error.wrongKey=无法加入 %S ，无效的频道密码。
+error.sendMessageFailed=发送最近一条信息时出现错误。当连接重新建立后请再次尝试。
+#    %1$S is the channel the user tried to join, %2$S is the channel
+#    he was forwarded to.
+error.channelForward=您可能未加入 %1$S，并被自动重定向到 %2$S。
+#    %S is the mode that the user tried to set but was not recognized
+#    by the server as a valid mode.
+error.unknownMode=“%S”不是此服务器上有效的用户模式。
+
+# LOCALIZATION NOTE (tooltip.*):
+#    These are the descriptions given in a tooltip with information received
+#    from a whois response.
+#    The human readable ("realname") description of the user.
+tooltip.realname=姓名
+tooltip.server=已连接至
+#    The username and hostname that the user connects from (usually based on the
+#    reverse DNS of the user's IP, but often mangled by the server to
+#    protect users).
+tooltip.connectedFrom=连接自
+tooltip.registered=已注册
+tooltip.registeredAs=注册为
+tooltip.secure=使用安全连接
+# The away message of the user
+tooltip.away=离开
+tooltip.ircOp=IRC 操作员
+tooltip.bot=机器人
+tooltip.lastActivity=最后活动
+# %S is the timespan elapsed since the last activity.
+tooltip.timespan=%S 天前
+tooltip.channels=当前在
+
+#    %1$S is the server name, %2$S is some generic server information (usually a
+#    location or the date the user was last seen).
+tooltip.serverValue=%1$S (%2$S)
+
+# LOCALIZATION NOTE (yes, no):
+#  These are used to turn true/false values into a yes/no response.
+yes=是
+no=否
diff --git a/l10n-zh-CN/chat/logger.properties b/l10n-zh-CN/chat/logger.properties
new file mode 100755
index 0000000000..9306f313f0
--- /dev/null
+++ b/l10n-zh-CN/chat/logger.properties
@@ -0,0 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (badLogfile):
+#  %S is the filename of the log file.
+badLogfile=空的或者中断的日志文件：%S
diff --git a/l10n-zh-CN/chat/matrix.properties b/l10n-zh-CN/chat/matrix.properties
new file mode 100644
index 0000000000..d2aab37b1a
--- /dev/null
+++ b/l10n-zh-CN/chat/matrix.properties
@@ -0,0 +1,26 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.connectServer=服务器
+options.connectPort=端口
+
+# LOCALIZATION NOTE (chatRoomField.*):
+#   These are the name of fields displayed in the 'Join Chat' dialog
+#   for Matrix accounts.
+#   The _ character won't be displayed; it indicates the next
+#   character of the string should be used as the access key for this
+#   field.
+chatRoomField.room=聊天室(_R)
+
+# LOCALIZATION NOTE (tooltip.*):
+#    These are the descriptions given in a tooltip with information received
+#    from the "User" object.
+# The human readable name of the user.
+tooltip.displayName=显示名
+# %S is the timespan elapsed since the last activity.
+tooltip.timespan=%S 前
+tooltip.lastActive=最后活动
diff --git a/l10n-zh-CN/chat/skype.properties b/l10n-zh-CN/chat/skype.properties
new file mode 100644
index 0000000000..b495066f62
--- /dev/null
+++ b/l10n-zh-CN/chat/skype.properties
@@ -0,0 +1,14 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (connection.*):
+#   These will show in the account manager to show progress during a connection.
+connecting.authenticating=正在验证身份
+connecting.registrationToken=正在获取注册令牌
+
+# LOCALIZATION NOTE (error.*):
+#   These will show in the account manager if the account is disconnected
+#   because of an error.
+error.auth=至服务器的身份验证失败
+error.registrationToken=获取注册令牌失败
diff --git a/l10n-zh-CN/chat/status.properties b/l10n-zh-CN/chat/status.properties
new file mode 100755
index 0000000000..158fa1555d
--- /dev/null
+++ b/l10n-zh-CN/chat/status.properties
@@ -0,0 +1,23 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+availableStatusType=有空
+awayStatusType=离开
+unavailableStatusType=不可用
+offlineStatusType=脱机
+invisibleStatusType=隐身
+idleStatusType=空闲
+mobileStatusType=移动版
+# LOCALIZATION NOTE (unknownStatusType):
+# the status of a buddy is unknown when it's in the list of a disconnected account
+unknownStatusType=未知
+
+# LOCALIZATION NOTE (statusWithStatusMessage):
+# Used to display the status of a buddy together with its status message.
+# %1$S is the status type, %2$S is the status message text.
+statusWithStatusMessage=%1$S - %2$S
+
+# LOCALIZATION NOTE (messenger.status.defaultIdleAwayMessage):
+#  This will be the away message put automatically when the user is idle.
+messenger.status.defaultIdleAwayMessage=我现在已不在计算机旁。
diff --git a/l10n-zh-CN/chat/twitter.properties b/l10n-zh-CN/chat/twitter.properties
new file mode 100755
index 0000000000..c31299d644
--- /dev/null
+++ b/l10n-zh-CN/chat/twitter.properties
@@ -0,0 +1,122 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (twitter.protocolName)
+#  This name is used whenever the name of the protocol is shown.
+twitter.protocolName=Twitter
+
+# LOCALIZATION NOTE (error.*):
+#   These are errors that will be shown to the user in conversation.
+error.tooLong=状态信息超过了 140 个字符。
+# LOCALIZATION NOTE (error.general, error.retweet, error.delete):
+#   %1$S will be either the error string returned by the twitter server,
+#   in English, inside parenthesis, or the empty string if we have no specific
+#   message for the error.
+#   %2$S is the message that caused the error.
+error.general=发送： %2$S 时发生 %1$S 错误。
+error.retweet=锐推：%2$S 时发生 %1$S 错误
+error.delete=删除：%2$S 时发生 %1$S 错误
+error.like=错误 %1$S 发生，当喜欢：%2$S
+error.unlike=错误 %1$S 发生，当取消喜欢：%2$S
+# LOCALIZATION NOTE (error.descriptionTooLong)
+#   %S is the truncated string that was sent to the server.
+error.descriptionTooLong=描述超过了最大长度（160个字符），自动截断为：%S 。
+
+# LOCALIZATION NOTE (timeline):
+#   This is the title of the conversation tab, %S will be replaced by
+#   @<username>.
+timeline=%S 时间轴
+
+# LOCALIZATION NOTE (action.*):
+#  This will be an action in the context menu of displayed tweets.
+action.copyLink=复制链接至推特
+action.retweet=锐推
+action.reply=回复
+action.delete=删除
+# LOCALIZATION NOTE (action.follow, action.stopFollowing):
+#  %S will be replaced by the screen name of a twitter user.
+action.follow=关注 %S
+action.stopFollowing=不再关注 %S
+action.like=喜欢
+action.unlike=移除喜欢
+
+# LOCALIZATION NOTE (event.follow, event.unfollow, event.followed):
+#  This will be displayed in system messages inside the timeline conversation.
+#  %S will be replaced by the screen name of a twitter user.
+event.follow=您现已关注 %S。
+event.unfollow=您已不再关注 %S。
+event.followed=%S 现已关注您。
+# LOCALIZATION NOTE (event.deleted):
+#  %S will be replaced by the text of the deleted tweet.
+event.deleted=您已删除此推：“%S”。
+
+# LOCALIZATION NOTE (replyingToStatusText):
+#  This will be visible in the status bar of the conversation window
+#  while the user is typing a reply to a tweet.
+#  %S will be replaced by the text of the tweet the user is replying to.
+replyingToStatusText=回复至：%S
+
+# LOCALIZATION NOTE (connection.*):
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initAuth=初始化验证过程
+connection.requestAuth=等待您的验证
+connection.requestAccess=正在完成验证
+connection.requestTimelines=请求用户时间轴
+# LOCALIZATION NOTE (connection.error.*):
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.userMismatch=用户名不匹配。
+connection.error.failedToken=无法获取请求令牌。
+connection.error.authCancelled=您取消了验证过程。
+connection.error.authFailed=无法通过验证。
+connection.error.noNetwork=网络不可以用。
+
+# LOCALIZATION NOTE (authPrompt):
+#   This is the prompt in the browser window that pops up to authorize us
+#   to use a Twitter account. It is shown in the title bar of the authorization
+#   window.
+authPrompt=授权使用您的推特账户
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.track=已追踪的关键字
+
+# LOCALIZATION NOTE (tooltip.*):
+#   These are the Twitter information that will appear in the tooltip
+#   for each participant on the home timeline.
+# LOCALIZATION NOTE (tooltip.created_at): the date the user joined.
+tooltip.created_at=用户自从
+tooltip.location=地址
+tooltip.lang=语言
+tooltip.time_zone=时区
+tooltip.url=主页
+# LOCALIZATION NOTE (tooltip.protected):
+#  whether the user's tweets are publicly visible.
+tooltip.protected=保护推
+# LOCALIZATION NOTE (tooltip.following):
+#  whether you are subscribed to the user's tweets.
+tooltip.following=现关注
+tooltip.name=名称
+tooltip.description=描述
+# LOCALIZATION NOTE (tooltip.*_count):
+#  Please see the right side of the official Twitter website UI.
+tooltip.friends_count=关注
+tooltip.statuses_count=推特
+tooltip.followers_count=粉丝
+tooltip.listed_count=已列出
+
+# LOCALIZATION NOTE (yes, no):
+#  These are used to turn true/false values into a yes/no response.
+yes=是
+no=否
+
+command.follow=%S &lt;username&gt;[ &lt;username&gt;]*: 开始关注一个或多个用户。
+command.unfollow=%S &lt;username&gt;[ &lt;username&gt;]*: 停止关注一个或多个用户。
+
+twitter.disabled=由于 Twitter 禁用了其流媒体协议，已不再支持。
diff --git a/l10n-zh-CN/chat/xmpp.properties b/l10n-zh-CN/chat/xmpp.properties
new file mode 100755
index 0000000000..8999309155
--- /dev/null
+++ b/l10n-zh-CN/chat/xmpp.properties
@@ -0,0 +1,275 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+# LOCALIZATION NOTE (connection.*)
+#   These will be displayed in the account manager in order to show the progress
+#   of the connection.
+#   (These will be displayed in account.connection.progress from
+#    accounts.properties, which adds … at the end, so do not include
+#    periods at the end of these messages.)
+connection.initializingStream=正在初始化流
+connection.initializingEncryption=正在初始化加密
+connection.authenticating=正在验证
+connection.gettingResource=正在获取资源
+connection.downloadingRoster=正在下载联系人列表
+connection.srvLookup=正在查找 SRV 记录
+
+# LOCALIZATION NOTE (connection.error.*)
+#   These will show in the account manager if an error occurs during the
+#   connection attempt.
+connection.error.invalidUsername=无效的用户名（你的用户名应该包括一个 '@' 字符）
+connection.error.failedToCreateASocket=创建套接字失败（您离线了吗？）
+connection.error.serverClosedConnection=服务器关闭了连接
+connection.error.resetByPeer=连接被重置
+connection.error.timedOut=连接超时
+connection.error.receivedUnexpectedData=收到意外的数据
+connection.error.incorrectResponse=收到不正确的响应
+connection.error.startTLSRequired=服务器要求加密，但您禁用了它
+connection.error.startTLSNotSupported=服务器不支持加密，但您的配置要求了必须加密
+connection.error.failedToStartTLS=无法启动加密
+connection.error.noAuthMec=服务器未提供身份验证机制
+connection.error.noCompatibleAuthMec=服务器提供的身份验证方法皆不支持
+connection.error.notSendingPasswordInClear=服务器只支持发送明文密码的验证方法
+connection.error.authenticationFailure=验证失败
+connection.error.notAuthorized=验证失败（您输入了错误的密码？）
+connection.error.failedToGetAResource=获取资源失败
+connection.error.failedMaxResourceLimit=此账号在短时间内在太多地方连接。
+connection.error.failedResourceNotValid=资源无效。
+connection.error.XMPPNotSupported=此服务器不支持 XMPP
+
+# LOCALIZATION NOTE (conversation.error.notDelivered):
+#   This is displayed in a conversation as an error message when a message
+#   the user has sent wasn't delivered.
+#   %S is replaced by the text of the message that wasn't delivered.
+conversation.error.notDelivered=此消息未能投递：%S
+#   This is displayed in a conversation as an error message when joining a MUC
+#   fails.
+#   %S is the name of the MUC.
+conversation.error.joinFailed=未能加入：%S
+#   This is displayed in a conversation as an error message when the user is
+#   banned from a room.
+#   %S is the name of the MUC room.
+conversation.error.joinForbidden=未能加入 %S，您已被此房间封禁。
+conversation.error.joinFailedNotAuthorized=必须注册：您无权加入此房间。
+conversation.error.creationFailedNotAllowed=访问被拒绝：您未被允许创建房间。
+#   This is displayed in a conversation as an error message when remote server
+#   is not found.
+#   %S is the name of MUC room.
+conversation.error.joinFailedRemoteServerNotFound=由于无法连接到聊天室所在的服务器，目前无法加入聊天室“%S”。
+conversation.error.changeTopicFailedNotAuthorized=您无权设置此房间的主题。
+#   This is displayed in a conversation as an error message when the user sends
+#   a message to a room that he is not in.
+#   %1$S is the name of MUC room.
+#   %2$S is the text of the message that wasn't delivered.
+conversation.error.sendFailedAsNotInRoom=消息未能发送到 %1$S，您已不在此房间中：%2$S
+#   This is displayed in a conversation as an error message when the user sends
+#   a message to a room that the recipient is not in.
+#   %1$S is the jid of the recipient.
+#   %2$S is the text of the message that wasn't delivered.
+conversation.error.sendFailedAsRecipientNotInRoom=消息未能发送到 %1$S，接收者已不在此房间中：%2$S
+#   These are displayed in a conversation as a system error message.
+conversation.error.remoteServerNotFound=无法连通收件人的服务器
+conversation.error.unknownSendError=发送此消息时发生一个未知错误。
+#   %S is the name of the message recipient.
+conversation.error.sendServiceUnavailable=目前无法发送消息至 %S。
+#   %S is the nick of participant that is not in room.
+conversation.error.nickNotInRoom=%S 不在此房间内。
+conversation.error.banCommandAnonymousRoom=您不能封禁匿名房间的参与者。尝试 /kick 代替。
+conversation.error.banKickCommandNotAllowed=您没有必要的权限来移除此房间中的此参与者。
+conversation.error.banKickCommandConflict=抱歉，您不能移除房间内的自己。
+conversation.error.changeNickFailedConflict=无法更改您的昵称到 %S，此昵称已被占用。
+conversation.error.changeNickFailedNotAcceptable=无法更改您的昵称到 %S，此昵称已被此房间锁定。
+conversation.error.inviteFailedForbidden=您没有可邀请用户进入此聊天室的权限。
+#   %S is the jid of user that is invited.
+conversation.error.failedJIDNotFound=无法与 %S 联系。
+#   %S is the jid that is invalid.
+conversation.error.invalidJID=%S 是无效的 jid （Jabber ID 必须是 user@domain 格式）。
+conversation.error.commandFailedNotInRoom=您必须重新加入聊天室才能使用此命令。
+#   %S is the name of the recipient.
+conversation.error.resourceNotAvailable=你必须先与 %S 通话才能与多个客户端连接。
+
+# LOCALIZATION NOTE (conversation.error.version.*):
+#   %S is the name of the recipient.
+conversation.error.version.unknown=%S 的客户端不支持查询其软件版本。
+
+# LOCALIZATION NOTE (tooltip.*):
+#   These are the titles of lines of information that will appear in
+#   the tooltip showing details about a contact or conversation.
+# LOCALIZATION NOTE (tooltip.status):
+#   %S will be replaced by the XMPP resource identifier
+tooltip.status=状态 (%S)
+tooltip.statusNoResource=状态
+tooltip.subscription=订阅
+tooltip.fullName=全名
+tooltip.nickname=昵称
+tooltip.email=电子邮件
+tooltip.birthday=生日
+tooltip.userName=用户名
+tooltip.title=标题
+tooltip.organization=组织
+tooltip.locality=地区
+tooltip.country=国家/地区
+tooltip.telephone=电话号码
+
+# LOCALIZATION NOTE (chatRoomField.*):
+#   These are the name of fields displayed in the 'Join Chat' dialog
+#   for XMPP accounts.
+#   The _ character won't be displayed; it indicates the next
+#   character of the string should be used as the access key for this
+#   field.
+chatRoomField.room=聊天室_R
+chatRoomField.server=_S服务器
+chatRoomField.nick=_N昵称
+chatRoomField.password=密码
+
+# LOCALIZATION NOTE (conversation.muc.*):
+#   These are displayed as a system message when a chatroom invitation is
+#   received.
+#   %1$S is the inviter.
+#   %2$S is the room.
+#   %3$S is the reason which is a message provided by the person sending the
+#   invitation.
+conversation.muc.invitationWithReason2=%1$S 邀请您加入 %2$S：%3$S
+#   %3$S is the password of the room.
+#   %4$S is the reason which is a message provided by the person sending the
+#   invitation.
+conversation.muc.invitationWithReason2.password=%1$S 邀请您使用密码 %3$S 加入 %2$S：%4$S
+conversation.muc.invitationWithoutReason=%1$S 已邀请您加入 %2$S
+#   %3$S is the password of the room.
+conversation.muc.invitationWithoutReason.password=%1$S 已邀请您加入 %2$S，使用密码 %3$S
+
+# LOCALIZATION NOTE (conversation.muc.join):
+#   This is displayed as a system message when a participant joins room.
+#   %S is the nick of the participant.
+conversation.message.join=%S 进入了房间。
+
+# LOCALIZATION NOTE (conversation.muc.rejoined):
+#   This is displayed as a system message when a participant rejoins room after
+#   parting it.
+conversation.message.rejoined=您重新加入了房间。
+
+# LOCALIZATION NOTE (conversation.message.parted.*):
+#   These are displayed as a system message when a participant parts a room.
+#   %S is the part message supplied by the user.
+conversation.message.parted.you=您离开了房间。
+conversation.message.parted.you.reason=您离开了房间：%S
+#   %1$S is the participant that is leaving.
+#   %2$S is the part message supplied by the participant.
+conversation.message.parted=%1$S 离开了此房间。
+conversation.message.parted.reason=%1$S 离开此房间：%2$S
+
+# LOCALIZATION NOTE (conversation.message.invitationDeclined*):
+#   %1$S is the invitee that declined the invitation.
+#   %2$S is the decline message supplied by the invitee.
+conversation.message.invitationDeclined=%1$S 拒绝了您的邀请。
+conversation.message.invitationDeclined.reason=%1$S 拒绝了您的邀请：%2$S
+
+# LOCALIZATION NOTE (conversation.message.banned.*):
+#   These are displayed as a system message when a participant is banned from
+#   a room.
+#   %1$S is the participant that is banned.
+#   %2$S is the reason.
+#   %3$S is the person who is banning.
+conversation.message.banned=%1$S 已被此房间封禁。
+conversation.message.banned.reason=%1$S 已被房间封禁：%2$S
+#   %1$S is the person who is banning.
+#   %2$S is the participant that is banned.
+#   %3$S is the reason.
+conversation.message.banned.actor=%1$S 在此房间封禁了 %2$S。
+conversation.message.banned.actor.reason=%1$S 在房间 %3$S 封禁了 %2$S。
+conversation.message.banned.you=您已被此房间封禁。
+#   %1$S is the reason.
+conversation.message.banned.you.reason=您已被该房间封禁：%1$S
+#   %1$S is the person who is banning.
+#   %2$S is the reason.
+conversation.message.banned.you.actor=%1$S 已在此房间中将您封禁。
+conversation.message.banned.you.actor.reason=%1$S 已在此房间中将您封禁：%2$S
+
+# LOCALIZATION NOTE (conversation.message.kicked.*):
+#   These are displayed as a system message when a participant is kicked from
+#   a room.
+#   %1$S is the participant that is kicked.
+#   %2$S is the reason.
+conversation.message.kicked=%1$S 已被此房间踢出。
+conversation.message.kicked.reason=%1$S 已被此房间踢出：%2$S
+#   %1$S is the person who is kicking.
+#   %2$S is the participant that is kicked.
+#   %3$S is the reason.
+conversation.message.kicked.actor=%1$S 踢出了此房间中的 %2$S。
+conversation.message.kicked.actor.reason=%1$S 踢出了此房间中的 %2$S：%3$S
+conversation.message.kicked.you=您已被此房间踢出。
+#   %1$S is the reason.
+conversation.message.kicked.you.reason=您已被此房间踢出：%1$S
+#   %1$S is the person who is kicking.
+#   %2$S is the reason.
+conversation.message.kicked.you.actor=%1$S 踢出了房间中的您。
+conversation.message.kicked.you.actor.reason=%1$S 踢出了房间中的您：%2$S
+
+# LOCALIZATION NOTE (conversation.message.removedNonMember.*):
+#   These are displayed as a system message when a participant is removed from
+#   a room because the room has been changed to members-only.
+#   %1$S is the participant that is removed.
+#   %2$S is the person who changed the room configuration.
+conversation.message.removedNonMember=%1$S 已被移出此房间，因为它的配置变更为仅成员。
+conversation.message.removedNonMember.actor=%1$S 已被移出房间，因为 %2$S 变更为仅成员。
+conversation.message.removedNonMember.you=您已被移出此房间，因为它的配置变更为仅成员。
+#   %1$S is the person who changed the room configuration.
+conversation.message.removedNonMember.you.actor=您已被移出房间，因为 %1$S 变更为仅成员。
+
+# LOCALIZATION NOTE (conversation.message.MUCShutdown):
+#   These are displayed as a system message when a participant is removed from
+#   a room because of a system shutdown.
+conversation.message.mucShutdown=您已被移出房间，因为系统关机。
+
+# LOCALIZATION NOTE (conversation.message.version*):
+#   %1$S is the name of the user whose version was requested.
+#   %2$S is the client name response from the client.
+#   %3$S is the client version response from the client.
+#   %4$S is the operating system(OS) response from the client.
+conversation.message.version=%1$S 正在使用 "%2$S %3$S"。
+conversation.message.versionWithOS=%1$S 正在在 %4$S 上使用 "%2$S %3$S"。
+
+# LOCALIZATION NOTE (options.*):
+#   These are the protocol specific options shown in the account manager and
+#   account wizard windows.
+options.resource=资源
+options.priority=优先级
+options.connectionSecurity=连接安全性
+options.connectionSecurity.requireEncryption=要求加密
+options.connectionSecurity.opportunisticTLS=如果可用，使用加密
+options.connectionSecurity.allowUnencryptedAuth=允许发送未经加密的密码
+options.connectServer=服务器
+options.connectPort=端口
+options.domain=域
+
+# LOCALIZATION NOTE (*.protocolName)
+#  This name is used whenever the name of the protocol is shown.
+gtalk.protocolName=Google Talk
+odnoklassniki.protocolName=Odnoklassniki
+
+# LOCALIZATION NOTE (gtalk.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring a Google Talk account.
+gtalk.usernameHint=邮箱地址
+
+# LOCALIZATION NOTE (odnoklassniki.usernameHint):
+#  This is displayed inside the accountUsernameInfoWithDescription
+#  string defined in imAccounts.properties when the user is
+#  configuring a Odnoklassniki account.
+odnoklassniki.usernameHint=配置文件编号
+
+# LOCALZIATION NOTE (command.*):
+#  These are the help messages for each command.
+command.join3=%S [&lt;room&gt;[@&lt;server&gt;][/&lt;nick&gt;]] [&lt;password&gt;]: 加入一个房间，可以提供其他服务器、昵称和房间密码。
+command.part2=%S [&lt;message&gt;]: 使用可选的消息离开当前房间。
+command.topic=%S [&lt;new topic&gt;]: 设置此房间的主题。
+command.ban=%S &lt;昵称&gt;[&lt;消息&gt;]：封禁房间中的某人。您必须是房间的管理员才能执行。
+command.kick=%S &lt;昵称&gt;[&lt;消息&gt;]：移除房间中的某人。您必须是房间的主持人才能执行。
+command.invite=%S &lt;jid&gt;[&lt;message&gt;]：邀请用户加入当前聊天室并留下消息。
+command.inviteto=%S &lt;房间 jid&gt;[&lt;密码&gt;]: 邀请您的聊天伙伴加入房间，如需要的话可输入密码。
+command.me=%S &lt;action to perform&gt;: Perform an action.
+command.nick=%S &lt;新昵称&gt;：更改您的昵称。
+command.msg=%S &lt;昵称&gt; &lt;消息&gt;：发送一条私信给房间中的某个参与者。
+command.version=%S：请求与您对话的同伴使用的客户端信息。
diff --git a/l10n-zh-CN/chat/yahoo.properties b/l10n-zh-CN/chat/yahoo.properties
new file mode 100755
index 0000000000..b2373ab76d
--- /dev/null
+++ b/l10n-zh-CN/chat/yahoo.properties
@@ -0,0 +1,5 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+yahoo.disabled=Yahoo Messenger 已不再支持，因为 Yahoo 禁用了它们的旧版协议。