[smuxi] L10N: Updated Chinese Simp translation from Transifex
- From: Mirco M. M. Bauer <mmmbauer src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [smuxi] L10N: Updated Chinese Simp translation from Transifex
- Date: Mon, 4 May 2015 04:51:20 +0000 (UTC)
commit a3f247cd8ed546daf74ca047c755cbeb5bae02b7
Author: Dean Lee <xslidian gmail com>
Date: Mon May 4 06:31:04 2015 +0200
L10N: Updated Chinese Simp translation from Transifex
po-Engine-Campfire/zh_CN.po | 2 +-
po-Engine-IRC/zh_CN.po | 160 +++++++++---------
po-Engine-JabbR/zh_CN.po | 8 +-
po-Engine-MessageBuffer/zh_CN.po | 121 +++++++++++++
po-Engine-Twitter/zh_CN.po | 101 ++++++-----
po-Engine-XMPP/zh_CN.po | 148 ++++++++++-------
po-Engine/zh_CN.po | 114 +++++++-----
po-Frontend-GNOME-IRC/zh_CN.po | 8 +-
po-Frontend-GNOME-Twitter/zh_CN.po | 2 +-
po-Frontend-GNOME-XMPP/zh_CN.po | 20 ++-
po-Frontend-GNOME/zh_CN.po | 335 ++++++++++++++++++++---------------
po-Frontend/zh_CN.po | 36 ++--
po-Server/zh_CN.po | 62 ++++---
13 files changed, 680 insertions(+), 437 deletions(-)
---
diff --git a/po-Engine-Campfire/zh_CN.po b/po-Engine-Campfire/zh_CN.po
index 37e5fe3..03f8e5e 100644
--- a/po-Engine-Campfire/zh_CN.po
+++ b/po-Engine-Campfire/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 16:59+0100\n"
+"POT-Creation-Date: 2015-05-03 12:31+0200\n"
"PO-Revision-Date: 2013-12-13 08:10+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
diff --git a/po-Engine-IRC/zh_CN.po b/po-Engine-IRC/zh_CN.po
index c46c5f8..ad03e3a 100644
--- a/po-Engine-IRC/zh_CN.po
+++ b/po-Engine-IRC/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 16:59+0100\n"
+"POT-Creation-Date: 2015-05-03 12:31+0200\n"
"PO-Revision-Date: 2013-12-13 08:02+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
@@ -18,263 +18,265 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:250
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:255
#, csharp-format
msgid "{0} invites you to {1}"
msgstr "{0} 邀请您加入 {1}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:266
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:279
msgid "Accept invite (join room)"
msgstr "接受邀请 (加入房间)"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:294
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1740
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:307
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1770
msgid "away"
msgstr "离开"
#. TRANSLATOR: {0} is the amount of seconds
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:300
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:313
#, csharp-format
msgid "lag: {0} seconds"
msgstr "延后: {0} 秒"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:306
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:319
msgid "not connected"
msgstr "未连接"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:366
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:379
#, csharp-format
msgid "Using proxy: {0}:{1}"
msgstr "使用代理: {0}:{1}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:373
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:386
#, csharp-format
msgid "Connecting to {0} port {1}..."
msgstr "正在连接到 {0} 端口 {1}..."
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:387
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:528
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:400
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:541
#, csharp-format
msgid "Connection to {0} established"
msgstr "到 {0} 的连接已建立"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:396
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:409
msgid "Logging in..."
msgstr "正在登录..."
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:436
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:449
msgid "Connection failed!"
msgstr "连接失败!"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:440
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:453
msgid "Connection failed! Reason: "
msgstr "连接失败! 原因: "
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:453
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:466
msgid "Disconnecting..."
msgstr "正在断开连接..."
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:458
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:471
#, csharp-format
msgid "Disconnecting from {0}..."
msgstr "正在从 {0} 断开连接..."
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:465
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:478
#, csharp-format
msgid "Disconnected from {0}"
msgstr "已从 {0} 断开连接"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:471
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:484
msgid "Connection closed"
msgstr "连接已关闭"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:480
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:555
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:493
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:568
msgid "Not connected"
msgstr "未连接"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:514
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:527
msgid "Reconnecting..."
msgstr "正在重新连接..."
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:522
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:535
#, csharp-format
msgid "Reconnecting to {0}..."
msgstr "正在重新连接到 {0}..."
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:541
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:554
msgid "Reconnect Error"
msgstr "重新连接出错"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:933
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:948
#, csharp-format
msgid "Sleeping for {0} milliseconds"
msgstr "睡眠 {0} 毫秒"
#. TRANSLATOR: this line is used as label / category for a
#. list of commands below
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1018
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1033
msgid "IrcProtocolManager Commands"
msgstr "IrcProtocolManager 命令"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1100
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1115
#, csharp-format
msgid "Invalid port: {0}"
msgstr "端口无效: {0}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1193
+#. TRANSLATOR: some IRC networks dislike too many joins in a
+#. short period and thus Smuxi throttles/queues them
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1210
#, csharp-format
msgid "Queuing joins: {0}"
msgstr "正等待加入: {0}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1213
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1231
#, csharp-format
msgid "Already joined to channel: {0}. Type /window {0} to switch to it."
msgstr "已经加入了频道: {0}。输入 /window {0} 切换过去。"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1247
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1265
#, csharp-format
msgid "Active joins: {0} - Queued joins: {1}"
msgstr "已经加入: {0} - 等待加入: {1}"
#. TRANSLATORS: final message will look like this:
#. Joining: #chan1 - Remaining active joins: #chan2 / queued joins: #chan3
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1271
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1301
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1289
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1319
#, csharp-format
msgid "Joining: {0}"
msgstr "正在加入: {0}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1273
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1291
msgid "Remaining"
msgstr "剩余"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1278
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1296
#, csharp-format
msgid "active joins: {0}"
msgstr "已经加入: {0}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1287
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1305
#, csharp-format
msgid "queued joins: {0}"
msgstr "等待加入: {0}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1721
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1751
msgid "IRC Op"
msgstr "IRC 版主"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1723
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1753
msgid "Owner"
msgstr "主人"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1725
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1755
msgid "ChanAdmin"
msgstr "超级版主"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1727
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1757
msgid "Op"
msgstr "版主"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1729
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1759
msgid "Halfop"
msgstr "版主"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1731
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1761
msgid "Voice"
msgstr "认证用户"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1794
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1824
#, csharp-format
msgid "Topic for {0}: {1}"
msgstr "{0} 的主题: {1}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1796
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1826
#, csharp-format
msgid "No topic set for {0}"
msgstr "{0} 尚未设定主题"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1961
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1991
msgid "ban"
msgstr "封禁"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:1972
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2002
msgid "No bans in channel"
msgstr "频道内无被封禁用户"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2009
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2039
msgid "ban exception"
msgstr "封禁例外"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2020
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2050
msgid "No ban exceptions in channel"
msgstr "频道内无封禁例外用户"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2057
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2087
msgid "invite exception"
msgstr "邀请例外"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2068
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2098
msgid "No invite exceptions in channel"
msgstr "频道内无邀请例外用户"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2182
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2212
#, csharp-format
msgid "Your user mode is {0}"
msgstr "您的用户模式为 {0}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2208
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2238
#, csharp-format
msgid "{0} is already on {1}"
msgstr "{0} 已在 {1}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2216
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2246
#, csharp-format
msgid "Inviting {0} to {1}"
msgstr "正在邀请 {0} 加入 {1}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2239
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2269
msgid "Users"
msgstr "用户"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2290
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2320
#, csharp-format
msgid "Total of {0} users [{1} ops, {2} voices, {3} normal]"
msgstr "总计 {0} 位用户 [{1} 位版主, {2} 位认证用户, {3} 位普通用户]"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2424
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2458
msgid "Connection error! Reason: "
msgstr "连接出错! 原因: "
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2436
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2470
#, csharp-format
msgid "Not enough parameters for {0} command"
msgstr "{0} 命令参数不足"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2445
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2479
msgid "Not connected to server"
msgstr "未连接到服务器"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2649
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2688
#, csharp-format
msgid "{0}: No such nick/channel"
msgstr "{0}: 无此昵称/频道"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2768
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2807
#, csharp-format
msgid ""
"Increased send delay to {0}ms to avoid being flooded off the server again."
msgstr "发送延时已增加到 {0}ms 以避免再次被服务器挤出。"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2783
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2822
#, csharp-format
msgid "Nick {0} is already in use"
msgstr "昵称 {0} 已被占用"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2799
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2838
msgid "Cannot join to channel:"
msgstr "无法加入频道:"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2801
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2840
msgid "You are banned"
msgstr "您已被封禁"
@@ -282,88 +284,88 @@ msgstr "您已被封禁"
#. {2}: CTCP command, {3}: own nickname, {4}: CTCP parameter
#. example:
#. meebey [meebey example com] requested CTCP VERSION from meebey:
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2884
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2923
#, csharp-format
msgid "{0} [{1}] requested CTCP {2} from {3}: {4}"
msgstr "{0} [{1}] 请求 CTCP {2} 来自 {3}: {4}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2911
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2950
#, csharp-format
msgid "CTCP PING reply from {0}: {1} seconds"
msgstr "CTCP PING 回复来自 {0}: {1} 秒"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2920
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:2959
#, csharp-format
msgid "CTCP {0} reply from {1}: {2}"
msgstr "CTCP {0} 回复来自 {1}: {2}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3168
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3207
#, csharp-format
msgid "{0} [{1}] has joined {2}"
msgstr "{0} [{1}] 已加入 {2}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3310
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3349
#, csharp-format
msgid "{0} [{1}] has left {2}"
msgstr "{0} [{1}] 已离开 {2}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3335
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3374
#, csharp-format
msgid "You were kicked from {0} by {1}"
msgstr "您被 {1} 从 {0} 踢出"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3343
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3382
#, csharp-format
msgid "{0} was kicked from {1} by {2}"
msgstr "{0} 被 {2} 从 {1} 踢出"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3361
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3393
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3400
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3432
#, csharp-format
msgid "You're now known as {0}"
msgstr "您现在的昵称为 {0}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3396
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3435
#, csharp-format
msgid "{0} is now known as {1}"
msgstr "{0} 现在的昵称为 {1}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3430
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3469
#, csharp-format
msgid "{0} changed the topic of {1} to: {2}"
msgstr "{0} 将主题 {1} 改为: {2}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3592
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3629
#, csharp-format
msgid "Mode change [{0}] for user {1}"
msgstr "用户 {1} 模式更改 [{0}]"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3609
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3660
#, csharp-format
msgid "mode/{0} [{1}] by {2}"
msgstr "模式/{0} [{1}] by {2}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3635
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3696
#, csharp-format
msgid "{0} [{1}] has quit"
msgstr "{0} [{1}] 已退出"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3712
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3786
#, csharp-format
msgid ""
"Connection to {0} port {1} has failed (attempt {2}), retrying in {3} "
"seconds..."
msgstr "到 {0} 端口 {1} 的连接失败 (第 {2}次尝试), 将在 {3} 秒后重试..."
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3762
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3836
#, csharp-format
msgid "{0} is away: {1}"
msgstr "{0} 离开: {1}"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3772
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3846
msgid "You are no longer marked as being away"
msgstr "您不再被标为离开状态"
-#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3782
+#: ../src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs:3856
msgid "You have been marked as being away"
msgstr "您已被标为离开状态"
diff --git a/po-Engine-JabbR/zh_CN.po b/po-Engine-JabbR/zh_CN.po
index 5b730f1..bc06dba 100644
--- a/po-Engine-JabbR/zh_CN.po
+++ b/po-Engine-JabbR/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:00+0100\n"
+"POT-Creation-Date: 2015-05-03 12:32+0200\n"
"PO-Revision-Date: 2013-12-13 08:22+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
@@ -42,16 +42,16 @@ msgstr "连接失败! 原因: {0}"
msgid "Connecting to {0}..."
msgstr "正在连接到 {0}..."
-#: ../src/Engine-JabbR/JabbrProtocolManager.cs:340
+#: ../src/Engine-JabbR/JabbrProtocolManager.cs:354
#, csharp-format
msgid "Reconnecting to {0}..."
msgstr "正在重新连接到 {0}..."
-#: ../src/Engine-JabbR/JabbrProtocolManager.cs:433
+#: ../src/Engine-JabbR/JabbrProtocolManager.cs:447
msgid "not connected"
msgstr "未连接"
-#: ../src/Engine-JabbR/JabbrProtocolManager.cs:577
+#: ../src/Engine-JabbR/JabbrProtocolManager.cs:607
#, csharp-format
msgid "Retrieving chat information failed. Reason: {0}"
msgstr "检索聊天信息失败。原因: {0}"
diff --git a/po-Engine-MessageBuffer/zh_CN.po b/po-Engine-MessageBuffer/zh_CN.po
new file mode 100644
index 0000000..f8b092d
--- /dev/null
+++ b/po-Engine-MessageBuffer/zh_CN.po
@@ -0,0 +1,121 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Dean Lee <xslidian gmail com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Smuxi - IRC client\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-05-03 12:31+0200\n"
+"PO-Revision-Date: 2014-03-17 08:14+0000\n"
+"Last-Translator: Dean Lee <xslidian gmail com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../src/Engine-MessageBuffer/Main.cs:49
+msgid "Enable debug output"
+msgstr "启用调试输出"
+
+#: ../src/Engine-MessageBuffer/Main.cs:55
+#: ../src/Engine-MessageBuffer/Main.cs:131
+#: ../src/Engine-MessageBuffer/Main.cs:195
+msgid "Show this help"
+msgstr "显示本帮助"
+
+#: ../src/Engine-MessageBuffer/Main.cs:57
+msgid "Usage: smuxi-message-buffer [options] action action-options"
+msgstr "用法: smuxi-message-buffer [选项列表] 操作 操作选项列表"
+
+#: ../src/Engine-MessageBuffer/Main.cs:59
+msgid "Actions:"
+msgstr "操作:"
+
+#: ../src/Engine-MessageBuffer/Main.cs:63
+#: ../src/Engine-MessageBuffer/Main.cs:142
+#: ../src/Engine-MessageBuffer/Main.cs:207
+msgid "Options:"
+msgstr "选项:"
+
+#: ../src/Engine-MessageBuffer/Main.cs:90
+#, csharp-format
+msgid "Unknown action: '{0}'"
+msgstr "未知操作: '{0}'"
+
+#: ../src/Engine-MessageBuffer/Main.cs:97
+#, csharp-format
+msgid "Command line error: {0}"
+msgstr "命令行错误: {0}"
+
+#: ../src/Engine-MessageBuffer/Main.cs:109
+msgid "Database format (valid values: auto, db4o, sqlite)"
+msgstr "数据库格式 (有效值: auto, db4o, sqlite)"
+
+#: ../src/Engine-MessageBuffer/Main.cs:124
+#: ../src/Engine-MessageBuffer/Main.cs:188
+#, csharp-format
+msgid "Unknown {0} option: '{1}'"
+msgstr "未知 {0} 选项: '{1}'"
+
+#: ../src/Engine-MessageBuffer/Main.cs:135
+#, csharp-format
+msgid "Usage: smuxi-message-buffer {0} [action-options] db_path"
+msgstr "用法: smuxi-message-buffer {0} [操作选项列表] 数据库路径"
+
+#: ../src/Engine-MessageBuffer/Main.cs:140
+msgid "Database path"
+msgstr "数据库路径"
+
+#: ../src/Engine-MessageBuffer/Main.cs:151
+msgid "db_path is required"
+msgstr "数据库路径必须提供"
+
+#: ../src/Engine-MessageBuffer/Main.cs:165
+msgid "Source format (valid values: auto, db4o, sqlite)"
+msgstr "源格式 (有效值: auto, db4o, sqlite)"
+
+#: ../src/Engine-MessageBuffer/Main.cs:173
+msgid "Destination format (valid values: auto, db4o, sqlite)"
+msgstr "目标格式 (有效值: auto, db4o, sqlite)"
+
+#: ../src/Engine-MessageBuffer/Main.cs:199
+#, csharp-format
+msgid ""
+"Usage: smuxi-message-buffer {0} [action-options] source_db destination_db"
+msgstr "用法: smuxi-message-buffer {0} [操作选项列表] 源数据库 目标数据库"
+
+#: ../src/Engine-MessageBuffer/Main.cs:204
+msgid "Source file path"
+msgstr "源文件路径"
+
+#: ../src/Engine-MessageBuffer/Main.cs:205
+msgid "Destination file path or -/empty for stdout"
+msgstr "目标文件路径或 -/留空输出到标准输出"
+
+#: ../src/Engine-MessageBuffer/Main.cs:216
+msgid "source_db and destination_db are required"
+msgstr "源数据库与目标数据库均必须提供"
+
+#: ../src/Engine-MessageBuffer/Main.cs:232
+msgid "sourceFile must not be empty."
+msgstr "源文件不能为空。"
+
+#: ../src/Engine-MessageBuffer/Main.cs:248
+#, csharp-format
+msgid "Destination database {0} must be empty!"
+msgstr "目标数据库 {0} 必须为空!"
+
+#: ../src/Engine-MessageBuffer/Main.cs:298
+#, csharp-format
+msgid "Unknown file format: '{0}'"
+msgstr "未知文件格式: '{0}'"
+
+#: ../src/Engine-MessageBuffer/Main.cs:320
+#, csharp-format
+msgid "Unsupported buffer type: '{0}'"
+msgstr "不支持的缓冲器类型: '{0}'"
diff --git a/po-Engine-Twitter/zh_CN.po b/po-Engine-Twitter/zh_CN.po
index f7c5fca..c5ca7db 100644
--- a/po-Engine-Twitter/zh_CN.po
+++ b/po-Engine-Twitter/zh_CN.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dean Lee <xslidian gmail com>, 2011,2013
+# Dean Lee <xslidian gmail com>, 2011,2013,2015
msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:01+0100\n"
-"PO-Revision-Date: 2013-12-13 08:14+0000\n"
+"POT-Creation-Date: 2015-05-03 12:32+0200\n"
+"PO-Revision-Date: 2015-05-03 19:53+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -18,168 +18,183 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:124
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:125
msgid "Home Timeline"
msgstr "主时间线"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:135
-msgid "Replies"
-msgstr "回复"
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:136
+msgid "Replies & Mentions"
+msgstr "回复 & 提及"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:146
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:147
msgid "Direct Messages"
msgstr "私信"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:193
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:195
#, csharp-format
msgid "Using proxy: {0}:{1}"
msgstr "使用代理: {0}:{1}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:212
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:217
msgid "Connecting to Twitter..."
msgstr "正在连接到 Twitter..."
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:254
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:259
msgid "Twitter authorization required."
msgstr "需要 Twitter 授权认证。"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:261
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:266
#, csharp-format
msgid ""
"Please open the following URL and click \"Allow\" to allow Smuxi to connect "
"to your Twitter account: {0}"
msgstr "请打开下面的 URL 并点击“允许”授权 Smuxi 连接您的 Twitter 账户: {0}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:277
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:282
msgid ""
"Once you have allowed Smuxi to access your Twitter account, Twitter will "
"provide a PIN."
msgstr "在您允许 Smuxi 访问您的 Twitter 账户后，Twitter 将提供 PIN。"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:284
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:289
msgid "Please type: /pin PIN_FROM_TWITTER"
msgstr "请输入: /pin TWITTER_给您的_PIN"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:292
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:354
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:297
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:359
msgid "Connection failed!"
msgstr "连接失败!"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:297
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:358
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:302
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:363
#, csharp-format
msgid "Connection failed! Reason: {0}"
msgstr "连接失败! 原因: {0}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:312
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:317
msgid "Fetching user details from Twitter, please wait..."
msgstr "正在从 Twitter 装载用户详细信息，请稍候..."
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:319
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:324
msgid "Finished fetching user details."
msgstr "装载用户详细信息完成。"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:325
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:330
msgid "Successfully connected to Twitter."
msgstr "成功连接到 Twitter。"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:343
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:348
msgid "Failed to fetch user details from Twitter. Reason: "
msgstr "从 Twitter 装载用户详细信息失败。原因: "
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:376
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:381
msgid "Fetching friends from Twitter, please wait..."
msgstr "正在从 Twitter 装载好友，请稍候..."
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:385
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:390
msgid "Finished fetching friends."
msgstr "装载好友完成。"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:389
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:394
msgid "Failed to fetch friends from Twitter. Reason: "
msgstr "从 Twitter 装载好友失败。原因: "
#. TRANSLATOR: this line is used as a label / category for a
#. list of commands below
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:703
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:738
msgid "Twitter Commands"
msgstr "Twitter 命令"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:749
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:787
msgid "No pending authorization request!"
msgstr "无待处理的认证请求!"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:770
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:808
#, csharp-format
msgid "Failed to authorize with Twitter: {0}"
msgstr "Twitter 认证失败: {0}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:778
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:816
msgid "Twitter did not accept your PIN. Did you enter it correctly?"
msgstr "Twitter 不接受您提供的 PIN。您是否已经正确输入?"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:786
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:824
#, csharp-format
msgid ""
"Please retry by closing this tab and reconnecting to the Twitter \"{0}\" "
"account."
msgstr "请关闭本标签，重新连接 Twitter \"{0}\" 账户再次尝试。"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:827
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:865
msgid "Migrated Twitter account from basic auth to OAuth."
msgstr "Twitter 账户已从 basic auth 迁移至 OAuth。"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:841
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:879
#, csharp-format
msgid "Successfully authorized Twitter account \"{0}\" for Smuxi"
msgstr "Smuxi 成功认证 Twitter 账户 \"{0}\""
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:864
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:902
#, csharp-format
msgid "Could not update status - Reason: {0}"
msgstr "无法更新状态 - 原因: {0}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:875
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:913
msgid "Cannot send message - no target specified. Use: /msg $nick message"
msgstr "无法发送信息 - 未指定目标。用法: /msg $昵称 信息"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:892
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:987
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:930
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1025
#, csharp-format
msgid "Could not send message - Reason: {0}"
msgstr "无法发送信息 - 原因: {0}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:912
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:950
msgid "Other timelines"
msgstr "其他时间线"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:970
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1008
msgid "Could not send message - the specified user does not exist."
msgstr "无法发送信息 - 指定用户不存在。"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1081
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1122
#, csharp-format
msgid "Search {0}"
msgstr "搜索 {0}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1228
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1245
+#, csharp-format
+msgid "Successfully deleted tweet {0}."
+msgstr "已成功删除推文“{0}”。"
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1277
+#, csharp-format
+msgid "Successfully favorited tweet {0}."
+msgstr "已成功收藏推文“{0}”。"
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1309
+#, csharp-format
+msgid "Successfully unfavorited tweet {0}."
+msgstr "已成功取消收藏推文“{0}”。"
+
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1371
#, csharp-format
msgid ""
"An error occurred while fetching the friends timeline from Twitter. Reason: "
"{0}"
msgstr "从 Twitter 装取好友时间线时发生了一个错误。原因: {0}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1340
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1483
#, csharp-format
msgid "An error occurred while fetching the replies from Twitter. Reason: {0}"
msgstr "从 Twitter 装取回复时发生了一个错误。原因: {0}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1446
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1589
#, csharp-format
msgid ""
"An error occurred while fetching direct messages from Twitter. Reason: {0}"
msgstr "从 Twitter 装取私信时发生了一个错误。原因: {0}"
-#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1817
+#: ../src/Engine-Twitter/Protocols/Twitter/TwitterProtocolManager.cs:1972
msgid "Twitter didn't send a valid response, they're probably overloaded"
msgstr "Twitter 所发送的响应无效，该网站可能处于过载状态"
diff --git a/po-Engine-XMPP/zh_CN.po b/po-Engine-XMPP/zh_CN.po
index c03b665..2ffbf19 100644
--- a/po-Engine-XMPP/zh_CN.po
+++ b/po-Engine-XMPP/zh_CN.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dean Lee <xslidian gmail com>, 2013
+# Dean Lee <xslidian gmail com>, 2013-2015
msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:01+0100\n"
-"PO-Revision-Date: 2013-12-13 08:35+0000\n"
+"POT-Creation-Date: 2015-05-03 12:33+0200\n"
+"PO-Revision-Date: 2015-05-03 19:53+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -18,157 +18,163 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:212
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:188
msgid "The Server has shut down"
msgstr "服务器已关闭"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:215
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:191
msgid ""
"Another client logged in with the same resource, you have been disconnected"
msgstr "相同资源被其他客户端登录占用，您已被断开连接"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:233
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:209
msgid ""
"Authentication failed, either username does not exist or invalid password"
msgstr "身份认证失败，用户名不存在或密码无效"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:237
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:213
msgid ""
"if you want to create an account with the specified user and password, type "
"/register now"
msgstr "如果您希望指定用户名与密码创建账号，请输入 /register"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:359
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:259
+msgid ""
+"This engine has native Facebook support, you should be using it instead of "
+"connecting to facebook with xmpp"
+msgstr "本引擎原生支持 Facebook，您应该使用原生功能，不必 xmpp 连接到 facebook"
+
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:328
msgid "not connected"
msgstr "未连接"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:818
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:819
#, csharp-format
msgid "Could not find contact {0}"
msgstr "未找到联系人 {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:824
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:825
#, csharp-format
msgid "Contact {0} has {1} known resources"
msgstr "联系人 {0} 有 {1} 个已知资源"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:828
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:829
#, csharp-format
msgid "{0} is not a known resource"
msgstr "{0} 不是已知资源"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:836
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:837
#, csharp-format
msgid "Contact's Jid: {0}"
msgstr "联系人的 Jid: {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:840
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:841
msgid "You have a mutual subscription with this contact"
msgstr "您与该联系人存在双向订阅关系"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:843
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:844
msgid ""
"You have no subscription with this contact and this contact is not "
"subscribed to you"
msgstr "您未订阅该联系人，该联系人也未订阅您"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:846
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:847
msgid ""
"You are subscribed to this contact, but the contact is not subcribed to you"
msgstr "您已订阅该联系人，但该联系人未订阅您"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:849
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:850
msgid ""
"You are not subscribed to this contact, but the contact is subcribed to you"
msgstr "您未订阅该联系人，但该联系人订阅了您"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:945
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:946
#, csharp-format
msgid "Invalid Contact command: {0}"
msgstr "无效联系人命令: {0}"
#. TRANSLATOR: this line is used as a label / category for a
#. list of commands below
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:956
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:957
#, csharp-format
msgid "{0} Commands"
msgstr "{0} 命令"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:981
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:982
#, csharp-format
msgid "Advanced {0} Commands"
msgstr "高级 {0} 命令"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1016
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1017
#, csharp-format
msgid "Invalid port: {0}"
msgstr "无效端口: {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1051
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1052
#, csharp-format
msgid "Priority for Available is: {0}"
msgstr "有空优先级为: {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1054
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1055
#, csharp-format
msgid "Priority for Away is: {0}"
msgstr "离开优先级为: {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1062
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1063
#, csharp-format
msgid ""
"Invalid Priority: {0} (valid priorities are between -128 and 127 inclusive)"
msgstr "优先级无效: {0} (有效的优先级从 -128 到 127)"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1641
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1633
#, csharp-format
msgid "{0}{1} is available"
msgstr "{0}{1} 有空"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1645
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1637
#, csharp-format
msgid "{0}{1} is away"
msgstr "{0}{1} 离开"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1649
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1641
#, csharp-format
msgid "{0}{1} is extended away"
msgstr "{0}{1} 长时间离开"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1653
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1645
#, csharp-format
msgid "{0}{1} wishes not to be disturbed"
msgstr "{0}{1} 忙碌"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1657
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1649
#, csharp-format
msgid "{0}{1} wants to chat"
msgstr "{0}{1} 想要聊天"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1664
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1656
#, csharp-format
msgid "{0}{1} is offline"
msgstr "{0}{1} 离线"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1670
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1662
#, csharp-format
msgid ""
"Automatically allowed {0} to subscribe to you, since you are already asking "
"to subscribe"
msgstr "由于您已请求订阅，已自动允许 {0} 订阅您"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1674
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1666
#, csharp-format
msgid "{0}{1} wishes to subscribe to you"
msgstr "{0}{1} 希望订阅您"
#. you can now see their presences
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1682
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1674
#, csharp-format
msgid "{0}{1} allowed you to subscribe"
msgstr "{0}{1} 允许您订阅"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1689
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1681
#, csharp-format
msgid ""
"Automatically removed {0}'s subscription to your presences after losing the "
@@ -176,118 +182,142 @@ msgid ""
msgstr "由于您不再订阅 {0}，已自动移除他对您在线状态的订阅"
#. you cannot (anymore?) see their presences
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1696
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1688
#, csharp-format
msgid "{0}{1} denied/removed your subscription"
msgstr "{0}{1} 拒绝/移除了您的订阅"
#. you might still be able to see their presences
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1701
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1693
#, csharp-format
msgid "{0}{1} unsubscribed from you"
msgstr "{0}{1} 已取消订阅您"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1705
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1697
#, csharp-format
msgid "received a malformed error message: {0}"
msgstr "收到畸形错误消息: {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1712
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1704
#, csharp-format
msgid "{0}{1}'s server could not be found"
msgstr "找不到 {0}{1} 的服务器"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1715
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1707
#, csharp-format
msgid "{0}{1} is already using your requested resource"
msgstr "{0}{1} 已在使用您请求的资源"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1722
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1744
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1758
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1714
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1736
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1750
#, csharp-format
msgid "There is currently no useful error message for {0}, {1}, {2}{3}"
msgstr "{0}, {1}, {2}{3} 当前没有有用的错误消息"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1735
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1727
#, csharp-format
msgid "You do not have permission to access {0}{1}"
msgstr "您无权访问 {0}{1}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1785
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1777
#, csharp-format
msgid "{0} days"
msgstr "{0} 天"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1791
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1783
#, csharp-format
msgid "{0} hours"
msgstr "{0} 小时"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1795
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1787
#, csharp-format
msgid "{0} minutes"
msgstr "{0} 分钟"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1798
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1790
#, csharp-format
msgid "{0} seconds"
msgstr "{0} 秒"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1810
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1802
#, csharp-format
msgid " since {0} ({1})"
msgstr " 从 {0} ({1})"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1888
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1887
#, csharp-format
msgid "An unknown groupchat error occurred: {0}"
msgstr "发生未知群聊错误: {0}"
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1894
+#, csharp-format
+msgid "Server of groupchat \"{0}\" not found."
+msgstr "未找到群聊“{0}”的服务器。"
+
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1897
+#, csharp-format
+msgid "Muc service is not available for \"{0}\""
+msgstr "Muc 服务对“{0}”不可用"
+
#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1904
#, csharp-format
+msgid "You do not have permission to join \"{0}\""
+msgstr "您没有权限加入“{0}”"
+
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1910
+#, csharp-format
msgid "An unhandled groupchat error occurred: {0}"
msgstr "发生未处理的群聊错误: {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:1906
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2096
#, csharp-format
-msgid "Error in Groupchat {0}: {1}"
-msgstr "群聊 {0} 出错: {1}"
+msgid ""
+"Received a presence update from {0}, but there's no corresponding chat "
+"window"
+msgstr "收到来自“{0}”的更新，但没有相应的聊天窗口"
+
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2120
+#, csharp-format
+msgid ""
+"Received a groupchat message from {0} but there's no corresponding chat "
+"window: {1}"
+msgstr "收到来自“{0}”的群聊消息，但没有相应的聊天窗口: {1}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2277
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2397
#, csharp-format
msgid "You have been invited to {2} by {0} because {1}"
msgstr "您被 {0} 邀请加入 {2}，因为 {1}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2283
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2403
#, csharp-format
msgid "You have been invited to {1} by {0}"
msgstr "您被 {0} 邀请加入 {1}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2304
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2424
msgid "Accept invite (join room)"
msgstr "接受邀请 (加入房间)"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2471
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2562
#, csharp-format
msgid "Reconnecting to {0}"
msgstr "正在重新连接到 {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2485
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2576
#, csharp-format
msgid "Reconnecting to {0} in {1} seconds"
msgstr "将在 {1} 秒后重新连接到 {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2515
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2606
#, csharp-format
msgid "Error: {0}"
msgstr "错误: {0}"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2527
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2618
msgid "Authenticated"
msgstr "已通过身份认证"
-#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2574
+#: ../src/Engine-XMPP/Protocols/Xmpp/XmppProtocolManager.cs:2669
#, csharp-format
msgid "Using proxy: {0}:{1}"
msgstr "使用代理: {0}:{1}"
diff --git a/po-Engine/zh_CN.po b/po-Engine/zh_CN.po
index ec85989..a3bf64d 100644
--- a/po-Engine/zh_CN.po
+++ b/po-Engine/zh_CN.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dean Lee <xslidian gmail com>, 2011-2013
+# Dean Lee <xslidian gmail com>, 2011-2014
msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 16:58+0100\n"
-"PO-Revision-Date: 2013-12-13 08:15+0000\n"
+"POT-Creation-Date: 2015-05-03 12:30+0200\n"
+"PO-Revision-Date: 2014-03-17 08:12+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -22,175 +22,195 @@ msgstr ""
msgid "No network connections"
msgstr "无网络连接"
-#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:295
+#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:263
#, csharp-format
msgid "Optimizing: {0}..."
msgstr "正在优化: {0}..."
-#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:313
+#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:281
#, csharp-format
msgid "Failed to optimize: {0}. Reason: {1}"
msgstr "优化失败: {0}。原因: {1}"
-#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:347
+#: ../src/Engine/MessageBuffers/Db4oMessageBuffer.cs:315
msgid ""
"Your chat history is no longer available because of an error but will be "
"preserved from now on."
msgstr "由于发生错误，您的聊天历史不再可用；但今后的聊天历史将会保留。"
-#: ../src/Engine/Messages/MessageBuilder.cs:782
+#: ../src/Engine/Messages/MessageBuilder.cs:771
#, csharp-format
msgid "{0} is typing..."
msgstr "{0} 正在输入..."
-#: ../src/Engine/Messages/MessageBuilder.cs:788
+#: ../src/Engine/Messages/MessageBuilder.cs:777
#, csharp-format
msgid "{0} has stopped typing..."
msgstr "{0} 已停止输入..."
-#: ../src/Engine/Messages/MessageBuilder.cs:831
+#: ../src/Engine/Messages/MessageBuilder.cs:820
#, csharp-format
msgid "{0} is away"
msgstr "{0} 处于离开状态"
-#: ../src/Engine/Messages/MessageBuilder.cs:837
+#: ../src/Engine/Messages/MessageBuilder.cs:826
#, csharp-format
msgid "{0} is offline"
msgstr "{0} 已下线"
-#: ../src/Engine/Messages/MessageBuilder.cs:843
+#: ../src/Engine/Messages/MessageBuilder.cs:832
#, csharp-format
msgid "{0} is online"
msgstr "{0} 已上线"
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:170
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:162
+msgid "not connected"
+msgstr "未连接"
+
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:193
msgid "Not connected to server"
msgstr "未连接到服务器"
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:178
-#: ../src/Engine/Session.cs:998
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:201
+#: ../src/Engine/Session.cs:1067
#, csharp-format
msgid "Not enough parameters for {0} command"
msgstr "{0} 命令参数不足"
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:189
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:212
#, csharp-format
msgid "Connected to {0}"
msgstr "已连接到 {0}"
-#: ../src/Engine/Protocols/ProtocolManagerBase.cs:219
+#: ../src/Engine/Protocols/ProtocolManagerBase.cs:242
#, csharp-format
msgid "Disconnected from {0}"
msgstr "已从 {0} 断开连接"
-#: ../src/Engine/Session.cs:237
+#: ../src/Engine/Session.cs:247
#, csharp-format
msgid "Automatically connecting to {0}..."
msgstr "正在自动连接到 {0}..."
-#: ../src/Engine/Session.cs:268
+#: ../src/Engine/Session.cs:278
#, csharp-format
msgid "Automatic connect to {0} failed!"
msgstr "自动连接 {0} 失败!"
#. TRANSLATOR: this line is used as a label / category for a
#. list of commands below
-#: ../src/Engine/Session.cs:471
+#: ../src/Engine/Session.cs:505
msgid "Engine Commands"
msgstr "引擎命令"
-#: ../src/Engine/Session.cs:599
+#: ../src/Engine/Session.cs:634
msgid "Connect failed!"
msgstr "连接失败!"
-#: ../src/Engine/Session.cs:622
+#: ../src/Engine/Session.cs:657
#, csharp-format
msgid "Disconnect failed - could not find server: {0}"
msgstr "连接断开失败 - 找不到服务器: {0}"
-#: ../src/Engine/Session.cs:664
+#: ../src/Engine/Session.cs:699
msgid "Reconnect failed!"
msgstr "重新连接失败!"
-#: ../src/Engine/Session.cs:688
+#: ../src/Engine/Session.cs:723
msgid "Configuration reloaded"
msgstr "配置已重新载入"
-#: ../src/Engine/Session.cs:692
+#: ../src/Engine/Session.cs:727
msgid "Configuration saved"
msgstr "配置已保存"
-#: ../src/Engine/Session.cs:723
+#: ../src/Engine/Session.cs:754
msgid "Invalid key/value format."
msgstr "键/值格式无效。"
-#: ../src/Engine/Session.cs:733
+#: ../src/Engine/Session.cs:778
#, csharp-format
msgid "Invalid config key: '{0}'"
msgstr "配置键无效: '{0}'"
-#: ../src/Engine/Session.cs:743 ../src/Engine/Session.cs:749
+#: ../src/Engine/Session.cs:794 ../src/Engine/Session.cs:800
#, csharp-format
msgid "Could not convert config value: '{0}' to type: {1}"
msgstr "无法转换配置键: '{0}' 目标类型: {1}"
-#: ../src/Engine/Session.cs:758
+#: ../src/Engine/Session.cs:814
+#, csharp-format
+msgid ""
+"Invalid config remove key: '{0}'. Valid remove keys: MessagePatterns/{{ID}}."
+msgstr "配置移除键无效: '{0}'。有效的移除键: MessagePatterns/{{ID}}。"
+
+#: ../src/Engine/Session.cs:827
+#, csharp-format
+msgid "Message pattern with ID: '{0}' does not exist."
+msgstr "消息匹配规则 ID: '{0}' 不存在。"
+
+#: ../src/Engine/Session.cs:834
+#, csharp-format
+msgid "Message pattern with ID: '{0}' removed."
+msgstr "消息匹配规则 ID: '{0}' 已移除。"
+
+#: ../src/Engine/Session.cs:842
msgid "Invalid parameter for config; use load, save, get or set."
msgstr "config 参数无效; 请使用 load、save、get 或 set。"
-#: ../src/Engine/Session.cs:850
+#: ../src/Engine/Session.cs:919
msgid "Invalid parameter for network; use list, switch, or close"
msgstr "network 的参数无效; 使用 list、switch 或 close"
#. TRANSLATOR: this line is used as a label / category for a
#. list of networks below
-#: ../src/Engine/Session.cs:880
+#: ../src/Engine/Session.cs:949
msgid "Connected Networks"
msgstr "已连接网络"
-#: ../src/Engine/Session.cs:885 ../src/Engine/Session.cs:909
+#: ../src/Engine/Session.cs:954 ../src/Engine/Session.cs:978
msgid "Network"
msgstr "网络"
-#: ../src/Engine/Session.cs:886
+#: ../src/Engine/Session.cs:955
msgid "Protocol"
msgstr "协议"
-#: ../src/Engine/Session.cs:887
+#: ../src/Engine/Session.cs:956
msgid "Host"
msgstr "主机"
-#: ../src/Engine/Session.cs:888
+#: ../src/Engine/Session.cs:957
msgid "Port"
msgstr "端口"
#. TRANSLATOR: no connected networks
#. TRANSLATOR: no available networks
-#: ../src/Engine/Session.cs:894 ../src/Engine/Session.cs:915
+#: ../src/Engine/Session.cs:963 ../src/Engine/Session.cs:984
msgid "None"
msgstr "无"
#. TRANSLATOR: this line is used as a label / category for a
#. list of networks below
-#: ../src/Engine/Session.cs:901
+#: ../src/Engine/Session.cs:970
msgid "Available Networks"
msgstr "可用网络"
-#: ../src/Engine/Session.cs:929
+#: ../src/Engine/Session.cs:998
#, csharp-format
msgid "Network close failed - could not find network: {0}"
msgstr "网络关闭失败——无法找到网络: {0}"
-#: ../src/Engine/Session.cs:973
+#: ../src/Engine/Session.cs:1042
#, csharp-format
msgid "Network switch failed - could not find network: {0}"
msgstr "网络切换失败——无法找到网络: {0}"
-#: ../src/Engine/Session.cs:991
+#: ../src/Engine/Session.cs:1060
msgid "Not connected to any network"
msgstr "未连接到任何网络"
-#: ../src/Engine/Session.cs:1245
+#: ../src/Engine/Session.cs:1317
#, csharp-format
msgid ""
"Failed to write to chat history. Your chat history will not be preserved. "
@@ -199,24 +219,24 @@ msgstr "无法写入聊天历史。您的聊天历史将不会保存。原因: {
#. just in case the ProtocolManager is not setting the
#. protocol chat
-#: ../src/Engine/Session.cs:1446
+#: ../src/Engine/Session.cs:1550
msgid "Connect failed."
msgstr "连接失败。"
-#: ../src/Engine/Session.cs:1460
+#: ../src/Engine/Session.cs:1564
#, csharp-format
msgid "No protocol manager found for the protocol: {0}"
msgstr "未找到该协议的协议管理器: {0}"
-#: ../src/Engine/Session.cs:1734
+#: ../src/Engine/Session.cs:1896
msgid "Welcome to Smuxi"
msgstr "欢迎来到 Smuxi"
-#: ../src/Engine/Session.cs:1741
+#: ../src/Engine/Session.cs:1903
msgid "Type /help to get a list of available commands."
msgstr "输入 /help 获取可用命令列表。"
-#: ../src/Engine/Session.cs:1747
+#: ../src/Engine/Session.cs:1909
msgid ""
"After you have made a connection the list of available commands changes. Go "
"to the newly opened connection tab and use the /help command again to see "
@@ -258,14 +278,14 @@ msgstr "服务器主机名包含无效字符 (换行)。"
msgid "Server ID '{0}' already exists."
msgstr "服务器 ID '{0}' 已存在。"
-#: ../src/Engine/Chats/ChatModel.cs:108
+#: ../src/Engine/Chats/ChatModel.cs:109
#, csharp-format
msgid ""
"Failed to load chat history. Your chat history will not be preserved. "
"Reason: {0}"
msgstr "无法加载聊天历史。您的聊天历史将不会保留。原因: {0}"
-#: ../src/Engine/Chats/ChatModel.cs:305
+#: ../src/Engine/Chats/ChatModel.cs:311
#, csharp-format
msgid ""
"Failed to open chat history for writing. Your chat history will not be "
diff --git a/po-Frontend-GNOME-IRC/zh_CN.po b/po-Frontend-GNOME-IRC/zh_CN.po
index bbed827..2a74dfe 100644
--- a/po-Frontend-GNOME-IRC/zh_CN.po
+++ b/po-Frontend-GNOME-IRC/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:04+0100\n"
+"POT-Creation-Date: 2015-05-03 12:35+0200\n"
"PO-Revision-Date: 2013-12-13 08:16+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
@@ -55,17 +55,17 @@ msgid "Unban"
msgstr "解封"
#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:430
-#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:63
+#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:92
msgid "Whois"
msgstr "详情"
#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:434
-#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:67
+#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:96
msgid "CTCP"
msgstr "CTCP"
#: ../src/Frontend-GNOME-IRC/IrcGroupChatView.cs:443
-#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:74
+#: ../src/Frontend-GNOME-IRC/IrcPersonChatView.cs:103
msgid "Invite to"
msgstr "邀请加入"
diff --git a/po-Frontend-GNOME-Twitter/zh_CN.po b/po-Frontend-GNOME-Twitter/zh_CN.po
index 467cb5c..3302acd 100644
--- a/po-Frontend-GNOME-Twitter/zh_CN.po
+++ b/po-Frontend-GNOME-Twitter/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:05+0100\n"
+"POT-Creation-Date: 2015-05-03 12:35+0200\n"
"PO-Revision-Date: 2013-12-13 08:16+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
diff --git a/po-Frontend-GNOME-XMPP/zh_CN.po b/po-Frontend-GNOME-XMPP/zh_CN.po
index 7c55416..d7a74c8 100644
--- a/po-Frontend-GNOME-XMPP/zh_CN.po
+++ b/po-Frontend-GNOME-XMPP/zh_CN.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dean Lee <xslidian gmail com>, 2013
+# Dean Lee <xslidian gmail com>, 2013,2015
msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:06+0100\n"
-"PO-Revision-Date: 2013-12-13 08:17+0000\n"
+"POT-Creation-Date: 2015-05-03 12:36+0200\n"
+"PO-Revision-Date: 2015-05-03 19:53+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -18,25 +18,29 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:219
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:247
msgid "Query"
msgstr "私聊"
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:227
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:255
#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:215
msgid "Whois"
msgstr "详情"
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:233
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:261
#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:221
msgid "Add To Contacts"
msgstr "添加到联系人"
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:239
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:267
#: ../src/Frontend-GNOME-XMPP/XmppPersonChatView.cs:227
msgid "Invite to"
msgstr "邀请加入"
-#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:257
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:285
msgid "Rename"
msgstr "改名"
+
+#: ../src/Frontend-GNOME-XMPP/XmppGroupChatView.cs:297
+msgid "Remove"
+msgstr "移除"
diff --git a/po-Frontend-GNOME/zh_CN.po b/po-Frontend-GNOME/zh_CN.po
index 154d677..82d7301 100644
--- a/po-Frontend-GNOME/zh_CN.po
+++ b/po-Frontend-GNOME/zh_CN.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dean Lee <xslidian gmail com>, 2012-2013
+# Dean Lee <xslidian gmail com>, 2012-2015
msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:04+0100\n"
-"PO-Revision-Date: 2013-12-13 08:04+0000\n"
+"POT-Creation-Date: 2015-05-03 12:34+0200\n"
+"PO-Revision-Date: 2015-05-03 19:53+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -40,6 +40,7 @@ msgstr "用户名:"
#: ../glade/smuxi-frontend-gnome.glade.h:5
#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.SteticPreferencesDialog.cs:338
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:177
msgid "Realname:"
msgstr "真名:"
@@ -73,7 +74,7 @@ msgid "Port:"
msgstr "端口:"
#: ../glade/smuxi-frontend-gnome.glade.h:13
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:170
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:254
msgid "Show Password"
msgstr "显示密码"
@@ -431,7 +432,7 @@ msgid "Smuxi - Server"
msgstr "Smuxi - 服务器"
#: ../glade/smuxi-frontend-gnome.glade.h:93
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:209
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:293
msgid "Automatically connect to server at startup"
msgstr "启动时自动连接到服务器"
@@ -463,11 +464,29 @@ msgstr "Smuxi IRC 客户端"
msgid "Chat with other people on IRC"
msgstr "和 IRC 上的其他人聊天"
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:1
+msgid ""
+"Smuxi is an open-source, distributed and user-friendly chat client for IRC, "
+"Twitter, Jabber/XMPP, Campfire and SignalR's JabbR."
+msgstr "Smuxi 是一款开源、简单易用的分布式聊天客户端，兼容 IRC、Twitter、Jabber/XMPP、Campfire 及 SignalR 的 JabbR。"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:2
+msgid ""
+"Inspired by the combination of screen and irssi, Smuxi has a detachable "
+"server (or like a \"normal\" client) that stays connected when you aren't, "
+"and can allow multiple Smuxi frontends to be connected and in sync. This is "
+"similar to screen+irssi or IRC bouncers, but more elegant and powerful."
+msgstr "受 screen 及 irssi 的启发，Smuxi 支持可插拔的服务器（也可以“正常的”客户端模式运行），可在您脱机时保持连接，也允许连接多个 Smuxi 前端并保持同步。这与
screen+irssi 或 IRC 转发器类似，但更为优雅及强大。"
+
+#: ../src/Frontend-GNOME/smuxi-frontend-gnome.appdata.xml.in.h:3
+msgid "The main window showing an IRC channel"
+msgstr "显示某 IRC 频道的主窗口"
+
#: ../src/Frontend-GNOME/AboutDialog.cs:66
msgid "translator-credits"
msgstr "Dean Lee <xslidian+smuxi gmail com>"
-#: ../src/Frontend-GNOME/AboutDialog.cs:73
+#: ../src/Frontend-GNOME/AboutDialog.cs:79
msgid "Smuxi Website"
msgstr "Smuxi 网站"
@@ -487,56 +506,59 @@ msgstr "这是 stacktrace，请报告错误!"
msgid "_Report Bug"
msgstr "报告错误(_R)"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:66
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:61
msgid "Engine not found."
msgstr "引擎未找到。"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:81
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:77
msgid "Engine Manager"
msgstr "引擎管理器"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:100
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:96
msgid "Select which Smuxi engine you want to connect to"
msgstr "选择希望连接到的 Smuxi 引擎"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:106
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:102
msgid "Engine:"
msgstr "引擎:"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:117
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:113
msgid "Use Low Bandwidth Mode"
msgstr "使用低带宽模式"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:141
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:201
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:383
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:137
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:197
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:382
msgid "Local Engine"
msgstr "本地引擎"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:193
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:189
msgid "Please select an engine!"
msgstr "请选择一个引擎!"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:219
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:212
#, csharp-format
-msgid "Your frontend version ({0}) does not match the engine version ({1})!"
-msgstr "您的前端版本 ({0}) 与引擎版本 ({1}) 不匹配!"
+msgid ""
+"Your frontend is not compatible with the engine!\n"
+"Engine Version: {0} Frontend Version: {1}\n"
+"Engine Protocol: {2} Frontend Protocol: {3}"
+msgstr "您的前端与引擎不兼容!\n引擎版本: {0} 前端版本: {1}\n引擎协议: {2} 前端协议: {3}"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:246
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:245
msgid "An error occurred while connecting to the engine!"
msgstr "连接到引擎时出现了一个错误!"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:247
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:246
#, csharp-format
msgid "Engine URL: {0}"
msgstr "引擎 URL: {0}"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:250
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:249
#, csharp-format
msgid "Error: {0}"
msgstr "错误: {0}"
-#: ../src/Frontend-GNOME/EngineManagerDialog.cs:320
+#: ../src/Frontend-GNOME/EngineManagerDialog.cs:319
#, csharp-format
msgid "Are you sure you want to delete the engine \"{0}\"?"
msgstr "您确实要删除引擎 \"{0}\" 吗?"
@@ -552,68 +574,93 @@ msgstr "您正在粘贴 {0} 行。是否继续?"
msgid "Frontend Commands"
msgstr "前端命令"
+#: ../src/Frontend-GNOME/Main.cs:80
+msgid "Bringing already running Smuxi instance to foreground..."
+msgstr "正在将已在运行的 Smuxi 实例切回至前景..."
+
+#: ../src/Frontend-GNOME/MainWindow.cs:374
+#, csharp-format
+msgid "{0} Users"
+msgstr "{0} 个用户"
+
#: ../src/Frontend-GNOME/NotImplementedMessageDialog.cs:40
msgid "Sorry, not implemented yet!"
msgstr "抱歉，尚未实现!"
#. fill ListStore
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:185
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:179
msgid "Character"
msgstr "字符"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:186
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:180
msgid "Word"
msgstr "单词"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:203
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:187
+msgid ""
+"This setting specifies if Smuxi should store chat messages in memory (volatile) or to disk (persistent).\n"
+"For persistent you can choose between Db4o, an object database or SQLite, a relational database.\n"
+"The Db4o backend has known issues like high memory and CPU usage and can even lead to crashes and thus it
is deprecated.\n"
+"The SQLite backend has no known performance or stability issues but is still an optional preview feature."
+msgstr "本设置指定 Smuxi 应将聊天消息保存到内存（易失）还是保存到磁盘（持久）。\n对于持久存储，您可以选择 Db4o、对象数据库或 SQLite（一款关系数据库）。\nDb4o
后端已知存在的问题包括高内存、CPU 占用率，甚至可能导致崩溃，因此已废弃。\nSQLite 后端已知存在性能或稳定性问题，但仍作为可选的预览功能提供。"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:207
msgid "Volatile"
msgstr "临时"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:205
-msgid "Persistent"
-msgstr "持久"
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:209
+msgid "Persistent (Preview)"
+msgstr "持久 (预览)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:212
+msgid "Persistent: Db4o (Deprecated)"
+msgstr "持久: Db4o (废弃)"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:228
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:214
+msgid "Persistent: SQLite (Preview)"
+msgstr "持久: SQLite (预览)"
+
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:238
msgid "No Proxy"
msgstr "无代理"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:230
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:326
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:240
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:336
msgid "System Default"
msgstr "系统默认"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:244
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:140
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:254
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:134
msgid "Connection"
msgstr "连接"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:248
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:258
msgid "Interface"
msgstr "界面"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:252
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:262
msgid "Servers"
msgstr "服务器"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:259
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:269
msgid "Filters"
msgstr "过滤器"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:263
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:273
msgid "Logging"
msgstr "历史"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:682
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:692
msgid "Nicknames(s) field must not be empty."
msgstr "昵称字段不能为空。"
-#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:878
+#: ../src/Frontend-GNOME/Preferences/PreferencesDialog.cs:888
#, csharp-format
msgid "Invalid highlight regex: '{0}'. Reason: {1}"
msgstr "高亮正则表达式无效: '{0}'。原因: {1}"
#: ../src/Frontend-GNOME/FindGroupChatDialog.cs:81
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:106
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:100
#: ../src/Frontend-GNOME/Views/FilterListWidget.cs:265
msgid "Name"
msgstr "名称"
@@ -632,33 +679,33 @@ msgstr "不建议不用过滤器搜索群组聊天。可能要耗费一些时间
msgid "Error while fetching the list of group chats from the server."
msgstr "从服务器装载群组聊天列表出错。"
-#: ../src/Frontend-GNOME/Frontend.cs:401
+#: ../src/Frontend-GNOME/Frontend.cs:398
msgid "Disconnected from engine."
msgstr "从引擎断开连接。"
-#: ../src/Frontend-GNOME/Frontend.cs:443
+#: ../src/Frontend-GNOME/Frontend.cs:440
#, csharp-format
msgid "Reconnecting to engine... (attempt {0})"
msgstr "正在重新连接到引擎... (第 {0} 次尝试)"
-#: ../src/Frontend-GNOME/Frontend.cs:548
+#: ../src/Frontend-GNOME/Frontend.cs:542
#, csharp-format
msgid "Cause: {0}"
msgstr "原因: {0}"
-#: ../src/Frontend-GNOME/Frontend.cs:680
+#: ../src/Frontend-GNOME/Frontend.cs:675
msgid ""
"The frontend has lost the connection to the server.\n"
"Do you want to reconnect now?"
msgstr "前端与服务器之间的连接已丢失。\n是否希望现在重新连接?"
-#: ../src/Frontend-GNOME/Frontend.cs:699
+#: ../src/Frontend-GNOME/Frontend.cs:694
msgid ""
"Reconnecting to the server has failed.\n"
"Do you want to try again?"
msgstr "重新连接到服务器失败。\n是否重试?"
-#: ../src/Frontend-GNOME/Frontend.cs:1007
+#: ../src/Frontend-GNOME/Frontend.cs:1008
msgid ""
"The server has lost the connection to the frontend.\n"
"Do you want to reconnect now?"
@@ -693,31 +740,31 @@ msgstr "成员 / 私聊"
msgid "Group / Public"
msgstr "群组 / 公开"
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:71
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:65
msgid "Engine Assistant - Smuxi"
msgstr "引擎助手 - Smuxi"
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:93
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:87
msgid "Add Smuxi Engine"
msgstr "添加 Smuxi 引擎"
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:95
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:89
msgid "Edit Smuxi Engine"
msgstr "编辑 Smuxi 引擎"
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:204
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:198
msgid "Credentials"
msgstr "证书"
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:284
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:278
msgid "Now you can use the Smuxi Engine"
msgstr "现在您可以使用该 Smuxi 引擎了"
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:287
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:281
msgid "Thank you"
msgstr "谢谢您"
-#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:304
+#: ../src/Frontend-GNOME/Views/Assistants/Engine/EngineAssistant.cs:298
msgid ""
"An engine with this name already exists! Please specify a different one."
msgstr "已存在同名引擎! 请另外指定一个。"
@@ -735,29 +782,29 @@ msgstr "关于 Smuxi"
msgid "Preferences"
msgstr "偏好设置"
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:251
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:263
#: ../src/Frontend-GNOME/Preferences/ServerListView.cs:227
msgid "Unable to add server: "
msgstr "无法添加服务器: "
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:372
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:384
msgid ""
"Switching to local engine will disconnect you from the current engine!\n"
"Are you sure you want to do this?"
msgstr "切换到本地引擎会将您与当前引擎断开!\n您确实大赛这样做吗?"
-#: ../src/Frontend-GNOME/Views/MenuWidget.cs:416
+#: ../src/Frontend-GNOME/Views/MenuWidget.cs:428
msgid ""
"Switching the remote engine will disconnect you from the current engine!\n"
"Are you sure you want to do this?"
msgstr "切换到远程引擎会将您与当前引擎断开!\n您确实大赛这样做吗?"
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:288
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:412
#, csharp-format
msgid "Day changed from {0} to {1}"
msgstr "天数由 {0} 变为 {1}"
-#: ../src/Frontend-GNOME/Views/MessageTextView.cs:292
+#: ../src/Frontend-GNOME/Views/MessageTextView.cs:416
#, csharp-format
msgid "Day changed to {0}"
msgstr "日期已改为 {0}"
@@ -796,35 +843,31 @@ msgstr "类型"
msgid "Pattern"
msgstr "匹配"
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:548
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:557
msgid "Low Bandwidth Mode is active: no messages synced."
msgstr "低带宽模式未启用: 未同步任何信息。"
-#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:792
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
+#: ../src/Frontend-GNOME/Views/Chats/ChatView.cs:839
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:174
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:175
msgid "Show _Menubar"
msgstr "显示菜单栏(_M)"
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:337
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:321
#, csharp-format
msgid "Retrieving user list for {0}..."
msgstr "正在检索 {0} 的用户列表..."
#. TRANSLATOR: this string will be appended to the one above
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:366
+#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:349
msgid "done."
msgstr "完成。"
-#: ../src/Frontend-GNOME/Views/Chats/GroupChatView.cs:398
-msgid "Person"
-msgstr "成员"
-
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:131
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:127
msgid "Reconnect"
msgstr "重新连接"
-#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:180
+#: ../src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs:174
msgid ""
"Closing the protocol chat will also close all open chats connected to it!\n"
"Are you sure you want to do this?"
@@ -863,11 +906,11 @@ msgstr "全文搜索(_W)"
msgid "Use _Regular Expressions"
msgstr "使用正则表达式(_R)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:23
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:32
msgid "Smuxi - Find Group Chat"
msgstr "Smuxi - 查找群组聊天"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:47
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.FindGroupChatDialog.cs:56
#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.OpenChatDialog.cs:73
msgid "_Name:"
msgstr "名称(_N):"
@@ -876,155 +919,155 @@ msgstr "名称(_N):"
msgid "Join"
msgstr "加入"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:55
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:56
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:95
msgid "_Smuxi"
msgstr "_Smuxi"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:58
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:59
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:98
msgid "_Server"
msgstr "服务器(_S)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:61
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:62
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:101
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:64
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:65
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:104
msgid "_Engine"
msgstr "引擎(_E)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:67
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:68
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:107
msgid "_View"
msgstr "视图(_V)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:70
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:71
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:110
msgid "_Help"
msgstr "帮助(_H)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:73
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:75
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
msgid "Connect"
msgstr "连接"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:77
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:79
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:116
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:186
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:187
msgid "Open Log"
msgstr "打开聊天历史"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:87
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:88
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
msgid "_Preferences"
msgstr "偏好设置(_P)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:90
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:91
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:93
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:94
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
msgid "_Connect"
msgstr "连接(_C)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:96
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:97
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:135
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:136
msgid "_Add"
msgstr "添加(_A)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:99
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:100
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
msgid "_Manage"
msgstr "管理(_M)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:102
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:103
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
msgid "_Open / Join Chat"
msgstr "打开(_O) / 加入聊天"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:105
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:106
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
msgid "_Find Group Chat"
msgstr "查找群组聊天(_F)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:108
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:109
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:147
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:148
msgid "C_lear All Activity"
msgstr "清除所有活动(_L)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:111
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:112
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:151
msgid "_Next Chat"
msgstr "下一个聊天(_N)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:114
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:115
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:153
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
msgid "_Previous Chat"
msgstr "上一个聊天(_P)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:117
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:118
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:156
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
msgid "_Close"
msgstr "关闭(_C)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:120
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:121
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:159
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:160
msgid "_Use Local Engine"
msgstr "使用本地引擎(_U)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:123
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:124
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:162
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:163
msgid "_Add Remote Engine"
msgstr "添加远程引擎(_A)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:126
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:127
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:165
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:166
msgid "Switch Remote Engine"
msgstr "切换远程引擎"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:129
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:130
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:168
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:169
msgid "_Caret Mode"
msgstr "插入模式(_C)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:132
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:133
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:171
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:172
msgid "_Browse Mode"
msgstr "浏览模式(_B)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:138
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:139
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:177
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:178
msgid "Show _Statusbar"
msgstr "显示状态栏(_S)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:141
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:142
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:180
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:181
msgid "_Fullscreen"
msgstr "全屏(_F)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:144
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:145
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:183
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:184
msgid "_About"
msgstr "关于(_A)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:150
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:152
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:189
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:191
msgid "Find Group Chat"
msgstr "查找群组聊天"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:154
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:155
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:193
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:194
msgid "_Website"
msgstr "网站(_W)"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:157
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:158
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:196
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.MenuWidget.cs:197
msgid "Show _Toolbar"
msgstr "显示工具栏(_T)"
@@ -1081,7 +1124,7 @@ msgstr "<span size=\"small\">SSH 服务器的 DNS 或者 IP 地址与端口</spa
#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:159
#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantConnectionWidget.cs:173
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:129
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:213
msgid "_Port:"
msgstr "端口(_P):"
@@ -1130,7 +1173,7 @@ msgid ""
msgstr "<span size=\"small\">SSH 私钥文件将用于登录 SSH 服务器</span>"
#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:181
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:188
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:272
msgid "_Username:"
msgstr "用户名(_U):"
@@ -1141,7 +1184,7 @@ msgid ""
msgstr "<span size=\"small\">将用于登录 Smuxi 服务器的用户名</span>"
#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.EngineAssistantCredentialsWidget.cs:224
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:87
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:146
msgid "_Password:"
msgstr "密码(_P):"
@@ -1195,30 +1238,34 @@ msgstr "Smuxi - 开放聊天"
msgid "_Type:"
msgstr "_类型:"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:54
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:88
msgid "_Hostname:"
msgstr "_主机名:"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:75
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:109
msgid "_Network:"
msgstr "_网络:"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:198
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:135
+msgid "Nickname:"
+msgstr "昵称:"
+
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:282
msgid "_Protocol:"
msgstr "_协议:"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:222
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:306
msgid "Use Encryption"
msgstr "使用加密"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:234
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:318
msgid "Validate Server Certificate"
msgstr "验证服务器证书"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:254
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:338
msgid "_On Connect Commands:"
msgstr "连接时命令(_O):"
-#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:265
+#: ../src/Frontend-GNOME/gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs:349
msgid "_Ignore Commands"
msgstr "忽略命令(_I)"
diff --git a/po-Frontend/zh_CN.po b/po-Frontend/zh_CN.po
index e4ed164..5a8f9a6 100644
--- a/po-Frontend/zh_CN.po
+++ b/po-Frontend/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:03+0100\n"
+"POT-Creation-Date: 2015-05-03 12:34+0200\n"
"PO-Revision-Date: 2013-12-13 08:18+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
@@ -18,53 +18,53 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../src/Frontend/CommandManager.cs:343
+#: ../src/Frontend/CommandManager.cs:466
#, csharp-format
msgid "Unknown Command: {0}"
msgstr "未知命令: {0}"
-#: ../src/Frontend/CommandManager.cs:352
+#: ../src/Frontend/CommandManager.cs:475
#, csharp-format
msgid "Not enough parameters for {0} command"
msgstr "{0} 命令参数不足"
-#: ../src/Frontend/EngineManager.cs:122
+#: ../src/Frontend/EngineManager.cs:112
msgid "Engine must not be empty."
msgstr "引擎不能为空。"
-#: ../src/Frontend/EngineManager.cs:133
+#: ../src/Frontend/EngineManager.cs:123
msgid "Engine does not exist."
msgstr "引擎不存在。"
-#: ../src/Frontend/EngineManager.cs:317
+#: ../src/Frontend/EngineManager.cs:313
#, csharp-format
msgid ""
"Unknown channel ({0}) - only the following channel types are supported:"
msgstr "未知频道 ({0}) - 仅支持下列频道类型:"
-#: ../src/Frontend/EngineManager.cs:326
+#: ../src/Frontend/EngineManager.cs:322
msgid ""
"Registration with engine failed! The username and/or password were wrong - "
"please verify them."
msgstr "引擎注册失败! 用户名和/或密码错误 - 请验证。"
-#: ../src/Frontend/SshTunnelManager.cs:144
+#: ../src/Frontend/SshTunnelManager.cs:147
msgid "SSH client application was not found: "
msgstr "未找到 SSH 客户端应用程序: "
-#: ../src/Frontend/SshTunnelManager.cs:147
+#: ../src/Frontend/SshTunnelManager.cs:150
msgid ""
"SSH client must be either OpenSSH (ssh) or Plink (plink.exe, not putty.exe)"
msgstr "SSH 客户端必须为 OpenSSH (ssh) 或 Plink (plink.exe, 而非 putty.exe)"
-#: ../src/Frontend/SshTunnelManager.cs:184
+#: ../src/Frontend/SshTunnelManager.cs:187
#, csharp-format
msgid ""
"The local SSH forwarding port {0} is already in use. Is there an old SSH "
"tunnel still active?"
msgstr "本地 SSH 转发端口 {0} 已被占用。是不是还有旧版 SSH 隧道处于活动状态?"
-#: ../src/Frontend/SshTunnelManager.cs:208
+#: ../src/Frontend/SshTunnelManager.cs:211
#, csharp-format
msgid ""
"SSH tunnel setup failed (exit code: {0})\n"
@@ -78,17 +78,17 @@ msgid ""
"{4}\n"
msgstr "SSH 隧道安装失败 (退出代码: {0})\n\nSSH 程序: {1}\nSSH 参数: {2}\n\n程序错误:\n{3}\n程序输出:\n{4}\n"
-#: ../src/Frontend/SshTunnelManager.cs:329
-#: ../src/Frontend/SshTunnelManager.cs:478
+#: ../src/Frontend/SshTunnelManager.cs:332
+#: ../src/Frontend/SshTunnelManager.cs:481
msgid "SSH keyfile not found."
msgstr "未找到 SSH 密钥文件。"
-#: ../src/Frontend/SshTunnelManager.cs:335
-#: ../src/Frontend/SshTunnelManager.cs:484
+#: ../src/Frontend/SshTunnelManager.cs:338
+#: ../src/Frontend/SshTunnelManager.cs:487
msgid "SSH keyfile could not be read."
msgstr "无法读取 SSH 密钥文件。"
-#: ../src/Frontend/SshTunnelManager.cs:426
+#: ../src/Frontend/SshTunnelManager.cs:429
#, csharp-format
msgid ""
"OpenSSH version number not found (exit code: {0})\n"
@@ -101,11 +101,11 @@ msgid ""
"{3}\n"
msgstr "未发现 OpenSSH 版本号 (退出代码: {0})\n\nSSH 程序: {1}\n\n程序错误:\n{2}\n程序输出:\n{3}\n"
-#: ../src/Frontend/SshTunnelManager.cs:469
+#: ../src/Frontend/SshTunnelManager.cs:472
msgid "PuTTY / Plink requires a username to be set."
msgstr "PuTTY / Plink 需要设置用户名。"
-#: ../src/Frontend/SshTunnelManager.cs:557
+#: ../src/Frontend/SshTunnelManager.cs:560
#, csharp-format
msgid ""
"Plink version number not found (exit code: {0})\n"
diff --git a/po-Server/zh_CN.po b/po-Server/zh_CN.po
index 1f37ebe..3fd6579 100644
--- a/po-Server/zh_CN.po
+++ b/po-Server/zh_CN.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dean Lee <xslidian gmail com>, 2012
+# Dean Lee <xslidian gmail com>, 2012,2014-2015
msgid ""
msgstr ""
"Project-Id-Version: Smuxi - IRC client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-11 17:02+0100\n"
-"PO-Revision-Date: 2013-12-13 08:10+0000\n"
+"POT-Creation-Date: 2015-05-03 12:33+0200\n"
+"PO-Revision-Date: 2015-05-03 19:36+0000\n"
"Last-Translator: Dean Lee <xslidian gmail com>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/smuxi/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
@@ -18,115 +18,119 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../src/Server/Main.cs:71
+#: ../src/Server/Main.cs:65
msgid "Add user to Server"
msgstr "将用户添加到服务器"
-#: ../src/Server/Main.cs:80
+#: ../src/Server/Main.cs:74
msgid "Modify existing user of Server"
msgstr "修改服务器上现存的用户"
-#: ../src/Server/Main.cs:89
+#: ../src/Server/Main.cs:83
msgid "Delete user from Server"
msgstr "将用户从服务器删除"
-#: ../src/Server/Main.cs:98
+#: ../src/Server/Main.cs:92
msgid "List all existing users of Server"
msgstr "列出服务器上所有现存的用户"
-#: ../src/Server/Main.cs:107
+#: ../src/Server/Main.cs:101
msgid "User to create, modify or delete"
msgstr "要创建、修改或删除的用户"
-#: ../src/Server/Main.cs:116
+#: ../src/Server/Main.cs:110
msgid "Password of the user when creating or modifying a user"
msgstr "要创建或修改的用户的密码"
-#: ../src/Server/Main.cs:125
+#: ../src/Server/Main.cs:119
msgid "Enable debug output"
msgstr "启用调试输出"
-#: ../src/Server/Main.cs:133
+#: ../src/Server/Main.cs:127
msgid ""
"Optimize message buffers and exit (valid values: none, defrag, index, all)"
msgstr "优化信息缓存并退出 (有效值: none、defrag、index、all)"
-#: ../src/Server/Main.cs:146
+#: ../src/Server/Main.cs:140
msgid "Show this help"
msgstr "显示本帮助"
-#: ../src/Server/Main.cs:148
+#: ../src/Server/Main.cs:142
msgid "Usage: smuxi-server [options]"
msgstr "用法: smuxi-server [选项]"
-#: ../src/Server/Main.cs:150
+#: ../src/Server/Main.cs:144
msgid "Options:"
msgstr "选项:"
-#: ../src/Server/Main.cs:161
+#: ../src/Server/Main.cs:152
+msgid "Show version"
+msgstr "显示版本"
+
+#: ../src/Server/Main.cs:165
#, csharp-format
msgid "Unknown option: '{0}'"
msgstr "未知选项: '{0}'"
-#: ../src/Server/Main.cs:188
+#: ../src/Server/Main.cs:192
#, csharp-format
msgid "Command line error: {0}"
msgstr "命令行错误: {0}"
-#: ../src/Server/Main.cs:232
+#: ../src/Server/Main.cs:236
msgid ""
"At most one of --add-user, --modify-user, and --delete-user may be used at a"
" time."
-msgstr "--add-user、--modify-user 与 --delete-user 三者每次只能用一个。"
+msgstr "只能选用 --add-user、--modify-user 及 --delete-user 三者中的一个，不可同时使用多个。"
-#: ../src/Server/Main.cs:242
+#: ../src/Server/Main.cs:246
msgid "You must specify a username with the --username option."
msgstr "您必须通过 --username 选项指定用户名。"
-#: ../src/Server/Main.cs:248
+#: ../src/Server/Main.cs:252
msgid "Username must not be empty."
msgstr "用户名不能为空。"
-#: ../src/Server/Main.cs:258
+#: ../src/Server/Main.cs:262
msgid "You must specify a password with the --password option."
msgstr "您必须通过 --password 选项指定密码。"
-#: ../src/Server/Main.cs:264
+#: ../src/Server/Main.cs:268
msgid "Password must not be empty."
msgstr "密码不能为空。"
-#: ../src/Server/Main.cs:283
+#: ../src/Server/Main.cs:287
#, csharp-format
msgid ""
"Invalid optimization value passed to --optimize-message-buffer, valid values"
" are: {0}"
msgstr "传递给 --optimize-message-buffer 的优化参数值无效，有效值有: {0}"
-#: ../src/Server/Main.cs:303
+#: ../src/Server/Main.cs:307
#, csharp-format
msgid "User \"{0}\" successfully added to server."
msgstr "成功将用户 \"{0}\" 添加到服务器。"
-#: ../src/Server/Main.cs:312
+#: ../src/Server/Main.cs:316
#, csharp-format
msgid "User \"{0}\" successfully modified."
msgstr "成功修改用户 \"{0}\"。"
-#: ../src/Server/Main.cs:321
+#: ../src/Server/Main.cs:325
#, csharp-format
msgid "User \"{0}\" successfully deleted from server."
msgstr "成功将用户 \"{0}\" 从服务器删除。"
-#: ../src/Server/Main.cs:328
+#: ../src/Server/Main.cs:332
msgid "Users:"
msgstr "用户:"
-#: ../src/Server/Main.cs:376
+#: ../src/Server/Main.cs:380
#, csharp-format
msgid "Successfully optimized {0} message buffers."
msgstr "成功优化 {0} 块信息缓存。"
-#: ../src/Server/Main.cs:389
+#: ../src/Server/Main.cs:393
#, csharp-format
msgid "Failed to optimize message buffers: {0}"
msgstr "无法优化信息缓存: {0}"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
