aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/zh_CN.po1434
1 files changed, 758 insertions, 676 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a332636df..7c49c1c6b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,14 +12,16 @@
# Yun Nie <yun.nie@ptiglobal.net>, 2009.
# Richard Ma <richard.ma.19850509@gmail.com>, 2009.
# Tao Wei <weitao1979@gmail.com>, 2009.
+# Tao Wang <dancefire@gmail.com>, 2010.
# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-29 15:43+0800\n"
-"PO-Revision-Date: 2010-03-29 18:36+0800\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&component=general\n"
+"POT-Creation-Date: 2010-07-16 08:58+0000\n"
+"PO-Revision-Date: 2010-07-17 15:37+0800\n"
"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -28,388 +30,403 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy"
-msgstr "Empathy"
+msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
+msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务"
#: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Empathy IM 客户端"
+msgid "Empathy"
+msgstr "Empathy"
#: ../data/empathy.desktop.in.in.h:3
-msgid "IM Client"
-msgstr "IM 客户端"
+msgid "Empathy Internet Messaging"
+msgstr "Empathy 互联网通讯"
#: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "发送接收即时消息"
+msgid "IM Client"
+msgstr "IM 客户端"
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
msgid "Always open a separate chat window for new chats."
msgstr "总是为新聊天打开单独的聊天窗口。"
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Chat window theme"
msgstr "聊天窗口主题"
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr "用于拼写检查器的语言的列表,以逗号分隔(例如:en, fr, nl)。"
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Compact contact list"
msgstr "紧凑显示联系人列表"
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Connection managers should be used"
msgstr "应该使用连接管理器"
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Contact list sort criterion"
msgstr "联系人列表排序条件"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "默认的选取头像图片的目录"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Disable popup notifications when away"
msgstr "离开时禁用弹出提示"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable sounds when away"
msgstr "离开时禁用声音"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "在状态栏显示呼入事件。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false present them right away "
+"to the user."
+msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Empathy can publish the user's location"
msgstr "Empathy 能够发布用户的位置"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy 能够通过 GPS 来估计位置"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy 能够通过手机来估计位置"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the network to guess the location"
msgstr "Empathy 能够通过网络来估计位置"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy default download folder"
msgstr "Empathy 默认下载文件夹"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy has asked about importing accounts"
msgstr "Empathy 已经询问导入账户"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
-msgstr ""
+msgstr "Empathy 已迁移 telepathy-butterfly 日志"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 空闲时是否自动离开"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "Empathy 启动时是否自动连接"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "降低 Emapthy 位置信息的准确度"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "启用 WebKit 开发工具"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "启用新消息弹出提示"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "启用拼写检查器"
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "隐藏主窗口"
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "隐藏主窗口。"
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4 账户已经被导入"
-
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4 帐户已经被导入。"
-
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "昵称补全字符"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Adium 主题的路径"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "如果聊天使用 Adium 主题,使用 Adium 主题的路径"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "收到消息时播放声音"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "新对话时播放声音"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "发出消息时播放声音"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "联系人登录时播放声音"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "联系人注销时播放声音"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "登录时播放声音"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "注销时播放声音"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "如果聊天窗口不是焦点则弹出消息通知"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "当联系人登录时弹出通知"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "当联系人注销时弹出通知"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Show avatars"
msgstr "显示头像"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show contact list in rooms"
msgstr "在聊天室显示联系人列表"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show hint about closing the main window"
msgstr "关闭主窗口时显示提示"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show offline contacts"
msgstr "显示离线联系人"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show protocols"
msgstr "显示协议"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Spell checking languages"
msgstr "拼写检查器语言"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "The default folder to save file transfers in."
msgstr "保存传送文件的默认文件夹。"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The last directory that an avatar image was chosen from."
msgstr "上次选取头像图片的目录。"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The position for the chat window side pane"
+msgstr "聊天窗口边栏的位置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "聊天窗口边栏保存的位置(像素)。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用于在聊天窗口中显示会话的主题。"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Use graphical smileys"
msgstr "使用表情图标"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Use notification sounds"
msgstr "使用通知声音"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use theme for chat rooms"
msgstr "为聊天室使用主题"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "是否允许 Empathy 将用户的位置共享给联系人"
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "是否允许 Empathy 通过 GPS 估计位置"
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "是否允许 Empathy 通过手机网络估计位置"
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the network to guess the location."
msgstr "是否允许 Empathy 通过网络估计位置"
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy has asked about importing accounts from other programs."
msgstr "Empathy 是否应该已经询问过要从其它程序中导入账户。"
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy has migrated butterfly logs."
-msgstr ""
+msgstr "Empathy 是否迁移 telepathy-butterfly 日志。"
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否在启动时自动登入您的账户。"
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgstr "Empathy 是否在空闲时自动进入离开状态"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "是否使用联系人的头像作为聊天窗口的图标。"
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "WebKit 开发工具,例如 Web Inspector 是否应该启用。"
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "是否使用连接管理器自动断开连接或重新连接。"
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "是否对您想要作拼写检查的单词作拼写检查。"
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "对话时是否将表情符号转换为表情图标。"
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "是否需要联系人上线提示音。"
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "是否需要联系人下线提示音。"
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to play a sound to notify of events."
msgstr "是否需要事件提示音。"
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of incoming messages."
msgstr "是否需要消息到达提示音。"
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of new conversations."
msgstr "是否需要新会话提示音。"
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "是否为外出消息使用声音提示。"
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound when logging into a network."
msgstr "当联网登录时是否播放提示音。"
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging out of a network."
msgstr "当网络断开时是否播放提示音。"
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play sound notifications when away or busy."
msgstr "当离开或忙碌时是否使用声音提示。"
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "当联系人离线时是否显示弹出通知。"
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes online."
msgstr "当联系人上线时是否显示弹出通知"
-#: ../data/empathy.schemas.in.h:78
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
-msgstr "当接收新消息时是否显示弹出提示即聊天窗口已开启,但未闲置。"
+msgstr "当接收新消息时是否显示弹出提示,即使聊天窗口已打开,但是不在焦点上。"
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when receiving a new message."
msgstr "当收到新消息时是否弹出显示提示框。"
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "是否在联系人列表和聊天窗口中显示头像。"
-#: ../data/empathy.schemas.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to show contacts that are offline in the contact list."
msgstr "是否显示联系人清单中离线的联系人。"
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show popup notifications when away or busy."
msgstr "当离开或忙碌时是否弹出显示提示框。"
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show protocols for contacts in the contact list."
msgstr "是否在联系人列表和聊天窗口中显示协议。"
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show the contact list in chat rooms."
msgstr "是否在聊天室显示联系人列表。"
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show the contact list in compact mode."
msgstr "是否以紧凑模式显示联系人列表。"
-#: ../data/empathy.schemas.in.h:86
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr "是否对使用标题栏中的“X”按钮关闭主窗口显示消息对话框。"
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to use the theme for chat rooms."
msgstr "是否对聊天室使用主题。"
-#: ../data/empathy.schemas.in.h:88
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -424,61 +441,56 @@ msgstr "管理消息和 VoIP 帐户"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243
+#: ../src/empathy-accounts-dialog.c:2094 ../src/cc-empathy-accounts-page.c:244
#: ../src/cc-empathy-accounts-panel.c:91
msgid "Messaging and VoIP Accounts"
msgstr "消息和 VoIP 帐户"
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:843
msgid "The hash of the received file and the sent one do not match"
msgstr "接收到的文件和发送的那个文件哈希值不匹配"
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1103
msgid "File transfer not supported by remote contact"
msgstr "文件传输不支持远程连接"
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1161
msgid "The selected file is not a regular file"
msgstr "所选文件是非正常的文件"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1170
msgid "The selected file is empty"
msgstr "所选文件是空的"
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:281
msgid "Socket type not supported"
msgstr "不支持 Socket 类型"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:400
msgid "No reason was specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:403
msgid "The change in state was requested"
msgstr "需要状态改变信息"
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:406
msgid "You canceled the file transfer"
msgstr "您取消了文件传输"
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:409
msgid "The other participant canceled the file transfer"
msgstr "另外的参与者取消了文件的传输"
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:412
msgid "Error while trying to transfer the file"
msgstr "当传输这个文件的时候发生错误"
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:415
msgid "The other participant is unable to transfer the file"
msgstr "另外的参与者无法传输这个文件"
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:315
msgid "Unknown reason"
msgstr "未知原因"
@@ -502,71 +514,77 @@ msgstr "隐身"
msgid "Offline"
msgstr "离线"
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:249 ../src/empathy-call-window.c:1763
+#: ../src/empathy-call-window.c:1764 ../src/empathy-call-window.c:1765
+#: ../src/empathy-call-window.c:1766 ../src/empathy-call-window.ui.h:16
+msgid "Unknown"
+msgstr "未知"
+
+#: ../libempathy/empathy-utils.c:287
msgid "No reason specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:289
msgid "Status is set to offline"
msgstr "状态已设置为离线"
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:291
msgid "Network error"
msgstr "网络错误"
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:293
msgid "Authentication failed"
msgstr "验证失败"
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
msgid "Encryption error"
msgstr "加密错误"
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:297
msgid "Name in use"
msgstr "用户名已经被占用"
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:299
msgid "Certificate not provided"
msgstr "未提供证书"
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:301
msgid "Certificate untrusted"
msgstr "证书不被信任"
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:303
msgid "Certificate expired"
msgstr "证书已过期"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:305
msgid "Certificate not activated"
msgstr "证书尚未激活"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:307
msgid "Certificate hostname mismatch"
msgstr "证书主机名不匹配"
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:309
msgid "Certificate fingerprint mismatch"
msgstr "证书指纹不匹配"
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
msgid "Certificate self-signed"
msgstr "证书是自签属的"
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:313
msgid "Certificate error"
msgstr "证书错误"
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:430
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:435
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:436
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -610,25 +628,25 @@ msgstr[0] "%d 月前"
msgid "in the future"
msgstr "将来"
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:549
+#: ../libempathy-gtk/empathy-account-widget.c:605
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1136
msgid "Username:"
msgstr "用户名:"
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1479
msgid "L_og in"
msgstr "登录(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-account-widget.c:1547
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
@@ -636,16 +654,15 @@ msgstr "登录(_O)"
msgid "Account:"
msgstr "账户:"
-#: ../libempathy-gtk/empathy-account-widget.c:1553
+#: ../libempathy-gtk/empathy-account-widget.c:1558
msgid "Enabled"
msgstr "启用"
-#: ../libempathy-gtk/empathy-account-widget.c:1618
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget.c:1623
msgid "This account already exists on the server"
-msgstr "这不会删除服务器上的账户。"
+msgstr "服务器上已存在该账户。"
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1626
msgid "Create a new account on the server"
msgstr "在服务器上创建新的帐户"
@@ -654,19 +671,19 @@ msgstr "在服务器上创建新的帐户"
#. * like: "MyUserName on chat.freenode.net".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1995
#, c-format
msgid "%1$s on %2$s"
msgstr "%2$s 中的 %1$s"
#. To translators: The parameter is the protocol name. The resulting
#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2039
+#: ../libempathy-gtk/empathy-account-widget.c:2021
#, c-format
msgid "%s Account"
msgstr "%s 账户"
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2025
msgid "New account"
msgstr "新建账户"
@@ -691,7 +708,7 @@ msgstr "高级"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "密码(_W):"
@@ -767,40 +784,40 @@ msgstr "您的 ICQ 密码是什么?"
msgid "_Character set:"
msgstr "字符集(_C):"
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
+#: ../libempathy-gtk/empathy-account-widget-irc.c:245
msgid "New Network"
msgstr "新建网络"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
msgid "Auto"
msgstr "自动"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:221
msgid "Register"
msgstr "注册"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:226
msgid "Options"
msgstr "选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
msgid "None"
msgstr "无"
@@ -864,6 +881,10 @@ msgid ""
"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
"Facebook username if you don't have one."
msgstr ""
+"这是您的用户名,而不是您正常的 Facebook 登录名。\n"
+"如果您是 facebook.com/<b>badger</b>,输入\n"
+"<b>badger</b>。如果您没有 Facebook 用户名的话,使用<a href=\"http://www."
+"facebook.com/username/\">此页面</a> 来选择一个。"
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "Use old SS_L"
@@ -955,97 +976,65 @@ msgstr "验证用户名:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
msgid "Discover Binding"
-msgstr ""
+msgstr "发现绑定"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
msgid "Discover the STUN server automatically"
-msgstr ""
+msgstr "自动的发现 STUN 服务器"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "间隔(秒)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Keep-Alive Options"
msgstr "Keep-Alive 选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid ""
-"Look up the DNS SRV record at the service's domain for the host name of a "
-"STUN server."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Loose Routing"
-msgstr ""
+msgstr "宽松路由"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Mechanism:"
msgstr "机制:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Miscellaneous Options"
msgstr "杂项"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "NAT Traversal Options"
msgstr "NAT 选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "出站代理端口"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
msgid "Port:"
msgstr "端口:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Proxy Options"
msgstr "代理选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "STUN Server:"
msgstr "STUN 服务器:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Server:"
msgstr "服务器:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid ""
-"The username for SIP authentication, if different from the SIP URI\n"
-"username."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
msgid "Transport:"
msgstr "传输:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid ""
-"Update the registration binding if the external address for the client is "
-"discovered to be different from the local binding."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid ""
-"Use the loose routing behavior and the Route header as recommended in RFC "
-"3261."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "What is your SIP account password?"
msgstr "您的 SIP 账户密码是什么?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
msgid "What is your SIP login ID?"
msgstr "您的 SIP 登录 ID 是什么?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "_Username:"
msgstr "用户名(_U):"
@@ -1073,179 +1062,173 @@ msgstr "忽略会议和聊天室邀请(_I)"
msgid "_Room List locale:"
msgstr "聊天室列表 locale(_R):"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
msgid "Couldn't convert image"
msgstr "无法转换图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-#, fuzzy
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
msgid "None of the accepted image formats are supported on your system"
-msgstr "没有一个公认的图片格式能被您的系统支持"
+msgstr "没有任何接受的图片格式能被您的系统支持"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
msgid "Select Your Avatar Image"
msgstr "选择您的头像图片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "No Image"
msgstr "无图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
msgid "Images"
msgstr "图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
msgid "All Files"
msgstr "所有文件"
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:325
msgid "Click to enlarge"
msgstr "单击以放大"
-#: ../libempathy-gtk/empathy-chat.c:233
-msgid "Failed to reconnect this chat"
-msgstr "重新连接到对话失败"
-
-#: ../libempathy-gtk/empathy-chat.c:655
-msgid "Failed to join chat room"
-msgstr "加入聊天室失败"
-
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:645
msgid "Failed to open private chat"
msgstr "建立私人对话失败"
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:685
msgid "Topic not supported on this conversation"
msgstr "不支持在此会话上设置主题"
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:691
msgid "You are not allowed to change the topic"
msgstr "您不能更改主题"
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:825
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear,清空当前会话的所有消息"
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:828
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主题>,设定当前对话的主题"
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:831
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室名>,加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:834
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室名>,加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:839
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <昵称> [<消息>],打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:842
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <昵称> <消息>,打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:846
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <昵称>,在当前服务器上改变您的昵称"
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:849
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <动作消息>,向当前对话中发送一个动作消息"
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:852
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
"join a new chat room\""
msgstr ""
-"/say <消息>,发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例"
-"如:“/say /join 是用来加入一个新的聊天室”"
+"/say <消息>,发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如:“/"
+"say /join 是用来加入一个新的聊天室”"
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:857
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
-"/help [<命令>],显示所有支持的命令。如果 <命令> 是有定义的,则显示它的用"
-"法。"
+"/help [<命令>],显示所有支持的命令。如果 <命令> 是有定义的,则显示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:867
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:896
msgid "Unknown command"
msgstr "未知命令"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1017
msgid "Unknown command; see /help for the available commands"
msgstr "未知命令,请使用 /help 查阅可用命令"
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1155
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1158
msgid "invalid contact"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1161
msgid "permission denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1164
msgid "too long message"
msgstr "消息太长"
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1167
msgid "not implemented"
msgstr "尚未实现"
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1170
msgid "unknown"
msgstr "未知"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1174
#, c-format
msgid "Error sending message '%s': %s"
msgstr "发送消息“%s”出错:%s"
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:691
+msgid "Topic:"
+msgstr "话题:"
+
+#: ../libempathy-gtk/empathy-chat.c:1296
#, c-format
msgid "Topic set to: %s"
msgstr "话题被设置为:%s"
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1298
msgid "No topic defined"
msgstr "未设置话题"
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1777
msgid "(No Suggestions)"
msgstr "(没有建议)"
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1831
msgid "Insert Smiley"
msgstr "插入表情"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1675
+#: ../libempathy-gtk/empathy-chat.c:1849
+#: ../libempathy-gtk/empathy-ui-utils.c:1619
msgid "_Send"
msgstr "发送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1883
msgid "_Spelling Suggestions"
msgstr "拼写建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1960
msgid "Failed to retrieve recent logs"
msgstr "获取最近日志失败"
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2066
#, c-format
msgid "%s has disconnected"
msgstr "%s 已断开连接"
@@ -1253,12 +1236,12 @@ msgstr "%s 已断开连接"
#. translators: reverse the order of these arguments
#. * if the kicked should come before the kicker in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1967
+#: ../libempathy-gtk/empathy-chat.c:2073
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出"
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:2076
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1266,17 +1249,17 @@ msgstr "%s 被踢出"
#. translators: reverse the order of these arguments
#. * if the banned should come before the banner in your locale.
#.
-#: ../libempathy-gtk/empathy-chat.c:1978
+#: ../libempathy-gtk/empathy-chat.c:2084
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%s 已被 %s 禁止"
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2087
#, c-format
msgid "%s was banned"
msgstr "%s 被禁止"
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2091
#, c-format
msgid "%s has left the room"
msgstr "%s 离开了聊天室"
@@ -1286,81 +1269,77 @@ msgstr "%s 离开了聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1994
+#: ../libempathy-gtk/empathy-chat.c:2100
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2125
#, c-format
msgid "%s has joined the room"
msgstr "%s 加入了聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2150
#, c-format
msgid "%s is now known as %s"
msgstr "%s 现在叫做 %s"
-#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532
+#: ../libempathy-gtk/empathy-chat.c:2289 ../src/empathy-call-window.c:1802
msgid "Disconnected"
msgstr "已断开连接"
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2927
msgid "Wrong password; please try again:"
msgstr "密码错误,请重试:"
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2928
msgid "Retry"
msgstr "重试"
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2933
msgid "This room is protected by a password:"
msgstr "这个房间是由一个密码保护的:"
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2934
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:3074
msgid "Connected"
msgstr "已连接"
-#: ../libempathy-gtk/empathy-chat.c:2901
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3127
+#: ../libempathy-gtk/empathy-log-window.c:639
msgid "Conversation"
msgstr "对话"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:672
-msgid "Topic:"
-msgstr "话题:"
-
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:785
msgid "_Copy Link Address"
msgstr "复制链接地址(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:792
msgid "_Open Link"
msgstr "打开链接(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
msgid "Edit Contact Information"
msgstr "编辑联系人信息"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
msgid "Personal Information"
msgstr "个人信息"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
msgid "New Contact"
msgstr "新建联系人"
@@ -1372,214 +1351,234 @@ msgstr "以后再决定(_L)"
msgid "Subscription Request"
msgstr "订阅请求"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-view.c:1984
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "您真的要删除群组“%s”吗?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
msgid "Removing group"
msgstr "删除群组"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
+#: ../libempathy-gtk/empathy-contact-list-view.c:2035
+#: ../libempathy-gtk/empathy-contact-list-view.c:2112
#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Remove"
msgstr "删除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2065
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "您真的想要删除联系人“%s”吗?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
msgid "Removing contact"
msgstr "删除联系人"
-#: ../libempathy-gtk/empathy-contact-menu.c:206
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
msgid "_Add Contact…"
msgstr "添加联系人(_A)..."
-#: ../libempathy-gtk/empathy-contact-menu.c:233
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../src/empathy-main-window.ui.h:14
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:264
+#: ../libempathy-gtk/empathy-contact-menu.c:261
msgctxt "menu item"
msgid "_Audio Call"
msgstr "音频呼叫(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:296
+#: ../libempathy-gtk/empathy-contact-menu.c:291
msgctxt "menu item"
msgid "_Video Call"
msgstr "视频呼叫(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:347
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:331
+#: ../src/empathy-main-window.ui.h:25
msgid "_Previous Conversations"
msgstr "最近会话(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:353
+msgid "Send File"
msgstr "发送文件"
-#: ../libempathy-gtk/empathy-contact-menu.c:392
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:376
+msgid "Share My Desktop"
msgstr "共享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-contact-widget.c:1379
+#: ../libempathy-gtk/empathy-contact-menu.c:416
+#: ../libempathy-gtk/empathy-contact-widget.c:1819
msgid "Favorite"
msgstr "收藏夹"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-contact-menu.c:445
msgid "Infor_mation"
msgstr "信息(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:508
+#: ../libempathy-gtk/empathy-contact-menu.c:491
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "编辑(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:562
-#: ../src/empathy-chat-window.c:857
+#: ../libempathy-gtk/empathy-contact-menu.c:545
+#: ../src/empathy-chat-window.c:903
msgid "Inviting you to this room"
msgstr "邀请到此聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:576
+msgid "_Invite to Chat Room"
msgstr "邀请到聊天室(_I)"
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "选择一个联系"
-#: ../libempathy-gtk/empathy-contact-widget.c:238
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+msgid "Full name:"
+msgstr "全称:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+msgid "Phone number:"
+msgstr "电话号码:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+msgid "E-mail address:"
+msgstr "E-mail 地址:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:222
+msgid "Website:"
+msgstr "网站:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:223
+msgid "Birthday:"
+msgstr "生日:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:614
msgid "Select"
msgstr "选择"
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1050
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../src/empathy-main-window.c:1171
msgid "Group"
msgstr "群组"
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:854
msgid "Country ISO Code:"
msgstr "包括 ISO 编码:"
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:856
msgid "Country:"
msgstr "国家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:858
msgid "State:"
msgstr "省:"
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:860
msgid "City:"
msgstr "城市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:862
msgid "Area:"
msgstr "地区:"
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:864
msgid "Postal Code:"
msgstr "邮政编码:"
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:866
msgid "Street:"
msgstr "街道:"
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:868
msgid "Building:"
msgstr "建筑物:"
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:870
msgid "Floor:"
msgstr "楼层:"
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:872
msgid "Room:"
msgstr "房间:"
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:874
msgid "Text:"
msgstr "文本:"
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:876
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:878
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:880
msgid "Accuracy Level:"
msgstr "准确程度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:882
msgid "Error:"
msgstr "错误:"
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:884
msgid "Vertical Error (meters):"
msgstr "垂直误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:886
msgid "Horizontal Error (meters):"
msgstr "水平误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:888
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:890
msgid "Bearing:"
msgstr "方位朝向:"
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:892
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:894
msgid "Last Updated on:"
msgstr "最近更新于:"
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:896
msgid "Longitude:"
msgstr "经度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:898
msgid "Latitude:"
msgstr "纬度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:900
msgid "Altitude:"
msgstr "海拔:"
-#: ../libempathy-gtk/empathy-contact-widget.c:587
+#: ../libempathy-gtk/empathy-contact-widget.c:963
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:979
msgid "<b>Location</b>, "
msgstr "<b>位置</b>,"
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:1030
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e,%Y 于 %R UTC 时间"
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:1113
msgid "Save Avatar"
msgstr "保存头像"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:1169
msgid "Unable to save avatar"
msgstr "无法保存头像"
@@ -1592,61 +1591,45 @@ msgid "Alias:"
msgstr "别名:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "生日:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client Information"
msgstr "客户端信息"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
msgid "Client:"
msgstr "客户端:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
msgid "Contact Details"
msgstr "联系人详情"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "全称:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
msgid "Groups"
msgstr "组"
#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
msgid "Identifier:"
msgstr "标识符:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
msgid "Information requested…"
msgstr "已发送信息请求..."
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
msgid "OS:"
msgstr "操作系统:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
msgid ""
"Select the groups you want this contact to appear in. Note that you can "
"select more than one group or no groups."
msgstr "选择您想将该联系人加入的群组。注意您可以选择多个群组,也可以不选择。"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
msgid "Version:"
msgstr "版本:"
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "网站:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
msgid "_Add Group"
msgstr "添加群组(_A)"
@@ -1666,12 +1649,12 @@ msgstr "端口"
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
+#: ../libempathy-gtk/empathy-log-window.c:632
+#: ../src/empathy-import-widget.c:312
msgid "Account"
msgstr "账户"
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-log-window.c:649
msgid "Date"
msgstr "日期"
@@ -1696,28 +1679,28 @@ msgid "Contact ID:"
msgstr "联系人 ID:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
msgid "C_hat"
msgstr "聊天(_H)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
msgid "New Conversation"
msgstr "新建对话"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:190
msgid "Send _Video"
msgstr "发送视频(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
-#: ../src/empathy-call-window.ui.h:17
+#: ../libempathy-gtk/empathy-new-call-dialog.c:198
+#: ../src/empathy-call-window.ui.h:22
msgid "_Call"
msgstr "通话(_C)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:208
msgid "New Call"
msgstr "新建通话"
@@ -1754,7 +1737,7 @@ msgid "Set your presence and current status"
msgstr "设置你的状态信息和现在的状态"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1128
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
msgid "Custom messages…"
msgstr "自定义消息..."
@@ -1770,43 +1753,43 @@ msgstr "区分大小写"
msgid "Phrase not found"
msgstr "未找到短语"
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
msgid "Received an instant message"
msgstr "收到了即时消息"
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
msgid "Sent an instant message"
msgstr "发送即时消息"
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
msgid "Incoming chat request"
msgstr "收到的聊天请求"
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
msgid "Contact connected"
msgstr "联系人已连接"
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
msgid "Contact disconnected"
msgstr "联系人已断开"
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
msgid "Connected to server"
msgstr "已连接到服务器"
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
msgid "Disconnected from server"
msgstr "已从服务器断开连接"
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
msgid "Incoming voice call"
msgstr "呼入的语音通话"
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
msgid "Outgoing voice call"
msgstr "呼出的语音通话"
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
msgid "Voice call ended"
msgstr "语音通话结束"
@@ -1842,17 +1825,18 @@ msgstr "清爽"
msgid "Blue"
msgstr "蓝色"
-#: ../libempathy-gtk/empathy-ui-utils.c:1550
+#: ../libempathy-gtk/empathy-ui-utils.c:1516
msgid "Unable to open URI"
msgstr "无法打开 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1667
+#: ../libempathy-gtk/empathy-ui-utils.c:1611
msgid "Select a file"
msgstr "选择文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1731
-msgid "Select a destination"
-msgstr "选择目的地"
+#: ../libempathy-gtk/empathy-ui-utils.c:1680
+#, c-format
+msgid "Incoming file from %s"
+msgstr "从 %s 传送来文件"
#: ../libempathy-gtk/totem-subtitle-encoding.c:158
msgid "Current Locale"
@@ -2033,19 +2017,20 @@ msgstr "选择的联系人离线。"
msgid "No error message"
msgstr "无错误信息"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
msgid "Instant Message (Empathy)"
msgstr "即时消息(Empathy)"
-#: ../src/empathy.c:584
+#: ../src/empathy.c:474
msgid "Don't connect on startup"
msgstr "启动时不自动登录"
-#: ../src/empathy.c:588
+#: ../src/empathy.c:478
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "启动时不显示联系人列表"
-#: ../src/empathy.c:600
+#: ../src/empathy.c:490
msgid "- Empathy IM Client"
msgstr " - Empathy IM 客户端"
@@ -2086,8 +2071,17 @@ msgstr "一个 GNOME 即时消息客户端"
#: ../src/empathy-about-dialog.c:127
msgid "translator-credits"
msgstr ""
-"YangZhang, <zyangmath@gmail.com>\n"
-"Aron Xu <aronxu@gnome.org>\n"
+"Abel Cheung <maddog@linux.org.hk>, 2003\n"
+"Mai Haohui <maihaohui@hotmail.com>, 2003\n"
+"Rongjun Mu <elanmu@sina.com>, 2003\n"
+"YangZhang <zyangmath@gmail.com>, 2008\n"
+"Funda Wang <fundawang@gmail.com>, 2009\n"
+"Lyper Lai <lyp069@gmail.com>, 2009\n"
+"Yun Nie <yun.nie@ptiglobal.net>, 2009\n"
+"Richard Ma <richard.ma.19850509@gmail.com>, 2009\n"
+"Tao Wei <weitao1979@gmail.com>, 2009\n"
+"Aron Xu <happyaron.xu@gmail.com>, 2009, 2010\n"
+"Tao Wang <dancefire@gmail.com>, 2010\n"
"\n"
"Launchpad Contributions:\n"
" =KK= https://launchpad.net/~sevkme\n"
@@ -2127,7 +2121,7 @@ msgstr ""
"您可以返回尝试重新输入您的账户信息,或者退出助理,然后从编辑菜单中加入账户。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1303
+#: ../src/empathy-account-assistant.c:1315
msgid "An error occurred"
msgstr "发生错误"
@@ -2136,36 +2130,36 @@ msgstr "发生错误"
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:606
#, c-format
msgid "New %s account"
msgstr "新建 %s 账户"
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:510
msgid "What kind of chat account do you have?"
msgstr "您已经拥有哪个类型的帐户?"
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:516
msgid "Do you have any other chat accounts you want to set up?"
msgstr "您还要设置其它聊天账户吗?"
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:522
msgid "Enter your account details"
msgstr "输入您的帐户详情"
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:527
msgid "What kind of chat account do you want to create?"
msgstr "您想创建那种类型的帐户?"
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:533
msgid "Do you want to create other chat accounts?"
msgstr "您想要创建其它的聊天账户吗、"
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:540
msgid "Enter the details for the new account"
msgstr "输入新账户的详细资料"
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:655
msgid ""
"With Empathy you can chat with people online nearby and with friends and "
"colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2176,146 +2170,152 @@ msgstr ""
"Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头,您就可以开始音频"
"和视频通话。"
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:672
msgid "Do you have an account you've been using with another chat program?"
msgstr "您有没有其它聊天软件的账户?"
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:695
msgid "Yes, import my account details from "
msgstr "有,请导入我的账户信息"
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:716
msgid "Yes, I'll enter my account details now"
msgstr "有,我现在就输入我的账户信息"
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:738
msgid "No, I want a new account"
msgstr "不,我想要一个新的账户。"
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:748
msgid "No, I just want to see people online nearby for now"
msgstr "没有,我只是想看看附近现在谁在线上"
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:769
msgid "Select the accounts you want to import:"
msgstr "选择您要导入的账户:"
-#: ../src/empathy-account-assistant.c:851
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-account-assistant.c:853
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:860
msgid "No, that's all for now"
msgstr "没有,就这样吧。"
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1129
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
"details below are correct. You can easily change these details later or "
"disable this feature by using the 'Accounts' dialog"
msgstr ""
+"Empathy 可以自动发现像您一样连接到同样的网络中的人们,并且可以和他们聊天。如"
+"果您想使用这个功能,请仔细查看下列信息是否正确。您之后也可以通过“账户”对话框"
+"轻松的修改这些信息或关闭这个功能。"
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
msgid "Edit->Accounts"
msgstr "编辑->账户"
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1151
msgid "I don't want to enable this feature for now"
msgstr "暂不启用此特性"
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1187
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
"install the telepathy-salut package and create a People Nearby account from "
"the Accounts dialog"
msgstr ""
+"您无法同连接到您局域网中的用户聊天,因为没有安装 telepathy-salut。如果您想启"
+"用该功能,请安装 telepathy-salut 包,并且在账户对话框中创建附近的人(People "
+"Nearby) 账户。"
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1193
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 未安装"
-#: ../src/empathy-account-assistant.c:1227
+#: ../src/empathy-account-assistant.c:1239
msgid "Messaging and VoIP Accounts Assistant"
msgstr "消息和 VoIP 帐户助手"
-#: ../src/empathy-account-assistant.c:1261
+#: ../src/empathy-account-assistant.c:1273
msgid "Welcome to Empathy"
msgstr "欢迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1270
+#: ../src/empathy-account-assistant.c:1282
msgid "Import your existing accounts"
msgstr "导入现有帐户"
-#: ../src/empathy-account-assistant.c:1288
+#: ../src/empathy-account-assistant.c:1300
msgid "Please enter personal details"
-msgstr ""
+msgstr "请输入个人信息"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
#, c-format
msgid "There are unsaved modifications to your %s account."
msgstr "您的 %s 账户有未保存的修改。"
#. The primary text of the dialog shown to the user when he is about to lose
#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:70
+#: ../src/empathy-accounts-dialog.c:69
msgid "Your new account has not been saved yet."
msgstr "您的新帐户还没有保存。"
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:273 ../src/empathy-call-window.c:799
msgid "Connecting…"
msgstr "正在连接..."
-#: ../src/empathy-accounts-dialog.c:290
-#, c-format
-msgid "Disconnected — %s"
-msgstr "已断开 - %s"
-
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:314
#, c-format
msgid "Offline — %s"
msgstr "离线 - %s"
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:326
+#, c-format
+msgid "Disconnected — %s"
+msgstr "已断开 - %s"
+
+#: ../src/empathy-accounts-dialog.c:337
msgid "Offline — No Network Connection"
msgstr "离线 - 无可用网络"
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:344
msgid "Unknown Status"
msgstr "未知状态"
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:356
msgid "Offline — Account Disabled"
msgstr "离线 - 帐户被禁用"
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:797
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "您将要创建一个新账户,所做的修改将作废。您确定要继续吗?"
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1144
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "您要从电脑中移除 %s 吗?"
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1148
msgid "This will not remove your account on the server."
msgstr "这不会删除服务器上的账户。"
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1385
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "您将要选择另一个账户,所做的修改将作废。您确定要继续吗?"
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:1962
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
@@ -2343,98 +2343,107 @@ msgstr "添加(_A)..."
msgid "_Import…"
msgstr "导入(_I)..."
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-auto-salut-account-helper.c:78
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../src/empathy-call-window.c:470
msgid "Contrast"
msgstr "对比度"
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:473
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:476
msgid "Gamma"
msgstr "伽马"
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:581
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1146
msgid "_Sidebar"
msgstr "侧边栏(_S)"
-#: ../src/empathy-call-window.c:1041
+#: ../src/empathy-call-window.c:1165
msgid "Audio input"
msgstr "音频输入"
-#: ../src/empathy-call-window.c:1045
+#: ../src/empathy-call-window.c:1169
msgid "Video input"
msgstr "视频输入"
-#: ../src/empathy-call-window.c:1049
+#: ../src/empathy-call-window.c:1173
msgid "Dialpad"
msgstr "电话键盘"
+#: ../src/empathy-call-window.c:1178
+#| msgid "Contact Details"
+msgid "Details"
+msgstr "详细信息"
+
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-call-window.c:1117
+#: ../src/empathy-call-window.c:1246
#, c-format
msgid "Call with %s"
msgstr "与 %s 通话"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../src/empathy-call-window.c:1198
+#: ../src/empathy-call-window.c:1325
msgid "Call"
msgstr "通话"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1695
+#: ../src/empathy-call-window.c:2117
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已连接 — %d:%02dm"
-#: ../src/empathy-call-window.c:1756
+#: ../src/empathy-call-window.c:2178
msgid "Technical Details"
msgstr "技术细节"
-#: ../src/empathy-call-window.c:1794
+#: ../src/empathy-call-window.c:2216
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
-msgstr ""
+msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:2221
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
-msgstr ""
+msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
-#: ../src/empathy-call-window.c:1805
+#: ../src/empathy-call-window.c:2227
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
"does not allow direct connections."
msgstr "不能与 %s 建立连接。可能是两台计算机之一不允许直接连接。"
-#: ../src/empathy-call-window.c:1811
+#: ../src/empathy-call-window.c:2233
msgid "There was a failure on the network"
msgstr "网络出现一个错误"
-#: ../src/empathy-call-window.c:1815
+#: ../src/empathy-call-window.c:2237
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
-#: ../src/empathy-call-window.c:1818
+#: ../src/empathy-call-window.c:2240
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
-#: ../src/empathy-call-window.c:1828
-#, fuzzy, c-format
+#: ../src/empathy-call-window.c:2250
+#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
@@ -2443,111 +2452,129 @@ msgstr ""
"Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>,并附上帮助菜"
"单里“调试”窗口收集到的日志。"
-#: ../src/empathy-call-window.c:1836
+#: ../src/empathy-call-window.c:2258
msgid "There was a failure in the call engine"
-msgstr ""
+msgstr "呼叫引擎里出现了一个故障"
-#: ../src/empathy-call-window.c:1875
+#: ../src/empathy-call-window.c:2297
msgid "Can't establish audio stream"
msgstr "不能建立音频流"
-#: ../src/empathy-call-window.c:1885
+#: ../src/empathy-call-window.c:2307
msgid "Can't establish video stream"
msgstr "不能建立视频流"
#: ../src/empathy-call-window.ui.h:1
+#| msgid "Auto"
+msgid "Audio"
+msgstr "音频"
+
+#: ../src/empathy-call-window.ui.h:2
msgid "Call the contact again"
msgstr "再次呼叫联系人"
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:3
msgid "Camera Off"
msgstr "相机关闭"
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:4
msgid "Camera On"
msgstr "相机开启"
-#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "解码器:"
+
+#: ../src/empathy-call-window.ui.h:6
msgid "Disable camera and stop sending video"
msgstr "禁用相机停止发送视频"
-#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-call-window.ui.h:7
msgid "Enable camera and send video"
msgstr "启用相机,并发送视频"
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:8
msgid "Enable camera but don't send video"
msgstr "启用相机,但不发送视频"
-#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "编码器:"
+
+#: ../src/empathy-call-window.ui.h:10
msgid "Hang up"
msgstr "挂起"
-#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-call-window.ui.h:11
msgid "Hang up current call"
msgstr "挂起当前呼叫"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:12
msgid "Preview"
msgstr "预览"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:13
msgid "Redial"
msgstr "重播"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:14
msgid "Send Audio"
msgstr "发送音频"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:15
msgid "Toggle audio transmission"
msgstr "切换音频传输"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:17
msgid "V_ideo"
msgstr "视频(_I)"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:18
+#| msgid "V_ideo"
+msgid "Video"
+msgstr "视频"
+
+#: ../src/empathy-call-window.ui.h:19
msgid "Video Off"
msgstr "视频关闭"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:20
msgid "Video On"
msgstr "视频开启"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:21
msgid "Video Preview"
msgstr "视频预览"
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:27
msgid "_View"
msgstr "查看(_V)"
-#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 未读)"
-#: ../src/empathy-chat-window.c:448
+#: ../src/empathy-chat-window.c:464
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (和 %u 其它)"
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:480
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (%d 其它未读)"
-#: ../src/empathy-chat-window.c:473
+#: ../src/empathy-chat-window.c:489
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (%d 全部未读)"
-#: ../src/empathy-chat-window.c:676
+#: ../src/empathy-chat-window.c:695
msgid "Typing a message."
msgstr "输入消息。"
@@ -2569,7 +2596,7 @@ msgstr "插入表情(_S)"
#: ../src/empathy-chat-window.ui.h:5
msgid "Invite _Participant…"
-msgstr ""
+msgstr "邀请参与人(_P)..."
#: ../src/empathy-chat-window.ui.h:6
msgid "Move Tab _Left"
@@ -2579,55 +2606,63 @@ msgstr "左移标签(_L)"
msgid "Move Tab _Right"
msgstr "右移标签(_R)"
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "提示所有消息"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
msgid "_Contents"
msgstr "内容(_C)"
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
msgid "_Conversation"
msgstr "对话(_C)"
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
msgid "_Detach Tab"
msgstr "漂移标签(_D)"
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
msgid "_Edit"
msgstr "编辑(_E)"
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "收藏聊天室(_F)"
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
msgid "_Help"
msgstr "帮助(_H)"
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
msgid "_Next Tab"
msgstr "下一标签(_N)"
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
msgid "_Previous Tab"
msgstr "上一标签(_P)"
-#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
msgid "_Show Contact List"
msgstr "显示联系人列表(_S)"
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
msgid "_Tabs"
msgstr "标签(_T)"
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "撤销关闭标签(_U)"
+
+#: ../src/empathy-chatrooms-window.c:241
msgid "Name"
msgstr "名称"
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
msgid "Room"
msgstr "聊天室"
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
msgid "Auto-Connect"
msgstr "自动连接"
@@ -2635,77 +2670,81 @@ msgstr "自动连接"
msgid "Manage Favorite Rooms"
msgstr "管理聊天室收藏"
-#: ../src/empathy-event-manager.c:339
-#, fuzzy
+#: ../src/empathy-event-manager.c:473
msgid "Incoming video call"
-msgstr "呼入的语音通话"
+msgstr "呼入的视频通话"
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:473
msgid "Incoming call"
msgstr "来电"
-#: ../src/empathy-event-manager.c:343
-#, fuzzy, c-format
+#: ../src/empathy-event-manager.c:477
+#, c-format
msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s 来电,您想要接听吗?"
+msgstr "%s 有一个视频呼叫给您。您想要接听吗?"
-#: ../src/empathy-event-manager.c:344
-#, fuzzy, c-format
+#: ../src/empathy-event-manager.c:478
+#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 来电,您想要接听吗?"
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:481 ../src/empathy-event-manager.c:623
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s 的来电"
+
+#: ../src/empathy-event-manager.c:506
msgid "_Reject"
msgstr "拒绝(_R)"
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:512
msgid "_Answer"
msgstr "接听(_A)"
-#: ../src/empathy-event-manager.c:489
-#, fuzzy, c-format
-msgid "Incoming video call from %s"
-msgstr "%s 的来电"
-
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:623
#, c-format
-msgid "Incoming call from %s"
-msgstr "%s 的来电"
+msgid "Incoming video call from %s"
+msgstr "%s 的视频呼叫"
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:700
msgid "Room invitation"
msgstr "聊天室邀请"
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:702
+#, c-format
+msgid "Invitation to join %s"
+msgstr "邀请您加入 %s"
+
+#: ../src/empathy-event-manager.c:709
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正邀请您加入 %s"
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:717
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:722
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:760
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 已邀请您加入 %s"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:787
#, c-format
msgid "Incoming file transfer from %s"
msgstr "接收 %s 文件传输"
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:988
#, c-format
msgid "Subscription requested by %s"
msgstr "%s 的订阅请求"
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:992
#, c-format
msgid ""
"\n"
@@ -2714,118 +2753,116 @@ msgstr ""
"\n"
"消息:%s"
-#. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:1035
#, c-format
msgid "%s is now offline."
msgstr "%s 当前离线。"
-#. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:1055
#, c-format
msgid "%s is now online."
msgstr "%s 当前在线。"
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
#, c-format
msgid "%u:%02u.%02u"
msgstr "%u:%02u.%02u"
#. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
#, c-format
msgid "%s of %s at %s/s"
msgstr "%2$s 中的 %1$s,速度 %3$s/s"
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
#, c-format
msgid "%s of %s"
msgstr "%2$s 中的 %1$s"
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
#, c-format
msgid "Receiving \"%s\" from %s"
msgstr "正在从 %2$s 接收 \"%1$s\""
#. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
#, c-format
msgid "Sending \"%s\" to %s"
msgstr "正在向 %2$s 发送 \"%1$s\""
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "从 %2$s 接收 \"%1$s\" 出错"
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
msgid "Error receiving a file"
msgstr "接收文件出错"
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "向 %2$s 发送 \"%1$s\" 出错"
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
msgid "Error sending a file"
msgstr "发送文件出错"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
#, c-format
msgid "\"%s\" received from %s"
msgstr "已经从 %2$s 完成接收 \"%1$s\""
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
#, c-format
msgid "\"%s\" sent to %s"
msgstr "已经向 %2$s 完成发送 \"%1$s\""
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
msgid "File transfer completed"
msgstr "文件传送完成"
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
msgid "Waiting for the other participant's response"
msgstr "正在等待其他参与者的回应"
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "检查\"%s\"完整性"
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
#, c-format
msgid "Hashing \"%s\""
msgstr "校验中 \"%s\""
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:990
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1002
msgid "File"
msgstr "文件"
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1024
msgid "Remaining"
msgstr "剩余"
@@ -2848,138 +2885,133 @@ msgid "Import Accounts"
msgstr "导入账户"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
msgid "Import"
msgstr "导入"
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
msgid "Protocol"
msgstr "协议"
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
msgid "Source"
msgstr "源"
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "%s 账户"
-
-#: ../src/empathy-main-window.c:437
+#: ../src/empathy-main-window.c:457
msgid "Reconnect"
msgstr "重新连接"
-#: ../src/empathy-main-window.c:443
+#: ../src/empathy-main-window.c:463
msgid "Edit Account"
msgstr "编辑账户"
-#: ../src/empathy-main-window.c:449
+#: ../src/empathy-main-window.c:469
msgid "Close"
msgstr "关闭"
-#: ../src/empathy-main-window.c:1033
+#: ../src/empathy-main-window.c:1154
msgid "Contact"
msgstr "联系人"
-#: ../src/empathy-main-window.c:1414
+#: ../src/empathy-main-window.c:1476
+msgid "Contact List"
+msgstr "联系人列表"
+
+#: ../src/empathy-main-window.c:1583
msgid "Show and edit accounts"
msgstr "显示和编辑账户"
#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "联系人列表"
-
-#: ../src/empathy-main-window.ui.h:2
msgid "Contacts on a _Map"
msgstr "联系人地图(_M)"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
msgid "Context"
msgstr "上下文"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
msgid "Join _Favorites"
msgstr "加入已收藏的聊天室(_F)"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
msgid "Manage Favorites"
msgstr "管理收藏夹"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
msgid "N_ormal Size"
msgstr "常规视图(_O)"
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
-msgstr ""
+msgstr "新建呼叫(_C)..."
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
msgid "Normal Size With _Avatars"
msgstr "扩展视图(_A)"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
msgid "P_references"
msgstr "首选项(_R)"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
msgid "Show P_rotocols"
msgstr "显示协议(_R)"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
msgid "Sort by _Name"
msgstr "按姓名排序(_N)"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Status"
msgstr "按状态排序(_S)"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
msgid "_Accounts"
msgstr "账户(_A)"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
msgid "_Compact Size"
msgstr "紧凑视图(_C)"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
msgid "_Debug"
msgstr "调试(_D)"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
msgid "_File Transfers"
msgstr "文件传输(_F)"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
msgid "_Join…"
msgstr "加入(_J)..."
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "新建对话(_N)..."
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
msgid "_Offline Contacts"
msgstr "离线联系人(_O)"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
msgid "_Personal Information"
msgstr "个人信息(_P)"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
msgid "Chat Room"
msgstr "聊天室"
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
msgid "Members"
msgstr "成员"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:539
+#: ../src/empathy-new-chatroom-dialog.c:605
#, c-format
msgid ""
"<b>%s</b>\n"
@@ -2992,16 +3024,16 @@ msgstr ""
"需要密码:%s\n"
"成员:%s"
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:635
msgid "Could not start room listing"
msgstr "无法开始聊天室列表"
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:645
msgid "Could not stop room listing"
msgstr "无法停止聊天室列表"
@@ -3032,62 +3064,66 @@ msgstr "聊天室列表"
msgid "_Room:"
msgstr "聊天室(_R):"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:136
msgid "Message received"
msgstr "收到了消息"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:137
msgid "Message sent"
msgstr "发出了消息"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:138
msgid "New conversation"
msgstr "新对话"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:139
msgid "Contact goes online"
msgstr "离线人上线"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:140
msgid "Contact goes offline"
msgstr "联系人离线"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:141
msgid "Account connected"
msgstr "账户已连接"
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:142
msgid "Account disconnected"
msgstr "账户已断开"
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:437
msgid "Language"
msgstr "语言"
+#: ../src/empathy-preferences.c:873
+msgid "Preferences"
+msgstr "首选项"
+
#: ../src/empathy-preferences.ui.h:1
msgid "Appearance"
msgstr "外观"
#: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "启动时自动登录(_C) "
-
-#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "行为"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
msgid "Chat Th_eme:"
msgstr "聊天主题(_E):"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
msgid "Disable notifications when _away or busy"
msgstr "离开或忙碌时禁用提示(_A)"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
msgid "Disable sounds when _away or busy"
msgstr "离开或忙碌时禁用声音(_A)"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "再提示区域显示呼入事件"
+
#: ../src/empathy-preferences.ui.h:7
msgid "Enable notifications when a contact comes online"
msgstr "当联系人上线时允许提示"
@@ -3121,14 +3157,10 @@ msgid "Play sound for events"
msgstr "播放事件声音"
#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "首选项"
-
-#: ../src/empathy-preferences.ui.h:17
msgid "Privacy"
msgstr "隐私"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:17
msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
"state and country will be published. GPS coordinates will be accurate to 1 "
@@ -3137,32 +3169,36 @@ msgstr ""
"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
"将精确到一位小数。 "
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:18
msgid "Show _smileys as images"
msgstr "显示表情符号为图形(_S)"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:19
msgid "Show contact _list in rooms"
msgstr "在聊天室显示联系人列表(_L)"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:20
msgid "Sounds"
msgstr "声音"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:21
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:22
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr "语言列表仅反映已安装的字典"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:23
msgid "Themes"
msgstr "主题"
+#: ../src/empathy-preferences.ui.h:24
+msgid "_Automatically connect on startup"
+msgstr "启动时自动登录(_A) "
+
#: ../src/empathy-preferences.ui.h:25
msgid "_Cellphone"
msgstr "手机(_C)"
@@ -3195,10 +3231,26 @@ msgstr "向我的联系人公布位置信息(_P)"
msgid "_Reduce location accuracy"
msgstr "降低位置信息精度(_R)"
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:141
msgid "Respond"
msgstr "响应"
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "拒绝"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "接听"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "拒绝"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "接受"
+
#: ../src/empathy-status-icon.ui.h:2
msgid "Status"
msgstr "状态"
@@ -3211,63 +3263,63 @@ msgstr "退出(_Q)"
msgid "Contact Map View"
msgstr "联系地图视图"
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1219
msgid "Save"
msgstr "保存"
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1395
msgid "Debug Window"
msgstr "调试窗口"
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1475
msgid "Pause"
msgstr "暂停"
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1487
msgid "Level "
msgstr "级别 "
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1507
msgid "Debug"
msgstr "调试"
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1513
msgid "Info"
msgstr "信息"
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
msgid "Message"
msgstr "消息"
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1525
msgid "Warning"
msgstr "警告"
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1531
msgid "Critical"
msgstr "危急"
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1537
msgid "Error"
msgstr "错误"
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1556
msgid "Time"
msgstr "时间"
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1559
msgid "Domain"
msgstr "域"
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1561
msgid "Category"
msgstr "类别"
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1563
msgid "Level"
msgstr "级别"
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1600
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
@@ -3276,33 +3328,37 @@ msgstr "已选定的连接管理不支持远程调试扩展"
#: ../src/empathy-invite-participant-dialog.c:34
#: ../src/empathy-invite-participant-dialog.c:48
msgid "Invite Participant"
-msgstr ""
+msgstr "邀请参与人"
#: ../src/empathy-invite-participant-dialog.c:35
msgid "Choose a contact to invite into the conversation:"
-msgstr ""
+msgstr "选择一个联系人以加入该会话:"
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "邀请"
+
+#: ../src/empathy-accounts.c:182
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
+msgstr "不显示任何对话框;执行任务(如,导入)然后退出"
-#: ../src/empathy-accounts.c:217
+#: ../src/empathy-accounts.c:186
msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr ""
+msgstr "如果有任何 non-salut 账户的话,不显示任何对话框"
-#: ../src/empathy-accounts.c:221
+#: ../src/empathy-accounts.c:190
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
+msgstr "首先选择给定账户 (如,gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
msgid "<account-id>"
msgstr "<账户 ID>"
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
msgid "- Empathy Accounts"
msgstr "- Empathy 账户"
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
msgid "Empathy Accounts"
msgstr "Empathy 账户"
@@ -3310,6 +3366,38 @@ msgstr "Empathy 账户"
msgid "Empathy Debugger"
msgstr "Empathy 调试器"
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr " - Empathy 语音/视频客户端"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy 语音/视频客户端"
+
+#~ msgid "Send and receive messages"
+#~ msgstr "发送接收即时消息"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4 账户已经被导入"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 帐户已经被导入。"
+
+#~ msgid "Port of the proxy for outbound requests."
+#~ msgstr "出站代理端口"
+
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "重新连接到对话失败"
+
+#~ msgid "Failed to join chat room"
+#~ msgstr "加入聊天室失败"
+
+#~ msgid "Select a destination"
+#~ msgstr "选择目的地"
+
+#~ msgid "%s account"
+#~ msgstr "%s 账户"
+
#~ msgid "Salut account is created"
#~ msgstr "已创建 Salut 账户"
@@ -3495,9 +3583,6 @@ msgstr "Empathy 调试器"
#~ msgid "gtk-leave-fullscreen"
#~ msgstr "gtk-leave-fullscreen"
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Empathy 即时通讯程序"
-
#~ msgid "- Empathy Instant Messenger"
#~ msgstr "- Empathy 即时通讯程序"
@@ -3636,9 +3721,6 @@ msgstr "Empathy 调试器"
#~ msgid "Do you want to accept the file \"%s\" (%s)?"
#~ msgstr "您想要接收文件“%s”(%s)吗?"
-#~ msgid "_Accept"
-#~ msgstr "接受(_A)"
-
#~ msgid "File transfers"
#~ msgstr "文件传送"