aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
authorYinghua Wang <wantinghard@gmail.com>2011-09-13 12:58:53 +0800
committerYunQiang Su <yqsu@src.gnome.org>2011-09-13 12:58:53 +0800
commit656e9addef5ab7c5d3dc21fc0c502a15fc94331e (patch)
tree93d41703a6ddf26941b49dc16c2df0afbc9cf6f8 /po
parentdafc0ff233c2d02c607bb6ee67e714ba698319fc (diff)
downloadgsoc2013-empathy-656e9addef5ab7c5d3dc21fc0c502a15fc94331e.tar
gsoc2013-empathy-656e9addef5ab7c5d3dc21fc0c502a15fc94331e.tar.gz
gsoc2013-empathy-656e9addef5ab7c5d3dc21fc0c502a15fc94331e.tar.bz2
gsoc2013-empathy-656e9addef5ab7c5d3dc21fc0c502a15fc94331e.tar.lz
gsoc2013-empathy-656e9addef5ab7c5d3dc21fc0c502a15fc94331e.tar.xz
gsoc2013-empathy-656e9addef5ab7c5d3dc21fc0c502a15fc94331e.tar.zst
gsoc2013-empathy-656e9addef5ab7c5d3dc21fc0c502a15fc94331e.zip
update Simplified Chinese (zh_CN) translation; fix format
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN.po1208
1 files changed, 634 insertions, 574 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0c93ff90c..aacd48d22 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -23,7 +23,7 @@ msgstr ""
"Project-Id-Version: empathy master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-08-15 13:23+0000\n"
+"POT-Creation-Date: 2011-09-12 13:37+0000\n"
"PO-Revision-Date: 2011-08-21 23:56+0800\n"
"Last-Translator: Julius Wong <villahwong@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -66,405 +66,413 @@ msgid "Camera device"
msgstr "相机设备"
#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "相机位置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
msgid ""
"Character to add after nickname when using nick completion (tab) in group "
"chat."
msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
msgid "Chat window theme"
msgstr "聊天窗口主题"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
msgid "Chat window theme variant"
msgstr "聊天窗口主题衍生"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
msgid ""
"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
msgstr "用于拼写检查器的语言的列表,以逗号分隔(例如:en, fr, nl)。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
msgid "Compact contact list"
msgstr "紧凑显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
msgid "Connection managers should be used"
msgstr "应该使用连接管理器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
msgid "Contact list sort criterion"
msgstr "联系人列表排序条件"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
msgid "Default camera device to use in video calls, e.g. /dev/video0."
msgstr "视频呼叫时默认使用的相机设备,例如 /dev/video0。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
msgid "Default directory to select an avatar image from"
msgstr "默认的选取头像图片的目录"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
msgid "Disable popup notifications when away"
msgstr "离开时禁用弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
msgid "Disable sounds when away"
msgstr "离开时禁用声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
msgid "Display incoming events in the status area"
msgstr "在状态栏显示呼入事件。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
msgid ""
"Display incoming events in the status area. If false, present them to the "
"user immediately."
msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
msgid "Echo cancellation support"
msgstr "回声抑制支持"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
msgid "Empathy can publish the user's location"
msgstr "Empathy 能够发布用户的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
msgid "Empathy can use the GPS to guess the location"
msgstr "Empathy 能够通过 GPS 来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
msgid "Empathy can use the cellular network to guess the location"
msgstr "Empathy 能够通过手机来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
msgid "Empathy can use the network to guess the location"
msgstr "Empathy 能够通过网络来估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
msgid "Empathy default download folder"
msgstr "Empathy 默认下载文件夹"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
msgid "Empathy has migrated butterfly logs"
msgstr "Empathy 已经迁移至 telepathy-butterfly 日志"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
msgid "Empathy should auto-away when idle"
msgstr "Empathy 空闲时是否自动离开"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
msgid "Empathy should auto-connect on startup"
msgstr "Empathy 启动时是否自动连接"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
msgid "Empathy should reduce the location's accuracy"
msgstr "降低 Emapthy 位置信息的准确度"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
msgid "Empathy should use the avatar of the contact as the chat window icon"
msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
msgid "Enable WebKit Developer Tools"
msgstr "启用 WebKit 开发工具"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
msgid "Enable popup notifications for new messages"
msgstr "启用新消息弹出提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
msgid "Enable spell checker"
msgstr "启用拼写检查器"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
msgid "Hide main window"
msgstr "隐藏主窗口"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
msgid "Hide the main window."
msgstr "隐藏主窗口。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
msgid "Nick completed character"
msgstr "昵称补全字符"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
msgid "Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
msgid "Path of the Adium theme to use"
msgstr "Adium 主题的路径"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
msgid "Path of the Adium theme to use if the theme used for chat is Adium."
msgstr "如果聊天使用 Adium 主题,使用 Adium 主题的路径"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
msgid "Play a sound for incoming messages"
msgstr "收到消息时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
msgid "Play a sound for new conversations"
msgstr "新对话时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
msgid "Play a sound for outgoing messages"
msgstr "发出消息时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
msgid "Play a sound when a contact logs in"
msgstr "联系人登录时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
msgid "Play a sound when a contact logs out"
msgstr "联系人注销时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
msgid "Play a sound when we log in"
msgstr "登录时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
msgid "Play a sound when we log out"
msgstr "注销时播放声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
msgid "Pop up notifications if the chat isn't focused"
msgstr "如果聊天窗口不是焦点则弹出消息通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
msgid "Pop up notifications when a contact logs in"
msgstr "当联系人登录时弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
msgid "Pop up notifications when a contact logs out"
msgstr "当联系人注销时弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "在通话时摄像头预览的位置。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
msgid "Show Balance in contact list"
msgstr "在联系人列表中显示余额"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
msgid "Show avatars"
msgstr "显示头像"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
msgid "Show contact list in rooms"
msgstr "在聊天室显示联系人列表"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
msgid "Show hint about closing the main window"
msgstr "关闭主窗口时显示提示"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
msgid "Show offline contacts"
msgstr "显示离线联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
msgid "Show protocols"
msgstr "显示协议"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
msgid "Spell checking languages"
msgstr "拼写检查器语言"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
msgid "The default folder to save file transfers in."
msgstr "保存传送文件的默认文件夹。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
msgid "The last directory that an avatar image was chosen from."
msgstr "上次选取头像图片的目录。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
msgid "The position for the chat window side pane"
msgstr "聊天窗口边栏的位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
msgid "The stored position (in pixels) of the chat window side pane."
msgstr "聊天窗口边栏保存的位置(像素)。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
msgid "The theme that is used to display the conversation in chat windows."
msgstr "用于在聊天窗口中显示会话的主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
msgid ""
"The theme variant that is used to display the conversation in chat windows."
msgstr "用于在聊天窗口中显示会话的主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
msgid "Use graphical smileys"
msgstr "使用表情图标"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
msgid "Use notification sounds"
msgstr "使用通知声音"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
msgid "Use theme for chat rooms"
msgstr "为聊天室使用主题"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
msgid "Whether Empathy can publish the user's location to their contacts."
msgstr "是否允许 Empathy 将用户的位置共享给联系人"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
msgid "Whether Empathy can use the GPS to guess the location."
msgstr "是否允许 Empathy 通过 GPS 估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
msgid "Whether Empathy can use the cellular network to guess the location."
msgstr "是否允许 Empathy 通过手机网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
msgid "Whether Empathy can use the network to guess the location."
msgstr "是否允许 Empathy 通过网络估计位置"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
msgid "Whether Empathy has migrated butterfly logs."
msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
msgid "Whether Empathy should automatically log into your accounts on startup."
msgstr "Empathy 是否在启动时自动登入您的帐号。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
msgid ""
"Whether Empathy should go into away mode automatically if the user is idle."
msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
msgid ""
"Whether Empathy should reduce the location's accuracy for privacy reasons."
msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
msgid ""
"Whether Empathy should use the avatar of the contact as the chat window icon."
msgstr "是否使用联系人的头像作为聊天窗口的图标。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
msgid ""
"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
msgstr "WebKit 开发工具,例如 Web Inspector 是否应该启用。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
msgid ""
"Whether connectivity managers should be used to automatically disconnect/"
"reconnect."
msgstr "是否使用连接管理器自动断开连接或重新连接。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
msgid ""
"Whether to check words typed against the languages you want to check with."
msgstr "是否对您想要作拼写检查的单词作拼写检查。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
msgid "Whether to convert smileys into graphical images in conversations."
msgstr "对话时是否将表情符号转换为表情图标。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
msgid "Whether to enable Pulseaudio's echo cancellation filter."
msgstr "是否启用 Pulseaudio 的回声抑制过滤器。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
msgid "Whether to play a sound to notify of contacts logging into the network."
msgstr "是否需要联系人上线提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
msgid ""
"Whether to play a sound to notify of contacts logging out of the network."
msgstr "是否需要联系人下线提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
msgid "Whether to play a sound to notify of events."
msgstr "是否需要事件提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
msgid "Whether to play a sound to notify of incoming messages."
msgstr "是否需要消息到达提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
msgid "Whether to play a sound to notify of new conversations."
msgstr "是否需要新会话提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
msgid "Whether to play a sound to notify of outgoing messages."
msgstr "是否为外出消息使用声音提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
msgid "Whether to play a sound when logging into a network."
msgstr "当联网登录时是否播放提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
msgid "Whether to play a sound when logging out of a network."
msgstr "当网络断开时是否播放提示音。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
msgid "Whether to play sound notifications when away or busy."
msgstr "当离开或忙碌时是否使用声音提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
msgid "Whether to show a popup notification when a contact goes offline."
msgstr "当联系人离线时是否显示弹出通知。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
msgid "Whether to show a popup notification when a contact goes online."
msgstr "当联系人上线时是否显示弹出通知"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
msgid ""
"Whether to show a popup notification when receiving a new message even if "
"the chat is already opened, but not focused."
msgstr "如果聊天窗口已开启,但不是当前窗口,接收新消息时是否弹出提示。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
msgid "Whether to show a popup notification when receiving a new message."
msgstr "当收到新消息时是否弹出显示提示框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
msgid "Whether to show account balances in the contact list."
msgstr "是否在联系人列表和聊天窗口中显示余额。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
msgid ""
"Whether to show avatars for contacts in the contact list and chat windows."
msgstr "是否在联系人列表和聊天窗口中显示头像。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
msgid "Whether to show contacts that are offline in the contact list."
msgstr "是否显示联系人清单中离线的联系人。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
msgid "Whether to show popup notifications when away or busy."
msgstr "当离开或忙碌时是否弹出显示提示框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
msgid "Whether to show protocols for contacts in the contact list."
msgstr "是否在联系人列表和聊天窗口中显示协议。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
msgid "Whether to show the contact list in chat rooms."
msgstr "是否在聊天室显示联系人列表。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
msgid "Whether to show the contact list in compact mode."
msgstr "是否以紧凑模式显示联系人列表。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
msgid ""
"Whether to show the message dialog about closing the main window with the "
"'x' button in the title bar."
msgstr "当使用标题栏中的“X”按钮关闭主窗口时是否显示提示对话框。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
msgid "Whether to use the theme for chat rooms."
msgstr "是否对聊天室使用主题。"
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
msgid ""
"Which criterion to use when sorting the contact list. Default is to sort by "
"the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -487,30 +495,30 @@ msgstr "消息和 VoIP 帐号"
msgid "File transfer completed, but the file was corrupted"
msgstr "文件传输完成,但该文件已损坏"
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
msgid "File transfer not supported by remote contact"
msgstr "文件传输不支持远程连接"
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
msgid "The selected file is not a regular file"
msgstr "所选文件是非正常的文件"
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
msgid "The selected file is empty"
msgstr "所选文件是空的"
-#: ../libempathy/empathy-message.c:413 ../src/empathy-call-observer.c:132
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
#, c-format
msgid "Missed call from %s"
msgstr "未接来电:%s"
#. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:417
+#: ../libempathy/empathy-message.c:419
#, c-format
msgid "Called %s"
msgstr "与 %s 通话"
-#: ../libempathy/empathy-message.c:420
+#: ../libempathy/empathy-message.c:422
#, c-format
msgid "Call from %s"
msgstr "来电:%s"
@@ -543,161 +551,161 @@ msgstr "当传输这个文件的时候发生错误"
msgid "The other participant is unable to transfer the file"
msgstr "另外的参与者无法传输这个文件"
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
msgid "Unknown reason"
msgstr "未知原因"
-#: ../libempathy/empathy-utils.c:212
+#: ../libempathy/empathy-utils.c:222
msgid "Available"
msgstr "在线"
-#: ../libempathy/empathy-utils.c:214
+#: ../libempathy/empathy-utils.c:224
msgid "Busy"
msgstr "忙碌"
-#: ../libempathy/empathy-utils.c:217
+#: ../libempathy/empathy-utils.c:227
msgid "Away"
msgstr "离开"
-#: ../libempathy/empathy-utils.c:219
+#: ../libempathy/empathy-utils.c:229
msgid "Invisible"
msgstr "隐身"
-#: ../libempathy/empathy-utils.c:221
+#: ../libempathy/empathy-utils.c:231
msgid "Offline"
msgstr "离线"
#. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:234
msgctxt "presence"
msgid "Unknown"
msgstr "未知"
-#: ../libempathy/empathy-utils.c:264
+#: ../libempathy/empathy-utils.c:274
msgid "No reason specified"
msgstr "未指定原因"
-#: ../libempathy/empathy-utils.c:266 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
msgid "Status is set to offline"
msgstr "状态已设置为离线"
-#: ../libempathy/empathy-utils.c:268 ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
#: ../libempathy-gtk/empathy-call-utils.c:49
msgid "Network error"
msgstr "网络错误"
-#: ../libempathy/empathy-utils.c:270 ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
msgid "Authentication failed"
msgstr "验证失败"
-#: ../libempathy/empathy-utils.c:272 ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
msgid "Encryption error"
msgstr "加密错误"
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:284
msgid "Name in use"
msgstr "用户名已经被占用"
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
msgid "Certificate not provided"
msgstr "未提供证书"
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
msgid "Certificate untrusted"
msgstr "证书不被信任"
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
msgid "Certificate expired"
msgstr "证书已过期"
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
msgid "Certificate not activated"
msgstr "证书尚未激活"
-#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
msgid "Certificate hostname mismatch"
msgstr "证书主机名不匹配"
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
msgid "Certificate fingerprint mismatch"
msgstr "证书指纹不匹配"
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
msgid "Certificate self-signed"
msgstr "证书是自签属的"
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:300
msgid "Certificate error"
msgstr "证书错误"
-#: ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:334
msgid "Encryption is not available"
msgstr "加密不可用"
-#: ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:336
msgid "Certificate is invalid"
msgstr "证书无效"
-#: ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:338
msgid "Connection has been refused"
msgstr "连接被拒绝"
-#: ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:340
msgid "Connection can't be established"
msgstr "无法建立连接"
-#: ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:342
msgid "Connection has been lost"
msgstr "连接已丢失"
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:344
msgid "This resource is already connected to the server"
msgstr "该资源已被连接至服务器"
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:346
msgid ""
"Connection has been replaced by a new connection using the same resource"
msgstr "连接已被使用相同资源的新连接取代"
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:349
msgid "The account already exists on the server"
msgstr "服务器上已存在该帐号"
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:351
msgid "Server is currently too busy to handle the connection"
msgstr "服务器太忙,无法处理当前连接"
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:353
msgid "Certificate has been revoked"
msgstr "证书已被吊销"
# lainme:证书使用不安全的加密算法或是弱加密的
# xslidian:证书使用的加密算法不安全或者易被破解
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:355
msgid ""
"Certificate uses an insecure cipher algorithm or is cryptographically weak"
msgstr "证书使用不安全的加密算法或者是弱加密的"
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:358
msgid ""
"The length of the server certificate, or the depth of the server certificate "
"chain, exceed the limits imposed by the cryptography library"
msgstr "服务器证书的长度——或服务器证书链的深度——超出了加密库的硬性限制"
-#: ../libempathy/empathy-utils.c:509
+#: ../libempathy/empathy-utils.c:519
#: ../libempathy-gtk/empathy-contact-list-store.h:73
msgid "People Nearby"
msgstr "附近的人"
-#: ../libempathy/empathy-utils.c:514
+#: ../libempathy/empathy-utils.c:524
msgid "Yahoo! Japan"
msgstr "Yahoo! 日本"
-#: ../libempathy/empathy-utils.c:543
+#: ../libempathy/empathy-utils.c:553
msgid "Google Talk"
msgstr "Google Talk"
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:554
msgid "Facebook Chat"
msgstr "Facebook 聊天"
@@ -745,67 +753,77 @@ msgstr "将来"
msgid "All accounts"
msgstr "全部帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:693
+#: ../libempathy-gtk/empathy-account-widget.c:694
#: ../src/empathy-import-widget.c:321
msgid "Account"
msgstr "帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:694
+#: ../libempathy-gtk/empathy-account-widget.c:695
msgid "Password"
msgstr "密码"
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:696
#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
msgid "Server"
msgstr "服务器"
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:697
#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
msgid "Port"
msgstr "端口"
-#: ../libempathy-gtk/empathy-account-widget.c:768
-#: ../libempathy-gtk/empathy-account-widget.c:825
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
#, c-format
msgid "%s:"
msgstr "%s:"
-#: ../libempathy-gtk/empathy-account-widget.c:1166
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "我的网络帐号"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1208
#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s 帐号通过我的网络帐户进行了编辑。"
+msgid "The account %s is edited via %s."
+msgstr "%s 帐号通过 %s 进行了编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1172
+#: ../libempathy-gtk/empathy-account-widget.c:1214
#, c-format
msgid "The account %s cannot be edited in Empathy."
msgstr "%s 帐号无法在 Empathy 中编辑。"
-#: ../libempathy-gtk/empathy-account-widget.c:1192
+#: ../libempathy-gtk/empathy-account-widget.c:1233
msgid "Launch My Web Accounts"
msgstr "启动我的网络帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:1532
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1241
+#, c-format
+msgid "Edit %s"
+msgstr "编辑 %s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1591
#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
msgid "Username:"
msgstr "用户名:"
-#: ../libempathy-gtk/empathy-account-widget.c:1850
+#: ../libempathy-gtk/empathy-account-widget.c:1909
msgid "A_pply"
msgstr "应用(_P)"
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:1939
msgid "L_og in"
msgstr "登录(_O)"
-#: ../libempathy-gtk/empathy-account-widget.c:1954
+#: ../libempathy-gtk/empathy-account-widget.c:2013
msgid "This account already exists on the server"
msgstr "服务器上已存在该帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:1957
+#: ../libempathy-gtk/empathy-account-widget.c:2016
msgid "Create a new account on the server"
msgstr "在服务器上创建新的帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:2149
+#: ../libempathy-gtk/empathy-account-widget.c:2208
msgid "Ca_ncel"
msgstr "取消(_N)"
@@ -814,19 +832,19 @@ msgstr "取消(_N)"
#. * like: "MyUserName on freenode".
#. * You should reverse the order of these arguments if the
#. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2427
+#: ../libempathy-gtk/empathy-account-widget.c:2486
#, 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:2453
+#: ../libempathy-gtk/empathy-account-widget.c:2512
#, c-format
msgid "%s Account"
msgstr "%s 帐号"
-#: ../libempathy-gtk/empathy-account-widget.c:2457
+#: ../libempathy-gtk/empathy-account-widget.c:2516
msgid "New account"
msgstr "新建帐号"
@@ -948,36 +966,36 @@ msgstr "您的 ICQ UIN 是什么?"
msgid "What is your ICQ password?"
msgstr "您的 ICQ 密码是什么?"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
msgid "Auto"
msgstr "自动"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
msgid "UDP"
msgstr "UDP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
msgid "TCP"
msgstr "TCP"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
msgid "TLS"
msgstr "TLS"
#. translators: this string is very specific to SIP's internal; maybe
#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
msgid "Register"
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
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
msgid "Options"
msgstr "选项"
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
msgid "None"
msgstr "无"
@@ -1206,14 +1224,18 @@ msgid "Transport:"
msgstr "传输:"
#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "用此账户拨打固定电话和手机(_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
msgid "What is your SIP account password?"
msgstr "您的 SIP 帐号密码是什么?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
msgid "What is your SIP login ID?"
msgstr "您的 SIP 登录 ID 是什么?"
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
msgid "_Username:"
msgstr "用户名(_U):"
@@ -1237,36 +1259,36 @@ msgstr "Yahoo I_D:"
msgid "_Room List locale:"
msgstr "聊天室列表 locale(_R):"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:470
+#: ../libempathy-gtk/empathy-avatar-chooser.c:555
msgid "Couldn't convert image"
msgstr "无法转换图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
msgid "None of the accepted image formats are supported on your system"
msgstr "没有任何接受的图片格式能被您的系统支持"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "无法将 pixbuf 保存为 PNG"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+msgid "Couldn't save picture to file"
+msgstr "无法将图片保存为文件"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:934
msgid "Select Your Avatar Image"
msgstr "选择您的头像图片"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
msgid "Take a picture..."
msgstr "照相..."
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:941
msgid "No Image"
msgstr "无图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
msgid "Images"
msgstr "图像"
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
msgid "All Files"
msgstr "所有文件"
@@ -1312,45 +1334,45 @@ msgstr "您不能更改主题"
msgid "“%s” is not a valid contact ID"
msgstr "%s 是无效的联系人 ID"
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1058
msgid "/clear: clear all messages from the current conversation"
msgstr "/clear:清空当前会话的所有消息"
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1061
msgid "/topic <topic>: set the topic of the current conversation"
msgstr "/topic <主题>:设定当前对话的主题"
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1064
msgid "/join <chat room ID>: join a new chat room"
msgstr "/join <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1067
msgid "/j <chat room ID>: join a new chat room"
msgstr "/j <聊天室名>:加入一个新的聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1071
msgid ""
"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
"current one"
msgstr "/用户[<聊天室ID>] [<原因>]:当前默认离开聊天室"
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1075
msgid "/query <contact ID> [<message>]: open a private chat"
msgstr "/query <昵称> [<消息>]:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1078
msgid "/msg <contact ID> <message>: open a private chat"
msgstr "/msg <昵称> <消息>:打开一个私人聊天"
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1081
msgid "/nick <nickname>: change your nickname on the current server"
msgstr "/nick <昵称>:在当前服务器上改变您的昵称"
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1084
msgid "/me <message>: send an ACTION message to the current conversation"
msgstr "/me <动作消息>:向当前对话中发送一个动作消息"
-#: ../libempathy-gtk/empathy-chat.c:1059
+#: ../libempathy-gtk/empathy-chat.c:1087
msgid ""
"/say <message>: send <message> to the current conversation. This is used to "
"send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1359,124 +1381,124 @@ msgstr ""
"/say <消息>:发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如:“/"
"say /join 是用来加入一个新的聊天室”"
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
msgid "/whois <contact ID>: display information about a contact"
msgstr "/whois <联系人 ID>:显示一个联系人的信息"
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
msgid ""
"/help [<command>]: show all supported commands. If <command> is defined, "
"show its usage."
msgstr ""
"/help [<命令>]:显示所有支持的命令。如果 <命令> 是有定义的,则显示它的用法。"
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1112
#, c-format
msgid "Usage: %s"
msgstr "用法:%s"
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1157
msgid "Unknown command"
msgstr "未知命令"
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1283
msgid "Unknown command; see /help for the available commands"
msgstr "未知命令,请使用 /help 查阅可用命令"
#. translators: error used when user doesn't have enough credit on his
#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
+#: ../libempathy-gtk/empathy-chat.c:1453
msgid "insufficient balance to send message"
msgstr "余额不足,无法发送消息"
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1455
msgid "not capable"
msgstr "做不到"
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1462
msgid "offline"
msgstr "离线"
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1465
msgid "invalid contact"
msgstr "无效联系人"
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1468
msgid "permission denied"
msgstr "权限不足"
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1471
msgid "too long message"
msgstr "消息太长"
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1474
msgid "not implemented"
msgstr "尚未实现"
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1478
msgid "unknown"
msgstr "未知"
-#: ../libempathy-gtk/empathy-chat.c:1443
+#: ../libempathy-gtk/empathy-chat.c:1484
#, c-format
msgid "Error sending message '%s': %s"
msgstr "发送消息“%s”出错:%s"
-#: ../libempathy-gtk/empathy-chat.c:1447
+#: ../libempathy-gtk/empathy-chat.c:1488
#, c-format
msgid "Error sending message: %s"
msgstr "发送消息出错:%s"
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
msgid "Topic:"
msgstr "话题:"
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1561
#, c-format
msgid "Topic set to: %s"
msgstr "话题被设置为:%s"
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1563
msgid "No topic defined"
msgstr "未设置话题"
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2072
msgid "(No Suggestions)"
msgstr "(没有建议)"
#. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2140
#, c-format
msgid "Add '%s' to Dictionary"
msgstr "添加“%s”到字典"
#. translators: first %s is the selected word,
#. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2177
#, c-format
msgid "Add '%s' to %s Dictionary"
msgstr "添加“%s”到 %s 字典"
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2247
msgid "Insert Smiley"
msgstr "插入表情"
#. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1757
+#: ../libempathy-gtk/empathy-chat.c:2265
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
msgid "_Send"
msgstr "发送(_S)"
#. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2319
msgid "_Spelling Suggestions"
msgstr "拼写建议(_S)"
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2408
msgid "Failed to retrieve recent logs"
msgstr "获取最近日志失败"
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2545
#, c-format
msgid "%s has disconnected"
msgstr "%s 已断开连接"
@@ -1484,12 +1506,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:2511
+#: ../libempathy-gtk/empathy-chat.c:2552
#, c-format
msgid "%1$s was kicked by %2$s"
msgstr "%1$s 被 %2$s 踢出"
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2555
#, c-format
msgid "%s was kicked"
msgstr "%s 被踢出"
@@ -1497,17 +1519,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:2522
+#: ../libempathy-gtk/empathy-chat.c:2563
#, c-format
msgid "%1$s was banned by %2$s"
msgstr "%s 已被 %s 禁止"
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2566
#, c-format
msgid "%s was banned"
msgstr "%s 被禁止"
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2570
#, c-format
msgid "%s has left the room"
msgstr "%s 离开了聊天室"
@@ -1517,68 +1539,68 @@ msgstr "%s 离开了聊天室"
#. * given by the user living the room. If this poses a problem,
#. * please let us know. :-)
#.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2579
#, c-format
msgid " (%s)"
msgstr " (%s)"
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2604
#, c-format
msgid "%s has joined the room"
msgstr "%s 加入了聊天室"
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2629
#, c-format
msgid "%s is now known as %s"
msgstr "%s 现在叫做 %s"
-#: ../libempathy-gtk/empathy-chat.c:2727
+#: ../libempathy-gtk/empathy-chat.c:2768
#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1241 ../src/empathy-call-window.c:2264
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
msgid "Disconnected"
msgstr "已断开连接"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3415
msgid "Would you like to store this password?"
msgstr "是否保存密码?"
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3421
msgid "Remember"
msgstr "记录"
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3431
msgid "Not now"
msgstr "不是现在"
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3475
msgid "Retry"
msgstr "重试"
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3479
msgid "Wrong password; please try again:"
msgstr "密码错误,请重试:"
#. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3609
msgid "This room is protected by a password:"
msgstr "这个房间是由一个密码保护的:"
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3636
msgid "Join"
msgstr "加入"
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1262
+#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
msgid "Connected"
msgstr "已连接"
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3893
msgid "Conversation"
msgstr "对话"
#. Translators: this string is a something like
#. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:3898
#, c-format
msgid "%s (SMS)"
msgstr "%s (短信)"
@@ -1603,15 +1625,15 @@ msgstr "权限不足"
msgid "Could not block contact"
msgstr "无法屏蔽联系人"
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:772
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
msgid "Edit Blocked Contacts"
msgstr "编辑屏蔽的联系人"
#. Account and Identifier
#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
#: ../src/empathy-chatrooms-window.ui.h:1
#: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1622,15 +1644,22 @@ msgstr "帐号:"
msgid "Blocked Contacts"
msgstr "已屏蔽的联系人"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "删除"
+
#. Copy Link Address menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1417
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
msgid "_Copy Link Address"
msgstr "复制链接地址(_C)"
#. Open Link menu item
#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1424
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
msgid "_Open Link"
msgstr "打开链接(_O)"
@@ -1661,18 +1690,18 @@ msgid "Block %s?"
msgstr "屏蔽 %s?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
#, c-format
msgid "Are you sure you want to block '%s' from contacting you again?"
msgstr "确定要屏蔽 %s 以阻止他再次联系您吗?"
#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
msgid "_Block"
msgstr "屏蔽(_B)"
#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
msgid "_Report this contact as abusive"
msgid_plural "_Report these contacts as abusive"
msgstr[0] "举报联系人滥用"
@@ -1697,38 +1726,38 @@ msgstr "未分组"
msgid "Favorite People"
msgstr "收藏夹"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
#, c-format
msgid "Do you really want to remove the group '%s'?"
msgstr "您真的要删除群组“%s”吗?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
msgid "Removing group"
msgstr "删除群组"
#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
msgid "_Remove"
msgstr "删除(_R)"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
#, c-format
msgid "Do you really want to remove the contact '%s'?"
msgstr "您真的想要删除联系人“%s”吗?"
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
msgid "Removing contact"
msgstr "删除联系人"
#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
msgid "_Add Contact…"
msgstr "添加联系人(_A)..."
@@ -1737,48 +1766,48 @@ msgid "_Block Contact"
msgstr "屏蔽联系人"
#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:548
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
msgid "_Chat"
msgstr "聊天(_C)"
#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:639
+#: ../libempathy-gtk/empathy-individual-menu.c:849
msgctxt "menu item"
msgid "_Audio Call"
msgstr "音频呼叫(_A)"
#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:684
+#: ../libempathy-gtk/empathy-individual-menu.c:894
msgctxt "menu item"
msgid "_Video Call"
msgstr "视频呼叫(_V)"
#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:737
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
msgid "_Previous Conversations"
msgstr "最近会话(_P)"
#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:778
+#: ../libempathy-gtk/empathy-individual-menu.c:988
msgid "Send File"
msgstr "发送文件"
#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:820
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
msgid "Share My Desktop"
msgstr "共享我的桌面"
#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:855
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1886
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1373
msgid "Favorite"
msgstr "收藏"
#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:883
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
msgid "Infor_mation"
msgstr "信息(_M)"
@@ -1788,33 +1817,41 @@ msgid "_Edit"
msgstr "编辑(_E)"
#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1070
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1283
+#: ../src/empathy-chat-window.c:1011
msgid "Inviting you to this room"
msgstr "邀请到此聊天室"
#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1116
+#: ../libempathy-gtk/empathy-individual-menu.c:1329
msgid "_Invite to Chat Room"
msgstr "邀请到聊天室(_I)"
#. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
msgid "Search contacts"
msgstr "搜索联系人"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
msgid "Search: "
msgstr "搜索"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
msgid "_Add Contact"
msgstr "添加联系人(_A)"
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
msgid "No contacts found"
msgstr "未找到联系人"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "您的自我介绍信息:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "你在线时请让我知道,谢谢!"
+
#: ../libempathy-gtk/empathy-contact-selector.c:129
msgid "Select a contact"
msgstr "选择一个联系"
@@ -1867,153 +1904,153 @@ msgstr "离开消息:"
msgid "Channels:"
msgstr "频道:"
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
msgid "Country ISO Code:"
msgstr "包括 ISO 编码:"
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
msgid "Country:"
msgstr "国家:"
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
msgid "State:"
msgstr "省:"
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
msgid "City:"
msgstr "城市:"
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
msgid "Area:"
msgstr "地区:"
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
msgid "Postal Code:"
msgstr "邮政编码:"
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
msgid "Street:"
msgstr "街道:"
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
msgid "Building:"
msgstr "建筑物:"
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
msgid "Floor:"
msgstr "楼层:"
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
msgid "Room:"
msgstr "房间:"
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
msgid "Text:"
msgstr "文本:"
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
msgid "Description:"
msgstr "描述:"
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
msgid "URI:"
msgstr "URI:"
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
msgid "Accuracy Level:"
msgstr "准确程度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
msgid "Error:"
msgstr "错误:"
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
msgid "Vertical Error (meters):"
msgstr "垂直误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
msgid "Horizontal Error (meters):"
msgstr "水平误差(米):"
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
msgid "Speed:"
msgstr "速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
msgid "Bearing:"
msgstr "方位朝向:"
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
msgid "Climb Speed:"
msgstr "爬升速度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
msgid "Last Updated on:"
msgstr "最近更新于:"
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
msgid "Longitude:"
msgstr "经度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
msgid "Latitude:"
msgstr "纬度:"
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
msgid "Altitude:"
msgstr "海拔:"
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
msgid "Location"
msgstr "位置"
#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
#, c-format
msgid "%s, %s"
msgstr "%s, %s"
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
msgid "%B %e, %Y at %R UTC"
msgstr "%B %e,%Y 于 %R UTC 时间"
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
msgid "Save Avatar"
msgstr "保存头像"
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
msgid "Unable to save avatar"
msgstr "无法保存头像"
@@ -2023,7 +2060,7 @@ msgstr "<b>位置</b>于(日期)\t"
#. Alias
#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
msgid "Alias:"
msgstr "别名:"
@@ -2043,7 +2080,7 @@ msgstr "联系人详情"
#. Identifier to connect to Instant Messaging network
#. Translators: Identifier to connect to Instant Messaging network
#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1515
msgid "Identifier:"
msgstr "标识符:"
@@ -2080,16 +2117,16 @@ msgid "Select"
msgstr "选择"
#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
msgid "Group"
msgstr "群组"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
msgid "The following identity will be blocked:"
msgid_plural "The following identities will be blocked:"
msgstr[0] "以下用户将被屏蔽:"
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
msgid "The following identity can not be blocked:"
msgid_plural "The following identities can not be blocked:"
msgstr[0] "以下用户无法被屏蔽:"
@@ -2114,34 +2151,59 @@ msgstr "在左侧列表中选中的联系人将被绑定在一起。"
#. Translators: this is used in the context menu for a contact. The first
#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
#. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:138
+#: ../libempathy-gtk/empathy-individual-menu.c:145
#, c-format
msgid "%s (%s)"
msgstr "%s (%s)"
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "选择要用于拨打电话的账户"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "通话"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+msgid "Mobile"
+msgstr "手机"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "办公"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "家庭"
+
#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:594
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
msgid "_SMS"
msgstr "短信(_S)"
-#: ../libempathy-gtk/empathy-individual-menu.c:931
+#: ../libempathy-gtk/empathy-individual-menu.c:1141
msgctxt "Edit individual (contextual menu)"
msgid "_Edit"
msgstr "编辑(_E)"
#. Translators: this is a verb meaning "to connect two contacts together
#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:957
+#: ../libempathy-gtk/empathy-individual-menu.c:1167
msgctxt "Link individual (contextual menu)"
msgid "_Link Contacts…"
msgstr "绑定联系人(_L)…"
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
msgid "Delete and _Block"
msgstr "删除并屏蔽(_B)"
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
#, c-format
msgid ""
"Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2149,7 +2211,7 @@ msgid ""
msgstr ""
"您是否真正地想要删除已绑定的联系人'%s' ? 注意这将删除所有联系已绑定的联系人"
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1662
#, c-format
msgid "Linked contact containing %u contact"
msgid_plural "Linked contacts containing %u contacts"
@@ -2231,128 +2293,128 @@ msgctxt "Unlink individual (button)"
msgid "_Unlink"
msgstr "解除绑定(_U)"
-#: ../libempathy-gtk/empathy-log-window.c:458
+#: ../libempathy-gtk/empathy-log-window.c:634
msgid "History"
msgstr "历史"
-#: ../libempathy-gtk/empathy-log-window.c:510
+#: ../libempathy-gtk/empathy-log-window.c:689
msgid "Show"
msgstr "显示"
-#: ../libempathy-gtk/empathy-log-window.c:532
+#: ../libempathy-gtk/empathy-log-window.c:711
msgid "Search"
msgstr "搜索"
-#: ../libempathy-gtk/empathy-log-window.c:946
+#: ../libempathy-gtk/empathy-log-window.c:1159
#, c-format
msgid "Chat in %s"
msgstr "在 %s 聊天"
-#: ../libempathy-gtk/empathy-log-window.c:948
+#: ../libempathy-gtk/empathy-log-window.c:1161
#, c-format
msgid "Chat with %s"
msgstr "与 %s 聊天"
-#: ../libempathy-gtk/empathy-log-window.c:998
-#: ../libempathy-gtk/empathy-log-window.c:1176
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
msgctxt "A date with the time"
msgid "%A, %e %B %Y %X"
msgstr "%Y年%m月%d日 %A"
#. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1118
+#: ../libempathy-gtk/empathy-log-window.c:1300
#, c-format
msgid "<i>* %s %s</i>"
msgstr "<i>* %s %s</i>"
#. Translators: this is a message: 'Danielle: hello'
#. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1124
+#: ../libempathy-gtk/empathy-log-window.c:1306
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b>%s"
-#: ../libempathy-gtk/empathy-log-window.c:1195
-#: ../libempathy-gtk/empathy-log-window.c:1197
+#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1379
#: ../src/empathy-ft-manager.c:1026
msgid "%"
msgstr "%"
-#: ../libempathy-gtk/empathy-log-window.c:1204
+#: ../libempathy-gtk/empathy-log-window.c:1386
#, c-format
msgid "Call took %s, ended at %s"
msgstr "通话时长:%s,结束于 %s"
-#: ../libempathy-gtk/empathy-log-window.c:1536
+#: ../libempathy-gtk/empathy-log-window.c:1718
msgid "Today"
msgstr "今天"
-#: ../libempathy-gtk/empathy-log-window.c:1540
+#: ../libempathy-gtk/empathy-log-window.c:1722
msgid "Yesterday"
msgstr "昨天"
-#: ../libempathy-gtk/empathy-log-window.c:1556
+#: ../libempathy-gtk/empathy-log-window.c:1738
msgctxt ""
"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
msgid "%e %B %Y"
msgstr "%Y年%m月%d日"
-#: ../libempathy-gtk/empathy-log-window.c:1637
-#: ../libempathy-gtk/empathy-log-window.c:3203
+#: ../libempathy-gtk/empathy-log-window.c:1819
+#: ../libempathy-gtk/empathy-log-window.c:3415
msgid "Anytime"
msgstr "随时"
-#: ../libempathy-gtk/empathy-log-window.c:1717
-#: ../libempathy-gtk/empathy-log-window.c:2154
+#: ../libempathy-gtk/empathy-log-window.c:1906
+#: ../libempathy-gtk/empathy-log-window.c:2343
msgid "Anyone"
msgstr "任何人"
-#: ../libempathy-gtk/empathy-log-window.c:2451
+#: ../libempathy-gtk/empathy-log-window.c:2656
msgid "Who"
msgstr "谁"
-#: ../libempathy-gtk/empathy-log-window.c:2655
+#: ../libempathy-gtk/empathy-log-window.c:2860
msgid "When"
msgstr "何时"
-#: ../libempathy-gtk/empathy-log-window.c:2771
+#: ../libempathy-gtk/empathy-log-window.c:2976
msgid "Anything"
msgstr "任何事"
-#: ../libempathy-gtk/empathy-log-window.c:2773
+#: ../libempathy-gtk/empathy-log-window.c:2978
msgid "Text chats"
msgstr "文本聊天"
-#: ../libempathy-gtk/empathy-log-window.c:2775
+#: ../libempathy-gtk/empathy-log-window.c:2980
#: ../src/empathy-preferences.ui.h:4
msgid "Calls"
msgstr "通话"
-#: ../libempathy-gtk/empathy-log-window.c:2780
+#: ../libempathy-gtk/empathy-log-window.c:2985
msgid "Incoming calls"
msgstr "来电"
-#: ../libempathy-gtk/empathy-log-window.c:2781
+#: ../libempathy-gtk/empathy-log-window.c:2986
msgid "Outgoing calls"
msgstr "呼出的语音通话"
-#: ../libempathy-gtk/empathy-log-window.c:2782
+#: ../libempathy-gtk/empathy-log-window.c:2987
msgid "Missed calls"
msgstr "未接来电"
-#: ../libempathy-gtk/empathy-log-window.c:2804
+#: ../libempathy-gtk/empathy-log-window.c:3009
msgid "What"
msgstr "什么事"
-#: ../libempathy-gtk/empathy-log-window.c:3506
+#: ../libempathy-gtk/empathy-log-window.c:3718
msgid "Are you sure you want to delete all logs of previous conversations?"
msgstr "确定要删除以前的全部对话日志?"
-#: ../libempathy-gtk/empathy-log-window.c:3510
+#: ../libempathy-gtk/empathy-log-window.c:3722
msgid "Clear All"
msgstr "全部清除"
-#: ../libempathy-gtk/empathy-log-window.c:3517
+#: ../libempathy-gtk/empathy-log-window.c:3729
msgid "Delete from:"
msgstr "从以下位置删除:"
@@ -2360,14 +2422,6 @@ msgstr "从以下位置删除:"
msgid "<span size=\"x-large\">Loading...</span>"
msgstr "<span size=\"x-large\">正在载入...</span>"
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call"
-msgstr "通话"
-
#: ../libempathy-gtk/empathy-log-window.ui.h:3
#: ../src/empathy-chat-window.ui.h:3
msgid "Chat"
@@ -2389,7 +2443,7 @@ msgstr "视频"
#: ../libempathy-gtk/empathy-log-window.ui.h:7
#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window-menubar.ui.h:20
msgid "_Edit"
msgstr "编辑(_E)"
@@ -2406,27 +2460,27 @@ msgid "Contact ID:"
msgstr "联系人 ID:"
#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
msgid "C_hat"
msgstr "聊天(_H)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
msgid "New Conversation"
msgstr "新建对话"
#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:231
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
msgid "Send _Video"
msgstr "发送视频(_V)"
#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
msgid "C_all"
msgstr "通话(_A)"
#. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
msgid "New Call"
msgstr "新建通话"
@@ -2486,24 +2540,24 @@ msgid "New %s account"
msgstr "新建 %s 帐号"
#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "向下查找"
+msgid "Find:"
+msgstr "查找:"
#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "向上查找"
+msgid "Mat_ch case"
+msgstr "区分大小写(_C)"
#: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "查找:"
+msgid "Phrase not found"
+msgstr "未找到短语"
#: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "区分大小写"
+msgid "_Next"
+msgstr "下一页(_N)"
#: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "未找到短语"
+msgid "_Previous"
+msgstr "上一页(_P)"
#: ../libempathy-gtk/empathy-sound-manager.c:51
msgid "Received an instant message"
@@ -2549,34 +2603,28 @@ msgstr "语音通话结束"
msgid "Edit Custom Messages"
msgstr "编辑自定义状态"
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "删除"
-
-#: ../libempathy-gtk/empathy-theme-adium.c:1121
+#: ../libempathy-gtk/empathy-theme-adium.c:1030
#, c-format
msgid "Message edited at %s"
msgstr "消息于 %s 被编辑"
-#: ../libempathy-gtk/empathy-theme-adium.c:1943
+#: ../libempathy-gtk/empathy-theme-adium.c:1720
msgid "Normal"
msgstr "普通"
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
msgid "Classic"
msgstr "经典"
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
msgid "Simple"
msgstr "简洁"
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
msgid "Clean"
msgstr "清爽"
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
msgid "Blue"
msgstr "蓝色"
@@ -2651,26 +2699,26 @@ msgstr "为将来的连接记住本次选择"
msgid "Certificate Details"
msgstr "证书详情"
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
msgid "Unable to open URI"
msgstr "无法打开 URI"
-#: ../libempathy-gtk/empathy-ui-utils.c:1749
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
msgid "Select a file"
msgstr "选择文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1821
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
msgid "Insufficient free space to save file"
msgstr "空间不足,无法保存文件"
-#: ../libempathy-gtk/empathy-ui-utils.c:1829
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
#, c-format
msgid ""
"%s of free space are required to save this file, but only %s is available. "
"Please choose another location."
msgstr "保存此文件需要 %s 空闲空间,但目前仅有 %s,请选择其他位置。"
-#: ../libempathy-gtk/empathy-ui-utils.c:1873
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
#, c-format
msgid "Incoming file from %s"
msgstr "从 %s 传来的文件"
@@ -2858,23 +2906,23 @@ msgstr "无错误信息"
msgid "Instant Message (Empathy)"
msgstr "即时消息(Empathy)"
-#: ../src/empathy.c:354
+#: ../src/empathy.c:431
msgid "Don't connect on startup"
msgstr "启动时不自动连接"
-#: ../src/empathy.c:358
+#: ../src/empathy.c:435
msgid "Don't display the contact list or any other dialogs on startup"
msgstr "启动时不显示联系人列表"
-#: ../src/empathy.c:373
+#: ../src/empathy.c:450
msgid "- Empathy IM Client"
msgstr " - Empathy 即时通讯客户端"
-#: ../src/empathy.c:560
+#: ../src/empathy.c:637
msgid "Error contacting the Account Manager"
msgstr "联系帐号管理器出错"
-#: ../src/empathy.c:562
+#: ../src/empathy.c:639
#, c-format
msgid ""
"There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3112,7 +3160,7 @@ msgstr "您的新帐号还没有保存。"
#: ../src/empathy-accounts-dialog.c:345
#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1098
+#: ../src/empathy-call-window.c:1164
msgid "Connecting…"
msgstr "正在连接..."
@@ -3259,33 +3307,33 @@ msgstr "详细信息"
#. translators: Call is a noun and %s is the contact name. This string
#. * is used in the window title
#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1599
+#: ../src/empathy-call-window.c:1672
#, c-format
msgid "Call with %s"
msgstr "与 %s 通话"
#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1843
+#: ../src/empathy-call-window.c:1916
msgid "The IP address as seen by the machine"
msgstr "机器所见的 IP 地址"
#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1845
+#: ../src/empathy-call-window.c:1918
msgid "The IP address as seen by a server on the Internet"
msgstr "Internet 上服务器所见的 IP 地址"
#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1847
+#: ../src/empathy-call-window.c:1920
msgid "The IP address of the peer as seen by the other side"
msgstr "另一方所见的 IP 地址"
#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1849
+#: ../src/empathy-call-window.c:1922
msgid "The IP address of a relay server"
msgstr "中转服务器 IP 地址"
#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1851
+#: ../src/empathy-call-window.c:1924
msgid "The IP address of the multicast group"
msgstr "多播组的 IP 地址"
@@ -3316,12 +3364,12 @@ msgid "Connected — %d:%02dm"
msgstr "已连接 — %d:%02dm"
#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2674
msgid "Technical Details"
msgstr "技术细节"
#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2621
+#: ../src/empathy-call-window.c:2712
#, c-format
msgid ""
"%s's software does not understand any of the audio formats supported by your "
@@ -3329,7 +3377,7 @@ msgid ""
msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2626
+#: ../src/empathy-call-window.c:2717
#, c-format
msgid ""
"%s's software does not understand any of the video formats supported by your "
@@ -3337,7 +3385,7 @@ msgid ""
msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2632
+#: ../src/empathy-call-window.c:2723
#, c-format
msgid ""
"Can't establish a connection to %s. One of you might be on a network that "
@@ -3345,24 +3393,24 @@ msgid ""
msgstr "不能与 %s 建立连接。可能是两台计算机之一不允许直接连接。"
#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2638
+#: ../src/empathy-call-window.c:2729
msgid "There was a failure on the network"
msgstr "网络出现一个错误"
#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2642
+#: ../src/empathy-call-window.c:2733
msgid ""
"The audio formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2645
+#: ../src/empathy-call-window.c:2736
msgid ""
"The video formats necessary for this call are not installed on your computer"
msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2657
+#: ../src/empathy-call-window.c:2748
#, c-format
msgid ""
"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3373,22 +3421,22 @@ msgstr ""
"单里“调试”窗口收集到的日志。"
#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2666
+#: ../src/empathy-call-window.c:2757
msgid "There was a failure in the call engine"
msgstr "呼叫引擎里出现了一个故障"
#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2669
+#: ../src/empathy-call-window.c:2760
msgid "The end of the stream was reached"
msgstr "已到达流的末尾"
#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2709
+#: ../src/empathy-call-window.c:2800
msgid "Can't establish audio stream"
msgstr "不能建立音频流"
#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2719
+#: ../src/empathy-call-window.c:2810
msgid "Can't establish video stream"
msgstr "不能建立视频流"
@@ -3479,8 +3527,8 @@ msgstr "切换视频传输"
#: ../src/empathy-call-window.ui.h:21
#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2219 ../src/empathy-call-window.c:2220
-#: ../src/empathy-call-window.c:2221 ../src/empathy-call-window.c:2222
+#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
msgid "Unknown"
msgstr "未知"
@@ -3498,16 +3546,17 @@ msgid "_Camera"
msgstr "相机(_C)"
#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window-menubar.ui.h:18
msgid "_Contents"
msgstr "内容(_C)"
-#: ../src/empathy-call-window.ui.h:27 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
msgid "_Debug"
msgstr "调试(_D)"
#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window-menubar.ui.h:22
msgid "_Help"
msgstr "帮助(_H)"
@@ -3519,46 +3568,47 @@ msgstr "话筒(_M)"
msgid "_Settings"
msgstr "设置(_S)"
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
#: ../src/empathy-streamed-media-window.ui.h:25
msgid "_View"
msgstr "查看(_V)"
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
#, c-format
msgid "%s (%d unread)"
msgid_plural "%s (%d unread)"
msgstr[0] "%s (%d 未读)"
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
#, c-format
msgid "%s (and %u other)"
msgid_plural "%s (and %u others)"
msgstr[0] "%s (和另外 %u 人)"
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
#, c-format
msgid "%s (%d unread from others)"
msgid_plural "%s (%d unread from others)"
msgstr[0] "%s (另有他人的 %d 条未读)"
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
#, c-format
msgid "%s (%d unread from all)"
msgid_plural "%s (%d unread from all)"
msgstr[0] "%s (所有人共 %d 条未读)"
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
msgid "SMS:"
msgstr "短信:"
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
#, c-format
msgid "Sending %d message"
msgid_plural "Sending %d messages"
msgstr[0] "正在发送 %d 条消息"
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
msgid "Typing a message."
msgstr "输入消息。"
@@ -3638,95 +3688,95 @@ msgstr "自动连接"
msgid "Manage Favorite Rooms"
msgstr "管理聊天室收藏"
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
msgid "Incoming video call"
msgstr "呼入的视频通话"
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:521
msgid "Incoming call"
msgstr "来电"
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:525
#, c-format
msgid "%s is video calling you. Do you want to answer?"
msgstr "%s 视频来电。您想要接听吗?"
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
#, c-format
msgid "%s is calling you. Do you want to answer?"
msgstr "%s 来电,您想要接听吗?"
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763
#, c-format
msgid "Incoming call from %s"
msgstr "%s 的来电"
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:554
msgid "_Reject"
msgstr "拒绝(_R)"
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
msgid "_Answer"
msgstr "接听(_A)"
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:570
msgid "_Answer with video"
msgstr "使用视频接听(_A)"
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
#, c-format
msgid "Incoming video call from %s"
msgstr "%s 的视频呼叫"
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:836
msgid "Room invitation"
msgstr "聊天室邀请"
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:838
#, c-format
msgid "Invitation to join %s"
msgstr "邀请您加入 %s"
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:845
#, c-format
msgid "%s is inviting you to join %s"
msgstr "%s 正邀请您加入 %s"
-#: ../src/empathy-event-manager.c:854
+#: ../src/empathy-event-manager.c:853
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:858
#: ../src/empathy-new-chatroom-dialog.ui.h:7
msgid "_Join"
msgstr "加入(_J)"
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:885
#, c-format
msgid "%s invited you to join %s"
msgstr "%s 已邀请您加入 %s"
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:891
#, c-format
msgid "You have been invited to join %s"
msgstr "您被邀请加入 %s"
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:942
#, c-format
msgid "Incoming file transfer from %s"
msgstr "接收 %s 文件传输"
-#: ../src/empathy-event-manager.c:1135 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
msgid "Password required"
msgstr "需要密码"
-#: ../src/empathy-event-manager.c:1191
+#: ../src/empathy-event-manager.c:1190
#, c-format
msgid "%s would like permission to see when you are online"
msgstr "%s 当您在线的时候可见"
-#: ../src/empathy-event-manager.c:1195
+#: ../src/empathy-event-manager.c:1194
#, c-format
msgid ""
"\n"
@@ -3901,107 +3951,104 @@ msgid "Top up account credit"
msgstr "账户充值"
#. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
msgid "Top Up..."
msgstr "充值..."
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
msgid "Contact"
msgstr "联系人"
-#: ../src/empathy-main-window.c:2145
+#: ../src/empathy-main-window.c:2119
msgid "Contact List"
msgstr "联系人列表"
-#: ../src/empathy-main-window.c:2263
-msgid "Show and edit accounts"
-msgstr "显示和编辑帐号"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
msgid "Contacts on a _Map"
msgstr "联系人地图(_M)"
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
msgid "Credit Balance"
msgstr "账户余额"
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
msgid "Find in Contact _List"
msgstr "在联系人列表中查找(_L)"
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
msgid "Join _Favorites"
msgstr "加入已收藏的聊天室(_F)"
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
msgid "Manage Favorites"
msgstr "管理收藏夹"
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
msgid "N_ormal Size"
msgstr "常规视图(_O)"
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
msgid "New _Call…"
msgstr "新建呼叫(_C)..."
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
msgid "Normal Size With _Avatars"
msgstr "扩展视图(_A)"
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
msgid "P_references"
msgstr "首选项(_R)"
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
msgid "Show P_rotocols"
msgstr "显示协议(_R)"
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
msgid "Sort by _Name"
msgstr "按姓名排序(_N)"
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
msgid "Sort by _Status"
msgstr "按状态排序(_S)"
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
msgid "_Accounts"
msgstr "帐号(_A)"
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
msgid "_Blocked Contacts"
msgstr "已屏蔽的联系人(_B)"
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
msgid "_Compact Size"
msgstr "紧凑视图(_C)"
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
msgid "_File Transfers"
msgstr "文件传输(_F)"
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
msgid "_Join…"
msgstr "加入(_J)..."
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
msgid "_New Conversation…"
msgstr "新建对话(_N)..."
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
msgid "_Offline Contacts"
msgstr "离线联系人(_O)"
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
msgid "_Personal Information"
msgstr "个人信息(_P)"
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
msgid "_Room"
msgstr "聊天室(_R)"
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
msgid "_Search for Contacts…"
msgstr "搜索联系人(_S)..."
@@ -4068,79 +4115,79 @@ msgstr "聊天室列表"
msgid "_Room:"
msgstr "聊天室(_R):"
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:169
msgid "Message received"
msgstr "收到了消息"
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
msgid "Message sent"
msgstr "发出了消息"
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
msgid "New conversation"
msgstr "新对话"
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
msgid "Contact goes online"
msgstr "离线人上线"
-#: ../src/empathy-preferences.c:176
+#: ../src/empathy-preferences.c:173
msgid "Contact goes offline"
msgstr "联系人离线"
-#: ../src/empathy-preferences.c:177
+#: ../src/empathy-preferences.c:174
msgid "Account connected"
msgstr "帐号已连接"
-#: ../src/empathy-preferences.c:178
+#: ../src/empathy-preferences.c:175
msgid "Account disconnected"
msgstr "帐号已断开"
-#: ../src/empathy-preferences.c:487
+#: ../src/empathy-preferences.c:484
msgid "Language"
msgstr "语言"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:734
msgid "Juliet"
msgstr "朱立叶"
#. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:741
msgid "Romeo"
msgstr "罗密欧"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:747
msgid "O Romeo, Romeo, wherefore art thou Romeo?"
msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:750
msgid "Deny thy father and refuse thy name;"
msgstr "Deny thy father and refuse thy name;"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:753
msgid "Or if thou wilt not, be but sworn my love"
msgstr "Or if thou wilt not, be but sworn my love"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:756
msgid "And I'll no longer be a Capulet."
msgstr "And I'll no longer be a Capulet."
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:759
msgid "Shall I hear more, or shall I speak at this?"
msgstr "Shall I hear more, or shall I speak at this?"
#. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:765
+#: ../src/empathy-preferences.c:762
msgid "Juliet has disconnected"
msgstr "朱立叶已断开连接"
-#: ../src/empathy-preferences.c:1171
+#: ../src/empathy-preferences.c:1166
msgid "Preferences"
msgstr "首选项"
@@ -4169,54 +4216,64 @@ msgid "Display incoming events in the notification area"
msgstr "再提示区域显示呼入事件"
#: ../src/empathy-preferences.ui.h:9
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"回声消除可以使您的语音在对方听来更清晰,但在某些计算机上可能导致问题。如果您"
+"或对方在通话时听到了奇怪的噪音或怪音,请尝试关闭回声消除并重新通话。"
+
+#: ../src/empathy-preferences.ui.h:10
msgid "Enable notifications when a contact comes online"
msgstr "当联系人上线时允许提示"
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:11
msgid "Enable notifications when a contact goes offline"
msgstr "当联系人离线时允许提示"
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:12
msgid "Enable notifications when the _chat is not focused"
msgstr "当会话闲置时允许提示"
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:13
msgid "Enable spell checking for languages:"
msgstr "允许拼写检查的语言:"
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:14
msgid "General"
msgstr "常规"
-#: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr "输入级别"
-
#: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr "输入音量"
+msgid "Input level:"
+msgstr "输入级别:"
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "输入音量:"
+
+#: ../src/empathy-preferences.ui.h:18
msgid "Location sources:"
msgstr "位置来源:"
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:19
msgid "Log conversations"
msgstr "记录对话"
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:20
msgid "Notifications"
msgstr "提示"
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:21
msgid "Play sound for events"
msgstr "播放事件声音"
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:22
msgid "Privacy"
msgstr "隐私"
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:23
msgid ""
"Reduced location accuracy means that nothing more precise than your city, "
"state and country will be published. GPS coordinates will be accurate to 1 "
@@ -4225,70 +4282,70 @@ msgstr ""
"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
"将精确到一位小数。 "
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:24
msgid "Show _smileys as images"
msgstr "显示表情符号为图形(_S)"
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:25
msgid "Show contact _list in rooms"
msgstr "在聊天室显示联系人列表(_L)"
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:26
msgid "Sounds"
msgstr "声音"
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:27
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
msgid ""
"The list of languages reflects only the languages for which you have a "
"dictionary installed."
msgstr "语言列表仅反映已安装的字典"
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
msgid "Themes"
msgstr "主题"
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
msgid "Variant:"
msgstr "版本:"
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
msgid "_Automatically connect on startup"
msgstr "启动时自动连接(_A) "
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
msgid "_Cellphone"
msgstr "手机(_C)"
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
msgid "_Enable bubble notifications"
msgstr "允许气泡通知(_E)"
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
msgid "_Enable sound notifications"
msgstr "启用声音通知(_E)"
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
msgid "_GPS"
msgstr "_GPS"
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
msgid "_Network (IP, Wi-Fi)"
msgstr "网络(_N)(IP,Wi-Fi)"
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:37
msgid "_Open new chats in separate windows"
msgstr "在单独窗口中打开新聊天(_O)"
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:38
msgid "_Publish location to my contacts"
msgstr "向我的联系人公布位置信息(_P)"
#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:40
msgid "_Reduce location accuracy"
msgstr "降低位置信息精度(_R)"
@@ -4414,16 +4471,16 @@ msgid ""
"extension."
msgstr "已选定的连接管理不支持远程调试扩展"
+#: ../src/empathy-invite-participant-dialog.c:179
#: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
msgid "Invite Participant"
msgstr "邀请参与者"
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:180
msgid "Choose a contact to invite into the conversation:"
msgstr "选择一个联系人以加入该会话:"
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:201
msgid "Invite"
msgstr "邀请"
@@ -4500,31 +4557,31 @@ msgstr "接受"
msgid "Provide"
msgstr "提供"
-#: ../src/empathy-call-observer.c:135
+#: ../src/empathy-call-observer.c:134
#, c-format
msgid "%s just tried to call you, but you were in another call."
msgstr "%s 刚刚尝试呼叫您,但您当时正在与其他人通话。"
#. Translators: this is an "Info" label. It should be as short
#. * as possible.
-#: ../src/empathy-call-window.c:986 ../src/empathy-call-window.c:1000
+#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
msgid "i"
msgstr "i"
-#: ../src/empathy-call-window.c:2512
+#: ../src/empathy-call-window.c:2603
msgid "On hold"
msgstr "挂起"
-#: ../src/empathy-call-window.c:2515
+#: ../src/empathy-call-window.c:2606
msgid "Mute"
msgstr "静音"
-#: ../src/empathy-call-window.c:2517
+#: ../src/empathy-call-window.c:2608
msgid "Duration"
msgstr "时长"
#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2520
+#: ../src/empathy-call-window.c:2611
#, c-format
msgid "%s — %d:%02dm"
msgstr "%s — %d:%02dm"
@@ -4533,6 +4590,15 @@ msgstr "%s — %d:%02dm"
msgid "_Match case"
msgstr "区分大小写(_M)"
+#~ msgid "Find Next"
+#~ msgstr "向下查找"
+
+#~ msgid "Find Previous"
+#~ msgstr "向上查找"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "显示和编辑帐号"
+
#, fuzzy
#~ msgid "Call with %d participants"
#~ msgstr "与 %s 通话"
@@ -4664,9 +4730,6 @@ msgstr "区分大小写(_M)"
#~ msgid "The error message was: <span style=\"italic\">%s</span>"
#~ msgstr "错误信息是:<span style=\"italic\">%s</span>"
-#~ msgid "_Next"
-#~ msgstr "下一页(_N)"
-
#~ msgid "Add new"
#~ msgstr "添加"
@@ -4857,9 +4920,6 @@ msgstr "区分大小写(_M)"
#~ msgid "Status:"
#~ msgstr "状态:"
-#~ msgid "Word"
-#~ msgstr "单词"
-
#~ msgid "Suggestions for the word"
#~ msgstr "单词的拼写建议"