aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAron Xu <aronxu@gnome.org>2011-08-01 02:09:16 +0800
committerAron Xu <aronxu@gnome.org>2011-08-01 02:09:16 +0800
commit04c2c076f2108ba9f4ecdb61cfbf1186a615c053 (patch)
tree11327c9bf6d094dc2667a0b7c944a30660e5f46a
parent744e20f3c770091c4b6c5162289e8585b3af9474 (diff)
downloadgsoc2013-empathy-04c2c076f2108ba9f4ecdb61cfbf1186a615c053.tar
gsoc2013-empathy-04c2c076f2108ba9f4ecdb61cfbf1186a615c053.tar.gz
gsoc2013-empathy-04c2c076f2108ba9f4ecdb61cfbf1186a615c053.tar.bz2
gsoc2013-empathy-04c2c076f2108ba9f4ecdb61cfbf1186a615c053.tar.lz
gsoc2013-empathy-04c2c076f2108ba9f4ecdb61cfbf1186a615c053.tar.xz
gsoc2013-empathy-04c2c076f2108ba9f4ecdb61cfbf1186a615c053.tar.zst
gsoc2013-empathy-04c2c076f2108ba9f4ecdb61cfbf1186a615c053.zip
Update Simplified Chinese translation.
-rw-r--r--po/zh_CN.po1100
1 files changed, 576 insertions, 524 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6312c3cbf..5123b90f0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -23,13 +23,14 @@ 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-06-24 20:23+0000\n"
-"PO-Revision-Date: 2011-06-26 09:47+0000\n"
-"Last-Translator: Yinghua Wang <wantinghard@gmail.com>\n"
+"POT-Creation-Date: 2011-07-30 17:16+0000\n"
+"PO-Revision-Date: 2011-07-31 18:08+0000\n"
+"Last-Translator: Julius Wong <villahwong@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"
"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
#: ../data/empathy.desktop.in.in.h:1
@@ -53,395 +54,403 @@ msgid "Always open a separate chat window for new chats."
msgstr "总是为新聊天打开单独的聊天窗口。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#, fuzzy
+msgid "Call volume"
+msgstr "来电:%s"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr ""
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "聊天窗口主题"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme variant"
msgstr "聊天窗口主题衍生"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
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:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "紧凑显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "应该使用连接管理器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "联系人列表排序条件"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Default directory to select an avatar image from"
msgstr "默认的选取头像图片的目录"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Disable popup notifications when away"
msgstr "离开时禁用弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Disable sounds when away"
msgstr "离开时禁用声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Display incoming events in the status area"
msgstr "在状态栏显示呼入事件。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
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:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Empathy can publish the user's location"
msgstr "Empathy 能够发布用户的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy 能够通过 GPS 来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy 能够通过手机来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Empathy can use the network to guess the location"
msgstr "Empathy 能够通过网络来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy default download folder"
msgstr "Empathy 默认下载文件夹"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy 已经迁移至 telepathy-butterfly 日志"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy should auto-away when idle"
msgstr "Empathy 空闲时是否自动离开"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy should auto-connect on startup"
msgstr "Empathy 启动时是否自动连接"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should reduce the location's accuracy"
msgstr "降低 Emapthy 位置信息的准确度"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Enable WebKit Developer Tools"
msgstr "启用 WebKit 开发工具"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Enable popup notifications for new messages"
msgstr "启用新消息弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable spell checker"
msgstr "启用拼写检查器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Hide main window"
msgstr "隐藏主窗口"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Hide the main window."
msgstr "隐藏主窗口。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Nick completed character"
msgstr "昵称补全字符"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Path of the Adium theme to use"
msgstr "Adium 主题的路径"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
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:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Play a sound for incoming messages"
msgstr "收到消息时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Play a sound for new conversations"
msgstr "新对话时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Play a sound for outgoing messages"
msgstr "发出消息时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Play a sound when a contact logs in"
msgstr "联系人登录时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound when a contact logs out"
msgstr "联系人注销时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound when we log in"
msgstr "登录时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound when we log out"
msgstr "注销时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Pop up notifications if the chat isn't focused"
msgstr "如果聊天窗口不是焦点则弹出消息通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Pop up notifications when a contact logs in"
msgstr "当联系人登录时弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Pop up notifications when a contact logs out"
msgstr "当联系人注销时弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Show Balance in contact list"
msgstr "在联系人列表中显示余额"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Show avatars"
msgstr "显示头像"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Show contact list in rooms"
msgstr "在聊天室显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Show hint about closing the main window"
msgstr "关闭主窗口时显示提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show offline contacts"
msgstr "显示离线联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show protocols"
msgstr "显示协议"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Spell checking languages"
msgstr "拼写检查器语言"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "The default folder to save file transfers in."
msgstr "保存传送文件的默认文件夹。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "The last directory that an avatar image was chosen from."
msgstr "上次选取头像图片的目录。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "The position for the chat window side pane"
msgstr "聊天窗口边栏的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "聊天窗口边栏保存的位置(像素)。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用于在聊天窗口中显示会话的主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
#, 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
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "Use graphical smileys"
msgstr "使用表情图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "Use notification sounds"
msgstr "使用通知声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "Use theme for chat rooms"
msgstr "为聊天室使用主题"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "是否允许 Empathy 将用户的位置共享给联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "是否允许 Empathy 通过 GPS 估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "是否允许 Empathy 通过手机网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Whether Empathy can use the network to guess the location."
msgstr "是否允许 Empathy 通过网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否在启动时自动登入您的帐户。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "是否使用联系人的头像作为聊天窗口的图标。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
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:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "是否使用连接管理器自动断开连接或重新连接。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "是否对您想要作拼写检查的单词作拼写检查。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "对话时是否将表情符号转换为表情图标。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "是否需要联系人上线提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "是否需要联系人下线提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid "Whether to play a sound to notify of events."
msgstr "是否需要事件提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid "Whether to play a sound to notify of incoming messages."
msgstr "是否需要消息到达提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to play a sound to notify of new conversations."
msgstr "是否需要新会话提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "是否为外出消息使用声音提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound when logging into a network."
msgstr "当联网登录时是否播放提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid "Whether to play a sound when logging out of a network."
msgstr "当网络断开时是否播放提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play sound notifications when away or busy."
msgstr "当离开或忙碌时是否使用声音提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "当联系人离线时是否显示弹出通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to show a popup notification when a contact goes online."
msgstr "当联系人上线时是否显示弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
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:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to show a popup notification when receiving a new message."
msgstr "当收到新消息时是否弹出显示提示框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to show account balances in the contact list."
msgstr "是否在联系人列表和聊天窗口中显示余额。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "是否在联系人列表和聊天窗口中显示头像。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show contacts that are offline in the contact list."
msgstr "是否显示联系人清单中离线的联系人。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show popup notifications when away or busy."
msgstr "当离开或忙碌时是否弹出显示提示框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid "Whether to show protocols for contacts in the contact list."
msgstr "是否在联系人列表和聊天窗口中显示协议。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show the contact list in chat rooms."
msgstr "是否在聊天室显示联系人列表。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show the contact list in compact mode."
msgstr "是否以紧凑模式显示联系人列表。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
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:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to use the theme for chat rooms."
msgstr "是否对聊天室使用主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
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 "
@@ -476,7 +485,7 @@ msgstr "所选文件是非正常的文件"
msgid "The selected file is empty"
msgstr "所选文件是空的"
-#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:130
+#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
#, c-format
msgid "Missed call from %s"
msgstr "未接来电:%s"
@@ -484,7 +493,6 @@ 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 通话"
@@ -521,161 +529,161 @@ msgstr "当传输这个文件的时候发生错误"
msgid "The other participant is unable to transfer the file"
msgstr "另外的参与者无法传输这个文件"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
msgid "Unknown reason"
msgstr "未知原因"
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:212
msgid "Available"
msgstr "在线"
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:214
msgid "Busy"
msgstr "忙碌"
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:217
msgid "Away"
msgstr "离开"
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:219
msgid "Invisible"
msgstr "隐身"
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:221
msgid "Offline"
msgstr "离线"
#. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:258
+#: ../libempathy/empathy-utils.c:224
msgctxt "presence"
msgid "Unknown"
msgstr "未知"
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:264
msgid "No reason specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
msgid "Status is set to offline"
msgstr "状态已设置为离线"
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
#: ../libempathy-gtk/empathy-call-utils.c:47
msgid "Network error"
msgstr "网络错误"
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
msgid "Authentication failed"
msgstr "验证失败"
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
msgid "Encryption error"
msgstr "加密错误"
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:274
msgid "Name in use"
msgstr "用户名已经被占用"
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
msgid "Certificate not provided"
msgstr "未提供证书"
-#: ../libempathy/empathy-utils.c:311 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
msgid "Certificate untrusted"
msgstr "证书不被信任"
-#: ../libempathy/empathy-utils.c:313 ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
msgid "Certificate expired"
msgstr "证书已过期"
-#: ../libempathy/empathy-utils.c:315 ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
msgid "Certificate not activated"
msgstr "证书尚未激活"
-#: ../libempathy/empathy-utils.c:317 ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
msgid "Certificate hostname mismatch"
msgstr "证书主机名不匹配"
-#: ../libempathy/empathy-utils.c:319 ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
msgid "Certificate fingerprint mismatch"
msgstr "证书指纹不匹配"
-#: ../libempathy/empathy-utils.c:321 ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
msgid "Certificate self-signed"
msgstr "证书是自签属的"
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:290
msgid "Certificate error"
msgstr "证书错误"
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:324
msgid "Encryption is not available"
msgstr "加密不可用"
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:326
msgid "Certificate is invalid"
msgstr "证书无效"
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:328
msgid "Connection has been refused"
msgstr "连接被拒绝"
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:330
msgid "Connection can't be established"
msgstr "无法建立连接"
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:332
msgid "Connection has been lost"
msgstr "连接已丢失"
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:334
msgid "This resource is already connected to the server"
msgstr "该资源已被连接至服务器"
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:336
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "连接已被使用相同资源的新连接取代"
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:339
msgid "The account already exists on the server"
msgstr "服务器上已存在该帐户"
-#: ../libempathy/empathy-utils.c:374
+#: ../libempathy/empathy-utils.c:341
msgid "Server is currently too busy to handle the connection"
msgstr "服务器太忙,无法处理当前连接"
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:343
msgid "Certificate has been revoked"
msgstr "证书已被吊销"
# lainme:证书使用不安全的加密算法或是弱加密的
# xslidian:证书使用的加密算法不安全或者易被破解
-#: ../libempathy/empathy-utils.c:378
+#: ../libempathy/empathy-utils.c:345
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "证书使用不安全的加密算法或者是弱加密的"
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:348
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:544
+#: ../libempathy/empathy-utils.c:509
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:514
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:543
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:579
+#: ../libempathy/empathy-utils.c:544
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -721,70 +729,70 @@ msgstr "将来"
#: ../libempathy-gtk/empathy-account-chooser.c:539
#, fuzzy
-#| msgid "Accounts"
msgid "All accounts"
msgstr "帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:691
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:692
msgid "Password"
msgstr "密码"
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:693
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "服务器"
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "端口"
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:766
+#: ../libempathy-gtk/empathy-account-widget.c:823
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1154
+#: ../libempathy-gtk/empathy-account-widget.c:1164
#, c-format
msgid "The account %s is edited via My Web Accounts."
msgstr "%s 帐户通过我的网络帐户进行了编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1170
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s 帐户无法在 Empathy 中编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1190
msgid "Launch My Web Accounts"
msgstr "启动我的网络帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "用户名:"
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1848
msgid "A_pply"
msgstr "应用(_P)"
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1878
msgid "L_og in"
msgstr "登录(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1952
msgid "This account already exists on the server"
msgstr "服务器上已存在该帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1955
msgid "Create a new account on the server"
msgstr "在服务器上创建新的帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2147
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -793,19 +801,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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2425
#, 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:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2451
#, c-format
msgid "%s Account"
msgstr "%s 帐户"
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2455
msgid "New account"
msgstr "新建帐户"
@@ -817,6 +825,7 @@ msgstr "<b>例如:</b> 我的屏幕名称"
#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -959,43 +968,49 @@ msgstr "选项"
msgid "None"
msgstr "无"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
msgid "Character set:"
msgstr "字符集:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr "大多数 IRC 服务器不需要密码,如果您不确定,则不要输入密码。"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
msgid "Network"
msgstr "网络"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
msgid "Network:"
msgstr "网络:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
msgid "Nickname:"
msgstr "昵称:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
msgid "Password:"
msgstr "密码:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
msgid "Quit message:"
msgstr "退出消息:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
msgid "Real name:"
msgstr "真名:"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
msgid "Servers"
msgstr "服务器"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
msgid "What is your IRC nickname?"
msgstr "您的 IRC 昵称是什么?"
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
msgid "Which IRC network?"
msgstr "哪个 IRC 网络?"
@@ -1256,7 +1271,6 @@ 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 "选择的联系人离线"
@@ -1266,67 +1280,65 @@ 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
+#: ../libempathy-gtk/empathy-chat.c:702
msgid "Failed to open private chat"
msgstr "建立私人对话失败"
-#: ../libempathy-gtk/empathy-chat.c:758
+#: ../libempathy-gtk/empathy-chat.c:763
msgid "Topic not supported on this conversation"
msgstr "不支持在此会话上设置主题"
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:769
msgid "You are not allowed to change the topic"
msgstr "您不能更改主题"
-#: ../libempathy-gtk/empathy-chat.c:968
+#: ../libempathy-gtk/empathy-chat.c:973
#, fuzzy, c-format
-#| msgid "invalid contact"
msgid "“%s” is not a valid contact ID"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:1025
+#: ../libempathy-gtk/empathy-chat.c:1030
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear:清空当前会话的所有消息"
-#: ../libempathy-gtk/empathy-chat.c:1028
+#: ../libempathy-gtk/empathy-chat.c:1033
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主题>:设定当前对话的主题"
-#: ../libempathy-gtk/empathy-chat.c:1031
+#: ../libempathy-gtk/empathy-chat.c:1036
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1034
+#: ../libempathy-gtk/empathy-chat.c:1039
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1038
+#: ../libempathy-gtk/empathy-chat.c:1043
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/用户[<聊天室ID>] [<原因>]:当前默认离开聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-chat.c:1047
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <昵称> [<消息>]:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1045
+#: ../libempathy-gtk/empathy-chat.c:1050
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <昵称> <消息>:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1048
+#: ../libempathy-gtk/empathy-chat.c:1053
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <昵称>:在当前服务器上改变您的昵称"
-#: ../libempathy-gtk/empathy-chat.c:1051
+#: ../libempathy-gtk/empathy-chat.c:1056
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <动作消息>:向当前对话中发送一个动作消息"
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1059
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 "
@@ -1335,124 +1347,124 @@ msgstr ""
"/say <消息>:发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如:“/"
"say /join 是用来加入一个新的聊天室”"
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/whois <contact ID>: display information about a contact"
msgstr ""
-#: ../libempathy-gtk/empathy-chat.c:1062
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
"/help [<命令>]:显示所有支持的命令。如果 <命令> 是有定义的,则显示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1077
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1116
msgid "Unknown command"
msgstr "未知命令"
-#: ../libempathy-gtk/empathy-chat.c:1237
+#: ../libempathy-gtk/empathy-chat.c:1242
msgid "Unknown command; see /help for the available commands"
msgstr "未知命令,请使用 /help 查阅可用命令"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1407
+#: ../libempathy-gtk/empathy-chat.c:1412
msgid "insufficient balance to send message"
msgstr "余额不足,无法发送消息"
-#: ../libempathy-gtk/empathy-chat.c:1409
+#: ../libempathy-gtk/empathy-chat.c:1414
msgid "not capable"
msgstr "做不到"
-#: ../libempathy-gtk/empathy-chat.c:1416
+#: ../libempathy-gtk/empathy-chat.c:1421
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:1419
+#: ../libempathy-gtk/empathy-chat.c:1424
msgid "invalid contact"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:1422
+#: ../libempathy-gtk/empathy-chat.c:1427
msgid "permission denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-chat.c:1425
+#: ../libempathy-gtk/empathy-chat.c:1430
msgid "too long message"
msgstr "消息太长"
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1433
msgid "not implemented"
msgstr "尚未实现"
-#: ../libempathy-gtk/empathy-chat.c:1432
+#: ../libempathy-gtk/empathy-chat.c:1437
msgid "unknown"
msgstr "未知"
-#: ../libempathy-gtk/empathy-chat.c:1438
+#: ../libempathy-gtk/empathy-chat.c:1443
#, c-format
msgid "Error sending message '%s': %s"
msgstr "发送消息“%s”出错:%s"
-#: ../libempathy-gtk/empathy-chat.c:1442
+#: ../libempathy-gtk/empathy-chat.c:1447
#, c-format
msgid "Error sending message: %s"
msgstr "发送消息出错:%s"
-#: ../libempathy-gtk/empathy-chat.c:1503 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
msgid "Topic:"
msgstr "话题:"
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1520
#, c-format
msgid "Topic set to: %s"
msgstr "话题被设置为:%s"
-#: ../libempathy-gtk/empathy-chat.c:1517
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "No topic defined"
msgstr "未设置话题"
-#: ../libempathy-gtk/empathy-chat.c:2024
+#: ../libempathy-gtk/empathy-chat.c:2031
msgid "(No Suggestions)"
msgstr "(没有建议)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2092
+#: ../libempathy-gtk/empathy-chat.c:2099
#, 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:2129
+#: ../libempathy-gtk/empathy-chat.c:2136
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "添加“%s”到 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:2186
+#: ../libempathy-gtk/empathy-chat.c:2206
msgid "Insert Smiley"
msgstr "插入表情"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2204
+#: ../libempathy-gtk/empathy-chat.c:2224
#: ../libempathy-gtk/empathy-ui-utils.c:1756
msgid "_Send"
msgstr "发送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2239
+#: ../libempathy-gtk/empathy-chat.c:2278
msgid "_Spelling Suggestions"
msgstr "拼写建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2328
+#: ../libempathy-gtk/empathy-chat.c:2367
msgid "Failed to retrieve recent logs"
msgstr "获取最近日志失败"
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2504
#, c-format
msgid "%s has disconnected"
msgstr "%s 已断开连接"
@@ -1460,12 +1472,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:2472
+#: ../libempathy-gtk/empathy-chat.c:2511
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出"
-#: ../libempathy-gtk/empathy-chat.c:2475
+#: ../libempathy-gtk/empathy-chat.c:2514
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1473,17 +1485,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:2483
+#: ../libempathy-gtk/empathy-chat.c:2522
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%s 已被 %s 禁止"
-#: ../libempathy-gtk/empathy-chat.c:2486
+#: ../libempathy-gtk/empathy-chat.c:2525
#, c-format
msgid "%s was banned"
msgstr "%s 被禁止"
-#: ../libempathy-gtk/empathy-chat.c:2490
+#: ../libempathy-gtk/empathy-chat.c:2529
#, c-format
msgid "%s has left the room"
msgstr "%s 离开了聊天室"
@@ -1493,94 +1505,94 @@ msgstr "%s 离开了聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2499
+#: ../libempathy-gtk/empathy-chat.c:2538
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2524
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%s has joined the room"
msgstr "%s 加入了聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2549
+#: ../libempathy-gtk/empathy-chat.c:2588
#, c-format
msgid "%s is now known as %s"
msgstr "%s 现在叫做 %s"
-#: ../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
+#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:1657
msgid "Disconnected"
msgstr "已断开连接"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3374
msgid "Would you like to store this password?"
msgstr "是否保存密码?"
-#: ../libempathy-gtk/empathy-chat.c:3338
+#: ../libempathy-gtk/empathy-chat.c:3380
msgid "Remember"
msgstr "记录"
-#: ../libempathy-gtk/empathy-chat.c:3348
+#: ../libempathy-gtk/empathy-chat.c:3390
msgid "Not now"
msgstr "不是现在"
-#: ../libempathy-gtk/empathy-chat.c:3392
+#: ../libempathy-gtk/empathy-chat.c:3434
msgid "Retry"
msgstr "重试"
-#: ../libempathy-gtk/empathy-chat.c:3396
+#: ../libempathy-gtk/empathy-chat.c:3438
msgid "Wrong password; please try again:"
msgstr "密码错误,请重试:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3526
+#: ../libempathy-gtk/empathy-chat.c:3568
msgid "This room is protected by a password:"
msgstr "这个房间是由一个密码保护的:"
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3595
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3755 ../src/empathy-event-manager.c:1261
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../src/empathy-call-window.c:1905
msgid "Connected"
msgstr "已连接"
-#: ../libempathy-gtk/empathy-chat.c:3810
+#: ../libempathy-gtk/empathy-chat.c:3852
msgid "Conversation"
msgstr "对话"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3815
+#: ../libempathy-gtk/empathy-chat.c:3857
#, c-format
msgid "%s (SMS)"
msgstr "%s (短信)"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
msgid "Unknown or invalid identifier"
msgstr "未知或无效的识别符"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
msgid "Contact blocking temporarily unavailable"
msgstr "联系人屏蔽暂时不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
msgid "Contact blocking unavailable"
msgstr "联系人屏蔽不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
msgid "Permission Denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
msgid "Could not block contact"
msgstr "无法屏蔽联系人"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
msgid "Edit Blocked Contacts"
msgstr "编辑屏蔽的联系人"
@@ -1595,15 +1607,20 @@ msgstr "编辑屏蔽的联系人"
msgid "Account:"
msgstr "帐户:"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#, fuzzy
+msgid "Blocked Contacts"
+msgstr "已屏蔽的联系人(_B)"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1410
+#: ../libempathy-gtk/empathy-theme-adium.c:1417
msgid "_Copy Link Address"
msgstr "复制链接地址(_C)"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-theme-adium.c:1424
msgid "_Open Link"
msgstr "打开链接(_O)"
@@ -1710,48 +1727,48 @@ msgid "_Block Contact"
msgstr "屏蔽联系人"
#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
+#: ../libempathy-gtk/empathy-individual-menu.c:548
#: ../src/empathy-main-window.ui.h:16
msgid "_Chat"
msgstr "聊天(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:639
msgctxt "menu item"
msgid "_Audio Call"
msgstr "音频呼叫(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:684
msgctxt "menu item"
msgid "_Video Call"
msgstr "视频呼叫(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-individual-menu.c:737
#: ../src/empathy-main-window.ui.h:27
msgid "_Previous Conversations"
msgstr "最近会话(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:778
msgid "Send File"
msgstr "发送文件"
#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:820
msgid "Share My Desktop"
msgstr "共享我的桌面"
#: ../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-menu.c:855
#: ../libempathy-gtk/empathy-individual-widget.c:1386
msgid "Favorite"
msgstr "收藏"
#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:883
msgid "Infor_mation"
msgstr "信息(_M)"
@@ -1761,13 +1778,13 @@ msgid "_Edit"
msgstr "编辑(_E)"
#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
+#: ../libempathy-gtk/empathy-individual-menu.c:1070
#: ../src/empathy-chat-window.c:1010
msgid "Inviting you to this room"
msgstr "邀请到此聊天室"
#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1116
msgid "_Invite to Chat Room"
msgstr "邀请到聊天室(_I)"
@@ -1823,13 +1840,11 @@ msgstr "生日:"
#.
#: ../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 "已连接"
@@ -1838,13 +1853,11 @@ msgstr "已连接"
#.
#: ../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)"
@@ -1972,7 +1985,7 @@ msgstr "海拔:"
#: ../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
+#: ../src/empathy-preferences.ui.h:16
msgid "Location"
msgstr "位置"
@@ -2095,25 +2108,25 @@ 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:137
+#: ../libempathy-gtk/empathy-individual-menu.c:138
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
+#: ../libempathy-gtk/empathy-individual-menu.c:594
#: ../libempathy-gtk/empathy-new-message-dialog.c:248
msgid "_SMS"
msgstr "短信(_S)"
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:931
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:945
+#: ../libempathy-gtk/empathy-individual-menu.c:957
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "绑定联系人(_L)…"
@@ -2204,7 +2217,7 @@ 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
@@ -2212,132 +2225,135 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "解除绑定(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:416
+#: ../libempathy-gtk/empathy-log-window.c:458
+msgid "History"
+msgstr "历史"
+
+#: ../libempathy-gtk/empathy-log-window.c:510
msgid "Show"
msgstr "显示"
-#: ../libempathy-gtk/empathy-log-window.c:438
+#: ../libempathy-gtk/empathy-log-window.c:532
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:946
+#, fuzzy, c-format
+msgid "Chat in %s"
+msgstr "与 %s 通话"
-#: ../libempathy-gtk/empathy-log-window.c:671
+#: ../libempathy-gtk/empathy-log-window.c:948
#, fuzzy, c-format
msgid "Chat with %s"
msgstr "与 %s 通话"
+#: ../libempathy-gtk/empathy-log-window.c:998
+#: ../libempathy-gtk/empathy-log-window.c:1176
+#, fuzzy
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A %B %d %Y"
+
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:790
+#: ../libempathy-gtk/empathy-log-window.c:1118
#, 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
+#: ../libempathy-gtk/empathy-log-window.c:1124
#, 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
+#: ../libempathy-gtk/empathy-log-window.c:1195
+#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:861
+#: ../libempathy-gtk/empathy-log-window.c:1204
#, c-format
msgid "Call took %s, ended at %s"
msgstr "通话时长:%s,结束于 %s"
-#: ../libempathy-gtk/empathy-log-window.c:1188
+#: ../libempathy-gtk/empathy-log-window.c:1536
msgid "Today"
msgstr "今天"
-#: ../libempathy-gtk/empathy-log-window.c:1192
+#: ../libempathy-gtk/empathy-log-window.c:1540
msgid "Yesterday"
msgstr "昨天"
-#: ../libempathy-gtk/empathy-log-window.c:1208
+#: ../libempathy-gtk/empathy-log-window.c:1556
#, 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
+#: ../libempathy-gtk/empathy-log-window.c:1637
+#: ../libempathy-gtk/empathy-log-window.c:3203
msgid "Anytime"
msgstr ""
-#: ../libempathy-gtk/empathy-log-window.c:1361
-#: ../libempathy-gtk/empathy-log-window.c:1705
+#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:2154
#, fuzzy
-#| msgid "None"
msgid "Anyone"
msgstr "无"
-#: ../libempathy-gtk/empathy-log-window.c:1985
+#: ../libempathy-gtk/empathy-log-window.c:2451
msgid "Who"
msgstr ""
-#: ../libempathy-gtk/empathy-log-window.c:2189
+#: ../libempathy-gtk/empathy-log-window.c:2655
msgid "When"
msgstr ""
-#: ../libempathy-gtk/empathy-log-window.c:2305
+#: ../libempathy-gtk/empathy-log-window.c:2771
msgid "Anything"
msgstr ""
-#: ../libempathy-gtk/empathy-log-window.c:2307
+#: ../libempathy-gtk/empathy-log-window.c:2773
msgid "Text chats"
msgstr "文本聊天"
-#: ../libempathy-gtk/empathy-log-window.c:2309
+#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../src/empathy-preferences.ui.h:4
#, fuzzy
-#| msgid "Call"
msgid "Calls"
msgstr "通话"
-#: ../libempathy-gtk/empathy-log-window.c:2314
+#: ../libempathy-gtk/empathy-log-window.c:2780
msgid "Incoming calls"
msgstr "来电"
-#: ../libempathy-gtk/empathy-log-window.c:2315
+#: ../libempathy-gtk/empathy-log-window.c:2781
#, fuzzy
-#| msgid "Outgoing voice call"
msgid "Outgoing calls"
msgstr "呼出的语音通话"
-#: ../libempathy-gtk/empathy-log-window.c:2316
+#: ../libempathy-gtk/empathy-log-window.c:2782
msgid "Missed calls"
msgstr "未接来电"
-#: ../libempathy-gtk/empathy-log-window.c:2337
+#: ../libempathy-gtk/empathy-log-window.c:2804
#, fuzzy
-#| msgid "Chat"
msgid "What"
msgstr "聊天"
-#: ../libempathy-gtk/empathy-log-window.c:2966
+#: ../libempathy-gtk/empathy-log-window.c:3506
#, 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
+#: ../libempathy-gtk/empathy-log-window.c:3510
msgid "Clear All"
msgstr "全部清除"
-#: ../libempathy-gtk/empathy-log-window.c:2977
+#: ../libempathy-gtk/empathy-log-window.c:3517
msgid "Delete from:"
msgstr ""
@@ -2348,7 +2364,8 @@ msgstr ""
#. translators: Call is a noun. This string is used in the window
#. * title
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1340
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "通话"
@@ -2358,15 +2375,15 @@ msgid "Chat"
msgstr "聊天"
#: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "History"
-msgstr "历史"
+msgid "Delete All History..."
+msgstr ""
#: ../libempathy-gtk/empathy-log-window.ui.h:5
msgid "Profile"
-msgstr ""
+msgstr "个人信息"
#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:20
msgid "Video"
msgstr "视频"
@@ -2399,17 +2416,17 @@ msgid "New Conversation"
msgstr "新建对话"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:231
msgid "Send _Video"
msgstr "发送视频(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
msgid "C_all"
msgstr "通话(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
msgid "New Call"
msgstr "新建通话"
@@ -2452,7 +2469,7 @@ msgstr "设置状态"
#: ../libempathy-gtk/empathy-presence-chooser.c:943
msgid "Set your presence and current status"
-msgstr "设置你的状态信息和现在的状态"
+msgstr "设置您的状态信息和现在的状态"
#. Custom messages
#: ../libempathy-gtk/empathy-presence-chooser.c:1131
@@ -2534,18 +2551,17 @@ msgstr "编辑自定义状态"
#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
#, fuzzy
-#| msgid "_Remove"
msgid "Remove"
msgstr "删除(_R)"
-#: ../libempathy-gtk/empathy-theme-adium.c:1118
+#: ../libempathy-gtk/empathy-theme-adium.c:1121
#, fuzzy, c-format
-#| msgid "Message received"
msgid "Message edited at %s"
msgstr "收到了消息"
-#: ../libempathy-gtk/empathy-theme-adium.c:1937
+#: ../libempathy-gtk/empathy-theme-adium.c:1943
msgid "Normal"
msgstr "普通"
@@ -3096,7 +3112,7 @@ msgid "Your new account has not been saved yet."
msgstr "您的新帐户还没有保存。"
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:649
msgid "Connecting…"
msgstr "正在连接..."
@@ -3160,7 +3176,6 @@ msgstr "您将要关闭此窗口,所做的修改将作废。您确定要继续
#: ../src/empathy-accounts-dialog.ui.h:1
#, fuzzy
-#| msgid "_Add…"
msgid "Add…"
msgstr "添加(_A)..."
@@ -3198,162 +3213,157 @@ msgstr "Empathy 认证客户端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
msgid "- Empathy Audio/Video Client"
msgstr " - Empathy 语音/视频客户端"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
msgid "Empathy Audio/Video Client"
msgstr "Empathy 语音/视频客户端"
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
msgid "Contrast"
msgstr "对比度"
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
msgid "Gamma"
msgstr "伽马"
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
msgid "_Sidebar"
msgstr "侧边栏(_S)"
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
msgid "Audio input"
msgstr "音频输入"
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
msgid "Video input"
msgstr "视频输入"
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
msgid "Dialpad"
msgstr "电话键盘"
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
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:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:998
#, c-format
msgid "Call with %s"
msgstr "与 %s 通话"
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:1242
msgid "The IP address as seen by the machine"
msgstr "机器所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:1244
msgid "The IP address as seen by a server on the Internet"
msgstr "Internet 上服务器所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:1246
msgid "The IP address of the peer as seen by the other side"
msgstr "另一方所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:1248
msgid "The IP address of a relay server"
msgstr "中转服务器 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:1250
msgid "The IP address of the multicast group"
msgstr "多播组的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1843
msgctxt "encoding video codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1846
msgctxt "encoding audio codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1849
msgctxt "decoding video codec"
msgid "Unknown"
msgstr "未知"
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1852
msgctxt "decoding audio codec"
msgid "Unknown"
msgstr "未知"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已连接 — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:1967
msgid "Technical Details"
msgstr "技术细节"
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2005
#, 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:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2010
#, 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:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2016
#, 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:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2022
msgid "There was a failure on the network"
msgstr "网络出现一个错误"
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2026
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2029
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2041
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3363,150 +3373,129 @@ msgstr ""
"Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>,并附上帮助菜"
"单里“调试”窗口收集到的日志。"
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2050
msgid "There was a failure in the call engine"
msgstr "呼叫引擎里出现了一个故障"
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2053
msgid "The end of the stream was reached"
msgstr "已到达流的末尾"
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2093
msgid "Can't establish audio stream"
msgstr "不能建立音频流"
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2103
msgid "Can't establish video stream"
msgstr "不能建立视频流"
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
#: ../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:4
+#, fuzzy
+msgid "Disable camera"
+msgstr "禁用(_D)"
-#: ../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:5
+msgid "Display the dialpad"
+msgstr "显示拨号盘"
-#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:6
#: ../src/empathy-streamed-media-window.ui.h:9
msgid "Encoding Codec:"
msgstr "编码器:"
-#: ../src/empathy-call-window.ui.h:10
+#: ../src/empathy-call-window.ui.h:7
#: ../src/empathy-streamed-media-window.ui.h:10
msgid "Hang up"
msgstr "挂起"
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:8
#: ../src/empathy-streamed-media-window.ui.h:11
msgid "Hang up current call"
msgstr "挂起当前呼叫"
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:9
#: ../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:10
+msgid "Maximise me"
+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:11
+msgid "Minimise me"
+msgstr ""
-#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-call-window.ui.h:12
#: ../src/empathy-streamed-media-window.ui.h:15
msgid "Remote Candidate:"
msgstr "远程候选:"
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:13
#: ../src/empathy-streamed-media-window.ui.h:16
msgid "Send Audio"
msgstr "发送音频"
+#: ../src/empathy-call-window.ui.h:14
+#, fuzzy
+msgid "Send Video"
+msgstr "发送视频(_V)"
+
+#: ../src/empathy-call-window.ui.h:15
+#, fuzzy
+msgid "Show dialpad"
+msgstr "电话键盘"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Start a video call"
+msgstr "开始视频通话"
+
#: ../src/empathy-call-window.ui.h:17
+msgid "Start an audio call"
+msgstr "开始音频通话"
+
+#: ../src/empathy-call-window.ui.h:18
#: ../src/empathy-streamed-media-window.ui.h:17
msgid "Toggle audio transmission"
msgstr "切换音频传输"
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:19
+#, fuzzy
+msgid "Toggle video transmission"
+msgstr "切换音频传输"
+
+#: ../src/empathy-call-window.ui.h:20
#: ../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
+#: ../src/empathy-call-window.c:1612 ../src/empathy-call-window.c:1613
+#: ../src/empathy-call-window.c:1614 ../src/empathy-call-window.c:1615
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: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 "视频开启"
+#, fuzzy
+msgid "Video call"
+msgstr "视频呼叫(_V)"
#: ../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
-#, fuzzy
-#| msgid "Dialpad"
-msgid "_Dialpad"
-msgstr "电话键盘"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:24 ../src/empathy-main-window.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "查看(_V)"
@@ -3617,15 +3606,15 @@ msgstr "标签(_T)"
msgid "_Undo Close Tab"
msgstr "撤销关闭标签(_U)"
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
msgid "Name"
msgstr "名称"
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
msgid "Room"
msgstr "聊天室"
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
msgid "Auto-Connect"
msgstr "自动连接"
@@ -3633,95 +3622,95 @@ msgstr "自动连接"
msgid "Manage Favorite Rooms"
msgstr "管理聊天室收藏"
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
msgid "Incoming video call"
msgstr "呼入的视频通话"
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
msgid "Incoming call"
msgstr "来电"
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 视频来电。您想要接听吗?"
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 来电,您想要接听吗?"
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的来电"
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
msgid "_Reject"
msgstr "拒绝(_R)"
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
msgid "_Answer"
msgstr "接听(_A)"
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
msgid "_Answer with video"
msgstr ""
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
#, c-format
msgid "Incoming video call from %s"
msgstr "%s 的视频呼叫"
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
msgid "Room invitation"
msgstr "聊天室邀请"
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
#, c-format
msgid "Invitation to join %s"
msgstr "邀请您加入 %s"
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正邀请您加入 %s"
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:859
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 已邀请您加入 %s"
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
#, c-format
msgid "You have been invited to join %s"
msgstr "您被邀请加入 %s"
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
#, c-format
msgid "Incoming file transfer from %s"
msgstr "接收 %s 文件传输"
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "需要密码"
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1191
#, c-format
msgid "%s would like permission to see when you are online"
-msgstr "%s 当你在线的时候可见"
+msgstr "%s 当您在线的时候可见"
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1195
#, c-format
msgid ""
"\n"
@@ -4067,79 +4056,79 @@ msgstr "聊天室列表"
msgid "_Room:"
msgstr "聊天室(_R):"
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:160
msgid "Message received"
msgstr "收到了消息"
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:161
msgid "Message sent"
msgstr "发出了消息"
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:162
msgid "New conversation"
msgstr "新对话"
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:163
msgid "Contact goes online"
msgstr "离线人上线"
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:164
msgid "Contact goes offline"
msgstr "联系人离线"
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:165
msgid "Account connected"
msgstr "帐户已连接"
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:166
msgid "Account disconnected"
msgstr "帐户已断开"
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:469
msgid "Language"
msgstr "语言"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:719
msgid "Juliet"
msgstr "朱立叶"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:726
msgid "Romeo"
msgstr "罗密欧"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:732
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr ""
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:735
msgid "Deny thy father and refuse thy name;"
msgstr ""
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:738
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
+#: ../src/empathy-preferences.c:741
msgid "And I'll no longer be a Capulet."
msgstr ""
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:744
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
+#: ../src/empathy-preferences.c:747
msgid "Juliet has disconnected"
msgstr "朱立叶已断开连接"
-#: ../src/empathy-preferences.c:1135
+#: ../src/empathy-preferences.c:1153
msgid "Preferences"
msgstr "首选项"
@@ -4147,67 +4136,75 @@ msgstr "首选项"
msgid "Appearance"
msgstr "外观"
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
msgid "Behavior"
msgstr "行为"
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
msgid "Chat Th_eme:"
msgstr "聊天主题(_E):"
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
msgid "Disable notifications when _away or busy"
msgstr "离开或忙碌时禁用提示(_A)"
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
msgid "Disable sounds when _away or busy"
msgstr "离开或忙碌时禁用声音(_A)"
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
msgid "Display incoming events in the notification area"
msgstr "再提示区域显示呼入事件"
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
msgid "Enable notifications when a contact comes online"
msgstr "当联系人上线时允许提示"
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact goes offline"
msgstr "当联系人离线时允许提示"
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when the _chat is not focused"
msgstr "当会话闲置时允许提示"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable spell checking for languages:"
msgstr "允许拼写检查的语言:"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
msgid "General"
msgstr "常规"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
+msgid "Input level"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input volume"
+msgstr "输入音量"
+
+#: ../src/empathy-preferences.ui.h:17
msgid "Location sources:"
msgstr "位置来源:"
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
msgid "Log conversations"
msgstr "记录对话"
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
msgid "Notifications"
msgstr "提示"
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
msgid "Play sound for events"
msgstr "播放事件声音"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
msgid "Privacy"
msgstr "隐私"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
"state and country will be published. GPS coordinates will be accurate to 1 "
@@ -4216,72 +4213,71 @@ msgstr ""
"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
"将精确到一位小数。 "
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
msgid "Show _smileys as images"
msgstr "显示表情符号为图形(_S)"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
msgid "Show contact _list in rooms"
msgstr "在聊天室显示联系人列表(_L)"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
msgid "Sounds"
msgstr "声音"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr "语言列表仅反映已安装的字典"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:28
msgid "Themes"
msgstr "主题"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
#, fuzzy
-#| msgid "Theme Variant:"
msgid "Variant:"
msgstr "主题变量:"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "启动时自动连接(_A) "
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "手机(_C)"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "允许气泡通知(_E)"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "启用声音通知(_E)"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "网络(_N)(IP,Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天(_O)"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
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:35
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "降低位置信息精度(_R)"
@@ -4293,6 +4289,54 @@ msgstr "状态"
msgid "_Quit"
msgstr "退出(_Q)"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "再次呼叫联系人"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "相机关闭"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "相机开启"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "禁用相机停止发送视频"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "启用相机,并发送视频"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "启用相机,但不发送视频"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "预览"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "重拨"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "视频(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "视频关闭"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "视频开启"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "视频预览"
+
#: ../src/empathy-map-view.c:448
msgid "Contact Map View"
msgstr "联系地图视图"
@@ -4421,7 +4465,7 @@ msgstr "接听"
#: ../src/empathy-notifications-approver.c:227
msgid "Answer with video"
-msgstr ""
+msgstr "以视频应答"
#: ../src/empathy-notifications-approver.c:235
#: ../src/empathy-notifications-approver.c:245
@@ -4437,25 +4481,29 @@ msgstr "接受"
msgid "Provide"
msgstr "提供"
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:135
#, c-format
msgid "%s just tried to call you, but you were in another call."
msgstr "%s 刚刚尝试呼叫您,但您当时正在与其他人通话。"
-#: ../src/empathy-call-window.c:1246
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:556 ../src/empathy-call-window.c:570
+msgid "i"
+msgstr ""
+
+#: ../src/empathy-call-window.c:1005
#, 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
+#: ../src/empathy-call-window.c:1904
#, fuzzy, c-format
-#| msgid "Connected — %d:%02dm"
msgid "%s — %d:%02dm"
msgstr "已连接 — %d:%02dm"
-#: ../src/empathy-call-window.c:2125
+#: ../src/empathy-call-window.c:1905
msgid "On hold"
msgstr ""
@@ -4463,6 +4511,10 @@ msgstr ""
msgid "_Match case"
msgstr "区分大小写(_M)"
+#~| msgid "Dialpad"
+#~ msgid "_Dialpad"
+#~ msgstr "电话键盘"
+
#~ msgid "All"
#~ msgstr "全部"
@@ -4631,7 +4683,7 @@ msgstr "区分大小写(_M)"
#~ msgid ""
#~ "An invitation was offered for service %s, but you don't have the needed "
#~ "application to handle it"
-#~ msgstr "一个由 %s 服务提供邀请,但是你不需要应用程序处理它"
+#~ msgstr "一个由 %s 服务提供邀请,但是您不需要应用程序处理它"
#~ msgid "Can't set an empty display name"
#~ msgstr "无法设置为空显示名称"