diff options
| author | Aron Xu <aronxu@gnome.org> | 2010-03-29 18:36:47 +0800 |
|---|---|---|
| committer | Aron Xu <aronxu@gnome.org> | 2010-03-29 18:37:56 +0800 |
| commit | 8a7843d2d137f6bd8ca336b79226b7e7a9d79bfa (patch) | |
| tree | f511010ddfe09db4109bbe5afb32af2729c93530 | |
| parent | 6bd3bfe6aa288d05f1aaf4cdbbf2f9ac574a3121 (diff) | |
| download | gsoc2013-empathy-8a7843d2d137f6bd8ca336b79226b7e7a9d79bfa.tar.gz gsoc2013-empathy-8a7843d2d137f6bd8ca336b79226b7e7a9d79bfa.tar.zst gsoc2013-empathy-8a7843d2d137f6bd8ca336b79226b7e7a9d79bfa.zip | |
Update Simplified Chinese translation.
| -rw-r--r-- | po/zh_CN.po | 1686 |
1 files changed, 960 insertions, 726 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po index 6be5530e0..a332636df 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,6 +1,6 @@ # Simplified Chinese translation of Empathy. # Convert to Simp. Chinese translation of Empathy. -# Copyright (C) 2003-2009 Free Software Foundation, Inc. +# Copyright (C) 2003, 2008, 2009, 2010 Free Software Foundation, Inc. # This file is distributed under the same license as the Empathy package. # # Abel Cheung <maddog@linux.org.hk>, 2003. @@ -8,21 +8,20 @@ # Rongjun Mu <elanmu@sina.com>, 2003. # YangZhang <zyangmath@gmail.com>, 2008. # Funda Wang <fundawang@gmail.com>, 2009. -# Aron Xu <aronxu@gnome.org>, 2009. # Lyper Lai <lyp069@gmail.com>, 2009. # Yun Nie <yun.nie@ptiglobal.net>, 2009. # Richard Ma <richard.ma.19850509@gmail.com>, 2009. # Tao Wei <weitao1979@gmail.com>, 2009. +# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010. # msgid "" msgstr "" "Project-Id-Version: empathy master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=empathy&component=general\n" -"POT-Creation-Date: 2009-12-08 15:17+0000\n" -"PO-Revision-Date: 2009-12-09 13:06+0800\n" -"Last-Translator: Tao Wei <weitao1979@gmail.com>\n" -"Language-Team: Simplified Chinese <i18n-zh@googlegroups.com>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-03-29 15:43+0800\n" +"PO-Revision-Date: 2010-03-29 18:36+0800\n" +"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" +"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -60,7 +59,7 @@ msgstr "聊天窗口主题" #: ../data/empathy.schemas.in.h:4 msgid "" -"Comma separated list of spell checker languages to use (e.g. en, fr, nl)." +"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")." msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。" #: ../data/empathy.schemas.in.h:5 @@ -93,15 +92,15 @@ msgstr "Empathy 能够发布用户的位置" #: ../data/empathy.schemas.in.h:12 msgid "Empathy can use the GPS to guess the location" -msgstr "Empathy 能够通过 GPS 来估算位置" +msgstr "Empathy 能够通过 GPS 来估计位置" #: ../data/empathy.schemas.in.h:13 msgid "Empathy can use the cellular network to guess the location" -msgstr "Empathy 能够通过手机来估算位置" +msgstr "Empathy 能够通过手机来估计位置" #: ../data/empathy.schemas.in.h:14 msgid "Empathy can use the network to guess the location" -msgstr "Empathy 能够通过网络来估算位置" +msgstr "Empathy 能够通过网络来估计位置" #: ../data/empathy.schemas.in.h:15 msgid "Empathy default download folder" @@ -112,104 +111,104 @@ msgid "Empathy has asked about importing accounts" msgstr "Empathy 已经询问导入账户" #: ../data/empathy.schemas.in.h:17 +msgid "Empathy has migrated butterfly logs" +msgstr "" + +#: ../data/empathy.schemas.in.h:18 msgid "Empathy should auto-connect on startup" msgstr "Empathy 启动时是否自动连接" -#: ../data/empathy.schemas.in.h:18 +#: ../data/empathy.schemas.in.h:19 msgid "Empathy should reduce the location's accuracy" msgstr "降低 Emapthy 位置信息的准确度" -#: ../data/empathy.schemas.in.h:19 +#: ../data/empathy.schemas.in.h:20 msgid "Empathy should use the avatar of the contact as the chat window icon" msgstr "Empathy 是否使用联系人头像作为聊天窗口图标" -#: ../data/empathy.schemas.in.h:20 +#: ../data/empathy.schemas.in.h:21 msgid "Enable WebKit Developer Tools" msgstr "启用 WebKit 开发工具" -#: ../data/empathy.schemas.in.h:21 +#: ../data/empathy.schemas.in.h:22 msgid "Enable popup notifications for new messages" msgstr "启用新消息弹出提示" -#: ../data/empathy.schemas.in.h:22 +#: ../data/empathy.schemas.in.h:23 msgid "Enable spell checker" msgstr "启用拼写检查器" -#: ../data/empathy.schemas.in.h:23 +#: ../data/empathy.schemas.in.h:24 msgid "Hide main window" msgstr "隐藏主窗口" -#: ../data/empathy.schemas.in.h:24 +#: ../data/empathy.schemas.in.h:25 msgid "Hide the main window." msgstr "隐藏主窗口。" -#: ../data/empathy.schemas.in.h:25 +#: ../data/empathy.schemas.in.h:26 msgid "MC 4 accounts have been imported" msgstr "MC 4 账户已经被导入" -#: ../data/empathy.schemas.in.h:26 +#: ../data/empathy.schemas.in.h:27 msgid "MC 4 accounts have been imported." msgstr "MC 4 帐户已经被导入。" -#: ../data/empathy.schemas.in.h:27 +#: ../data/empathy.schemas.in.h:28 msgid "Nick completed character" msgstr "昵称补全字符" -#: ../data/empathy.schemas.in.h:28 +#: ../data/empathy.schemas.in.h:29 msgid "Open new chats in separate windows" msgstr "在单独窗口中打开新聊天" -#: ../data/empathy.schemas.in.h:29 -msgid "Path of the adium theme to use" +#: ../data/empathy.schemas.in.h:30 +msgid "Path of the Adium theme to use" msgstr "Adium 主题的路径" -#: ../data/empathy.schemas.in.h:30 -msgid "Path of the adium theme to use if the theme used for chat is adium." +#: ../data/empathy.schemas.in.h:31 +msgid "Path of the Adium theme to use if the theme used for chat is Adium." msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径" -#: ../data/empathy.schemas.in.h:31 +#: ../data/empathy.schemas.in.h:32 msgid "Play a sound for incoming messages" msgstr "收到消息时播放声音" -#: ../data/empathy.schemas.in.h:32 +#: ../data/empathy.schemas.in.h:33 msgid "Play a sound for new conversations" msgstr "新对话时播放声音" -#: ../data/empathy.schemas.in.h:33 +#: ../data/empathy.schemas.in.h:34 msgid "Play a sound for outgoing messages" msgstr "发出消息时播放声音" -#: ../data/empathy.schemas.in.h:34 +#: ../data/empathy.schemas.in.h:35 msgid "Play a sound when a contact logs in" msgstr "联系人登录时播放声音" -#: ../data/empathy.schemas.in.h:35 +#: ../data/empathy.schemas.in.h:36 msgid "Play a sound when a contact logs out" msgstr "联系人注销时播放声音" -#: ../data/empathy.schemas.in.h:36 +#: ../data/empathy.schemas.in.h:37 msgid "Play a sound when we log in" msgstr "登录时播放声音" -#: ../data/empathy.schemas.in.h:37 +#: ../data/empathy.schemas.in.h:38 msgid "Play a sound when we log out" msgstr "注销时播放声音" -#: ../data/empathy.schemas.in.h:38 -msgid "Popup notifications if the chat isn't focused" -msgstr "如果聊天窗口不是焦点则弹出消息通知" - #: ../data/empathy.schemas.in.h:39 -msgid "Popup notifications when a contact sign in" -msgstr "当联系人登录时弹出通知" +msgid "Pop up notifications if the chat isn't focused" +msgstr "如果聊天窗口不是焦点则弹出消息通知" #: ../data/empathy.schemas.in.h:40 -msgid "Popup notifications when a contact sign out" -msgstr "当联系人注销时弹出通知" +msgid "Pop up notifications when a contact logs in" +msgstr "当联系人登录时弹出通知" #: ../data/empathy.schemas.in.h:41 -msgid "Salut account is created" -msgstr "已创建 Salut 账户" +msgid "Pop up notifications when a contact logs out" +msgstr "当联系人注销时弹出通知" #: ../data/empathy.schemas.in.h:42 msgid "Show avatars" @@ -228,218 +227,226 @@ msgid "Show offline contacts" msgstr "显示离线联系人" #: ../data/empathy.schemas.in.h:46 +msgid "Show protocols" +msgstr "显示协议" + +#: ../data/empathy.schemas.in.h:47 msgid "Spell checking languages" msgstr "拼写检查器语言" -#: ../data/empathy.schemas.in.h:47 +#: ../data/empathy.schemas.in.h:48 msgid "The default folder to save file transfers in." msgstr "保存传送文件的默认文件夹。" -#: ../data/empathy.schemas.in.h:48 +#: ../data/empathy.schemas.in.h:49 msgid "The last directory that an avatar image was chosen from." msgstr "上次选取头像图片的目录。" -#: ../data/empathy.schemas.in.h:49 +#: ../data/empathy.schemas.in.h:50 msgid "The theme that is used to display the conversation in chat windows." msgstr "用于在聊天窗口中显示会话的主题。" -#: ../data/empathy.schemas.in.h:50 +#: ../data/empathy.schemas.in.h:51 msgid "Use graphical smileys" msgstr "使用表情图标" -#: ../data/empathy.schemas.in.h:51 +#: ../data/empathy.schemas.in.h:52 msgid "Use notification sounds" msgstr "使用通知声音" -#: ../data/empathy.schemas.in.h:52 +#: ../data/empathy.schemas.in.h:53 msgid "Use theme for chat rooms" msgstr "为聊天室使用主题" -#: ../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:54 -msgid "Whether or not Empathy can publish the user's location to his contacts." +msgid "Whether Empathy can publish the user's location to their contacts." msgstr "是否允许 Empathy 将用户的位置共享给联系人" #: ../data/empathy.schemas.in.h:55 -msgid "Whether or not Empathy can use the GPS to guess the location." -msgstr "是否允许 Empathy 通过 GPS 估算位置" +msgid "Whether Empathy can use the GPS to guess the location." +msgstr "是否允许 Empathy 通过 GPS 估计位置" #: ../data/empathy.schemas.in.h:56 -msgid "" -"Whether or not Empathy can use the cellular network to guess the location." -msgstr "是否允许 Empathy 通过手机估算位置" +msgid "Whether Empathy can use the cellular network to guess the location." +msgstr "是否允许 Empathy 通过手机网络估计位置" #: ../data/empathy.schemas.in.h:57 -msgid "Whether or not Empathy can use the network to guess the location." -msgstr "是否允许 Empathy 通过网络估算位置" +msgid "Whether Empathy can use the network to guess the location." +msgstr "是否允许 Empathy 通过网络估计位置" #: ../data/empathy.schemas.in.h:58 -msgid "" -"Whether or not Empathy has asked about importing accounts from other " -"programs." +msgid "Whether Empathy has asked about importing accounts from other programs." msgstr "Empathy 是否应该已经询问过要从其它程序中导入账户。" #: ../data/empathy.schemas.in.h:59 -msgid "" -"Whether or not Empathy should automatically log in to your accounts on " -"startup." -msgstr "Empathy 是否在启动时自动登入您的账户。" +msgid "Whether Empathy has migrated butterfly logs." +msgstr "" #: ../data/empathy.schemas.in.h:60 -msgid "" -"Whether or not Empathy should reduce the location's accuracy for privacy " -"reasons." -msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。" +msgid "Whether Empathy should automatically log into your accounts on startup." +msgstr "Empathy 是否在启动时自动登入您的账户。" #: ../data/empathy.schemas.in.h:61 msgid "" -"Whether or not Empathy should use the avatar of the contact as the chat " -"window icon." -msgstr "是否使用联系人的头像作为聊天窗口的图标。" +"Whether Empathy should reduce the location's accuracy for privacy reasons." +msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。" #: ../data/empathy.schemas.in.h:62 msgid "" -"Whether or not connectivity managers should be used to automatically " -"disconnect/reconnect." -msgstr "是否使用连接管理器自动断开连接/重新连接。" +"Whether Empathy should use the avatar of the contact as the chat window icon." +msgstr "是否使用联系人的头像作为聊天窗口的图标。" #: ../data/empathy.schemas.in.h:63 msgid "" -"Whether or not the Salut account has been created on the first Empathy run." -msgstr "是否在 Empathy 第一次运行时创建 Salut 账户。" +"Whether WebKit developer tools, such as the Web Inspector, should be enabled." +msgstr "WebKit 开发工具，例如 Web Inspector 是否应该启用。" #: ../data/empathy.schemas.in.h:64 msgid "" -"Whether or not to check words typed against the languages you want to check " -"with." -msgstr "是否对您想要作拼写检查的单词作拼写检查。" +"Whether connectivity managers should be used to automatically disconnect/" +"reconnect." +msgstr "是否使用连接管理器自动断开连接或重新连接。" #: ../data/empathy.schemas.in.h:65 msgid "" -"Whether or not to convert smileys into graphical images in conversations." -msgstr "对话时是否将表情符号转换为真正的图标。" +"Whether to check words typed against the languages you want to check with." +msgstr "是否对您想要作拼写检查的单词作拼写检查。" #: ../data/empathy.schemas.in.h:66 -msgid "" -"Whether or not to play a sound to notify for contacts logging in the network." -msgstr "是否需要联系人上线提示音。" +msgid "Whether to convert smileys into graphical images in conversations." +msgstr "对话时是否将表情符号转换为表情图标。" #: ../data/empathy.schemas.in.h:67 -msgid "" -"Whether or not to play a sound to notify for contacts logging off the " -"network." -msgstr "是否需要联系人下线提示音。" +msgid "Whether to play a sound to notify of contacts logging into the network." +msgstr "是否需要联系人上线提示音。" #: ../data/empathy.schemas.in.h:68 -msgid "Whether or not to play a sound to notify for events." -msgstr "是否需要事件提示音。" +msgid "" +"Whether to play a sound to notify of contacts logging out of the network." +msgstr "是否需要联系人下线提示音。" #: ../data/empathy.schemas.in.h:69 -msgid "Whether or not to play a sound to notify for incoming messages." -msgstr "是否需要消息到达提示音。" +msgid "Whether to play a sound to notify of events." +msgstr "是否需要事件提示音。" #: ../data/empathy.schemas.in.h:70 -msgid "Whether or not to play a sound to notify for new conversations." -msgstr "是否需要新会话提示音。" +msgid "Whether to play a sound to notify of incoming messages." +msgstr "是否需要消息到达提示音。" #: ../data/empathy.schemas.in.h:71 -msgid "Whether or not to play a sound to notify for outgoing messages." -msgstr "是否为外出消息使用语音提示。" +msgid "Whether to play a sound to notify of new conversations." +msgstr "是否需要新会话提示音。" #: ../data/empathy.schemas.in.h:72 -msgid "Whether or not to play a sound when logging in a network." -msgstr "当联网登录时是否播放提示音。" +msgid "Whether to play a sound to notify of outgoing messages." +msgstr "是否为外出消息使用声音提示。" #: ../data/empathy.schemas.in.h:73 -msgid "Whether or not to play a sound when logging off a network." -msgstr "当网络断开时是否播放提示音。" +msgid "Whether to play a sound when logging into a network." +msgstr "当联网登录时是否播放提示音。" #: ../data/empathy.schemas.in.h:74 -msgid "Whether or not to play sound notifications when away or busy." -msgstr "当离开或忙碌时是否使用语音通知。" +msgid "Whether to play a sound when logging out of a network." +msgstr "当网络断开时是否播放提示音。" #: ../data/empathy.schemas.in.h:75 -msgid "" -"Whether or not to show a popup notification when a contact goes offline." -msgstr "当联系人离线时是否显示弹出通知。" +msgid "Whether to play sound notifications when away or busy." +msgstr "当离开或忙碌时是否使用声音提示。" #: ../data/empathy.schemas.in.h:76 -msgid "Whether or not to show a popup notification when a contact goes online." -msgstr "当联系人上线时是否显示弹出通知" +msgid "Whether to show a popup notification when a contact goes offline." +msgstr "当联系人离线时是否显示弹出通知。" #: ../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 "当接收新消息时是否显示弹出提示即聊天窗口已开启，但未闲置。" +msgid "Whether to show a popup notification when a contact goes online." +msgstr "当联系人上线时是否显示弹出通知" #: ../data/empathy.schemas.in.h:78 +#, fuzzy msgid "" -"Whether or not to show a popup notification when receiving a new message." -msgstr "当收到新消息时是否弹出显示提示框。" +"Whether 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:79 -msgid "" -"Whether or not to show avatars for contacts in the contact list and chat " -"windows." -msgstr "是否在联系人列表和聊天窗口中显示头像。" +msgid "Whether to show a popup notification when receiving a new message." +msgstr "当收到新消息时是否弹出显示提示框。" #: ../data/empathy.schemas.in.h:80 -msgid "Whether or not to show contacts that are offline in the contact list." -msgstr "是否显示联系人清单中离线的联系人。" +msgid "" +"Whether to show avatars for contacts in the contact list and chat windows." +msgstr "是否在联系人列表和聊天窗口中显示头像。" #: ../data/empathy.schemas.in.h:81 -msgid "Whether or not to show popup notifications when away or busy." -msgstr "当离开活忙碌时是否弹出显示提示框。" +msgid "Whether to show contacts that are offline in the contact list." +msgstr "是否显示联系人清单中离线的联系人。" #: ../data/empathy.schemas.in.h:82 -msgid "Whether or not to show the contact list in chat rooms." -msgstr "是否在聊天室显示联系人列表。" +msgid "Whether to show popup notifications when away or busy." +msgstr "当离开或忙碌时是否弹出显示提示框。" #: ../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”按钮关闭主窗口显示消息对话框。" +msgid "Whether to show protocols for contacts in the contact list." +msgstr "是否在联系人列表和聊天窗口中显示协议。" #: ../data/empathy.schemas.in.h:84 -msgid "Whether to show the contact list in compact mode or not." -msgstr "是否以紧凑格式显示联系人列表。" +msgid "Whether to show the contact list in chat rooms." +msgstr "是否在聊天室显示联系人列表。" #: ../data/empathy.schemas.in.h:85 -msgid "Whether to use the theme for chat rooms or not." -msgstr "是否对聊天室使用主题。" +msgid "Whether to show the contact list in compact mode." +msgstr "是否以紧凑模式显示联系人列表。" #: ../data/empathy.schemas.in.h:86 +#, fuzzy +msgid "" +"Whether 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:87 +msgid "Whether to use the theme for chat rooms." +msgstr "是否对聊天室使用主题。" + +#: ../data/empathy.schemas.in.h:88 +#, fuzzy msgid "" -"Which criterion 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 " -"sort the contact list by state." +"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 " +"the contact list by state." msgstr "" "使用何种条件来排序联系人列表。默认情况下使用值“name”以按联系人姓名排序。取值" "为“state“时将按状态排序联系人列表。" -#: ../libempathy/empathy-ft-handler.c:839 +#: ../data/empathy-accounts.desktop.in.in.h:1 +msgid "Manage Messaging and VoIP accounts" +msgstr "管理消息和 VoIP 帐户" + +#. Tweak the dialog +#: ../data/empathy-accounts.desktop.in.in.h:2 +#: ../src/empathy-accounts-dialog.c:2066 ../src/cc-empathy-accounts-page.c:243 +#: ../src/cc-empathy-accounts-panel.c:91 +msgid "Messaging and VoIP Accounts" +msgstr "消息和 VoIP 帐户" + +#: ../libempathy/empathy-ft-handler.c:842 msgid "The hash of the received file and the sent one do not match" msgstr "接收到的文件和发送的那个文件哈希值不匹配" -#: ../libempathy/empathy-ft-handler.c:1099 +#: ../libempathy/empathy-ft-handler.c:1102 msgid "File transfer not supported by remote contact" msgstr "文件传输不支持远程连接" -#: ../libempathy/empathy-ft-handler.c:1157 +#: ../libempathy/empathy-ft-handler.c:1160 msgid "The selected file is not a regular file" msgstr "所选文件是非正常的文件" -#: ../libempathy/empathy-ft-handler.c:1166 +#: ../libempathy/empathy-ft-handler.c:1169 msgid "The selected file is empty" msgstr "所选文件是空的" -#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:293 +#: ../libempathy/empathy-tp-contact-list.c:834 +#: ../src/empathy-auto-salut-account-helper.c:77 msgid "People nearby" msgstr "附近的人" @@ -471,7 +478,7 @@ msgstr "当传输这个文件的时候发生错误" msgid "The other participant is unable to transfer the file" msgstr "另外的参与者无法传输这个文件" -#: ../libempathy/empathy-tp-file.c:417 +#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314 msgid "Unknown reason" msgstr "未知原因" @@ -488,22 +495,78 @@ msgid "Away" msgstr "离开" #: ../libempathy/empathy-utils.c:245 -msgid "Hidden" +msgid "Invisible" msgstr "隐身" #: ../libempathy/empathy-utils.c:247 msgid "Offline" msgstr "离线" -#: ../libempathy/empathy-utils.c:383 ../src/empathy-import-mc4-accounts.c:104 +#: ../libempathy/empathy-utils.c:286 +msgid "No reason specified" +msgstr "未指定原因" + +#: ../libempathy/empathy-utils.c:288 +msgid "Status is set to offline" +msgstr "状态已设置为离线" + +#: ../libempathy/empathy-utils.c:290 +msgid "Network error" +msgstr "网络错误" + +#: ../libempathy/empathy-utils.c:292 +msgid "Authentication failed" +msgstr "验证失败" + +#: ../libempathy/empathy-utils.c:294 +msgid "Encryption error" +msgstr "加密错误" + +#: ../libempathy/empathy-utils.c:296 +msgid "Name in use" +msgstr "用户名已经被占用" + +#: ../libempathy/empathy-utils.c:298 +msgid "Certificate not provided" +msgstr "未提供证书" + +#: ../libempathy/empathy-utils.c:300 +msgid "Certificate untrusted" +msgstr "证书不被信任" + +#: ../libempathy/empathy-utils.c:302 +msgid "Certificate expired" +msgstr "证书已过期" + +#: ../libempathy/empathy-utils.c:304 +msgid "Certificate not activated" +msgstr "证书尚未激活" + +#: ../libempathy/empathy-utils.c:306 +msgid "Certificate hostname mismatch" +msgstr "证书主机名不匹配" + +#: ../libempathy/empathy-utils.c:308 +msgid "Certificate fingerprint mismatch" +msgstr "证书指纹不匹配" + +#: ../libempathy/empathy-utils.c:310 +msgid "Certificate self-signed" +msgstr "证书是自签属的" + +#: ../libempathy/empathy-utils.c:312 +msgid "Certificate error" +msgstr "证书错误" + +#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104 msgid "People Nearby" msgstr "附近的人" -#: ../libempathy/empathy-utils.c:388 +#: ../libempathy/empathy-utils.c:434 msgid "Yahoo! Japan" msgstr "Yahoo! 日本" -#: ../libempathy/empathy-utils.c:389 +#: ../libempathy/empathy-utils.c:435 msgid "Facebook Chat" msgstr "Facebook 聊天" @@ -547,57 +610,69 @@ msgstr[0] "%d 月前" msgid "in the future" msgstr "将来" -#: ../libempathy-gtk/empathy-account-chooser.c:450 +#: ../libempathy-gtk/empathy-account-chooser.c:462 msgid "All" msgstr "全部" -#: ../libempathy-gtk/empathy-account-widget.c:519 -#: ../libempathy-gtk/empathy-account-widget.c:575 +#: ../libempathy-gtk/empathy-account-widget.c:538 +#: ../libempathy-gtk/empathy-account-widget.c:594 #, c-format msgid "%s:" msgstr "%s：" -#: ../libempathy-gtk/empathy-account-widget.c:1292 +#: ../libempathy-gtk/empathy-account-widget.c:1126 +msgid "Username:" +msgstr "用户名：" + +#: ../libempathy-gtk/empathy-account-widget.c:1474 msgid "L_og in" msgstr "登录(_O)" -#: ../libempathy-gtk/empathy-account-widget.c:1500 -msgid "Enabled" -msgstr "启用" - -#. Translators: this is used only when built on a moblin platform -#: ../libempathy-gtk/empathy-account-widget.c:1506 +#: ../libempathy-gtk/empathy-account-widget.c:1542 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2 -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1 +#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1 #: ../src/empathy-chatrooms-window.ui.h:1 #: ../src/empathy-new-chatroom-dialog.ui.h:1 msgid "Account:" msgstr "账户：" +#: ../libempathy-gtk/empathy-account-widget.c:1553 +msgid "Enabled" +msgstr "启用" + +#: ../libempathy-gtk/empathy-account-widget.c:1618 +#, fuzzy +msgid "This account already exists on the server" +msgstr "这不会删除服务器上的账户。" + +#: ../libempathy-gtk/empathy-account-widget.c:1621 +msgid "Create a new account on the server" +msgstr "在服务器上创建新的帐户" + #. To translators: The first parameter is the login id and the #. * second one is the server. The resulting string will be something #. * like: "MyUserName on chat.freenode.net". #. * 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:1770 +#: ../libempathy-gtk/empathy-account-widget.c:2013 #, 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:1788 +#: ../libempathy-gtk/empathy-account-widget.c:2039 #, c-format msgid "%s Account" msgstr "%s 账户" -#: ../libempathy-gtk/empathy-account-widget.c:1792 +#: ../libempathy-gtk/empathy-account-widget.c:2043 msgid "New account" msgstr "新建账户" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1 -msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>" -msgstr "<span size=\"small\"><b>例如：</b> 我的屏幕名称</span>" +msgid "<b>Example:</b> MyScreenName" +msgstr "<b>例如：</b> 我的屏幕名称" #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1 @@ -606,7 +681,7 @@ msgstr "<span size=\"small\"><b>例如：</b> 我的屏幕名称</span>" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2 msgid "Advanced" msgstr "高级" @@ -616,7 +691,7 @@ msgstr "高级" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4 -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3 msgid "Pass_word:" msgstr "密码(_W)：" @@ -636,7 +711,7 @@ msgstr "您的 AIM 屏幕名称是什么？" #: ../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:18 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10 msgid "_Port:" @@ -645,7 +720,7 @@ msgstr "端口(_P)：" #: ../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:19 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25 #: ../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 @@ -654,8 +729,8 @@ msgstr "服务器(_S)：" #: ../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 "<span size=\"small\"><b>例如：</b>用户名</span>" +msgid "<b>Example:</b> username" +msgstr "<b>例如：</b>用户名" #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4 @@ -672,8 +747,8 @@ msgid "What is your GroupWise password?" msgstr "您的 GroupWise 密码是什么？" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1 -msgid "<span size=\"small\"><b>Example:</b> 123456789</span>" -msgstr "<span size=\"small\"><b>例如：</b>123456789</span>" +msgid "<b>Example:</b> 123456789" +msgstr "<b>例如：</b>123456789" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3 msgid "ICQ _UIN:" @@ -689,7 +764,7 @@ msgstr "您的 ICQ 密码是什么？" #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8 -msgid "_Charset:" +msgid "_Character set:" msgstr "字符集(_C)：" #: ../libempathy-gtk/empathy-account-widget-irc.c:244 @@ -717,20 +792,20 @@ msgstr "TLS" #. * best to keep the English version. #: ../libempathy-gtk/empathy-account-widget-sip.c:222 msgid "Register" -msgstr "" +msgstr "注册" #. translators: this string is very specific to SIP's internal; maybe #. * best to keep the English version. #: ../libempathy-gtk/empathy-account-widget-sip.c:227 msgid "Options" -msgstr "" +msgstr "选项" #: ../libempathy-gtk/empathy-account-widget-sip.c:230 msgid "None" msgstr "无" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1 -msgid "Charset:" +msgid "Character set:" msgstr "字符集：" #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2 @@ -762,12 +837,12 @@ msgid "Servers" msgstr "服务器" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1 -msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>" -msgstr "<span size=\"small\"><b>例如：</b> user@gmail.com</span>" +msgid "<b>Example:</b> user@gmail.com" +msgstr "<b>例如：</b>user@gmail.com" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2 -msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>" -msgstr "<span size=\"small\"><b>例如：</b> user@jabber.org</span>" +msgid "<b>Example:</b> user@jabber.org" +msgstr "<b>例如：</b>user@jabber.org" #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5 msgid "Override server settings" @@ -781,56 +856,73 @@ msgstr "优先级(_O)：" msgid "Reso_urce:" msgstr "资源(_U)：" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9 +#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice. +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +msgid "" +"This is your username, not your normal Facebook login.\n" +"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n" +"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a " +"Facebook username if you don't have one." +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 msgid "Use old SS_L" msgstr "使用旧的 SS_L" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +msgid "What is your Facebook password?" +msgstr "您的 Facebook 密码是什么？" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +msgid "What is your Facebook username?" +msgstr "您的 Facebook 用户名是什么？" + +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 msgid "What is your Google ID?" msgstr "您的 Google ID 是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 msgid "What is your Google password?" msgstr "您的 Google 密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18 msgid "What is your Jabber ID?" msgstr "您的 Jabber ID 是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19 msgid "What is your Jabber password?" msgstr "您的 Jabber 密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20 msgid "What is your desired Jabber ID?" msgstr "您想要的 Jabber ID 是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21 msgid "What is your desired Jabber password?" msgstr "您想要的 Jabber 密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22 msgid "_Encryption required (TLS/SSL)" msgstr "需要加密(TLS/SSL)(_E)" -#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17 +#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23 msgid "_Ignore SSL certificate errors" msgstr "忽略 SSL 证书错误(_I)" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1 -msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>" -msgstr "<span size=\"small\"><b>例如：</b> user@hotmail.com</span>" +msgid "<b>Example:</b> user@hotmail.com" +msgstr "<b>例如：</b>user@hotmail.com" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5 -msgid "What is your Windows Live password?" -msgstr "您的 Windows Live 密码是什么？" +msgid "What is your Windows Live ID?" +msgstr "您的 Windows Live 帐户是什么？" #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6 -msgid "What is your Windows Live user name?" -msgstr "您的 Windows Live 用户名是什么？" +msgid "What is your Windows Live password?" +msgstr "您的 Windows Live 密码是什么？" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2 -msgid "_Email:" +msgid "_E-mail address:" msgstr "电子邮件(_E)：" #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3 @@ -854,90 +946,111 @@ msgid "_Published Name:" msgstr "公开的名字(_P)：" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1 -msgid "<b>Keep-Alive Options</b>" -msgstr "" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2 -msgid "<b>Miscellaneous Options</b>" -msgstr "<b>杂项选项</b>" +msgid "<b>Example:</b> user@my.sip.server" +msgstr "<b>例如：</b>user@my.sip.server" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3 -msgid "<b>NAT Traversal Options</b>" -msgstr "" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 -msgid "<b>Proxy Options</b>" -msgstr "<b>代理选项</b>" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 -msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>" -msgstr "<span size=\"small\"><b>例如：</b> user@my.sip.server</span>" - -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 msgid "Authentication username:" msgstr "验证用户名：" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4 msgid "Discover Binding" 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:10 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5 msgid "Discover the STUN server automatically" msgstr "" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6 msgid "Hostname of the proxy for outbound requests." msgstr "" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7 msgid "Interval (seconds)" msgstr "间隔(秒)" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8 +msgid "Keep-Alive Options" +msgstr "Keep-Alive 选项" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9 +msgid "" +"Look up the DNS SRV record at the service's domain for the host name of a " +"STUN server." +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10 msgid "Loose Routing" msgstr "" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11 msgid "Mechanism:" msgstr "机制：" +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12 +msgid "Miscellaneous Options" +msgstr "杂项" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13 +msgid "NAT Traversal Options" +msgstr "NAT 选项" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15 +msgid "Port of the proxy for outbound requests." +msgstr "出站代理端口" + #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16 msgid "Port:" msgstr "端口：" #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17 +msgid "Proxy Options" +msgstr "代理选项" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 msgid "STUN Server:" msgstr "STUN 服务器：" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 msgid "Server:" msgstr "服务器：" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20 msgid "" "The username for SIP authentication, if different from the SIP URI\n" "username." msgstr "" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 msgid "Transport:" msgstr "传输：" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +msgid "" +"Update the registration binding if the external address for the client is " +"discovered to be different from the local binding." +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +msgid "" +"Use the loose routing behavior and the Route header as recommended in RFC " +"3261." +msgstr "" + +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25 msgid "What is your SIP account password?" msgstr "您的 SIP 账户密码是什么？" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26 msgid "What is your SIP login ID?" msgstr "您的 SIP 登录 ID 是什么？" -#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24 +#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27 msgid "_Username:" msgstr "用户名(_U)：" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4 -msgid "Use _Yahoo Japan" +msgid "Use _Yahoo! Japan" msgstr "使用 _Yahoo 日本" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5 @@ -949,11 +1062,11 @@ msgid "What is your Yahoo! password?" msgstr "您的 Yahoo! 密码是什么？" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7 -msgid "Yahoo I_D:" +msgid "Yahoo! I_D:" msgstr "Yahoo I_D：" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9 -msgid "_Ignore conference and chatroom invitations" +msgid "_Ignore conference and chat room invitations" msgstr "忽略会议和聊天室邀请(_I)" #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11 @@ -966,7 +1079,8 @@ msgid "Couldn't convert image" msgstr "无法转换图像" #: ../libempathy-gtk/empathy-avatar-chooser.c:450 -msgid "None of the accepted image formats is supported on your system" +#, fuzzy +msgid "None of the accepted image formats are supported on your system" msgstr "没有一个公认的图片格式能被您的系统支持" #: ../libempathy-gtk/empathy-avatar-chooser.c:915 @@ -989,145 +1103,149 @@ msgstr "所有文件" msgid "Click to enlarge" msgstr "单击以放大" -#: ../libempathy-gtk/empathy-chat.c:199 +#: ../libempathy-gtk/empathy-chat.c:233 msgid "Failed to reconnect this chat" msgstr "重新连接到对话失败" -#: ../libempathy-gtk/empathy-chat.c:621 -msgid "Failed to join chatroom" +#: ../libempathy-gtk/empathy-chat.c:655 +msgid "Failed to join chat room" msgstr "加入聊天室失败" -#: ../libempathy-gtk/empathy-chat.c:639 +#: ../libempathy-gtk/empathy-chat.c:673 msgid "Failed to open private chat" msgstr "建立私人对话失败" -#: ../libempathy-gtk/empathy-chat.c:678 +#: ../libempathy-gtk/empathy-chat.c:712 msgid "Topic not supported on this conversation" msgstr "不支持在此会话上设置主题" -#: ../libempathy-gtk/empathy-chat.c:684 +#: ../libempathy-gtk/empathy-chat.c:718 msgid "You are not allowed to change the topic" msgstr "您不能更改主题" -#: ../libempathy-gtk/empathy-chat.c:802 -msgid "/clear, clear all messages from the current conversation" +#: ../libempathy-gtk/empathy-chat.c:847 +msgid "/clear: clear all messages from the current conversation" msgstr "/clear，清空当前会话的所有消息" -#: ../libempathy-gtk/empathy-chat.c:805 -msgid "/topic <topic>, set the topic of the current conversation" -msgstr "/topic <topic>，设定当前对话的主题" +#: ../libempathy-gtk/empathy-chat.c:850 +msgid "/topic <topic>: set the topic of the current conversation" +msgstr "/topic <主题>，设定当前对话的主题" -#: ../libempathy-gtk/empathy-chat.c:808 -msgid "/join <chatroom id>, join a new chatroom" -msgstr "/join <chatroom id>，加入一个新的聊天室" +#: ../libempathy-gtk/empathy-chat.c:853 +msgid "/join <chat room ID>: join a new chat room" +msgstr "/join <聊天室名>，加入一个新的聊天室" -#: ../libempathy-gtk/empathy-chat.c:811 -msgid "/j <chatroom id>, join a new chatroom" -msgstr "/j <chatroom id>，加入一个新的聊天室" +#: ../libempathy-gtk/empathy-chat.c:856 +msgid "/j <chat room ID>: join a new chat room" +msgstr "/j <聊天室名>，加入一个新的聊天室" -#: ../libempathy-gtk/empathy-chat.c:814 -msgid "/query <contact id> [<message>], open a private chat" -msgstr "/query <contact id> [<message>]，打开一个私人聊天" +#: ../libempathy-gtk/empathy-chat.c:859 +msgid "/query <contact ID> [<message>]: open a private chat" +msgstr "/query <昵称> [<消息>]，打开一个私人聊天" -#: ../libempathy-gtk/empathy-chat.c:817 -msgid "/msg <contact id> <message>, open a private chat" -msgstr "/msg <contact id> <message>，打开一个私人聊天" +#: ../libempathy-gtk/empathy-chat.c:862 +msgid "/msg <contact ID> <message>: open a private chat" +msgstr "/msg <昵称> <消息>，打开一个私人聊天" -#: ../libempathy-gtk/empathy-chat.c:820 -msgid "/nick <nickname>, change your nickname on current server" -msgstr "/nick <nickname>，在当前服务器上改变您的昵称" +#: ../libempathy-gtk/empathy-chat.c:865 +msgid "/nick <nickname>: change your nickname on the current server" +msgstr "/nick <昵称>，在当前服务器上改变您的昵称" -#: ../libempathy-gtk/empathy-chat.c:823 -msgid "/me <message>, send an ACTION message to the current conversation" -msgstr "" +#: ../libempathy-gtk/empathy-chat.c:868 +msgid "/me <message>: send an ACTION message to the current conversation" +msgstr "/me <动作消息>，向当前对话中发送一个动作消息" -#: ../libempathy-gtk/empathy-chat.c:826 +#: ../libempathy-gtk/empathy-chat.c:871 msgid "" -"/say <message>, send <message> to the current conversation. This is used to " +"/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 " -"join a new chatroom\"" +"join a new chat room\"" msgstr "" -"/say <message>，发送 <message> 到当前对话。这是用来发送一个“/”开始的信息。例" +"/say <消息>，发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例" "如：“/say /join 是用来加入一个新的聊天室”" -#: ../libempathy-gtk/empathy-chat.c:831 +#: ../libempathy-gtk/empathy-chat.c:876 msgid "" -"/help [<command>], show all supported commands. If <command> is defined, " +"/help [<command>]: show all supported commands. If <command> is defined, " "show its usage." msgstr "" -"/help [<command>]，显示所有支持的命令。如果 <command> 被定义的，显示它的用" +"/help [<命令>]，显示所有支持的命令。如果 <命令> 是有定义的，则显示它的用" "法。" -#: ../libempathy-gtk/empathy-chat.c:841 +#: ../libempathy-gtk/empathy-chat.c:886 #, c-format msgid "Usage: %s" msgstr "用法：%s" -#: ../libempathy-gtk/empathy-chat.c:870 +#: ../libempathy-gtk/empathy-chat.c:915 msgid "Unknown command" msgstr "未知命令" -#: ../libempathy-gtk/empathy-chat.c:991 -msgid "Unknown command, see /help for the available commands" +#: ../libempathy-gtk/empathy-chat.c:1036 +msgid "Unknown command; see /help for the available commands" msgstr "未知命令，请使用 /help 查阅可用命令" -#: ../libempathy-gtk/empathy-chat.c:1130 +#: ../libempathy-gtk/empathy-chat.c:1174 msgid "offline" msgstr "离线" -#: ../libempathy-gtk/empathy-chat.c:1133 +#: ../libempathy-gtk/empathy-chat.c:1177 msgid "invalid contact" msgstr "无效联系人" -#: ../libempathy-gtk/empathy-chat.c:1136 +#: ../libempathy-gtk/empathy-chat.c:1180 msgid "permission denied" msgstr "权限不足" -#: ../libempathy-gtk/empathy-chat.c:1139 +#: ../libempathy-gtk/empathy-chat.c:1183 msgid "too long message" msgstr "消息太长" -#: ../libempathy-gtk/empathy-chat.c:1142 +#: ../libempathy-gtk/empathy-chat.c:1186 msgid "not implemented" msgstr "尚未实现" -#: ../libempathy-gtk/empathy-chat.c:1145 +#: ../libempathy-gtk/empathy-chat.c:1189 msgid "unknown" msgstr "未知" -#: ../libempathy-gtk/empathy-chat.c:1149 +#: ../libempathy-gtk/empathy-chat.c:1193 #, c-format msgid "Error sending message '%s': %s" msgstr "发送消息“%s”出错：%s" -#: ../libempathy-gtk/empathy-chat.c:1179 +#: ../libempathy-gtk/empathy-chat.c:1228 #, c-format msgid "Topic set to: %s" msgstr "话题被设置为：%s" -#: ../libempathy-gtk/empathy-chat.c:1181 +#: ../libempathy-gtk/empathy-chat.c:1230 msgid "No topic defined" msgstr "未设置话题" -#: ../libempathy-gtk/empathy-chat.c:1554 +#: ../libempathy-gtk/empathy-chat.c:1629 msgid "(No Suggestions)" msgstr "(没有建议)" -#: ../libempathy-gtk/empathy-chat.c:1608 +#: ../libempathy-gtk/empathy-chat.c:1683 msgid "Insert Smiley" msgstr "插入表情" #. send button -#: ../libempathy-gtk/empathy-chat.c:1626 -#: ../libempathy-gtk/empathy-ui-utils.c:1545 +#: ../libempathy-gtk/empathy-chat.c:1701 +#: ../libempathy-gtk/empathy-ui-utils.c:1675 msgid "_Send" msgstr "发送(_S)" -#: ../libempathy-gtk/empathy-chat.c:1660 +#: ../libempathy-gtk/empathy-chat.c:1735 msgid "_Spelling Suggestions" msgstr "拼写建议(_S)" -#: ../libempathy-gtk/empathy-chat.c:1775 +#: ../libempathy-gtk/empathy-chat.c:1829 +msgid "Failed to retrieve recent logs" +msgstr "获取最近日志失败" + +#: ../libempathy-gtk/empathy-chat.c:1960 #, c-format msgid "%s has disconnected" msgstr "%s 已断开连接" @@ -1135,12 +1253,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:1782 +#: ../libempathy-gtk/empathy-chat.c:1967 #, c-format msgid "%1$s was kicked by %2$s" msgstr "%1$s 被 %2$s 踢出" -#: ../libempathy-gtk/empathy-chat.c:1785 +#: ../libempathy-gtk/empathy-chat.c:1970 #, c-format msgid "%s was kicked" msgstr "%s 被踢出" @@ -1148,17 +1266,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:1793 +#: ../libempathy-gtk/empathy-chat.c:1978 #, c-format msgid "%1$s was banned by %2$s" msgstr "%s 已被 %s 禁止" -#: ../libempathy-gtk/empathy-chat.c:1796 +#: ../libempathy-gtk/empathy-chat.c:1981 #, c-format msgid "%s was banned" msgstr "%s 被禁止" -#: ../libempathy-gtk/empathy-chat.c:1800 +#: ../libempathy-gtk/empathy-chat.c:1985 #, c-format msgid "%s has left the room" msgstr "%s 离开了聊天室" @@ -1168,81 +1286,81 @@ msgstr "%s 离开了聊天室" #. * given by the user living the room. If this poses a problem, #. * please let us know. :-) #. -#: ../libempathy-gtk/empathy-chat.c:1809 +#: ../libempathy-gtk/empathy-chat.c:1994 #, c-format msgid " (%s)" msgstr " (%s)" -#: ../libempathy-gtk/empathy-chat.c:1834 +#: ../libempathy-gtk/empathy-chat.c:2019 #, c-format msgid "%s has joined the room" msgstr "%s 加入了聊天室" -#: ../libempathy-gtk/empathy-chat.c:1859 +#: ../libempathy-gtk/empathy-chat.c:2044 #, c-format msgid "%s is now known as %s" msgstr "%s 现在叫做 %s" -#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1534 +#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1532 msgid "Disconnected" msgstr "已断开连接" -#: ../libempathy-gtk/empathy-chat.c:2521 +#: ../libempathy-gtk/empathy-chat.c:2701 msgid "Wrong password; please try again:" msgstr "密码错误，请重试：" -#: ../libempathy-gtk/empathy-chat.c:2522 +#: ../libempathy-gtk/empathy-chat.c:2702 msgid "Retry" msgstr "重试" -#: ../libempathy-gtk/empathy-chat.c:2527 +#: ../libempathy-gtk/empathy-chat.c:2707 msgid "This room is protected by a password:" msgstr "这个房间是由一个密码保护的：" -#: ../libempathy-gtk/empathy-chat.c:2528 +#: ../libempathy-gtk/empathy-chat.c:2708 msgid "Join" msgstr "加入" -#: ../libempathy-gtk/empathy-chat.c:2668 +#: ../libempathy-gtk/empathy-chat.c:2848 msgid "Connected" msgstr "已连接" -#: ../libempathy-gtk/empathy-chat.c:2721 -#: ../libempathy-gtk/empathy-log-window.c:546 +#: ../libempathy-gtk/empathy-chat.c:2901 +#: ../libempathy-gtk/empathy-log-window.c:707 msgid "Conversation" msgstr "对话" -#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:650 +#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:672 msgid "Topic:" msgstr "话题：" #. Copy Link Address menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:317 -#: ../libempathy-gtk/empathy-theme-adium.c:817 +#: ../libempathy-gtk/empathy-chat-text-view.c:318 +#: ../libempathy-gtk/empathy-theme-adium.c:786 msgid "_Copy Link Address" msgstr "复制链接地址(_C)" #. Open Link menu item -#: ../libempathy-gtk/empathy-chat-text-view.c:324 -#: ../libempathy-gtk/empathy-theme-adium.c:824 +#: ../libempathy-gtk/empathy-chat-text-view.c:325 +#: ../libempathy-gtk/empathy-theme-adium.c:793 msgid "_Open Link" msgstr "打开链接(_O)" #. Translators: timestamp displayed between conversations in #. * chat windows (strftime format string) -#: ../libempathy-gtk/empathy-chat-text-view.c:422 +#: ../libempathy-gtk/empathy-chat-text-view.c:423 msgid "%A %B %d %Y" msgstr "%A %B %d %Y" -#: ../libempathy-gtk/empathy-contact-dialogs.c:238 +#: ../libempathy-gtk/empathy-contact-dialogs.c:249 msgid "Edit Contact Information" msgstr "编辑联系人信息" -#: ../libempathy-gtk/empathy-contact-dialogs.c:289 +#: ../libempathy-gtk/empathy-contact-dialogs.c:301 msgid "Personal Information" msgstr "个人信息" -#: ../libempathy-gtk/empathy-contact-dialogs.c:394 +#: ../libempathy-gtk/empathy-contact-dialogs.c:406 msgid "New Contact" msgstr "新建联系人" @@ -1254,209 +1372,217 @@ msgstr "以后再决定(_L)" msgid "Subscription Request" msgstr "订阅请求" -#: ../libempathy-gtk/empathy-contact-list-view.c:1555 +#: ../libempathy-gtk/empathy-contact-list-view.c:1633 #, c-format msgid "Do you really want to remove the group '%s'?" msgstr "您真的要删除群组“%s”吗？" -#: ../libempathy-gtk/empathy-contact-list-view.c:1557 +#: ../libempathy-gtk/empathy-contact-list-view.c:1635 msgid "Removing group" msgstr "删除群组" #. Remove -#: ../libempathy-gtk/empathy-contact-list-view.c:1604 -#: ../libempathy-gtk/empathy-contact-list-view.c:1681 +#: ../libempathy-gtk/empathy-contact-list-view.c:1684 +#: ../libempathy-gtk/empathy-contact-list-view.c:1761 +#: ../src/empathy-accounts-dialog.ui.h:6 msgid "_Remove" msgstr "删除(_R)" -#: ../libempathy-gtk/empathy-contact-list-view.c:1634 +#: ../libempathy-gtk/empathy-contact-list-view.c:1714 #, c-format msgid "Do you really want to remove the contact '%s'?" msgstr "您真的想要删除联系人“%s”吗？" -#: ../libempathy-gtk/empathy-contact-list-view.c:1636 +#: ../libempathy-gtk/empathy-contact-list-view.c:1716 msgid "Removing contact" msgstr "删除联系人" -#: ../libempathy-gtk/empathy-contact-menu.c:195 -#: ../src/empathy-main-window.ui.h:12 -msgid "_Add Contact..." +#: ../libempathy-gtk/empathy-contact-menu.c:206 +#: ../src/empathy-main-window.ui.h:14 +msgid "_Add Contact…" msgstr "添加联系人(_A)..." -#: ../libempathy-gtk/empathy-contact-menu.c:222 -#: ../src/empathy-main-window.ui.h:13 +#: ../libempathy-gtk/empathy-contact-menu.c:233 +#: ../src/empathy-main-window.ui.h:15 msgid "_Chat" msgstr "聊天(_C)" -#: ../libempathy-gtk/empathy-contact-menu.c:253 +#: ../libempathy-gtk/empathy-contact-menu.c:264 msgctxt "menu item" msgid "_Audio Call" msgstr "音频呼叫(_A)" -#: ../libempathy-gtk/empathy-contact-menu.c:285 +#: ../libempathy-gtk/empathy-contact-menu.c:296 msgctxt "menu item" msgid "_Video Call" msgstr "视频呼叫(_V)" -#: ../libempathy-gtk/empathy-contact-menu.c:324 -#: ../src/empathy-main-window.ui.h:24 +#: ../libempathy-gtk/empathy-contact-menu.c:347 +#: ../src/empathy-main-window.ui.h:26 msgid "_Previous Conversations" msgstr "最近会话(_P)" -#: ../libempathy-gtk/empathy-contact-menu.c:346 +#: ../libempathy-gtk/empathy-contact-menu.c:369 msgid "Send file" msgstr "发送文件" -#: ../libempathy-gtk/empathy-contact-menu.c:369 +#: ../libempathy-gtk/empathy-contact-menu.c:392 msgid "Share my desktop" msgstr "共享我的桌面" -#: ../libempathy-gtk/empathy-contact-menu.c:397 +#: ../libempathy-gtk/empathy-contact-menu.c:432 +#: ../libempathy-gtk/empathy-contact-widget.c:1379 +msgid "Favorite" +msgstr "收藏夹" + +#: ../libempathy-gtk/empathy-contact-menu.c:462 msgid "Infor_mation" msgstr "信息(_M)" -#: ../libempathy-gtk/empathy-contact-menu.c:441 -#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:17 +#: ../libempathy-gtk/empathy-contact-menu.c:508 +msgctxt "Edit contact (contextual menu)" msgid "_Edit" msgstr "编辑(_E)" -#: ../libempathy-gtk/empathy-contact-menu.c:501 -msgid "Inviting to this room" +#: ../libempathy-gtk/empathy-contact-menu.c:562 +#: ../src/empathy-chat-window.c:857 +msgid "Inviting you to this room" msgstr "邀请到此聊天室" -#: ../libempathy-gtk/empathy-contact-menu.c:532 -msgid "_Invite to chatroom" +#: ../libempathy-gtk/empathy-contact-menu.c:593 +msgid "_Invite to chat room" msgstr "邀请到聊天室(_I)" #: ../libempathy-gtk/empathy-contact-selector.c:129 msgid "Select a contact" msgstr "选择一个联系" -#: ../libempathy-gtk/empathy-contact-widget.c:447 -msgid "Save Avatar" -msgstr "保存头像" - -#: ../libempathy-gtk/empathy-contact-widget.c:503 -msgid "Unable to save avatar" -msgstr "无法保存头像" - -#: ../libempathy-gtk/empathy-contact-widget.c:1001 +#: ../libempathy-gtk/empathy-contact-widget.c:238 msgid "Select" msgstr "选择" -#: ../libempathy-gtk/empathy-contact-widget.c:1010 -#: ../src/empathy-main-window.c:1026 +#: ../libempathy-gtk/empathy-contact-widget.c:247 +#: ../src/empathy-main-window.c:1050 msgid "Group" msgstr "群组" -#: ../libempathy-gtk/empathy-contact-widget.c:1261 +#: ../libempathy-gtk/empathy-contact-widget.c:478 msgid "Country ISO Code:" msgstr "包括 ISO 编码：" -#: ../libempathy-gtk/empathy-contact-widget.c:1263 +#: ../libempathy-gtk/empathy-contact-widget.c:480 msgid "Country:" msgstr "国家：" -#: ../libempathy-gtk/empathy-contact-widget.c:1265 +#: ../libempathy-gtk/empathy-contact-widget.c:482 msgid "State:" msgstr "省：" -#: ../libempathy-gtk/empathy-contact-widget.c:1267 +#: ../libempathy-gtk/empathy-contact-widget.c:484 msgid "City:" msgstr "城市：" -#: ../libempathy-gtk/empathy-contact-widget.c:1269 +#: ../libempathy-gtk/empathy-contact-widget.c:486 msgid "Area:" msgstr "地区：" -#: ../libempathy-gtk/empathy-contact-widget.c:1271 +#: ../libempathy-gtk/empathy-contact-widget.c:488 msgid "Postal Code:" msgstr "邮政编码：" -#: ../libempathy-gtk/empathy-contact-widget.c:1273 +#: ../libempathy-gtk/empathy-contact-widget.c:490 msgid "Street:" msgstr "街道：" -#: ../libempathy-gtk/empathy-contact-widget.c:1275 +#: ../libempathy-gtk/empathy-contact-widget.c:492 msgid "Building:" msgstr "建筑物：" -#: ../libempathy-gtk/empathy-contact-widget.c:1277 +#: ../libempathy-gtk/empathy-contact-widget.c:494 msgid "Floor:" msgstr "楼层：" -#: ../libempathy-gtk/empathy-contact-widget.c:1279 +#: ../libempathy-gtk/empathy-contact-widget.c:496 msgid "Room:" msgstr "房间：" -#: ../libempathy-gtk/empathy-contact-widget.c:1281 +#: ../libempathy-gtk/empathy-contact-widget.c:498 msgid "Text:" msgstr "文本：" -#: ../libempathy-gtk/empathy-contact-widget.c:1283 +#: ../libempathy-gtk/empathy-contact-widget.c:500 msgid "Description:" msgstr "描述：" -#: ../libempathy-gtk/empathy-contact-widget.c:1285 +#: ../libempathy-gtk/empathy-contact-widget.c:502 msgid "URI:" msgstr "URI：" -#: ../libempathy-gtk/empathy-contact-widget.c:1287 +#: ../libempathy-gtk/empathy-contact-widget.c:504 msgid "Accuracy Level:" msgstr "准确程度：" -#: ../libempathy-gtk/empathy-contact-widget.c:1289 +#: ../libempathy-gtk/empathy-contact-widget.c:506 msgid "Error:" msgstr "错误：" -#: ../libempathy-gtk/empathy-contact-widget.c:1291 +#: ../libempathy-gtk/empathy-contact-widget.c:508 msgid "Vertical Error (meters):" msgstr "垂直误差(米)：" -#: ../libempathy-gtk/empathy-contact-widget.c:1293 +#: ../libempathy-gtk/empathy-contact-widget.c:510 msgid "Horizontal Error (meters):" msgstr "水平误差(米)：" -#: ../libempathy-gtk/empathy-contact-widget.c:1295 +#: ../libempathy-gtk/empathy-contact-widget.c:512 msgid "Speed:" msgstr "速度：" -#: ../libempathy-gtk/empathy-contact-widget.c:1297 +#: ../libempathy-gtk/empathy-contact-widget.c:514 msgid "Bearing:" msgstr "方位朝向：" -#: ../libempathy-gtk/empathy-contact-widget.c:1299 +#: ../libempathy-gtk/empathy-contact-widget.c:516 msgid "Climb Speed:" msgstr "爬升速度：" -#: ../libempathy-gtk/empathy-contact-widget.c:1301 +#: ../libempathy-gtk/empathy-contact-widget.c:518 msgid "Last Updated on:" msgstr "最近更新于：" -#: ../libempathy-gtk/empathy-contact-widget.c:1303 +#: ../libempathy-gtk/empathy-contact-widget.c:520 msgid "Longitude:" msgstr "经度：" -#: ../libempathy-gtk/empathy-contact-widget.c:1305 +#: ../libempathy-gtk/empathy-contact-widget.c:522 msgid "Latitude:" msgstr "纬度：" -#: ../libempathy-gtk/empathy-contact-widget.c:1307 +#: ../libempathy-gtk/empathy-contact-widget.c:524 msgid "Altitude:" msgstr "海拔：" -#: ../libempathy-gtk/empathy-contact-widget.c:1368 -msgid "<b>Location</b>" -msgstr "<b>位置</b>" +#: ../libempathy-gtk/empathy-contact-widget.c:587 +#: ../src/empathy-preferences.ui.h:12 +msgid "Location" +msgstr "位置" -#: ../libempathy-gtk/empathy-contact-widget.c:1381 +#: ../libempathy-gtk/empathy-contact-widget.c:603 msgid "<b>Location</b>, " msgstr "<b>位置</b>，" -#: ../libempathy-gtk/empathy-contact-widget.c:1431 +#: ../libempathy-gtk/empathy-contact-widget.c:653 msgid "%B %e, %Y at %R UTC" msgstr "%B %e,%Y 于 %R UTC 时间" +#: ../libempathy-gtk/empathy-contact-widget.c:736 +msgid "Save Avatar" +msgstr "保存头像" + +#: ../libempathy-gtk/empathy-contact-widget.c:792 +msgid "Unable to save avatar" +msgstr "无法保存头像" + #: ../libempathy-gtk/empathy-contact-widget.ui.h:1 msgid "<b>Location</b> at (date)\t" msgstr "<b>位置</b>于(日期）\t" @@ -1478,54 +1604,49 @@ msgid "Client:" msgstr "客户端：" #: ../libempathy-gtk/empathy-contact-widget.ui.h:7 -#: ../src/empathy-main-window.c:1009 -msgid "Contact" -msgstr "联系人" - -#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 msgid "Contact Details" msgstr "联系人详情" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 -msgid "Email:" -msgstr "电子邮件：" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:8 +msgid "E-mail address:" +msgstr "" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 -msgid "Fullname:" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:9 +msgid "Full name:" msgstr "全称：" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:11 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:10 msgid "Groups" msgstr "组" #. Identifier to connect to Instant Messaging network -#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:12 msgid "Identifier:" msgstr "标识符：" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 -msgid "Information requested..." -msgstr "信息已请求..." +#: ../libempathy-gtk/empathy-contact-widget.ui.h:13 +msgid "Information requested…" +msgstr "已发送信息请求..." -#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:14 msgid "OS:" msgstr "操作系统：" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:15 msgid "" "Select the groups you want this contact to appear in. Note that you can " "select more than one group or no groups." msgstr "选择您想将该联系人加入的群组。注意您可以选择多个群组，也可以不选择。" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:16 msgid "Version:" msgstr "版本：" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 -msgid "Web site:" +#: ../libempathy-gtk/empathy-contact-widget.ui.h:17 +msgid "Website:" msgstr "网站：" -#: ../libempathy-gtk/empathy-contact-widget.ui.h:19 +#: ../libempathy-gtk/empathy-contact-widget.ui.h:18 msgid "_Add Group" msgstr "添加群组(_A)" @@ -1545,12 +1666,12 @@ msgstr "端口" msgid "SSL" msgstr "SSL" -#: ../libempathy-gtk/empathy-log-window.c:539 +#: ../libempathy-gtk/empathy-log-window.c:700 #: ../src/empathy-import-widget.c:310 msgid "Account" msgstr "账户" -#: ../libempathy-gtk/empathy-log-window.c:556 +#: ../libempathy-gtk/empathy-log-window.c:717 msgid "Date" msgstr "日期" @@ -1570,58 +1691,84 @@ msgstr "搜索" msgid "_For:" msgstr "包含(_F)：" -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2 -msgid "C_all" -msgstr "通话(_A)" +#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2 +msgid "Contact ID:" +msgstr "联系人 ID：" -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3 +#. add chat button +#: ../libempathy-gtk/empathy-new-message-dialog.c:144 msgid "C_hat" msgstr "聊天(_H)" -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4 -msgid "Contact ID:" -msgstr "联系人 ID：" - -#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5 +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-message-dialog.c:154 msgid "New Conversation" msgstr "新建对话" +#. add video toggle +#: ../libempathy-gtk/empathy-new-call-dialog.c:188 +msgid "Send _Video" +msgstr "发送视频(_V)" + +#. add chat button +#: ../libempathy-gtk/empathy-new-call-dialog.c:196 +#: ../src/empathy-call-window.ui.h:17 +msgid "_Call" +msgstr "通话(_C)" + +#. Tweak the dialog +#: ../libempathy-gtk/empathy-new-call-dialog.c:206 +msgid "New Call" +msgstr "新建通话" + #. COL_STATUS_TEXT #. COL_STATE_ICON_NAME #. COL_STATE #. COL_DISPLAY_MARKUP #. COL_STATUS_CUSTOMISABLE #. COL_TYPE -#: ../libempathy-gtk/empathy-presence-chooser.c:167 -#: ../libempathy-gtk/empathy-presence-chooser.c:203 -msgid "Custom Message..." -msgstr "自定义状态..." +#: ../libempathy-gtk/empathy-presence-chooser.c:168 +#: ../libempathy-gtk/empathy-presence-chooser.c:204 +msgid "Custom Message…" +msgstr "自定义消息" -#: ../libempathy-gtk/empathy-presence-chooser.c:220 -#: ../libempathy-gtk/empathy-presence-chooser.c:222 -msgid "Edit Custom Messages..." -msgstr "编辑自定义状态..." +#: ../libempathy-gtk/empathy-presence-chooser.c:221 +#: ../libempathy-gtk/empathy-presence-chooser.c:223 +msgid "Edit Custom Messages…" +msgstr "编辑自定义消息" -#: ../libempathy-gtk/empathy-presence-chooser.c:344 +#: ../libempathy-gtk/empathy-presence-chooser.c:346 msgid "Click to remove this status as a favorite" msgstr "点击移除自定义状态" -#: ../libempathy-gtk/empathy-presence-chooser.c:353 +#: ../libempathy-gtk/empathy-presence-chooser.c:355 msgid "Click to make this status a favorite" msgstr "点击设置自定义状态" -#: ../libempathy-gtk/empathy-presence-chooser.c:387 +#: ../libempathy-gtk/empathy-presence-chooser.c:389 msgid "Set status" msgstr "设置状态" -#: ../libempathy-gtk/empathy-presence-chooser.c:895 +#: ../libempathy-gtk/empathy-presence-chooser.c:939 msgid "Set your presence and current status" msgstr "设置你的状态信息和现在的状态" #. Custom messages -#: ../libempathy-gtk/empathy-presence-chooser.c:1082 -msgid "Custom messages..." -msgstr "自定义状态..." +#: ../libempathy-gtk/empathy-presence-chooser.c:1128 +msgid "Custom messages…" +msgstr "自定义消息..." + +#: ../libempathy-gtk/empathy-search-bar.ui.h:1 +msgid "Find:" +msgstr "查找：" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:2 +msgid "Match case" +msgstr "区分大小写" + +#: ../libempathy-gtk/empathy-search-bar.ui.h:3 +msgid "Phrase not found" +msgstr "未找到短语" #: ../libempathy-gtk/empathy-sound.c:51 msgid "Received an instant message" @@ -1663,11 +1810,11 @@ msgstr "呼出的语音通话" msgid "Voice call ended" msgstr "语音通话结束" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:362 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:364 msgid "Enter Custom Message" msgstr "输入自定义状态" -#: ../libempathy-gtk/empathy-status-preset-dialog.c:521 +#: ../libempathy-gtk/empathy-status-preset-dialog.c:523 msgid "Edit Custom Messages" msgstr "编辑自定义状态" @@ -1695,15 +1842,15 @@ msgstr "清爽" msgid "Blue" msgstr "蓝色" -#: ../libempathy-gtk/empathy-ui-utils.c:1407 +#: ../libempathy-gtk/empathy-ui-utils.c:1550 msgid "Unable to open URI" msgstr "无法打开 URI" -#: ../libempathy-gtk/empathy-ui-utils.c:1537 +#: ../libempathy-gtk/empathy-ui-utils.c:1667 msgid "Select a file" msgstr "选择文件" -#: ../libempathy-gtk/empathy-ui-utils.c:1597 +#: ../libempathy-gtk/empathy-ui-utils.c:1731 msgid "Select a destination" msgstr "选择目的地" @@ -1875,12 +2022,12 @@ msgid "Vietnamese" msgstr "越南语" #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108 -msgid "The contact selected cannot receive files." -msgstr "选择的联系人无法接受文件。" +msgid "The selected contact cannot receive files." +msgstr "选择的联系人无法接收文件。" #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114 -msgid "The contact selected is offline." -msgstr "联系人离线" +msgid "The selected contact is offline." +msgstr "选择的联系人离线。" #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169 msgid "No error message" @@ -1890,23 +2037,19 @@ msgstr "无错误信息" msgid "Instant Message (Empathy)" msgstr "即时消息(Empathy)" -#: ../src/empathy.c:893 +#: ../src/empathy.c:584 msgid "Don't connect on startup" msgstr "启动时不自动登录" -#: ../src/empathy.c:897 +#: ../src/empathy.c:588 msgid "Don't display the contact list or any other dialogs on startup" msgstr "启动时不显示联系人列表" -#: ../src/empathy.c:901 -msgid "Show the accounts dialog" -msgstr "显示账户对话框" - -#: ../src/empathy.c:913 +#: ../src/empathy.c:600 msgid "- Empathy IM Client" msgstr " - Empathy IM 客户端" -#: ../src/empathy-about-dialog.c:83 +#: ../src/empathy-about-dialog.c:85 msgid "" "Empathy is free software; you can redistribute it and/or modify it under the " "terms of the GNU General Public License as published by the Free Software " @@ -1916,7 +2059,7 @@ msgstr "" "Empathy 是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证下重新发布" "或修改它；许可证可使用第二版或您想选择的更新的版本。" -#: ../src/empathy-about-dialog.c:87 +#: ../src/empathy-about-dialog.c:89 msgid "" "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY " "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS " @@ -1926,7 +2069,7 @@ msgstr "" "Empathy 发布的目的是希望它对您有用，但是没有任何担保；即使是对商业应用以及其" "它特定目的。查阅 GNU 通用公共许可证以获取更多细节。" -#: ../src/empathy-about-dialog.c:91 +#: ../src/empathy-about-dialog.c:93 msgid "" "You should have received a copy of the GNU General Public License along with " "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin " @@ -1936,11 +2079,11 @@ msgstr "" "给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA " "02110-130159 USA" -#: ../src/empathy-about-dialog.c:119 +#: ../src/empathy-about-dialog.c:121 msgid "An Instant Messaging client for GNOME" msgstr "一个 GNOME 即时消息客户端" -#: ../src/empathy-about-dialog.c:125 +#: ../src/empathy-about-dialog.c:127 msgid "translator-credits" msgstr "" "YangZhang, <zyangmath@gmail.com>\n" @@ -1955,75 +2098,74 @@ msgstr "" " fujianwzh https://launchpad.net/~fujianwzh\n" " yuane https://launchpad.net/~yuane" -#: ../src/empathy-account-assistant.c:118 -msgid "There has been an error while importing the accounts." -msgstr "建立帐户时发生错误。" +#: ../src/empathy-account-assistant.c:167 +msgid "There was an error while importing the accounts." +msgstr "导入帐户时发生错误。" -#: ../src/empathy-account-assistant.c:121 -msgid "There has been an error while parsing the account details." -msgstr "在解析账户信息时出现错误。" +#: ../src/empathy-account-assistant.c:170 +msgid "There was an error while parsing the account details." +msgstr "在解析账户详情时出现错误。" -#: ../src/empathy-account-assistant.c:124 -msgid "There has been an error while creating the account." -msgstr "在创建账户是出现错误。" +#: ../src/empathy-account-assistant.c:173 +msgid "There was an error while creating the account." +msgstr "在创建账户时出现错误。" -#: ../src/empathy-account-assistant.c:126 -msgid "There has been an error." +#: ../src/empathy-account-assistant.c:175 +msgid "There was an error." msgstr "发生错误。" -#: ../src/empathy-account-assistant.c:141 +#: ../src/empathy-account-assistant.c:179 #, c-format -msgid "The error message was: <span style=\"italic\">%s</span>" -msgstr "错误信息是：<span style=\"italic\">%s</span>" +msgid "The error message was: %s" +msgstr "错误信息为：%s" -#: ../src/empathy-account-assistant.c:149 +#: ../src/empathy-account-assistant.c:183 msgid "" "You can either go back and try to enter your accounts' details again or quit " "this assistant and add accounts later from the Edit menu." msgstr "" "您可以返回尝试重新输入您的账户信息，或者退出助理，然后从编辑菜单中加入账户。" -#: ../src/empathy-account-assistant.c:184 +#: ../src/empathy-account-assistant.c:220 +#: ../src/empathy-account-assistant.c:1303 msgid "An error occurred" msgstr "发生错误" -#. Create account #. To translator: %s is the protocol name #. Create account #. To translator: %s is the name of the protocol, such as "Google Talk" or #. * "Yahoo!" #. -#: ../src/empathy-account-assistant.c:331 -#: ../src/empathy-accounts-dialog.c:1339 +#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580 #, c-format msgid "New %s account" msgstr "新建 %s 账户" -#: ../src/empathy-account-assistant.c:403 +#: ../src/empathy-account-assistant.c:508 msgid "What kind of chat account do you have?" msgstr "您已经拥有哪个类型的帐户？" -#: ../src/empathy-account-assistant.c:409 +#: ../src/empathy-account-assistant.c:514 msgid "Do you have any other chat accounts you want to set up?" msgstr "您还要设置其它聊天账户吗？" -#: ../src/empathy-account-assistant.c:415 +#: ../src/empathy-account-assistant.c:520 msgid "Enter your account details" msgstr "输入您的帐户详情" -#: ../src/empathy-account-assistant.c:420 +#: ../src/empathy-account-assistant.c:525 msgid "What kind of chat account do you want to create?" msgstr "您想创建那种类型的帐户？" -#: ../src/empathy-account-assistant.c:426 +#: ../src/empathy-account-assistant.c:531 msgid "Do you want to create other chat accounts?" msgstr "您想要创建其它的聊天账户吗、" -#: ../src/empathy-account-assistant.c:433 +#: ../src/empathy-account-assistant.c:538 msgid "Enter the details for the new account" msgstr "输入新账户的详细资料" -#: ../src/empathy-account-assistant.c:519 +#: ../src/empathy-account-assistant.c:653 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 " @@ -2034,248 +2176,282 @@ msgstr "" "Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头，您就可以开始音频" "和视频通话。" -#: ../src/empathy-account-assistant.c:536 +#: ../src/empathy-account-assistant.c:670 msgid "Do you have an account you've been using with another chat program?" msgstr "您有没有其它聊天软件的账户？" -#: ../src/empathy-account-assistant.c:559 +#: ../src/empathy-account-assistant.c:693 msgid "Yes, import my account details from " msgstr "有，请导入我的账户信息" -#: ../src/empathy-account-assistant.c:580 +#: ../src/empathy-account-assistant.c:714 msgid "Yes, I'll enter my account details now" msgstr "有，我现在就输入我的账户信息" -#: ../src/empathy-account-assistant.c:602 +#: ../src/empathy-account-assistant.c:736 msgid "No, I want a new account" msgstr "不，我想要一个新的账户。" -#: ../src/empathy-account-assistant.c:612 +#: ../src/empathy-account-assistant.c:746 msgid "No, I just want to see people online nearby for now" msgstr "没有，我只是想看看附近现在谁在线上" -#: ../src/empathy-account-assistant.c:633 +#: ../src/empathy-account-assistant.c:767 msgid "Select the accounts you want to import:" msgstr "选择您要导入的账户：" -#: ../src/empathy-account-assistant.c:720 +#: ../src/empathy-account-assistant.c:851 #: ../src/empathy-new-chatroom-dialog.c:541 #: ../src/empathy-new-chatroom-dialog.c:542 msgid "Yes" msgstr "是" -#: ../src/empathy-account-assistant.c:727 +#: ../src/empathy-account-assistant.c:858 msgid "No, that's all for now" msgstr "没有，就这样吧。" -#: ../src/empathy-account-assistant.c:920 +#: ../src/empathy-account-assistant.c:1117 +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 " +"details below are correct. You can easily change these details later or " +"disable this feature by using the 'Accounts' dialog" +msgstr "" + +#: ../src/empathy-account-assistant.c:1123 +#: ../src/empathy-account-assistant.c:1179 +msgid "Edit->Accounts" +msgstr "编辑->账户" + +#: ../src/empathy-account-assistant.c:1139 +msgid "I don't want to enable this feature for now" +msgstr "暂不启用此特性" + +#: ../src/empathy-account-assistant.c:1175 +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 " +"install the telepathy-salut package and create a People Nearby account from " +"the Accounts dialog" +msgstr "" + +#: ../src/empathy-account-assistant.c:1181 +msgid "telepathy-salut not installed" +msgstr "telepathy-salut 未安装" + +#: ../src/empathy-account-assistant.c:1227 +msgid "Messaging and VoIP Accounts Assistant" +msgstr "消息和 VoIP 帐户助手" + +#: ../src/empathy-account-assistant.c:1261 msgid "Welcome to Empathy" msgstr "欢迎使用 Empathy" -#: ../src/empathy-account-assistant.c:929 +#: ../src/empathy-account-assistant.c:1270 msgid "Import your existing accounts" msgstr "导入现有帐户" +#: ../src/empathy-account-assistant.c:1288 +msgid "Please enter personal details" +msgstr "" + #. The primary text of the dialog shown to the user when he is about to lose #. * unsaved changes -#: ../src/empathy-accounts-dialog.c:63 +#: ../src/empathy-accounts-dialog.c:66 #, c-format -msgid "There are unsaved modification regarding your %s account." +msgid "There are unsaved modifications to your %s account." msgstr "您的 %s 账户有未保存的修改。" #. The primary text of the dialog shown to the user when he is about to lose #. * an unsaved new account -#: ../src/empathy-accounts-dialog.c:67 +#: ../src/empathy-accounts-dialog.c:70 msgid "Your new account has not been saved yet." msgstr "您的新帐户还没有保存。" -#: ../src/empathy-accounts-dialog.c:484 +#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729 +msgid "Connecting…" +msgstr "正在连接..." + +#: ../src/empathy-accounts-dialog.c:290 +#, c-format +msgid "Disconnected — %s" +msgstr "已断开 - %s" + +#: ../src/empathy-accounts-dialog.c:295 +#, c-format +msgid "Offline — %s" +msgstr "离线 - %s" + +#: ../src/empathy-accounts-dialog.c:308 +msgid "Offline — No Network Connection" +msgstr "离线 - 无可用网络" + +#: ../src/empathy-accounts-dialog.c:316 +msgid "Unknown Status" +msgstr "未知状态" + +#: ../src/empathy-accounts-dialog.c:327 +msgid "Offline — Account Disabled" +msgstr "离线 - 帐户被禁用" + +#: ../src/empathy-accounts-dialog.c:768 msgid "" "You are about to create a new account, which will discard\n" "your changes. Are you sure you want to proceed?" msgstr "您将要创建一个新账户，所做的修改将作废。您确定要继续吗？" -#: ../src/empathy-accounts-dialog.c:774 +#: ../src/empathy-accounts-dialog.c:1115 #, c-format msgid "Do you want to remove %s from your computer?" msgstr "您要从电脑中移除 %s 吗？" -#: ../src/empathy-accounts-dialog.c:778 +#: ../src/empathy-accounts-dialog.c:1119 msgid "This will not remove your account on the server." msgstr "这不会删除服务器上的账户。" -#: ../src/empathy-accounts-dialog.c:960 +#: ../src/empathy-accounts-dialog.c:1356 msgid "" "You are about to select another account, which will discard\n" "your changes. Are you sure you want to proceed?" msgstr "您将要选择另一个账户，所做的修改将作废。您确定要继续吗？" -#: ../src/empathy-accounts-dialog.c:1425 +#: ../src/empathy-accounts-dialog.c:1933 msgid "" "You are about to close the window, which will discard\n" "your changes. Are you sure you want to proceed?" msgstr "您将要关闭此窗口，所做的修改将作废。您确定要继续吗？" -#. Translators: this is used only when built on a moblin platform -#: ../src/empathy-accounts-dialog.c:1596 -msgid "_Next" -msgstr "下一页(_N)" - #: ../src/empathy-accounts-dialog.ui.h:1 -msgid "Accounts" -msgstr "账户" +msgid "No protocol installed" +msgstr "尚未安装协议" #: ../src/empathy-accounts-dialog.ui.h:2 -msgid "Add new" -msgstr "添加" +msgid "Protocol:" +msgstr "协议：" #: ../src/empathy-accounts-dialog.ui.h:3 -msgid "Cr_eate" -msgstr "创建(_E)" - -#: ../src/empathy-accounts-dialog.ui.h:4 -msgid "No protocol installed" -msgstr "尚未安装协议" - -#: ../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:6 -msgid "_Add..." +#: ../src/empathy-accounts-dialog.ui.h:4 +msgid "_Add…" msgstr "添加(_A)..." -#: ../src/empathy-accounts-dialog.ui.h:7 -msgid "_Create a new account" -msgstr "创建新的帐户(_C)" - -#: ../src/empathy-accounts-dialog.ui.h:8 -msgid "_Import..." +#: ../src/empathy-accounts-dialog.ui.h:5 +msgid "_Import…" msgstr "导入(_I)..." -#: ../src/empathy-accounts-dialog.ui.h:9 -msgid "_Reuse an existing account" -msgstr "启用现有帐户(_R)" - -#: ../src/empathy-accounts-dialog.ui.h:10 -msgid "account" -msgstr "账户" - -#: ../src/empathy-call-window.c:452 +#: ../src/empathy-call-window.c:453 msgid "Contrast" msgstr "对比度" -#: ../src/empathy-call-window.c:455 +#: ../src/empathy-call-window.c:456 msgid "Brightness" msgstr "亮度" -#: ../src/empathy-call-window.c:458 +#: ../src/empathy-call-window.c:459 msgid "Gamma" msgstr "伽马" -#: ../src/empathy-call-window.c:566 +#: ../src/empathy-call-window.c:567 msgid "Volume" msgstr "音量" -#: ../src/empathy-call-window.c:728 -msgid "Connecting..." -msgstr "正在连接..." - -#: ../src/empathy-call-window.c:1021 +#: ../src/empathy-call-window.c:1022 msgid "_Sidebar" msgstr "侧边栏(_S)" -#: ../src/empathy-call-window.c:1040 -msgid "Dialpad" -msgstr "电话键盘" - -#: ../src/empathy-call-window.c:1046 +#: ../src/empathy-call-window.c:1041 msgid "Audio input" msgstr "音频输入" -#: ../src/empathy-call-window.c:1050 +#: ../src/empathy-call-window.c:1045 msgid "Video input" msgstr "视频输入" +#: ../src/empathy-call-window.c:1049 +msgid "Dialpad" +msgstr "电话键盘" + #. translators: Call is a noun and %s is the contact name. This string #. * is used in the window title -#: ../src/empathy-call-window.c:1113 +#: ../src/empathy-call-window.c:1117 #, c-format msgid "Call with %s" msgstr "与 %s 通话" #. translators: Call is a noun. This string is used in the window #. * title -#: ../src/empathy-call-window.c:1194 +#: ../src/empathy-call-window.c:1198 msgid "Call" msgstr "通话" #. Translators: number of minutes:seconds the caller has been connected -#: ../src/empathy-call-window.c:1697 +#: ../src/empathy-call-window.c:1695 #, c-format msgid "Connected — %d:%02dm" msgstr "已连接 — %d:%02dm" -#: ../src/empathy-call-window.c:1758 +#: ../src/empathy-call-window.c:1756 msgid "Technical Details" msgstr "技术细节" -#: ../src/empathy-call-window.c:1796 +#: ../src/empathy-call-window.c:1794 #, c-format msgid "" "%s's software does not understand any of the audio formats supported by your " "computer" msgstr "" -#: ../src/empathy-call-window.c:1801 +#: ../src/empathy-call-window.c:1799 #, c-format msgid "" "%s's software does not understand any of the video formats supported by your " "computer" msgstr "" -#: ../src/empathy-call-window.c:1807 +#: ../src/empathy-call-window.c:1805 #, 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-call-window.c:1813 +#: ../src/empathy-call-window.c:1811 msgid "There was a failure on the network" msgstr "网络出现一个错误" -#: ../src/empathy-call-window.c:1817 +#: ../src/empathy-call-window.c:1815 msgid "" "The audio formats necessary for this call are not installed on your computer" msgstr "呼叫所需要的音频格式还没有在您的电脑上安装" -#: ../src/empathy-call-window.c:1820 +#: ../src/empathy-call-window.c:1818 msgid "" "The video formats necessary for this call are not installed on your computer" msgstr "呼叫所需要的视频格式还没有在您的电脑上安装" -#: ../src/empathy-call-window.c:1830 -#, c-format +#: ../src/empathy-call-window.c:1828 +#, fuzzy, c-format msgid "" -"Something not expected happened in a Telepathy component. Please <a href=\"%s" +"Something unexpected happened in a Telepathy component. Please <a href=\"%s" "\">report this bug</a> and attach logs gathered from the 'Debug' window in " "the Help menu." msgstr "" "Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助菜" "单里“调试”窗口收集到的日志。" -#: ../src/empathy-call-window.c:1838 +#: ../src/empathy-call-window.c:1836 msgid "There was a failure in the call engine" msgstr "" -#: ../src/empathy-call-window.c:1877 +#: ../src/empathy-call-window.c:1875 msgid "Can't establish audio stream" msgstr "不能建立音频流" -#: ../src/empathy-call-window.c:1887 +#: ../src/empathy-call-window.c:1885 msgid "Can't establish video stream" msgstr "不能建立视频流" @@ -2343,39 +2519,35 @@ msgstr "视频开启" msgid "Video Preview" msgstr "视频预览" -#: ../src/empathy-call-window.ui.h:17 -msgid "_Call" -msgstr "通话(_C)" - -#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:26 +#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28 msgid "_View" msgstr "查看(_V)" -#: ../src/empathy-chat-window.c:408 ../src/empathy-chat-window.c:428 +#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456 #, c-format msgid "%s (%d unread)" msgid_plural "%s (%d unread)" msgstr[0] "%s (%d 未读)" -#: ../src/empathy-chat-window.c:420 +#: ../src/empathy-chat-window.c:448 #, c-format msgid "%s (and %u other)" msgid_plural "%s (and %u others)" msgstr[0] "%s (和 %u 其它)" -#: ../src/empathy-chat-window.c:436 +#: ../src/empathy-chat-window.c:464 #, c-format msgid "%s (%d unread from others)" msgid_plural "%s (%d unread from others)" msgstr[0] "%s (%d 其它未读)" -#: ../src/empathy-chat-window.c:445 +#: ../src/empathy-chat-window.c:473 #, c-format msgid "%s (%d unread from all)" msgid_plural "%s (%d unread from all)" msgstr[0] "%s (%d 全部未读)" -#: ../src/empathy-chat-window.c:654 +#: ../src/empathy-chat-window.c:676 msgid "Typing a message." msgstr "输入消息。" @@ -2396,46 +2568,54 @@ msgid "Insert _Smiley" msgstr "插入表情(_S)" #: ../src/empathy-chat-window.ui.h:5 +msgid "Invite _Participant…" +msgstr "" + +#: ../src/empathy-chat-window.ui.h:6 msgid "Move Tab _Left" msgstr "左移标签(_L)" -#: ../src/empathy-chat-window.ui.h:6 +#: ../src/empathy-chat-window.ui.h:7 msgid "Move Tab _Right" msgstr "右移标签(_R)" -#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:15 +#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17 msgid "_Contents" msgstr "内容(_C)" -#: ../src/empathy-chat-window.ui.h:8 +#: ../src/empathy-chat-window.ui.h:9 msgid "_Conversation" msgstr "对话(_C)" -#: ../src/empathy-chat-window.ui.h:9 +#: ../src/empathy-chat-window.ui.h:10 msgid "_Detach Tab" msgstr "漂移标签(_D)" -#: ../src/empathy-chat-window.ui.h:11 -msgid "_Favorite Chatroom" +#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19 +msgid "_Edit" +msgstr "编辑(_E)" + +#: ../src/empathy-chat-window.ui.h:12 +msgid "_Favorite Chat Room" msgstr "收藏聊天室(_F)" -#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19 +#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21 msgid "_Help" msgstr "帮助(_H)" -#: ../src/empathy-chat-window.ui.h:13 +#: ../src/empathy-chat-window.ui.h:14 msgid "_Next Tab" msgstr "下一标签(_N)" -#: ../src/empathy-chat-window.ui.h:14 +#: ../src/empathy-chat-window.ui.h:15 msgid "_Previous Tab" msgstr "上一标签(_P)" -#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4 +#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5 msgid "_Show Contact List" msgstr "显示联系人列表(_S)" -#: ../src/empathy-chat-window.ui.h:16 +#: ../src/empathy-chat-window.ui.h:17 msgid "_Tabs" msgstr "标签(_T)" @@ -2455,75 +2635,77 @@ msgstr "自动连接" msgid "Manage Favorite Rooms" msgstr "管理聊天室收藏" -#: ../src/empathy-event-manager.c:330 +#: ../src/empathy-event-manager.c:339 +#, fuzzy +msgid "Incoming video call" +msgstr "呼入的语音通话" + +#: ../src/empathy-event-manager.c:339 msgid "Incoming call" msgstr "来电" -#: ../src/empathy-event-manager.c:333 -#, c-format -msgid "%s is calling you, do you want to answer?" +#: ../src/empathy-event-manager.c:343 +#, fuzzy, c-format +msgid "%s is video calling you. Do you want to answer?" +msgstr "%s 来电，您想要接听吗？" + +#: ../src/empathy-event-manager.c:344 +#, fuzzy, c-format +msgid "%s is calling you. Do you want to answer?" msgstr "%s 来电，您想要接听吗？" -#: ../src/empathy-event-manager.c:340 +#: ../src/empathy-event-manager.c:366 msgid "_Reject" msgstr "拒绝(_R)" -#: ../src/empathy-event-manager.c:346 +#: ../src/empathy-event-manager.c:372 msgid "_Answer" msgstr "接听(_A)" -#: ../src/empathy-event-manager.c:455 -#, c-format -msgid "Incoming call from %s" +#: ../src/empathy-event-manager.c:489 +#, fuzzy, c-format +msgid "Incoming video call from %s" msgstr "%s 的来电" -#: ../src/empathy-event-manager.c:499 +#: ../src/empathy-event-manager.c:489 #, c-format -msgid "%s is offering you an invitation" -msgstr "%s 正发送邀请给您" - -#: ../src/empathy-event-manager.c:505 -msgid "An external application will be started to handle it." -msgstr "将启动一个外部应用程序来处理它." - -#: ../src/empathy-event-manager.c:510 -msgid "You don't have the needed external application to handle it." -msgstr "您没有必需的外部应用程序来处理它." +msgid "Incoming call from %s" +msgstr "%s 的来电" -#: ../src/empathy-event-manager.c:638 +#: ../src/empathy-event-manager.c:579 msgid "Room invitation" msgstr "聊天室邀请" -#: ../src/empathy-event-manager.c:641 +#: ../src/empathy-event-manager.c:582 #, c-format msgid "%s is inviting you to join %s" msgstr "%s 正邀请您加入 %s" -#: ../src/empathy-event-manager.c:649 +#: ../src/empathy-event-manager.c:590 msgid "_Decline" msgstr "拒绝(_D)" -#: ../src/empathy-event-manager.c:654 +#: ../src/empathy-event-manager.c:595 #: ../src/empathy-new-chatroom-dialog.ui.h:7 msgid "_Join" msgstr "加入(_J)" -#: ../src/empathy-event-manager.c:693 +#: ../src/empathy-event-manager.c:634 #, c-format msgid "%s invited you to join %s" msgstr "%s 已邀请您加入 %s" -#: ../src/empathy-event-manager.c:719 +#: ../src/empathy-event-manager.c:660 #, c-format msgid "Incoming file transfer from %s" msgstr "接收 %s 文件传输" -#: ../src/empathy-event-manager.c:899 +#: ../src/empathy-event-manager.c:818 #, c-format msgid "Subscription requested by %s" msgstr "%s 的订阅请求" -#: ../src/empathy-event-manager.c:903 +#: ../src/empathy-event-manager.c:822 #, c-format msgid "" "\n" @@ -2533,13 +2715,13 @@ msgstr "" "消息：%s" #. someone is logging off -#: ../src/empathy-event-manager.c:943 +#: ../src/empathy-event-manager.c:862 #, c-format msgid "%s is now offline." msgstr "%s 当前离线。" #. someone is logging in -#: ../src/empathy-event-manager.c:959 +#: ../src/empathy-event-manager.c:878 #, c-format msgid "%s is now online." msgstr "%s 当前在线。" @@ -2683,75 +2865,23 @@ msgstr "源" msgid "%s account" msgstr "%s 账户" -#: ../src/empathy-main-window.c:410 +#: ../src/empathy-main-window.c:437 msgid "Reconnect" msgstr "重新连接" -#: ../src/empathy-main-window.c:417 +#: ../src/empathy-main-window.c:443 msgid "Edit Account" msgstr "编辑账户" -#: ../src/empathy-main-window.c:424 +#: ../src/empathy-main-window.c:449 msgid "Close" msgstr "关闭" -#: ../src/empathy-main-window.c:512 -msgid "No error specified" -msgstr "没有说明错误" - -#: ../src/empathy-main-window.c:515 -msgid "Network error" -msgstr "网络错误" - -#: ../src/empathy-main-window.c:518 -msgid "Authentication failed" -msgstr "验证失败" - -#: ../src/empathy-main-window.c:521 -msgid "Encryption error" -msgstr "加密错误" - -#: ../src/empathy-main-window.c:524 -msgid "Name in use" -msgstr "用户名已经被占用" - -#: ../src/empathy-main-window.c:527 -msgid "Certificate not provided" -msgstr "未提供证书" - -#: ../src/empathy-main-window.c:530 -msgid "Certificate untrusted" -msgstr "证书不被信任" - -#: ../src/empathy-main-window.c:533 -msgid "Certificate expired" -msgstr "证书已过期" - -#: ../src/empathy-main-window.c:536 -msgid "Certificate not activated" -msgstr "证书尚未激活" - -#: ../src/empathy-main-window.c:539 -msgid "Certificate hostname mismatch" -msgstr "证书主机名不匹配" - -#: ../src/empathy-main-window.c:542 -msgid "Certificate fingerprint mismatch" -msgstr "证书指纹不匹配" - -#: ../src/empathy-main-window.c:545 -msgid "Certificate self-signed" -msgstr "证书是自签属的" - -#: ../src/empathy-main-window.c:548 -msgid "Certificate error" -msgstr "证书错误" - -#: ../src/empathy-main-window.c:551 -msgid "Unknown error" -msgstr "未知的错误" +#: ../src/empathy-main-window.c:1033 +msgid "Contact" +msgstr "联系人" -#: ../src/empathy-main-window.c:1312 +#: ../src/empathy-main-window.c:1414 msgid "Show and edit accounts" msgstr "显示和编辑账户" @@ -2779,55 +2909,63 @@ msgstr "管理收藏夹" msgid "N_ormal Size" msgstr "常规视图(_O)" -#: ../src/empathy-main-window.ui.h:7 +#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1 +msgid "New _Call…" +msgstr "" + +#: ../src/empathy-main-window.ui.h:8 msgid "Normal Size With _Avatars" msgstr "扩展视图(_A)" -#: ../src/empathy-main-window.ui.h:8 +#: ../src/empathy-main-window.ui.h:9 msgid "P_references" msgstr "首选项(_R)" -#: ../src/empathy-main-window.ui.h:9 +#: ../src/empathy-main-window.ui.h:10 +msgid "Show P_rotocols" +msgstr "显示协议(_R)" + +#: ../src/empathy-main-window.ui.h:11 msgid "Sort by _Name" msgstr "按姓名排序(_N)" -#: ../src/empathy-main-window.ui.h:10 +#: ../src/empathy-main-window.ui.h:12 msgid "Sort by _Status" msgstr "按状态排序(_S)" -#: ../src/empathy-main-window.ui.h:11 +#: ../src/empathy-main-window.ui.h:13 msgid "_Accounts" msgstr "账户(_A)" -#: ../src/empathy-main-window.ui.h:14 +#: ../src/empathy-main-window.ui.h:16 msgid "_Compact Size" msgstr "紧凑视图(_C)" -#: ../src/empathy-main-window.ui.h:16 +#: ../src/empathy-main-window.ui.h:18 msgid "_Debug" msgstr "调试(_D)" -#: ../src/empathy-main-window.ui.h:18 +#: ../src/empathy-main-window.ui.h:20 msgid "_File Transfers" msgstr "文件传输(_F)" -#: ../src/empathy-main-window.ui.h:20 -msgid "_Join..." +#: ../src/empathy-main-window.ui.h:22 +msgid "_Join…" msgstr "加入(_J)..." -#: ../src/empathy-main-window.ui.h:21 ../src/empathy-status-icon.ui.h:2 -msgid "_New Conversation..." +#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3 +msgid "_New Conversation…" msgstr "新建对话(_N)..." -#: ../src/empathy-main-window.ui.h:22 +#: ../src/empathy-main-window.ui.h:24 msgid "_Offline Contacts" msgstr "离线联系人(_O)" -#: ../src/empathy-main-window.ui.h:23 +#: ../src/empathy-main-window.ui.h:25 msgid "_Personal Information" msgstr "个人信息(_P)" -#: ../src/empathy-main-window.ui.h:25 +#: ../src/empathy-main-window.ui.h:27 msgid "_Room" msgstr "聊天室(_R)" @@ -2839,11 +2977,10 @@ msgstr "聊天室" 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:539 #, c-format -msgctxt "" -"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no " -"and a number." msgid "" "<b>%s</b>\n" "Invite required: %s\n" @@ -2852,7 +2989,7 @@ msgid "" msgstr "" "<b>%s</b>\n" "需要邀请：%s\n" -"需要邀请：%s\n" +"需要密码：%s\n" "成员：%s" #: ../src/empathy-new-chatroom-dialog.c:541 @@ -2971,10 +3108,6 @@ msgstr "允许拼写检查的语言：" msgid "General" msgstr "常规" -#: ../src/empathy-preferences.ui.h:12 -msgid "Location" -msgstr "位置" - #: ../src/empathy-preferences.ui.h:13 msgid "Location sources:" msgstr "位置来源：" @@ -3047,8 +3180,8 @@ msgid "_GPS" msgstr "_GPS" #: ../src/empathy-preferences.ui.h:29 -msgid "_Network (IP, Wifi)" -msgstr "网络(_N)(IP, Wifi)" +msgid "_Network (IP, Wi-Fi)" +msgstr "网络(_N)(IP，Wi-Fi)" #: ../src/empathy-preferences.ui.h:30 msgid "_Open new chats in separate windows" @@ -3062,98 +3195,205 @@ msgstr "向我的联系人公布位置信息(_P)" msgid "_Reduce location accuracy" msgstr "降低位置信息精度(_R)" -#: ../src/empathy-status-icon.c:178 +#: ../src/empathy-status-icon.c:176 msgid "Respond" msgstr "响应" -#: ../src/empathy-status-icon.ui.h:1 +#: ../src/empathy-status-icon.ui.h:2 msgid "Status" msgstr "状态" -#: ../src/empathy-status-icon.ui.h:3 +#: ../src/empathy-status-icon.ui.h:4 msgid "_Quit" msgstr "退出(_Q)" -#: ../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: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-map-view.ui.h:1 msgid "Contact Map View" msgstr "联系地图视图" -#: ../src/empathy-debug-window.c:1063 +#: ../src/empathy-debug-window.c:1066 msgid "Save" msgstr "保存" -#: ../src/empathy-debug-window.c:1185 +#: ../src/empathy-debug-window.c:1219 msgid "Debug Window" msgstr "调试窗口" -#: ../src/empathy-debug-window.c:1265 +#: ../src/empathy-debug-window.c:1299 msgid "Pause" msgstr "暂停" -#: ../src/empathy-debug-window.c:1277 +#: ../src/empathy-debug-window.c:1311 msgid "Level " msgstr "级别 " -#: ../src/empathy-debug-window.c:1297 +#: ../src/empathy-debug-window.c:1331 msgid "Debug" msgstr "调试" -#: ../src/empathy-debug-window.c:1303 +#: ../src/empathy-debug-window.c:1337 msgid "Info" msgstr "信息" -#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358 +#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392 msgid "Message" msgstr "消息" -#: ../src/empathy-debug-window.c:1315 +#: ../src/empathy-debug-window.c:1349 msgid "Warning" msgstr "警告" -#: ../src/empathy-debug-window.c:1321 +#: ../src/empathy-debug-window.c:1355 msgid "Critical" msgstr "危急" -#: ../src/empathy-debug-window.c:1327 +#: ../src/empathy-debug-window.c:1361 msgid "Error" msgstr "错误" -#: ../src/empathy-debug-window.c:1346 +#: ../src/empathy-debug-window.c:1380 msgid "Time" msgstr "时间" -#: ../src/empathy-debug-window.c:1349 +#: ../src/empathy-debug-window.c:1383 msgid "Domain" msgstr "域" -#: ../src/empathy-debug-window.c:1351 +#: ../src/empathy-debug-window.c:1385 msgid "Category" msgstr "类别" -#: ../src/empathy-debug-window.c:1353 +#: ../src/empathy-debug-window.c:1387 msgid "Level" msgstr "级别" -#: ../src/empathy-debug-window.c:1385 +#: ../src/empathy-debug-window.c:1424 msgid "" "The selected connection manager does not support the remote debugging " "extension." msgstr "已选定的连接管理不支持远程调试扩展" -#~ msgid "Send video" -#~ msgstr "发送视频" +#: ../src/empathy-invite-participant-dialog.c:34 +#: ../src/empathy-invite-participant-dialog.c:48 +msgid "Invite Participant" +msgstr "" + +#: ../src/empathy-invite-participant-dialog.c:35 +msgid "Choose a contact to invite into the conversation:" +msgstr "" + +#: ../src/empathy-accounts.c:213 +msgid "Don't display any dialogs; do any work (eg, importing) and exit" +msgstr "" + +#: ../src/empathy-accounts.c:217 +msgid "Don't display any dialogs if there are any non-salut accounts" +msgstr "" + +#: ../src/empathy-accounts.c:221 +msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)" +msgstr "" + +#: ../src/empathy-accounts.c:223 +msgid "<account-id>" +msgstr "<账户 ID>" + +#: ../src/empathy-accounts.c:231 +msgid "- Empathy Accounts" +msgstr "- Empathy 账户" + +#: ../src/empathy-accounts.c:247 +msgid "Empathy Accounts" +msgstr "Empathy 账户" + +#: ../src/empathy-debugger.c:40 +msgid "Empathy Debugger" +msgstr "Empathy 调试器" + +#~ msgid "Salut account is created" +#~ msgstr "已创建 Salut 账户" + +#~ msgid "" +#~ "Whether or not the Salut account has been created on the first Empathy " +#~ "run." +#~ msgstr "是否在 Empathy 第一次运行时创建 Salut 账户。" + +#~ msgid "Hidden" +#~ msgstr "隐身" + +#~ msgid "<b>Location</b>" +#~ msgstr "<b>位置</b>" + +#~ msgid "Email:" +#~ msgstr "电子邮件：" + +#~ msgid "C_all" +#~ msgstr "通话(_A)" + +#~ msgid "Custom Message..." +#~ msgstr "自定义状态..." + +#~ msgid "Edit Custom Messages..." +#~ msgstr "编辑自定义状态..." + +#~ 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>" + +#~ msgid "_Next" +#~ msgstr "下一页(_N)" + +#~ msgid "Accounts" +#~ msgstr "账户" + +#~ msgid "Add new" +#~ msgstr "添加" + +#~ msgid "Cr_eate" +#~ msgstr "创建(_E)" + +#~ msgid "_Add..." +#~ msgstr "添加(_A)..." + +#~ msgid "_Import..." +#~ msgstr "导入(_I)..." + +#~ msgid "_Reuse an existing account" +#~ msgstr "启用现有帐户(_R)" + +#~ msgid "%s is offering you an invitation" +#~ msgstr "%s 正发送邀请给您" + +#~ msgid "An external application will be started to handle it." +#~ msgstr "将启动一个外部应用程序来处理它." + +#~ msgid "You don't have the needed external application to handle it." +#~ msgstr "您没有必需的外部应用程序来处理它." + +#~ msgid "No error specified" +#~ msgstr "没有说明错误" + +#~ msgid "Unknown error" +#~ msgstr "未知的错误" + +#~ msgid "_Join..." +#~ msgstr "加入(_J)..." + +#~ msgid "_New Conversation..." +#~ msgstr "新建对话(_N)..." + +#~ msgid "Unable to start application for service %s: %s" +#~ msgstr "不能启动应用程序为 %s: %s 服务" + +#~ msgid "" +#~ "An invitation was offered for service %s, but you don't have the needed " +#~ "application to handle it" +#~ msgstr "一个由 %s 服务提供邀请，但是你不需要应用程序处理它" #~ msgid "Can't set an empty display name" #~ msgstr "无法设置为空显示名称" @@ -3316,9 +3556,6 @@ msgstr "已选定的连接管理不支持远程调试扩展" #~ msgid "Contact information" #~ msgstr "联系人信息" -#~ msgid "Custom message" -#~ msgstr "自定义消息" - #~ msgid "Message:" #~ msgstr "消息：" @@ -3352,9 +3589,6 @@ msgstr "已选定的连接管理不支持远程调试扩展" #~ msgid "Invitation _message:" #~ msgstr "邀请消息(_M)：" -#~ msgid "Invite" -#~ msgstr "邀请" - #~ msgid "You have been invited to join a chat conference." #~ msgstr "您被邀请加入一个聊天会议。" |