Update Simplified Chinese translation.

1 files changed, 400 insertions, 380 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5123b90f0..0c93ff90c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -23,8 +23,8 @@ 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-07-30 17:16+0000\n"
-"PO-Revision-Date: 2011-07-31 18:08+0000\n"
+"POT-Creation-Date: 2011-08-15 13:23+0000\n"
+"PO-Revision-Date: 2011-08-21 23:56+0800\n"
 "Last-Translator: Julius Wong <villahwong@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -54,403 +54,417 @@ 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"
+msgstr "来电音量"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Call volume, as a percentage."
-msgstr ""
+msgstr "来电音量，以百分比计。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "相机设备"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme"
 msgstr "聊天窗口主题"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme variant"
 msgstr "聊天窗口主题衍生"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 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:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Compact contact list"
 msgstr "紧凑显示联系人列表"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Connection managers should be used"
 msgstr "应该使用连接管理器"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Contact list sort criterion"
 msgstr "联系人列表排序条件"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "视频呼叫时默认使用的相机设备，例如 /dev/video0。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "默认的选取头像图片的目录"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "离开时禁用弹出提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "离开时禁用声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "在状态栏显示呼入事件。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 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:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Echo cancellation support"
+msgstr "回声抑制支持"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy 能够发布用户的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy 能够通过 GPS 来估计位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy 能够通过手机来估计位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy 能够通过网络来估计位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Empathy 默认下载文件夹"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy 已经迁移至 telepathy-butterfly 日志"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy 空闲时是否自动离开"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 启动时是否自动连接"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should reduce the location's accuracy"
 msgstr "降低 Emapthy 位置信息的准确度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable WebKit Developer Tools"
 msgstr "启用 WebKit 开发工具"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable popup notifications for new messages"
 msgstr "启用新消息弹出提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable spell checker"
 msgstr "启用拼写检查器"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide main window"
 msgstr "隐藏主窗口"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide the main window."
 msgstr "隐藏主窗口。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Nick completed character"
 msgstr "昵称补全字符"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Open new chats in separate windows"
 msgstr "在单独窗口中打开新聊天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Path of the Adium theme to use"
 msgstr "Adium 主题的路径"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 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:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "收到消息时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for new conversations"
 msgstr "新对话时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for outgoing messages"
 msgstr "发出消息时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
 msgstr "联系人登录时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs out"
 msgstr "联系人注销时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when we log in"
 msgstr "登录时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log out"
 msgstr "注销时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天窗口不是焦点则弹出消息通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications when a contact logs in"
 msgstr "当联系人登录时弹出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs out"
 msgstr "当联系人注销时弹出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Show Balance in contact list"
 msgstr "在联系人列表中显示余额"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Show avatars"
 msgstr "显示头像"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show contact list in rooms"
 msgstr "在聊天室显示联系人列表"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show hint about closing the main window"
 msgstr "关闭主窗口时显示提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show offline contacts"
 msgstr "显示离线联系人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show protocols"
 msgstr "显示协议"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Spell checking languages"
 msgstr "拼写检查器语言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "The default folder to save file transfers in."
 msgstr "保存传送文件的默认文件夹。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次选取头像图片的目录。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The position for the chat window side pane"
 msgstr "聊天窗口边栏的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "聊天窗口边栏保存的位置(像素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用于在聊天窗口中显示会话的主题。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用于在聊天窗口中显示会话的主题。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use notification sounds"
 msgstr "使用通知声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use theme for chat rooms"
 msgstr "为聊天室使用主题"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "是否允许 Empathy 将用户的位置共享给联系人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "是否允许 Empathy 通过 GPS 估计位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "是否允许 Empathy 通过手机网络估计位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "是否允许 Empathy 通过网络估计位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy 是否在启动时自动登入您的帐户。"
+msgstr "Empathy 是否在启动时自动登入您的帐号。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "是否使用联系人的头像作为聊天窗口的图标。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 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:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是否使用连接管理器自动断开连接或重新连接。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是否对您想要作拼写检查的单词作拼写检查。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "对话时是否将表情符号转换为表情图标。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "是否启用 Pulseaudio 的回声抑制过滤器。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是否需要联系人上线提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是否需要联系人下线提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of events."
 msgstr "是否需要事件提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是否需要消息到达提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是否需要新会话提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是否为外出消息使用声音提示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound when logging into a network."
 msgstr "当联网登录时是否播放提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound when logging out of a network."
 msgstr "当网络断开时是否播放提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play sound notifications when away or busy."
 msgstr "当离开或忙碌时是否使用声音提示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "当联系人离线时是否显示弹出通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "当联系人上线时是否显示弹出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 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:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "当收到新消息时是否弹出显示提示框。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show account balances in the contact list."
 msgstr "是否在联系人列表和聊天窗口中显示余额。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是否在联系人列表和聊天窗口中显示头像。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是否显示联系人清单中离线的联系人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show popup notifications when away or busy."
 msgstr "当离开或忙碌时是否弹出显示提示框。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是否在联系人列表和聊天窗口中显示协议。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是否在聊天室显示联系人列表。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show the contact list in compact mode."
 msgstr "是否以紧凑模式显示联系人列表。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 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:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to use the theme for chat rooms."
 msgstr "是否对聊天室使用主题。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 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 "
@@ -461,13 +475,13 @@ msgstr ""
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
 msgid "Manage Messaging and VoIP accounts"
-msgstr "管理消息和 VoIP 帐户"
+msgstr "管理消息和 VoIP 帐号"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
 #: ../src/empathy-accounts-dialog.c:2324
 msgid "Messaging and VoIP Accounts"
-msgstr "消息和 VoIP 帐户"
+msgstr "消息和 VoIP 帐号"
 
 #: ../libempathy/empathy-ft-handler.c:825
 msgid "File transfer completed, but the file was corrupted"
@@ -568,7 +582,7 @@ msgid "Status is set to offline"
 msgstr "状态已设置为离线"
 
 #: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "网络错误"
 
@@ -647,7 +661,7 @@ msgstr "连接已被使用相同资源的新连接取代"
 
 #: ../libempathy/empathy-utils.c:339
 msgid "The account already exists on the server"
-msgstr "服务器上已存在该帐户"
+msgstr "服务器上已存在该帐号"
 
 #: ../libempathy/empathy-utils.c:341
 msgid "Server is currently too busy to handle the connection"
@@ -728,71 +742,70 @@ msgid "in the future"
 msgstr "将来"
 
 #: ../libempathy-gtk/empathy-account-chooser.c:539
-#, fuzzy
 msgid "All accounts"
-msgstr "帐户"
+msgstr "全部帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:691
+#: ../libempathy-gtk/empathy-account-widget.c:693
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
-msgstr "帐户"
+msgstr "帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:692
+#: ../libempathy-gtk/empathy-account-widget.c:694
 msgid "Password"
 msgstr "密码"
 
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:695
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "服务器"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "端口"
 
-#: ../libempathy-gtk/empathy-account-widget.c:766
-#: ../libempathy-gtk/empathy-account-widget.c:823
+#: ../libempathy-gtk/empathy-account-widget.c:768
+#: ../libempathy-gtk/empathy-account-widget.c:825
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1164
+#: ../libempathy-gtk/empathy-account-widget.c:1166
 #, c-format
 msgid "The account %s is edited via My Web Accounts."
-msgstr "%s 帐户通过我的网络帐户进行了编辑。"
+msgstr "%s 帐号通过我的网络帐户进行了编辑。"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1170
+#: ../libempathy-gtk/empathy-account-widget.c:1172
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
-msgstr "%s 帐户无法在 Empathy 中编辑。"
+msgstr "%s 帐号无法在 Empathy 中编辑。"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1190
+#: ../libempathy-gtk/empathy-account-widget.c:1192
 msgid "Launch My Web Accounts"
-msgstr "启动我的网络帐户"
+msgstr "启动我的网络帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1532
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "用户名："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1848
+#: ../libempathy-gtk/empathy-account-widget.c:1850
 msgid "A_pply"
 msgstr "应用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1878
+#: ../libempathy-gtk/empathy-account-widget.c:1880
 msgid "L_og in"
 msgstr "登录(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1952
+#: ../libempathy-gtk/empathy-account-widget.c:1954
 msgid "This account already exists on the server"
-msgstr "服务器上已存在该帐户"
+msgstr "服务器上已存在该帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1955
+#: ../libempathy-gtk/empathy-account-widget.c:1957
 msgid "Create a new account on the server"
-msgstr "在服务器上创建新的帐户"
+msgstr "在服务器上创建新的帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2147
+#: ../libempathy-gtk/empathy-account-widget.c:2149
 msgid "Ca_ncel"
 msgstr "取消(_N)"
 
@@ -801,21 +814,21 @@ 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:2425
+#: ../libempathy-gtk/empathy-account-widget.c:2427
 #, 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:2451
+#: ../libempathy-gtk/empathy-account-widget.c:2453
 #, c-format
 msgid "%s Account"
-msgstr "%s 帐户"
+msgstr "%s 帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2455
+#: ../libempathy-gtk/empathy-account-widget.c:2457
 msgid "New account"
-msgstr "新建帐户"
+msgstr "新建帐号"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 msgid "<b>Example:</b> MyScreenName"
@@ -1097,7 +1110,7 @@ msgstr "<b>例如：</b>user@hotmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 msgid "What is your Windows Live ID?"
-msgstr "您的 Windows Live 帐户是什么？"
+msgstr "您的 Windows Live 帐号是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live password?"
@@ -1194,7 +1207,7 @@ msgstr "传输："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 msgid "What is your SIP account password?"
-msgstr "您的 SIP 帐户密码是什么？"
+msgstr "您的 SIP 帐号密码是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP login ID?"
@@ -1235,7 +1248,7 @@ msgstr "没有任何接受的图片格式能被您的系统支持"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:822
 msgid "Couldn't save pixbuf to png"
-msgstr ""
+msgstr "无法将 pixbuf 保存为 PNG"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "Select Your Avatar Image"
@@ -1261,27 +1274,26 @@ msgstr "所有文件"
 msgid "Click to enlarge"
 msgstr "单击以放大"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "发起呼叫时出错"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
 msgstr "选择的联系人不支持呼叫"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is offline"
 msgstr "选择的联系人离线"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "The specified contact is not valid"
 msgstr "选择的联系人无效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "Emergency calls are not supported on this protocol"
-msgstr "不支持在此会话上设置主题"
+msgstr "不支持在此会话上进行紧急呼叫"
 
 #: ../libempathy-gtk/empathy-chat.c:702
 msgid "Failed to open private chat"
@@ -1296,9 +1308,9 @@ msgid "You are not allowed to change the topic"
 msgstr "您不能更改主题"
 
 #: ../libempathy-gtk/empathy-chat.c:973
-#, fuzzy, c-format
+#, c-format
 msgid "“%s” is not a valid contact ID"
-msgstr "无效联系人"
+msgstr "%s 是无效的联系人 ID"
 
 #: ../libempathy-gtk/empathy-chat.c:1030
 msgid "/clear: clear all messages from the current conversation"
@@ -1349,7 +1361,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/whois <contact ID>: display information about a contact"
-msgstr ""
+msgstr "/whois <联系人 ID>：显示一个联系人的信息"
 
 #: ../libempathy-gtk/empathy-chat.c:1067
 msgid ""
@@ -1451,7 +1463,7 @@ msgstr "插入表情"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-ui-utils.c:1757
 msgid "_Send"
 msgstr "发送(_S)"
 
@@ -1522,7 +1534,7 @@ msgstr "%s 现在叫做 %s"
 
 #: ../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
+#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:2264
 msgid "Disconnected"
 msgstr "已断开连接"
 
@@ -1557,7 +1569,6 @@ msgid "Join"
 msgstr "加入"
 
 #: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
-#: ../src/empathy-call-window.c:1905
 msgid "Connected"
 msgstr "已连接"
 
@@ -1605,12 +1616,11 @@ msgstr "编辑屏蔽的联系人"
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
-msgstr "帐户："
+msgstr "帐号："
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#, fuzzy
 msgid "Blocked Contacts"
-msgstr "已屏蔽的联系人(_B)"
+msgstr "已屏蔽的联系人"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
@@ -1839,27 +1849,23 @@ msgstr "生日："
 #. * with their IM client.
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:346
-#, fuzzy
 msgid "Last seen:"
-msgstr "姓(_L)："
+msgstr "最近上线："
 
 #: ../libempathy-gtk/empathy-contact-widget.c:348
-#, fuzzy
 msgid "Connected from:"
-msgstr "已连接"
+msgstr "连接来源："
 
 #. FIXME: once Idle implements SimplePresence using this information, we can
 #. * and should bin this.
 #.
 #: ../libempathy-gtk/empathy-contact-widget.c:353
-#, fuzzy
 msgid "Away message:"
-msgstr "退出消息："
+msgstr "离开消息："
 
 #: ../libempathy-gtk/empathy-contact-widget.c:606
-#, fuzzy
 msgid "Channels:"
-msgstr "取消(_N)"
+msgstr "频道："
 
 #: ../libempathy-gtk/empathy-contact-widget.c:901
 #: ../libempathy-gtk/empathy-individual-widget.c:495
@@ -2238,21 +2244,20 @@ msgid "Search"
 msgstr "搜索"
 
 #: ../libempathy-gtk/empathy-log-window.c:946
-#, fuzzy, c-format
+#, c-format
 msgid "Chat in %s"
-msgstr "与 %s 通话"
+msgstr "在 %s 聊天"
 
 #: ../libempathy-gtk/empathy-log-window.c:948
-#, fuzzy, c-format
+#, c-format
 msgid "Chat with %s"
-msgstr "与 %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"
+msgstr "%Y年%m月%d日 %A"
 
 #. Translators: this is an emote: '* Danielle waves'
 #: ../libempathy-gtk/empathy-log-window.c:1118
@@ -2263,9 +2268,9 @@ 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:1124
-#, fuzzy, c-format
+#, c-format
 msgid "<b>%s:</b> %s"
-msgstr "<b>话题：</b>"
+msgstr "<b>%s：</b>%s"
 
 #: ../libempathy-gtk/empathy-log-window.c:1195
 #: ../libempathy-gtk/empathy-log-window.c:1197
@@ -2287,34 +2292,32 @@ msgid "Yesterday"
 msgstr "昨天"
 
 #: ../libempathy-gtk/empathy-log-window.c:1556
-#, fuzzy
 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"
+msgstr "%Y年%m月%d日"
 
 #: ../libempathy-gtk/empathy-log-window.c:1637
 #: ../libempathy-gtk/empathy-log-window.c:3203
 msgid "Anytime"
-msgstr ""
+msgstr "随时"
 
 #: ../libempathy-gtk/empathy-log-window.c:1717
 #: ../libempathy-gtk/empathy-log-window.c:2154
-#, fuzzy
 msgid "Anyone"
-msgstr "无"
+msgstr "任何人"
 
 #: ../libempathy-gtk/empathy-log-window.c:2451
 msgid "Who"
-msgstr ""
+msgstr "谁"
 
 #: ../libempathy-gtk/empathy-log-window.c:2655
 msgid "When"
-msgstr ""
+msgstr "何时"
 
 #: ../libempathy-gtk/empathy-log-window.c:2771
 msgid "Anything"
-msgstr ""
+msgstr "任何事"
 
 #: ../libempathy-gtk/empathy-log-window.c:2773
 msgid "Text chats"
@@ -2322,7 +2325,6 @@ msgstr "文本聊天"
 
 #: ../libempathy-gtk/empathy-log-window.c:2775
 #: ../src/empathy-preferences.ui.h:4
-#, fuzzy
 msgid "Calls"
 msgstr "通话"
 
@@ -2331,7 +2333,6 @@ msgid "Incoming calls"
 msgstr "来电"
 
 #: ../libempathy-gtk/empathy-log-window.c:2781
-#, fuzzy
 msgid "Outgoing calls"
 msgstr "呼出的语音通话"
 
@@ -2340,14 +2341,12 @@ msgid "Missed calls"
 msgstr "未接来电"
 
 #: ../libempathy-gtk/empathy-log-window.c:2804
-#, fuzzy
 msgid "What"
-msgstr "聊天"
+msgstr "什么事"
 
 #: ../libempathy-gtk/empathy-log-window.c:3506
-#, fuzzy
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr "确定要屏蔽 %s 以阻止他再次联系您吗？"
+msgstr "确定要删除以前的全部对话日志？"
 
 #: ../libempathy-gtk/empathy-log-window.c:3510
 msgid "Clear All"
@@ -2355,11 +2354,11 @@ msgstr "全部清除"
 
 #: ../libempathy-gtk/empathy-log-window.c:3517
 msgid "Delete from:"
-msgstr ""
+msgstr "从以下位置删除："
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "<span size=\"x-large\">Loading...</span>"
-msgstr ""
+msgstr "<span size=\"x-large\">正在载入...</span>"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
@@ -2376,20 +2375,21 @@ msgstr "聊天"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Delete All History..."
-msgstr ""
+msgstr "清空全部历史..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
 msgid "Profile"
 msgstr "个人信息"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:22
 #: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "视频"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:20
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -2399,7 +2399,7 @@ msgstr "文件(_F)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
-msgstr ""
+msgstr "第 2 页"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
@@ -2436,7 +2436,7 @@ msgid ""
 "Enter your password for account\n"
 "<b>%s</b>"
 msgstr ""
-"输入您的帐户密码\n"
+"输入您的帐号密码\n"
 "<b>%s</b>"
 
 #. COL_STATUS_TEXT
@@ -2483,7 +2483,7 @@ msgstr "自定义消息..."
 #: ../libempathy-gtk/empathy-protocol-chooser.c:584
 #, c-format
 msgid "New %s account"
-msgstr "新建 %s 帐户"
+msgstr "新建 %s 帐号"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find Next"
@@ -2552,14 +2552,13 @@ 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"
-msgstr "删除(_R)"
+msgstr "删除"
 
 #: ../libempathy-gtk/empathy-theme-adium.c:1121
-#, fuzzy, c-format
+#, c-format
 msgid "Message edited at %s"
-msgstr "收到了消息"
+msgstr "消息于 %s 被编辑"
 
 #: ../libempathy-gtk/empathy-theme-adium.c:1943
 msgid "Normal"
@@ -2656,22 +2655,22 @@ msgstr "证书详情"
 msgid "Unable to open URI"
 msgstr "无法打开 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1749
 msgid "Select a file"
 msgstr "选择文件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1821
 msgid "Insufficient free space to save file"
 msgstr "空间不足，无法保存文件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1829
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "保存此文件需要 %s 空闲空间，但目前仅有 %s，请选择其他位置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1873
 #, c-format
 msgid "Incoming file from %s"
 msgstr "从 %s 传来的文件"
@@ -2859,23 +2858,23 @@ msgstr "无错误信息"
 msgid "Instant Message (Empathy)"
 msgstr "即时消息(Empathy)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:354
 msgid "Don't connect on startup"
 msgstr "启动时不自动连接"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:358
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "启动时不显示联系人列表"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:373
 msgid "- Empathy IM Client"
 msgstr " - Empathy 即时通讯客户端"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:560
 msgid "Error contacting the Account Manager"
-msgstr "联系帐户管理器出错"
+msgstr "联系帐号管理器出错"
 
-#: ../src/empathy.c:502
+#: ../src/empathy.c:562
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2883,7 +2882,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"在试图连接到 Telepathy 帐户管理器时出错。错误是：\n"
+"在试图连接到 Telepathy 帐号管理器时出错。错误是：\n"
 "\n"
 "%s"
 
@@ -2947,15 +2946,15 @@ msgstr ""
 
 #: ../src/empathy-account-assistant.c:167
 msgid "There was an error while importing the accounts."
-msgstr "导入帐户时发生错误。"
+msgstr "导入帐号时发生错误。"
 
 #: ../src/empathy-account-assistant.c:170
 msgid "There was an error while parsing the account details."
-msgstr "在解析帐户详情时出现错误。"
+msgstr "在解析帐号详情时出现错误。"
 
 #: ../src/empathy-account-assistant.c:173
 msgid "There was an error while creating the account."
-msgstr "在创建帐户时出现错误。"
+msgstr "在创建帐号时出现错误。"
 
 #: ../src/empathy-account-assistant.c:175
 msgid "There was an error."
@@ -2971,7 +2970,7 @@ msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
-"您可以返回尝试重新输入您的帐户信息，或者退出助理，然后从编辑菜单中加入帐户。"
+"您可以返回尝试重新输入您的帐号信息，或者退出助理，然后从编辑菜单中加入帐户。"
 
 #: ../src/empathy-account-assistant.c:220
 #: ../src/empathy-account-assistant.c:1271
@@ -2980,27 +2979,27 @@ msgstr "发生错误"
 
 #: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
-msgstr "您已经拥有哪个类型的帐户？"
+msgstr "您已经拥有哪个类型的帐号？"
 
 #: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
-msgstr "您还要设置其它聊天帐户吗？"
+msgstr "您还要设置其它聊天帐号吗？"
 
 #: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
-msgstr "输入您的帐户详情"
+msgstr "输入您的帐号详情"
 
 #: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
-msgstr "您想创建那种类型的帐户？"
+msgstr "您想创建那种类型的帐号？"
 
 #: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
-msgstr "您想要创建其它的聊天帐户吗、"
+msgstr "您想要创建其它的聊天帐号吗、"
 
 #: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
-msgstr "输入新帐户的详细资料"
+msgstr "输入新帐号的详细资料"
 
 #: ../src/empathy-account-assistant.c:612
 msgid ""
@@ -3015,19 +3014,19 @@ msgstr ""
 
 #: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
-msgstr "您有没有其它聊天软件的帐户？"
+msgstr "您有没有其它聊天软件的帐号？"
 
 #: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
-msgstr "有，请导入我的帐户信息"
+msgstr "有，请导入我的帐号信息"
 
 #: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
-msgstr "有，我现在就输入我的帐户信息"
+msgstr "有，我现在就输入我的帐号信息"
 
 #: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
-msgstr "不，我想要一个新的帐户"
+msgstr "不，我想要一个新的帐号"
 
 #: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
@@ -3035,7 +3034,7 @@ msgstr "没有，我只是想看看附近现在谁在线上"
 
 #: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
-msgstr "选择您要导入的帐户："
+msgstr "选择您要导入的帐号："
 
 #: ../src/empathy-account-assistant.c:813
 #: ../src/empathy-new-chatroom-dialog.c:555
@@ -3055,13 +3054,13 @@ msgid ""
 "disable this feature by using the 'Accounts' dialog"
 msgstr ""
 "Empathy 可以自动发现和您连接到同一个网络中的人们，并且可以和他们聊天。如果您"
-"想使用这个功能，请仔细查看下列信息是否正确。您之后也可以通过“帐户”对话框轻松"
+"想使用这个功能，请仔细查看下列信息是否正确。您之后也可以通过“帐号”对话框轻松"
 "的修改这些信息或关闭这个功能"
 
 #: ../src/empathy-account-assistant.c:1091
 #: ../src/empathy-account-assistant.c:1147
 msgid "Edit->Accounts"
-msgstr "编辑->帐户"
+msgstr "编辑->帐号"
 
 #: ../src/empathy-account-assistant.c:1107
 msgid "I do _not want to enable this feature for now"
@@ -3075,8 +3074,8 @@ msgid ""
 "the Accounts dialog"
 msgstr ""
 "您无法同连接到您局域网中的用户聊天，因为没有安装 telepathy-salut。如果您想启"
-"用该功能，请安装 telepathy-salut 包，并且在帐户对话框中创建附近的人(People "
-"Nearby)帐户"
+"用该功能，请安装 telepathy-salut 包，并且在帐号对话框中创建附近的人(People "
+"Nearby)帐号"
 
 #: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
@@ -3084,7 +3083,7 @@ msgstr "telepathy-salut 未安装"
 
 #: ../src/empathy-account-assistant.c:1195
 msgid "Messaging and VoIP Accounts Assistant"
-msgstr "消息和 VoIP 帐户助手"
+msgstr "消息和 VoIP 帐号助手"
 
 #: ../src/empathy-account-assistant.c:1229
 msgid "Welcome to Empathy"
@@ -3092,7 +3091,7 @@ msgstr "欢迎使用 Empathy"
 
 #: ../src/empathy-account-assistant.c:1238
 msgid "Import your existing accounts"
-msgstr "导入现有帐户"
+msgstr "导入现有帐号"
 
 #: ../src/empathy-account-assistant.c:1256
 msgid "Please enter personal details"
@@ -3103,16 +3102,17 @@ msgstr "请输入个人信息"
 #: ../src/empathy-accounts-dialog.c:64
 #, c-format
 msgid "There are unsaved modifications to your %s account."
-msgstr "您的 %s 帐户有未保存的修改。"
+msgstr "您的 %s 帐号有未保存的修改。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
 #: ../src/empathy-accounts-dialog.c:68
 msgid "Your new account has not been saved yet."
-msgstr "您的新帐户还没有保存。"
+msgstr "您的新帐号还没有保存。"
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754 ../src/empathy-call-window.c:649
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1098
 msgid "Connecting…"
 msgstr "正在连接..."
 
@@ -3136,13 +3136,13 @@ msgstr "未知状态"
 
 #: ../src/empathy-accounts-dialog.c:428
 msgid "Offline — Account Disabled"
-msgstr "离线 - 帐户被禁用"
+msgstr "离线 - 帐号被禁用"
 
 #: ../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 "您将要创建一个新帐户，所做的修改将作废。您确定要继续吗？"
+msgstr "您将要创建一个新帐号，所做的修改将作废。您确定要继续吗？"
 
 #: ../src/empathy-accounts-dialog.c:1192
 #, c-format
@@ -3151,13 +3151,13 @@ msgstr "您要从电脑中移除 %s 吗？"
 
 #: ../src/empathy-accounts-dialog.c:1196
 msgid "This will not remove your account on the server."
-msgstr "这不会删除服务器上的帐户。"
+msgstr "这不会删除服务器上的帐号。"
 
 #: ../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 "您将要选择另一个帐户，所做的修改将作废。您确定要继续吗？"
+msgstr "您将要选择另一个帐号，所做的修改将作废。您确定要继续吗？"
 
 #. Menu items: to enabled/disable the account
 #: ../src/empathy-accounts-dialog.c:1643
@@ -3175,9 +3175,8 @@ msgid ""
 msgstr "您将要关闭此窗口，所做的修改将作废。您确定要继续吗？"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#, fuzzy
 msgid "Add…"
-msgstr "添加(_A)..."
+msgstr "添加..."
 
 #: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
@@ -3195,7 +3194,7 @@ msgstr "协议："
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
-msgstr "要添加一个新帐户，您首先需要为您想要使用的每个协议安装后端。"
+msgstr "要添加一个新帐号，您首先需要为您想要使用的每个协议安装后端。"
 
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
@@ -3213,11 +3212,11 @@ msgstr "Empathy 认证客户端"
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:124
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy 语音/视频客户端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:145
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 语音/视频客户端"
 
@@ -3260,33 +3259,33 @@ 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:1220
-#: ../src/empathy-call-window.c:998
+#: ../src/empathy-call-window.c:1599
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通话"
 
 #: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1242
+#: ../src/empathy-call-window.c:1843
 msgid "The IP address as seen by the machine"
 msgstr "机器所见的 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1244
+#: ../src/empathy-call-window.c:1845
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet 上服务器所见的 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1246
+#: ../src/empathy-call-window.c:1847
 msgid "The IP address of the peer as seen by the other side"
 msgstr "另一方所见的 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1248
+#: ../src/empathy-call-window.c:1849
 msgid "The IP address of a relay server"
 msgstr "中转服务器 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1250
+#: ../src/empathy-call-window.c:1851
 msgid "The IP address of the multicast group"
 msgstr "多播组的 IP 地址"
 
@@ -3317,12 +3316,12 @@ msgid "Connected — %d:%02dm"
 msgstr "已连接 — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:1967
+#: ../src/empathy-call-window.c:2583
 msgid "Technical Details"
 msgstr "技术细节"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2005
+#: ../src/empathy-call-window.c:2621
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3330,7 +3329,7 @@ msgid ""
 msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
 
 #: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2010
+#: ../src/empathy-call-window.c:2626
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3338,7 +3337,7 @@ msgid ""
 msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
 
 #: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2016
+#: ../src/empathy-call-window.c:2632
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3346,24 +3345,24 @@ msgid ""
 msgstr "不能与 %s 建立连接。可能是两台计算机之一不允许直接连接。"
 
 #: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2022
+#: ../src/empathy-call-window.c:2638
 msgid "There was a failure on the network"
 msgstr "网络出现一个错误"
 
 #: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-call-window.c:2642
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
 
 #: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2029
+#: ../src/empathy-call-window.c:2645
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
 
 #: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2041
+#: ../src/empathy-call-window.c:2657
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3374,22 +3373,22 @@ msgstr ""
 "单里“调试”窗口收集到的日志。"
 
 #: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2050
+#: ../src/empathy-call-window.c:2666
 msgid "There was a failure in the call engine"
 msgstr "呼叫引擎里出现了一个故障"
 
 #: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2053
+#: ../src/empathy-call-window.c:2669
 msgid "The end of the stream was reached"
 msgstr "已到达流的末尾"
 
 #: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2093
+#: ../src/empathy-call-window.c:2709
 msgid "Can't establish audio stream"
 msgstr "不能建立音频流"
 
 #: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2103
+#: ../src/empathy-call-window.c:2719
 msgid "Can't establish video stream"
 msgstr "不能建立视频流"
 
@@ -3404,9 +3403,8 @@ msgid "Decoding Codec:"
 msgstr "解码器："
 
 #: ../src/empathy-call-window.ui.h:4
-#, fuzzy
 msgid "Disable camera"
-msgstr "禁用(_D)"
+msgstr "禁用相机"
 
 #: ../src/empathy-call-window.ui.h:5
 msgid "Display the dialpad"
@@ -3434,11 +3432,11 @@ msgstr "本地候选："
 
 #: ../src/empathy-call-window.ui.h:10
 msgid "Maximise me"
-msgstr ""
+msgstr "最大化我"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
-msgstr ""
+msgstr "最小化我"
 
 #: ../src/empathy-call-window.ui.h:12
 #: ../src/empathy-streamed-media-window.ui.h:15
@@ -3451,14 +3449,12 @@ msgid "Send Audio"
 msgstr "发送音频"
 
 #: ../src/empathy-call-window.ui.h:14
-#, fuzzy
 msgid "Send Video"
-msgstr "发送视频(_V)"
+msgstr "发送视频"
 
 #: ../src/empathy-call-window.ui.h:15
-#, fuzzy
 msgid "Show dialpad"
-msgstr "电话键盘"
+msgstr "显示拨号盘"
 
 #: ../src/empathy-call-window.ui.h:16
 msgid "Start a video call"
@@ -3469,33 +3465,61 @@ msgid "Start an audio call"
 msgstr "开始音频通话"
 
 #: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "交换相机"
+
+#: ../src/empathy-call-window.ui.h:19
 #: ../src/empathy-streamed-media-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "切换音频传输"
 
-#: ../src/empathy-call-window.ui.h:19
-#, fuzzy
+#: ../src/empathy-call-window.ui.h:20
 msgid "Toggle video transmission"
-msgstr "切换音频传输"
+msgstr "切换视频传输"
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:1612 ../src/empathy-call-window.c:1613
-#: ../src/empathy-call-window.c:1614 ../src/empathy-call-window.c:1615
+#: ../src/empathy-call-window.c:2219 ../src/empathy-call-window.c:2220
+#: ../src/empathy-call-window.c:2221 ../src/empathy-call-window.c:2222
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/empathy-call-window.ui.h:22
-#, fuzzy
+#: ../src/empathy-call-window.ui.h:23
 msgid "Video call"
-msgstr "视频呼叫(_V)"
+msgstr "视频呼叫"
 
-#: ../src/empathy-call-window.ui.h:23
+#: ../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:24 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:25
+msgid "_Camera"
+msgstr "相机(_C)"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Contents"
+msgstr "内容(_C)"
+
+#: ../src/empathy-call-window.ui.h:27 ../src/empathy-main-window.ui.h:19
+msgid "_Debug"
+msgstr "调试(_D)"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window.ui.h:22
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "话筒(_M)"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "_Settings"
+msgstr "设置(_S)"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-main-window.ui.h:30
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "查看(_V)"
@@ -3566,10 +3590,6 @@ msgstr "右移标签(_R)"
 msgid "Notify for All Messages"
 msgstr "提示所有消息"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "内容(_C)"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "对话(_C)"
@@ -3582,10 +3602,6 @@ msgstr "漂移标签(_D)"
 msgid "_Favorite Chat Room"
 msgstr "收藏聊天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "帮助(_H)"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "下一标签(_N)"
@@ -3656,7 +3672,7 @@ msgstr "接听(_A)"
 
 #: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
-msgstr ""
+msgstr "使用视频接听(_A)"
 
 #: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
 #, c-format
@@ -3830,11 +3846,11 @@ msgstr "从列表移除已完成、已取消及已失败的文件传输"
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
-msgstr "未找到可导入的帐户。Empathy 目前只能支持从 Pidgin 导入帐户。"
+msgstr "未找到可导入的帐号。Empathy 目前只能支持从 Pidgin 导入帐户。"
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
-msgstr "导入帐户"
+msgstr "导入帐号"
 
 #. Translators: this is the header of a treeview column
 #: ../src/empathy-import-widget.c:301
@@ -3867,7 +3883,7 @@ msgstr "重新连接"
 
 #: ../src/empathy-main-window.c:783
 msgid "Edit Account"
-msgstr "编辑帐户"
+msgstr "编辑帐号"
 
 #: ../src/empathy-main-window.c:789
 msgid "Close"
@@ -3893,13 +3909,13 @@ msgstr "充值..."
 msgid "Contact"
 msgstr "联系人"
 
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2145
 msgid "Contact List"
 msgstr "联系人列表"
 
-#: ../src/empathy-main-window.c:2287
+#: ../src/empathy-main-window.c:2263
 msgid "Show and edit accounts"
-msgstr "显示和编辑帐户"
+msgstr "显示和编辑帐号"
 
 #: ../src/empathy-main-window.ui.h:1
 msgid "Contacts on a _Map"
@@ -3951,7 +3967,7 @@ msgstr "按状态排序(_S)"
 
 #: ../src/empathy-main-window.ui.h:13
 msgid "_Accounts"
-msgstr "帐户(_A)"
+msgstr "帐号(_A)"
 
 #: ../src/empathy-main-window.ui.h:15
 msgid "_Blocked Contacts"
@@ -3961,10 +3977,6 @@ msgstr "已屏蔽的联系人(_B)"
 msgid "_Compact Size"
 msgstr "紧凑视图(_C)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "调试(_D)"
-
 #: ../src/empathy-main-window.ui.h:21
 msgid "_File Transfers"
 msgstr "文件传输(_F)"
@@ -4042,7 +4054,7 @@ msgstr "输入聊天室名以加入或在列表中点击一个或多个聊天室
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
-msgstr "输入聊天室所在的服务器，或为空表示聊天室在当前帐户的服务器上。"
+msgstr "输入聊天室所在的服务器，或为空表示聊天室在当前帐号的服务器上。"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -4056,79 +4068,79 @@ msgstr "聊天室列表"
 msgid "_Room:"
 msgstr "聊天室(_R)："
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:172
 msgid "Message received"
 msgstr "收到了消息"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:173
 msgid "Message sent"
 msgstr "发出了消息"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:174
 msgid "New conversation"
 msgstr "新对话"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:175
 msgid "Contact goes online"
 msgstr "离线人上线"
 
-#: ../src/empathy-preferences.c:164
+#: ../src/empathy-preferences.c:176
 msgid "Contact goes offline"
 msgstr "联系人离线"
 
-#: ../src/empathy-preferences.c:165
+#: ../src/empathy-preferences.c:177
 msgid "Account connected"
-msgstr "帐户已连接"
+msgstr "帐号已连接"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-preferences.c:178
 msgid "Account disconnected"
-msgstr "帐户已断开"
+msgstr "帐号已断开"
 
-#: ../src/empathy-preferences.c:469
+#: ../src/empathy-preferences.c:487
 msgid "Language"
 msgstr "语言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:719
+#: ../src/empathy-preferences.c:737
 msgid "Juliet"
 msgstr "朱立叶"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:744
 msgid "Romeo"
 msgstr "罗密欧"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:750
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:735
+#: ../src/empathy-preferences.c:753
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:756
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:759
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:762
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:765
 msgid "Juliet has disconnected"
 msgstr "朱立叶已断开连接"
 
-#: ../src/empathy-preferences.c:1153
+#: ../src/empathy-preferences.c:1171
 msgid "Preferences"
 msgstr "首选项"
 
@@ -4178,7 +4190,7 @@ msgstr "常规"
 
 #: ../src/empathy-preferences.ui.h:14
 msgid "Input level"
-msgstr ""
+msgstr "输入级别"
 
 #: ../src/empathy-preferences.ui.h:15
 msgid "Input volume"
@@ -4240,9 +4252,8 @@ msgid "Themes"
 msgstr "主题"
 
 #: ../src/empathy-preferences.ui.h:29
-#, fuzzy
 msgid "Variant:"
-msgstr "主题变量："
+msgstr "版本："
 
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Automatically connect on startup"
@@ -4341,78 +4352,78 @@ msgstr "视频预览"
 msgid "Contact Map View"
 msgstr "联系地图视图"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "保存"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "级别 "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "调试"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "信息"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "消息"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "危急"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "错误"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "时间"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "域"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "类别"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "级别"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "已选定的连接管理不支持远程调试扩展"
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:231
 msgid "Invite Participant"
 msgstr "邀请参与者"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:206
 msgid "Choose a contact to invite into the conversation:"
 msgstr "选择一个联系人以加入该会话："
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:227
 msgid "Invite"
 msgstr "邀请"
 
@@ -4423,26 +4434,34 @@ msgstr "不显示任何对话框；完成所有工作（如导入）然后退出
 #: ../src/empathy-accounts.c:187
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "只有“附近的人”帐户的时候不显示任何对话框"
+msgstr "只有“附近的人”帐号的时候不显示任何对话框"
 
-# lainme：初次选择给定的帐户(比如 gabble/jabber/foo_40example_2eorg0)
+# lainme：初次选择给定的帐号(比如 gabble/jabber/foo_40example_2eorg0)
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "首先选择给定帐户(如 gabble/jabber/foo_40example_2eorg0)"
+msgstr "首先选择给定帐号(如 gabble/jabber/foo_40example_2eorg0)"
 
 #: ../src/empathy-accounts.c:193
 msgid "<account-id>"
-msgstr "<帐户 ID>"
+msgstr "<帐号 ID>"
 
 #: ../src/empathy-accounts.c:198
 msgid "- Empathy Accounts"
-msgstr "- Empathy 帐户"
+msgstr "- Empathy 帐号"
 
 #: ../src/empathy-accounts.c:237
 msgid "Empathy Accounts"
-msgstr "Empathy 帐户"
+msgstr "Empathy 帐号"
+
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "显示特定的服务"
+
+#: ../src/empathy-debugger.c:75
+msgid "- Empathy Debugger"
+msgstr "- Empathy 调试器"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "Empathy 调试器"
 
@@ -4488,29 +4507,36 @@ msgstr "%s 刚刚尝试呼叫您，但您当时正在与其他人通话。"
 
 #. 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
+#: ../src/empathy-call-window.c:986 ../src/empathy-call-window.c:1000
 msgid "i"
-msgstr ""
+msgstr "i"
 
-#: ../src/empathy-call-window.c:1005
-#, fuzzy, c-format
-msgid "Call with %d participants"
-msgstr "与 %s 通话"
+#: ../src/empathy-call-window.c:2512
+msgid "On hold"
+msgstr "挂起"
+
+#: ../src/empathy-call-window.c:2515
+msgid "Mute"
+msgstr "静音"
+
+#: ../src/empathy-call-window.c:2517
+msgid "Duration"
+msgstr "时长"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:1904
-#, fuzzy, c-format
+#: ../src/empathy-call-window.c:2520
+#, c-format
 msgid "%s — %d:%02dm"
-msgstr "已连接 — %d:%02dm"
-
-#: ../src/empathy-call-window.c:1905
-msgid "On hold"
-msgstr ""
+msgstr "%s — %d:%02dm"
 
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "区分大小写(_M)"
 
+#, fuzzy
+#~ msgid "Call with %d participants"
+#~ msgstr "与 %s 通话"
+
 #~| msgid "Dialpad"
 #~ msgid "_Dialpad"
 #~ msgstr "电话键盘"
@@ -4564,11 +4590,11 @@ msgstr "区分大小写(_M)"
 #~ msgstr "上下文"
 
 #~ msgid "Empathy has asked about importing accounts"
-#~ msgstr "Empathy 已经询问导入帐户"
+#~ msgstr "Empathy 已经询问导入帐号"
 
 #~ msgid ""
 #~ "Whether Empathy has asked about importing accounts from other programs."
-#~ msgstr "Empathy 是否应该已经询问过要从其它程序中导入帐户。"
+#~ msgstr "Empathy 是否应该已经询问过要从其它程序中导入帐号。"
 
 #~ msgid "Use _Yahoo! Japan"
 #~ msgstr "使用 _Yahoo 日本"
@@ -4589,10 +4615,10 @@ msgstr "区分大小写(_M)"
 #~ msgstr "发送接收即时消息"
 
 #~ msgid "MC 4 accounts have been imported"
-#~ msgstr "MC 4 帐户已经被导入"
+#~ msgstr "MC 4 帐号已经被导入"
 
 #~ msgid "MC 4 accounts have been imported."
-#~ msgstr "MC 4 帐户已经被导入。"
+#~ msgstr "MC 4 帐号已经被导入。"
 
 #~ msgid "Port of the proxy for outbound requests."
 #~ msgstr "出站代理端口"
@@ -4607,12 +4633,12 @@ msgstr "区分大小写(_M)"
 #~ msgstr "选择目的地"
 
 #~ msgid "%s account"
-#~ msgstr "%s 帐户"
+#~ msgstr "%s 帐号"
 
 #~ msgid ""
 #~ "Whether or not the Salut account has been created on the first Empathy "
 #~ "run."
-#~ msgstr "是否在 Empathy 第一次运行时创建 Salut 帐户。"
+#~ msgstr "是否在 Empathy 第一次运行时创建 Salut 帐号。"
 
 #~ msgid "Hidden"
 #~ msgstr "隐身"
@@ -4633,7 +4659,7 @@ msgstr "区分大小写(_M)"
 #~ msgstr "自定义状态..."
 
 #~ msgid "Show the accounts dialog"
-#~ msgstr "显示帐户对话框"
+#~ msgstr "显示帐号对话框"
 
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "错误信息是：<span style=\"italic\">%s</span>"
@@ -4654,7 +4680,7 @@ msgstr "区分大小写(_M)"
 #~ msgstr "导入(_I)..."
 
 #~ msgid "_Reuse an existing account"
-#~ msgstr "启用现有帐户(_R)"
+#~ msgstr "启用现有帐号(_R)"
 
 #~ msgid "%s is offering you an invitation"
 #~ msgstr "%s 正发送邀请给您"
@@ -4701,9 +4727,6 @@ msgstr "区分大小写(_M)"
 #~ msgid "The contact's avatar token. Empty means contact has no avatar."
 #~ msgstr "联系人的头像标志。空表示联系人无头像。"
 
-#~ msgid "Megaphone"
-#~ msgstr "话筒"
-
 #~ msgid "Talk!"
 #~ msgstr "说吧！"
 
@@ -4729,7 +4752,7 @@ msgstr "区分大小写(_M)"
 #~ "You are about to remove your %s account!\n"
 #~ "Are you sure you want to proceed?"
 #~ msgstr ""
-#~ "您将要删除您的 %s 帐户！\n"
+#~ "您将要删除您的 %s 帐号！\n"
 #~ "您确定要继续吗？"
 
 #~ msgid ""
@@ -4741,7 +4764,7 @@ msgstr "区分大小写(_M)"
 #~ msgstr ""
 #~ "如果您决定继续，任何相关的对话和聊天室都 不会 被删除。\n"
 #~ "\n"
-#~ "如果将来您重新添加此帐户，它们将仍然存在。"
+#~ "如果将来您重新添加此帐号，它们将仍然存在。"
 
 #~ msgid "Conversations (%d)"
 #~ msgstr "对话 (%d)"
@@ -4765,16 +4788,13 @@ msgstr "区分大小写(_M)"
 #~ msgstr "gtk-remove"
 
 #~ msgid "Add Account"
-#~ msgstr "添加帐户"
+#~ msgstr "添加帐号"
 
 #~ msgid "Gmail"
 #~ msgstr "Gmail"
 
 #~ msgid "Import Accounts..."
-#~ msgstr "导入帐户..."
-
-#~ msgid "Settings"
-#~ msgstr "设置"
+#~ msgstr "导入帐号..."
 
 #~ msgid "Type:"
 #~ msgstr "类型："
@@ -4850,7 +4870,7 @@ msgstr "区分大小写(_M)"
 #~ msgstr "单词的拼写建议："
 
 #~ msgid "<b>New Account</b>"
-#~ msgstr "<b>新建帐户</b>"
+#~ msgstr "<b>新建帐号</b>"
 
 #~ msgid "<b>No protocol installed</b>"
 #~ msgstr "<b>未安装协议</b>"