aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorYangtse Su <yangtsesu@gmail.com>2011-11-25 21:45:35 +0800
committerAron Xu <aronxu@gnome.org>2011-11-25 21:47:17 +0800
commit3aa77dd47ea6de9f281cbb401816532f83ad5764 (patch)
treeeb125d6b55bbe0e4fb5e95a431ddd94fe77b3b62 /po
parent2be6f5eedc02aec60e2afd747313728c2ccdacd7 (diff)
downloadgsoc2013-empathy-3aa77dd47ea6de9f281cbb401816532f83ad5764.tar
gsoc2013-empathy-3aa77dd47ea6de9f281cbb401816532f83ad5764.tar.gz
gsoc2013-empathy-3aa77dd47ea6de9f281cbb401816532f83ad5764.tar.bz2
gsoc2013-empathy-3aa77dd47ea6de9f281cbb401816532f83ad5764.tar.lz
gsoc2013-empathy-3aa77dd47ea6de9f281cbb401816532f83ad5764.tar.xz
gsoc2013-empathy-3aa77dd47ea6de9f281cbb401816532f83ad5764.tar.zst
gsoc2013-empathy-3aa77dd47ea6de9f281cbb401816532f83ad5764.zip
Update Simplified Chinese translation.
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN.po1595
1 files changed, 868 insertions, 727 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7ce025242..1f83f27e6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -23,9 +23,9 @@ msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-26 10:41+0000\n"
-"PO-Revision-Date: 2011-09-27 16:14+0000\n"
-"Last-Translator: Julius Wong <villahwong@gmail.com>\n"
+"POT-Creation-Date: 2011-11-24 11:51+0000\n"
+"PO-Revision-Date: 2011-11-25 21:46+0800\n"
+"Last-Translator: Yangtse Su <yangtsesu@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"
@@ -54,425 +54,417 @@ msgid "Always open a separate chat window for new chats."
msgstr "总是为新聊天打开单独的聊天窗口。"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "来电音量"
-
-#: ../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 "Camera device"
msgstr "相机设备"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
msgid "Camera position"
msgstr "相机位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../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:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
msgid "Chat window theme"
msgstr "聊天窗口主题"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid "Chat window theme variant"
msgstr "聊天窗口主题衍生"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../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:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Compact contact list"
msgstr "紧凑显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid "Connection managers should be used"
msgstr "应该使用连接管理器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Contact list sort criterion"
msgstr "联系人列表排序条件"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+
+#: ../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:14
+#: ../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:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Disable popup notifications when away"
msgstr "离开时禁用弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Disable sounds when away"
msgstr "离开时禁用声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../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:18
+#: ../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:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid "Echo cancellation support"
msgstr "回声抑制支持"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../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:21
+#: ../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:22
+#: ../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:23
+#: ../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:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy default download folder"
msgstr "Empathy 默认下载文件夹"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy 已经迁移至 telepathy-butterfly 日志"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy should auto-away when idle"
msgstr "Empathy 空闲时是否自动离开"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy should auto-connect on startup"
msgstr "Empathy 启动时是否自动连接"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Empathy should reduce the location's accuracy"
msgstr "降低 Emapthy 位置信息的准确度"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Enable WebKit Developer Tools"
msgstr "启用 WebKit 开发工具"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Enable popup notifications for new messages"
msgstr "启用新消息弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Enable spell checker"
msgstr "启用拼写检查器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Hide main window"
msgstr "隐藏主窗口"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Hide the main window."
msgstr "隐藏主窗口。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Last account selected in Join Room dialog"
+msgstr "在加入聊天室对话框中最后选择的帐号"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Nick completed character"
msgstr "昵称补全字符"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../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:37
+#: ../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:38
+#: ../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:39
+#: ../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:40
+#: ../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:41
+#: ../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:42
+#: ../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:43
+#: ../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:44
+#: ../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:45
+#: ../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:46
+#: ../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:47
+#: ../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:48
+#: ../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:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Position the camera preview should be during a call."
msgstr "在通话时摄像头预览的位置。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
msgid "Show Balance in contact list"
msgstr "在联系人列表中显示余额"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show avatars"
msgstr "显示头像"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Show contact list in rooms"
msgstr "在聊天室显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "Show hint about closing the main window"
msgstr "关闭主窗口时显示提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Show offline contacts"
msgstr "显示离线联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Show protocols"
msgstr "显示协议"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Spell checking languages"
msgstr "拼写检查器语言"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "The default folder to save file transfers in."
msgstr "保存传送文件的默认文件夹。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "The last directory that an avatar image was chosen from."
msgstr "上次选取头像图片的目录。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "The position for the chat window side pane"
msgstr "聊天窗口边栏的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "聊天窗口边栏保存的位置(像素)。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用于在聊天窗口中显示会话的主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr "用于在聊天窗口中显示会话的主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid "Use graphical smileys"
msgstr "使用表情图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Use notification sounds"
msgstr "使用通知声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Use theme for chat rooms"
msgstr "为聊天室使用主题"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "是否允许 Empathy 将用户的位置共享给联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "是否允许 Empathy 通过 GPS 估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "是否允许 Empathy 通过手机网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy can use the network to guess the location."
msgstr "是否允许 Empathy 通过网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否在启动时自动登入您的帐号。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../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:73
+#: ../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:74
+#: ../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:75
+#: ../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:76
+#: ../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:77
+#: ../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:78
+#: ../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:79
+#: ../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:80
+#: ../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:81
+#: ../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:82
+#: ../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:83
+#: ../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:84
+#: ../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:85
+#: ../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:86
+#: ../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:87
+#: ../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:88
+#: ../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:89
+#: ../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:90
+#: ../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:91
+#: ../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:92
+#: ../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:93
+#: ../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:94
+#: ../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:95
+#: ../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:96
+#: ../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:97
+#: ../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:98
+#: ../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:99
+#: ../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:100
+#: ../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:101
+#: ../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:102
+#: ../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 "
@@ -487,23 +479,23 @@ msgstr "管理消息和 VoIP 帐号"
#. Tweak the dialog
#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
+#: ../src/empathy-accounts-dialog.c:2312
msgid "Messaging and VoIP Accounts"
msgstr "消息和 VoIP 帐号"
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:838
msgid "File transfer completed, but the file was corrupted"
msgstr "文件传输完成,但该文件已损坏"
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1124
msgid "File transfer not supported by remote contact"
msgstr "文件传输不支持远程连接"
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1180
msgid "The selected file is not a regular file"
msgstr "所选文件是非正常的文件"
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1189
msgid "The selected file is empty"
msgstr "所选文件是空的"
@@ -523,35 +515,35 @@ msgstr "与 %s 通话"
msgid "Call from %s"
msgstr "来电:%s"
-#: ../libempathy/empathy-tp-file.c:268
+#: ../libempathy/empathy-tp-file.c:258
msgid "Socket type not supported"
msgstr "不支持 Socket 类型"
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-tp-file.c:377
msgid "No reason was specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-tp-file.c:380
msgid "The change in state was requested"
msgstr "需要状态改变信息"
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-tp-file.c:383
msgid "You canceled the file transfer"
msgstr "您取消了文件传输"
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-tp-file.c:386
msgid "The other participant canceled the file transfer"
msgstr "另外的参与者取消了文件的传输"
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:389
msgid "Error while trying to transfer the file"
msgstr "当传输这个文件的时候发生错误"
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:392
msgid "The other participant is unable to transfer the file"
msgstr "另外的参与者无法传输这个文件"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
msgid "Unknown reason"
msgstr "未知原因"
@@ -591,6 +583,7 @@ msgstr "状态已设置为离线"
#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
msgid "Network error"
msgstr "网络错误"
@@ -692,20 +685,23 @@ msgid ""
"chain, exceed the limits imposed by the cryptography library"
msgstr "服务器证书的长度——或服务器证书链的深度——超出了加密库的硬性限制"
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:372
+msgid "Your software is too old"
+msgstr "你的软件版本太旧了"
+
+#: ../libempathy/empathy-utils.c:531
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:536
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:565
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:566
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -749,7 +745,7 @@ msgstr[0] "%d 月前"
msgid "in the future"
msgstr "将来"
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:688
msgid "All accounts"
msgstr "全部帐号"
@@ -772,58 +768,58 @@ msgstr "服务器"
msgid "Port"
msgstr "端口"
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:776
+#: ../libempathy-gtk/empathy-account-widget.c:828
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1182
msgid "My Web Accounts"
msgstr "我的网络帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:1208
+#: ../libempathy-gtk/empathy-account-widget.c:1199
#, c-format
msgid "The account %s is edited via %s."
msgstr "%s 帐号通过 %s 进行了编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1214
+#: ../libempathy-gtk/empathy-account-widget.c:1205
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s 帐号无法在 Empathy 中编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1233
+#: ../libempathy-gtk/empathy-account-widget.c:1224
msgid "Launch My Web Accounts"
msgstr "启动我的网络帐号"
#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
+#: ../libempathy-gtk/empathy-account-widget.c:1232
#, c-format
msgid "Edit %s"
msgstr "编辑 %s"
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1582
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "用户名:"
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1900
msgid "A_pply"
msgstr "应用(_P)"
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1930
msgid "L_og in"
msgstr "登录(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:2004
msgid "This account already exists on the server"
msgstr "服务器上已存在该帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:2007
msgid "Create a new account on the server"
msgstr "在服务器上创建新的帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:2208
+#: ../libempathy-gtk/empathy-account-widget.c:2201
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -832,19 +828,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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2479
#, 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:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2505
#, c-format
msgid "%s Account"
msgstr "%s 帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2509
msgid "New account"
msgstr "新建帐号"
@@ -892,7 +888,7 @@ msgstr "记住密码"
#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
msgid "Remember password"
msgstr "记住密码"
@@ -1215,7 +1211,7 @@ msgid "STUN Server:"
msgstr "STUN 服务器:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
msgid "Server:"
msgstr "服务器:"
@@ -1225,7 +1221,7 @@ msgstr "传输:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
msgid "Use this account to call _landlines and mobile phones"
-msgstr "用此账户拨打固定电话和手机(_L)"
+msgstr "用此帐户拨打固定电话和手机(_L)"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP account password?"
@@ -1297,7 +1293,7 @@ msgid "Click to enlarge"
msgstr "单击以放大"
#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:62
msgid "There was an error starting the call"
msgstr "发起呼叫时出错"
@@ -1317,62 +1313,66 @@ msgstr "选择的联系人无效"
msgid "Emergency calls are not supported on this protocol"
msgstr "不支持在此会话上进行紧急呼叫"
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "您信用卡余额不足以支付此次通话"
+
+#: ../libempathy-gtk/empathy-chat.c:706
msgid "Failed to open private chat"
msgstr "建立私人对话失败"
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:764
msgid "Topic not supported on this conversation"
msgstr "不支持在此会话上设置主题"
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:770
msgid "You are not allowed to change the topic"
msgstr "您不能更改主题"
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:971
#, c-format
msgid "“%s” is not a valid contact ID"
msgstr "%s 是无效的联系人 ID"
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1066
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear:清空当前会话的所有消息"
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1069
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主题>:设定当前对话的主题"
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1072
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1075
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1079
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/用户[<聊天室ID>] [<原因>]:当前默认离开聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1083
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <昵称> [<消息>]:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1086
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <昵称> <消息>:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1089
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <昵称>:在当前服务器上改变您的昵称"
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1092
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <动作消息>:向当前对话中发送一个动作消息"
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1095
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 "
@@ -1381,124 +1381,131 @@ msgstr ""
"/say <消息>:发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如:“/"
"say /join 是用来加入一个新的聊天室”"
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1100
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <联系人 ID>:显示一个联系人的信息"
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1103
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
"/help [<命令>]:显示所有支持的命令。如果 <命令> 是有定义的,则显示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1122
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1167
msgid "Unknown command"
msgstr "未知命令"
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1293
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:1455
+#: ../libempathy-gtk/empathy-chat.c:1457
msgid "insufficient balance to send message"
msgstr "余额不足,无法发送消息"
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
+#: ../libempathy-gtk/empathy-chat.c:1538
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "发送消息“%s”出错:%s"
+
+#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1542
+#, c-format
+msgid "Error sending message: %s"
+msgstr "发送消息出错:%s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1469
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "余额不足,无法发送消息。 <a href='%s'>充值</a>。"
+
+#: ../libempathy-gtk/empathy-chat.c:1509
msgid "not capable"
msgstr "做不到"
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1516
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1519
msgid "invalid contact"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1522
msgid "permission denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1525
msgid "too long message"
msgstr "消息太长"
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1528
msgid "not implemented"
msgstr "尚未实现"
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1532
msgid "unknown"
msgstr "未知"
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "发送消息“%s”出错:%s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "发送消息出错:%s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
msgid "Topic:"
msgstr "话题:"
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1611
#, c-format
msgid "Topic set to: %s"
msgstr "话题被设置为:%s"
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1613
msgid "No topic defined"
msgstr "未设置话题"
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2126
msgid "(No Suggestions)"
msgstr "(没有建议)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2194
#, 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:2179
+#: ../libempathy-gtk/empathy-chat.c:2231
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "添加“%s”到 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2301
msgid "Insert Smiley"
msgstr "插入表情"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
msgid "_Send"
msgstr "发送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2376
msgid "_Spelling Suggestions"
msgstr "拼写建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2465
msgid "Failed to retrieve recent logs"
msgstr "获取最近日志失败"
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2602
#, c-format
msgid "%s has disconnected"
msgstr "%s 已断开连接"
@@ -1506,12 +1513,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:2554
+#: ../libempathy-gtk/empathy-chat.c:2609
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出"
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2612
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1519,17 +1526,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:2565
+#: ../libempathy-gtk/empathy-chat.c:2620
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%s 已被 %s 禁止"
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2623
#, c-format
msgid "%s was banned"
msgstr "%s 被禁止"
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2627
#, c-format
msgid "%s has left the room"
msgstr "%s 离开了聊天室"
@@ -1539,17 +1546,17 @@ msgstr "%s 离开了聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2636
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2661
#, c-format
msgid "%s has joined the room"
msgstr "%s 加入了聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2686
#, c-format
msgid "%s is now known as %s"
msgstr "%s 现在叫做 %s"
@@ -1557,88 +1564,88 @@ msgstr "%s 现在叫做 %s"
#. We don't know if the incoming call has been accepted or not, so we
#. * assume it hasn't and if it has, we'll set the proper status when
#. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2847
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
msgid "Disconnected"
msgstr "已断开连接"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3493
msgid "Would you like to store this password?"
msgstr "是否保存密码?"
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3499
msgid "Remember"
msgstr "记录"
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3509
msgid "Not now"
msgstr "不是现在"
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
msgid "Retry"
msgstr "重试"
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3557
msgid "Wrong password; please try again:"
msgstr "密码错误,请重试:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3687
msgid "This room is protected by a password:"
msgstr "这个房间是由一个密码保护的:"
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3714
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:3902 ../src/empathy-event-manager.c:1281
msgid "Connected"
msgstr "已连接"
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:3957
msgid "Conversation"
msgstr "对话"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:3962
#, c-format
msgid "%s (SMS)"
msgstr "%s (短信)"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
msgid "Unknown or invalid identifier"
msgstr "未知或无效的识别符"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
msgid "Contact blocking temporarily unavailable"
msgstr "联系人屏蔽暂时不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
msgid "Contact blocking unavailable"
msgstr "联系人屏蔽不可用"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
msgid "Permission Denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
msgid "Could not block contact"
msgstr "无法屏蔽联系人"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
msgid "Edit Blocked Contacts"
msgstr "编辑屏蔽的联系人"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1475
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
msgid "Account:"
@@ -1656,56 +1663,56 @@ msgid "Remove"
msgstr "删除"
#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
#: ../libempathy-gtk/empathy-webkit-utils.c:277
msgid "_Copy Link Address"
msgstr "复制链接地址(_C)"
#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Open Link"
msgstr "打开链接(_O)"
#. Translators: timestamp displayed between conversations in
#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
msgid "Edit Contact Information"
msgstr "编辑联系人信息"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
+#: ../libempathy-gtk/empathy-contact-dialogs.c:338
msgid "Personal Information"
msgstr "个人信息"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
+#: ../libempathy-gtk/empathy-contact-dialogs.c:439
#: ../libempathy-gtk/empathy-individual-dialogs.c:119
msgid "New Contact"
msgstr "新建联系人"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:508
+#: ../libempathy-gtk/empathy-individual-dialogs.c:198
#, c-format
msgid "Block %s?"
msgstr "屏蔽 %s?"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../libempathy-gtk/empathy-contact-dialogs.c:513
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "确定要屏蔽 %s 以阻止他再次联系您吗?"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:518
+#: ../libempathy-gtk/empathy-individual-dialogs.c:275
msgid "_Block"
msgstr "屏蔽(_B)"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../libempathy-gtk/empathy-contact-dialogs.c:536
+#: ../libempathy-gtk/empathy-individual-dialogs.c:284
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "举报联系人滥用"
@@ -1722,349 +1729,331 @@ msgstr "订阅请求"
msgid "_Block User"
msgstr "屏蔽用户(_B)"
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "未分组"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "收藏夹"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "您真的要删除群组“%s”吗?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "删除群组"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "删除(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "您真的想要删除联系人“%s”吗?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "删除联系人"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
+#: ../libempathy-gtk/empathy-contact-menu.c:212
+#: ../libempathy-gtk/empathy-individual-menu.c:1558
#: ../src/empathy-main-window-menubar.ui.h:14
msgid "_Add Contact…"
msgstr "添加联系人(_A)..."
-#: ../libempathy-gtk/empathy-contact-menu.c:300
+#: ../libempathy-gtk/empathy-contact-menu.c:287
msgid "_Block Contact"
msgstr "屏蔽联系人"
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
+#. add chat button
+#: ../libempathy-gtk/empathy-contact-menu.c:316
+#: ../libempathy-gtk/empathy-individual-menu.c:789
+#: ../libempathy-gtk/empathy-new-message-dialog.c:320
#: ../src/empathy-main-window-menubar.ui.h:16
msgid "_Chat"
msgstr "聊天(_C)"
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
+#: ../libempathy-gtk/empathy-contact-menu.c:348
+#: ../libempathy-gtk/empathy-individual-menu.c:881
msgctxt "menu item"
msgid "_Audio Call"
msgstr "音频呼叫(_A)"
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
+#: ../libempathy-gtk/empathy-contact-menu.c:381
+#: ../libempathy-gtk/empathy-individual-menu.c:926
msgctxt "menu item"
msgid "_Video Call"
msgstr "视频呼叫(_V)"
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../libempathy-gtk/empathy-contact-menu.c:427
+#: ../libempathy-gtk/empathy-individual-menu.c:979
#: ../src/empathy-main-window-menubar.ui.h:27
msgid "_Previous Conversations"
msgstr "最近会话(_P)"
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
+#: ../libempathy-gtk/empathy-contact-menu.c:449
+#: ../libempathy-gtk/empathy-individual-menu.c:1020
msgid "Send File"
msgstr "发送文件"
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
+#: ../libempathy-gtk/empathy-contact-menu.c:472
+#: ../libempathy-gtk/empathy-individual-menu.c:1062
msgid "Share My Desktop"
msgstr "共享我的桌面"
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "收藏"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
+#: ../libempathy-gtk/empathy-contact-menu.c:501
+#: ../libempathy-gtk/empathy-individual-menu.c:1125
msgid "Infor_mation"
msgstr "信息(_M)"
-#: ../libempathy-gtk/empathy-contact-menu.c:600
+#: ../libempathy-gtk/empathy-contact-menu.c:547
msgctxt "Edit contact (contextual menu)"
msgid "_Edit"
msgstr "编辑(_E)"
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../libempathy-gtk/empathy-contact-menu.c:601
+#: ../libempathy-gtk/empathy-individual-menu.c:1316
#: ../src/empathy-chat-window.c:1011
msgid "Inviting you to this room"
msgstr "邀请到此聊天室"
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
+#: ../libempathy-gtk/empathy-contact-menu.c:632
+#: ../libempathy-gtk/empathy-individual-menu.c:1362
msgid "_Invite to Chat Room"
msgstr "邀请到聊天室(_I)"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
msgid "Search contacts"
msgstr "搜索联系人"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
msgid "Search: "
msgstr "搜索"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
msgid "_Add Contact"
msgstr "添加联系人(_A)"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
msgid "No contacts found"
msgstr "未找到联系人"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
msgid "Your message introducing yourself:"
msgstr "您的自我介绍信息:"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
msgid "Please let me see when you're online. Thanks!"
msgstr "你在线时请让我知道,谢谢!"
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "选择一个联系"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "全称:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "电话号码:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "电子邮件地址:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "网站:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "生日:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "最近上线:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "连接来源:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "离开消息:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:571
+#: ../libempathy-gtk/empathy-individual-widget.c:304
msgid "Channels:"
msgstr "频道:"
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:455
msgid "Country ISO Code:"
msgstr "包括 ISO 编码:"
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:457
msgid "Country:"
msgstr "国家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:459
msgid "State:"
msgstr "省:"
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:461
msgid "City:"
msgstr "城市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:463
msgid "Area:"
msgstr "地区:"
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:465
msgid "Postal Code:"
msgstr "邮政编码:"
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:467
msgid "Street:"
msgstr "街道:"
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Building:"
msgstr "建筑物:"
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Floor:"
msgstr "楼层:"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "Room:"
msgstr "房间:"
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "Text:"
msgstr "文本:"
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Accuracy Level:"
msgstr "准确程度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Error:"
msgstr "错误:"
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Vertical Error (meters):"
msgstr "垂直误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Horizontal Error (meters):"
msgstr "水平误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Bearing:"
msgstr "方位朝向:"
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Last Updated on:"
msgstr "最近更新于:"
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Longitude:"
msgstr "经度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Latitude:"
msgstr "纬度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:797
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "Altitude:"
msgstr "海拔:"
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-individual-widget.c:610
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:659
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e,%Y 于 %R UTC 时间"
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-individual-widget.c:901
msgid "Save Avatar"
msgstr "保存头像"
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1057
+#: ../libempathy-gtk/empathy-individual-widget.c:959
msgid "Unable to save avatar"
msgstr "无法保存头像"
+#: ../libempathy-gtk/empathy-contact-widget.c:1745
+#: ../libempathy-gtk/empathy-individual-menu.c:1097
+#: ../libempathy-gtk/empathy-individual-widget.c:1358
+msgid "Favorite"
+msgstr "收藏"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "全名"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "电话号码"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "电子邮件地址"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "网站"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "生日"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "最近上线:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "连接来源:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "离开消息:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "办公"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "主页"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "手机"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "音频"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "首选"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "邮政"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "邮件"
+
#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
msgid "<b>Location</b> at (date)\t"
msgstr "<b>位置</b>于(日期)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1294
msgid "Alias:"
msgstr "别名:"
@@ -2084,7 +2073,7 @@ msgstr "联系人详情"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1503
msgid "Identifier:"
msgstr "标识符:"
@@ -2121,16 +2110,16 @@ msgid "Select"
msgstr "选择"
#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../src/empathy-main-window.c:1952
msgid "Group"
msgstr "群组"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:258
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "以下用户将被屏蔽:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:265
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "以下用户无法被屏蔽:"
@@ -2140,74 +2129,94 @@ msgstr[0] "以下用户无法被屏蔽:"
msgid "Linked Contacts"
msgstr "已绑定的联系人"
-#: ../libempathy-gtk/empathy-individual-linker.c:370
+#: ../libempathy-gtk/empathy-individual-linker.c:372
msgid "Select contacts to link"
msgstr "选择要绑定的联系人"
-#: ../libempathy-gtk/empathy-individual-linker.c:444
+#: ../libempathy-gtk/empathy-individual-linker.c:447
msgid "New contact preview"
msgstr "新联系人预览"
-#: ../libempathy-gtk/empathy-individual-linker.c:488
+#: ../libempathy-gtk/empathy-individual-linker.c:491
msgid "Contacts selected in the list on the left will be linked together."
msgstr "在左侧列表中选中的联系人将被绑定在一起。"
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:148
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:312
msgid "Select account to use to place the call"
-msgstr "选择要用于拨打电话的账户"
+msgstr "选择要用于拨打电话的帐户"
#. translators: Call is a noun. This string is used in the window
#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:316
#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1288
#: ../src/empathy-call-window.ui.h:2
msgid "Call"
msgstr "通话"
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:381
msgid "Mobile"
msgstr "手机"
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:383
msgid "Work"
msgstr "办公"
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:385
msgid "HOME"
msgstr "家庭"
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:836
+#: ../libempathy-gtk/empathy-new-message-dialog.c:314
msgid "_SMS"
msgstr "短信(_S)"
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1174
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:1168
+#: ../libempathy-gtk/empathy-individual-menu.c:1200
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "绑定联系人(_L)…"
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2362
msgid "Delete and _Block"
msgstr "删除并屏蔽(_B)"
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "您真的要删除群组“%s”吗?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2400
+msgid "Removing group"
+msgstr "删除群组"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2455
+#: ../libempathy-gtk/empathy-individual-view.c:2672
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2532
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "您真的想要删除联系人“%s”吗?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2541
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2215,7 +2224,11 @@ msgid ""
msgstr ""
"您是否真正地想要删除已绑定的联系人'%s' ? 注意这将删除所有联系已绑定的联系人"
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2553
+msgid "Removing contact"
+msgstr "删除联系人"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1642
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2297,133 +2310,133 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "解除绑定(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:621
msgid "History"
msgstr "历史"
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:676
msgid "Show"
msgstr "显示"
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:698
msgid "Search"
msgstr "搜索"
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1147
#, c-format
msgid "Chat in %s"
msgstr "在 %s 聊天"
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1149
#, c-format
msgid "Chat with %s"
msgstr "与 %s 聊天"
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1199
+#: ../libempathy-gtk/empathy-log-window.c:1346
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%Y年%m月%d日 %A"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1288
#, 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:1306
+#: ../libempathy-gtk/empathy-log-window.c:1294
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b>%s"
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1370
#, c-format
msgid "%s second"
msgid_plural "%s seconds"
msgstr[0] "%s 秒"
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1377
#, c-format
msgid "%s minute"
msgid_plural "%s minutes"
msgstr[0] "%s 分"
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1385
#, c-format
msgid "Call took %s, ended at %s"
msgstr "通话时长:%s,结束于 %s"
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1719
msgid "Today"
msgstr "今天"
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1723
msgid "Yesterday"
msgstr "昨天"
#. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1738
msgid "%e %B %Y"
msgstr "%Y年%m月%d日"
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1826
+#: ../libempathy-gtk/empathy-log-window.c:3458
msgid "Anytime"
msgstr "随时"
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:1915
+#: ../libempathy-gtk/empathy-log-window.c:2371
msgid "Anyone"
msgstr "任何人"
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2684
msgid "Who"
msgstr "谁"
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2893
msgid "When"
msgstr "何时"
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3009
msgid "Anything"
msgstr "任何事"
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3011
msgid "Text chats"
msgstr "文本聊天"
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3013
#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "通话"
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3018
msgid "Incoming calls"
msgstr "来电"
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3019
msgid "Outgoing calls"
msgstr "呼出的语音通话"
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3020
msgid "Missed calls"
msgstr "未接来电"
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3042
msgid "What"
msgstr "什么事"
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3751
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "确定要删除以前的全部对话日志?"
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3755
msgid "Clear All"
msgstr "全部清除"
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3762
msgid "Delete from:"
msgstr "从以下位置删除:"
@@ -2464,36 +2477,101 @@ msgstr "文件(_F)"
msgid "page 2"
msgstr "第 2 页"
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "联系人 ID:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#, fuzzy
+#| msgid "The specified contact is offline"
+msgid "The contact is offline"
+msgstr "选择的联系人离线"
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "聊天(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#, fuzzy
+#| msgid "The specified contact is not valid"
+msgid "The specified contact is either invalid or unknown"
+msgstr "选择的联系人无效"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+msgid "The contact does not support this kind of conversation"
+msgstr "选择的联系人不支持在该类型会话"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "所要求的功能与此协议不兼容"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+msgid "Could not start a conversation with the given contact"
+msgstr "无法与选择的联系人发起对话"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+msgid "You are banned from this channel"
+msgstr "您已被此频道屏蔽"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+msgid "This channel is full"
+msgstr "频道已满"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#, fuzzy
+#| msgid "You have been invited to join %s"
+msgid "You must be invited to join this channel"
+msgstr "您被邀请加入 %s"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#, fuzzy
+#| msgid "Contact disconnected"
+msgid "Can't proceed while disconnected"
+msgstr "联系人已断开"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#, fuzzy
+#| msgid "permission denied"
+msgid "Permission denied"
+msgstr "权限不足"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#, fuzzy
+#| msgid "There was an error starting the call"
+msgid "There was an error starting the conversation"
+msgstr "发起呼叫时出错"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:291
+#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+msgid "Enter a contact identifier or phone number:"
+msgstr "输入一个联系人标识或电话号码:"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:334
msgid "New Conversation"
msgstr "新建对话"
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "发送视频(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#, fuzzy
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "视频呼叫(_V)"
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "通话(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#, fuzzy
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+msgid "_Audio Call"
+msgstr "音频呼叫(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:246
msgid "New Call"
msgstr "新建通话"
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, fuzzy, c-format
+#| msgid "Authentication failed"
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "验证失败"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
#, c-format
msgid ""
"Enter your password for account\n"
@@ -2530,12 +2608,8 @@ msgstr "点击设置自定义状态"
msgid "Set status"
msgstr "设置状态"
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "设置您的状态信息和现在的状态"
-
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
msgid "Custom messages…"
msgstr "自定义消息..."
@@ -2612,12 +2686,12 @@ msgstr "语音通话结束"
msgid "Edit Custom Messages"
msgstr "编辑自定义状态"
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1047
#, c-format
msgid "Message edited at %s"
msgstr "消息于 %s 被编辑"
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1752
msgid "Normal"
msgstr "普通"
@@ -2708,26 +2782,26 @@ msgstr "为将来的连接记住本次选择"
msgid "Certificate Details"
msgstr "证书详情"
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
msgid "Unable to open URI"
msgstr "无法打开 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
msgid "Select a file"
msgstr "选择文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
msgid "Insufficient free space to save file"
msgstr "空间不足,无法保存文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
#, 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:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
#, c-format
msgid "Incoming file from %s"
msgstr "从 %s 传来的文件"
@@ -2899,39 +2973,31 @@ msgstr "西方语言"
msgid "Vietnamese"
msgstr "越南语"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "选择的联系人无法接收文件。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "选择的联系人离线。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
msgid "No error message"
msgstr "无错误信息"
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
msgid "Instant Message (Empathy)"
msgstr "即时消息(Empathy)"
-#: ../src/empathy.c:431
+#: ../src/empathy.c:433
msgid "Don't connect on startup"
msgstr "启动时不自动连接"
-#: ../src/empathy.c:435
+#: ../src/empathy.c:437
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "启动时不显示联系人列表"
-#: ../src/empathy.c:450
+#: ../src/empathy.c:452
msgid "- Empathy IM Client"
msgstr " - Empathy 即时通讯客户端"
-#: ../src/empathy.c:637
+#: ../src/empathy.c:639
msgid "Error contacting the Account Manager"
msgstr "联系帐号管理器出错"
-#: ../src/empathy.c:639
+#: ../src/empathy.c:641
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3030,7 +3096,7 @@ msgstr ""
"您可以返回尝试重新输入您的帐号信息,或者退出助理,然后从编辑菜单中加入帐户。"
#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1272
msgid "An error occurred"
msgstr "发生错误"
@@ -3073,37 +3139,37 @@ msgstr ""
msgid "Do you have an account you've been using with another chat program?"
msgstr "您有没有其它聊天软件的帐号?"
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:653
msgid "Yes, import my account details from "
msgstr "有,请导入我的帐号信息"
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:674
msgid "Yes, I'll enter my account details now"
msgstr "有,我现在就输入我的帐号信息"
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:696
msgid "No, I want a new account"
msgstr "不,我想要一个新的帐号"
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:706
msgid "No, I just want to see people online nearby for now"
msgstr "没有,我只是想看看附近现在谁在线上"
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:727
msgid "Select the accounts you want to import:"
msgstr "选择您要导入的帐号:"
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-account-assistant.c:814
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
msgid "Yes"
msgstr "是"
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:821
msgid "No, that's all for now"
msgstr "没有,就这样吧"
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1086
msgid ""
"Empathy can automatically discover and chat with the people connected on the "
"same network as you. If you want to use this feature, please check that the "
@@ -3114,16 +3180,16 @@ msgstr ""
"想使用这个功能,请仔细查看下列信息是否正确。您之后也可以通过“帐号”对话框轻松"
"的修改这些信息或关闭这个功能"
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1092
+#: ../src/empathy-account-assistant.c:1148
msgid "Edit->Accounts"
msgstr "编辑->帐号"
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1108
msgid "I do _not want to enable this feature for now"
msgstr "暂不启用此特性(_N)"
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1144
msgid ""
"You won't be able to chat with people connected to your local network, as "
"telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3134,23 +3200,23 @@ msgstr ""
"用该功能,请安装 telepathy-salut 包,并且在帐号对话框中创建附近的人(People "
"Nearby)帐号"
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1150
msgid "telepathy-salut not installed"
msgstr "telepathy-salut 未安装"
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1196
msgid "Messaging and VoIP Accounts Assistant"
msgstr "消息和 VoIP 帐号助手"
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1230
msgid "Welcome to Empathy"
msgstr "欢迎使用 Empathy"
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1239
msgid "Import your existing accounts"
msgstr "导入现有帐号"
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1257
msgid "Please enter personal details"
msgstr "请输入个人信息"
@@ -3168,8 +3234,8 @@ msgid "Your new account has not been saved yet."
msgstr "您的新帐号还没有保存。"
#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
msgid "Connecting…"
msgstr "正在连接..."
@@ -3257,11 +3323,11 @@ msgstr "要添加一个新帐号,您首先需要为您想要使用的每个协
msgid "_Import…"
msgstr "导入(_I)..."
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:284
msgid " - Empathy authentication client"
msgstr " - Empathy 认证客户端"
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:300
msgid "Empathy authentication client"
msgstr "Empathy 认证客户端"
@@ -3269,157 +3335,147 @@ msgstr "Empathy 认证客户端"
msgid "People nearby"
msgstr "附近的人"
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
msgid "- Empathy Audio/Video Client"
msgstr " - Empathy 语音/视频客户端"
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
msgid "Empathy Audio/Video Client"
msgstr "Empathy 语音/视频客户端"
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
msgid "Contrast"
msgstr "对比度"
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
msgid "Gamma"
msgstr "伽马"
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
msgid "_Sidebar"
msgstr "侧边栏(_S)"
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
msgid "Audio input"
msgstr "音频输入"
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
msgid "Video input"
msgstr "视频输入"
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
msgid "Dialpad"
msgstr "电话键盘"
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
#, c-format
msgid "Call with %s"
msgstr "与 %s 通话"
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
msgid "The IP address as seen by the machine"
msgstr "机器所见的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
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:2073
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
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:2075
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
msgid "The IP address of a relay server"
msgstr "中转服务器 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
msgid "The IP address of the multicast group"
msgstr "多播组的 IP 地址"
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "未知"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "未知"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "未知"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "codec"
msgid "Unknown"
msgstr "未知"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2139
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已连接 — %d:%02dm"
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
msgid "Technical Details"
msgstr "技术细节"
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
#, 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:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
#, 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:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
#, 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:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
msgid "There was a failure on the network"
msgstr "网络出现一个错误"
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
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:2908
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
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:2920
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3429,23 +3485,23 @@ msgstr ""
"Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>,并附上帮助菜"
"单里“调试”窗口收集到的日志。"
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
msgid "There was a failure in the call engine"
msgstr "呼叫引擎里出现了一个故障"
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
msgid "The end of the stream was reached"
msgstr "已到达流的末尾"
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
msgid "Can't establish audio stream"
msgstr "不能建立音频流"
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
msgid "Can't establish video stream"
msgstr "不能建立视频流"
@@ -3536,8 +3592,8 @@ msgstr "切换视频传输"
#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
msgid "Unknown"
msgstr "未知"
@@ -3701,7 +3757,7 @@ msgstr "管理聊天室收藏"
msgid "Incoming video call"
msgstr "呼入的视频通话"
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1555
msgid "Incoming call"
msgstr "来电"
@@ -3716,7 +3772,7 @@ 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-call-window.c:1455
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1561
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的来电"
@@ -3734,7 +3790,7 @@ msgid "_Answer with video"
msgstr "使用视频接听(_A)"
#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-call-window.c:1561
#, c-format
msgid "Incoming video call from %s"
msgstr "%s 的视频呼叫"
@@ -3777,16 +3833,16 @@ msgstr "您被邀请加入 %s"
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:1145 ../src/empathy-main-window.c:377
msgid "Password required"
msgstr "需要密码"
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1210
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s 当您在线的时候可见"
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1214
#, c-format
msgid ""
"\n"
@@ -3929,51 +3985,60 @@ msgstr "协议"
msgid "Source"
msgstr "源"
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-main-window.c:394
msgid "Provide Password"
msgstr "提供密码"
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-main-window.c:400
msgid "Disconnect"
msgstr "已断开连接"
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-main-window.c:637
msgid "No match found"
msgstr "没有找到匹配项"
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-main-window.c:745
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "很抱歉,在软件 %2$s 更新前,您不能使用 %1$s 帐户。"
+
+#: ../src/empathy-main-window.c:813
+msgid "Update software..."
+msgstr "升级软件"
+
+#: ../src/empathy-main-window.c:819 ../src/empathy-main-window.c:940
+msgid "Close"
+msgstr "关闭"
+
+#: ../src/empathy-main-window.c:928
msgid "Reconnect"
msgstr "重新连接"
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-main-window.c:934
msgid "Edit Account"
msgstr "编辑帐号"
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "关闭"
-
#. Translators: this string will be something like:
#. * Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-main-window.c:1073
#, c-format
msgid "Top up %s (%s)..."
msgstr "给 %s 充值(%s)..."
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-main-window.c:1120
msgid "Top up account credit"
-msgstr "账户充值"
+msgstr "帐户充值"
#. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-main-window.c:1191
msgid "Top Up..."
msgstr "充值..."
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-main-window.c:1934
msgid "Contact"
msgstr "联系人"
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-main-window.c:2309
msgid "Contact List"
msgstr "联系人列表"
@@ -3983,7 +4048,7 @@ msgstr "联系人地图(_M)"
#: ../src/empathy-main-window-menubar.ui.h:2
msgid "Credit Balance"
-msgstr "账户余额"
+msgstr "帐户余额"
#: ../src/empathy-main-window-menubar.ui.h:3
msgid "Find in Contact _List"
@@ -4066,17 +4131,17 @@ msgstr "聊天室(_R)"
msgid "_Search for Contacts…"
msgstr "搜索联系人(_S)..."
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
msgid "Chat Room"
msgstr "聊天室"
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
msgid "Members"
msgstr "成员"
#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:623
#, c-format
msgid ""
"%s\n"
@@ -4089,16 +4154,16 @@ msgstr ""
"需要密码: %s\n"
"成员: %s"
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:625
+#: ../src/empathy-new-chatroom-dialog.c:626
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:654
msgid "Could not start room listing"
msgstr "无法开始聊天室列表"
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:664
msgid "Could not stop room listing"
msgstr "无法停止聊天室列表"
@@ -4129,79 +4194,79 @@ msgstr "聊天室列表"
msgid "_Room:"
msgstr "聊天室(_R):"
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
msgid "Message received"
msgstr "收到了消息"
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
msgid "Message sent"
msgstr "发出了消息"
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
msgid "New conversation"
msgstr "新对话"
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
msgid "Contact goes online"
msgstr "离线人上线"
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
msgid "Contact goes offline"
msgstr "联系人离线"
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
msgid "Account connected"
msgstr "帐号已连接"
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
msgid "Account disconnected"
msgstr "帐号已断开"
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
msgid "Language"
msgstr "语言"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:725
msgid "Juliet"
msgstr "朱立叶"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:732
msgid "Romeo"
msgstr "罗密欧"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:738
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:741
msgid "Deny thy father and refuse thy name;"
msgstr "Deny thy father and refuse thy name;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:744
msgid "Or if thou wilt not, be but sworn my love"
msgstr "Or if thou wilt not, be but sworn my love"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:747
msgid "And I'll no longer be a Capulet."
msgstr "And I'll no longer be a Capulet."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:750
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Shall I hear more, or shall I speak at this?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:753
msgid "Juliet has disconnected"
msgstr "朱立叶已断开连接"
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1157
msgid "Preferences"
msgstr "首选项"
@@ -4259,35 +4324,27 @@ msgstr "允许拼写检查的语言:"
msgid "General"
msgstr "常规"
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "输入级别:"
-
#: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "输入音量:"
-
-#: ../src/empathy-preferences.ui.h:18
msgid "Location sources:"
msgstr "位置来源:"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
msgid "Log conversations"
msgstr "记录对话"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
msgid "Notifications"
msgstr "提示"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
msgid "Play sound for events"
msgstr "播放事件声音"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
msgid "Privacy"
msgstr "隐私"
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
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 "
@@ -4296,70 +4353,74 @@ msgstr ""
"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
"将精确到一位小数。 "
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
msgid "Show _smileys as images"
msgstr "显示表情符号为图形(_S)"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
msgid "Show contact _list in rooms"
msgstr "在聊天室显示联系人列表(_L)"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
msgid "Sounds"
msgstr "声音"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr "语言列表仅反映已安装的字典"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:27
msgid "Themes"
msgstr "主题"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:28
+msgid "Use _echo cancellation to improve call quality"
+msgstr "使用回声抑制,以改善通话质量"
+
+#: ../src/empathy-preferences.ui.h:29
msgid "Variant:"
msgstr "版本:"
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:30
msgid "_Automatically connect on startup"
msgstr "启动时自动连接(_A) "
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:31
msgid "_Cellphone"
msgstr "手机(_C)"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:32
msgid "_Enable bubble notifications"
msgstr "允许气泡通知(_E)"
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable sound notifications"
msgstr "启用声音通知(_E)"
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:34
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:35
msgid "_Network (IP, Wi-Fi)"
msgstr "网络(_N)(IP,Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:36
msgid "_Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天(_O)"
-#: ../src/empathy-preferences.ui.h:38
+#: ../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:40
+#: ../src/empathy-preferences.ui.h:39
msgid "_Reduce location accuracy"
msgstr "降低位置信息精度(_R)"
@@ -4485,16 +4546,16 @@ msgid ""
"extension."
msgstr "已选定的连接管理不支持远程调试扩展"
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:197
+#: ../src/empathy-invite-participant-dialog.c:225
msgid "Invite Participant"
msgstr "邀请参与者"
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:198
msgid "Choose a contact to invite into the conversation:"
msgstr "选择一个联系人以加入该会话:"
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:221
msgid "Invite"
msgstr "邀请"
@@ -4516,23 +4577,29 @@ msgstr "首先选择给定帐号(如 gabble/jabber/foo_40example_2eorg0)"
msgid "<account-id>"
msgstr "<帐号 ID>"
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+#, fuzzy
+#| msgid "Show the accounts dialog"
+msgid "Show account assistant"
+msgstr "显示帐号对话框"
+
+#: ../src/empathy-accounts.c:202
msgid "- Empathy Accounts"
msgstr "- Empathy 帐号"
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:238
msgid "Empathy Accounts"
msgstr "Empathy 帐号"
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
msgid "Show a particular service"
msgstr "显示特定的服务"
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
msgid "- Empathy Debugger"
msgstr "- Empathy 调试器"
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
msgid "Empathy Debugger"
msgstr "Empathy 调试器"
@@ -4540,39 +4607,39 @@ msgstr "Empathy 调试器"
msgid "- Empathy Chat Client"
msgstr " - Empathy IM 客户端"
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
msgid "Respond"
msgstr "响应"
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
msgid "Reject"
msgstr "拒绝"
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
msgid "Answer"
msgstr "接听"
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
msgid "Answer with video"
msgstr "以视频应答"
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
msgid "Decline"
msgstr "拒绝"
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
msgid "Accept"
msgstr "接受"
#. translators: the 'Provide' button is displayed in a notification
#. * bubble when Empathy is asking for an account password; clicking on it
#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
msgid "Provide"
msgstr "提供"
@@ -4583,32 +4650,109 @@ msgstr "%s 刚刚尝试呼叫您,但您当时正在与其他人通话。"
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2929
msgid "On hold"
msgstr "挂起"
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2932
msgid "Mute"
msgstr "静音"
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2934
msgid "Duration"
msgstr "时长"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2937
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "您当前的余额为 %s。"
+
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "对不起,您信用卡余额不足以支付此次通话。"
+
+#: ../src/empathy-call-window.c:3213
+msgid "Top Up"
+msgstr "充值"
+
#: ../libempathy-gtk/empathy-search-bar.c:243
msgid "_Match case"
msgstr "区分大小写(_M)"
+#~ msgid "Call volume"
+#~ msgstr "来电音量"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "来电音量,以百分比计。"
+
+#~ msgid "Input level:"
+#~ msgstr "输入级别:"
+
+#~ msgid "Input volume:"
+#~ msgstr "输入音量:"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy 已经迁移至 telepathy-butterfly 日志"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
+
+#~ msgid "Ungrouped"
+#~ msgstr "未分组"
+
+#~ msgid "Favorite People"
+#~ msgstr "收藏夹"
+
+#~ msgid "Select a contact"
+#~ msgstr "选择一个联系"
+
+#~ msgid "Contact ID:"
+#~ msgstr "联系人 ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "聊天(_H)"
+
+#~ msgid "Send _Video"
+#~ msgstr "发送视频(_V)"
+
+#~ msgid "C_all"
+#~ msgstr "通话(_A)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "设置您的状态信息和现在的状态"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "选择的联系人无法接收文件。"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "选择的联系人离线。"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
#~ msgid "Find Next"
#~ msgstr "向下查找"
@@ -4743,9 +4887,6 @@ msgstr "区分大小写(_M)"
#~ msgid "Custom messages..."
#~ msgstr "自定义状态..."
-#~ msgid "Show the accounts dialog"
-#~ msgstr "显示帐号对话框"
-
#~ msgid "The error message was: <span style=\"italic\">%s</span>"
#~ msgstr "错误信息是:<span style=\"italic\">%s</span>"