aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorAron Xu <aronxu@gnome.org>2011-06-26 17:47:51 +0800
committerAron Xu <aronxu@gnome.org>2011-06-26 17:47:51 +0800
commitd191659f11e5fcdcc4277c2c30295e2f5f099335 (patch)
treee48bc0a9d43610b03f8c1278cd49abb63d31827c /po
parent26259ee3b6fce128a175f71b65dbcd523d56cbb8 (diff)
downloadgsoc2013-empathy-d191659f11e5fcdcc4277c2c30295e2f5f099335.tar
gsoc2013-empathy-d191659f11e5fcdcc4277c2c30295e2f5f099335.tar.gz
gsoc2013-empathy-d191659f11e5fcdcc4277c2c30295e2f5f099335.tar.bz2
gsoc2013-empathy-d191659f11e5fcdcc4277c2c30295e2f5f099335.tar.lz
gsoc2013-empathy-d191659f11e5fcdcc4277c2c30295e2f5f099335.tar.xz
gsoc2013-empathy-d191659f11e5fcdcc4277c2c30295e2f5f099335.tar.zst
gsoc2013-empathy-d191659f11e5fcdcc4277c2c30295e2f5f099335.zip
Update Simplified Chinese translation.
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN.po1821
1 files changed, 1144 insertions, 677 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fefc6b430..6312c3cbf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -22,10 +22,10 @@ msgid ""
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: 2011-03-23 08:54+0000\n"
-"PO-Revision-Date: 2011-03-25 12:08+0800\n"
-"Last-Translator: liu zhen <liuzhen1191@gmail.com>\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-06-24 20:23+0000\n"
+"PO-Revision-Date: 2011-06-26 09:47+0000\n"
+"Last-Translator: Yinghua Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -63,366 +63,385 @@ msgid "Chat window theme"
msgstr "聊天窗口主题"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Chat window theme variant"
+msgstr "聊天窗口主题衍生"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr "用于拼写检查器的语言的列表,以逗号分隔(例如:en, fr, nl)。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Compact contact list"
msgstr "紧凑显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Connection managers should be used"
msgstr "应该使用连接管理器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Contact list sort criterion"
msgstr "联系人列表排序条件"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Default directory to select an avatar image from"
msgstr "默认的选取头像图片的目录"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Disable popup notifications when away"
msgstr "离开时禁用弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Disable sounds when away"
msgstr "离开时禁用声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Display incoming events in the status area"
msgstr "在状态栏显示呼入事件。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Empathy can publish the user's location"
msgstr "Empathy 能够发布用户的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy 能够通过 GPS 来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy 能够通过手机来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the network to guess the location"
msgstr "Empathy 能够通过网络来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy default download folder"
msgstr "Empathy 默认下载文件夹"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy 已经迁移至 telepathy-butterfly 日志"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy should auto-away when idle"
msgstr "Empathy 空闲时是否自动离开"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy should auto-connect on startup"
msgstr "Empathy 启动时是否自动连接"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should reduce the location's accuracy"
msgstr "降低 Emapthy 位置信息的准确度"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Enable WebKit Developer Tools"
msgstr "启用 WebKit 开发工具"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Enable popup notifications for new messages"
msgstr "启用新消息弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable spell checker"
msgstr "启用拼写检查器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Hide main window"
msgstr "隐藏主窗口"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Hide the main window."
msgstr "隐藏主窗口。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Nick completed character"
msgstr "昵称补全字符"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Path of the Adium theme to use"
msgstr "Adium 主题的路径"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "如果聊天使用 Adium 主题,使用 Adium 主题的路径"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Play a sound for incoming messages"
msgstr "收到消息时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Play a sound for new conversations"
msgstr "新对话时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for outgoing messages"
msgstr "发出消息时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound when a contact logs in"
msgstr "联系人登录时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound when a contact logs out"
msgstr "联系人注销时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when we log in"
msgstr "登录时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when we log out"
msgstr "注销时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Pop up notifications if the chat isn't focused"
msgstr "如果聊天窗口不是焦点则弹出消息通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Pop up notifications when a contact logs in"
msgstr "当联系人登录时弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications when a contact logs out"
msgstr "当联系人注销时弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+msgid "Show Balance in contact list"
+msgstr "在联系人列表中显示余额"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Show avatars"
msgstr "显示头像"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show contact list in rooms"
msgstr "在聊天室显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show hint about closing the main window"
msgstr "关闭主窗口时显示提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show offline contacts"
msgstr "显示离线联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show protocols"
msgstr "显示协议"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Spell checking languages"
msgstr "拼写检查器语言"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "The default folder to save file transfers in."
msgstr "保存传送文件的默认文件夹。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "The last directory that an avatar image was chosen from."
msgstr "上次选取头像图片的目录。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The position for the chat window side pane"
msgstr "聊天窗口边栏的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "聊天窗口边栏保存的位置(像素)。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用于在聊天窗口中显示会话的主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#, fuzzy
+#| msgid "The theme that is used to display the conversation in chat windows."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "用于在聊天窗口中显示会话的主题。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Use graphical smileys"
msgstr "使用表情图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "Use notification sounds"
msgstr "使用通知声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use theme for chat rooms"
msgstr "为聊天室使用主题"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "是否允许 Empathy 将用户的位置共享给联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "是否允许 Empathy 通过 GPS 估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "是否允许 Empathy 通过手机网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the network to guess the location."
msgstr "是否允许 Empathy 通过网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否在启动时自动登入您的帐户。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "是否使用联系人的头像作为聊天窗口的图标。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "WebKit 开发工具,例如 Web Inspector 是否应该启用。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "是否使用连接管理器自动断开连接或重新连接。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "是否对您想要作拼写检查的单词作拼写检查。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "对话时是否将表情符号转换为表情图标。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "是否需要联系人上线提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "是否需要联系人下线提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of events."
msgstr "是否需要事件提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid "Whether to play a sound to notify of incoming messages."
msgstr "是否需要消息到达提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of new conversations."
msgstr "是否需要新会话提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "是否为外出消息使用声音提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound when logging into a network."
msgstr "当联网登录时是否播放提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound when logging out of a network."
msgstr "当网络断开时是否播放提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play sound notifications when away or busy."
msgstr "当离开或忙碌时是否使用声音提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "当联系人离线时是否显示弹出通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to show a popup notification when a contact goes online."
msgstr "当联系人上线时是否显示弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
msgstr "如果聊天窗口已开启,但不是当前窗口,接收新消息时是否弹出提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when receiving a new message."
msgstr "当收到新消息时是否弹出显示提示框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to show account balances in the contact list."
+msgstr "是否在联系人列表和聊天窗口中显示余额。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "是否在联系人列表和聊天窗口中显示头像。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show contacts that are offline in the contact list."
msgstr "是否显示联系人清单中离线的联系人。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to show popup notifications when away or busy."
msgstr "当离开或忙碌时是否弹出显示提示框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show protocols for contacts in the contact list."
msgstr "是否在联系人列表和聊天窗口中显示协议。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show the contact list in chat rooms."
msgstr "是否在聊天室显示联系人列表。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show the contact list in compact mode."
msgstr "是否以紧凑模式显示联系人列表。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr "当使用标题栏中的“X”按钮关闭主窗口时是否显示提示对话框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to use the theme for chat rooms."
msgstr "是否对聊天室使用主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -437,7 +456,7 @@ msgstr "管理消息和 VoIP 帐户"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2269
+#: ../src/empathy-accounts-dialog.c:2324
msgid "Messaging and VoIP Accounts"
msgstr "消息和 VoIP 帐户"
@@ -457,6 +476,23 @@ msgstr "所选文件是非正常的文件"
msgid "The selected file is empty"
msgstr "所选文件是空的"
+#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:130
+#, c-format
+msgid "Missed call from %s"
+msgstr "未接来电:%s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:417
+#, c-format
+#| msgid "Call with %s"
+msgid "Called %s"
+msgstr "与 %s 通话"
+
+#: ../libempathy/empathy-message.c:420
+#, c-format
+msgid "Call from %s"
+msgstr "来电:%s"
+
#: ../libempathy/empathy-tp-file.c:268
msgid "Socket type not supported"
msgstr "不支持 Socket 类型"
@@ -485,287 +521,270 @@ msgstr "当传输这个文件的时候发生错误"
msgid "The other participant is unable to transfer the file"
msgstr "另外的参与者无法传输这个文件"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:325
msgid "Unknown reason"
msgstr "未知原因"
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:246
msgid "Available"
msgstr "在线"
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:248
msgid "Busy"
msgstr "忙碌"
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:251
msgid "Away"
msgstr "离开"
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:253
msgid "Invisible"
msgstr "隐身"
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:255
msgid "Offline"
msgstr "离线"
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:258
+msgctxt "presence"
msgid "Unknown"
msgstr "未知"
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:297
msgid "No reason specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:355
msgid "Status is set to offline"
msgstr "状态已设置为离线"
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:335
+#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "Network error"
msgstr "网络错误"
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:337
msgid "Authentication failed"
msgstr "验证失败"
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:339
msgid "Encryption error"
msgstr "加密错误"
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:307
msgid "Name in use"
msgstr "用户名已经被占用"
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
msgid "Certificate not provided"
msgstr "未提供证书"
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:311 ../libempathy/empathy-utils.c:343
msgid "Certificate untrusted"
msgstr "证书不被信任"
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:313 ../libempathy/empathy-utils.c:345
msgid "Certificate expired"
msgstr "证书已过期"
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:315 ../libempathy/empathy-utils.c:347
msgid "Certificate not activated"
msgstr "证书尚未激活"
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:317 ../libempathy/empathy-utils.c:349
msgid "Certificate hostname mismatch"
msgstr "证书主机名不匹配"
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:319 ../libempathy/empathy-utils.c:351
msgid "Certificate fingerprint mismatch"
msgstr "证书指纹不匹配"
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:321 ../libempathy/empathy-utils.c:353
msgid "Certificate self-signed"
msgstr "证书是自签属的"
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:323
msgid "Certificate error"
msgstr "证书错误"
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:357
msgid "Encryption is not available"
msgstr "加密不可用"
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:359
msgid "Certificate is invalid"
msgstr "证书无效"
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:361
msgid "Connection has been refused"
msgstr "连接被拒绝"
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:363
msgid "Connection can't be established"
msgstr "无法建立连接"
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:365
msgid "Connection has been lost"
msgstr "连接已丢失"
-#: ../libempathy/empathy-utils.c:424
+#: ../libempathy/empathy-utils.c:367
msgid "This resource is already connected to the server"
msgstr "该资源已被连接至服务器"
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:369
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "连接已被使用相同资源的新连接取代"
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:372
msgid "The account already exists on the server"
msgstr "服务器上已存在该帐户"
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:374
msgid "Server is currently too busy to handle the connection"
msgstr "服务器太忙,无法处理当前连接"
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:376
msgid "Certificate has been revoked"
msgstr "证书已被吊销"
# lainme:证书使用不安全的加密算法或是弱加密的
# xslidian:证书使用的加密算法不安全或者易被破解
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:378
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "证书使用不安全的加密算法或者是弱加密的"
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:381
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:601
+#: ../libempathy/empathy-utils.c:544
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:549
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:578
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:579
msgid "Facebook Chat"
msgstr "Facebook 聊天"
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:88
#, c-format
msgid "%d second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d 秒钟前"
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:93
#, c-format
msgid "%d minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d 分钟前"
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:98
#, c-format
msgid "%d hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d 小时前"
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:103
#, c-format
msgid "%d day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天前"
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:108
#, c-format
msgid "%d week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d 星期前"
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:113
#, c-format
msgid "%d month ago"
msgid_plural "%d months ago"
msgstr[0] "%d 月前"
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:136
msgid "in the future"
msgstr "将来"
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "全部"
+#: ../libempathy-gtk/empathy-account-chooser.c:539
+#, fuzzy
+#| msgid "Accounts"
+msgid "All accounts"
+msgstr "帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
+#: ../libempathy-gtk/empathy-account-widget.c:681
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:682
msgid "Password"
msgstr "密码"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:683
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "服务器"
-#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-account-widget.c:684
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "端口"
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../libempathy-gtk/empathy-account-widget.c:756
+#: ../libempathy-gtk/empathy-account-widget.c:813
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1154
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "%s 帐户通过我的网络帐户进行了编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1160
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s 帐户无法在 Empathy 中编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1180
msgid "Launch My Web Accounts"
msgstr "启动我的网络帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1518
msgid "Username:"
msgstr "用户名:"
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1836
msgid "A_pply"
msgstr "应用(_P)"
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1866
msgid "L_og in"
msgstr "登录(_O)"
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "帐户:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-msgid "_Enabled"
-msgstr "已启用(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:1940
msgid "This account already exists on the server"
msgstr "服务器上已存在该帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:1943
msgid "Create a new account on the server"
msgstr "在服务器上创建新的帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:2264
+#: ../libempathy-gtk/empathy-account-widget.c:2135
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -774,19 +793,19 @@ msgstr "取消(_N)"
#. * 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:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2413
#, 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:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2439
#, c-format
msgid "%s Account"
msgstr "%s 帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2443
msgid "New account"
msgstr "新建帐户"
@@ -811,7 +830,7 @@ msgstr "高级"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
msgid "Pass_word:"
msgstr "密码(_W):"
@@ -821,7 +840,7 @@ msgstr "密码(_W):"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
msgid "Remember Password"
msgstr "记住密码"
@@ -831,7 +850,7 @@ msgstr "记住密码"
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
#: ../libempathy-gtk/empathy-password-dialog.c:311
msgid "Remember password"
@@ -907,36 +926,36 @@ msgstr "您的 ICQ UIN 是什么?"
msgid "What is your ICQ password?"
msgstr "您的 ICQ 密码是什么?"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:184
+#: ../libempathy-gtk/empathy-account-widget-sip.c:217
msgid "Auto"
msgstr "自动"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:187
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:190
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../libempathy-gtk/empathy-account-widget-sip.c:193
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:222
msgid "Register"
msgstr "注册"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:227
msgid "Options"
msgstr "选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:230
msgid "None"
msgstr "无"
@@ -1110,58 +1129,63 @@ msgid "Discover the STUN server automatically"
msgstr "自动发现 STUN 服务器"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "Ignore TLS Errors"
+msgstr "忽略 TLS 错误"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "Interval (seconds)"
msgstr "间隔(秒)"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
msgid "Keep-Alive Options"
msgstr "Keep-Alive 选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
msgid "Loose Routing"
msgstr "宽松路由"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "Mechanism:"
msgstr "机制:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
msgid "Miscellaneous Options"
msgstr "杂项"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
msgid "NAT Traversal Options"
msgstr "NAT 选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
msgid "Port:"
msgstr "端口:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
msgid "Proxy Options"
msgstr "代理选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
msgid "STUN Server:"
msgstr "STUN 服务器:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.c:347
msgid "Server:"
msgstr "服务器:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
msgid "Transport:"
msgstr "传输:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "What is your SIP account password?"
msgstr "您的 SIP 帐户密码是什么?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP login ID?"
msgstr "您的 SIP 登录 ID 是什么?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "_Username:"
msgstr "用户名(_U):"
@@ -1185,28 +1209,36 @@ msgstr "Yahoo I_D:"
msgid "_Room List locale:"
msgstr "聊天室列表 locale(_R):"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:474
+#: ../libempathy-gtk/empathy-avatar-chooser.c:559
msgid "Couldn't convert image"
msgstr "无法转换图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:475
msgid "None of the accepted image formats are supported on your system"
msgstr "没有任何接受的图片格式能被您的系统支持"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:822
+msgid "Couldn't save pixbuf to png"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "Select Your Avatar Image"
msgstr "选择您的头像图片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+msgid "Take a picture..."
+msgstr "照相..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:945
msgid "No Image"
msgstr "无图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "Images"
msgstr "图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
msgid "All Files"
msgstr "所有文件"
@@ -1214,57 +1246,87 @@ msgstr "所有文件"
msgid "Click to enlarge"
msgstr "单击以放大"
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:58
+msgid "There was an error starting the call"
+msgstr "发起呼叫时出错"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "选择的联系人不支持呼叫"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+#| msgid "The selected contact is offline."
+msgid "The specified contact is offline"
+msgstr "选择的联系人离线"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "选择的联系人无效"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+#, fuzzy
+#| msgid "Topic not supported on this conversation"
+msgid "Emergency calls are not supported on this protocol"
+msgstr "不支持在此会话上设置主题"
+
+#: ../libempathy-gtk/empathy-chat.c:697
msgid "Failed to open private chat"
msgstr "建立私人对话失败"
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:758
msgid "Topic not supported on this conversation"
msgstr "不支持在此会话上设置主题"
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:764
msgid "You are not allowed to change the topic"
msgstr "您不能更改主题"
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:968
+#, fuzzy, c-format
+#| msgid "invalid contact"
+msgid "“%s” is not a valid contact ID"
+msgstr "无效联系人"
+
+#: ../libempathy-gtk/empathy-chat.c:1025
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear:清空当前会话的所有消息"
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1028
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主题>:设定当前对话的主题"
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1031
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1034
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1038
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/用户[<聊天室ID>] [<原因>]:当前默认离开聊天室"
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1042
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <昵称> [<消息>]:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1045
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <昵称> <消息>:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1048
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <昵称>:在当前服务器上改变您的昵称"
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1051
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <动作消息>:向当前对话中发送一个动作消息"
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1054
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 "
@@ -1273,105 +1335,124 @@ msgstr ""
"/say <消息>:发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如:“/"
"say /join 是用来加入一个新的聊天室”"
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1059
+msgid "/whois <contact ID>: display information about a contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1062
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
"/help [<命令>]:显示所有支持的命令。如果 <命令> 是有定义的,则显示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1072
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1111
msgid "Unknown command"
msgstr "未知命令"
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1237
msgid "Unknown command; see /help for the available commands"
msgstr "未知命令,请使用 /help 查阅可用命令"
-#: ../libempathy-gtk/empathy-chat.c:1254
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1407
+msgid "insufficient balance to send message"
+msgstr "余额不足,无法发送消息"
+
+#: ../libempathy-gtk/empathy-chat.c:1409
+msgid "not capable"
+msgstr "做不到"
+
+#: ../libempathy-gtk/empathy-chat.c:1416
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1419
msgid "invalid contact"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1422
msgid "permission denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1425
msgid "too long message"
msgstr "消息太长"
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1428
msgid "not implemented"
msgstr "尚未实现"
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1432
msgid "unknown"
msgstr "未知"
-#: ../libempathy-gtk/empathy-chat.c:1274
+#: ../libempathy-gtk/empathy-chat.c:1438
#, c-format
msgid "Error sending message '%s': %s"
msgstr "发送消息“%s”出错:%s"
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1442
+#, c-format
+msgid "Error sending message: %s"
+msgstr "发送消息出错:%s"
+
+#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "话题:"
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1515
#, c-format
msgid "Topic set to: %s"
msgstr "话题被设置为:%s"
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1517
msgid "No topic defined"
msgstr "未设置话题"
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2024
msgid "(No Suggestions)"
msgstr "(没有建议)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2092
#, 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:1953
+#: ../libempathy-gtk/empathy-chat.c:2129
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "添加“%s”到 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2186
msgid "Insert Smiley"
msgstr "插入表情"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2204
+#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "发送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2239
msgid "_Spelling Suggestions"
msgstr "拼写建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2328
msgid "Failed to retrieve recent logs"
msgstr "获取最近日志失败"
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2465
#, c-format
msgid "%s has disconnected"
msgstr "%s 已断开连接"
@@ -1379,12 +1460,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:2270
+#: ../libempathy-gtk/empathy-chat.c:2472
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出"
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2475
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1392,17 +1473,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:2281
+#: ../libempathy-gtk/empathy-chat.c:2483
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%s 已被 %s 禁止"
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2486
#, c-format
msgid "%s was banned"
msgstr "%s 被禁止"
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2490
#, c-format
msgid "%s has left the room"
msgstr "%s 离开了聊天室"
@@ -1412,105 +1493,123 @@ msgstr "%s 离开了聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2499
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2524
#, c-format
msgid "%s has joined the room"
msgstr "%s 加入了聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2549
#, c-format
msgid "%s is now known as %s"
msgstr "%s 现在叫做 %s"
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#: ../libempathy-gtk/empathy-chat.c:2688
+#: ../src/empathy-streamed-media-window.c:1935
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1869
msgid "Disconnected"
msgstr "已断开连接"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3332
msgid "Would you like to store this password?"
msgstr "是否保存密码?"
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3338
msgid "Remember"
msgstr "记录"
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3348
msgid "Not now"
msgstr "不是现在"
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3392
msgid "Retry"
msgstr "重试"
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3396
msgid "Wrong password; please try again:"
msgstr "密码错误,请重试:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3526
msgid "This room is protected by a password:"
msgstr "这个房间是由一个密码保护的:"
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3553
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1261
+#: ../src/empathy-call-window.c:2125
msgid "Connected"
msgstr "已连接"
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:3810
msgid "Conversation"
msgstr "对话"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:3815
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (短信)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
msgid "Unknown or invalid identifier"
msgstr "未知或无效的识别符"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
msgid "Contact blocking temporarily unavailable"
msgstr "联系人屏蔽暂时不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
msgid "Contact blocking unavailable"
msgstr "联系人屏蔽不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
msgid "Permission Denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
msgid "Could not block contact"
msgstr "无法屏蔽联系人"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
msgid "Edit Blocked Contacts"
msgstr "编辑屏蔽的联系人"
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "帐户:"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-theme-adium.c:1410
msgid "_Copy Link Address"
msgstr "复制链接地址(_C)"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Open Link"
msgstr "打开链接(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:415
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
@@ -1529,24 +1628,24 @@ msgid "New Contact"
msgstr "新建联系人"
#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-individual-dialogs.c:200
#, c-format
msgid "Block %s?"
msgstr "屏蔽 %s?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "确定要屏蔽 %s 以阻止他再次联系您吗?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
msgid "_Block"
msgstr "屏蔽(_B)"
#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "举报联系人滥用"
@@ -1571,122 +1670,121 @@ msgstr "未分组"
msgid "Favorite People"
msgstr "收藏夹"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1983
+#: ../libempathy-gtk/empathy-individual-view.c:2375
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "您真的要删除群组“%s”吗?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-contact-list-view.c:1985
+#: ../libempathy-gtk/empathy-individual-view.c:2378
msgid "Removing group"
msgstr "删除群组"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../libempathy-gtk/empathy-contact-list-view.c:2034
+#: ../libempathy-gtk/empathy-contact-list-view.c:2111
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+#: ../libempathy-gtk/empathy-individual-view.c:2636
msgid "_Remove"
msgstr "删除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
+#: ../libempathy-gtk/empathy-contact-list-view.c:2064
+#: ../libempathy-gtk/empathy-individual-view.c:2500
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "您真的想要删除联系人“%s”吗?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
+#: ../libempathy-gtk/empathy-contact-list-view.c:2066
+#: ../libempathy-gtk/empathy-individual-view.c:2521
msgid "Removing contact"
msgstr "删除联系人"
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
+#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../src/empathy-main-window.ui.h:14
msgid "_Add Contact…"
msgstr "添加联系人(_A)..."
-#: ../libempathy-gtk/empathy-contact-menu.c:299
+#: ../libempathy-gtk/empathy-contact-menu.c:300
msgid "_Block Contact"
msgstr "屏蔽联系人"
-#: ../libempathy-gtk/empathy-contact-menu.c:328
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:329
+#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:359
-#: ../libempathy-gtk/empathy-individual-menu.c:560
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:638
msgctxt "menu item"
msgid "_Audio Call"
msgstr "音频呼叫(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:390
-#: ../libempathy-gtk/empathy-individual-menu.c:602
+#: ../libempathy-gtk/empathy-contact-menu.c:394
+#: ../libempathy-gtk/empathy-individual-menu.c:682
msgctxt "menu item"
msgid "_Video Call"
msgstr "视频呼叫(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:440
+#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "最近会话(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:458
-#: ../libempathy-gtk/empathy-individual-menu.c:686
+#: ../libempathy-gtk/empathy-contact-menu.c:462
+#: ../libempathy-gtk/empathy-individual-menu.c:766
msgid "Send File"
msgstr "发送文件"
-#: ../libempathy-gtk/empathy-contact-menu.c:481
-#: ../libempathy-gtk/empathy-individual-menu.c:728
+#: ../libempathy-gtk/empathy-contact-menu.c:485
+#: ../libempathy-gtk/empathy-individual-menu.c:808
msgid "Share My Desktop"
msgstr "共享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:521
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
+#: ../libempathy-gtk/empathy-contact-menu.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:1890
+#: ../libempathy-gtk/empathy-individual-menu.c:843
+#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "收藏"
-#: ../libempathy-gtk/empathy-contact-menu.c:550
-#: ../libempathy-gtk/empathy-individual-menu.c:791
+#: ../libempathy-gtk/empathy-contact-menu.c:554
+#: ../libempathy-gtk/empathy-individual-menu.c:871
msgid "Infor_mation"
msgstr "信息(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:596
+#: ../libempathy-gtk/empathy-contact-menu.c:600
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "编辑(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:650
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
+#: ../libempathy-gtk/empathy-contact-menu.c:654
+#: ../libempathy-gtk/empathy-individual-menu.c:1058
+#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "邀请到此聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:681
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
+#: ../libempathy-gtk/empathy-contact-menu.c:685
+#: ../libempathy-gtk/empathy-individual-menu.c:1104
msgid "_Invite to Chat Room"
msgstr "邀请到聊天室(_I)"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
msgid "Search contacts"
msgstr "搜索联系人"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
msgid "Search: "
msgstr "搜索"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
msgid "_Add Contact"
msgstr "添加联系人(_A)"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
msgid "No contacts found"
msgstr "未找到联系人"
@@ -1694,178 +1792,209 @@ msgstr "未找到联系人"
msgid "Select a contact"
msgstr "选择一个联系"
-#: ../libempathy-gtk/empathy-contact-widget.c:295
+#: ../libempathy-gtk/empathy-contact-widget.c:336
#: ../libempathy-gtk/empathy-individual-widget.c:153
msgid "Full name:"
msgstr "全称:"
-#: ../libempathy-gtk/empathy-contact-widget.c:296
+#: ../libempathy-gtk/empathy-contact-widget.c:337
#: ../libempathy-gtk/empathy-individual-widget.c:154
msgid "Phone number:"
msgstr "电话号码:"
-#: ../libempathy-gtk/empathy-contact-widget.c:297
+#: ../libempathy-gtk/empathy-contact-widget.c:338
#: ../libempathy-gtk/empathy-individual-widget.c:155
msgid "E-mail address:"
msgstr "电子邮件地址:"
-#: ../libempathy-gtk/empathy-contact-widget.c:298
+#: ../libempathy-gtk/empathy-contact-widget.c:339
#: ../libempathy-gtk/empathy-individual-widget.c:156
msgid "Website:"
msgstr "网站:"
-#: ../libempathy-gtk/empathy-contact-widget.c:299
+#: ../libempathy-gtk/empathy-contact-widget.c:340
#: ../libempathy-gtk/empathy-individual-widget.c:157
msgid "Birthday:"
msgstr "生日:"
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#. 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-contact-widget.c:346
+#, fuzzy
+#| msgid "_Last Name:"
+msgid "Last seen:"
+msgstr "姓(_L):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:348
+#, fuzzy
+#| msgid "Connected"
+msgid "Connected from:"
+msgstr "已连接"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#.
+#: ../libempathy-gtk/empathy-contact-widget.c:353
+#, fuzzy
+#| msgid "Quit message:"
+msgid "Away message:"
+msgstr "退出消息:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:606
+#, fuzzy
+#| msgid "Ca_ncel"
+msgid "Channels:"
+msgstr "取消(_N)"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Country ISO Code:"
msgstr "包括 ISO 编码:"
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Country:"
msgstr "国家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "State:"
msgstr "省:"
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "City:"
msgstr "城市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Area:"
msgstr "地区:"
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Postal Code:"
msgstr "邮政编码:"
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Street:"
msgstr "街道:"
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Building:"
msgstr "建筑物:"
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Floor:"
msgstr "楼层:"
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Room:"
msgstr "房间:"
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Text:"
msgstr "文本:"
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:517
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:519
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:521
msgid "Accuracy Level:"
msgstr "准确程度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:523
msgid "Error:"
msgstr "错误:"
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:525
msgid "Vertical Error (meters):"
msgstr "垂直误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:527
msgid "Horizontal Error (meters):"
msgstr "水平误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:529
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:531
msgid "Bearing:"
msgstr "方位朝向:"
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:533
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:535
msgid "Last Updated on:"
msgstr "最近更新于:"
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:537
msgid "Longitude:"
msgstr "经度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:945
+#: ../libempathy-gtk/empathy-individual-widget.c:539
msgid "Latitude:"
msgstr "纬度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:947
+#: ../libempathy-gtk/empathy-individual-widget.c:541
msgid "Altitude:"
msgstr "海拔:"
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
+#: ../libempathy-gtk/empathy-contact-widget.c:1015
+#: ../libempathy-gtk/empathy-individual-widget.c:629
+#: ../libempathy-gtk/empathy-individual-widget.c:644
#: ../src/empathy-preferences.ui.h:12
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:1017
+#: ../libempathy-gtk/empathy-individual-widget.c:646
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:1069
+#: ../libempathy-gtk/empathy-individual-widget.c:695
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e,%Y 于 %R UTC 时间"
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:1151
+#: ../libempathy-gtk/empathy-individual-widget.c:931
msgid "Save Avatar"
msgstr "保存头像"
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1207
+#: ../libempathy-gtk/empathy-individual-widget.c:989
msgid "Unable to save avatar"
msgstr "无法保存头像"
@@ -1875,7 +2004,7 @@ msgstr "<b>位置</b>于(日期)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
+#: ../libempathy-gtk/empathy-individual-widget.c:1321
msgid "Alias:"
msgstr "别名:"
@@ -1895,7 +2024,7 @@ msgstr "联系人详情"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-individual-widget.c:1525
msgid "Identifier:"
msgstr "标识符:"
@@ -1912,82 +2041,88 @@ msgstr "操作系统:"
msgid "Version:"
msgstr "版本:"
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-groups-widget.c:333
msgid "Groups"
msgstr "组"
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:345
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:363
+#: ../libempathy-gtk/empathy-groups-widget.c:364
msgid "_Add Group"
msgstr "添加群组(_A)"
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:399
msgctxt "verb in a column header displaying group names"
msgid "Select"
msgstr "选择"
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:409
+#: ../src/empathy-main-window.c:1835
msgid "Group"
msgstr "群组"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "以下用户将被屏蔽:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "以下用户无法被屏蔽:"
#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
msgid "Linked Contacts"
msgstr "已绑定的联系人"
-#: ../libempathy-gtk/empathy-individual-linker.c:354
+#: ../libempathy-gtk/empathy-individual-linker.c:370
msgid "Select contacts to link"
msgstr "选择要绑定的联系人"
-#: ../libempathy-gtk/empathy-individual-linker.c:428
+#: ../libempathy-gtk/empathy-individual-linker.c:444
msgid "New contact preview"
msgstr "新联系人预览"
-#: ../libempathy-gtk/empathy-individual-linker.c:472
+#: ../libempathy-gtk/empathy-individual-linker.c:488
msgid "Contacts selected in the list on the left will be linked together."
msgstr "在左侧列表中选中的联系人将被绑定在一起。"
#. 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:131
+#: ../libempathy-gtk/empathy-individual-menu.c:137
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#. add an SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:593
+#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+msgid "_SMS"
+msgstr "短信(_S)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:919
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "编辑(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
+#: ../libempathy-gtk/empathy-individual-menu.c:945
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "绑定联系人(_L)…"
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2340
msgid "Delete and _Block"
msgstr "删除并屏蔽(_B)"
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2509
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -1995,7 +2130,7 @@ msgid ""
msgstr ""
"您是否真正地想要删除已绑定的联系人'%s' ? 注意这将删除所有联系已绑定的联系人"
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-widget.c:1672
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2069,72 +2204,212 @@ msgid ""
"Are you sure you want to unlink these linked contacts? This will completely "
"split the linked contacts into separate contacts."
msgstr ""
-"你确定你要接触这些已绑定的联系人?这将会完全拆分已绑定的联系人为单独的联系人。"
+"你确定你要接触这些已绑定的联系人?这将会完全拆分已绑定的联系人为单独的联系"
+"人。"
#: ../libempathy-gtk/empathy-linking-dialog.c:190
msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "解除绑定(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "日期"
+#: ../libempathy-gtk/empathy-log-window.c:416
+msgid "Show"
+msgstr "显示"
+
+#: ../libempathy-gtk/empathy-log-window.c:438
+msgid "Search"
+msgstr "搜索"
+
+#: ../libempathy-gtk/empathy-log-window.c:669
+#: ../libempathy-gtk/empathy-log-window.c:833
+#, fuzzy
+#| msgid "%A %B %d %Y"
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %B %d %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:671
+#, fuzzy, c-format
+msgid "Chat with %s"
+msgstr "与 %s 通话"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:790
+#, 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:796
+#, fuzzy, c-format
+#| msgid "<b>Topic:</b>"
+msgid "<b>%s:</b> %s"
+msgstr "<b>话题:</b>"
+
+#: ../libempathy-gtk/empathy-log-window.c:852
+#: ../libempathy-gtk/empathy-log-window.c:854 ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
+#: ../libempathy-gtk/empathy-log-window.c:861
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "通话时长:%s,结束于 %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1188
+msgid "Today"
+msgstr "今天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1192
+msgid "Yesterday"
+msgstr "昨天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1208
+#, fuzzy
+#| msgid "%A %B %d %Y"
+msgctxt ""
+"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+msgid "%e %B %Y"
+msgstr "%A %B %d %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1289
+#: ../libempathy-gtk/empathy-log-window.c:2729
+msgid "Anytime"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:1361
+#: ../libempathy-gtk/empathy-log-window.c:1705
+#, fuzzy
+#| msgid "None"
+msgid "Anyone"
+msgstr "无"
+
+#: ../libempathy-gtk/empathy-log-window.c:1985
+msgid "Who"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2189
+msgid "When"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2305
+msgid "Anything"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:2307
+msgid "Text chats"
+msgstr "文本聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:2309
+#, fuzzy
+#| msgid "Call"
+msgid "Calls"
+msgstr "通话"
+
+#: ../libempathy-gtk/empathy-log-window.c:2314
+msgid "Incoming calls"
+msgstr "来电"
+
+#: ../libempathy-gtk/empathy-log-window.c:2315
+#, fuzzy
+#| msgid "Outgoing voice call"
+msgid "Outgoing calls"
+msgstr "呼出的语音通话"
-#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.c:2316
+msgid "Missed calls"
+msgstr "未接来电"
+
+#: ../libempathy-gtk/empathy-log-window.c:2337
+#, fuzzy
+#| msgid "Chat"
+msgid "What"
+msgstr "聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:2966
+#, fuzzy
+#| msgid "Are you sure you want to block '%s' from contacting you again?"
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "确定要屏蔽 %s 以阻止他再次联系您吗?"
+
+#: ../libempathy-gtk/empathy-log-window.c:2970
+msgid "Clear All"
+msgstr "全部清除"
+
+#: ../libempathy-gtk/empathy-log-window.c:2977
+msgid "Delete from:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr ""
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "对话"
+#: ../src/empathy-streamed-media-window.c:1340
+msgid "Call"
+msgstr "通话"
#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "向下查找"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Chat"
+msgstr "聊天"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "向上查找"
+msgid "History"
+msgstr "历史"
#: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "以前的对话"
+msgid "Profile"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Video"
+msgstr "视频"
-#. Tab Label
#: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "搜索"
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "_File"
+msgstr "文件(_F)"
-#. Searching *for* something
#: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "包含(_F):"
+msgid "page 2"
+msgstr ""
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
msgid "Contact ID:"
msgstr "联系人 ID:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
+#: ../libempathy-gtk/empathy-new-message-dialog.c:258
msgid "C_hat"
msgstr "聊天(_H)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:277
msgid "New Conversation"
msgstr "新建对话"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
+#: ../libempathy-gtk/empathy-new-call-dialog.c:216
msgid "Send _Video"
msgstr "发送视频(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
+#: ../libempathy-gtk/empathy-new-call-dialog.c:224
msgid "C_all"
msgstr "通话(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:234
msgid "New Call"
msgstr "新建通话"
@@ -2153,34 +2428,34 @@ msgstr ""
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
msgid "Custom Message…"
msgstr "自定义消息..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
msgid "Edit Custom Messages…"
msgstr "编辑自定义消息"
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
msgid "Click to remove this status as a favorite"
msgstr "点击移除自定义状态"
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
msgid "Click to make this status a favorite"
msgstr "点击设置自定义状态"
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
msgid "Set status"
msgstr "设置状态"
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
msgstr "设置你的状态信息和现在的状态"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
msgid "Custom messages…"
msgstr "自定义消息..."
@@ -2193,6 +2468,14 @@ msgstr "自定义消息..."
msgid "New %s account"
msgstr "新建 %s 帐户"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "向下查找"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "向上查找"
+
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
msgid "Find:"
msgstr "查找:"
@@ -2245,35 +2528,40 @@ msgstr "呼出的语音通话"
msgid "Voice call ended"
msgstr "语音通话结束"
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "输入自定义状态"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
msgid "Edit Custom Messages"
msgstr "编辑自定义状态"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "保存新的状态信息(_N)"
+#: ../src/empathy-accounts-dialog.ui.h:5
+#, fuzzy
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "删除(_R)"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "保存状态信息"
+#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#, fuzzy, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "收到了消息"
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-adium.c:1937
+msgid "Normal"
+msgstr "普通"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:75
msgid "Classic"
msgstr "经典"
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:76
msgid "Simple"
msgstr "简洁"
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:77
msgid "Clean"
msgstr "清爽"
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:78
msgid "Blue"
msgstr "蓝色"
@@ -2348,27 +2636,26 @@ msgstr "为将来的连接记住本次选择"
msgid "Certificate Details"
msgstr "证书详情"
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1653
msgid "Unable to open URI"
msgstr "无法打开 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1748
msgid "Select a file"
msgstr "选择文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1820
msgid "Insufficient free space to save file"
msgstr "空间不足,无法保存文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1828
#, 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,请选择其他位置。"
+msgstr "保存此文件需要 %s 空闲空间,但目前仅有 %s,请选择其他位置。"
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
#, c-format
msgid "Incoming file from %s"
msgstr "从 %s 传来的文件"
@@ -2556,23 +2843,23 @@ msgstr "无错误信息"
msgid "Instant Message (Empathy)"
msgstr "即时消息(Empathy)"
-#: ../src/empathy.c:308
+#: ../src/empathy.c:309
msgid "Don't connect on startup"
msgstr "启动时不自动连接"
-#: ../src/empathy.c:312
+#: ../src/empathy.c:313
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "启动时不显示联系人列表"
-#: ../src/empathy.c:320
+#: ../src/empathy.c:321
msgid "- Empathy IM Client"
msgstr " - Empathy 即时通讯客户端"
-#: ../src/empathy.c:499
+#: ../src/empathy.c:500
msgid "Error contacting the Account Manager"
msgstr "联系帐户管理器出错"
-#: ../src/empathy.c:501
+#: ../src/empathy.c:502
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2735,8 +3022,8 @@ msgid "Select the accounts you want to import:"
msgstr "选择您要导入的帐户:"
#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "Yes"
msgstr "是"
@@ -2808,100 +3095,102 @@ msgstr "您的 %s 帐户有未保存的修改。"
msgid "Your new account has not been saved yet."
msgstr "您的新帐户还没有保存。"
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
msgid "Connecting…"
msgstr "正在连接..."
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:386
#, c-format
msgid "Offline — %s"
msgstr "离线 - %s"
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:398
#, c-format
msgid "Disconnected — %s"
msgstr "已断开 - %s"
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:409
msgid "Offline — No Network Connection"
msgstr "离线 - 无可用网络"
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:416
msgid "Unknown Status"
msgstr "未知状态"
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:428
msgid "Offline — Account Disabled"
msgstr "离线 - 帐户被禁用"
-#: ../src/empathy-accounts-dialog.c:772
+#: ../src/empathy-accounts-dialog.c:831
msgid ""
"You are about to create a new account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "您将要创建一个新帐户,所做的修改将作废。您确定要继续吗?"
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:1192
#, c-format
msgid "Do you want to remove %s from your computer?"
msgstr "您要从电脑中移除 %s 吗?"
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1196
msgid "This will not remove your account on the server."
msgstr "这不会删除服务器上的帐户。"
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1432
msgid ""
"You are about to select another account, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "您将要选择另一个帐户,所做的修改将作废。您确定要继续吗?"
#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1593
+#: ../src/empathy-accounts-dialog.c:1643
msgid "_Enable"
msgstr "启用(_E)"
-#: ../src/empathy-accounts-dialog.c:1594
+#: ../src/empathy-accounts-dialog.c:1644
msgid "_Disable"
msgstr "禁用(_D)"
-#: ../src/empathy-accounts-dialog.c:2113
+#: ../src/empathy-accounts-dialog.c:2154
msgid ""
"You are about to close the window, which will discard\n"
"your changes. Are you sure you want to proceed?"
msgstr "您将要关闭此窗口,所做的修改将作废。您确定要继续吗?"
#: ../src/empathy-accounts-dialog.ui.h:1
+#, fuzzy
+#| msgid "_Add…"
+msgid "Add…"
+msgstr "添加(_A)..."
+
+#: ../src/empathy-accounts-dialog.ui.h:2
msgid "Loading account information"
msgstr "正在加载账号信息"
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
msgid "No protocol installed"
msgstr "尚未安装协议"
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:4
msgid "Protocol:"
msgstr "协议:"
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr "要添加一个新帐户,您首先需要为您想要使用的每个协议安装后端。"
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "添加(_A)..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Import…"
msgstr "导入(_I)..."
-#: ../src/empathy-auth-client.c:250
+#: ../src/empathy-auth-client.c:249
msgid " - Empathy authentication client"
msgstr " - Empathy 认证客户端"
-#: ../src/empathy-auth-client.c:266
+#: ../src/empathy-auth-client.c:265
msgid "Empathy authentication client"
msgstr "Empathy 认证客户端"
@@ -2909,129 +3198,162 @@ msgstr "Empathy 认证客户端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:118
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
msgid "- Empathy Audio/Video Client"
msgstr " - Empathy 语音/视频客户端"
-#: ../src/empathy-av.c:134
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
msgid "Empathy Audio/Video Client"
msgstr "Empathy 语音/视频客户端"
-#: ../src/empathy-streamed-media-window.c:479
+#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
msgid "Contrast"
msgstr "对比度"
-#: ../src/empathy-streamed-media-window.c:482
+#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-streamed-media-window.c:485
+#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
msgid "Gamma"
msgstr "伽马"
-#: ../src/empathy-streamed-media-window.c:590
+#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-streamed-media-window.c:1166
+#: ../src/empathy-streamed-media-window.c:1153
+#: ../src/empathy-call-window.c:1127
msgid "_Sidebar"
msgstr "侧边栏(_S)"
-#: ../src/empathy-streamed-media-window.c:1186
+#: ../src/empathy-streamed-media-window.c:1173
+#: ../src/empathy-call-window.c:1149
msgid "Audio input"
msgstr "音频输入"
-#: ../src/empathy-streamed-media-window.c:1190
+#: ../src/empathy-streamed-media-window.c:1177
+#: ../src/empathy-call-window.c:1153
msgid "Video input"
msgstr "视频输入"
-#: ../src/empathy-streamed-media-window.c:1194
+#: ../src/empathy-streamed-media-window.c:1181
+#: ../src/empathy-call-window.c:1157
msgid "Dialpad"
msgstr "电话键盘"
-#: ../src/empathy-streamed-media-window.c:1205
+#: ../src/empathy-streamed-media-window.c:1192
+#: ../src/empathy-call-window.c:1167
msgid "Details"
msgstr "详细信息"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1274
+#: ../src/empathy-streamed-media-window.c:1261
+#: ../src/empathy-call-window.c:1239
#, c-format
msgid "Call with %s"
msgstr "与 %s 通话"
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "通话"
-
-#: ../src/empathy-streamed-media-window.c:1507
+#: ../src/empathy-streamed-media-window.c:1494
+#: ../src/empathy-call-window.c:1459
msgid "The IP address as seen by the machine"
msgstr "机器所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1509
+#: ../src/empathy-streamed-media-window.c:1496
+#: ../src/empathy-call-window.c:1461
msgid "The IP address as seen by a server on the Internet"
msgstr "Internet 上服务器所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1511
+#: ../src/empathy-streamed-media-window.c:1498
+#: ../src/empathy-call-window.c:1463
msgid "The IP address of the peer as seen by the other side"
msgstr "另一方所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1513
+#: ../src/empathy-streamed-media-window.c:1500
+#: ../src/empathy-call-window.c:1465
msgid "The IP address of a relay server"
msgstr "中转服务器 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1515
+#: ../src/empathy-streamed-media-window.c:1502
+#: ../src/empathy-call-window.c:1467
msgid "The IP address of the multicast group"
msgstr "多播组的 IP 地址"
+#: ../src/empathy-streamed-media-window.c:1884
+msgctxt "encoding video codec"
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/empathy-streamed-media-window.c:1887
+msgctxt "encoding audio codec"
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/empathy-streamed-media-window.c:1890
+msgctxt "decoding video codec"
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/empathy-streamed-media-window.c:1893
+msgctxt "decoding audio codec"
+msgid "Unknown"
+msgstr "未知"
+
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
+#: ../src/empathy-streamed-media-window.c:2185
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已连接 — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2327
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:2187
msgid "Technical Details"
msgstr "技术细节"
-#: ../src/empathy-streamed-media-window.c:2365
+#: ../src/empathy-streamed-media-window.c:2284
+#: ../src/empathy-call-window.c:2225
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
"computer"
msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
-#: ../src/empathy-streamed-media-window.c:2370
+#: ../src/empathy-streamed-media-window.c:2289
+#: ../src/empathy-call-window.c:2230
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
"computer"
msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
-#: ../src/empathy-streamed-media-window.c:2376
+#: ../src/empathy-streamed-media-window.c:2295
+#: ../src/empathy-call-window.c:2236
#, 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-streamed-media-window.c:2382
+#: ../src/empathy-streamed-media-window.c:2301
+#: ../src/empathy-call-window.c:2242
msgid "There was a failure on the network"
msgstr "网络出现一个错误"
-#: ../src/empathy-streamed-media-window.c:2386
+#: ../src/empathy-streamed-media-window.c:2305
+#: ../src/empathy-call-window.c:2246
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
-#: ../src/empathy-streamed-media-window.c:2389
+#: ../src/empathy-streamed-media-window.c:2308
+#: ../src/empathy-call-window.c:2249
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
-#: ../src/empathy-streamed-media-window.c:2399
+#: ../src/empathy-streamed-media-window.c:2318
+#: ../src/empathy-call-window.c:2261
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3041,143 +3363,189 @@ msgstr ""
"Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>,并附上帮助菜"
"单里“调试”窗口收集到的日志。"
-#: ../src/empathy-streamed-media-window.c:2407
+#: ../src/empathy-streamed-media-window.c:2326
+#: ../src/empathy-call-window.c:2270
msgid "There was a failure in the call engine"
msgstr "呼叫引擎里出现了一个故障"
-#: ../src/empathy-streamed-media-window.c:2410
+#: ../src/empathy-streamed-media-window.c:2329
+#: ../src/empathy-call-window.c:2273
msgid "The end of the stream was reached"
msgstr "已到达流的末尾"
-#: ../src/empathy-streamed-media-window.c:2450
+#: ../src/empathy-streamed-media-window.c:2369
+#: ../src/empathy-call-window.c:2313
msgid "Can't establish audio stream"
msgstr "不能建立音频流"
-#: ../src/empathy-streamed-media-window.c:2460
+#: ../src/empathy-streamed-media-window.c:2379
+#: ../src/empathy-call-window.c:2323
msgid "Can't establish video stream"
msgstr "不能建立视频流"
#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-streamed-media-window.ui.h:1
msgid "Audio"
msgstr "音频"
#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:2
msgid "Call the contact again"
msgstr "再次呼叫联系人"
#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-streamed-media-window.ui.h:3
msgid "Camera Off"
msgstr "相机关闭"
#: ../src/empathy-call-window.ui.h:4
+#: ../src/empathy-streamed-media-window.ui.h:4
msgid "Camera On"
msgstr "相机开启"
#: ../src/empathy-call-window.ui.h:5
+#: ../src/empathy-streamed-media-window.ui.h:5
msgid "Decoding Codec:"
msgstr "解码器:"
#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-streamed-media-window.ui.h:6
msgid "Disable camera and stop sending video"
msgstr "禁用相机停止发送视频"
#: ../src/empathy-call-window.ui.h:7
+#: ../src/empathy-streamed-media-window.ui.h:7
msgid "Enable camera and send video"
msgstr "启用相机,并发送视频"
#: ../src/empathy-call-window.ui.h:8
+#: ../src/empathy-streamed-media-window.ui.h:8
msgid "Enable camera but don't send video"
msgstr "启用相机,但不发送视频"
#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "编码器:"
#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "挂起"
#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "挂起当前呼叫"
#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-streamed-media-window.ui.h:12
msgid "Local Candidate:"
msgstr "本地候选:"
#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-streamed-media-window.ui.h:13
msgid "Preview"
msgstr "预览"
#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-streamed-media-window.ui.h:14
msgid "Redial"
msgstr "重拨"
#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "远程候选:"
#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "发送音频"
#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "切换音频传输"
+#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:1824 ../src/empathy-call-window.c:1825
+#: ../src/empathy-call-window.c:1826 ../src/empathy-call-window.c:1827
+msgid "Unknown"
+msgstr "未知"
+
#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-streamed-media-window.ui.h:19
msgid "V_ideo"
msgstr "视频(_I)"
-#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "视频"
-
#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:21
msgid "Video Off"
msgstr "视频关闭"
#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:22
msgid "Video On"
msgstr "视频开启"
#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-streamed-media-window.ui.h:23
msgid "Video Preview"
msgstr "视频预览"
#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
msgid "_Call"
msgstr "通话(_C)"
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-call-window.ui.h:25
+#, fuzzy
+#| msgid "Dialpad"
+msgid "_Dialpad"
+msgstr "电话键盘"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "查看(_V)"
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 未读)"
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:492
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
-msgstr[0] "%s (和 %u 其它)"
+msgstr[0] "%s (和另外 %u 人)"
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:508
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
-msgstr[0] "%s (%d 其它未读)"
+msgstr[0] "%s (另有他人的 %d 条未读)"
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:517
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
-msgstr[0] "%s (%d 全部未读)"
+msgstr[0] "%s (所有人共 %d 条未读)"
+
+#: ../src/empathy-chat-window.c:732
+msgid "SMS:"
+msgstr "短信:"
+
+#: ../src/empathy-chat-window.c:742
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "正在发送 %d 条消息"
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:764
msgid "Typing a message."
msgstr "输入消息。"
@@ -3189,10 +3557,6 @@ msgstr "清除(_L)"
msgid "C_ontact"
msgstr "联系人(_O)"
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "聊天"
-
#: ../src/empathy-chat-window.ui.h:4
msgid "Insert _Smiley"
msgstr "插入表情(_S)"
@@ -3213,7 +3577,7 @@ msgstr "右移标签(_R)"
msgid "Notify for All Messages"
msgstr "提示所有消息"
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
msgid "_Contents"
msgstr "内容(_C)"
@@ -3225,15 +3589,11 @@ msgstr "对话(_C)"
msgid "_Detach Tab"
msgstr "漂移标签(_D)"
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "编辑(_E)"
-
#: ../src/empathy-chat-window.ui.h:13
msgid "_Favorite Chat Room"
msgstr "收藏聊天室(_F)"
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
msgid "_Help"
msgstr "帮助(_H)"
@@ -3273,90 +3633,95 @@ msgstr "自动连接"
msgid "Manage Favorite Rooms"
msgstr "管理聊天室收藏"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
msgid "Incoming video call"
msgstr "呼入的视频通话"
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:521
msgid "Incoming call"
msgstr "来电"
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:525
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 视频来电。您想要接听吗?"
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 来电,您想要接听吗?"
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的来电"
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:554
msgid "_Reject"
msgstr "拒绝(_R)"
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
msgid "_Answer"
msgstr "接听(_A)"
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:570
+msgid "_Answer with video"
+msgstr ""
+
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
#, c-format
msgid "Incoming video call from %s"
msgstr "%s 的视频呼叫"
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:836
msgid "Room invitation"
msgstr "聊天室邀请"
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:838
#, c-format
msgid "Invitation to join %s"
msgstr "邀请您加入 %s"
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:845
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正邀请您加入 %s"
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:853
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../src/empathy-event-manager.c:759
+#: ../src/empathy-event-manager.c:858
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:885
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 已邀请您加入 %s"
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:891
#, c-format
msgid "You have been invited to join %s"
msgstr "您被邀请加入 %s"
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:942
#, c-format
msgid "Incoming file transfer from %s"
msgstr "接收 %s 文件传输"
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "需要密码"
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1190
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s 当你在线的时候可见"
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1194
#, c-format
msgid ""
"\n"
@@ -3366,105 +3731,101 @@ msgstr ""
"消息:%s"
#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:100
#, 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:103
#, c-format
msgid "%02u.%02u"
msgstr "%02u.%02u"
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:179
msgctxt "file transfer percent"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:274
#, 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:275
#, 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:306
#, 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:309
#, 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:339
#, c-format
msgid "Error receiving \"%s\" from %s"
msgstr "从 %2$s 接收 \"%1$s\" 出错"
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:342
msgid "Error receiving a file"
msgstr "接收文件出错"
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:347
#, c-format
msgid "Error sending \"%s\" to %s"
msgstr "向 %2$s 发送 \"%1$s\" 出错"
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:350
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:489
#, 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:494
#, c-format
msgid "\"%s\" sent to %s"
msgstr "已经向 %2$s 完成发送 \"%1$s\""
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:497
msgid "File transfer completed"
msgstr "文件传送完成"
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
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:642 ../src/empathy-ft-manager.c:680
#, 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:645 ../src/empathy-ft-manager.c:683
#, c-format
msgid "Hashing \"%s\""
msgstr "校验中 \"%s\""
-#: ../src/empathy-ft-manager.c:1016
-msgid "%"
-msgstr "%"
-
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1038
msgid "File"
msgstr "文件"
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1060
msgid "Remaining"
msgstr "剩余"
@@ -3499,39 +3860,55 @@ msgstr "协议"
msgid "Source"
msgstr "源"
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-main-window.c:392
msgid "Provide Password"
msgstr "提供密码"
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-main-window.c:398
msgid "Disconnect"
msgstr "已断开连接"
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-main-window.c:622
msgid "No match found"
msgstr "没有找到匹配项"
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-main-window.c:777
msgid "Reconnect"
msgstr "重新连接"
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-main-window.c:783
msgid "Edit Account"
msgstr "编辑帐户"
-#: ../src/empathy-main-window.c:700
+#: ../src/empathy-main-window.c:789
msgid "Close"
msgstr "关闭"
-#: ../src/empathy-main-window.c:1418
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-main-window.c:928
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "给 %s 充值(%s)..."
+
+#: ../src/empathy-main-window.c:975
+msgid "Top up account credit"
+msgstr "账户充值"
+
+#. top up button
+#: ../src/empathy-main-window.c:1050
+msgid "Top Up..."
+msgstr "充值..."
+
+#: ../src/empathy-main-window.c:1817
msgid "Contact"
msgstr "联系人"
-#: ../src/empathy-main-window.c:1765
+#: ../src/empathy-main-window.c:2169
msgid "Contact List"
msgstr "联系人列表"
-#: ../src/empathy-main-window.c:1881
+#: ../src/empathy-main-window.c:2287
msgid "Show and edit accounts"
msgstr "显示和编辑帐户"
@@ -3540,86 +3917,90 @@ msgid "Contacts on a _Map"
msgstr "联系人地图(_M)"
#: ../src/empathy-main-window.ui.h:2
+msgid "Credit Balance"
+msgstr "账户余额"
+
+#: ../src/empathy-main-window.ui.h:3
msgid "Find in Contact _List"
msgstr "在联系人列表中查找(_L)"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:4
msgid "Join _Favorites"
msgstr "加入已收藏的聊天室(_F)"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:5
msgid "Manage Favorites"
msgstr "管理收藏夹"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:6
msgid "N_ormal Size"
msgstr "常规视图(_O)"
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "新建呼叫(_C)..."
-#: ../src/empathy-main-window.ui.h:7
+#: ../src/empathy-main-window.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "扩展视图(_A)"
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:9
msgid "P_references"
msgstr "首选项(_R)"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:10
msgid "Show P_rotocols"
msgstr "显示协议(_R)"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:11
msgid "Sort by _Name"
msgstr "按姓名排序(_N)"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:12
msgid "Sort by _Status"
msgstr "按状态排序(_S)"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:13
msgid "_Accounts"
msgstr "帐户(_A)"
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:15
msgid "_Blocked Contacts"
msgstr "已屏蔽的联系人(_B)"
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:17
msgid "_Compact Size"
msgstr "紧凑视图(_C)"
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:19
msgid "_Debug"
msgstr "调试(_D)"
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:21
msgid "_File Transfers"
msgstr "文件传输(_F)"
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:23
msgid "_Join…"
msgstr "加入(_J)..."
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "新建对话(_N)..."
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:25
msgid "_Offline Contacts"
msgstr "离线联系人(_O)"
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
msgid "_Personal Information"
msgstr "个人信息(_P)"
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:28
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window.ui.h:29
msgid "_Search for Contacts…"
msgstr "搜索联系人(_S)..."
@@ -3633,7 +4014,7 @@ msgstr "成员"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:553
#, c-format
msgid ""
"%s\n"
@@ -3646,16 +4027,16 @@ msgstr ""
"需要密码: %s\n"
"成员: %s"
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:555
+#: ../src/empathy-new-chatroom-dialog.c:556
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:584
msgid "Could not start room listing"
msgstr "无法开始聊天室列表"
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:594
msgid "Could not stop room listing"
msgstr "无法停止聊天室列表"
@@ -3686,39 +4067,79 @@ msgstr "聊天室列表"
msgid "_Room:"
msgstr "聊天室(_R):"
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:156
msgid "Message received"
msgstr "收到了消息"
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:157
msgid "Message sent"
msgstr "发出了消息"
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:158
msgid "New conversation"
msgstr "新对话"
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:159
msgid "Contact goes online"
msgstr "离线人上线"
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:160
msgid "Contact goes offline"
msgstr "联系人离线"
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:161
msgid "Account connected"
msgstr "帐户已连接"
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:162
msgid "Account disconnected"
msgstr "帐户已断开"
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:459
msgid "Language"
msgstr "语言"
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:709
+msgid "Juliet"
+msgstr "朱立叶"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:716
+msgid "Romeo"
+msgstr "罗密欧"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:722
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:725
+msgid "Deny thy father and refuse thy name;"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:728
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:731
+msgid "And I'll no longer be a Capulet."
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:734
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr ""
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:737
+msgid "Juliet has disconnected"
+msgstr "朱立叶已断开连接"
+
+#: ../src/empathy-preferences.c:1135
msgid "Preferences"
msgstr "首选项"
@@ -3822,39 +4243,45 @@ msgid "Themes"
msgstr "主题"
#: ../src/empathy-preferences.ui.h:25
+#, fuzzy
+#| msgid "Theme Variant:"
+msgid "Variant:"
+msgstr "主题变量:"
+
+#: ../src/empathy-preferences.ui.h:26
msgid "_Automatically connect on startup"
msgstr "启动时自动连接(_A) "
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "_Cellphone"
msgstr "手机(_C)"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid "_Enable bubble notifications"
msgstr "允许气泡通知(_E)"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "_Enable sound notifications"
msgstr "启用声音通知(_E)"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Network (IP, Wi-Fi)"
msgstr "网络(_N)(IP,Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天(_O)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
msgid "_Publish location to my contacts"
msgstr "向我的联系人公布位置信息(_P)"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
msgid "_Reduce location accuracy"
msgstr "降低位置信息精度(_R)"
@@ -3866,7 +4293,7 @@ msgstr "状态"
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "联系地图视图"
@@ -3932,16 +4359,16 @@ msgid ""
"extension."
msgstr "已选定的连接管理不支持远程调试扩展"
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:429
+#: ../src/empathy-invite-participant-dialog.c:477
msgid "Invite Participant"
msgstr "邀请参与者"
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:430
msgid "Choose a contact to invite into the conversation:"
msgstr "选择一个联系人以加入该会话:"
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:473
msgid "Invite"
msgstr "邀请"
@@ -3979,38 +4406,90 @@ msgstr "Empathy 调试器"
msgid "- Empathy Chat Client"
msgstr " - Empathy IM 客户端"
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:203
msgid "Respond"
msgstr "响应"
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:217
msgid "Reject"
msgstr "拒绝"
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:227
msgid "Answer"
msgstr "接听"
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:227
+msgid "Answer with video"
+msgstr ""
+
+#: ../src/empathy-notifications-approver.c:235
+#: ../src/empathy-notifications-approver.c:245
msgid "Decline"
msgstr "拒绝"
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:239
+#: ../src/empathy-notifications-approver.c:250
msgid "Accept"
msgstr "接受"
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "未接来电:%s"
+#: ../src/empathy-notifications-approver.c:260
+msgid "Provide"
+msgstr "提供"
#: ../src/empathy-call-observer.c:133
#, c-format
msgid "%s just tried to call you, but you were in another call."
msgstr "%s 刚刚尝试呼叫您,但您当时正在与其他人通话。"
+#: ../src/empathy-call-window.c:1246
+#, fuzzy, c-format
+#| msgid "Call with %s"
+msgid "Call with %d participants"
+msgstr "与 %s 通话"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2124
+#, fuzzy, c-format
+#| msgid "Connected — %d:%02dm"
+msgid "%s — %d:%02dm"
+msgstr "已连接 — %d:%02dm"
+
+#: ../src/empathy-call-window.c:2125
+msgid "On hold"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "区分大小写(_M)"
+
+#~ msgid "All"
+#~ msgstr "全部"
+
+#~ msgid "Date"
+#~ msgstr "日期"
+
+#~ msgid "Conversations"
+#~ msgstr "对话"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "以前的对话"
+
+#~ msgid "_For:"
+#~ msgstr "包含(_F):"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "输入自定义状态"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "保存新的状态信息(_N)"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "保存状态信息"
+
+#~ msgid "_Enabled"
+#~ msgstr "已启用(_E)"
+
#~ msgid "The hash of the received file and the sent one do not match"
#~ msgstr "接收到的文件和发送的那个文件哈希值不匹配"
@@ -4078,9 +4557,6 @@ msgstr "%s 刚刚尝试呼叫您,但您当时正在与其他人通话。"
#~ msgid "%s account"
#~ msgstr "%s 帐户"
-#~ msgid "Salut account is created"
-#~ msgstr "已创建 Salut 帐户"
-
#~ msgid ""
#~ "Whether or not the Salut account has been created on the first Empathy "
#~ "run."
@@ -4113,9 +4589,6 @@ msgstr "%s 刚刚尝试呼叫您,但您当时正在与其他人通话。"
#~ msgid "_Next"
#~ msgstr "下一页(_N)"
-#~ msgid "Accounts"
-#~ msgstr "帐户"
-
#~ msgid "Add new"
#~ msgstr "添加"
@@ -4284,9 +4757,6 @@ msgstr "%s 刚刚尝试呼叫您,但您当时正在与其他人通话。"
#~ msgid "_Check Word Spelling..."
#~ msgstr "拼写检查(_C)..."
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>话题:</b>"
-
#~ msgid "Group Chat"
#~ msgstr "群聊"
@@ -4428,9 +4898,6 @@ msgstr "%s 刚刚尝试呼叫您,但您当时正在与其他人通话。"
#~ msgid "Show _avatars"
#~ msgstr "显示头像(_A)"
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "紧凑显示联系人列表(_M)"
-
#~ msgid "Sort by _name"
#~ msgstr "按名称排序(_N)"