[empathy] update Simplified Chinese (zh_CN) translation
- From: YunQiang Su <yqsu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] update Simplified Chinese (zh_CN) translation
- Date: Thu, 11 Jul 2013 07:40:33 +0000 (UTC)
commit b30fe91ec7e921e6bd23722447478dfcb9f64a22
Author: Wylmer Wang <wantinghard gmail com>
Date: Thu Jul 11 15:40:25 2013 +0800
update Simplified Chinese (zh_CN) translation
po/zh_CN.po | 1576 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 826 insertions(+), 750 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ca4ea06..1cd7eb9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@
# Tao Wang <dancefire gmail com>, 2010.
# Dean Lee <xslidian gmail com>, 2010.
# Aron Xu <happyaron xu gmail com>, 2009, 2010.
-# Wylmer Wang <wantinghard gmail com>, 2010-2012.
+# Wylmer Wang <wantinghard gmail com>, 2010-2013.
# zhen liu <liuzhen1191 gmail com>, 2011
# Yangtse Su <yangtsesu gmail com>, 2011
# Mike Manilone <crtmike gmail com>, 2012
@@ -28,9 +28,9 @@ msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-09-20 08:28+0000\n"
+"POT-Creation-Date: 2013-07-09 15:43+0000\n"
"PO-Revision-Date: 2012-08-31 16:21+0800\n"
-"Last-Translator: Cheng Lu <chenglu1990 gmail com>\n"
+"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
"Language-Team: Chinese (Simplified) <i18n-zh googlegroups com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -54,6 +54,12 @@ 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:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr ""
+"chat;talk;im;message;irc;voip;gtalk;facebook;jabber;聊天;消息;即时通讯;通话;"
+"视频"
+
#: ../data/org.gnome.Empathy.gschema.xml.h:1
msgid "Connection managers should be used"
msgstr "应该使用连接管理器"
@@ -476,283 +482,284 @@ msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
-#: ../libempathy/empathy-ft-handler.c:733
+#: ../libempathy/empathy-ft-handler.c:732
msgid "No reason was specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:735
msgid "The change in state was requested"
msgstr "需要状态改变信息"
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:738
msgid "You canceled the file transfer"
msgstr "您取消了文件传输"
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:741
msgid "The other participant canceled the file transfer"
msgstr "另外的参与者取消了文件的传输"
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:744
msgid "Error while trying to transfer the file"
msgstr "当传输这个文件的时候发生错误"
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:747
msgid "The other participant is unable to transfer the file"
msgstr "另外的参与者无法传输这个文件"
-#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-ft-handler.c:750 ../libempathy/empathy-utils.c:295
msgid "Unknown reason"
msgstr "未知原因"
-#: ../libempathy/empathy-ft-handler.c:914
+#: ../libempathy/empathy-ft-handler.c:913
msgid "File transfer completed, but the file was corrupted"
msgstr "文件传输完成，但该文件已损坏"
-#: ../libempathy/empathy-ft-handler.c:1200
+#: ../libempathy/empathy-ft-handler.c:1199
msgid "File transfer not supported by remote contact"
msgstr "文件传输不支持远程连接"
-#: ../libempathy/empathy-ft-handler.c:1256
+#: ../libempathy/empathy-ft-handler.c:1255
msgid "The selected file is not a regular file"
msgstr "所选文件是非正常的文件"
-#: ../libempathy/empathy-ft-handler.c:1265
+#: ../libempathy/empathy-ft-handler.c:1264
msgid "The selected file is empty"
msgstr "所选文件是空的"
-#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+#: ../libempathy/empathy-keyring.c:75 ../libempathy/empathy-keyring.c:184
msgid "Password not found"
msgstr "未找到密码"
-#: ../libempathy/empathy-keyring.c:594
+#: ../libempathy/empathy-keyring.c:584
#, c-format
msgid "IM account password for %s (%s)"
msgstr "IM 帐号 %s (%s) 的密码"
-#: ../libempathy/empathy-keyring.c:631
+#: ../libempathy/empathy-keyring.c:621
#, c-format
msgid "Password for chatroom '%s' on account %s (%s)"
msgstr "帐号 %2$s (%3$s) 的聊天室 %1$s 密码"
-#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
+#: ../libempathy/empathy-message.c:402 ../src/empathy-call-observer.c:107
#, c-format
msgid "Missed call from %s"
msgstr "未接来电：%s"
#. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:407
+#: ../libempathy/empathy-message.c:406
#, c-format
msgid "Called %s"
msgstr "与 %s 通话"
-#: ../libempathy/empathy-message.c:410
+#: ../libempathy/empathy-message.c:409
#, c-format
msgid "Call from %s"
msgstr "来电：%s"
-#: ../libempathy/empathy-time.c:90
+#: ../libempathy/empathy-time.c:86
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d 秒钟前"
-#: ../libempathy/empathy-time.c:96
+#: ../libempathy/empathy-time.c:92
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d 分钟前"
-#: ../libempathy/empathy-time.c:102
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d 小时前"
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:104
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天前"
-#: ../libempathy/empathy-time.c:114
+#: ../libempathy/empathy-time.c:110
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d 星期前"
-#: ../libempathy/empathy-time.c:120
+#: ../libempathy/empathy-time.c:116
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d 月前"
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:138
msgid "in the future"
msgstr "将来"
-#: ../libempathy/empathy-utils.c:226
+#: ../libempathy/empathy-utils.c:215
msgid "Available"
msgstr "在线"
-#: ../libempathy/empathy-utils.c:228
+#: ../libempathy/empathy-utils.c:217
msgid "Busy"
msgstr "忙碌"
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:220
msgid "Away"
msgstr "离开"
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:222
msgid "Invisible"
msgstr "隐身"
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:224
msgid "Offline"
msgstr "离线"
#. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:227
msgctxt "presence"
msgid "Unknown"
msgstr "未知"
-#: ../libempathy/empathy-utils.c:278
+#: ../libempathy/empathy-utils.c:267
msgid "No reason specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:269 ../libempathy/empathy-utils.c:325
msgid "Status is set to offline"
msgstr "状态已设置为离线"
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
-#: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:80
+#: ../libempathy/empathy-utils.c:271 ../libempathy/empathy-utils.c:305
+#: ../libempathy-gtk/empathy-call-utils.c:41
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
msgid "Network error"
msgstr "网络错误"
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:273 ../libempathy/empathy-utils.c:307
msgid "Authentication failed"
msgstr "验证失败"
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:275 ../libempathy/empathy-utils.c:309
msgid "Encryption error"
msgstr "加密错误"
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:277
msgid "Name in use"
msgstr "用户名已被占用"
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:279 ../libempathy/empathy-utils.c:311
msgid "Certificate not provided"
msgstr "未提供证书"
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:281 ../libempathy/empathy-utils.c:313
msgid "Certificate untrusted"
msgstr "证书不被信任"
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:283 ../libempathy/empathy-utils.c:315
msgid "Certificate expired"
msgstr "证书已过期"
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:317
msgid "Certificate not activated"
msgstr "证书尚未激活"
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:319
msgid "Certificate hostname mismatch"
msgstr "证书主机名不匹配"
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:321
msgid "Certificate fingerprint mismatch"
msgstr "证书指纹不匹配"
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:323
msgid "Certificate self-signed"
msgstr "证书是自签属的"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:293
msgid "Certificate error"
msgstr "证书错误"
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:327
msgid "Encryption is not available"
msgstr "加密不可用"
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:329
msgid "Certificate is invalid"
msgstr "证书无效"
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:331
msgid "Connection has been refused"
msgstr "连接被拒绝"
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:333
msgid "Connection can't be established"
msgstr "无法建立连接"
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:335
msgid "Connection has been lost"
msgstr "连接已丢失"
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:337
msgid "This account is already connected to the server"
msgstr "该帐号已连接到服务器"
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:339
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "连接已被使用相同资源的新连接取代"
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:342
msgid "The account already exists on the server"
msgstr "服务器上已存在该帐号"
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:344
msgid "Server is currently too busy to handle the connection"
msgstr "服务器太忙，无法处理当前连接"
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:346
msgid "Certificate has been revoked"
msgstr "证书已被吊销"
# lainme：证书使用不安全的加密算法或是弱加密的
# xslidian：证书使用的加密算法不安全或者易被破解
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:348
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "证书使用不安全的加密算法或者是弱加密的"
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:351
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
msgstr "服务器证书的长度——或服务器证书链的深度——超出了加密库的硬性限制"
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:355
msgid "Your software is too old"
msgstr "你的软件版本太旧了"
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:357
msgid "Internal error"
msgstr "内部错误"
-#: ../libempathy/empathy-utils.c:497
+#: ../libempathy/empathy-utils.c:486
+#: ../libempathy-gtk/empathy-roster-model.h:28
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:502
+#: ../libempathy/empathy-utils.c:491
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:527 ../src/empathy-roster-window.c:657
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:532
+#: ../libempathy/empathy-utils.c:528
msgid "Facebook Chat"
msgstr "Facebook 聊天"
-#: ../libempathy-gtk/empathy-account-chooser.c:689
+#: ../libempathy-gtk/empathy-account-chooser.c:684
msgid "All accounts"
msgstr "全部帐号"
@@ -831,56 +838,56 @@ msgstr "您的 AIM 密码是什么？"
msgid "Remember Password"
msgstr "记住密码"
-#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-account-widget.c:668
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../src/empathy-import-widget.c:322
+#: ../src/empathy-import-widget.c:316
msgid "Account"
msgstr "帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget.c:669
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "Password"
msgstr "密码"
-#: ../libempathy-gtk/empathy-account-widget.c:677
+#: ../libempathy-gtk/empathy-account-widget.c:670
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:498
msgid "Server"
msgstr "服务器"
-#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget.c:671
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:519
msgid "Port"
msgstr "端口"
-#: ../libempathy-gtk/empathy-account-widget.c:762
+#: ../libempathy-gtk/empathy-account-widget.c:755
#, c-format
msgid "%s"
msgstr "%s"
-#: ../libempathy-gtk/empathy-account-widget.c:817
+#: ../libempathy-gtk/empathy-account-widget.c:810
#, c-format
msgid "%s:"
msgstr "%s："
-#: ../libempathy-gtk/empathy-account-widget.c:1429
+#: ../libempathy-gtk/empathy-account-widget.c:1422
msgid "Username:"
msgstr "用户名："
-#: ../libempathy-gtk/empathy-account-widget.c:1746
+#: ../libempathy-gtk/empathy-account-widget.c:1739
msgid "A_pply"
msgstr "应用(_P)"
-#: ../libempathy-gtk/empathy-account-widget.c:1775
+#: ../libempathy-gtk/empathy-account-widget.c:1768
msgid "L_og in"
msgstr "登录(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1845
+#: ../libempathy-gtk/empathy-account-widget.c:1838
msgid "This account already exists on the server"
msgstr "服务器上已存在该帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:1849
+#: ../libempathy-gtk/empathy-account-widget.c:1842
msgid "Create a new account on the server"
msgstr "在服务器上创建新的帐号"
@@ -889,19 +896,19 @@ msgstr "在服务器上创建新的帐号"
#. * like: "MyUserName on freenode".
#. * 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:2270
+#: ../libempathy-gtk/empathy-account-widget.c:2255
#, 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:2296
+#: ../libempathy-gtk/empathy-account-widget.c:2281
#, c-format
msgid "%s Account"
msgstr "%s 帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:2300
+#: ../libempathy-gtk/empathy-account-widget.c:2285
msgid "New account"
msgstr "新建帐号"
@@ -1122,32 +1129,32 @@ msgstr "您的 Windows Live 帐号是什么？"
msgid "What is your Windows Live password?"
msgstr "您的 Windows Live 密码是什么？"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+#: ../libempathy-gtk/empathy-account-widget-sip.c:198
+#: ../libempathy-gtk/empathy-account-widget-sip.c:231
msgid "Auto"
msgstr "自动"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+#: ../libempathy-gtk/empathy-account-widget-sip.c:201
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+#: ../libempathy-gtk/empathy-account-widget-sip.c:204
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
msgid "TLS"
msgstr "TLS"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+#: ../libempathy-gtk/empathy-account-widget-sip.c:236
msgid "Register"
msgstr "注册"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+#: ../libempathy-gtk/empathy-account-widget-sip.c:241
msgid "Options"
msgstr "选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
msgid "None"
msgstr "无"
@@ -1259,55 +1266,55 @@ msgstr "您的 Yahoo! ID 是什么？"
msgid "What is your Yahoo! password?"
msgstr "您的 Yahoo! 密码是什么？"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:545
-#: ../libempathy-gtk/empathy-avatar-chooser.c:630
+#: ../libempathy-gtk/empathy-avatar-chooser.c:539
+#: ../libempathy-gtk/empathy-avatar-chooser.c:624
msgid "Couldn't convert image"
msgstr "无法转换图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:546
+#: ../libempathy-gtk/empathy-avatar-chooser.c:540
msgid "None of the accepted image formats are supported on your system"
msgstr "没有任何接受的图片格式能被您的系统支持"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:906
+#: ../libempathy-gtk/empathy-avatar-chooser.c:900
msgid "Couldn't save picture to file"
msgstr "无法将图片保存为文件"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1024
msgid "Select Your Avatar Image"
msgstr "选择您的头像图片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1032
msgid "Take a picture..."
msgstr "照相..."
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1045
msgid "No Image"
msgstr "无图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1102
msgid "Images"
msgstr "图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1106
msgid "All Files"
msgstr "所有文件"
-#: ../libempathy-gtk/empathy-avatar-image.c:322
+#: ../libempathy-gtk/empathy-avatar-image.c:319
msgid "Click to enlarge"
msgstr "单击以放大"
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
#, c-format
msgid "Authentication failed for account <b>%s</b>"
msgstr "帐号 <b>%s</b> 验证失败"
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-#: ../libempathy-gtk/empathy-chat.c:3724
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3844
msgid "Retry"
msgstr "重试"
#: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
+#: ../libempathy-gtk/empathy-password-dialog.c:132
#, c-format
msgid ""
"Enter your password for account\n"
@@ -1316,94 +1323,94 @@ msgstr ""
"输入您的帐号密码\n"
"<b>%s</b>"
-#: ../libempathy-gtk/empathy-calendar-button.c:66
+#: ../libempathy-gtk/empathy-calendar-button.c:63
msgid "Select..."
msgstr "选择..."
-#: ../libempathy-gtk/empathy-calendar-button.c:154
+#: ../libempathy-gtk/empathy-calendar-button.c:151
msgid "_Select"
msgstr "选择(_S)"
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:36
+#: ../libempathy-gtk/empathy-call-utils.c:54
msgid "There was an error starting the call"
msgstr "发起呼叫时出错"
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:43
msgid "The specified contact doesn't support calls"
msgstr "选择的联系人不支持呼叫"
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:45
msgid "The specified contact is offline"
msgstr "选择的联系人离线"
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "The specified contact is not valid"
msgstr "选择的联系人无效"
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:49
msgid "Emergency calls are not supported on this protocol"
msgstr "不支持在此会话上进行紧急呼叫"
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:51
msgid "You don't have enough credit in order to place this call"
msgstr "您信用卡余额不足以支付此次通话"
-#: ../libempathy-gtk/empathy-chat.c:727
+#: ../libempathy-gtk/empathy-chat.c:731
msgid "Failed to open private chat"
msgstr "建立私人对话失败"
-#: ../libempathy-gtk/empathy-chat.c:785
+#: ../libempathy-gtk/empathy-chat.c:789
msgid "Topic not supported on this conversation"
msgstr "不支持在此会话上设置主题"
-#: ../libempathy-gtk/empathy-chat.c:791
+#: ../libempathy-gtk/empathy-chat.c:795
msgid "You are not allowed to change the topic"
msgstr "您不能更改主题"
-#: ../libempathy-gtk/empathy-chat.c:967
+#: ../libempathy-gtk/empathy-chat.c:971
msgid "Invalid contact ID"
msgstr "无效的联系人 ID"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1058
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear：清空当前会话的所有消息"
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1061
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主题>：设定当前对话的主题"
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室名>：加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室名>：加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1071
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/用户[<聊天室ID>] [<原因>]：当前默认离开聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1075
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <昵称> [<消息>]：打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1078
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <昵称> <消息>：打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1081
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <昵称>：在当前服务器上改变您的昵称"
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1084
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <动作消息>：向当前对话中发送一个动作消息"
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1087
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 "
@@ -1412,137 +1419,137 @@ msgstr ""
"/say <消息>：发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如：“/"
"say /join 是用来加入一个新的聊天室”"
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1092
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <联系人 ID>：显示一个联系人的信息"
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1095
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
"/help [<命令>]：显示所有支持的命令。如果 <命令> 是有定义的，则显示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1114
#, c-format
msgid "Usage: %s"
msgstr "用法：%s"
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1159
msgid "Unknown command"
msgstr "未知命令"
-#: ../libempathy-gtk/empathy-chat.c:1281
+#: ../libempathy-gtk/empathy-chat.c:1285
msgid "Unknown command; see /help for the available commands"
msgstr "未知命令，请使用 /help 查阅可用命令"
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1542
msgid "insufficient balance to send message"
msgstr "余额不足，无法发送消息"
-#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
-#: ../libempathy-gtk/empathy-chat.c:1619
+#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
#, c-format
msgid "Error sending message '%s': %s"
msgstr "发送消息“%s”出错：%s"
-#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
#, c-format
msgid "Error sending message: %s"
msgstr "发送消息出错：%s"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1550
+#: ../libempathy-gtk/empathy-chat.c:1554
#, c-format
msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
msgstr "余额不足，无法发送消息。 <a href='%s'>充值</a>。"
-#: ../libempathy-gtk/empathy-chat.c:1590
+#: ../libempathy-gtk/empathy-chat.c:1594
msgid "not capable"
msgstr "做不到"
-#: ../libempathy-gtk/empathy-chat.c:1597
+#: ../libempathy-gtk/empathy-chat.c:1601
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:1600
+#: ../libempathy-gtk/empathy-chat.c:1604
msgid "invalid contact"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:1603
+#: ../libempathy-gtk/empathy-chat.c:1607
msgid "permission denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-chat.c:1606
+#: ../libempathy-gtk/empathy-chat.c:1610
msgid "too long message"
msgstr "消息太长"
-#: ../libempathy-gtk/empathy-chat.c:1609
+#: ../libempathy-gtk/empathy-chat.c:1613
msgid "not implemented"
msgstr "尚未实现"
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1617
msgid "unknown"
msgstr "未知"
-#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:967
msgid "Topic:"
msgstr "话题："
-#: ../libempathy-gtk/empathy-chat.c:1695
+#: ../libempathy-gtk/empathy-chat.c:1699
#, c-format
msgid "Topic set to: %s"
msgstr "话题被设置为：%s"
-#: ../libempathy-gtk/empathy-chat.c:1697
+#: ../libempathy-gtk/empathy-chat.c:1701
#, c-format
msgid "Topic set by %s to: %s"
msgstr "话题被 %s 设置为：%s"
#. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1702
+#: ../libempathy-gtk/empathy-chat.c:1706
msgid "No topic defined"
msgstr "未设置话题"
-#: ../libempathy-gtk/empathy-chat.c:2218
+#: ../libempathy-gtk/empathy-chat.c:2222
msgid "(No Suggestions)"
msgstr "(没有建议)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2286
+#: ../libempathy-gtk/empathy-chat.c:2290
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "添加“%s”到字典"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2323
+#: ../libempathy-gtk/empathy-chat.c:2327
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "添加“%s”到 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:2393
+#: ../libempathy-gtk/empathy-chat.c:2397
msgid "Insert Smiley"
msgstr "插入表情"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2411
-#: ../libempathy-gtk/empathy-ui-utils.c:1180
+#: ../libempathy-gtk/empathy-chat.c:2415
+#: ../libempathy-gtk/empathy-ui-utils.c:1208
msgid "_Send"
msgstr "发送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2468
+#: ../libempathy-gtk/empathy-chat.c:2472
msgid "_Spelling Suggestions"
msgstr "拼写建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2574
+#: ../libempathy-gtk/empathy-chat.c:2583
msgid "Failed to retrieve recent logs"
msgstr "获取最近日志失败"
-#: ../libempathy-gtk/empathy-chat.c:2718
+#: ../libempathy-gtk/empathy-chat.c:2826
#, c-format
msgid "%s has disconnected"
msgstr "%s 已断开连接"
@@ -1550,12 +1557,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:2725
+#: ../libempathy-gtk/empathy-chat.c:2833
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出"
-#: ../libempathy-gtk/empathy-chat.c:2728
+#: ../libempathy-gtk/empathy-chat.c:2836
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1563,17 +1570,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:2736
+#: ../libempathy-gtk/empathy-chat.c:2844
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%s 已被 %s 禁止"
-#: ../libempathy-gtk/empathy-chat.c:2739
+#: ../libempathy-gtk/empathy-chat.c:2847
#, c-format
msgid "%s was banned"
msgstr "%s 被禁止"
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2851
#, c-format
msgid "%s has left the room"
msgstr "%s 离开了聊天室"
@@ -1583,17 +1590,17 @@ msgstr "%s 离开了聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2752
+#: ../libempathy-gtk/empathy-chat.c:2860
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2777
+#: ../libempathy-gtk/empathy-chat.c:2885
#, c-format
msgid "%s has joined the room"
msgstr "%s 加入了聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2910
#, c-format
msgid "%s is now known as %s"
msgstr "%s 现在叫做 %s"
@@ -1601,82 +1608,82 @@ msgstr "%s 现在叫做 %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
-#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
-#: ../src/empathy-event-manager.c:1166
+#: ../libempathy-gtk/empathy-chat.c:3097 ../src/empathy-call-window.c:1516
+#: ../src/empathy-call-window.c:1566 ../src/empathy-call-window.c:2641
+#: ../src/empathy-call-window.c:2948 ../src/empathy-event-manager.c:1158
msgid "Disconnected"
msgstr "已断开连接"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3784
msgid "Would you like to store this password?"
msgstr "是否保存密码?"
-#: ../libempathy-gtk/empathy-chat.c:3670
+#: ../libempathy-gtk/empathy-chat.c:3790
msgid "Remember"
msgstr "记录"
-#: ../libempathy-gtk/empathy-chat.c:3680
+#: ../libempathy-gtk/empathy-chat.c:3800
msgid "Not now"
msgstr "不是现在"
-#: ../libempathy-gtk/empathy-chat.c:3728
+#: ../libempathy-gtk/empathy-chat.c:3848
msgid "Wrong password; please try again:"
msgstr "密码错误，请重试："
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3858
+#: ../libempathy-gtk/empathy-chat.c:3972
msgid "This room is protected by a password:"
msgstr "这个房间是由一个密码保护的："
-#: ../libempathy-gtk/empathy-chat.c:3885
-#: ../src/empathy-new-chatroom-dialog.c:780
+#: ../libempathy-gtk/empathy-chat.c:3999
+#: ../src/empathy-new-chatroom-dialog.c:785
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
+#: ../libempathy-gtk/empathy-chat.c:4191 ../src/empathy-event-manager.c:1179
msgid "Connected"
msgstr "已连接"
-#: ../libempathy-gtk/empathy-chat.c:4132
+#: ../libempathy-gtk/empathy-chat.c:4246
msgid "Conversation"
msgstr "对话"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4137
+#: ../libempathy-gtk/empathy-chat.c:4251
#, c-format
msgid "%s (SMS)"
msgstr "%s (短信)"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:261
msgid "Unknown or invalid identifier"
msgstr "未知或无效的标识符"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
msgid "Contact blocking temporarily unavailable"
msgstr "联系人屏蔽暂时不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
msgid "Contact blocking unavailable"
msgstr "联系人屏蔽不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
msgid "Permission Denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
msgid "Could not block contact"
msgstr "无法屏蔽联系人"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
msgid "Edit Blocked Contacts"
msgstr "编辑屏蔽的联系人"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1473
#: ../src/empathy-chatrooms-window.ui.h:2
#: ../src/empathy-new-chatroom-dialog.ui.h:6
msgid "Account:"
@@ -1686,120 +1693,126 @@ msgstr "帐号："
msgid "Blocked Contacts"
msgstr "已屏蔽的联系人"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:98
msgid "Full name"
msgstr "全名"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:99
msgid "Phone number"
msgstr "电话号码"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:100
msgid "E-mail address"
msgstr "电子邮件地址"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:101
msgid "Website"
msgstr "网站"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
msgid "Birthday"
msgstr "生日"
#. Note to translators: this is the caption for a string of the form "5
#. * minutes ago", and refers to the time since the contact last interacted
#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:111
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
msgid "Last seen:"
msgstr "最近上线："
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
msgid "Server:"
msgstr "服务器："
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:109
msgid "Connected from:"
msgstr "连接来源："
#. FIXME: once Idle implements SimplePresence using this information, we can
#. * and should bin this.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
msgid "Away message:"
msgstr "离开消息："
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:126
msgid "work"
msgstr "办公"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:127
msgid "home"
msgstr "主页"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:128
msgid "mobile"
msgstr "手机"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:129
msgid "voice"
msgstr "音频"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
msgid "preferred"
msgstr "首选"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
msgid "postal"
msgstr "邮政"
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
msgid "parcel"
msgstr "邮件"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
msgid "Search contacts"
msgstr "搜索联系人"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
msgid "Search: "
msgstr "搜索"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
msgid "_Add Contact"
msgstr "添加联系人(_A)"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
msgid "No contacts found"
msgstr "未找到联系人"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+#, fuzzy
+#| msgid "Topic not supported on this conversation"
+msgid "Contact search is not supported on this account"
+msgstr "不支持在此会话上设置主题"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
msgid "Your message introducing yourself:"
msgstr "您的自我介绍信息："
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
msgid "Please let me see when you're online. Thanks!"
msgstr "你在线时请让我知道，谢谢！"
-#: ../libempathy-gtk/empathy-contact-widget.c:168
-#: ../libempathy-gtk/empathy-individual-widget.c:900
+#: ../libempathy-gtk/empathy-contact-widget.c:156
+#: ../libempathy-gtk/empathy-individual-widget.c:888
msgid "Save Avatar"
msgstr "保存头像"
-#: ../libempathy-gtk/empathy-contact-widget.c:224
-#: ../libempathy-gtk/empathy-individual-widget.c:958
+#: ../libempathy-gtk/empathy-contact-widget.c:212
+#: ../libempathy-gtk/empathy-individual-widget.c:946
msgid "Unable to save avatar"
msgstr "无法保存头像"
#. Identifier to connect to Instant Messaging network
#. Setup id label
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-user-info.c:444
+#: ../libempathy-gtk/empathy-user-info.c:455
msgid "Identifier"
msgstr "标识符"
#. Setup nickname entry
#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-user-info.c:449
+#: ../libempathy-gtk/empathy-user-info.c:460
msgid "Alias"
msgstr "别名"
@@ -1833,128 +1846,128 @@ msgstr "版本"
msgid "Client"
msgstr "客户端"
-#: ../libempathy-gtk/empathy-groups-widget.c:327
+#: ../libempathy-gtk/empathy-groups-widget.c:317
msgid "Groups"
msgstr "组"
-#: ../libempathy-gtk/empathy-groups-widget.c:339
+#: ../libempathy-gtk/empathy-groups-widget.c:329
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-groups-widget.c:358
+#: ../libempathy-gtk/empathy-groups-widget.c:348
msgid "_Add Group"
msgstr "添加群组(_A)"
-#: ../libempathy-gtk/empathy-groups-widget.c:393
+#: ../libempathy-gtk/empathy-groups-widget.c:383
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "选择"
-#: ../libempathy-gtk/empathy-groups-widget.c:403
+#: ../libempathy-gtk/empathy-groups-widget.c:393
msgid "Group"
msgstr "群组"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+#: ../libempathy-gtk/empathy-individual-dialogs.c:108
msgid "New Contact"
msgstr "新建联系人"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:193
-#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#: ../libempathy-gtk/empathy-individual-dialogs.c:183
+#: ../libempathy-gtk/empathy-subscription-dialog.c:120
#, c-format
msgid "Block %s?"
msgstr "屏蔽 %s？"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:248
-#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#: ../libempathy-gtk/empathy-individual-dialogs.c:238
+#: ../libempathy-gtk/empathy-subscription-dialog.c:124
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "确定要屏蔽 %s 以阻止他再次联系您吗？"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../libempathy-gtk/empathy-individual-dialogs.c:243
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "以下用户将被屏蔽："
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:250
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "以下用户无法被屏蔽："
-#: ../libempathy-gtk/empathy-individual-dialogs.c:270
-#: ../libempathy-gtk/empathy-subscription-dialog.c:130
-#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-subscription-dialog.c:129
+#: ../libempathy-gtk/empathy-subscription-dialog.c:274
msgid "_Block"
msgstr "屏蔽(_B)"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:279
-#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-subscription-dialog.c:149
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "举报联系人滥用"
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
msgid "Edit Contact Information"
msgstr "编辑联系人信息"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
msgid "Linked Contacts"
msgstr "已绑定的联系人"
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
msgid "gnome-contacts not installed"
msgstr "gnome-contacts 未安装"
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
msgid "Please install gnome-contacts to access contacts details."
msgstr "请安装 gnome-contacts 来访问联系人详情。"
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo jabber org) and the second is one
#. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:172
+#: ../libempathy-gtk/empathy-individual-menu.c:168
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:344
msgid "Select account to use to place the call"
msgstr "选择要用于拨打电话的帐号"
-#: ../libempathy-gtk/empathy-individual-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:348
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
msgid "Call"
msgstr "通话"
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:413
msgid "Mobile"
msgstr "手机"
-#: ../libempathy-gtk/empathy-individual-menu.c:419
+#: ../libempathy-gtk/empathy-individual-menu.c:415
msgid "Work"
msgstr "办公"
-#: ../libempathy-gtk/empathy-individual-menu.c:421
+#: ../libempathy-gtk/empathy-individual-menu.c:417
msgid "HOME"
msgstr "家庭"
-#: ../libempathy-gtk/empathy-individual-menu.c:662
+#: ../libempathy-gtk/empathy-individual-menu.c:660
msgid "_Block Contact"
msgstr "屏蔽联系人"
-#: ../libempathy-gtk/empathy-individual-menu.c:718
+#: ../libempathy-gtk/empathy-individual-menu.c:716
msgid "Delete and _Block"
msgstr "删除并屏蔽(_B)"
-#: ../libempathy-gtk/empathy-individual-menu.c:780
+#: ../libempathy-gtk/empathy-individual-menu.c:778
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "您真的想要删除联系人“%s”吗？"
-#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-individual-menu.c:787
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -1962,218 +1975,218 @@ msgid ""
msgstr ""
"您是否真正地想要删除已绑定的联系人'%s' ？ 注意这将删除所有联系已绑定的联系人"
-#: ../libempathy-gtk/empathy-individual-menu.c:800
+#: ../libempathy-gtk/empathy-individual-menu.c:798
msgid "Removing contact"
msgstr "删除联系人"
-#: ../libempathy-gtk/empathy-individual-menu.c:864
-#: ../libempathy-gtk/empathy-individual-view.c:2453
+#: ../libempathy-gtk/empathy-individual-menu.c:862
+#: ../libempathy-gtk/empathy-individual-view.c:2440
msgid "_Remove"
msgstr "删除(_R)"
#. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1227
-#: ../libempathy-gtk/empathy-new-message-dialog.c:318
+#: ../libempathy-gtk/empathy-individual-menu.c:1225
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
msgid "_Chat"
msgstr "聊天(_C)"
#. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1262
-#: ../libempathy-gtk/empathy-new-message-dialog.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:1260
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
msgid "_SMS"
msgstr "短信(_S)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1295
+#: ../libempathy-gtk/empathy-individual-menu.c:1293
msgctxt "menu item"
msgid "_Audio Call"
msgstr "音频呼叫(_A)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1328
+#: ../libempathy-gtk/empathy-individual-menu.c:1326
msgctxt "menu item"
msgid "_Video Call"
msgstr "视频呼叫(_V)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../libempathy-gtk/empathy-individual-menu.c:1367
#: ../src/empathy-roster-window-menubar.ui.h:11
msgid "_Previous Conversations"
msgstr "最近会话(_P)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1396
msgid "Send File"
msgstr "发送文件"
-#: ../libempathy-gtk/empathy-individual-menu.c:1428
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
msgid "Share My Desktop"
msgstr "共享我的桌面"
-#: ../libempathy-gtk/empathy-individual-menu.c:1454
-#: ../libempathy-gtk/empathy-individual-widget.c:1368
+#: ../libempathy-gtk/empathy-individual-menu.c:1452
+#: ../libempathy-gtk/empathy-individual-widget.c:1356
msgid "Favorite"
msgstr "收藏"
-#: ../libempathy-gtk/empathy-individual-menu.c:1483
+#: ../libempathy-gtk/empathy-individual-menu.c:1481
msgid "Infor_mation"
msgstr "信息(_M)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1532
+#: ../libempathy-gtk/empathy-individual-menu.c:1530
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "编辑(_E)"
#. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1648
+#: ../libempathy-gtk/empathy-individual-menu.c:1646
#: ../src/empathy-chat-window.c:1233
msgid "Inviting you to this room"
msgstr "邀请到此聊天室"
-#: ../libempathy-gtk/empathy-individual-menu.c:1694
+#: ../libempathy-gtk/empathy-individual-menu.c:1692
msgid "_Invite to Chat Room"
msgstr "邀请到聊天室(_I)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:1888
msgid "_Add Contact…"
msgstr "添加联系人(_A)..."
-#: ../libempathy-gtk/empathy-individual-view.c:2373
+#: ../libempathy-gtk/empathy-individual-view.c:2360
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "您真的要删除群组“%s”吗？"
-#: ../libempathy-gtk/empathy-individual-view.c:2376
+#: ../libempathy-gtk/empathy-individual-view.c:2363
msgid "Removing group"
msgstr "删除群组"
-#: ../libempathy-gtk/empathy-individual-view.c:2444
+#: ../libempathy-gtk/empathy-individual-view.c:2431
msgid "Re_name"
msgstr "重命名"
-#: ../libempathy-gtk/empathy-individual-widget.c:304
+#: ../libempathy-gtk/empathy-individual-widget.c:294
msgid "Channels:"
msgstr "频道："
-#: ../libempathy-gtk/empathy-individual-widget.c:455
+#: ../libempathy-gtk/empathy-individual-widget.c:445
msgid "Country ISO Code:"
msgstr "包括 ISO 编码："
-#: ../libempathy-gtk/empathy-individual-widget.c:457
+#: ../libempathy-gtk/empathy-individual-widget.c:447
msgid "Country:"
msgstr "国家："
-#: ../libempathy-gtk/empathy-individual-widget.c:459
+#: ../libempathy-gtk/empathy-individual-widget.c:449
msgid "State:"
msgstr "省："
-#: ../libempathy-gtk/empathy-individual-widget.c:461
+#: ../libempathy-gtk/empathy-individual-widget.c:451
msgid "City:"
msgstr "城市："
-#: ../libempathy-gtk/empathy-individual-widget.c:463
+#: ../libempathy-gtk/empathy-individual-widget.c:453
msgid "Area:"
msgstr "地区："
-#: ../libempathy-gtk/empathy-individual-widget.c:465
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Postal Code:"
msgstr "邮政编码："
-#: ../libempathy-gtk/empathy-individual-widget.c:467
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "Street:"
msgstr "街道："
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "Building:"
msgstr "建筑物："
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "Floor:"
msgstr "楼层："
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Room:"
msgstr "房间："
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Text:"
msgstr "文本："
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Description:"
msgstr "描述："
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "URI:"
msgstr "URI："
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Accuracy Level:"
msgstr "准确程度："
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Error:"
msgstr "错误："
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Vertical Error (meters):"
msgstr "垂直误差(米)："
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Horizontal Error (meters):"
msgstr "水平误差(米)："
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Speed:"
msgstr "速度："
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Bearing:"
msgstr "方位朝向："
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Climb Speed:"
msgstr "爬升速度："
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Last Updated on:"
msgstr "最近更新于："
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Longitude:"
msgstr "经度："
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Latitude:"
msgstr "纬度："
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Altitude:"
msgstr "海拔："
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:583
+#: ../libempathy-gtk/empathy-individual-widget.c:598
#: ../src/empathy-preferences.ui.h:39
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-individual-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:600
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-individual-widget.c:659
+#: ../libempathy-gtk/empathy-individual-widget.c:649
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e,%Y 于 %R UTC 时间"
#. Alias
-#: ../libempathy-gtk/empathy-individual-widget.c:1304
+#: ../libempathy-gtk/empathy-individual-widget.c:1292
msgid "Alias:"
msgstr "别名："
#. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-individual-widget.c:1513
+#: ../libempathy-gtk/empathy-individual-widget.c:1501
msgid "Identifier:"
msgstr "标识符："
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1640
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2187,32 +2200,32 @@ msgstr "<b>位置</b> 于 (日期)"
msgid "Online from a phone or mobile device"
msgstr "通过电话或移动设备上网"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:329
msgid "New Network"
msgstr "新建网络"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:532
msgid "Choose an IRC network"
msgstr "选择一个 IRC 网络"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:615
msgid "Reset _Networks List"
msgstr "重置_Networks列表"
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:619
msgctxt "verb displayed on a button to select an IRC network"
msgid "Select"
msgstr "选择"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:271
msgid "new server"
msgstr "新建服务器"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:534
msgid "SSL"
msgstr "SSL"
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:80
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 "
@@ -2221,11 +2234,11 @@ msgstr ""
"Empathy 可以自动发现和您连接到同一个网络中的人们，并且可以和他们聊天。如果您"
"想使用这个功能，请仔细查看下列信息是否正确。"
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:100
msgid "People nearby"
msgstr "附近的人"
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:115
msgid ""
"You can change these details later or disable this feature by choosing <span "
"style=\"italic\">Edit → Accounts</span> in the Contact List."
@@ -2233,133 +2246,133 @@ msgstr ""
"您可以在以后修改这些详细信息或通过在联系人列表中选择<span style=\"italic\">编"
"辑 → 帐号</span>来禁用这一功能。"
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:627
msgid "History"
msgstr "历史"
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:682
msgid "Show"
msgstr "显示"
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:704
msgid "Search"
msgstr "搜索"
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1155
#, c-format
msgid "Chat in %s"
msgstr "在 %s 聊天"
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1157
#, c-format
msgid "Chat with %s"
msgstr "与 %s 聊天"
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1207
+#: ../libempathy-gtk/empathy-log-window.c:1351
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%Y年%m月%d日 %A"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:1294
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1295
+#: ../libempathy-gtk/empathy-log-window.c:1300
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s：</b>%s"
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1375
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
msgstr[0] "%s 秒"
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1382
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
msgstr[0] "%s 分"
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1390
#, c-format
msgid "Call took %s, ended at %s"
msgstr "通话时长：%s，结束于 %s"
-#: ../libempathy-gtk/empathy-log-window.c:1716
+#: ../libempathy-gtk/empathy-log-window.c:1721
msgid "Today"
msgstr "今天"
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1725
msgid "Yesterday"
msgstr "昨天"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1735
+#: ../libempathy-gtk/empathy-log-window.c:1740
msgid "%e %B %Y"
msgstr "%Y年%m月%d日"
-#: ../libempathy-gtk/empathy-log-window.c:1839
-#: ../libempathy-gtk/empathy-log-window.c:3462
+#: ../libempathy-gtk/empathy-log-window.c:1844
+#: ../libempathy-gtk/empathy-log-window.c:3467
msgid "Anytime"
msgstr "随时"
-#: ../libempathy-gtk/empathy-log-window.c:1938
-#: ../libempathy-gtk/empathy-log-window.c:2397
+#: ../libempathy-gtk/empathy-log-window.c:1943
+#: ../libempathy-gtk/empathy-log-window.c:2402
msgid "Anyone"
msgstr "任何人"
-#: ../libempathy-gtk/empathy-log-window.c:2710
+#: ../libempathy-gtk/empathy-log-window.c:2715
msgid "Who"
msgstr "谁"
-#: ../libempathy-gtk/empathy-log-window.c:2919
+#: ../libempathy-gtk/empathy-log-window.c:2924
msgid "When"
msgstr "何时"
-#: ../libempathy-gtk/empathy-log-window.c:3037
+#: ../libempathy-gtk/empathy-log-window.c:3042
msgid "Anything"
msgstr "任何事"
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
msgid "Text chats"
msgstr "文本聊天"
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
#: ../src/empathy-preferences.ui.h:29
msgid "Calls"
msgstr "通话"
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3049
msgid "Incoming calls"
msgstr "来电"
-#: ../libempathy-gtk/empathy-log-window.c:3045
+#: ../libempathy-gtk/empathy-log-window.c:3050
msgid "Outgoing calls"
msgstr "呼出的语音通话"
-#: ../libempathy-gtk/empathy-log-window.c:3046
+#: ../libempathy-gtk/empathy-log-window.c:3051
msgid "Missed calls"
msgstr "未接来电"
-#: ../libempathy-gtk/empathy-log-window.c:3066
+#: ../libempathy-gtk/empathy-log-window.c:3071
msgid "What"
msgstr "什么事"
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3760
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "确定要删除以前的全部对话日志？"
-#: ../libempathy-gtk/empathy-log-window.c:3759
+#: ../libempathy-gtk/empathy-log-window.c:3764
msgid "Clear All"
msgstr "全部清除"
-#: ../libempathy-gtk/empathy-log-window.c:3766
+#: ../libempathy-gtk/empathy-log-window.c:3771
msgid "Delete from:"
msgstr "从以下位置删除："
@@ -2381,12 +2394,12 @@ msgid "Profile"
msgstr "个人信息"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-chat-window.c:1426 ../src/empathy-preferences.ui.h:11
msgid "Chat"
msgstr "聊天"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:26
msgid "Video"
msgstr "视频"
@@ -2403,75 +2416,77 @@ msgid "What kind of chat account do you have?"
msgstr "您已经拥有哪个类型的帐号？"
#: ../libempathy-gtk/empathy-new-account-dialog.c:151
-msgid "Adding new account"
+#, fuzzy
+#| msgid "Adding new account"
+msgid "Add new account"
msgstr "添加新帐号"
-#: ../libempathy-gtk/empathy-new-call-dialog.c:199
-#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
msgid "Enter a contact identifier or phone number:"
msgstr "输入一个联系人标识或电话号码："
#. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
msgid "_Video Call"
msgstr "视频呼叫(_V)"
#. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
msgid "_Audio Call"
msgstr "音频呼叫(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
msgid "New Call"
msgstr "新建通话"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
msgid "The contact is offline"
msgstr "联系人为离线"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
msgid "The specified contact is either invalid or unknown"
msgstr "指定的联系人无效或信息未知"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
msgid "The contact does not support this kind of conversation"
msgstr "选择的联系人不支持在该类型会话"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
msgid "The requested functionality is not implemented for this protocol"
msgstr "所要求的功能与此协议不兼容"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:94
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
msgid "Could not start a conversation with the given contact"
msgstr "无法与选择的联系人发起对话"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
msgid "You are banned from this channel"
msgstr "您已被此频道屏蔽"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
msgid "This channel is full"
msgstr "频道已满"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
msgid "You must be invited to join this channel"
msgstr "您必须被邀请才能加入此频道"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
msgid "Can't proceed while disconnected"
msgstr "断开时无法进行"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
msgid "Permission denied"
msgstr "拒绝访问"
-#: ../libempathy-gtk/empathy-new-message-dialog.c:110
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
msgid "There was an error starting the conversation"
msgstr "发起对话时出错"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:332
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
msgid "New Conversation"
msgstr "新建对话"
@@ -2481,26 +2496,26 @@ msgstr "新建对话"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:164
-#: ../libempathy-gtk/empathy-presence-chooser.c:200
+#: ../libempathy-gtk/empathy-presence-chooser.c:157
+#: ../libempathy-gtk/empathy-presence-chooser.c:193
msgid "Custom Message…"
msgstr "自定义消息..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:217
-#: ../libempathy-gtk/empathy-presence-chooser.c:219
+#: ../libempathy-gtk/empathy-presence-chooser.c:210
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
msgid "Edit Custom Messages…"
msgstr "编辑自定义消息"
-#: ../libempathy-gtk/empathy-presence-chooser.c:341
+#: ../libempathy-gtk/empathy-presence-chooser.c:334
msgid "Click to remove this status as a favorite"
msgstr "点击移除常用自定义状态"
-#: ../libempathy-gtk/empathy-presence-chooser.c:350
+#: ../libempathy-gtk/empathy-presence-chooser.c:343
msgid "Click to make this status a favorite"
msgstr "点击设置常用自定义状态"
#. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:384
+#: ../libempathy-gtk/empathy-presence-chooser.c:377
#, c-format
msgid ""
"<b>Current message: %s</b>\n"
@@ -2509,12 +2524,12 @@ msgstr ""
"<b>当前信息: %s</b>\n"
"<small><i>按下 Enter 设置新信息或按下 Esc 取消。</i></small>"
-#: ../libempathy-gtk/empathy-presence-chooser.c:393
+#: ../libempathy-gtk/empathy-presence-chooser.c:386
msgid "Set status"
msgstr "设置状态"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1101
+#: ../libempathy-gtk/empathy-presence-chooser.c:1094
msgid "Custom messages…"
msgstr "自定义消息..."
@@ -2522,12 +2537,12 @@ msgstr "自定义消息..."
#. To translator: %s is the name of the protocol, such as "Google Talk" or
#. * "Yahoo!"
#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:608
+#: ../libempathy-gtk/empathy-protocol-chooser.c:603
#, c-format
msgid "New %s account"
msgstr "新建 %s 帐号"
-#: ../libempathy-gtk/empathy-search-bar.c:243
+#: ../libempathy-gtk/empathy-search-bar.c:237
msgid "_Match case"
msgstr "区分大小写(_M)"
@@ -2551,371 +2566,391 @@ msgstr "区分大小写(_C)"
msgid "Phrase not found"
msgstr "未找到短语"
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:49
msgid "Received an instant message"
msgstr "收到了即时消息"
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Sent an instant message"
msgstr "发送即时消息"
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:53
msgid "Incoming chat request"
msgstr "收到的聊天请求"
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:55
msgid "Contact connected"
msgstr "联系人已连接"
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:57
msgid "Contact disconnected"
msgstr "联系人已断开"
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:59
msgid "Connected to server"
msgstr "已连接到服务器"
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:61
msgid "Disconnected from server"
msgstr "已从服务器断开连接"
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:63
msgid "Incoming voice call"
msgstr "呼入的语音通话"
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:65
msgid "Outgoing voice call"
msgstr "呼出的语音通话"
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:67
msgid "Voice call ended"
msgstr "语音通话结束"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:294
msgid "Edit Custom Messages"
msgstr "编辑自定义消息"
-#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+#: ../libempathy-gtk/empathy-subscription-dialog.c:233
msgid "Subscription Request"
msgstr "订阅请求"
-#: ../libempathy-gtk/empathy-subscription-dialog.c:240
-#: ../src/empathy-event-manager.c:1104
+#: ../libempathy-gtk/empathy-subscription-dialog.c:239
+#: ../src/empathy-event-manager.c:1096
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s 当您在线的时候可见"
-#: ../libempathy-gtk/empathy-subscription-dialog.c:281
-#: ../src/empathy-event-manager.c:729
+#: ../libempathy-gtk/empathy-subscription-dialog.c:280
+#: ../src/empathy-event-manager.c:721
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
msgid "_Accept"
msgstr "接受(_A)"
-#: ../libempathy-gtk/empathy-theme-adium.c:1125
+#: ../libempathy-gtk/empathy-theme-adium.c:1211
#, c-format
msgid "Message edited at %s"
msgstr "消息于 %s 被编辑"
-#: ../libempathy-gtk/empathy-theme-adium.c:1841
+#: ../libempathy-gtk/empathy-theme-adium.c:1913
msgid "Normal"
msgstr "普通"
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
msgid "The identity provided by the chat server cannot be verified."
msgstr "聊天服务器所提供的身份无法验证。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
msgid "The certificate is not signed by a Certification Authority."
msgstr "证书并非由 CA 签发。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
msgid "The certificate has expired."
msgstr "证书已过期。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
msgid "The certificate hasn't yet been activated."
msgstr "证书尚未被激活。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
msgid "The certificate does not have the expected fingerprint."
msgstr "证书缺少应有的指纹。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
msgid "The hostname verified by the certificate doesn't match the server name."
msgstr "证书所验证的主机名与服务器名不匹配。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
msgid "The certificate is self-signed."
msgstr "证书是自签署的。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
msgid ""
"The certificate has been revoked by the issuing Certification Authority."
msgstr "证书被证书签发机构吊销。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
msgid "The certificate is cryptographically weak."
msgstr "证书是弱加密的。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
msgid "The certificate length exceeds verifiable limits."
msgstr "证书长度超出可验证限制。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
msgid "The certificate is malformed."
msgstr "证书损坏。"
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
#, c-format
msgid "Expected hostname: %s"
msgstr "预期主机名: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
#, c-format
msgid "Certificate hostname: %s"
msgstr "证书主机名: %s"
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
msgid "C_ontinue"
msgstr "继续(_O)"
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
msgid "Untrusted connection"
msgstr "不受信任的连接"
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
msgid "This connection is untrusted. Would you like to continue anyway?"
msgstr "连接不受信任。是否仍要继续?"
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
msgid "Remember this choice for future connections"
msgstr "为将来的连接记住本次选择"
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
msgid "Certificate Details"
msgstr "证书详情"
-#: ../libempathy-gtk/empathy-ui-utils.c:1050
+#: ../libempathy-gtk/empathy-ui-utils.c:1078
msgid "Unable to open URI"
msgstr "无法打开 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1174
+#: ../libempathy-gtk/empathy-ui-utils.c:1202
msgid "Select a file"
msgstr "选择文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1248
+#: ../libempathy-gtk/empathy-ui-utils.c:1276
msgid "Insufficient free space to save file"
msgstr "空间不足，无法保存文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1256
+#: ../libempathy-gtk/empathy-ui-utils.c:1284
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
"Please choose another location."
msgstr "保存此文件需要 %s 空闲空间，但目前仅有 %s，请选择其他位置。"
-#: ../libempathy-gtk/empathy-ui-utils.c:1302
+#: ../libempathy-gtk/empathy-ui-utils.c:1330
#, c-format
msgid "Incoming file from %s"
msgstr "从 %s 传来的文件"
-#: ../libempathy-gtk/empathy-user-info.c:384
+#: ../libempathy-gtk/empathy-user-info.c:395
msgid "Go online to edit your personal information."
msgstr "请上线以编辑您的个人信息。"
-#: ../libempathy-gtk/empathy-user-info.c:464
+#: ../libempathy-gtk/empathy-user-info.c:475
msgid "<b>Personal Details</b>"
msgstr "<b>个人详情</b>"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:278
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Copy Link Address"
msgstr "复制链接地址(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-webkit-utils.c:285
+#: ../libempathy-gtk/empathy-webkit-utils.c:291
msgid "_Open Link"
msgstr "打开链接(_O)"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:305
+msgid "Inspect HTML"
+msgstr "审查 HTML"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:157
msgid "Current Locale"
msgstr "当前语言环境"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:161
-#: ../libempathy-gtk/totem-subtitle-encoding.c:163
-#: ../libempathy-gtk/totem-subtitle-encoding.c:165
-#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+#: ../libempathy-gtk/totem-subtitle-encoding.c:160
+#: ../libempathy-gtk/totem-subtitle-encoding.c:162
+#: ../libempathy-gtk/totem-subtitle-encoding.c:164
+#: ../libempathy-gtk/totem-subtitle-encoding.c:166
msgid "Arabic"
msgstr "阿拉伯语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+#: ../libempathy-gtk/totem-subtitle-encoding.c:169
msgid "Armenian"
msgstr "亚美尼亚语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:173
-#: ../libempathy-gtk/totem-subtitle-encoding.c:175
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+#: ../libempathy-gtk/totem-subtitle-encoding.c:172
+#: ../libempathy-gtk/totem-subtitle-encoding.c:174
+#: ../libempathy-gtk/totem-subtitle-encoding.c:176
msgid "Baltic"
msgstr "波罗的语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+#: ../libempathy-gtk/totem-subtitle-encoding.c:179
msgid "Celtic"
msgstr "凯尔特语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:183
-#: ../libempathy-gtk/totem-subtitle-encoding.c:185
-#: ../libempathy-gtk/totem-subtitle-encoding.c:187
-#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+#: ../libempathy-gtk/totem-subtitle-encoding.c:182
+#: ../libempathy-gtk/totem-subtitle-encoding.c:184
+#: ../libempathy-gtk/totem-subtitle-encoding.c:186
+#: ../libempathy-gtk/totem-subtitle-encoding.c:188
msgid "Central European"
msgstr "中欧"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:192
-#: ../libempathy-gtk/totem-subtitle-encoding.c:194
-#: ../libempathy-gtk/totem-subtitle-encoding.c:196
-#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+#: ../libempathy-gtk/totem-subtitle-encoding.c:191
+#: ../libempathy-gtk/totem-subtitle-encoding.c:193
+#: ../libempathy-gtk/totem-subtitle-encoding.c:195
+#: ../libempathy-gtk/totem-subtitle-encoding.c:197
msgid "Chinese Simplified"
msgstr "简体中文"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:201
-#: ../libempathy-gtk/totem-subtitle-encoding.c:203
-#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+#: ../libempathy-gtk/totem-subtitle-encoding.c:200
+#: ../libempathy-gtk/totem-subtitle-encoding.c:202
+#: ../libempathy-gtk/totem-subtitle-encoding.c:204
msgid "Chinese Traditional"
msgstr "繁体中文"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+#: ../libempathy-gtk/totem-subtitle-encoding.c:207
msgid "Croatian"
msgstr "克罗地亚语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:211
-#: ../libempathy-gtk/totem-subtitle-encoding.c:213
-#: ../libempathy-gtk/totem-subtitle-encoding.c:215
-#: ../libempathy-gtk/totem-subtitle-encoding.c:217
-#: ../libempathy-gtk/totem-subtitle-encoding.c:219
-#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+#: ../libempathy-gtk/totem-subtitle-encoding.c:210
+#: ../libempathy-gtk/totem-subtitle-encoding.c:212
+#: ../libempathy-gtk/totem-subtitle-encoding.c:214
+#: ../libempathy-gtk/totem-subtitle-encoding.c:216
+#: ../libempathy-gtk/totem-subtitle-encoding.c:218
+#: ../libempathy-gtk/totem-subtitle-encoding.c:220
msgid "Cyrillic"
msgstr "斯拉夫语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+#: ../libempathy-gtk/totem-subtitle-encoding.c:223
msgid "Cyrillic/Russian"
msgstr "斯拉夫语系/俄语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+#: ../libempathy-gtk/totem-subtitle-encoding.c:226
+#: ../libempathy-gtk/totem-subtitle-encoding.c:228
msgid "Cyrillic/Ukrainian"
msgstr "斯拉夫语系/乌克兰语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#: ../libempathy-gtk/totem-subtitle-encoding.c:231
msgid "Georgian"
msgstr "格鲁吉亚语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+#: ../libempathy-gtk/totem-subtitle-encoding.c:234
+#: ../libempathy-gtk/totem-subtitle-encoding.c:236
+#: ../libempathy-gtk/totem-subtitle-encoding.c:238
msgid "Greek"
msgstr "希腊语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+#: ../libempathy-gtk/totem-subtitle-encoding.c:241
msgid "Gujarati"
msgstr "古吉拉特语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+#: ../libempathy-gtk/totem-subtitle-encoding.c:244
msgid "Gurmukhi"
msgstr "旁遮普语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:248
-#: ../libempathy-gtk/totem-subtitle-encoding.c:250
-#: ../libempathy-gtk/totem-subtitle-encoding.c:252
-#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+#: ../libempathy-gtk/totem-subtitle-encoding.c:247
+#: ../libempathy-gtk/totem-subtitle-encoding.c:249
+#: ../libempathy-gtk/totem-subtitle-encoding.c:251
+#: ../libempathy-gtk/totem-subtitle-encoding.c:253
msgid "Hebrew"
msgstr "希伯来语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+#: ../libempathy-gtk/totem-subtitle-encoding.c:256
msgid "Hebrew Visual"
msgstr "希伯来语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+#: ../libempathy-gtk/totem-subtitle-encoding.c:259
msgid "Hindi"
msgstr "北印度语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+#: ../libempathy-gtk/totem-subtitle-encoding.c:262
msgid "Icelandic"
msgstr "冰岛语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+#: ../libempathy-gtk/totem-subtitle-encoding.c:265
+#: ../libempathy-gtk/totem-subtitle-encoding.c:267
+#: ../libempathy-gtk/totem-subtitle-encoding.c:269
msgid "Japanese"
msgstr "日本语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:273
-#: ../libempathy-gtk/totem-subtitle-encoding.c:275
-#: ../libempathy-gtk/totem-subtitle-encoding.c:277
-#: ../libempathy-gtk/totem-subtitle-encoding.c:279
+#: ../libempathy-gtk/totem-subtitle-encoding.c:272
+#: ../libempathy-gtk/totem-subtitle-encoding.c:274
+#: ../libempathy-gtk/totem-subtitle-encoding.c:276
+#: ../libempathy-gtk/totem-subtitle-encoding.c:278
msgid "Korean"
msgstr "韩语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+#: ../libempathy-gtk/totem-subtitle-encoding.c:281
msgid "Nordic"
msgstr "北欧语系"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#: ../libempathy-gtk/totem-subtitle-encoding.c:284
msgid "Persian"
msgstr "波斯语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+#: ../libempathy-gtk/totem-subtitle-encoding.c:287
+#: ../libempathy-gtk/totem-subtitle-encoding.c:289
msgid "Romanian"
msgstr "罗马尼亚语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+#: ../libempathy-gtk/totem-subtitle-encoding.c:292
msgid "South European"
msgstr "南欧语系"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+#: ../libempathy-gtk/totem-subtitle-encoding.c:295
msgid "Thai"
msgstr "泰国语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:299
-#: ../libempathy-gtk/totem-subtitle-encoding.c:301
-#: ../libempathy-gtk/totem-subtitle-encoding.c:303
-#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+#: ../libempathy-gtk/totem-subtitle-encoding.c:298
+#: ../libempathy-gtk/totem-subtitle-encoding.c:300
+#: ../libempathy-gtk/totem-subtitle-encoding.c:302
+#: ../libempathy-gtk/totem-subtitle-encoding.c:304
msgid "Turkish"
msgstr "土耳其语"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:308
-#: ../libempathy-gtk/totem-subtitle-encoding.c:310
-#: ../libempathy-gtk/totem-subtitle-encoding.c:312
-#: ../libempathy-gtk/totem-subtitle-encoding.c:314
-#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+#: ../libempathy-gtk/totem-subtitle-encoding.c:307
+#: ../libempathy-gtk/totem-subtitle-encoding.c:309
+#: ../libempathy-gtk/totem-subtitle-encoding.c:311
+#: ../libempathy-gtk/totem-subtitle-encoding.c:313
+#: ../libempathy-gtk/totem-subtitle-encoding.c:315
msgid "Unicode"
msgstr "Unicode"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:319
-#: ../libempathy-gtk/totem-subtitle-encoding.c:321
-#: ../libempathy-gtk/totem-subtitle-encoding.c:323
-#: ../libempathy-gtk/totem-subtitle-encoding.c:325
-#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+#: ../libempathy-gtk/totem-subtitle-encoding.c:318
+#: ../libempathy-gtk/totem-subtitle-encoding.c:320
+#: ../libempathy-gtk/totem-subtitle-encoding.c:322
+#: ../libempathy-gtk/totem-subtitle-encoding.c:324
+#: ../libempathy-gtk/totem-subtitle-encoding.c:326
msgid "Western"
msgstr "西方语言"
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+#: ../libempathy-gtk/totem-subtitle-encoding.c:329
+#: ../libempathy-gtk/totem-subtitle-encoding.c:331
+#: ../libempathy-gtk/totem-subtitle-encoding.c:333
msgid "Vietnamese"
msgstr "越南语"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
+#: ../libempathy-gtk/empathy-roster-model.h:27
+msgid "Top Contacts"
+msgstr "常用联系人"
+
+#: ../libempathy-gtk/empathy-roster-model.h:29
+msgid "Ungrouped"
+msgstr "未分组"
+
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:201
+#, c-format
+msgid "Server cannot find contact: %s"
+msgstr "服务器找不到联系人：%s"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:223
msgid "No error message"
msgstr "无错误信息"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:296
msgid "Instant Message (Empathy)"
msgstr "即时消息(Empathy)"
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
msgid ""
"Empathy is free software; you can redistribute it and/or modify it under the "
"terms of the GNU General Public License as published by the Free Software "
@@ -2925,7 +2960,7 @@ msgstr ""
"Empathy 是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证下重新发布"
"或修改它；许可证可使用第二版或您想选择的更新的版本。"
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
msgid ""
"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2935,7 +2970,7 @@ msgstr ""
"Empathy 发布的目的是希望它对您有用，但是没有任何担保；即使是对商业应用以及其"
"它特定目的。查阅 GNU 通用公共许可证以获取更多细节。"
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
msgid ""
"You should have received a copy of the GNU General Public License along with "
"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2945,11 +2980,11 @@ msgstr ""
"给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA "
"02110-130159 USA"
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
msgid "An Instant Messaging client for GNOME"
msgstr "一个 GNOME 即时消息客户端"
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
msgid "translator-credits"
msgstr ""
"Abel Cheung <maddog linux org hk>, 2003\n"
@@ -2975,68 +3010,69 @@ msgstr ""
" fujianwzh https://launchpad.net/~fujianwzh\n";
" yuane https://launchpad.net/~yuane";
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:171
msgid "Don't display any dialogs; do any work (eg, importing) and exit"
msgstr "不显示任何对话框；完成所有工作（如导入）然后退出"
-#: ../src/empathy-accounts.c:186
+#: ../src/empathy-accounts.c:175
msgid ""
"Don't display any dialogs unless there are only \"People Nearby\" accounts"
msgstr "只有“附近的人”帐号的时候不显示任何对话框"
# lainme：初次选择给定的帐号(比如 gabble/jabber/foo_40example_2eorg0)
-#: ../src/empathy-accounts.c:190
+#: ../src/empathy-accounts.c:179
msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
msgstr "首先选择给定帐号(如 gabble/jabber/foo_40example_2eorg0)"
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:181
msgid "<account-id>"
msgstr "<帐号 ID>"
-#: ../src/empathy-accounts.c:197
+#: ../src/empathy-accounts.c:186
msgid "- Empathy Accounts"
msgstr "- Empathy 帐号"
-#: ../src/empathy-accounts.c:240
+#: ../src/empathy-accounts.c:239
msgid "Empathy Accounts"
msgstr "Empathy 帐号"
#. The primary text of the dialog shown to the user when he is about to lose
#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:68
-#, c-format
-msgid "There are unsaved modifications to your %s account."
+#: ../src/empathy-accounts-dialog.c:52
+#, fuzzy, c-format
+#| msgid "There are unsaved modifications to your %s account."
+msgid "There are unsaved modifications to your %.50s 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:72
+#: ../src/empathy-accounts-dialog.c:56
msgid "Your new account has not been saved yet."
msgstr "您的新帐号还没有保存。"
-#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:388 ../src/empathy-call-window.c:1258
msgid "Connecting…"
msgstr "正在连接..."
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:429
#, c-format
msgid "Offline — %s"
msgstr "离线 - %s"
-#: ../src/empathy-accounts-dialog.c:457
+#: ../src/empathy-accounts-dialog.c:441
#, c-format
msgid "Disconnected — %s"
msgstr "已断开 - %s"
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:452
msgid "Offline — No Network Connection"
msgstr "离线 - 无可用网络"
-#: ../src/empathy-accounts-dialog.c:475
+#: ../src/empathy-accounts-dialog.c:459
msgid "Unknown Status"
msgstr "未知状态"
-#: ../src/empathy-accounts-dialog.c:492
+#: ../src/empathy-accounts-dialog.c:476
msgid ""
"This account has been disabled because it relies on an old, unsupported "
"backend. Please install telepathy-haze and restart your session to migrate "
@@ -3045,59 +3081,60 @@ msgstr ""
"因为此账户依赖一个旧式、不支持的后端，所以此账户已被禁用。请安装 telepathy-"
"haze 并重新启动您的会话来迁移您的账户。"
-#: ../src/empathy-accounts-dialog.c:502
+#: ../src/empathy-accounts-dialog.c:486
msgid "Offline — Account Disabled"
msgstr "离线 - 帐号被禁用"
-#: ../src/empathy-accounts-dialog.c:608
+#: ../src/empathy-accounts-dialog.c:592
msgid "Edit Connection Parameters"
msgstr "编辑连接参数"
-#: ../src/empathy-accounts-dialog.c:733
+#: ../src/empathy-accounts-dialog.c:719
msgid "_Edit Connection Parameters..."
msgstr "编辑连接参数(_E)..."
-#: ../src/empathy-accounts-dialog.c:1266
-#, c-format
-msgid "Do you want to remove %s from your computer?"
+#: ../src/empathy-accounts-dialog.c:1252
+#, fuzzy, c-format
+#| msgid "Do you want to remove %s from your computer?"
+msgid "Do you want to remove %.50s from your computer?"
msgstr "您要从电脑中移除 %s 吗？"
-#: ../src/empathy-accounts-dialog.c:1270
+#: ../src/empathy-accounts-dialog.c:1256
msgid "This will not remove your account on the server."
msgstr "这不会删除服务器上的帐号。"
-#: ../src/empathy-accounts-dialog.c:1475
+#: ../src/empathy-accounts-dialog.c:1461
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "您将要选择另一个帐号，所做的修改将作废。您确定要继续吗？"
#. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1666
+#: ../src/empathy-accounts-dialog.c:1652
msgid "_Enabled"
msgstr "已启用(_E)"
#. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1689
+#: ../src/empathy-accounts-dialog.c:1675
msgid "Rename"
msgstr "重命名"
-#: ../src/empathy-accounts-dialog.c:2105
+#: ../src/empathy-accounts-dialog.c:2091
msgid "_Skip"
msgstr "跳过(_S)"
-#: ../src/empathy-accounts-dialog.c:2109
+#: ../src/empathy-accounts-dialog.c:2095
msgid "_Connect"
msgstr "连接(_C)"
-#: ../src/empathy-accounts-dialog.c:2288
+#: ../src/empathy-accounts-dialog.c:2274
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "您将要关闭此窗口，所做的修改将作废。您确定要继续吗？"
#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2431
+#: ../src/empathy-accounts-dialog.c:2418
msgid "Messaging and VoIP Accounts"
msgstr "消息和 VoIP 帐号"
@@ -3119,31 +3156,31 @@ msgstr "要添加一个新帐号，您首先需要为您想要使用的每个协
msgid "No protocol backends installed"
msgstr "未安装协议后端"
-#: ../src/empathy-auth-client.c:296
+#: ../src/empathy-auth-client.c:285
msgid " - Empathy authentication client"
msgstr " - Empathy 认证客户端"
-#: ../src/empathy-auth-client.c:312
+#: ../src/empathy-auth-client.c:301
msgid "Empathy authentication client"
msgstr "Empathy 认证客户端"
-#: ../src/empathy.c:427
+#: ../src/empathy.c:407
msgid "Don't connect on startup"
msgstr "启动时不自动连接"
-#: ../src/empathy.c:431
+#: ../src/empathy.c:411
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "启动时不显示联系人列表"
-#: ../src/empathy.c:447
+#: ../src/empathy.c:440
msgid "- Empathy IM Client"
msgstr " - Empathy 即时通讯客户端"
-#: ../src/empathy.c:623
+#: ../src/empathy.c:626
msgid "Error contacting the Account Manager"
msgstr "联系帐号管理器出错"
-#: ../src/empathy.c:625
+#: ../src/empathy.c:628
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3155,142 +3192,140 @@ msgstr ""
"\n"
"%s"
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:115
+msgid "In a call"
+msgstr "正在通话"
+
+#: ../src/empathy-call.c:215
msgid "- Empathy Audio/Video Client"
msgstr " - Empathy 语音/视频客户端"
-#: ../src/empathy-call.c:217
+#: ../src/empathy-call.c:239
msgid "Empathy Audio/Video Client"
msgstr "Empathy 语音/视频客户端"
-#: ../src/empathy-call-observer.c:119
+#: ../src/empathy-call-observer.c:110
#, c-format
msgid "%s just tried to call you, but you were in another call."
msgstr "%s 刚刚尝试呼叫您，但您当时正在与其他人通话。"
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr "i"
-
-#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+#: ../src/empathy-call-window.c:1533 ../src/empathy-event-manager.c:500
msgid "Incoming call"
msgstr "来电"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:905
#, c-format
msgid "Incoming video call from %s"
msgstr "%s 的视频呼叫"
-#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
-#: ../src/empathy-event-manager.c:913
+#: ../src/empathy-call-window.c:1539 ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:905
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的来电"
-#: ../src/empathy-call-window.c:1494
-#: ../src/empathy-notifications-approver.c:197
+#: ../src/empathy-call-window.c:1543
+#: ../src/empathy-notifications-approver.c:191
msgid "Reject"
msgstr "拒绝"
-#: ../src/empathy-call-window.c:1495
-#: ../src/empathy-notifications-approver.c:202
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-call-window.c:1544
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
msgid "Answer"
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:1861
+#: ../src/empathy-call-window.c:1913
#, c-format
msgid "Call with %s"
msgstr "与 %s 通话"
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2165
msgid "The IP address as seen by the machine"
msgstr "机器所见的 IP 地址"
-#: ../src/empathy-call-window.c:2115
+#: ../src/empathy-call-window.c:2167
msgid "The IP address as seen by a server on the Internet"
msgstr "Internet 上服务器所见的 IP 地址"
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-call-window.c:2169
msgid "The IP address of the peer as seen by the other side"
msgstr "另一方所见的 IP 地址"
-#: ../src/empathy-call-window.c:2119
+#: ../src/empathy-call-window.c:2171
msgid "The IP address of a relay server"
msgstr "中转服务器 IP 地址"
-#: ../src/empathy-call-window.c:2121
+#: ../src/empathy-call-window.c:2173
msgid "The IP address of the multicast group"
msgstr "多播组的 IP 地址"
-#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
-#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
-#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-call-window.c:2584 ../src/empathy-call-window.c:2585
+#: ../src/empathy-call-window.c:2586 ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.ui.h:28
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-call-window.c:2874
+#: ../src/empathy-call-window.c:2946
msgid "On hold"
msgstr "挂起"
-#: ../src/empathy-call-window.c:2876
+#: ../src/empathy-call-window.c:2950
msgid "Mute"
msgstr "静音"
-#: ../src/empathy-call-window.c:2878
+#: ../src/empathy-call-window.c:2952
msgid "Duration"
msgstr "时长"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-call-window.c:2955
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
-#: ../src/empathy-call-window.c:2977
+#: ../src/empathy-call-window.c:3051
msgid "Technical Details"
msgstr "技术细节"
-#: ../src/empathy-call-window.c:3016
+#: ../src/empathy-call-window.c:3090
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
-#: ../src/empathy-call-window.c:3021
+#: ../src/empathy-call-window.c:3095
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
-#: ../src/empathy-call-window.c:3027
+#: ../src/empathy-call-window.c:3101
#, 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:3033
+#: ../src/empathy-call-window.c:3107
msgid "There was a failure on the network"
msgstr "网络出现一个错误"
-#: ../src/empathy-call-window.c:3037
+#: ../src/empathy-call-window.c:3111
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
-#: ../src/empathy-call-window.c:3040
+#: ../src/empathy-call-window.c:3114
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3126
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3300,32 +3335,32 @@ msgstr ""
"Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助菜"
"单里“调试”窗口收集到的日志。"
-#: ../src/empathy-call-window.c:3061
+#: ../src/empathy-call-window.c:3135
msgid "There was a failure in the call engine"
msgstr "呼叫引擎里出现了一个故障"
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3138
msgid "The end of the stream was reached"
msgstr "已到达流的末尾"
-#: ../src/empathy-call-window.c:3104
+#: ../src/empathy-call-window.c:3178
msgid "Can't establish audio stream"
msgstr "不能建立音频流"
-#: ../src/empathy-call-window.c:3114
+#: ../src/empathy-call-window.c:3188
msgid "Can't establish video stream"
msgstr "不能建立视频流"
-#: ../src/empathy-call-window.c:3151
+#: ../src/empathy-call-window.c:3225
#, c-format
msgid "Your current balance is %s."
msgstr "您当前的余额为 %s。"
-#: ../src/empathy-call-window.c:3155
+#: ../src/empathy-call-window.c:3229
msgid "Sorry, you don’t have enough credit for that call."
msgstr "对不起，您信用卡余额不足以支付此次通话。"
-#: ../src/empathy-call-window.c:3157
+#: ../src/empathy-call-window.c:3231
msgid "Top Up"
msgstr "充值"
@@ -3362,90 +3397,98 @@ msgid "_Debug"
msgstr "调试(_D)"
#: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
msgid "Swap camera"
msgstr "交换相机"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
msgid "Minimise me"
msgstr "最小化我"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
msgid "Maximise me"
msgstr "最大化我"
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
msgid "Disable camera"
msgstr "禁用相机"
-#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-call-window.ui.h:16
msgid "Hang up"
msgstr "挂断"
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:17
msgid "Hang up current call"
msgstr "挂断当前呼叫"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
msgid "Video call"
msgstr "视频呼叫"
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
msgid "Start a video call"
msgstr "开始视频通话"
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
msgid "Start an audio call"
msgstr "开始音频通话"
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
msgid "Show dialpad"
msgstr "显示拨号盘"
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
msgid "Display the dialpad"
msgstr "显示拨号盘"
-#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:24
msgid "Toggle video transmission"
msgstr "切换视频传输"
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:25
msgid "Toggle audio transmission"
msgstr "切换音频传输"
-#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:27
msgid "Encoding Codec:"
msgstr "编码器："
-#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-call-window.ui.h:29
msgid "Decoding Codec:"
msgstr "解码器："
-#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:30
msgid "Remote Candidate:"
msgstr "远程候选："
-#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:31
msgid "Local Candidate:"
msgstr "本地候选："
-#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
msgid "Audio"
msgstr "音频"
-#: ../src/empathy-chat.c:104
+#: ../src/empathy-chat.c:101
msgid "- Empathy Chat Client"
msgstr " - Empathy IM 客户端"
-#: ../src/empathy-chatrooms-window.c:251
+#: ../src/empathy-chatrooms-window.c:243
msgid "Name"
msgstr "名称"
-#: ../src/empathy-chatrooms-window.c:269
+#: ../src/empathy-chatrooms-window.c:261
msgid "Room"
msgstr "聊天室"
-#: ../src/empathy-chatrooms-window.c:277
+#: ../src/empathy-chatrooms-window.c:269
msgid "Auto-Connect"
msgstr "自动连接"
@@ -3453,18 +3496,18 @@ msgstr "自动连接"
msgid "Manage Favorite Rooms"
msgstr "管理聊天室收藏"
-#: ../src/empathy-chat-window.c:280
+#: ../src/empathy-chat-window.c:275
msgid "Close this window?"
msgstr "关闭此窗口？"
-#: ../src/empathy-chat-window.c:286
+#: ../src/empathy-chat-window.c:281
#, c-format
msgid ""
"Closing this window will leave %s. You will not receive any further messages "
"until you rejoin it."
msgstr "关闭此窗口将离开 %s。您将不会再收到任何消息，除非重新加入。"
-#: ../src/empathy-chat-window.c:299
+#: ../src/empathy-chat-window.c:294
#, c-format
msgid ""
"Closing this window will leave a chat room. You will not receive any further "
@@ -3475,22 +3518,22 @@ msgid_plural ""
msgstr[0] ""
"关闭此窗口将离开 %u 间聊天室。您将不会再收到任何消息，除非重新加入。"
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:305
#, c-format
msgid "Leave %s?"
msgstr "离开 %s？"
-#: ../src/empathy-chat-window.c:312
+#: ../src/empathy-chat-window.c:307
msgid ""
"You will not receive any further messages from this chat room until you "
"rejoin it."
msgstr "您将不会再收到来自此聊天室的任何消息，除非重新加入。"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:326
msgid "Close window"
msgstr "关闭窗口"
-#: ../src/empathy-chat-window.c:331
+#: ../src/empathy-chat-window.c:326
msgid "Leave room"
msgstr "离开聊天室"
@@ -3592,160 +3635,176 @@ msgstr "右移标签(_R)"
msgid "_Detach Tab"
msgstr "漂移标签(_D)"
-#: ../src/empathy-debugger.c:69
+#: ../src/empathy-debugger.c:77
msgid "Show a particular service"
msgstr "显示特定的服务"
-#: ../src/empathy-debugger.c:74
+#: ../src/empathy-debugger.c:82
msgid "- Empathy Debugger"
msgstr "- Empathy 调试器"
-#: ../src/empathy-debugger.c:113
+#: ../src/empathy-debugger.c:142
msgid "Empathy Debugger"
msgstr "Empathy 调试器"
-#: ../src/empathy-debug-window.c:1599
+#: ../src/empathy-debug-window.c:1589
msgid "Save"
msgstr "保存"
-#: ../src/empathy-debug-window.c:1659
+#: ../src/empathy-debug-window.c:1649
msgid "Pastebin link"
msgstr "Pastebin 链接"
-#: ../src/empathy-debug-window.c:1668
+#: ../src/empathy-debug-window.c:1658
msgid "Pastebin response"
msgstr "Pastebin 响应"
-#: ../src/empathy-debug-window.c:1675
+#: ../src/empathy-debug-window.c:1665
msgid "Data too large for a single paste. Please save logs to file."
msgstr "一次粘贴的数据太多。请把日志保存到文件。"
-#: ../src/empathy-debug-window.c:1856
+#: ../src/empathy-debug-window.c:1847
msgid "Debug Window"
msgstr "调试窗口"
-#: ../src/empathy-debug-window.c:1916
+#: ../src/empathy-debug-window.c:1907
msgid "Send to pastebin"
msgstr "发送到 pastebin"
-#: ../src/empathy-debug-window.c:1960
+#: ../src/empathy-debug-window.c:1951
msgid "Pause"
msgstr "暂停"
-#: ../src/empathy-debug-window.c:1972
+#: ../src/empathy-debug-window.c:1963
msgid "Level "
msgstr "级别 "
-#: ../src/empathy-debug-window.c:1991
+#: ../src/empathy-debug-window.c:1982
msgid "Debug"
msgstr "调试"
-#: ../src/empathy-debug-window.c:1996
+#: ../src/empathy-debug-window.c:1987
msgid "Info"
msgstr "信息"
-#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:1992 ../src/empathy-debug-window.c:2067
msgid "Message"
msgstr "消息"
-#: ../src/empathy-debug-window.c:2006
+#: ../src/empathy-debug-window.c:1997
msgid "Warning"
msgstr "警告"
-#: ../src/empathy-debug-window.c:2011
+#: ../src/empathy-debug-window.c:2002
msgid "Critical"
msgstr "危急"
-#: ../src/empathy-debug-window.c:2016
+#: ../src/empathy-debug-window.c:2007
msgid "Error"
msgstr "错误"
-#: ../src/empathy-debug-window.c:2035
+#: ../src/empathy-debug-window.c:2020
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://";
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"即使不显示密码，日志中仍然可能包含一些敏感信息，如您的联系人列表或最近收发的"
+"消息。\n"
+"如果不想让这些信息出现在公共的 BUG 报告中，您可以通过在 <a href=\"https://";
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug 报告</a> 中显示高级字"
+"段来控制在发送报告时哪些内容能被 Empathy 开发者看到。"
+
+#: ../src/empathy-debug-window.c:2052
msgid "Time"
msgstr "时间"
-#: ../src/empathy-debug-window.c:2038
+#: ../src/empathy-debug-window.c:2055
msgid "Domain"
msgstr "域"
-#: ../src/empathy-debug-window.c:2041
+#: ../src/empathy-debug-window.c:2058
msgid "Category"
msgstr "类别"
-#: ../src/empathy-debug-window.c:2044
+#: ../src/empathy-debug-window.c:2061
msgid "Level"
msgstr "级别"
-#: ../src/empathy-debug-window.c:2073
+#: ../src/empathy-debug-window.c:2090
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr "已选定的连接管理不支持远程调试扩展"
-#: ../src/empathy-event-manager.c:508
+#: ../src/empathy-event-manager.c:500
msgid "Incoming video call"
msgstr "呼入的视频通话"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:504
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 视频来电。您想要接听吗？"
-#: ../src/empathy-event-manager.c:513
+#: ../src/empathy-event-manager.c:505
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 来电，您想要接听吗？"
-#: ../src/empathy-event-manager.c:541
+#: ../src/empathy-event-manager.c:533
msgid "_Reject"
msgstr "拒绝(_R)"
-#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:541 ../src/empathy-event-manager.c:549
msgid "_Answer"
msgstr "接听(_A)"
-#: ../src/empathy-event-manager.c:557
+#: ../src/empathy-event-manager.c:549
msgid "_Answer with video"
msgstr "使用视频接听(_A)"
-#: ../src/empathy-event-manager.c:712
+#: ../src/empathy-event-manager.c:704
msgid "Room invitation"
msgstr "聊天室邀请"
-#: ../src/empathy-event-manager.c:714
+#: ../src/empathy-event-manager.c:706
#, c-format
msgid "Invitation to join %s"
msgstr "邀请您加入 %s"
-#: ../src/empathy-event-manager.c:721
+#: ../src/empathy-event-manager.c:713
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正邀请您加入 %s"
-#: ../src/empathy-event-manager.c:734
+#: ../src/empathy-event-manager.c:726
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:752
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 已邀请您加入 %s"
-#: ../src/empathy-event-manager.c:766
+#: ../src/empathy-event-manager.c:758
#, c-format
msgid "You have been invited to join %s"
msgstr "您被邀请加入 %s"
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:937
#, c-format
msgid "Incoming file transfer from %s"
msgstr "接收 %s 文件传输"
-#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
+#: ../src/empathy-event-manager.c:965 ../src/empathy-roster-window.c:212
msgid "Password required"
msgstr "需要密码"
-#: ../src/empathy-event-manager.c:1110
+#: ../src/empathy-event-manager.c:1102
#, c-format
msgid ""
"\n"
@@ -3755,105 +3814,105 @@ msgstr ""
"消息：%s"
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:93
#, 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:102
+#: ../src/empathy-ft-manager.c:96
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:172
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:267
#, c-format
msgid "%s of %s at %s/s"
msgstr "%2$s 中的 %1$s，速度 %3$s/s"
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:268
#, 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:305
+#: ../src/empathy-ft-manager.c:299
#, 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:308
+#: ../src/empathy-ft-manager.c:302
#, 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:338
+#: ../src/empathy-ft-manager.c:332
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "从 %2$s 接收 \"%1$s\" 出错"
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:335
msgid "Error receiving a file"
msgstr "接收文件出错"
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:340
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "向 %2$s 发送 \"%1$s\" 出错"
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:343
msgid "Error sending a file"
msgstr "发送文件出错"
#. translators: first %s is filename, second %s
#. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:482
#, 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:493
+#: ../src/empathy-ft-manager.c:487
#, c-format
msgid "\"%s\" sent to %s"
msgstr "已经向 %2$s 完成发送 \"%1$s\""
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:490
msgid "File transfer completed"
msgstr "文件传送完成"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:609 ../src/empathy-ft-manager.c:773
msgid "Waiting for the other participant's response"
msgstr "正在等待其他参与者的回应"
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:635 ../src/empathy-ft-manager.c:673
#, c-format
msgid "Checking integrity of \"%s\""
msgstr "检查\"%s\"完整性"
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:638 ../src/empathy-ft-manager.c:676
#, c-format
msgid "Hashing \"%s\""
msgstr "校验中 \"%s\""
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1019
msgid "%"
msgstr "%"
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1031
msgid "File"
msgstr "文件"
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1053
msgid "Remaining"
msgstr "剩余"
@@ -3865,59 +3924,59 @@ msgstr "文件传输"
msgid "Remove completed, canceled and failed file transfers from the list"
msgstr "从列表移除已完成、已取消及已失败的文件传输"
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
msgid "_Import"
msgstr "导入(_I)"
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
msgid ""
"No accounts to import could be found. Empathy currently only supports "
"importing accounts from Pidgin."
msgstr "未找到可导入的帐号。Empathy 目前只能支持从 Pidgin 导入帐号。"
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
msgid "Import Accounts"
msgstr "导入帐号"
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:302
+#: ../src/empathy-import-widget.c:296
msgid "Import"
msgstr "导入"
-#: ../src/empathy-import-widget.c:311
+#: ../src/empathy-import-widget.c:305
msgid "Protocol"
msgstr "协议"
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:329
msgid "Source"
msgstr "源"
-#: ../src/empathy-invite-participant-dialog.c:201
-#: ../src/empathy-invite-participant-dialog.c:229
+#: ../src/empathy-invite-participant-dialog.c:196
+#: ../src/empathy-invite-participant-dialog.c:224
msgid "Invite Participant"
msgstr "邀请参与者"
-#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:197
msgid "Choose a contact to invite into the conversation:"
msgstr "选择一个联系人以加入该会话："
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:220
msgid "Invite"
msgstr "邀请"
-#: ../src/empathy-new-chatroom-dialog.c:194
+#: ../src/empathy-new-chatroom-dialog.c:184
msgid "Chat Room"
msgstr "聊天室"
-#: ../src/empathy-new-chatroom-dialog.c:209
+#: ../src/empathy-new-chatroom-dialog.c:199
msgid "Members"
msgstr "成员"
-#: ../src/empathy-new-chatroom-dialog.c:410
+#: ../src/empathy-new-chatroom-dialog.c:400
msgid "Failed to list rooms"
msgstr "无法列出聊天室"
-#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:435
#, c-format
msgid ""
"%s\n"
@@ -3930,17 +3989,17 @@ msgstr ""
"需要密码: %s\n"
"成员: %s"
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:437
+#: ../src/empathy-new-chatroom-dialog.c:438
msgid "Yes"
msgstr "是"
-#: ../src/empathy-new-chatroom-dialog.c:441
-#: ../src/empathy-new-chatroom-dialog.c:442
+#: ../src/empathy-new-chatroom-dialog.c:437
+#: ../src/empathy-new-chatroom-dialog.c:438
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:784
+#: ../src/empathy-new-chatroom-dialog.c:789
msgid "Join Room"
msgstr "加入聊天室"
@@ -3977,104 +4036,104 @@ msgstr "无法载入聊天室列表"
msgid "Room List"
msgstr "聊天室列表"
-#: ../src/empathy-notifications-approver.c:188
+#: ../src/empathy-notifications-approver.c:182
msgid "Respond"
msgstr "响应"
-#: ../src/empathy-notifications-approver.c:207
+#: ../src/empathy-notifications-approver.c:201
msgid "Answer with video"
msgstr "以视频应答"
-#: ../src/empathy-notifications-approver.c:215
-#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
msgid "Decline"
msgstr "拒绝"
-#: ../src/empathy-notifications-approver.c:219
-#: ../src/empathy-notifications-approver.c:230
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
msgid "Accept"
msgstr "接受"
#. translators: the 'Provide' button is displayed in a notification
#. * bubble when Empathy is asking for an account password; clicking on it
#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:240
+#: ../src/empathy-notifications-approver.c:234
msgid "Provide"
msgstr "提供"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:134
msgid "Message received"
msgstr "收到了消息"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:135
msgid "Message sent"
msgstr "发出了消息"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:136
msgid "New conversation"
msgstr "新对话"
-#: ../src/empathy-preferences.c:146
+#: ../src/empathy-preferences.c:137
msgid "Contact comes online"
msgstr "联系人上线了"
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
msgid "Contact goes offline"
msgstr "联系人离线了"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
msgid "Account connected"
msgstr "帐号已连接"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
msgid "Account disconnected"
msgstr "帐号已断开"
-#: ../src/empathy-preferences.c:386
+#: ../src/empathy-preferences.c:377
msgid "Language"
msgstr "语言"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:637
+#: ../src/empathy-preferences.c:628
msgid "Juliet"
msgstr "朱立叶"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:644
+#: ../src/empathy-preferences.c:635
msgid "Romeo"
msgstr "罗密欧"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:650
+#: ../src/empathy-preferences.c:641
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:654
+#: ../src/empathy-preferences.c:645
msgid "Deny thy father and refuse thy name;"
msgstr "Deny thy father and refuse thy name;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:657
+#: ../src/empathy-preferences.c:648
msgid "Or if thou wilt not, be but sworn my love"
msgstr "Or if thou wilt not, be but sworn my love"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:660
+#: ../src/empathy-preferences.c:651
msgid "And I'll no longer be a Capulet."
msgstr "And I'll no longer be a Capulet."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:663
+#: ../src/empathy-preferences.c:654
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Shall I hear more, or shall I speak at this?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:666
+#: ../src/empathy-preferences.c:657
msgid "Juliet has disconnected"
msgstr "朱立叶已断开连接"
-#: ../src/empathy-preferences.c:1032
+#: ../src/empathy-preferences.c:1023
msgid "Preferences"
msgstr "首选项"
@@ -4086,7 +4145,7 @@ msgstr "显示分组"
msgid "Show account balances"
msgstr "显示帐号余额"
-#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2236
msgid "Contact List"
msgstr "联系人列表"
@@ -4248,64 +4307,84 @@ msgstr "版本："
msgid "Themes"
msgstr "主题"
-#: ../src/empathy-roster-window.c:242
+#: ../src/empathy-roster-window.c:229
msgid "Provide Password"
msgstr "提供密码"
-#: ../src/empathy-roster-window.c:248
+#: ../src/empathy-roster-window.c:235
msgid "Disconnect"
msgstr "已断开连接"
-#: ../src/empathy-roster-window.c:442
-msgid "You need to setup an account to see contacts here."
+#: ../src/empathy-roster-window.c:478
+msgid "You need to set up an account to see contacts here."
msgstr "您需要设置一个帐号才能查看这里的联系人。"
-#: ../src/empathy-roster-window.c:518
+#: ../src/empathy-roster-window.c:554
#, c-format
msgid "Sorry, %s accounts can’t be used until your %s software is updated."
msgstr "很抱歉，在软件 %2$s 更新前，您不能使用 %1$s 帐号。"
-#: ../src/empathy-roster-window.c:636
+#: ../src/empathy-roster-window.c:655
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:659
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:674
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s 帐号需要身份认证"
+
+#: ../src/empathy-roster-window.c:685
+msgid "Online Accounts"
+msgstr "在线帐号"
+
+#: ../src/empathy-roster-window.c:732
msgid "Update software..."
msgstr "升级软件"
-#: ../src/empathy-roster-window.c:642
+#: ../src/empathy-roster-window.c:738
msgid "Reconnect"
msgstr "重新连接"
-#: ../src/empathy-roster-window.c:646
+#: ../src/empathy-roster-window.c:742
msgid "Edit Account"
msgstr "编辑帐号"
-#: ../src/empathy-roster-window.c:651
+#: ../src/empathy-roster-window.c:747
msgid "Close"
msgstr "关闭"
-#: ../src/empathy-roster-window.c:788
+#: ../src/empathy-roster-window.c:889
msgid "Top up account"
msgstr "帐号充值"
-#: ../src/empathy-roster-window.c:1470
+#: ../src/empathy-roster-window.c:1575
msgid "You need to enable one of your accounts to see contacts here."
msgstr "您需要启用一个帐号才能查看这里的联系人。"
#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:1478
+#: ../src/empathy-roster-window.c:1583
#, c-format
msgid "You need to enable %s to see contacts here."
msgstr "您需要启用 %s 来查看这里的联系人。"
-#: ../src/empathy-roster-window.c:1556
-#, fuzzy
-#| msgid "You need to enable %s to see contacts here."
+#: ../src/empathy-roster-window.c:1661
msgid "Change your presence to see contacts here"
-msgstr "您需要启用 %s 来查看这里的联系人。"
+msgstr "更改您的在线状态来查看这里的联系人"
-#: ../src/empathy-roster-window.c:1565
+#: ../src/empathy-roster-window.c:1670
msgid "No match found"
msgstr "没有找到匹配项"
-#: ../src/empathy-roster-window.c:1570
+#: ../src/empathy-roster-window.c:1677
+msgid "You haven't added any contact yet"
+msgstr "您尚未添加任何联系人"
+
+#: ../src/empathy-roster-window.c:1680
msgid "No online contacts"
msgstr "无在线联系人"
@@ -4380,7 +4459,15 @@ msgstr "帐号设置"
#: ../src/empathy-roster-window.ui.h:2
msgid "Go _Online"
-msgstr ""
+msgstr "上线(_O)"
+
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "显示离线联系人(_O)"
+
+#: ../src/empathy-roster-window.ui.h:4
+msgid "_Add Contact..."
+msgstr "添加联系人(_A)..."
#: ../src/empathy-status-icon.ui.h:2
msgid "_New Conversation…"
@@ -4394,12 +4481,12 @@ msgstr "新建呼叫(_C)..."
msgid "Status"
msgstr "状态"
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
msgid "Done"
msgstr "完成"
-#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
msgid "Please enter your account details"
msgstr "输入您的帐号详情"
@@ -4409,10 +4496,11 @@ msgid "Edit %s account options"
msgstr "编辑 %s 帐号选项"
#: ../ubuntu-online-accounts/empathy.application.in.h:1
-#, fuzzy
-#| msgid "Import your existing accounts"
msgid "Integrate your IM accounts"
-msgstr "导入现有帐号"
+msgstr "集成您的即时通讯帐号"
+
+#~ msgid "i"
+#~ msgstr "i"
#~ msgid "Manage Messaging and VoIP accounts"
#~ msgstr "管理消息和 VoIP 帐号"
@@ -4718,9 +4806,6 @@ msgstr "导入现有帐号"
#~ msgid "Socket type not supported"
#~ msgstr "不支持 Socket 类型"
-#~ msgid "My Web Accounts"
-#~ msgstr "我的网络帐号"
-
#~ msgid "The account %s is edited via %s."
#~ msgstr "%s 帐号通过 %s 进行了编辑。"
@@ -4813,15 +4898,9 @@ msgstr "导入现有帐号"
#~ msgid "Whether Empathy has migrated butterfly logs."
#~ msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
-#~ msgid "Ungrouped"
-#~ msgstr "未分组"
-
#~ msgid "Favorite People"
#~ msgstr "收藏夹"
-#~ msgid "Select a contact"
-#~ msgstr "选择一个联系"
-
#~ msgid "Contact ID:"
#~ msgstr "联系人 ID："
@@ -5242,9 +5321,6 @@ msgstr "导入现有帐号"
#~ msgid "Join _New..."
#~ msgstr "加入新聊天室(_N)..."
-#~ msgid "Show _Offline Contacts"
-#~ msgstr "显示离线联系人(_O)"
-
#~ msgid "Chat Rooms"
#~ msgstr "聊天室"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
