aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorAron Xu <aronxu@gnome.org>2009-08-25 19:32:22 +0800
committerAron Xu <aronxu@gnome.org>2009-08-25 19:32:22 +0800
commit84f127d075d2f2de415e777064680b58014ac3ff (patch)
tree842519925fd453705505934f325778db59cd97f8 /po
parentfefe898e2ccbca4a0aa75d849073faef5d37bb65 (diff)
downloadgsoc2013-empathy-84f127d075d2f2de415e777064680b58014ac3ff.tar
gsoc2013-empathy-84f127d075d2f2de415e777064680b58014ac3ff.tar.gz
gsoc2013-empathy-84f127d075d2f2de415e777064680b58014ac3ff.tar.bz2
gsoc2013-empathy-84f127d075d2f2de415e777064680b58014ac3ff.tar.lz
gsoc2013-empathy-84f127d075d2f2de415e777064680b58014ac3ff.tar.xz
gsoc2013-empathy-84f127d075d2f2de415e777064680b58014ac3ff.tar.zst
gsoc2013-empathy-84f127d075d2f2de415e777064680b58014ac3ff.zip
Updated Simplified Chinese translation.
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN.po1166
1 files changed, 703 insertions, 463 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 66efcb6d1..70d8f33c0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,12 +14,11 @@
msgid ""
msgstr ""
"Project-Id-Version: gossip\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&component=general\n"
-"POT-Creation-Date: 2009-07-30 18:04+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-08-25 19:26+0800\n"
"PO-Revision-Date: 2009-07-25 21:28+0000\n"
-"Last-Translator: Aron Xu <aronxu@gnome.org>\n"
-"Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"Language-Team: Simplified Chinese <i18n-zh@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -57,345 +56,355 @@ msgid "Compact contact list"
msgstr "紧凑显示联系人列表"
#: ../data/empathy.schemas.in.h:6
-msgid "Contact list sort criterium"
-msgstr "联系人列表排序准则"
+#, fuzzy
+msgid "Connection managers should be used"
+msgstr "是否使用 NetworkManager"
#: ../data/empathy.schemas.in.h:7
+msgid "Contact list sort criterium"
+msgstr "联系人列表排序规则"
+
+#: ../data/empathy.schemas.in.h:8
msgid "Default directory to select an avatar image from"
msgstr "默认的选取头像图片的目录"
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:9
msgid "Disable popup notifications when away"
msgstr "离开时禁用弹出提示"
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:10
msgid "Disable sounds when away"
msgstr "离开时禁用声音"
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:11
msgid "Empathy can publish the user's location"
msgstr "Empathy 能够发布用户的位置"
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:12
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy 能够通过 GPS 来估算位置"
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:13
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy 能够通过手机来估算位置"
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:14
msgid "Empathy can use the network to guess the location"
msgstr "Empathy 能够通过网络来估算位置"
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:15
msgid "Empathy default download folder"
msgstr "Empathy 默认下载文件夹"
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:16
msgid "Empathy has asked about importing accounts"
msgstr "Empathy 已经询问导入账户"
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:17
msgid "Empathy should auto-connect on startup"
msgstr "Empathy 启动时是否自动连接"
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:18
msgid "Empathy should reduce the location's accuracy"
msgstr "降低 Emapthy 位置信息的准确度"
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:19
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:20
msgid "Enable WebKit Developer Tools"
msgstr "启用 WebKit 开发工具"
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:21
msgid "Enable popup notifications for new messages"
msgstr "启用新消息弹出提示"
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:22
msgid "Enable spell checker"
msgstr "启用拼写检查器"
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:23
msgid "Hide main window"
msgstr "隐藏主窗口"
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:24
msgid "Hide the main window."
msgstr "隐藏主窗口。"
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr "是否使用 NetworkManager"
-
#: ../data/empathy.schemas.in.h:25
+msgid "MC 4 accounts have been imported"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:26
+msgid "MC 4 accounts have been imported."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:27
msgid "Nick completed character"
msgstr "昵称补全字符"
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:28
msgid "Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天"
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:29
msgid "Path of the adium theme to use"
msgstr "Adium 主题的路径"
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:30
msgid "Path of the adium theme to use if the theme used for chat is adium."
msgstr "如果聊天使用 Adium 主题,使用 Adium 主题的路径"
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:31
msgid "Play a sound for incoming messages"
msgstr "收到消息时播放声音"
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:32
msgid "Play a sound for new conversations"
msgstr "新对话时播放声音"
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:33
msgid "Play a sound for outgoing messages"
msgstr "发出消息时播放声音"
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:34
msgid "Play a sound when a contact logs in"
msgstr "联系人登录时播放声音"
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:35
msgid "Play a sound when a contact logs out"
msgstr "联系人注销时播放声音"
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:36
msgid "Play a sound when we log in"
msgstr "登录时播放声音"
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:37
msgid "Play a sound when we log out"
msgstr "注销时播放声音"
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:38
msgid "Popup notifications if the chat isn't focused"
msgstr "如果聊天窗口不是焦点则弹出消息通知"
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:39
msgid "Popup notifications when a contact sign in"
msgstr "当联系人登录时弹出通知"
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:40
msgid "Popup notifications when a contact sign out"
msgstr "当联系人注销时弹出通知"
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:41
msgid "Salut account is created"
msgstr "已创建 Salut 账户"
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:42
msgid "Show avatars"
msgstr "显示头像"
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:43
msgid "Show contact list in rooms"
msgstr "在聊天室显示联系人列表"
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:44
msgid "Show hint about closing the main window"
msgstr "关闭主窗口时显示提示"
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:45
msgid "Show offline contacts"
msgstr "显示离线联系人"
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:46
msgid "Spell checking languages"
msgstr "拼写检查器语言"
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:47
msgid "The default folder to save file transfers in."
msgstr "保存传送文件的默认文件夹。"
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:48
msgid "The last directory that an avatar image was chosen from."
msgstr "上次选取头像图片的目录。"
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:49
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用于在聊天窗口中显示会话的主题。"
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:50
msgid "Use graphical smileys"
msgstr "使用表情图标"
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:51
msgid "Use notification sounds"
msgstr "使用通知声音"
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:52
msgid "Use theme for chat rooms"
msgstr "为聊天室使用主题"
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "WebKit 开发工具,例如 Web Inspector 是否应该启用。"
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
msgid "Whether or not Empathy can publish the user's location to his contacts."
msgstr "是否允许 Empathy 将用户的位置共享给联系人"
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
msgid "Whether or not Empathy can use the GPS to guess the location."
msgstr "是否允许 Empathy 通过 GPS 估算位置"
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
msgid ""
"Whether or not Empathy can use the cellular network to guess the location."
msgstr "是否允许 Empathy 通过手机估算位置"
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
msgid "Whether or not Empathy can use the network to guess the location."
msgstr "是否允许 Empathy 通过网络估算位置"
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
msgid ""
"Whether or not Empathy has asked about importing accounts from other "
"programs."
msgstr "Empathy 是否应该已经询问过要从其它程序中导入账户。"
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
msgid ""
"Whether or not Empathy should automatically log in to your accounts on "
"startup."
msgstr "Empathy 是否在启动时自动登入您的账户。"
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
msgid ""
"Whether or not Empathy should reduce the location's accuracy for privacy "
"reasons."
msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:61
msgid ""
"Whether or not Empathy should use the avatar of the contact as the chat "
"window icon."
msgstr "是否使用联系人的头像作为聊天窗口的图标。"
-#: ../data/empathy.schemas.in.h:60
-msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "是否在 Empathy 第一次运行时创建 Salut 账户。"
-
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:62
+#, fuzzy
msgid ""
-"Whether or not the network manager should be used to automatically "
+"Whether or not connectivity managers should be used to automatically "
"disconnect/reconnect."
msgstr "是否使用 NetworkManager(网络管理器) 自动断开连接/重新连接。"
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:63
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr "是否在 Empathy 第一次运行时创建 Salut 账户。"
+
+#: ../data/empathy.schemas.in.h:64
msgid ""
"Whether or not to check words typed against the languages you want to check "
"with."
msgstr "是否对您想要作拼写检查的单词作拼写检查。"
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:65
msgid ""
"Whether or not to convert smileys into graphical images in conversations."
msgstr "对话时是否将表情符号转换为真正的图标。"
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:66
msgid ""
"Whether or not to play a sound to notify for contacts logging in the network."
msgstr "是否需要联系人上线提示音。"
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:67
msgid ""
"Whether or not to play a sound to notify for contacts logging off the "
"network."
msgstr "是否需要联系人下线提示音。"
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:68
msgid "Whether or not to play a sound to notify for events."
msgstr "是否需要事件提示音。"
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:69
msgid "Whether or not to play a sound to notify for incoming messages."
msgstr "是否需要消息到达提示音。"
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:70
msgid "Whether or not to play a sound to notify for new conversations."
msgstr "是否需要新会话提示音。"
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:71
msgid "Whether or not to play a sound to notify for outgoing messages."
msgstr "是否为外出消息使用语音提示。"
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:72
msgid "Whether or not to play a sound when logging in a network."
msgstr "当联网登录时是否播放提示音。"
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:73
msgid "Whether or not to play a sound when logging off a network."
msgstr "当网络断开时是否播放提示音。"
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:74
msgid "Whether or not to play sound notifications when away or busy."
msgstr "当离开或忙碌时是否使用语音通知。"
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:75
msgid ""
"Whether or not to show a popup notification when a contact goes offline."
msgstr "当联系人离线时是否显示弹出通知。"
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:76
msgid "Whether or not to show a popup notification when a contact goes online."
msgstr "当联系人上线时是否显示弹出通知"
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:77
msgid ""
"Whether or not to show a popup notification when receiving a new message "
"even if the chat is already opened, but not focused."
msgstr "当接收新消息时是否显示弹出提示即聊天窗口已开启,但未闲置。"
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:78
msgid ""
"Whether or not to show a popup notification when receiving a new message."
msgstr "当收到新消息时是否弹出显示提示框。"
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:79
msgid ""
"Whether or not to show avatars for contacts in the contact list and chat "
"windows."
msgstr "是否在联系人列表和聊天窗口中显示头像。"
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:80
msgid "Whether or not to show contacts that are offline in the contact list."
msgstr "是否显示联系人清单中离线的联系人。"
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:81
msgid "Whether or not to show popup notifications when away or busy."
msgstr "当离开活忙碌时是否弹出显示提示框。"
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:82
msgid "Whether or not to show the contact list in chat rooms."
msgstr "是否在聊天室显示联系人列表。"
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:83
msgid ""
"Whether or not to show the message dialog about closing the main window with "
"the 'x' button in the title bar."
msgstr "是否对使用标题栏中的“X”按钮关闭主窗口显示消息对话框。"
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:84
msgid "Whether to show the contact list in compact mode or not."
msgstr "是否以紧凑格式显示联系人列表。"
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:85
msgid "Whether to use the theme for chat rooms or not."
msgstr "是否对聊天室使用主题。"
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:86
msgid ""
"Which criterium to use when sorting the contact list. Default is to use sort "
"by the contact's name with the value \"name\". A value of \"state\" will "
@@ -404,78 +413,86 @@ msgstr ""
"使用何种准则来排序联系人列表。默认情况下使用值\"name\"以按联系人姓名\n"
"排序。取值为\"state\"时将按状态排序联系人列表。"
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-account.c:1086
+msgid "Can't set an empty display name"
+msgstr ""
+
+#: ../libempathy/empathy-ft-handler.c:839
msgid "The hash of the received file and the sent one do not match"
msgstr "接收到的文件和发送的那个文件哈希值不匹配"
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:1099
msgid "File transfer not supported by remote contact"
msgstr "文件传输不支持远程连接"
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1157
msgid "The selected file is not a regular file"
msgstr "所选文件是非正常的文件"
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1166
msgid "The selected file is empty"
msgstr "所选文件是空的"
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
+#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
msgid "People nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:280
msgid "Socket type not supported"
msgstr "不支持Socket类型"
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:399
msgid "No reason was specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:402
msgid "The change in state was requested"
msgstr "需要状态改变信息"
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:405
msgid "You canceled the file transfer"
msgstr "您取消了文件传输"
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:408
msgid "The other participant canceled the file transfer"
msgstr "另外的参与者取消了文件的传输"
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:411
msgid "Error while trying to transfer the file"
msgstr "当传输这个文件的时候发生错误"
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:414
msgid "The other participant is unable to transfer the file"
msgstr "另外的参与者无法传输这个文件"
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:417
msgid "Unknown reason"
msgstr "未知原因"
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:235
msgid "Available"
msgstr "在线"
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:237
msgid "Busy"
msgstr "忙碌"
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:240
msgid "Away"
msgstr "离开"
-#: ../libempathy/empathy-utils.c:272
+#: ../libempathy/empathy-utils.c:242
msgid "Hidden"
msgstr "隐身"
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:244
msgid "Offline"
msgstr "离线"
+#: ../libempathy/empathy-utils.c:378 ../src/empathy-import-mc4-accounts.c:104
+msgid "People Nearby"
+msgstr "附近的人"
+
#: ../libempathy/empathy-time.c:137
#, c-format
msgid "%d second ago"
@@ -516,77 +533,118 @@ msgstr[0] "%d 月前"
msgid "in the future"
msgstr "将来"
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:424
msgid "All"
msgstr "全部"
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:448
+#: ../libempathy-gtk/empathy-account-widget.c:504
#, c-format
msgid "%s:"
msgstr "%s:"
+#: ../libempathy-gtk/empathy-account-widget.c:1224
+msgid "Enabled"
+msgstr "启用"
+
#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
msgid "Advanced"
msgstr "高级"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
msgid "Pass_word:"
msgstr "密码(_W):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
msgid "Screen _Name:"
msgstr "用户名(_N):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+msgid "What is your AIM password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
msgid "_Port:"
msgstr "端口(_P):"
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
#: ../src/empathy-new-chatroom-dialog.ui.h:9
msgid "_Server:"
msgstr "服务器(_S):"
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> username</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
msgid "Login I_D:"
msgstr "登录 I_D:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
msgid "ICQ _UIN:"
msgstr "ICQ _UIN:"
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+msgid "What is your ICQ UIN?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
msgid "_Charset:"
msgstr "字符集(_C):"
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
+#: ../libempathy-gtk/empathy-account-widget-irc.c:244
msgid "New Network"
msgstr "新建网络"
@@ -622,84 +680,136 @@ msgstr "全名:"
msgid "Servers"
msgstr "服务器"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
msgid "Override server settings"
msgstr "覆盖服务器设置"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
msgid "Pri_ority:"
msgstr "优先级(_O):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
msgid "Reso_urce:"
msgstr "资源(_U):"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
msgid "Use old SS_L"
msgstr "使用旧的 SS_L"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "What is your Jabber ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Jabber password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your desired Jabber ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+msgid "What is your desired Jabber password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
msgid "_Encryption required (TLS/SSL)"
msgstr "需要加密(TLS/SSL)(_E)"
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
msgid "_Ignore SSL certificate errors"
msgstr "忽略 SSL 证书错误(_I)"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live user name?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
msgid "_Email:"
msgstr "电子邮件(_E):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
msgid "_First Name:"
msgstr "名(_F)"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
msgid "_Jabber ID:"
msgstr "_Jabber ID:"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
msgid "_Last Name:"
msgstr "姓(_L):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
msgid "_Nickname:"
msgstr "昵称(_N):"
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
msgid "_Published Name:"
msgstr "公开的名字(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
+msgstr ""
+
#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
msgid "Discover STUN"
msgstr "搜索 STUN"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
msgid "STUN Server:"
msgstr "STUN 服务器:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
msgid "STUN port:"
msgstr "STUN 端口:"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "What is your SIP account password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "What is your SIP login ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
msgid "_Username:"
msgstr "用户名(_U):"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
msgid "Use _Yahoo Japan"
msgstr "使用 _Yahoo 日本"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "What is your Yahoo! ID?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "What is your Yahoo! password?"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
msgid "Yahoo I_D:"
msgstr "Yahoo I_D:"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
msgid "_Ignore conference and chatroom invitations"
msgstr "忽略会议和聊天室邀请(_I)"
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
msgid "_Room List locale:"
msgstr "聊天室列表 locale(_R):"
@@ -736,92 +846,98 @@ msgstr "单击以放大"
msgid "Failed to reconnect this chat"
msgstr "重新连接到对话失败"
-#: ../libempathy-gtk/empathy-chat.c:404
+#: ../libempathy-gtk/empathy-chat.c:413
msgid "Unsupported command"
msgstr "不支持的命令"
-#: ../libempathy-gtk/empathy-chat.c:539
+#: ../libempathy-gtk/empathy-chat.c:549
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:542
+#: ../libempathy-gtk/empathy-chat.c:552
msgid "invalid contact"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:545
+#: ../libempathy-gtk/empathy-chat.c:555
msgid "permission denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-chat.c:548
+#: ../libempathy-gtk/empathy-chat.c:558
msgid "too long message"
msgstr "消息太长"
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:561
msgid "not implemented"
msgstr "尚未实现"
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:564
msgid "unknown"
msgstr "未知"
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:568
#, c-format
msgid "Error sending message '%s': %s"
msgstr "发送消息“%s”出错:%s"
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:598
#, c-format
msgid "Topic set to: %s"
msgstr "话题被设置为:%s"
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:600
msgid "No topic defined"
msgstr "未设置话题"
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:970
msgid "(No Suggestions)"
msgstr "(没有建议)"
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1024
msgid "Insert Smiley"
msgstr "插入表情"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1042
+#: ../libempathy-gtk/empathy-ui-utils.c:1471
msgid "_Send"
msgstr "发送(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1076
msgid "_Spelling Suggestions"
msgstr "拼写建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1191
#, c-format
msgid "%s has disconnected"
msgstr "%s 已断开连接"
-#: ../libempathy-gtk/empathy-chat.c:1185
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1198
#, c-format
-msgid "%s was kicked by %s"
-msgstr "%s 被 %s 踢出"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s 被 %2$s 踢出"
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1201
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
-#: ../libempathy-gtk/empathy-chat.c:1193
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
#, c-format
-msgid "%s was banned by %s"
-msgstr "%s 被 %s 禁止"
+msgid "%1$s was banned by %2$s"
+msgstr "%s 已被 %s 禁止"
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:1212
#, c-format
msgid "%s was banned"
msgstr "%s 被禁止"
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:1216
#, c-format
msgid "%s has left the room"
msgstr "%s 离开了聊天室"
@@ -831,42 +947,42 @@ msgstr "%s 离开了聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:1225
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:1248
#, c-format
msgid "%s has joined the room"
msgstr "%s 加入了聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:1381 ../src/empathy-call-window.c:1277
msgid "Disconnected"
msgstr "已断开连接"
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1817
msgid "Connected"
msgstr "已连接"
-#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-chat.c:1867
#: ../libempathy-gtk/empathy-log-window.c:502
msgid "Conversation"
msgstr "对话"
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
msgid "Topic:"
msgstr "话题:"
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-theme-adium.c:266
msgid "_Copy Link Address"
msgstr "复制链接地址(_C)"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-theme-adium.c:274
msgid "_Open Link"
msgstr "打开链接(_O)"
@@ -876,16 +992,16 @@ msgstr "打开链接(_O)"
msgid "%A %B %d %Y"
msgstr "%A %B %d %Y"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:177
+#: ../libempathy-gtk/empathy-contact-dialogs.c:236
msgid "Edit Contact Information"
msgstr "编辑联系人信息"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:287
msgid "Personal Information"
msgstr "个人信息"
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:392
msgid "New Contact"
msgstr "新建联系人"
@@ -897,27 +1013,27 @@ msgstr "以后再决定(_L)"
msgid "Subscription Request"
msgstr "订阅请求"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1404
+#: ../libempathy-gtk/empathy-contact-list-view.c:1412
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "您真的要删除群组“%s”吗?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1406
+#: ../libempathy-gtk/empathy-contact-list-view.c:1414
msgid "Removing group"
msgstr "删除群组"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1453
-#: ../libempathy-gtk/empathy-contact-list-view.c:1530
+#: ../libempathy-gtk/empathy-contact-list-view.c:1461
+#: ../libempathy-gtk/empathy-contact-list-view.c:1538
msgid "_Remove"
msgstr "删除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1483
+#: ../libempathy-gtk/empathy-contact-list-view.c:1491
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "您真的想要删除联系人“%s”吗?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1485
+#: ../libempathy-gtk/empathy-contact-list-view.c:1493
msgid "Removing contact"
msgstr "删除联系人"
@@ -958,7 +1074,7 @@ msgid "Infor_mation"
msgstr "信息(_M)"
#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
msgid "_Edit"
msgstr "编辑(_E)"
@@ -982,120 +1098,120 @@ msgstr "保存头像"
msgid "Unable to save avatar"
msgstr "无法保存头像"
-#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1000
msgid "Select"
msgstr "选择"
-#: ../libempathy-gtk/empathy-contact-widget.c:1005
-#: ../src/empathy-main-window.c:1023
+#: ../libempathy-gtk/empathy-contact-widget.c:1009
+#: ../src/empathy-main-window.c:1019
msgid "Group"
msgstr "群组"
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
msgid "Country ISO Code:"
msgstr "包括 ISO 编码"
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
msgid "Country:"
msgstr "国家"
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
msgid "State:"
msgstr "省"
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
msgid "City:"
msgstr "市"
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
msgid "Area:"
msgstr "地区"
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
msgid "Postal Code:"
msgstr "邮政编码"
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
msgid "Street:"
msgstr "街"
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
msgid "Building:"
msgstr "建筑物"
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
msgid "Floor:"
msgstr "楼层:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
msgid "Room:"
msgstr "房间:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
msgid "Text:"
msgstr "文本:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
msgid "Accuracy Level:"
msgstr "准确程度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
msgid "Error:"
msgstr "错误:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
msgid "Vertical Error (meters):"
msgstr "垂直误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
msgid "Horizontal Error (meters):"
msgstr "水平误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
msgid "Bearing:"
msgstr "方位朝向:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
msgid "Last Updated on:"
msgstr "最近更新于:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
msgid "Longitude:"
msgstr "经度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:1304
msgid "Latitude:"
msgstr "纬度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:1306
msgid "Altitude:"
msgstr "海拔:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1349
+#: ../libempathy-gtk/empathy-contact-widget.c:1353
msgid "<b>Location</b>"
msgstr "<b>位置</b>"
-#: ../libempathy-gtk/empathy-contact-widget.c:1362
+#: ../libempathy-gtk/empathy-contact-widget.c:1366
msgid "<b>Location</b>, "
msgstr "<b>位置</b>,"
-#: ../libempathy-gtk/empathy-contact-widget.c:1412
+#: ../libempathy-gtk/empathy-contact-widget.c:1416
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e,%Y 于 %R UTC 时间"
@@ -1127,7 +1243,7 @@ msgid "Client:"
msgstr "客户端:"
#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
+#: ../src/empathy-main-window.c:1002
msgid "Contact"
msgstr "联系人"
@@ -1178,24 +1294,24 @@ msgstr "网站:"
msgid "_Add Group"
msgstr "添加群组(_A)"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
msgid "new server"
msgstr "新建服务器"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
msgid "Server"
msgstr "服务器"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
msgid "Port"
msgstr "端口"
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:536
msgid "SSL"
msgstr "SSL"
#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
+#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "账户"
@@ -1241,34 +1357,34 @@ msgstr "新建对话"
#. COL_DISPLAY_MARKUP
#. COL_STATUS_CUSTOMISABLE
#. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
+#: ../libempathy-gtk/empathy-presence-chooser.c:176
+#: ../libempathy-gtk/empathy-presence-chooser.c:212
msgid "Custom Message..."
msgstr "自定义状态..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
+#: ../libempathy-gtk/empathy-presence-chooser.c:229
+#: ../libempathy-gtk/empathy-presence-chooser.c:231
msgid "Edit Custom Messages..."
msgstr "编辑自定义状态..."
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:330
msgid "Click to remove this status as a favorite"
msgstr "点击移除自定义状态"
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:339
msgid "Click to make this status a favorite"
msgstr "点击设置自定义状态"
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:373
msgid "Set status"
msgstr "设置状态"
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:794
msgid "Set your presence and current status"
msgstr "设置你的状态信息和现在的状态"
#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+#: ../libempathy-gtk/empathy-presence-chooser.c:1043
msgid "Custom messages..."
msgstr "自定义状态..."
@@ -1328,14 +1444,6 @@ msgstr "添加新自定义状态(_N)"
msgid "Saved Presets"
msgstr "已保存的自定义状态"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
#: ../libempathy-gtk/empathy-theme-manager.c:67
msgid "Classic"
msgstr "经典"
@@ -1352,15 +1460,15 @@ msgstr "清爽"
msgid "Blue"
msgstr "蓝色"
-#: ../libempathy-gtk/empathy-ui-utils.c:1382
+#: ../libempathy-gtk/empathy-ui-utils.c:1373
msgid "Unable to open URI"
msgstr "无法打开 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1463
msgid "Select a file"
msgstr "选择文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
+#: ../libempathy-gtk/empathy-ui-utils.c:1523
msgid "Select a destination"
msgstr "选择目的地"
@@ -1548,7 +1656,7 @@ msgid "Megaphone"
msgstr "话筒"
#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
+#: ../megaphone/src/megaphone-applet.c:518
msgid "Talk!"
msgstr "说吧!"
@@ -1566,11 +1674,11 @@ msgstr "信息(_I)"
msgid "_Preferences"
msgstr "首选项(_P)"
-#: ../megaphone/src/megaphone-applet.c:168
+#: ../megaphone/src/megaphone-applet.c:166
msgid "Please configure a contact."
msgstr "请配置一个联系人。"
-#: ../megaphone/src/megaphone-applet.c:258
+#: ../megaphone/src/megaphone-applet.c:256
msgid "Select contact..."
msgstr "选择联系人..."
@@ -1579,23 +1687,23 @@ msgid "Presence"
msgstr "状态"
#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
+#: ../nothere/src/nothere-applet.c:105
msgid "Set your own presence"
msgstr "设置您的状态"
-#: ../src/empathy.c:567
+#: ../src/empathy.c:588
msgid "Don't connect on startup"
msgstr "启动时不自动登录"
-#: ../src/empathy.c:571
+#: ../src/empathy.c:592
msgid "Don't show the contact list on startup"
msgstr "启动时不显示联系人列表"
-#: ../src/empathy.c:575
+#: ../src/empathy.c:596
msgid "Show the accounts dialog"
msgstr "显示账户对话框"
-#: ../src/empathy.c:587
+#: ../src/empathy.c:608
msgid "- Empathy IM Client"
msgstr " - Empathy IM 客户端"
@@ -1647,21 +1755,131 @@ msgstr ""
" fujianwzh https://launchpad.net/~fujianwzh\n"
" yuane https://launchpad.net/~yuane"
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "启用"
+#. translators: this is followed by the "while ..." strings some lines
+#. * down this file.
+#.
+#: ../src/empathy-account-assistant.c:121
+msgid "There has been an error "
+msgstr ""
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "账户"
+#. translators: this follows the "There has been an error " string
+#: ../src/empathy-account-assistant.c:125
+msgid "while importing the accounts."
+msgstr ""
+
+#. translators: this follows the "There has been an error " string
+#: ../src/empathy-account-assistant.c:129
+msgid "while parsing the account details."
+msgstr ""
+
+#. translators: this follows the "There has been an error " string
+#: ../src/empathy-account-assistant.c:133
+msgid "while creating the account."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:151
+#, c-format
+msgid "The error message was: <span style=\"italic\">%s</span>"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:159
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this wizard and add accounts later from the Edit menu."
+msgstr ""
+#: ../src/empathy-account-assistant.c:194
+msgid "An error occurred"
+msgstr ""
+
+#. Create account
#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
+#: ../src/empathy-account-assistant.c:330
+#: ../src/empathy-accounts-dialog.c:1094
#, c-format
msgid "New %s account"
msgstr "新建 %s 账户"
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-account-assistant.c:397
+msgid "What kind of chat account do you have?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:403
+#, fuzzy
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "我已经拥有账户,我想使用它"
+
+#: ../src/empathy-account-assistant.c:409
+msgid "Enter your account details"
+msgstr "输入您的帐户详情"
+
+#: ../src/empathy-account-assistant.c:414
+#, fuzzy
+msgid "What kind of chat account do you want to create?"
+msgstr "%s 来电,您想要接听吗?"
+
+#: ../src/empathy-account-assistant.c:420
+#, fuzzy
+msgid "Do you want to create other chat accounts?"
+msgstr "您真的想要删除联系人“%s”吗?"
+
+#: ../src/empathy-account-assistant.c:427
+msgid "Enter the details for the new account"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:513
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:530
+msgid "Do you have an account you've been using with another chat program?"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:553
+msgid "Yes, import my account details from "
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:574
+msgid "Yes, I'll enter my account details now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:596
+#, fuzzy
+msgid "No, I want a new account"
+msgstr "创建新的帐户(_C)"
+
+#: ../src/empathy-account-assistant.c:606
+msgid "No, I just want to see people online nearby for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:627
+#, fuzzy
+msgid "Select the accounts you want to import:"
+msgstr "选择您要邀请的人:"
+
+#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-account-assistant.c:721
+msgid "No, that's all for now"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:914
+msgid "Welcome to Empathy"
+msgstr "欢迎使用 Empathy"
+
+#: ../src/empathy-account-assistant.c:923
+msgid "Import your existing accounts"
+msgstr "导入现有帐户"
+
+#: ../src/empathy-accounts-dialog.c:616
#, c-format
msgid ""
"You are about to remove your %s account!\n"
@@ -1670,7 +1888,7 @@ msgstr ""
"您将要删除您的 %s 账户!\n"
"您确定要继续吗?"
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-accounts-dialog.c:622
msgid ""
"Any associated conversations and chat rooms will NOT be removed if you "
"decide to proceed.\n"
@@ -1682,99 +1900,94 @@ msgstr ""
"\n"
"如果将来您重新添加此账户,它们将仍然存在。"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Accounts"
+msgstr "账户"
+
#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "添加帐户"
+msgid "Add new"
+msgstr ""
#: ../src/empathy-accounts-dialog.ui.h:3
msgid "Cr_eate"
msgstr "创建(_E)"
#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "导入账户..."
-
-#: ../src/empathy-accounts-dialog.ui.h:6
msgid "No protocol installed"
msgstr "尚未安装协议"
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "设置"
-
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../src/empathy-accounts-dialog.ui.h:5
msgid ""
"To add a new account, you first have to install a backend for each protocol "
"you want to use."
msgstr "要添加一个新账户,您首先需要为您想要使用的每个协议安装后端。"
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "类型:"
-
-#: ../src/empathy-accounts-dialog.ui.h:10
+#: ../src/empathy-accounts-dialog.ui.h:6
msgid "_Add..."
msgstr "添加(_A)..."
-#: ../src/empathy-accounts-dialog.ui.h:11
+#: ../src/empathy-accounts-dialog.ui.h:7
msgid "_Create a new account"
msgstr "创建新的帐户(_C)"
-#: ../src/empathy-accounts-dialog.ui.h:12
+#: ../src/empathy-accounts-dialog.ui.h:8
msgid "_Reuse an existing account"
msgstr "启用现有帐户(_R)"
-#: ../src/empathy-call-window.c:420
+#: ../src/empathy-accounts-dialog.ui.h:9
+msgid "account"
+msgstr "账户"
+
+#: ../src/empathy-call-window.c:426
msgid "Contrast"
msgstr "对比度"
-#: ../src/empathy-call-window.c:423
+#: ../src/empathy-call-window.c:429
msgid "Brightness"
msgstr "亮度"
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-call-window.c:432
msgid "Gamma"
msgstr "伽马"
-#: ../src/empathy-call-window.c:531
+#: ../src/empathy-call-window.c:539
msgid "Volume"
msgstr "音量"
-#: ../src/empathy-call-window.c:662
+#: ../src/empathy-call-window.c:671
msgid "Connecting..."
msgstr "正在连接..."
-#: ../src/empathy-call-window.c:746
+#: ../src/empathy-call-window.c:778
msgid "_Sidebar"
msgstr "侧边栏(_S)"
-#: ../src/empathy-call-window.c:765
+#: ../src/empathy-call-window.c:797
msgid "Dialpad"
msgstr "电话键盘"
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-call-window.c:803
msgid "Audio input"
msgstr "音频输入"
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:807
msgid "Video input"
msgstr "视频输入"
-#: ../src/empathy-call-window.c:835
+#. translators: Call is a noun and %s is the contact name. This string is used
+#. * in the window title
+#: ../src/empathy-call-window.c:868
#, c-format
msgid "Call with %s"
msgstr "与 %s 通话"
-#: ../src/empathy-call-window.c:904
+#. translators: Call is a noun. This string is used in the window title
+#: ../src/empathy-call-window.c:938
msgid "Call"
msgstr "通话"
#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:1390
#, c-format
msgid "Connected — %d:%02dm"
msgstr "已连接 — %d:%02dm"
@@ -1807,15 +2020,75 @@ msgstr "通话(_C)"
msgid "_View"
msgstr "查看(_V)"
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:343
#, c-format
msgid "Conversations (%d)"
msgstr "对话 (%d)"
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:475
msgid "Typing a message."
msgstr "输入消息。"
+#: ../src/empathy-chat-window.ui.h:1
+msgid "C_lear"
+msgstr "清除(_L)"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "Chat"
+msgstr "聊天"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "插入表情(_M)"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "Move Tab _Left"
+msgstr "左移标签(_L)"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Move Tab _Right"
+msgstr "右移标签(_R)"
+
+#: ../src/empathy-chat-window.ui.h:6
+msgid "_Contact"
+msgstr "联系人(_C)"
+
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "内容(_C)"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "_Conversation"
+msgstr "对话(_C)"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "_Detach Tab"
+msgstr "漂移标签(_D)"
+
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Favorite Chatroom"
+msgstr "收藏聊天室(_F)"
+
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Next Tab"
+msgstr "下一标签(_N)"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "_Previous Tab"
+msgstr "上一标签(_P)"
+
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "显示联系人列表(_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Tabs"
+msgstr "标签(_T)"
+
#: ../src/empathy-chatrooms-window.c:258
msgid "Name"
msgstr "名称"
@@ -1832,75 +2105,75 @@ msgstr "自动连接"
msgid "Manage Favorite Rooms"
msgstr "管理聊天室收藏"
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:322
msgid "Incoming call"
msgstr "来电"
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:325
#, c-format
msgid "%s is calling you, do you want to answer?"
msgstr "%s 来电,您想要接听吗?"
-#: ../src/empathy-event-manager.c:331
+#: ../src/empathy-event-manager.c:332
msgid "_Reject"
msgstr "拒绝(_R)"
-#: ../src/empathy-event-manager.c:337
+#: ../src/empathy-event-manager.c:338
msgid "_Answer"
msgstr "接听(_A)"
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:453
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的来电"
-#: ../src/empathy-event-manager.c:496
+#: ../src/empathy-event-manager.c:497
#, c-format
msgid "%s is offering you an invitation"
msgstr "%s 正发送邀请给您"
-#: ../src/empathy-event-manager.c:502
+#: ../src/empathy-event-manager.c:503
msgid "An external application will be started to handle it."
msgstr "将启动一个外部应用程序来处理它."
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:508
msgid "You don't have the needed external application to handle it."
msgstr "您没有必需的外部应用程序来处理它."
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:635
msgid "Room invitation"
msgstr "聊天室邀请"
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:638
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正邀请您加入 %s"
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:646
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:651
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:690
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 已邀请您加入 %s"
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:716
#, c-format
msgid "Incoming file transfer from %s"
msgstr "接收 %s 文件传输"
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:896
#, c-format
msgid "Subscription requested by %s"
msgstr "%s 的订阅请求"
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:900
#, c-format
msgid ""
"\n"
@@ -1910,13 +2183,13 @@ msgstr ""
"消息:%s"
#. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:936
#, c-format
msgid "%s is now offline."
msgstr "%s 当前离线。"
#. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:952
#, c-format
msgid "%s is now online."
msgstr "%s 当前在线。"
@@ -2032,90 +2305,95 @@ msgstr "文件传输"
msgid "Remove completed, canceled and failed file transfers from the list"
msgstr "从列表移除已完成、已取消及已失败的文件传输"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr "未找到可导入的账户。Empathy 目前只能支持从 Pidgin 导入账户。"
+
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "导入账户"
+
#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
+#: ../src/empathy-import-widget.c:301
msgid "Import"
msgstr "导入"
-#: ../src/empathy-import-dialog.c:272
+#: ../src/empathy-import-widget.c:310
msgid "Protocol"
msgstr "协议"
-#: ../src/empathy-import-dialog.c:298
+#: ../src/empathy-import-widget.c:334
msgid "Source"
msgstr "源"
-#: ../src/empathy-import-dialog.c:392
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr "未找到可导入的账户。Empathy 目前只能支持从 Pidgin 导入账户。"
-
-#: ../src/empathy-import-dialog.ui.h:1
-msgid "Import Accounts"
-msgstr "导入账户"
+#: ../src/empathy-import-mc4-accounts.c:106
+#, c-format
+msgid "%s account"
+msgstr "%s 账户"
-#: ../src/empathy-main-window.c:402
+#: ../src/empathy-main-window.c:399
msgid "_Edit account"
msgstr "编辑账户(_E)"
-#: ../src/empathy-main-window.c:505
+#: ../src/empathy-main-window.c:502
msgid "No error specified"
msgstr "没有说明错误"
-#: ../src/empathy-main-window.c:508
+#: ../src/empathy-main-window.c:505
msgid "Network error"
msgstr "网络错误"
-#: ../src/empathy-main-window.c:511
+#: ../src/empathy-main-window.c:508
msgid "Authentication failed"
msgstr "验证失败"
-#: ../src/empathy-main-window.c:514
+#: ../src/empathy-main-window.c:511
msgid "Encryption error"
msgstr "加密错误"
-#: ../src/empathy-main-window.c:517
+#: ../src/empathy-main-window.c:514
msgid "Name in use"
msgstr "用户名已经被占用"
-#: ../src/empathy-main-window.c:520
+#: ../src/empathy-main-window.c:517
msgid "Certificate not provided"
msgstr "未提供证书"
-#: ../src/empathy-main-window.c:523
+#: ../src/empathy-main-window.c:520
msgid "Certificate untrusted"
msgstr "证书不被信任"
-#: ../src/empathy-main-window.c:526
+#: ../src/empathy-main-window.c:523
msgid "Certificate expired"
msgstr "证书已过期"
-#: ../src/empathy-main-window.c:529
+#: ../src/empathy-main-window.c:526
msgid "Certificate not activated"
msgstr "证书尚未激活"
-#: ../src/empathy-main-window.c:532
+#: ../src/empathy-main-window.c:529
msgid "Certificate hostname mismatch"
msgstr "证书主机名不匹配"
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:532
msgid "Certificate fingerprint mismatch"
msgstr "证书指纹不匹配"
-#: ../src/empathy-main-window.c:538
+#: ../src/empathy-main-window.c:535
msgid "Certificate self-signed"
msgstr "证书是自签属的"
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:538
msgid "Certificate error"
msgstr "证书错误"
-#: ../src/empathy-main-window.c:544
+#: ../src/empathy-main-window.c:541
msgid "Unknown error"
msgstr "未知的错误"
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1288
msgid "Show and edit accounts"
msgstr "显示和编辑账户"
@@ -2163,10 +2441,6 @@ msgstr "账户(_A)"
msgid "_Compact Size"
msgstr "紧凑视图(_C)"
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Contents"
-msgstr "内容(_C)"
-
#: ../src/empathy-main-window.ui.h:15
msgid "_Debug"
msgstr "调试(_D)"
@@ -2175,10 +2449,6 @@ msgstr "调试(_D)"
msgid "_File Transfers"
msgstr "文件传输(_F)"
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Help"
-msgstr "帮助(_H)"
-
#: ../src/empathy-main-window.ui.h:19
msgid "_Join..."
msgstr "加入(_J)..."
@@ -2203,15 +2473,15 @@ msgstr "最近会话(_P)"
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:328
msgid "Chat Room"
msgstr "聊天室"
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:344
msgid "Members"
msgstr "成员"
-#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:494
#, c-format
msgctxt ""
"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
@@ -2227,21 +2497,16 @@ msgstr ""
"需要邀请:%s\n"
"成员:%s"
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:496
+#: ../src/empathy-new-chatroom-dialog.c:497
msgid "No"
msgstr "否"
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:524
msgid "Could not start room listing"
msgstr "无法开始聊天室列表"
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:534
msgid "Could not stop room listing"
msgstr "无法停止聊天室列表"
@@ -2272,35 +2537,35 @@ msgstr "聊天室列表"
msgid "_Room:"
msgstr "聊天室(_R):"
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:148
msgid "Message received"
msgstr "收到了消息"
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:149
msgid "Message sent"
msgstr "发出了消息"
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:150
msgid "New conversation"
msgstr "新对话"
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:151
msgid "Contact goes online"
msgstr "离线人上线"
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:152
msgid "Contact goes offline"
msgstr "联系人离线"
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:153
msgid "Account connected"
msgstr "账户已连接"
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:154
msgid "Account disconnected"
msgstr "账户已断开"
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:394
msgid "Language"
msgstr "语言"
@@ -2385,10 +2650,11 @@ msgid "Privacy"
msgstr "隐私"
#: ../src/empathy-preferences.ui.h:21
+#, fuzzy
msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published. GPS coordinates will have a random "
-"value added (&#xB1;0.25&#xB0;)."
+"state and country will be published. GPS coordinates will be accurate to 1 "
+"decimal place."
msgstr ""
"降低位置精度意味着你公开的城市、州和国家信息不在精确。 GPS 座标会有一个随机数"
"加入 (&#xB1;0.25&#xB0;) 。"
@@ -2447,93 +2713,109 @@ msgstr "状态"
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "显示联系人列表(_S)"
-
-#: ../src/empathy-tube-dispatch.c:375
+#: ../src/empathy-tube-dispatch.c:376
#, c-format
msgid "Unable to start application for service %s: %s"
msgstr "不能启动应用程序为 %s: %s 服务"
-#: ../src/empathy-tube-dispatch.c:446
+#: ../src/empathy-tube-dispatch.c:447
#, c-format
msgid ""
"An invitation was offered for service %s, but you don't have the needed "
"application to handle it"
msgstr "一个由 %s 服务提供邀请,但是你不需要应用程序处理它"
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr "gtk-leave-fullscreen"
-
#: ../src/empathy-map-view.ui.h:1
msgid "Contact Map View"
msgstr "联系地图视图"
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1079
msgid "Error"
msgstr "错误"
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1073
msgid "Critical"
msgstr "危急"
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1067
msgid "Warning"
msgstr "警告"
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1061
+#: ../src/empathy-debug-dialog.c:1109
msgid "Message"
msgstr "消息"
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1055
msgid "Info"
msgstr "信息"
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1049
msgid "Debug"
msgstr "调试"
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-dialog.c:841
msgid "Save"
msgstr "保存"
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-dialog.c:944
msgid "Debug Window"
msgstr "调试窗口"
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-dialog.c:1017
msgid "Pause"
msgstr "暂停"
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-dialog.c:1029
msgid "Level "
msgstr "级别 "
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-dialog.c:1098
msgid "Time"
msgstr "时间"
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-dialog.c:1100
msgid "Domain"
msgstr "域"
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-dialog.c:1102
msgid "Category"
msgstr "类别"
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-dialog.c:1104
msgid "Level"
msgstr "级别"
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-dialog.c:1136
msgid ""
"The selected connection manager does not support the remote debugging "
"extension."
msgstr "已选定的连接管理不支持远程调试扩展"
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Add Account"
+#~ msgstr "添加帐户"
+
+#~ msgid "Gmail"
+#~ msgstr "Gmail"
+
+#~ msgid "Import Accounts..."
+#~ msgstr "导入账户..."
+
+#~ msgid "Settings"
+#~ msgstr "设置"
+
+#~ msgid "Type:"
+#~ msgstr "类型:"
+
+#~ msgid "gtk-leave-fullscreen"
+#~ msgstr "gtk-leave-fullscreen"
+
#~ msgid "Empathy Instant Messenger"
#~ msgstr "Empathy 即时通讯程序"
@@ -2630,57 +2912,15 @@ msgstr "已选定的连接管理不支持远程调试扩展"
#~ msgid "<b>Settings</b>"
#~ msgstr "<b>设置</b>"
-#~ msgid "I already have an account I want to use"
-#~ msgstr "我已经拥有账户,我想使用它"
-
-#~ msgid "C_lear"
-#~ msgstr "清除(_L)"
-
-#~ msgid "Chat"
-#~ msgstr "聊天"
-
-#~ msgid "Insert _Smiley"
-#~ msgstr "插入表情(_M)"
-
#~ msgid "Invitation _message:"
#~ msgstr "邀请消息(_M):"
#~ msgid "Invite"
#~ msgstr "邀请"
-#~ msgid "Move Tab _Left"
-#~ msgstr "左移标签(_L)"
-
-#~ msgid "Move Tab _Right"
-#~ msgstr "右移标签(_R)"
-
-#~ msgid "Select who would you like to invite:"
-#~ msgstr "选择您要邀请的人:"
-
#~ msgid "You have been invited to join a chat conference."
#~ msgstr "您被邀请加入一个聊天会议。"
-#~ msgid "_Contact"
-#~ msgstr "联系人(_C)"
-
-#~ msgid "_Conversation"
-#~ msgstr "对话(_C)"
-
-#~ msgid "_Detach Tab"
-#~ msgstr "漂移标签(_D)"
-
-#~ msgid "_Favorite Chatroom"
-#~ msgstr "收藏聊天室(_F)"
-
-#~ msgid "_Next Tab"
-#~ msgstr "下一标签(_N)"
-
-#~ msgid "_Previous Tab"
-#~ msgstr "上一标签(_P)"
-
-#~ msgid "_Tabs"
-#~ msgstr "标签(_T)"
-
#~ msgid "Edit Favorite Room"
#~ msgstr "编辑聊天室收藏"