summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorLuke Schierer <lschiere@pidgin.im>2006-09-11 16:51:42 +0000
committerLuke Schierer <lschiere@pidgin.im>2006-09-11 16:51:42 +0000
commit7f669513ccd28d1babdac6b11fe0db0955d5c25d (patch)
treea0b402199829f189094634f9f581710c9681aad4 /po/zh_CN.po
parentb1a639b8c738e460935bc3ea360b38bd8e6d1d4e (diff)
downloadpidgin-7f669513ccd28d1babdac6b11fe0db0955d5c25d.tar.gz
[gaim-migrate @ 17250]
a few translation updates
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po11729
1 files changed, 6744 insertions, 4985 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e3ab86946b..f1acaee904 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gaim HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-08 00:00-0500\n"
-"PO-Revision-Date: 2006-03-08 18:28+0800\n"
+"POT-Creation-Date: 2006-08-27 21:58+0800\n"
+"PO-Revision-Date: 2006-08-27 22:23+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -28,2449 +28,1314 @@ msgstr "互联网通讯程序"
msgid "Send instant messages over multiple protocols"
msgstr "通过多种协议发送即时消息"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ciphertest.c:264
-msgid "Cipher Test"
-msgstr ""
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
-msgstr ""
-
-#: ../plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "好友正发呆"
-
-#: ../plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "好友已离开"
-
-#: ../plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "好友为“扩展”离开"
-
-#. Not used yet.
-#: ../plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr ""
-
-#: ../plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "好友离线"
-
-#: ../plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "程序内部所用的权值,当..."
-
-#: ../plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-
-#: ../plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr ""
-
-#: ../plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "账户的权值..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "联系人优先级"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr "允许控制好友不同状态所对应的值。"
-
-#. *< description
-#: ../plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr "允许在进行好友优先级比较时为发呆/离开/离线状态所用的权值。"
+#: ../console/gntaccount.c:95 ../console/gntblist.c:168
+#: ../console/gntblist.c:285 ../console/gntblist.c:298
+#: ../console/gntplugin.c:145 ../console/gntplugin.c:190
+#: ../console/gntstatus.c:216 ../console/gntstatus.c:224
+#: ../libgaim/protocols/jabber/buddy.c:1365
+#: ../libgaim/protocols/jabber/chat.c:675
+#: ../libgaim/protocols/jabber/chat.c:686
+#: ../libgaim/protocols/jabber/jabber.c:1191
+#: ../libgaim/protocols/silc/ops.c:1448
+msgid "Error"
+msgstr "出错"
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/crazychat/cc_gaim_plugin.c:146
-msgid "Crazychat"
-msgstr "Crazychat"
+#: ../console/gntaccount.c:95
+msgid "Account was not added"
+msgstr "账户未添加"
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/crazychat/cc_gaim_plugin.c:149
-msgid "Plugin to establish a Crazychat session."
-msgstr "建立 Crazychat 会话的插件。"
+#: ../console/gntaccount.c:96
+msgid "Screenname of an account must be non-empty."
+msgstr "账户的用户名必须非空。"
-#. * description
-#: ../plugins/crazychat/cc_gaim_plugin.c:151
-msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
-msgstr ""
+#: ../console/gntaccount.c:399 ../gtk/gtkaccount.c:553
+msgid "New mail notifications"
+msgstr "新邮件通知"
-#. make the network configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:295
-msgid "Network Configuration"
-msgstr "网络配置"
+#: ../console/gntaccount.c:409 ../gtk/gtkaccount.c:482
+msgid "Remember password"
+msgstr "记住密码"
-#: ../plugins/crazychat/cc_gaim_plugin.c:307
-msgid "TCP port"
-msgstr "TCP 端口"
+#: ../console/gntaccount.c:450 ../gtk/gtkaccount.c:1395 ../gtk/gtkblist.c:3787
+msgid "Modify Account"
+msgstr "修改账户"
-#: ../plugins/crazychat/cc_gaim_plugin.c:317
-msgid "UDP port"
-msgstr "UDP 端口"
+#: ../console/gntaccount.c:450
+msgid "New Account"
+msgstr "新建账户"
-#. make the feature configuration frame
-#: ../plugins/crazychat/cc_gaim_plugin.c:329
-msgid "Feature Calibration"
-msgstr "特性校正"
+#: ../console/gntaccount.c:476 ../gtk/gtkaccount.c:394 ../gtk/gtkft.c:642
+msgid "Protocol:"
+msgstr "协议:"
-#. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:574
-msgid "Enabled"
-msgstr "已启用"
+#: ../console/gntaccount.c:484 ../gtk/gtkaccount.c:399 ../gtk/gtkblist.c:4842
+#: ../gtk/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "用户名:"
-#: ../plugins/crazychat/cc_gaim_plugin.c:350
-msgid "Disabled"
-msgstr "已禁用"
+#: ../console/gntaccount.c:497 ../gtk/gtkaccount.c:473
+#: ../gtk/plugins/cap/cap.c:1099
+msgid "Password:"
+msgstr "密码:"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/dbus-example.c:135
-msgid "DBus"
-msgstr "DBus"
+#: ../console/gntaccount.c:507 ../gtk/gtkblist.c:4863 ../gtk/gtkblist.c:5228
+msgid "Alias:"
+msgstr "别名:"
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/dbus-example.c:138 ../plugins/dbus-example.c:140
-msgid "DBus Plugin Example"
-msgstr "DBus 插件示例"
+#. Cancel
+#: ../console/gntaccount.c:530 ../console/gntaccount.c:591
+#: ../console/gntaccount.c:803 ../console/gntblist.c:209
+#: ../console/gntblist.c:275 ../console/gntblist.c:308
+#: ../console/gntblist.c:590 ../console/gntblist.c:745
+#: ../console/gntblist.c:833 ../console/gntprefs.c:202
+#: ../console/gntstatus.c:108 ../console/gntstatus.c:380
+#: ../console/gntstatus.c:500 ../gtk/gtkaccount.c:1828
+#: ../gtk/gtkaccount.c:2298 ../gtk/gtkblist.c:5284 ../gtk/gtkdialogs.c:666
+#: ../gtk/gtkdialogs.c:803 ../gtk/gtkdialogs.c:894 ../gtk/gtkdialogs.c:913
+#: ../gtk/gtkdialogs.c:935 ../gtk/gtkdialogs.c:955 ../gtk/gtkdialogs.c:999
+#: ../gtk/gtkdialogs.c:1054 ../gtk/gtkdialogs.c:1091 ../gtk/gtkdialogs.c:1116
+#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:296
+#: ../gtk/gtkpounce.c:1088 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
+#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
+#: ../gtk/gtksavedstatuses.c:296 ../libgaim/account.c:963
+#: ../libgaim/account.c:1134 ../libgaim/account.c:1171
+#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:594
+#: ../libgaim/protocols/jabber/buddy.c:1727
+#: ../libgaim/protocols/jabber/buddy.c:1761
+#: ../libgaim/protocols/jabber/chat.c:778
+#: ../libgaim/protocols/jabber/jabber.c:841
+#: ../libgaim/protocols/jabber/jabber.c:1346
+#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
+#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
+#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
+#: ../libgaim/protocols/oscar/oscar.c:1368
+#: ../libgaim/protocols/oscar/oscar.c:2130
+#: ../libgaim/protocols/oscar/oscar.c:2169
+#: ../libgaim/protocols/oscar/oscar.c:2217
+#: ../libgaim/protocols/oscar/oscar.c:5710
+#: ../libgaim/protocols/oscar/oscar.c:5762
+#: ../libgaim/protocols/oscar/oscar.c:5914
+#: ../libgaim/protocols/oscar/oscar.c:5939
+#: ../libgaim/protocols/oscar/oscar.c:5995
+#: ../libgaim/protocols/oscar/oscar.c:6064
+#: ../libgaim/protocols/oscar/peer.c:982
+#: ../libgaim/protocols/qq/buddy_info.c:513
+#: ../libgaim/protocols/qq/buddy_opt.c:214
+#: ../libgaim/protocols/qq/buddy_opt.c:408 ../libgaim/protocols/qq/group.c:112
+#: ../libgaim/protocols/qq/group_join.c:124
+#: ../libgaim/protocols/qq/group_join.c:359
+#: ../libgaim/protocols/qq/group_opt.c:141
+#: ../libgaim/protocols/qq/group_opt.c:391 ../libgaim/protocols/qq/qq.c:470
+#: ../libgaim/protocols/qq/sendqueue.c:203
+#: ../libgaim/protocols/qq/sys_msg.c:103 ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libgaim/protocols/sametime/sametime.c:3365
+#: ../libgaim/protocols/sametime/sametime.c:3450
+#: ../libgaim/protocols/sametime/sametime.c:3620
+#: ../libgaim/protocols/sametime/sametime.c:5320
+#: ../libgaim/protocols/sametime/sametime.c:5409
+#: ../libgaim/protocols/sametime/sametime.c:5533
+#: ../libgaim/protocols/silc/buddy.c:467
+#: ../libgaim/protocols/silc/buddy.c:1078
+#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/silc.c:754 ../libgaim/protocols/silc/silc.c:959
+#: ../libgaim/protocols/yahoo/yahoo.c:3156
+#: ../libgaim/protocols/yahoo/yahoo.c:3165 ../libgaim/request.h:1344
+#: ../libgaim/request.h:1354
+msgid "Cancel"
+msgstr "取消"
-#: ../plugins/docklet/docklet.c:154
-msgid "Right-click for more unread messages...\n"
-msgstr "用鼠标右键单击可查看更多未读消息...\n"
+#. Save
+#: ../console/gntaccount.c:534 ../console/gntprefs.c:202
+#: ../console/gntstatus.c:383 ../console/gntstatus.c:488 ../gtk/gtkdebug.c:684
+#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1170
+#: ../libgaim/protocols/jabber/buddy.c:593
+msgid "Save"
+msgstr "保存"
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3238
+#: ../console/gntaccount.c:586 ../gtk/gtkaccount.c:1822
+#: ../gtk/gtksavedstatuses.c:293
#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "来自 %2$s 的 %1$d 条未读消息\n"
-
-#: ../plugins/docklet/docklet.c:432
-msgid "Change Status"
-msgstr "更改状态"
-
-#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
-#: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
-#: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2735 ../src/status.c:155
-msgid "Available"
-msgstr "可用"
-
-#. Away stuff
-#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7873
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
-#: ../src/status.c:158
-msgid "Away"
-msgstr "离开"
-
-#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2729
-#: ../src/status.c:157
-msgid "Invisible"
-msgstr "隐身"
-
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2968
-#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7845 ../src/protocols/yahoo/yahoo.c:2733
-#: ../src/status.c:154
-msgid "Offline"
-msgstr "离线"
-
-#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
-msgid "New..."
-msgstr "新建..."
-
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
-msgid "Saved..."
-msgstr "已存..."
-
-#: ../plugins/docklet/docklet.c:484
-msgid "Show Buddy List"
-msgstr "显示好友列表"
+msgid "Are you sure you want to delete %s?"
+msgstr "您真的想要删除 %s 吗?"
-#: ../plugins/docklet/docklet.c:489
-msgid "Unread Messages"
-msgstr "未读消息"
+#. Close any other opened delete window
+#: ../console/gntaccount.c:590
+msgid "Delete Account"
+msgstr "删除账户"
-#: ../plugins/docklet/docklet.c:510
-msgid "New Message..."
-msgstr "新消息..."
+#: ../console/gntaccount.c:591 ../console/gntaccount.c:657
+#: ../console/gntstatus.c:108 ../console/gntstatus.c:170
+#: ../gtk/gtkaccount.c:1827 ../gtk/gtkpounce.c:1087 ../gtk/gtkrequest.c:273
+#: ../gtk/gtksavedstatuses.c:295
+msgid "Delete"
+msgstr "删除"
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2467
+#: ../console/gntaccount.c:620 ../gtk/gtkaccount.c:2130
+#: ../gtk/plugins/docklet/docklet.c:519
msgid "Accounts"
msgstr "账户"
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
-msgid "Plugins"
-msgstr "插件"
-
-#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1900
-msgid "Preferences"
-msgstr "首选项"
-
-#: ../plugins/docklet/docklet.c:525
-msgid "Mute Sounds"
-msgstr "静音"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../plugins/docklet/docklet.c:538
-msgid "Quit"
-msgstr "退出"
-
-#: ../plugins/docklet/docklet.c:679
-msgid "Blink tray icon for unread..."
-msgstr "有未读消息时闪烁托盘图标..."
-
-#: ../plugins/docklet/docklet.c:682
-msgid "_Instant Messages:"
-msgstr "即时消息(_I):"
-
-#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
-#: ../src/gtkprefs.c:1749 ../src/gtkprefs.c:1763
-msgid "Never"
-msgstr "从不"
-
-#: ../plugins/docklet/docklet.c:685
-msgid "In hidden conversations"
-msgstr "于隐藏对话"
-
-#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
-#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
-msgid "Always"
-msgstr "总是"
-
-#: ../plugins/docklet/docklet.c:690
-msgid "C_hat Messages:"
-msgstr "聊天消息(_H):"
-
-#: ../plugins/docklet/docklet.c:693
-msgid "When my nick is said"
-msgstr "谈到我的昵称时"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/docklet/docklet.c:720
-msgid "System Tray Icon"
-msgstr "系统托盘图标"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/docklet/docklet.c:723
-msgid "Displays an icon for Gaim in the system tray."
-msgstr "在系统托盘中显示 Gaim 的图标。"
-
-#. * description
-#: ../plugins/docklet/docklet.c:725
-msgid ""
-"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list. Also provides options to blink for "
-"unread messages."
-msgstr ""
-"在系统的托盘区(如 GNOME、KDE 或 Windows)显示一个图标,表示 Gaim 的当前状态,"
-"并允许快速访问常用的功能,以及切换好友列表的显示。同时还提供有未读消息时闪烁"
-"的选项。"
-
-#: ../plugins/docklet/eggtrayicon.c:123
-msgid "Orientation"
-msgstr "方向"
-
-#: ../plugins/docklet/eggtrayicon.c:124
-msgid "The orientation of the tray."
-msgstr "托盘的方向。"
-
-#: ../plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "按对话计数"
-
-#: ../plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "交谈放置"
-
-#: ../plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "每个窗口的对话数"
-
-#: ../plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "按数字放置时分离即时消息和聊天窗口"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "扩展放置"
-
-#. *< name
-#. *< version
-#: ../plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "额外的对话放置选项。"
-
-#. *< summary
-#. * description
-#: ../plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr "限制每个窗口的对话数,可选分离即时消息和聊天窗口"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/filectl.c:245
-msgid "Gaim File Control"
-msgstr "Gaim 文件控制"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr "允许您输入文件中的命令来控制 Gaim。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim 演示插件"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "一个范例插件 - 参看描述。"
-
-#. * description
-#: ../plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"这个插件非常酷,它可以完成以下功能:\n"
-"- 在您登入后告诉您谁写的这个程序\n"
-"- 颠倒所有收到的文本\n"
-"- 当您的好友登入后立即给他们发送信息"
-
-#: ../plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "光标颜色"
-
-#: ../plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "次要光标颜色"
-
-#: ../plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "超级链接颜色"
-
-#: ../plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "GtkTreeView 扩展柄大小"
-
-#: ../plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView 水平分隔"
-
-#: ../plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "对话项"
-
-#: ../plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "对话历史"
-
-#: ../plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "日志查看器"
-
-#: ../plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "请求对话框"
-
-#: ../plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "提醒对话框"
-
-#: ../plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeView 缩进扩展柄"
-
-#: ../plugins/gaimrc.c:287
-#, c-format
-msgid "Select Color for %s"
-msgstr "选择 %s 的颜色"
+#: ../console/gntaccount.c:626
+msgid "You can enable/disable accounts from the following list."
+msgstr "您可以启用/禁用以下列表中的账户。"
+
+#: ../console/gntaccount.c:649 ../console/gntaccount.c:802
+#: ../console/gntblist.c:209 ../console/gntblist.c:275
+#: ../console/gntblist.c:308 ../console/gntnotify.c:282
+#: ../console/gntstatus.c:160 ../gtk/gtkaccount.c:2297 ../gtk/gtkblist.c:5283
+#: ../gtk/gtkconv.c:1594 ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2407
+#: ../libgaim/protocols/qq/sys_msg.c:103 ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libgaim/protocols/sametime/sametime.c:5408
+#: ../libgaim/protocols/silc/chat.c:596
+msgid "Add"
+msgstr "添加"
-#: ../plugins/gaimrc.c:289
-msgid "Select Color"
-msgstr "选择颜色"
+#: ../console/gntaccount.c:653
+msgid "Modify"
+msgstr "修改"
-#: ../plugins/gaimrc.c:324
+#: ../console/gntaccount.c:727 ../gtk/gtkaccount.c:2246
#, c-format
-msgid "Select Font for %s"
-msgstr "选择 %s 的字体"
-
-#: ../plugins/gaimrc.c:362
-msgid "Select Interface Font"
-msgstr "选择界面字体"
-
-#: ../plugins/gaimrc.c:415
-msgid "General"
-msgstr "常规"
-
-#: ../plugins/gaimrc.c:420
-msgid "GTK+ Interface Font"
-msgstr "GTK+ 界面字体"
-
-#: ../plugins/gaimrc.c:440
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ 文字快捷方式主题"
-
-#: ../plugins/gaimrc.c:475
-msgid "Interface colors"
-msgstr "界面颜色"
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s 已经将 %s 加为好友%s%s"
-#: ../plugins/gaimrc.c:499
-msgid "Widget Sizes"
-msgstr "部件大小"
+#: ../console/gntaccount.c:800 ../gtk/gtkaccount.c:2295
+msgid "Add buddy to your list?"
+msgstr "将用户加为好友吗?"
-#: ../plugins/gaimrc.c:520
-msgid "Fonts"
-msgstr "字体"
+#: ../console/gntblist.c:160
+msgid "You must provide a screename for the buddy."
+msgstr "您必须提供好友的用户名。"
-#: ../plugins/gaimrc.c:543
-msgid "Tools"
-msgstr "工具"
+#: ../console/gntblist.c:162
+msgid "You must provide a group."
+msgstr "您必须提供组。"
-#: ../plugins/gaimrc.c:548
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "将设置写入 %s%sgtkrc-2.0"
+#: ../console/gntblist.c:164
+msgid "You must select an account."
+msgstr "您必须选择账户。"
-#: ../plugins/gaimrc.c:556
-msgid "Re-read gtkrc files"
-msgstr "重新读取 gtkrc 文件"
+#: ../console/gntblist.c:168
+msgid "Error adding buddy"
+msgstr "添加好友出错"
-#: ../plugins/gaimrc.c:583
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ 主题控制"
-
-#: ../plugins/gaimrc.c:585 ../plugins/gaimrc.c:586
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "提供对常用 gtkrc 设置的访问。"
+#: ../console/gntblist.c:193 ../gtk/gtkaccount.c:1891
+#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2781
+msgid "Screen Name"
+msgstr "用户名"
-#. Configuration frame
-#: ../plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "鼠标手势配置"
+#: ../console/gntblist.c:196 ../console/gntblist.c:267 ../gtk/gtkdialogs.c:912
+#: ../gtk/gtkdialogs.c:934 ../gtk/gtkdialogs.c:954 ../gtk/gtkrequest.c:277
+#: ../libgaim/protocols/silc/chat.c:587
+msgid "Alias"
+msgstr "别名"
-#: ../plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "鼠标中键"
+#: ../console/gntblist.c:199 ../console/gntblist.c:270
+msgid "Group"
+msgstr "组"
-#: ../plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "鼠标右键"
-
-#. "Visual gesture display" checkbox
-#: ../plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "可视手势显示(_V)"
+#: ../console/gntblist.c:202 ../console/gntblist.c:258
+#: ../console/gntnotify.c:131 ../console/gntstatus.c:471
+#: ../gtk/gtknotify.c:406 ../gtk/gtkpounce.c:1255
+#: ../gtk/plugins/gevolution/gevolution.c:450 ../libgaim/plugins/idle.c:153
+#: ../libgaim/plugins/idle.c:189
+msgid "Account"
+msgstr "账户"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "鼠标手势"
+#: ../console/gntblist.c:208 ../console/gntblist.c:630 ../gtk/gtkblist.c:4796
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:442
+#: ../libgaim/protocols/silc/buddy.c:736
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/buddy.c:1075
+#: ../libgaim/protocols/silc/buddy.c:1174
+#: ../libgaim/protocols/yahoo/yahoo.c:3070
+msgid "Add Buddy"
+msgstr "添加好友"
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "提供鼠标手势的支持"
+#: ../console/gntblist.c:208
+msgid "Please enter buddy information."
+msgstr "请输入好友信息。"
-#. * description
-#: ../plugins/gestures/gestures.c:294
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-"允许在对话窗口中支持鼠标手势。\n"
-"拖曳鼠标中键可执行特定操作:\n"
-"\n"
-"向下再向右可关闭对话。\n"
-"向上再向左可切换到上个对话。\n"
-"向上再向右可切换到下个对话。"
+#: ../console/gntblist.c:231 ../libgaim/blist.c:1182
+msgid "Chats"
+msgstr "聊天"
#. Extract their Name and put it in
-#: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
-#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1525
+#. Contact Info
+#. Personal
+#. Business
+#: ../console/gntblist.c:264 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:604
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:131
+#: ../gtk/plugins/gevolution/assoc-buddy.c:119
+#: ../libgaim/protocols/jabber/jabber.c:772
+#: ../libgaim/protocols/msn/msn.c:1529 ../libgaim/protocols/msn/msn.c:1582
+#: ../libgaim/protocols/msn/msn.c:1603 ../libgaim/protocols/qq/buddy_info.c:63
msgid "Name"
msgstr "名称"
-#: ../plugins/gevolution/add_buddy_dialog.c:142
-msgid "Instant Messaging"
-msgstr "即时通讯"
-
-#. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
-msgid "Select a person from your address book below, or add a new person."
-msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
-
-#. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
-#: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8393
-#: ../src/protocols/sametime/sametime.c:5532
-msgid "Search"
-msgstr "搜索"
-
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4534
-#: ../src/gtkblist.c:4898
-msgid "Group:"
-msgstr "组:"
-
-#. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
-#: ../plugins/gevolution/assoc-buddy.c:464
-msgid "New Person"
-msgstr "新建联系人"
-
-#. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
-msgid "Select Buddy"
-msgstr "选择好友"
-
-#. Add the label.
-#: ../plugins/gevolution/assoc-buddy.c:340
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr "从您的地址簿中选择一个人可将其加为好友,您也可以创建一个新联系人。"
-
-#. Add the expander
-#: ../plugins/gevolution/assoc-buddy.c:428
-msgid "User _details"
-msgstr "用户资料(_D)"
+#: ../console/gntblist.c:273 ../console/gntblist.c:632 ../gtk/gtkblist.c:5174
+msgid "Add Chat"
+msgstr "添加聊天"
-#. "Associate Buddy" button
-#: ../plugins/gevolution/assoc-buddy.c:481
-msgid "_Associate Buddy"
-msgstr "关联好友(_A)"
+#: ../console/gntblist.c:274
+msgid "You can edit more information from the context menu later."
+msgstr ""
-#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1121
-msgid "None"
-msgstr "无"
+#: ../console/gntblist.c:285 ../console/gntblist.c:298
+msgid "Error adding group"
+msgstr "添加组出错"
-#: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1271 ../src/blist.c:1498
-#: ../src/gtkblist.c:4343 ../src/protocols/jabber/roster.c:65
-msgid "Buddies"
-msgstr "好友"
+#: ../console/gntblist.c:286
+msgid "You must give a name for the group to add."
+msgstr "您必须给出要添加的组名称。"
-#: ../plugins/gevolution/gevolution.c:262
-#: ../plugins/gevolution/gevolution.c:268
-msgid "Unable to send e-mail"
-msgstr "无法发送电子邮件。"
+#: ../console/gntblist.c:299
+msgid "A group with the name already exists."
+msgstr "已存在同名组。"
-#: ../plugins/gevolution/gevolution.c:263
-msgid "The evolution executable was not found in the PATH."
-msgstr "Evolution 可执行文件未在 PATH 中找到。"
+#: ../console/gntblist.c:306 ../console/gntblist.c:634 ../gtk/gtkblist.c:5280
+#: ../libgaim/protocols/sametime/sametime.c:5319
+#: ../libgaim/protocols/sametime/sametime.c:5406
+msgid "Add Group"
+msgstr "添加组"
-#: ../plugins/gevolution/gevolution.c:269
-msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr "指定的好友未在 Evolution 联系人中找到。"
+#: ../console/gntblist.c:306
+msgid "Enter the name of the group"
+msgstr "请输入组名称"
-#: ../plugins/gevolution/gevolution.c:286
-msgid "Add to Address Book"
-msgstr "添加到地址簿"
+#: ../console/gntblist.c:589
+msgid "Edit Chat"
+msgstr "编辑聊天"
-#: ../plugins/gevolution/gevolution.c:290
-msgid "Send E-Mail"
-msgstr "发送电子邮件"
+#: ../console/gntblist.c:589
+msgid "Please Update the necessary fields."
+msgstr "请更新必要的字段。"
-#. Configuration frame
-#: ../plugins/gevolution/gevolution.c:417
-msgid "Evolution Integration Configuration"
-msgstr "Evolution 集成配置"
+#: ../console/gntblist.c:590 ../console/gntstatus.c:165
+msgid "Edit"
+msgstr "编辑"
-#. Label
-#: ../plugins/gevolution/gevolution.c:420
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "选择要将好友自动添加到哪些账户。"
+#: ../console/gntblist.c:596
+msgid "Auto-join"
+msgstr "自动加入"
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
-msgid "Account"
-msgstr "账户"
+#: ../console/gntblist.c:604
+msgid "Edit Settings"
+msgstr "编辑设置"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gevolution/gevolution.c:527
-msgid "Evolution Integration"
-msgstr "Evolution 集成"
+#: ../console/gntblist.c:652 ../libgaim/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "信息"
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/gevolution/gevolution.c:530
-#: ../plugins/gevolution/gevolution.c:532
-msgid "Provides integration with Evolution."
-msgstr "提供与 Evolution 的集成。"
+#: ../console/gntblist.c:657
+msgid "Add Buddy Pounce"
+msgstr "添加好友千里眼"
-#: ../plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the person's information below."
-msgstr "请在下面输入联系人的信息。"
+#: ../console/gntblist.c:664 ../gtk/gtkconv.c:1542
+#: ../libgaim/protocols/oscar/oscar.c:616
+msgid "Send File"
+msgstr "发送文件"
-#: ../plugins/gevolution/new_person_dialog.c:270
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "请在下面输入好友的用户名和账户类型。"
+#: ../console/gntblist.c:668
+msgid "View Log"
+msgstr "查看日志"
-#: ../plugins/gevolution/new_person_dialog.c:290
-msgid "Account type:"
-msgstr "账户类型:"
+#: ../console/gntblist.c:741
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "请输入 %s 的新名称"
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
-msgid "Screen name:"
-msgstr "用户名:"
+#. These are common for everything
+#: ../console/gntblist.c:743 ../console/gntblist.c:744
+#: ../console/gntblist.c:888
+msgid "Rename"
+msgstr "重命名"
-#. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
-msgid "Optional information:"
-msgstr "额外信息:"
+#: ../console/gntblist.c:743
+msgid "Enter empty string to reset the name."
+msgstr "输入空字符串可重置名称。"
-#. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
-msgid "Buddy Icon"
-msgstr "好友图标"
+#: ../console/gntblist.c:821
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "删除此组也将删除该组中的全部好友"
-#: ../plugins/gevolution/new_person_dialog.c:349
-msgid "First name:"
-msgstr "名:"
-
-#: ../plugins/gevolution/new_person_dialog.c:361
-msgid "Last name:"
-msgstr "姓:"
-
-#: ../plugins/gevolution/new_person_dialog.c:381
-msgid "E-mail:"
-msgstr "电子邮件:"
+#: ../console/gntblist.c:826
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "您真的想要删除 %s 吗?"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK 信号测试"
+#. XXX: anything to do with the returned ui-handle?
+#: ../console/gntblist.c:829
+msgid "Confirm Remove"
+msgstr "确认删除"
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "测试看看所有的 UI 信号是否都工作正确。"
+#: ../console/gntblist.c:832 ../console/gntblist.c:890 ../gtk/gtkblist.c:1027
+#: ../gtk/gtkconv.c:1591 ../gtk/gtkrequest.c:275
+msgid "Remove"
+msgstr "删除"
-#: ../plugins/history.c:120
+#: ../console/gntblist.c:954 ../console/gntblist.c:1003
#, c-format
-msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>与 %s 在 %s 的谈话</b><br>"
-
-#: ../plugins/history.c:147
-msgid "History Plugin Requires Logging"
-msgstr "历史插件请求登录"
+msgid "Account: %s (%s)"
+msgstr "账户:%s(%s)"
-#: ../plugins/history.c:148
+#: ../console/gntblist.c:981
+#, c-format
msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Idle: %s"
msgstr ""
+"\n"
+"发呆:%s"
-#: ../plugins/history.c:188
-msgid "History"
-msgstr "历史"
-
-#: ../plugins/history.c:190
-msgid "Shows recently logged conversations in new conversations."
-msgstr "在新对话中显示显示最近记录的对话。"
-
-#: ../plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
-msgstr "打开新对话时,此插件将会将上次对话插入当前对话。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "离开后变为图标"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "您离开后将好友列表和对话都变为图标。"
-
-#: ../plugins/idle.c:152 ../plugins/idle.c:210
-msgid "Minutes"
-msgstr "分钟"
-
-#: ../plugins/idle.c:159 ../plugins/idle.c:192 ../plugins/idle.c:217
-#: ../plugins/idle.c:306
-msgid "I'dle Mak'er"
-msgstr "发呆器"
-
-#: ../plugins/idle.c:160 ../plugins/idle.c:249
-msgid "Set Account Idle Time"
-msgstr "设定账户发呆时间"
-
-#: ../plugins/idle.c:163 ../plugins/idle.c:221
-msgid "_Set"
-msgstr "设置(_S)"
-
-#: ../plugins/idle.c:164 ../plugins/idle.c:197 ../plugins/idle.c:222
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../plugins/idle.c:177
-msgid "None of your accounts are idle."
-msgstr "您的全部账户都没有设为发呆。"
-
-#: ../plugins/idle.c:193 ../plugins/idle.c:253
-msgid "Unset Account Idle Time"
-msgstr "取消账户发呆时间的设定"
-
-#: ../plugins/idle.c:196
-msgid "_Unset"
-msgstr "取消设置(_U)"
-
-#: ../plugins/idle.c:218 ../plugins/idle.c:257
-msgid "Set Idle Time for All Accounts"
-msgstr "设定全部账户的发呆时间"
-
-#: ../plugins/idle.c:262
-msgid "Unset Idle Time for All Idled Accounts"
-msgstr "取消全部账户的发呆时间"
-
-#: ../plugins/idle.c:308 ../plugins/idle.c:309
-msgid "Allows you to hand-configure how long you've been idle"
-msgstr "允许您手动配置您发了多长时间呆"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-client.c:87
-msgid "IPC Test Client"
-msgstr "IPC 测试客户"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/ipc-test-client.c:90
-msgid "Test plugin IPC support, as a client."
-msgstr "测试插件 IPC 支持,作为客户。"
-
-#. * description
-#: ../plugins/ipc-test-client.c:92
+#: ../console/gntblist.c:992
+#, c-format
msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr "测试插件 IPC 支持,作为客户。这将定位服务器插件并调用注册的命令。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "IPC 测试服务器"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "测试插件 IPC 支持,作为服务器。"
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"在线: %d\n"
+"总计: %d"
-#. * description
-#: ../plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "测试插件 IPC 支持,作为服务器。这将注册 IPC 命令。"
+#: ../console/gntblist.c:1211 ../gtk/gtkstatusbox.c:814
+#: ../gtk/plugins/docklet/docklet.c:467
+msgid "New..."
+msgstr "新建..."
-#: ../plugins/log_reader.c:1407
-msgid "User is offline."
-msgstr "用户离线。"
+#: ../console/gntblist.c:1218 ../gtk/gtkstatusbox.c:815
+#: ../gtk/plugins/docklet/docklet.c:468
+msgid "Saved..."
+msgstr "已存..."
-#: ../plugins/log_reader.c:1413
-msgid "Auto-response sent:"
-msgstr "自动响应发送:"
+#. Buddy List
+#: ../console/gntblist.c:1421 ../console/gntprefs.c:197 ../gtk/gtkblist.c:3903
+#: ../gtk/plugins/win32/winprefs/winprefs.c:451
+msgid "Buddy List"
+msgstr "好友列表"
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
-#: ../plugins/statenotify.c:79
+#: ../console/gntconn.c:12
#, c-format
-msgid "%s has signed off."
-msgstr "%s 已登出。"
-
-#: ../plugins/log_reader.c:1440
-msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgid "%s (%s)"
+msgstr "%s(%s)"
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
-msgid "You were disconnected from the server."
-msgstr "您已经断开与服务器的连接。"
+#: ../console/gntconn.c:15
+#, c-format
+msgid "%s disconnected."
+msgstr "%s 已断开连接。"
-#: ../plugins/log_reader.c:1458
+#: ../console/gntconn.c:16
+#, c-format
msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
-msgstr "您目前已被断开。除非您再次登录,否则无法收到消息。"
-
-#: ../plugins/log_reader.c:1473
-msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "消息未发出,因为超过了最大长度。"
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"由于下列错误 %s 已经断开:\n"
+"%s"
-#: ../plugins/log_reader.c:1478
-msgid "Message could not be sent."
-msgstr "无法发送消息。"
+#: ../console/gntconn.c:19 ../gtk/gtkblist.c:3784 ../libgaim/account.c:990
+#: ../libgaim/connection.c:99
+msgid "Connection Error"
+msgstr "连接错误"
-#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
-msgid "Adium"
-msgstr "Adium"
+#: ../console/gntconv.c:78 ../gtk/gtkconv.c:472
+msgid "No such command."
+msgstr "没有这样的命令。"
-#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
-msgid "Fire"
-msgstr "Fire"
+#: ../console/gntconv.c:82 ../gtk/gtkconv.c:479
+msgid "Syntax Error: You typed the wrong number of arguments to that command."
+msgstr "系统错误: 您给命令传送的参数个数不对。"
-#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
-msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
+#: ../console/gntconv.c:87 ../gtk/gtkconv.c:484
+msgid "Your command failed for an unknown reason."
+msgstr "您的命令失败,原因未知。"
-#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
+#: ../console/gntconv.c:92 ../gtk/gtkconv.c:490
+msgid "That command only works in chats, not IMs."
+msgstr "该命令只在聊天中可用,对话中无效。"
-#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
-msgid "Trillian"
-msgstr "Trillian"
+#: ../console/gntconv.c:95 ../gtk/gtkconv.c:493
+msgid "That command only works in IMs, not chats."
+msgstr "该命令只在对话中可用,聊天中无效。"
-#. Add general preferences.
-#: ../plugins/log_reader.c:1912
-msgid "General Log Reading Configuration"
-msgstr "常规日志读取配置"
+#: ../console/gntconv.c:99 ../gtk/gtkconv.c:497
+msgid "That command doesn't work on this protocol."
+msgstr "命令无法在此协议下工作。"
-#: ../plugins/log_reader.c:1916
-msgid "Fast size calculations"
-msgstr "快速计算大小"
+#: ../console/gntconv.c:106
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "命令尚未支持。消息未送出。"
-#: ../plugins/log_reader.c:1920
-msgid "Use name heuristics"
-msgstr ""
+#: ../console/gntconv.c:189
+#, c-format
+msgid "%s"
+msgstr "%s"
-#. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
-msgid "Log Directory"
-msgstr "日志目录"
+#. Print the list of users in the room
+#: ../console/gntconv.c:334
+msgid "List of users:\n"
+msgstr "用户列表:\n"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/log_reader.c:1969
-msgid "Log Reader"
-msgstr "日志读取器"
+#: ../console/gntconv.c:466 ../gtk/gtkconv.c:366
+msgid "Supported debug options are: version"
+msgstr "支持的调试选项有: version"
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/log_reader.c:1973
-msgid "Includes other IM clients' logs in the log viewer."
-msgstr "在日志查看器中包含其它即时通讯客户的日志。"
+#: ../console/gntconv.c:501 ../gtk/gtkconv.c:402
+msgid "No such command (in this context)."
+msgstr "没有这样的命令(在此环境中)。"
-#. * description
-#: ../plugins/log_reader.c:1977
+#: ../console/gntconv.c:504 ../gtk/gtkconv.c:405
msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
-"Trillian."
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
msgstr ""
-"查看日志时,此插件将包含其它即时通讯客户端的日志。目前支持的即时通讯客户端包"
-"括 Adium、Fire、Messenger Plus!、MSN Messenger 和 Trillian。"
-
-#: ../plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "邮件检查器"
-
-#: ../plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "检查新的本地邮件。"
-
-#: ../plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
-
-#: ../plugins/mono/loader/mono.c:213
-msgid "Mono Plugin Loader"
-msgstr "Mono 插件装入器"
-
-#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
-msgid "Loads .NET plugins with Mono."
-msgstr "装入 Mono 编写的 .NET 插件。"
+"使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
+"此环境下可使用下列命令:\n"
-#: ../plugins/musicmessaging/musicmessaging.c:44
+#: ../console/gntconv.c:545 ../gtk/gtkconv.c:6584
msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr "请求了音乐信使会话。请单击 MM 图标接受。"
-
-#: ../plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "音乐信使会话已确认。"
-
-#: ../plugins/musicmessaging/musicmessaging.c:414
-msgid "Music Messaging"
-msgstr "音乐信使"
-
-#: ../plugins/musicmessaging/musicmessaging.c:415
-msgid "There was a conflict in running the command:"
-msgstr "运行命令时发生了冲突:"
-
-#: ../plugins/musicmessaging/musicmessaging.c:523
-msgid "Error Running Editor"
-msgstr "运行编辑器出错"
-
-#: ../plugins/musicmessaging/musicmessaging.c:524
-msgid "The following error has occured:"
-msgstr "发生了下列错误:"
-
-#. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:623
-msgid "Music Messaging Configuration"
-msgstr "音乐信使配置"
-
-#: ../plugins/musicmessaging/musicmessaging.c:627
-msgid "Score Editor Path"
-msgstr "计分编辑器路径"
-
-#: ../plugins/musicmessaging/musicmessaging.c:628
-msgid "_Apply"
-msgstr "应用(_A)"
+"say &lt;message&gt;: Send a message normally as if you weren't using a "
+"command."
+msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:663
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "合作作曲的音乐信使插件。"
+#: ../console/gntconv.c:548 ../gtk/gtkconv.c:6587
+msgid "me &lt;action&gt;: Send an IRC style action to a buddy or chat."
+msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
-#. * summary
-#: ../plugins/musicmessaging/musicmessaging.c:665
+#: ../console/gntconv.c:551 ../gtk/gtkconv.c:6590
msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr "音乐信使插件允许多个用户同时在同一份曲谱上工作。"
-
-#. ---------- "Notify For" ----------
-#: ../plugins/notify.c:638
-msgid "Notify For"
-msgstr "提醒"
-
-#: ../plugins/notify.c:642
-msgid "_IM windows"
-msgstr "即时消息窗口(_I)"
-
-#: ../plugins/notify.c:649
-msgid "C_hat windows"
-msgstr "聊天窗口(_H)"
-
-#: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
-msgstr "\t仅当别人在聊天中提到您的名字(_O)"
-
-#: ../plugins/notify.c:667
-msgid "_Focused windows"
-msgstr "聚焦窗口(_F)"
-
-#. ---------- "Notification Methods" ----------
-#: ../plugins/notify.c:675
-msgid "Notification Methods"
-msgstr "通知方式"
-
-#: ../plugins/notify.c:682
-msgid "Prepend _string into window title:"
-msgstr "在窗口标题前追加字符串(_S):"
-
-#. Count method button
-#: ../plugins/notify.c:701
-msgid "Insert c_ount of new messages into window title"
-msgstr "在窗口标题中插入新消息数(_O)"
-
-#. Urgent method button
-#: ../plugins/notify.c:710
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "设置窗口管理器“紧急”提示(_U)"
-
-#. Raise window method button
-#: ../plugins/notify.c:719
-msgid "R_aise conversation window"
-msgstr "升起对话窗口(_A)"
-
-#. ---------- "Notification Removals" ----------
-#: ../plugins/notify.c:727
-msgid "Notification Removal"
-msgstr "通知删除"
-
-#. Remove on focus button
-#: ../plugins/notify.c:732
-msgid "Remove when conversation window _gains focus"
-msgstr "对话窗口获得焦点后即删除(_G)"
-
-#. Remove on click button
-#: ../plugins/notify.c:739
-msgid "Remove when conversation window _receives click"
-msgstr "单击对话窗口后即删除(_R)"
-
-#. Remove on type button
-#: ../plugins/notify.c:747
-msgid "Remove when _typing in conversation window"
-msgstr "在对话窗口中打字后即删除(_T)"
-
-#. Remove on message send button
-#: ../plugins/notify.c:755
-msgid "Remove when a _message gets sent"
-msgstr "消息送出后即删除(_M)"
-
-#. Remove on conversation switch button
-#: ../plugins/notify.c:764
-msgid "Remove on switch to conversation ta_b"
-msgstr "切换对话标签后即删除(_B)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/notify.c:853
-msgid "Message Notification"
-msgstr "消息通知"
+"debug &lt;option&gt;: Send various debug information to the current "
+"conversation."
+msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/notify.c:856 ../plugins/notify.c:858
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "提供各种方法通知您有未读消息。"
+#: ../console/gntconv.c:554 ../gtk/gtkconv.c:6593
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: 清除对话回滚。"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/perl/perl.c:583
-msgid "Perl Plugin Loader"
-msgstr "Perl 插件装入器"
+#: ../console/gntconv.c:557 ../gtk/gtkconv.c:6596
+msgid "help &lt;command&gt;: Help on a specific command."
+msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
-#. *< name
-#. *< version
-#. *< summary
-#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
-msgid "Provides support for loading perl plugins."
-msgstr "提供装入 Perl 插件的支持。"
+#: ../console/gntconv.c:562
+msgid "plugins: Show the plugins window."
+msgstr "plugins: 显示插件窗口。"
-#: ../plugins/psychic.c:22
-msgid "Psychic Mode"
-msgstr ""
+#: ../console/gntconv.c:565
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: 显示好友列表。"
-#: ../plugins/psychic.c:23
-msgid "Psychic mode for incoming conversation"
+#: ../console/gntconv.c:568
+msgid "accounts: Show the accounts window."
msgstr ""
-#: ../plugins/psychic.c:24
-msgid ""
-"Causes conversation windows to appear as other users begin to message you. "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+#: ../console/gntconv.c:571
+msgid "debugwin: Show the debug window."
msgstr ""
-#: ../plugins/psychic.c:60
-msgid "You feel a disturbance in the force..."
+#: ../console/gntconv.c:574
+msgid "prefs: Show the preference window."
msgstr ""
-#: ../plugins/psychic.c:79
-msgid "Only enable for users on the buddy list"
-msgstr "仅对好友列表中的用户启用"
-
-#: ../plugins/psychic.c:84
-msgid "Disable when away"
-msgstr "离开时禁用"
-
-#: ../plugins/psychic.c:88
-msgid "Display notification message in conversations"
-msgstr "对话时显示通知消息"
-
-#: ../plugins/raw.c:175
-msgid "Raw"
-msgstr "Raw"
-
-#: ../plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "允许您发送原样输入基于文本的协议。"
-
-#: ../plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
+#: ../console/gntconv.c:577
+msgid "statuses: Show the savedstatuses window."
msgstr ""
-"允许您将输入原样发送给基于文本的协议(Jabber,MSN,IRC,TOC)。在输入框中按回车"
-"键可以发送。看看调试窗口。"
-#: ../plugins/relnot.c:63
-#, c-format
-msgid "You are using Gaim version %s. The current version is %s.<hr>"
-msgstr "您正在使用 Gaim 版本 %s。而当前版本为 %s。<hr>"
+#: ../console/gntdebug.c:95 ../gtk/gtkdebug.c:636
+msgid "Debug Window"
+msgstr "调试窗口"
-#: ../plugins/relnot.c:69
+#: ../console/gntgaim.c:145
#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>更新记录:</b>\n"
-"%s<br><br>"
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "%s。试试“%s -h”查看帮助。\n"
-#: ../plugins/relnot.c:74
+#: ../console/gntgaim.c:147
#, c-format
msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+" -c, --config=DIR use DIR for config files\n"
+" -d, --debug print debugging messages to stdout\n"
+" -h, --help display this help and exit\n"
+" -n, --nologin don't automatically login\n"
+" -v, --version display the current version and exit\n"
msgstr ""
-"您可以从下面的地址获得版本 %s:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-
-#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
-msgid "New Version Available"
-msgstr "新版本可用"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/relnot.c:137
-msgid "Release Notification"
-msgstr "版本通知"
-
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/relnot.c:140
-msgid "Checks periodically for new releases."
-msgstr "定期检查新版本。"
-
-#. * description
-#: ../plugins/relnot.c:142
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr "定期检查新版本并通知用户更新记录。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/signals-test.c:684
-msgid "Signals Test"
-msgstr "信号测试"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
-msgid "Test to see that all signals are working properly."
-msgstr "测试看看所有的信号是否都工作正确。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/simple.c:34
-msgid "Simple Plugin"
-msgstr "简单插件"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
-msgid "Tests to see that most things are working."
-msgstr "测试看看大多数功能是否正常。"
-
-#: ../plugins/spellchk.c:1917
-msgid "Duplicate Correction"
-msgstr "重复更正"
-
-#: ../plugins/spellchk.c:1918
-msgid "The specified word already exists in the correction list."
-msgstr "指定的单词已经在更正列表中存在了。"
-
-#: ../plugins/spellchk.c:2127
-msgid "Text Replacements"
-msgstr "文字替换"
-
-#: ../plugins/spellchk.c:2150
-msgid "You type"
-msgstr "输入文字"
-
-#: ../plugins/spellchk.c:2164
-msgid "You send"
-msgstr "送出文字"
-
-#: ../plugins/spellchk.c:2178
-msgid "Whole words only"
-msgstr "整个单词"
-
-#: ../plugins/spellchk.c:2190
-msgid "Case sensitive"
-msgstr "区分大小写"
-
-#: ../plugins/spellchk.c:2216
-msgid "Add a new text replacement"
-msgstr "添加新的文字替换"
-
-#: ../plugins/spellchk.c:2232
-msgid "You _type:"
-msgstr "输入文字(_T):"
-
-#: ../plugins/spellchk.c:2249
-msgid "You _send:"
-msgstr "送出文字(_S):"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2261
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "区分大小写匹配(不选中代表自动处理大小写)"
-
-#: ../plugins/spellchk.c:2263
-msgid "Only replace _whole words"
-msgstr "只替换整个单词(_W)"
-
-#: ../plugins/spellchk.c:2288
-msgid "General Text Replacement Options"
-msgstr "常规文本替换选项"
-
-#: ../plugins/spellchk.c:2289
-msgid "Enable replacement of last word on send"
-msgstr "允许在发送时替换最后一个单词"
-
-#: ../plugins/spellchk.c:2314
-msgid "Text replacement"
-msgstr "文本替换"
-
-#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "根据用户自定义的规则替换寄出消息中的文字。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-gnutls.c:251
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
-msgid "Provides SSL support through GNUTLS."
-msgstr "提供通过 GNUTLS 的 SSL 支持。"
+"%s\n"
+"用法: %s [选项]...\n"
+"\n"
+" -c, --config=目录 使用“目录”存储配置文件\n"
+" -d, --debug 将调试信息打印到标准输出\n"
+" -h, --help 显示帮助并退出\n"
+" -n, --nologin 不自动登入\n"
+" -v, --version 显示当前版本并退出\n"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl-nss.c:412
-msgid "NSS"
-msgstr "NSS"
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../console/gntnotify.c:55 ../gtk/gtkblist.c:3786 ../gtk/gtkdialogs.c:665
+#: ../gtk/gtkdialogs.c:802 ../gtk/gtkdialogs.c:893 ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:962 ../libgaim/account.c:1133
+#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1345
+#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1367
+#: ../libgaim/protocols/oscar/oscar.c:2129
+#: ../libgaim/protocols/oscar/oscar.c:2216
+#: ../libgaim/protocols/oscar/oscar.c:5709
+#: ../libgaim/protocols/oscar/oscar.c:5913
+#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libgaim/protocols/oscar/oscar.c:5994
+#: ../libgaim/protocols/silc/buddy.c:466
+#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1296 ../libgaim/protocols/silc/ops.c:1908
+#: ../libgaim/protocols/silc/silc.c:753
+#: ../libgaim/protocols/yahoo/yahoo.c:3155
+#: ../libgaim/protocols/yahoo/yahoo.c:3164 ../libgaim/request.h:1344
+msgid "OK"
+msgstr "确定"
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
+#: ../console/gntnotify.c:122
+msgid "Emails"
+msgstr "电子邮件"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ssl/ssl.c:94
-msgid "SSL"
-msgstr "SSL"
+#: ../console/gntnotify.c:128 ../console/gntnotify.c:182
+msgid "You have mail!"
+msgstr "您有邮件了!"
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
-msgid "Provides a wrapper around SSL support libraries."
-msgstr "提供 SSL 支持库。"
+#: ../console/gntnotify.c:131 ../gtk/gtknotify.c:418
+#: ../libgaim/protocols/jabber/jabber.c:1141
+msgid "From"
+msgstr "来自"
-#: ../plugins/statenotify.c:49
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s 回来了。"
+#: ../console/gntnotify.c:131 ../gtk/gtknotify.c:427
+msgid "Subject"
+msgstr "主题"
-#: ../plugins/statenotify.c:51
-#, c-format
-msgid "%s has gone away."
-msgstr "%s 走了。"
+#: ../console/gntnotify.c:139 ../console/gntplugin.c:169
+#: ../console/gntplugin.c:250 ../console/gntstatus.c:175
+#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
+#: ../libgaim/protocols/silc/util.c:377
+msgid "Close"
+msgstr "关闭"
-#: ../plugins/statenotify.c:61
+#: ../console/gntnotify.c:158
#, c-format
-msgid "%s has become idle."
-msgstr "%s 发起了呆。"
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] "%s(%s) 有 %d 封新邮件。"
-#: ../plugins/statenotify.c:63
-#, c-format
-msgid "%s is no longer idle."
-msgstr "%s 发完呆了。"
+#: ../console/gntnotify.c:182 ../gtk/gtknotify.c:336
+msgid "New Mail"
+msgstr "新邮件"
-#: ../plugins/statenotify.c:72
+#: ../console/gntnotify.c:205 ../gtk/gtknotify.c:853
+#: ../libgaim/protocols/oscar/oscar.c:2588
#, c-format
-msgid "%s has signed on."
-msgstr "%s 已登入。"
-
-#: ../plugins/statenotify.c:90
-msgid "Notify When"
-msgstr "通知情况"
-
-#: ../plugins/statenotify.c:93
-msgid "Buddy Goes _Away"
-msgstr "好友离开(_A)"
-
-#: ../plugins/statenotify.c:96
-msgid "Buddy Goes _Idle"
-msgstr "好友发呆(_I)"
-
-#: ../plugins/statenotify.c:99
-msgid "Buddy _Signs On/Off"
-msgstr "好友登入/登出(_S)"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/statenotify.c:141
-msgid "Buddy State Notification"
-msgstr "好友状态通知"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
-msgstr "好友离开/返回或发呆/睡醒时在对话窗口给出通知。"
-
-#: ../plugins/tcl/tcl.c:369
-msgid "Tcl Plugin Loader"
-msgstr "Tcl 插件装入器"
-
-#: ../plugins/tcl/tcl.c:371 ../plugins/tcl/tcl.c:372
-msgid "Provides support for loading Tcl plugins"
-msgstr "提供装入 Tcl 插件的支持"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "好友点点通"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr "好友列表的水平滚动版本。"
-
-#: ../plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "iChat 时间戳"
-
-#: ../plugins/timestamp.c:193
-msgid "Delay"
-msgstr "延迟"
-
-#: ../plugins/timestamp.c:200
-msgid "minutes."
-msgstr "分钟。"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp.c:254
-msgid "Timestamp"
-msgstr "时间戳"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
-
-#: ../plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "时间戳格式选项"
-
-#: ../plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "强制使用 24 小时制(_F)"
+msgid "Info for %s"
+msgstr "%s 的信息"
-#: ../plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "显示日期于..."
+#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:854
+#: ../libgaim/protocols/toc/toc.c:471
+msgid "Buddy Information"
+msgstr "好友信息"
-#: ../plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "对话(_N):"
+#: ../console/gntnotify.c:279
+msgid "Continue"
+msgstr "继续"
-#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "对迟发的消息"
+#: ../console/gntnotify.c:285 ../gtk/gtkconv.c:1570
+msgid "Info"
+msgstr "信息"
-#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "对迟发的消息和聊天"
+#: ../console/gntnotify.c:288 ../gtk/gtkconv.c:1531
+msgid "IM"
+msgstr "开聊"
-#: ../plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "消息日志(_M):"
+#: ../console/gntnotify.c:291
+msgid "Join"
+msgstr "加入"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/timestamp_format.c:150
-msgid "Message Timestamp Formats"
-msgstr "消息时间戳格式"
+#: ../console/gntnotify.c:294 ../libgaim/protocols/sametime/sametime.c:3449
+msgid "Invite"
+msgstr "邀请"
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/timestamp_format.c:153
-msgid "Customizes the message timestamp formats."
-msgstr "自定义消息时间戳的格式。"
+#: ../console/gntnotify.c:297
+msgid "(none)"
+msgstr "(无)"
-#. * description
-#: ../plugins/timestamp_format.c:155
+#: ../console/gntplugin.c:93
+#, c-format
msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr "此插件允许用户自定义会话和日志消息的时间戳格式。"
-
-#: ../plugins/win32/transparency/win2ktrans.c:183
-#: ../plugins/win32/transparency/win2ktrans.c:569
-#: ../plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "不透明度:"
-
-#. IM Convo trans options
-#: ../plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "即时消息对话窗口"
-
-#: ../plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "即时消息窗口透明度(_I)"
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+"名称: %s\n"
+"版本: %s\n"
+"描述: %s\n"
+"作者: %s\n"
+"网站: %s\n"
+"文件名: %s\n"
-#: ../plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "在即时消息窗口中显示滑块(_S)"
+#: ../console/gntplugin.c:146
+msgid "Plugin need to be loaded before you can configure it."
+msgstr "在您配置插件之前必须先装入它。"
-#: ../plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "聚焦时取消即时通讯窗口透明度"
+#: ../console/gntplugin.c:184
+msgid "..."
+msgstr "..."
-#: ../plugins/win32/transparency/win2ktrans.c:558
-#: ../plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "常居顶端"
-
-#. Buddy List trans options
-#: ../plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "好友列表窗口"
-
-#: ../plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "好友列表窗口的透明度(_B)"
+#: ../console/gntplugin.c:185
+msgid "Still need to do something about this."
+msgstr ""
-#: ../plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "聚焦时取消好友列表窗口透明度"
+#: ../console/gntplugin.c:191
+msgid "No configuration options for this plugin."
+msgstr "此插件无配置选项。"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "透明度"
+#: ../console/gntplugin.c:207 ../gtk/gtkplugin.c:538
+#: ../gtk/plugins/docklet/docklet.c:520
+msgid "Plugins"
+msgstr "插件"
-#. *< name
-#. *< version
-#. * summary
-#: ../plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "好友列表和对话窗口的可变透明度。"
+#: ../console/gntplugin.c:212
+msgid "You can (un)load plugins from the following list."
+msgstr "您可以卸载以下列表中的插件。"
-#. * description
-#: ../plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-"此插件能够让对话窗口和好友列表有可变的 alpha 透明度。\n"
-"\n"
-"* 注意: 此插件需要 Win2000 或更高版本。"
+#: ../console/gntplugin.c:255
+msgid "Configure Plugin"
+msgstr "配置插件"
-#: ../plugins/win32/winprefs/winprefs.c:397
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ 运行时刻版本"
+#: ../console/gntprefs.c:101
+msgid "Show Idle Time"
+msgstr "显示发呆时间"
-#. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
-msgid "Startup"
-msgstr "启动"
+#: ../console/gntprefs.c:107
+msgid "Show Timestamps"
+msgstr "显示时间戳"
-#: ../plugins/win32/winprefs/winprefs.c:406
-msgid "_Start Gaim on Windows startup"
-msgstr "Windows 启动时启动 Gaim(_S)"
+#: ../console/gntprefs.c:108
+msgid "Notify buddies when you are typing"
+msgstr "提醒好友您正在打字给他们"
-#. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3587
-msgid "Buddy List"
-msgstr "好友列表"
+#: ../console/gntprefs.c:114
+msgid "Log format"
+msgstr "日志格式"
-#: ../plugins/win32/winprefs/winprefs.c:418
-msgid "_Dockable Buddy List"
-msgstr "可停靠的好友列表(_D)"
+#: ../console/gntprefs.c:115
+msgid "Log IMs"
+msgstr "记录对话"
-#. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
-msgid "_Keep Buddy List window on top:"
-msgstr "好友列表窗口常居顶端(_K):"
+#: ../console/gntprefs.c:116
+msgid "Log chats"
+msgstr "记录聊天"
-#. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
-msgid "Only when docked"
-msgstr "仅停靠时"
+#: ../console/gntprefs.c:117
+msgid "Log status change events"
+msgstr "记录状态更改事件"
#. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
-#: ../src/gtkprefs.c:1864
+#: ../console/gntprefs.c:198 ../gtk/gtkprefs.c:823 ../gtk/gtkprefs.c:1883
+#: ../gtk/plugins/win32/winprefs/winprefs.c:465
msgid "Conversations"
msgstr "对话"
-#: ../plugins/win32/winprefs/winprefs.c:432
-msgid "_Flash window when messages are received"
-msgstr "收到信息时闪烁窗口(_F)"
-
-#: ../plugins/win32/winprefs/winprefs.c:456
-msgid "WinGaim Options"
-msgstr "WinGaim 选项"
-
-#: ../plugins/win32/winprefs/winprefs.c:458
-msgid "Options specific to Windows Gaim."
-msgstr "Windows Gaim 特定的选项。"
-
-#: ../plugins/win32/winprefs/winprefs.c:459
-msgid ""
-"Provides options specific to Windows Gaim, such as buddy list docking and "
-"conversation flashing."
-msgstr "提供 Gaim 在 Windows 下特定的选项,比如好友列表停靠和对话闪烁。"
-
-#: ../src/account.c:773
-msgid "accounts"
-msgstr "账户"
-
-#: ../src/account.c:923
-msgid "Password is required to sign on."
-msgstr "需要密码才能登入。"
-
-#: ../src/account.c:948
-#, c-format
-msgid "Enter password for %s (%s)"
-msgstr "输入 %s(%s) 的密码"
-
-#: ../src/account.c:955
-msgid "Enter Password"
-msgstr "输入密码"
-
-#: ../src/account.c:960
-msgid "Save password"
-msgstr "保存密码"
+#: ../console/gntprefs.c:199 ../gtk/gtkprefs.c:1313 ../gtk/gtkprefs.c:1894
+msgid "Logging"
+msgstr "日志"
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3471
-#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:785
-#: ../src/gtkrequest.c:271 ../src/protocols/gg/gg.c:454
-#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
-#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
-#: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
-#: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
-#: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8124
-#: ../src/protocols/oscar/oscar.c:8247 ../src/protocols/oscar/oscar.c:8272
-#: ../src/protocols/oscar/oscar.c:8324 ../src/protocols/silc/buddy.c:466
-#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
-#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
-#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
-msgid "OK"
-msgstr "确定"
+#: ../console/gntprefs.c:201 ../gtk/gtkprefs.c:1919
+#: ../gtk/plugins/docklet/docklet.c:521
+msgid "Preferences"
+msgstr "首选项"
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4939
-#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:786
-#: ../src/gtkdialogs.c:805 ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:847
-#: ../src/gtkdialogs.c:891 ../src/gtkdialogs.c:946 ../src/gtkdialogs.c:983
-#: ../src/gtkdialogs.c:1008 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
-#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:272 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
-#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
-#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1319
-#: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
-#: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
-#: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
-#: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
-#: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8125 ../src/protocols/oscar/oscar.c:8248
-#: ../src/protocols/oscar/oscar.c:8273 ../src/protocols/oscar/oscar.c:8325
-#: ../src/protocols/oscar/oscar.c:8394
-#: ../src/protocols/sametime/sametime.c:3376
-#: ../src/protocols/sametime/sametime.c:3461
-#: ../src/protocols/sametime/sametime.c:3631
-#: ../src/protocols/sametime/sametime.c:5320
-#: ../src/protocols/sametime/sametime.c:5409
-#: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
-#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
-#: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
-#: ../src/protocols/yahoo/yahoo.c:3073
-msgid "Cancel"
-msgstr "取消"
+#: ../console/gntrequest.c:471
+msgid "Not implemented yet."
+msgstr "未实现。"
-#: ../src/account.c:994 ../src/connection.c:96
+#: ../console/gntstatus.c:104
#, c-format
-msgid "Missing protocol plugin for %s"
-msgstr "缺少 %s 的协议插件"
+msgid "Are you sure you want to delete \"%s\""
+msgstr "您真的想要删除“%s”吗"
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3463
-#: ../src/gtkblist.c:3469
-msgid "Connection Error"
-msgstr "连接错误"
+#: ../console/gntstatus.c:107
+msgid "Delete Status"
+msgstr "删除状态"
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
-#: ../src/protocols/jabber/jabber.c:1271
-msgid "New passwords do not match."
-msgstr "新密码不相同。"
-
-#: ../src/account.c:1085
-msgid "Fill out all fields completely."
-msgstr "完全填入所有字段。"
+#: ../console/gntstatus.c:136 ../gtk/gtksavedstatuses.c:526
+msgid "Saved Statuses"
+msgstr "已存状态"
-#: ../src/account.c:1108
-msgid "Original password"
-msgstr "旧密码"
+#: ../console/gntstatus.c:143 ../console/gntstatus.c:434
+#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
+#: ../libgaim/protocols/jabber/buddy.c:921
+#: ../libgaim/protocols/novell/novell.c:1484
+msgid "Title"
+msgstr "标题"
-#: ../src/account.c:1115
-msgid "New password"
-msgstr "新密码"
+#: ../console/gntstatus.c:143 ../gtk/gtksavedstatuses.c:448
+msgid "Type"
+msgstr "类型"
-#: ../src/account.c:1122
-msgid "New password (again)"
-msgstr "再次输入新密码"
+#: ../console/gntstatus.c:143 ../console/gntstatus.c:459
+#: ../console/gntstatus.c:471 ../gtk/gtksavedstatuses.c:459
+#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../libgaim/protocols/bonjour/bonjour.c:263
+#: ../libgaim/protocols/gg/gg.c:1590 ../libgaim/protocols/gg/gg.c:1600
+#: ../libgaim/protocols/gg/gg.c:1606 ../libgaim/protocols/gg/gg.c:1615
+#: ../libgaim/protocols/gg/gg.c:1620 ../libgaim/protocols/irc/irc.c:227
+#: ../libgaim/protocols/jabber/jabber.c:1208
+#: ../libgaim/protocols/jabber/jabber.c:1218
+#: ../libgaim/protocols/jabber/jabber.c:1228
+#: ../libgaim/protocols/jabber/jabber.c:1238
+#: ../libgaim/protocols/jabber/jabber.c:1248
+#: ../libgaim/protocols/jabber/jabber.c:1260
+#: ../libgaim/protocols/novell/novell.c:2872
+#: ../libgaim/protocols/novell/novell.c:2978
+#: ../libgaim/protocols/novell/novell.c:2984
+#: ../libgaim/protocols/novell/novell.c:2990
+#: ../libgaim/protocols/oscar/oscar.c:5373
+#: ../libgaim/protocols/oscar/oscar.c:5388
+#: ../libgaim/protocols/oscar/oscar.c:5393
+#: ../libgaim/protocols/oscar/oscar.c:5601
+#: ../libgaim/protocols/oscar/oscar.c:5613
+#: ../libgaim/protocols/oscar/oscar.c:5626
+#: ../libgaim/protocols/oscar/oscar.c:5633
+#: ../libgaim/protocols/oscar/oscar.c:5640
+#: ../libgaim/protocols/sametime/sametime.c:3263
+#: ../libgaim/protocols/sametime/sametime.c:3269
+#: ../libgaim/protocols/sametime/sametime.c:3275
+#: ../libgaim/protocols/sametime/sametime.c:3354
+#: ../libgaim/protocols/silc/buddy.c:1544
+#: ../libgaim/protocols/simple/simple.c:246
+#: ../libgaim/protocols/yahoo/yahoo.c:3401
+#: ../libgaim/protocols/yahoo/yahoo.c:3407
+#: ../libgaim/protocols/zephyr/zephyr.c:2281
+msgid "Message"
+msgstr "消息"
-#: ../src/account.c:1128
-#, c-format
-msgid "Change password for %s"
-msgstr "更改 %s 的密码"
+#: ../console/gntstatus.c:155
+msgid "Use"
+msgstr "使用"
-#: ../src/account.c:1136
-msgid "Please enter your current password and your new password."
-msgstr "请输入您目前的密码和新密码。"
+#: ../console/gntstatus.c:216
+msgid "Invalid title"
+msgstr "无效的标题"
-#: ../src/account.c:1169
-#, c-format
-msgid "Change user information for %s"
-msgstr "更改 %s 的用户信息"
+#: ../console/gntstatus.c:217
+msgid "Please enter a non-empty title for the status."
+msgstr "请为状态输入非空标题。"
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:278
-#: ../src/protocols/jabber/buddy.c:572
-msgid "Save"
-msgstr "保存"
+#: ../console/gntstatus.c:224
+msgid "Duplicate title"
+msgstr "重复标题"
-#: ../src/account.c:1679 ../src/gtkft.c:157
-#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
-msgid "Unknown"
-msgstr "未知"
+#: ../console/gntstatus.c:225
+msgid "Please enter a different title for the status."
+msgstr "为下列状态使用不同的标题。"
-#: ../src/blist.c:543
-msgid "buddy list"
-msgstr "好友列表"
+#: ../console/gntstatus.c:348
+msgid "Substatus"
+msgstr "子状态"
-#: ../src/blist.c:1173
-msgid "Chats"
-msgstr "聊天"
+#. Set up stuff for the account box
+#: ../console/gntstatus.c:351 ../gtk/gtkblist.c:4890 ../gtk/gtkblist.c:5208
+msgid "Account:"
+msgstr "账户:"
-#: ../src/blist.c:1894
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline. This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline. These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%2$s 组中的 %1$d 个好友未删除,原因是他们属于目前已禁用或离线的账户。这些好友"
-"和该组不会被删除。\n"
+#: ../console/gntstatus.c:359 ../gtk/gtkft.c:645
+msgid "Status:"
+msgstr "状态:"
-#: ../src/blist.c:1904
-msgid "Group not removed"
-msgstr "组未删除"
+#: ../console/gntstatus.c:374
+msgid "Message:"
+msgstr "消息:"
+
+#: ../console/gntstatus.c:423
+msgid "Edit Status"
+msgstr "编辑状态"
+
+#: ../console/gntstatus.c:442 ../console/gntstatus.c:471
+#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
+#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1573
+#: ../libgaim/protocols/gg/gg.c:1577 ../libgaim/protocols/jabber/buddy.c:629
+#: ../libgaim/protocols/jabber/buddy.c:636
+#: ../libgaim/protocols/jabber/buddy.c:662
+#: ../libgaim/protocols/jabber/jabber.c:1179
+#: ../libgaim/protocols/msn/msn.c:546
+#: ../libgaim/protocols/novell/novell.c:2871
+#: ../libgaim/protocols/novell/novell.c:2875
+#: ../libgaim/protocols/oscar/oscar.c:760
+#: ../libgaim/protocols/oscar/oscar.c:766
+#: ../libgaim/protocols/oscar/oscar.c:769
+#: ../libgaim/protocols/yahoo/yahoo.c:2974
+msgid "Status"
+msgstr "状态"
-#: ../src/connection.c:98
-msgid "Registration Error"
-msgstr "注册错误"
+#: ../console/gntstatus.c:465
+msgid "Use different status for following accounts"
+msgstr "为下列账户使用不同的状态"
-#: ../src/connection.c:280
-#, c-format
-msgid "+++ %s signed on"
-msgstr "+++ %s 已登入"
+#. Save & Use
+#: ../console/gntstatus.c:494
+msgid "Save & Use"
+msgstr "保存并使用"
-#: ../src/connection.c:322
+#: ../console/plugins/gntgf.c:169
#, c-format
-msgid "+++ %s signed off"
-msgstr "+++ %s 已登出"
+msgid "%s just signed on"
+msgstr "%s 刚刚登入"
-#: ../src/conversation.c:163
-msgid "Unable to send message: The message is too large."
-msgstr "无法发送消息: 消息太大。"
-
-#: ../src/conversation.c:166 ../src/conversation.c:179
+#: ../console/plugins/gntgf.c:176
#, c-format
-msgid "Unable to send message to %s."
-msgstr "无法给 %s 发送消息。"
+msgid "%s just signed off"
+msgstr "%s 刚刚登出"
-#: ../src/conversation.c:167
-msgid "The message is too large."
-msgstr "消息太长。"
-
-#: ../src/conversation.c:176
-msgid "Unable to send message."
-msgstr "无法发送消息。"
-
-#: ../src/conversation.c:1517
+#: ../console/plugins/gntgf.c:184
#, c-format
-msgid "%s entered the room."
-msgstr "%s 进入了聊天室。"
+msgid "%s sent you a message"
+msgstr "%s 给您发送了消息"
-#: ../src/conversation.c:1520
+#: ../console/plugins/gntgf.c:203
#, c-format
-msgid "%s [<I>%s</I>] entered the room."
-msgstr "%s [<I>%s</I>] 进入了聊天室。"
+msgid "%s said your nick in %s"
+msgstr "%s 在 %s 中提到了您的昵称"
-#: ../src/conversation.c:1627
+#: ../console/plugins/gntgf.c:205
#, c-format
-msgid "You are now known as %s"
-msgstr "您现在叫做 %s"
+msgid "%s sent a message in %s"
+msgstr "%s 在 %s 中发送了消息"
-#: ../src/conversation.c:1647
-#, c-format
-msgid "%s is now known as %s"
-msgstr "%s 现在叫做 %s。"
+#: ../console/plugins/gntgf.c:243
+msgid "Buddy signs on/off"
+msgstr "好友登入/登出"
-#: ../src/conversation.c:1720
-#, c-format
-msgid "%s left the room."
-msgstr "%s 离开了聊天室。"
+#: ../console/plugins/gntgf.c:244
+msgid "You receive an IM"
+msgstr "您接受了 IM"
-#: ../src/conversation.c:1723
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s 离开了聊天室(%s)。"
+#: ../console/plugins/gntgf.c:245
+msgid "Someone speaks in a chat"
+msgstr "有人在聊天中别人在聊天中提到您的名字"
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
-msgid "No name"
-msgstr "无名称"
+#: ../console/plugins/gntgf.c:246
+msgid "Someone says your name in a chat"
+msgstr "别人在聊天中提到您的名字"
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
-#, c-format
-msgid ""
-"Error reading %s: \n"
-"%s.\n"
+#: ../console/plugins/gntgf.c:274
+msgid "Notify with a toaster when"
msgstr ""
-"读取 %s 出错:\n"
-"%s。\n"
-#: ../src/ft.c:193
-#, c-format
-msgid ""
-"Error writing %s: \n"
-"%s.\n"
+#: ../console/plugins/gntgf.c:289
+msgid "Beep too!"
msgstr ""
-"写入 %s 出错:\n"
-"%s。\n"
-#: ../src/ft.c:197
-#, c-format
-msgid ""
-"Error accessing %s: \n"
-"%s.\n"
+#: ../console/plugins/gntgf.c:308
+msgid "GntGf"
msgstr ""
-"访问 %s 出错:\n"
-"%s。\n"
-#: ../src/ft.c:230
-msgid "Cannot send a file of 0 bytes."
-msgstr "无法发送 0 字节的文件。"
-
-#: ../src/ft.c:240
-msgid "Cannot send a directory."
-msgstr "无法发送目录。"
-
-#: ../src/ft.c:249
-#, c-format
-msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
-
-#: ../src/ft.c:307
-#, c-format
-msgid "%s wants to send you %s (%s)"
-msgstr "%s 想要给您发送 %s (%s)"
+#: ../console/plugins/gntgf.c:310 ../console/plugins/gntgf.c:311
+msgid "Toaster plugin for GntGaim."
+msgstr ""
-#: ../src/ft.c:314
+#: ../console/plugins/gnthistory.c:119 ../gtk/plugins/history.c:120
#, c-format
-msgid "%s wants to send you a file"
-msgstr "%s 想要给您发送文件"
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>与 %s 在 %s 的谈话</b><br>"
-#: ../src/ft.c:355
-#, c-format
-msgid "Accept file transfer request from %s?"
-msgstr "接受来自 %s 的文件传送吗?"
+#: ../console/plugins/gnthistory.c:140 ../gtk/plugins/history.c:147
+msgid "History Plugin Requires Logging"
+msgstr "历史插件请求登录"
-#: ../src/ft.c:359
-#, c-format
+#: ../console/plugins/gnthistory.c:141 ../gtk/plugins/history.c:148
msgid ""
-"A file is available for download from:\n"
-"Remote host: %s\n"
-"Remote port: %d"
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
msgstr ""
-"可从以下地址下载文件:\n"
-"远程主机: %s\n"
-"远程端口: %d"
-
-#: ../src/ft.c:391
-#, c-format
-msgid "%s is offering to send file %s"
-msgstr "%s 正在发送文件 %s"
-#: ../src/ft.c:442
-#, c-format
-msgid "%s is not a valid filename.\n"
-msgstr "%s 不是合法的文件名。\n"
+#: ../console/plugins/gnthistory.c:181
+#, fuzzy
+msgid "GntHistory"
+msgstr "历史"
-#: ../src/ft.c:463
-#, c-format
-msgid "Offering to send %s to %s"
-msgstr "%2$s 发送 %1$s"
+#: ../console/plugins/gnthistory.c:183 ../gtk/plugins/history.c:190
+msgid "Shows recently logged conversations in new conversations."
+msgstr "在新对话中显示显示最近记录的对话。"
-#: ../src/ft.c:474
-#, c-format
-msgid "Starting transfer of %s from %s"
-msgstr "开始来自 %2$s 的 %1$s 传送"
+#: ../console/plugins/gnthistory.c:184 ../gtk/plugins/history.c:191
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr "打开新对话时,此插件将会将上次对话插入当前对话。"
-#: ../src/ft.c:628
-#, c-format
-msgid "Transfer of file %s complete"
-msgstr "文件 %s 传送完成"
+#: ../gtk/gaimstock.c:137
+msgid "_Alias"
+msgstr "别名(_A)"
-#: ../src/ft.c:631
-msgid "File transfer complete"
-msgstr "文件传送完成"
+#. join button
+#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1108 ../gtk/gtkroomlist.c:285
+#: ../gtk/gtkroomlist.c:441
+msgid "_Join"
+msgstr "加入(_J)"
-#: ../src/ft.c:1022
-#, c-format
-msgid "You canceled the transfer of %s"
-msgstr "您取消了 %s 的传送"
+#: ../gtk/gaimstock.c:139
+msgid "Close _tabs"
+msgstr "关闭标签(_T)"
-#: ../src/ft.c:1027
-msgid "File transfer cancelled"
-msgstr "文件传送已取消"
+#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:992
+msgid "I_M"
+msgstr "开聊(_M)"
-#: ../src/ft.c:1084
-#, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s 取消了 %s 的传送"
+#: ../gtk/gaimstock.c:141
+msgid "_Get Info"
+msgstr "获得信息(_G)"
-#: ../src/ft.c:1089
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s 取消了文件传送"
+#: ../gtk/gaimstock.c:142
+msgid "_Invite"
+msgstr "邀请(_I)"
-#: ../src/ft.c:1146
-#, c-format
-msgid "File transfer to %s failed."
-msgstr "给 %s 传送文件失败。"
+#: ../gtk/gaimstock.c:143
+msgid "_Modify"
+msgstr "修改(_M)"
-#: ../src/ft.c:1148
-#, c-format
-msgid "File transfer from %s failed."
-msgstr "来自 %s 的文件传送失败。"
+#: ../gtk/gaimstock.c:144
+msgid "_Open Mail"
+msgstr "打开邮件(_O)"
-#: ../src/gtkaccount.c:374
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>文件:</b> %s\n"
-"<b>文件大小:</b> %s\n"
-"<b>图像大小:</b> %dx%d"
+#. Pause button
+#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:782
+msgid "_Pause"
+msgstr "暂停(_P)"
#. Build the login options frame.
-#: ../src/gtkaccount.c:762
+#: ../gtk/gtkaccount.c:377
msgid "Login Options"
msgstr "登入选项"
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:640
-msgid "Protocol:"
-msgstr "协议:"
-
-#: ../src/gtkaccount.c:858
-msgid "Password:"
-msgstr "密码:"
-
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4517 ../src/gtkblist.c:4883
-msgid "Alias:"
-msgstr "别名:"
-
-#: ../src/gtkaccount.c:867
-msgid "Remember password"
-msgstr "记住密码"
+#: ../gtk/gtkaccount.c:478
+msgid "Local alias:"
+msgstr "本地别名:"
#. Build the user options frame.
-#: ../src/gtkaccount.c:919
+#: ../gtk/gtkaccount.c:540
msgid "User Options"
msgstr "用户选项"
-#: ../src/gtkaccount.c:932
-msgid "New mail notifications"
-msgstr "新邮件通知"
-
-#: ../src/gtkaccount.c:941
-msgid "Buddy icon:"
-msgstr "好友图标:"
+#. Buddy icon
+#: ../gtk/gtkaccount.c:558
+msgid "Use this buddy icon for this account:"
+msgstr "此账户使用此好友图标:"
#. Build the protocol options frame.
-#: ../src/gtkaccount.c:1032
+#: ../gtk/gtkaccount.c:665
#, c-format
msgid "%s Options"
msgstr "%s 选项"
-#: ../src/gtkaccount.c:1233
+#: ../gtk/gtkaccount.c:861
msgid "Use Global Proxy Settings"
msgstr "使用全局代理设置"
-#: ../src/gtkaccount.c:1239
+#: ../gtk/gtkaccount.c:867
msgid "No Proxy"
msgstr "无代理"
-#: ../src/gtkaccount.c:1245
+#: ../gtk/gtkaccount.c:873
msgid "HTTP"
msgstr "HTTP"
-#: ../src/gtkaccount.c:1251
+#: ../gtk/gtkaccount.c:879
msgid "SOCKS 4"
msgstr "SOCKS 4"
-#: ../src/gtkaccount.c:1257
+#: ../gtk/gtkaccount.c:885
msgid "SOCKS 5"
msgstr "SOCKS 5"
-#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1043
+#: ../gtk/gtkaccount.c:891 ../gtk/gtkprefs.c:1062
msgid "Use Environmental Settings"
msgstr "使用环境设置"
-#: ../src/gtkaccount.c:1297
-msgid "you can see the butterflies mating"
-msgstr "明日复明日"
-
-#: ../src/gtkaccount.c:1301
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../gtk/gtkaccount.c:930
msgid "If you look real closely"
msgstr "万事成蹉跎"
-#: ../src/gtkaccount.c:1317
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../gtk/gtkaccount.c:933
+msgid "you can see the butterflies mating"
+msgstr "明日复明日"
+
+#: ../gtk/gtkaccount.c:954
msgid "Proxy Options"
msgstr "代理选项"
-#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1037
+#: ../gtk/gtkaccount.c:968 ../gtk/gtkprefs.c:1056
msgid "Proxy _type:"
msgstr "代理类型(_T):"
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1058
+#: ../gtk/gtkaccount.c:977 ../gtk/gtkprefs.c:1077
msgid "_Host:"
msgstr "主机(_H):"
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1076
+#: ../gtk/gtkaccount.c:981 ../gtk/gtkprefs.c:1095
msgid "_Port:"
msgstr "端口(_P):"
-#: ../src/gtkaccount.c:1352
+#: ../gtk/gtkaccount.c:989
msgid "_Username:"
msgstr "用户名(_U):"
-#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1113
+#: ../gtk/gtkaccount.c:995 ../gtk/gtkprefs.c:1132
msgid "Pa_ssword:"
msgstr "密码(_S):"
-#: ../src/gtkaccount.c:1736
+#: ../gtk/gtkaccount.c:1393
msgid "Add Account"
msgstr "添加账户"
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3472
-msgid "Modify Account"
-msgstr "修改账户"
-
-#: ../src/gtkaccount.c:1760
+#: ../gtk/gtkaccount.c:1417
msgid "_Basic"
msgstr "基本(_B)"
-#: ../src/gtkaccount.c:1771
+#: ../gtk/gtkaccount.c:1428
msgid "_Advanced"
msgstr "高级(_A)"
#. Register button
-#: ../src/gtkaccount.c:1786 ../src/protocols/jabber/jabber.c:823
+#: ../gtk/gtkaccount.c:1443 ../libgaim/protocols/jabber/jabber.c:840
msgid "Register"
msgstr "注册"
-#: ../src/gtkaccount.c:2165 ../src/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "您真的想要删除 %s 吗?"
-
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:275
-#: ../src/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "删除"
-
-#: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:5252
-msgid "Screen Name"
-msgstr "用户名"
+#. add enabled / disabled
+#: ../gtk/gtkaccount.c:1914 ../gtk/gtkplugin.c:576
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:345
+msgid "Enabled"
+msgstr "已启用"
-#: ../src/gtkaccount.c:2259
+#: ../gtk/gtkaccount.c:1922
msgid "Protocol"
msgstr "协议"
-#: ../src/gtkaccount.c:2586
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s 已经将 %s 加为好友%s%s"
-
-#: ../src/gtkaccount.c:2635
-msgid "Add buddy to your list?"
-msgstr "将用户加为好友吗?"
-
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4938 ../src/gtkconv.c:1597
-#: ../src/gtkrequest.c:276 ../src/protocols/gg/gg.c:811
-#: ../src/protocols/oscar/oscar.c:4877
-#: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
-msgid "Add"
-msgstr "添加"
-
-#: ../src/gtkblist.c:669
+#: ../gtk/gtkblist.c:694
msgid "Join a Chat"
msgstr "加入聊天"
-#: ../src/gtkblist.c:690
+#: ../gtk/gtkblist.c:715
msgid ""
"Please enter the appropriate information about the chat you would like to "
"join.\n"
msgstr "请输入您想要加入的聊天的对应信息。\n"
-#: ../src/gtkblist.c:701 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../gtk/gtkblist.c:726 ../gtk/gtkpounce.c:523 ../gtk/gtkroomlist.c:377
msgid "_Account:"
msgstr "账户(_A):"
-#: ../src/gtkblist.c:945
+#: ../gtk/gtkblist.c:989
msgid "Get _Info"
msgstr "资料(_I)"
-#: ../src/gtkblist.c:948 ../src/gtkstock.c:141
-msgid "I_M"
-msgstr "开聊(_M)"
-
-#: ../src/gtkblist.c:954
+#: ../gtk/gtkblist.c:998
msgid "_Send File"
msgstr "传送(_S)"
-#: ../src/gtkblist.c:961
+#: ../gtk/gtkblist.c:1005
msgid "Add Buddy _Pounce"
msgstr "添加好友千里眼(_P)"
-#: ../src/gtkblist.c:965 ../src/gtkblist.c:969 ../src/gtkblist.c:1068
-#: ../src/gtkblist.c:1091
+#: ../gtk/gtkblist.c:1009 ../gtk/gtkblist.c:1013 ../gtk/gtkblist.c:1112
+#: ../gtk/gtkblist.c:1135
msgid "View _Log"
msgstr "查看日志(_L)"
-#: ../src/gtkblist.c:980
+#: ../gtk/gtkblist.c:1024
msgid "Alias..."
msgstr "别名..."
-#: ../src/gtkblist.c:983 ../src/gtkconv.c:1594 ../src/gtkrequest.c:277
-msgid "Remove"
-msgstr "删除"
-
-#: ../src/gtkblist.c:989 ../src/gtkblist.c:1076 ../src/gtkblist.c:1097
+#: ../gtk/gtkblist.c:1033 ../gtk/gtkblist.c:1120 ../gtk/gtkblist.c:1141
msgid "_Alias..."
msgstr "别名(_A)..."
-#: ../src/gtkblist.c:991 ../src/gtkblist.c:1078 ../src/gtkblist.c:1099
+#: ../gtk/gtkblist.c:1035 ../gtk/gtkblist.c:1122 ../gtk/gtkblist.c:1143
msgid "_Remove"
msgstr "删除(_R)"
-#: ../src/gtkblist.c:1039
+#: ../gtk/gtkblist.c:1083
msgid "Add a _Buddy"
msgstr "添加好友(_B)"
-#: ../src/gtkblist.c:1041
+#: ../gtk/gtkblist.c:1085
msgid "Add a C_hat"
msgstr "添加聊天(_H)"
-#: ../src/gtkblist.c:1044
+#: ../gtk/gtkblist.c:1088
msgid "_Delete Group"
msgstr "删除组(_D)"
-#: ../src/gtkblist.c:1046
+#: ../gtk/gtkblist.c:1090
msgid "_Rename"
msgstr "重命名(_R)"
-#. join button
-#: ../src/gtkblist.c:1064 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
-#: ../src/gtkstock.c:139
-msgid "_Join"
-msgstr "加入(_J)"
-
-#: ../src/gtkblist.c:1066
+#: ../gtk/gtkblist.c:1110
msgid "Auto-Join"
msgstr "自动加入"
-#: ../src/gtkblist.c:1104 ../src/gtkblist.c:1127
+#: ../gtk/gtkblist.c:1148 ../gtk/gtkblist.c:1171
msgid "_Collapse"
msgstr "折叠(_C)"
-#: ../src/gtkblist.c:1132
+#: ../gtk/gtkblist.c:1176
msgid "_Expand"
msgstr "展开(_E)"
-#: ../src/gtkblist.c:1378 ../src/gtkblist.c:1390 ../src/gtkblist.c:3732
-#: ../src/gtkblist.c:3742
+#: ../gtk/gtkblist.c:1422 ../gtk/gtkblist.c:1434 ../gtk/gtkblist.c:4047
+#: ../gtk/gtkblist.c:4057
msgid "/Tools/Mute Sounds"
msgstr "/工具(T)/静音(S)"
-#: ../src/gtkblist.c:1853 ../src/gtkconv.c:4197 ../src/gtkpounce.c:426
+#: ../gtk/gtkblist.c:1894 ../gtk/gtkconv.c:4225 ../gtk/gtkpounce.c:422
msgid ""
"You are not currently signed on with an account that can add that buddy."
msgstr "您目前登入的协议中没有一个可以添加好友的。"
#. Buddies menu
-#: ../src/gtkblist.c:2427
+#: ../gtk/gtkblist.c:2468
msgid "/_Buddies"
msgstr "/好友(_B)"
-#: ../src/gtkblist.c:2428
+#: ../gtk/gtkblist.c:2469
msgid "/Buddies/New Instant _Message..."
msgstr "/好友(B)/新即时消息(_M)..."
-#: ../src/gtkblist.c:2429
+#: ../gtk/gtkblist.c:2470
msgid "/Buddies/Join a _Chat..."
msgstr "/好友(B)/加入聊天(_C)..."
-#: ../src/gtkblist.c:2430
+#: ../gtk/gtkblist.c:2471
msgid "/Buddies/Get User _Info..."
msgstr "/好友(B)/获取用户信息(_I)..."
-#: ../src/gtkblist.c:2431
+#: ../gtk/gtkblist.c:2472
msgid "/Buddies/View User _Log..."
msgstr "/好友(B)/查看用户日志(_L)..."
-#: ../src/gtkblist.c:2433
+#: ../gtk/gtkblist.c:2474
msgid "/Buddies/Show _Offline Buddies"
msgstr "/好友(B)/显示离线好友(_O)"
-#: ../src/gtkblist.c:2434
+#: ../gtk/gtkblist.c:2475
msgid "/Buddies/Show _Empty Groups"
msgstr "/好友(B)/显示空组(_E)"
-#: ../src/gtkblist.c:2435
+#: ../gtk/gtkblist.c:2476
msgid "/Buddies/Show Buddy _Details"
msgstr "/好友(B)/显示好友详细资料(_D)"
-#: ../src/gtkblist.c:2436
+#: ../gtk/gtkblist.c:2477
msgid "/Buddies/Show Idle _Times"
msgstr "/好友(B)/显示发呆时间(_T)"
-#: ../src/gtkblist.c:2437
+#: ../gtk/gtkblist.c:2478
msgid "/Buddies/_Sort Buddies"
msgstr "/好友(B)/好友排序(_S)"
-#: ../src/gtkblist.c:2439
+#: ../gtk/gtkblist.c:2480
msgid "/Buddies/_Add Buddy..."
msgstr "/好友(B)/添加好友(_A)..."
-#: ../src/gtkblist.c:2440
+#: ../gtk/gtkblist.c:2481
msgid "/Buddies/Add C_hat..."
msgstr "/好友(B)/添加聊天(_H)..."
-#: ../src/gtkblist.c:2441
+#: ../gtk/gtkblist.c:2482
msgid "/Buddies/Add _Group..."
msgstr "/好友(B)/添加组(_G)..."
-#: ../src/gtkblist.c:2443
+#: ../gtk/gtkblist.c:2484
msgid "/Buddies/_Quit"
msgstr "/好友(B)/退出(_Q)"
#. Accounts menu
-#: ../src/gtkblist.c:2446
+#: ../gtk/gtkblist.c:2487
msgid "/_Accounts"
msgstr "/账户(_A)"
-#: ../src/gtkblist.c:2447 ../src/gtkblist.c:5517
+#: ../gtk/gtkblist.c:2488 ../gtk/gtkblist.c:5864
msgid "/Accounts/Add\\/Edit"
msgstr "/账户(A)/添加\\/编辑"
#. Tools
-#: ../src/gtkblist.c:2450
+#: ../gtk/gtkblist.c:2491
msgid "/_Tools"
msgstr "/工具(_T)"
-#: ../src/gtkblist.c:2451
+#: ../gtk/gtkblist.c:2492
msgid "/Tools/Buddy _Pounces"
msgstr "/工具(T)/好友千里眼(_P)"
-#: ../src/gtkblist.c:2452
+#: ../gtk/gtkblist.c:2493
msgid "/Tools/Plu_gins"
msgstr "/工具(T)/插件(_G)"
-#: ../src/gtkblist.c:2453
+#: ../gtk/gtkblist.c:2494
msgid "/Tools/Pr_eferences"
msgstr "/工具(T)/首选项(_E)"
-#: ../src/gtkblist.c:2454
+#: ../gtk/gtkblist.c:2495
msgid "/Tools/Pr_ivacy"
msgstr "/工具(T)/隐私(_I)"
-#: ../src/gtkblist.c:2456
+#: ../gtk/gtkblist.c:2497
msgid "/Tools/_File Transfers"
msgstr "/工具(T)/文件传送(_F)"
-#: ../src/gtkblist.c:2457
+#: ../gtk/gtkblist.c:2498
msgid "/Tools/R_oom List"
msgstr "/工具(T)/房间列表(_O)"
-#: ../src/gtkblist.c:2458
+#: ../gtk/gtkblist.c:2499
msgid "/Tools/System _Log"
msgstr "/工具(T)/系统日志(_L)"
-#: ../src/gtkblist.c:2460
+#: ../gtk/gtkblist.c:2501
msgid "/Tools/Mute _Sounds"
msgstr "/工具(T)/静音(_S)"
#. Help
-#: ../src/gtkblist.c:2463
+#: ../gtk/gtkblist.c:2504
msgid "/_Help"
msgstr "/帮助(_H)"
-#: ../src/gtkblist.c:2464
+#: ../gtk/gtkblist.c:2505
msgid "/Help/Online _Help"
msgstr "/帮助(H)/在线帮助(_H)"
-#: ../src/gtkblist.c:2465
+#: ../gtk/gtkblist.c:2506
msgid "/Help/_Debug Window"
msgstr "/帮助(H)/调试窗口(_D)"
-#: ../src/gtkblist.c:2466
+#: ../gtk/gtkblist.c:2507
msgid "/Help/_About"
msgstr "/帮助(H)/关于(_A)"
-#: ../src/gtkblist.c:2498 ../src/gtkblist.c:2567
+#: ../gtk/gtkblist.c:2539 ../gtk/gtkblist.c:2608
#, c-format
msgid ""
"\n"
@@ -2479,7 +1344,7 @@ msgstr ""
"\n"
"<b>账户:</b>%s"
-#: ../src/gtkblist.c:2579
+#: ../gtk/gtkblist.c:2620
#, c-format
msgid ""
"\n"
@@ -2488,7 +1353,7 @@ msgstr ""
"\n"
"<b>好友别名:</b>%s"
-#: ../src/gtkblist.c:2591
+#: ../gtk/gtkblist.c:2632
#, c-format
msgid ""
"\n"
@@ -2497,7 +1362,7 @@ msgstr ""
"\n"
"<b>昵称:</b>%s"
-#: ../src/gtkblist.c:2600
+#: ../gtk/gtkblist.c:2641
#, c-format
msgid ""
"\n"
@@ -2506,7 +1371,7 @@ msgstr ""
"\n"
"<b>登入:</b>%s"
-#: ../src/gtkblist.c:2611
+#: ../gtk/gtkblist.c:2652
#, c-format
msgid ""
"\n"
@@ -2515,7 +1380,7 @@ msgstr ""
"\n"
"<b>发呆:</b>%s"
-#: ../src/gtkblist.c:2646
+#: ../gtk/gtkblist.c:2687
#, c-format
msgid ""
"\n"
@@ -2524,7 +1389,7 @@ msgstr ""
"\n"
"<b>上次看见:</b>%s前"
-#: ../src/gtkblist.c:2655
+#: ../gtk/gtkblist.c:2696
msgid ""
"\n"
"<b>Status:</b> Offline"
@@ -2532,7 +1397,7 @@ msgstr ""
"\n"
"<b>状态:</b>离线"
-#: ../src/gtkblist.c:2666
+#: ../gtk/gtkblist.c:2707
msgid ""
"\n"
"<b>Description:</b> Spooky"
@@ -2540,7 +1405,7 @@ msgstr ""
"\n"
"<b>描述:</b>健谈"
-#: ../src/gtkblist.c:2668
+#: ../gtk/gtkblist.c:2709
msgid ""
"\n"
"<b>Status:</b> Awesome"
@@ -2548,7 +1413,7 @@ msgstr ""
"\n"
"<b>状态:</b>可怕"
-#: ../src/gtkblist.c:2670
+#: ../gtk/gtkblist.c:2711
msgid ""
"\n"
"<b>Status:</b> Rockin'"
@@ -2556,125 +1421,146 @@ msgstr ""
"\n"
"<b>状态:</b>混乱"
-#: ../src/gtkblist.c:2959
+#: ../gtk/gtkblist.c:3178 ../gtk/gtkstatusbox.c:809
+#: ../gtk/plugins/docklet/docklet.c:447 ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1367
+#: ../libgaim/protocols/novell/novell.c:2861
+#: ../libgaim/protocols/oscar/oscar.c:770
+#: ../libgaim/protocols/oscar/oscar.c:5423
+#: ../libgaim/protocols/yahoo/yahoo.c:2825 ../libgaim/status.c:154
+msgid "Offline"
+msgstr "离线"
+
+#: ../gtk/gtkblist.c:3194
#, c-format
msgid "Idle %dh %02dm"
msgstr "发呆中 (%d小时%02d分) "
-#: ../src/gtkblist.c:2961
+#: ../gtk/gtkblist.c:3196
#, c-format
msgid "Idle %dm"
msgstr "发呆 %d分"
#. Idle stuff
-#: ../src/gtkblist.c:2964 ../src/gtkprefs.c:1745
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
-#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2731
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../gtk/gtkblist.c:3199 ../gtk/gtkprefs.c:1764
+#: ../libgaim/protocols/bonjour/bonjour.c:333
+#: ../libgaim/protocols/jabber/buddy.c:641
+#: ../libgaim/protocols/jabber/buddy.c:672 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/msn/state.c:32
+#: ../libgaim/protocols/novell/novell.c:2858
+#: ../libgaim/protocols/oscar/oscar.c:2802
+#: ../libgaim/protocols/yahoo/yahoo.c:2823
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
msgid "Idle"
msgstr "发呆"
-#: ../src/gtkblist.c:3096
+#: ../gtk/gtkblist.c:3327
msgid "/Buddies/New Instant Message..."
msgstr "/好友(B)/新即时消息..."
-#: ../src/gtkblist.c:3097 ../src/gtkblist.c:3130
+#: ../gtk/gtkblist.c:3328 ../gtk/gtkblist.c:3361
msgid "/Buddies/Join a Chat..."
msgstr "/好友(B)/加入聊天(C)..."
-#: ../src/gtkblist.c:3098
+#: ../gtk/gtkblist.c:3329
msgid "/Buddies/Get User Info..."
msgstr "/好友(B)/获取用户信息..."
-#: ../src/gtkblist.c:3099
+#: ../gtk/gtkblist.c:3330
msgid "/Buddies/Add Buddy..."
msgstr "/好友(B)/添加好友..."
-#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
+#: ../gtk/gtkblist.c:3331 ../gtk/gtkblist.c:3364
msgid "/Buddies/Add Chat..."
msgstr "/好友(B)/添加聊天..."
-#: ../src/gtkblist.c:3101
+#: ../gtk/gtkblist.c:3332
msgid "/Buddies/Add Group..."
msgstr "/好友(B)/添加组..."
-#: ../src/gtkblist.c:3136
+#: ../gtk/gtkblist.c:3367
msgid "/Tools/Buddy Pounces"
msgstr "/工具(T)/好友千里眼(P)"
-#: ../src/gtkblist.c:3139
+#: ../gtk/gtkblist.c:3370
msgid "/Tools/Privacy"
msgstr "/工具(T)/隐私(I)"
-#: ../src/gtkblist.c:3142
+#: ../gtk/gtkblist.c:3373
msgid "/Tools/Room List"
msgstr "/工具(T)/房间列表(O)"
-#: ../src/gtkblist.c:3336
+#: ../gtk/gtkblist.c:3469 ../gtk/plugins/docklet/docklet.c:157
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "来自 %2$s 的 %1$d 条未读消息\n"
+
+#: ../gtk/gtkblist.c:3567
msgid "Manually"
msgstr "手动"
-#: ../src/gtkblist.c:3338
+#: ../gtk/gtkblist.c:3569
msgid "Alphabetically"
msgstr "按字母序"
-#: ../src/gtkblist.c:3339
+#: ../gtk/gtkblist.c:3570
msgid "By status"
msgstr "按状态"
-#: ../src/gtkblist.c:3340
+#: ../gtk/gtkblist.c:3571
msgid "By log size"
msgstr "按日志大小"
-#: ../src/gtkblist.c:3457 ../src/gtkconn.c:196
+#: ../gtk/gtkblist.c:3779 ../gtk/gtkconn.c:186
#, c-format
msgid "%s disconnected"
msgstr "%s 已断开连接"
-#: ../src/gtkblist.c:3473 ../src/protocols/sametime/sametime.c:3630
+#: ../gtk/gtkblist.c:3788 ../libgaim/protocols/sametime/sametime.c:3619
msgid "Connect"
msgstr "连接"
-#: ../src/gtkblist.c:3473 ../src/gtkblist.c:5616
-msgid "Enable Account"
-msgstr "启用账户"
+#: ../gtk/gtkblist.c:3788
+msgid "Re-enable Account"
+msgstr "重新启用账户"
-#: ../src/gtkblist.c:3494
+#: ../gtk/gtkblist.c:3809
#, c-format
msgid "<span color=\"red\">%s disconnected: %s</span>"
msgstr "<span color=\"red\">%s 已经断开连接:%s</span>"
-#: ../src/gtkblist.c:3621
+#: ../gtk/gtkblist.c:3937
msgid "/Accounts"
msgstr "/账户(A)"
#. set the Show Offline Buddies option. must be done
#. * after the treeview or faceprint gets mad. -Robot101
#.
-#: ../src/gtkblist.c:3726
+#: ../gtk/gtkblist.c:4041
msgid "/Buddies/Show Offline Buddies"
msgstr "/好友(B)/显示离线好友(O)"
-#: ../src/gtkblist.c:3729
+#: ../gtk/gtkblist.c:4044
msgid "/Buddies/Show Empty Groups"
msgstr "/好友(B)/显示空组(E)"
-#: ../src/gtkblist.c:3735
+#: ../gtk/gtkblist.c:4050
msgid "/Buddies/Show Buddy Details"
msgstr "/好友(B)/显示好友详细资料(D)"
-#: ../src/gtkblist.c:3738
+#: ../gtk/gtkblist.c:4053
msgid "/Buddies/Show Idle Times"
msgstr "/好友(B)/显示发呆时间(T)"
-#: ../src/gtkblist.c:4450 ../src/protocols/silc/buddy.c:736
-#: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
-msgid "Add Buddy"
-msgstr "添加好友"
+#: ../gtk/gtkblist.c:4686 ../gtk/plugins/gevolution/gevolution.c:96
+#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:516
+#: ../libgaim/blist.c:1281 ../libgaim/blist.c:1508
+#: ../libgaim/protocols/jabber/roster.c:67
+msgid "Buddies"
+msgstr "好友"
-#: ../src/gtkblist.c:4474
+#: ../gtk/gtkblist.c:4820
msgid ""
"Please enter the screen name of the person you would like to add to your "
"buddy list. You may optionally enter an alias, or nickname, for the buddy. "
@@ -2683,873 +1569,829 @@ msgstr ""
"您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要可能"
"的话,别名将会替代用户名显示。\n"
-#: ../src/gtkblist.c:4496
-msgid "Screen Name:"
-msgstr "用户名:"
-
-#. Set up stuff for the account box
-#: ../src/gtkblist.c:4544 ../src/gtkblist.c:4863
-msgid "Account:"
-msgstr "账户:"
+#: ../gtk/gtkblist.c:4880 ../gtk/gtkblist.c:5243
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:549
+#: ../gtk/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "组:"
-#: ../src/gtkblist.c:4796
+#: ../gtk/gtkblist.c:5141
msgid "This protocol does not support chat rooms."
msgstr "此协议不支持聊天室。"
-#: ../src/gtkblist.c:4812
+#: ../gtk/gtkblist.c:5157
msgid ""
"You are not currently signed on with any protocols that have the ability to "
"chat."
msgstr "您目前登入的协议中没有一个可以聊天的。"
-#: ../src/gtkblist.c:4829
-msgid "Add Chat"
-msgstr "添加聊天"
-
-#: ../src/gtkblist.c:4853
+#: ../gtk/gtkblist.c:5198
msgid ""
"Please enter an alias, and the appropriate information about the chat you "
"would like to add to your buddy list.\n"
msgstr "您想要将聊天加入您的好友列表,请输入该聊天的别名和对应信息。\n"
-#: ../src/gtkblist.c:4935 ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5406
-msgid "Add Group"
-msgstr "添加组"
-
-#: ../src/gtkblist.c:4936
+#: ../gtk/gtkblist.c:5281
msgid "Please enter the name of the group to be added."
msgstr "请输入要添加的组名称。"
-#: ../src/gtkblist.c:5557
+#: ../gtk/gtkblist.c:5904
msgid "_Edit Account"
msgstr "编辑账户(_E)"
-#: ../src/gtkblist.c:5590 ../src/gtkblist.c:5596
+#: ../gtk/gtkblist.c:5937 ../gtk/gtkblist.c:5943 ../gtk/gtkconv.c:2727
msgid "No actions available"
msgstr "没有可用的操作"
-#: ../src/gtkblist.c:5604
+#: ../gtk/gtkblist.c:5951
msgid "_Disable"
msgstr "禁用(_D)"
-#: ../src/gtkblist.c:5669
+#: ../gtk/gtkblist.c:5963
+msgid "Enable Account"
+msgstr "启用账户"
+
+#: ../gtk/gtkblist.c:6016
msgid "/Tools"
msgstr "/工具(T)"
-#: ../src/gtkblist.c:5755
+#: ../gtk/gtkblist.c:6102
msgid "/Buddies/Sort Buddies"
msgstr "/好友(B)/好友排序(S)"
-#: ../src/gtkconn.c:197
+#: ../gtk/gtkconn.c:187
#, c-format
msgid ""
"%s was disconnected due to an error: %s\n"
"Gaim will not attempt to reconnect the account until you correct the error "
"and re-enable the account."
msgstr ""
+"%s 已断开连接,原因是发生了错误:%s\n"
+"Gaim 将不会尝试重新连接账户,除非您纠正了错误然后重新启用账户。"
-#: ../src/gtkconv.c:373
-msgid "Supported debug options are: version"
-msgstr "支持的调试选项有: version"
-
-#: ../src/gtkconv.c:409
-msgid "No such command (in this context)."
-msgstr "没有这样的命令(在此环境中)。"
-
-#: ../src/gtkconv.c:412
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
-"此环境下可使用下列命令:\n"
-
-#: ../src/gtkconv.c:484
-msgid "No such command."
-msgstr "没有这样的命令。"
-
-#: ../src/gtkconv.c:491
-msgid "Syntax Error: You typed the wrong number of arguments to that command."
-msgstr "系统错误: 您给命令传送的参数个数不对。"
-
-#: ../src/gtkconv.c:496
-msgid "Your command failed for an unknown reason."
-msgstr "您的命令失败,原因未知。"
-
-#: ../src/gtkconv.c:503
-msgid "That command only works in chats, not IMs."
-msgstr "该命令只在聊天中可用,对话中无效。"
-
-#: ../src/gtkconv.c:506
-msgid "That command only works in IMs, not chats."
-msgstr "该命令只在对话中可用,聊天中无效。"
-
-#: ../src/gtkconv.c:510
-msgid "That command doesn't work on this protocol."
-msgstr "命令无法在此协议下工作。"
-
-#: ../src/gtkconv.c:744 ../src/gtkconv.c:770
+#: ../gtk/gtkconv.c:732 ../gtk/gtkconv.c:758
msgid "That buddy is not on the same protocol as this chat."
msgstr "该好友不在此聊天的协议中。"
-#: ../src/gtkconv.c:764
+#: ../gtk/gtkconv.c:752
msgid ""
"You are not currently signed on with an account that can invite that buddy."
msgstr "您目前登入的协议中没有一个可以邀请好友的。"
-#: ../src/gtkconv.c:817
+#: ../gtk/gtkconv.c:805
msgid "Invite Buddy Into Chat Room"
msgstr "邀请好友进入聊天室"
#. Put our happy label in it.
-#: ../src/gtkconv.c:847
+#: ../gtk/gtkconv.c:835
msgid ""
"Please enter the name of the user you wish to invite, along with an optional "
"invite message."
msgstr "您想要邀请谁?请输入他/她的名字,以及可选的邀请消息。"
-#: ../src/gtkconv.c:868
+#: ../gtk/gtkconv.c:856
msgid "_Buddy:"
msgstr "好友(_B):"
-#: ../src/gtkconv.c:888 ../src/gtksavedstatuses.c:1108
-#: ../src/gtksavedstatuses.c:1444
+#: ../gtk/gtkconv.c:876 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtksavedstatuses.c:1447
msgid "_Message:"
msgstr "消息(_M):"
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2380 ../src/gtkdebug.c:217
-#: ../src/gtkft.c:488
+#: ../gtk/gtkconv.c:933 ../gtk/gtkconv.c:2344 ../gtk/gtkdebug.c:217
+#: ../gtk/gtkft.c:490
msgid "Unable to open file."
msgstr "无法打开文件。"
-#: ../src/gtkconv.c:951
+#: ../gtk/gtkconv.c:939
#, c-format
msgid "<h1>Conversation with %s</h1>\n"
msgstr "<h1>与 %s 的谈话</h1>\n"
-#: ../src/gtkconv.c:975
+#: ../gtk/gtkconv.c:963
msgid "Save Conversation"
msgstr "保存对话"
-#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../gtk/gtkconv.c:1084 ../gtk/gtkdebug.c:165 ../gtk/gtkdebug.c:678
msgid "Find"
msgstr "查找"
-#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
+#: ../gtk/gtkconv.c:1110 ../gtk/gtkdebug.c:193
msgid "_Search for:"
msgstr "搜索文字(_S):"
-#: ../src/gtkconv.c:1293
+#: ../gtk/gtkconv.c:1281
msgid "Logging started. Future messages in this conversation will be logged."
msgstr "日志已启动。此会话中的后续消息将会被自动记录。"
-#: ../src/gtkconv.c:1301
+#: ../gtk/gtkconv.c:1289
msgid ""
"Logging stopped. Future messages in this conversation will not be logged."
msgstr "记录已停止。此会话中的后续消息将不会被记录。"
-#: ../src/gtkconv.c:1559
-msgid "IM"
-msgstr "开聊"
-
-#: ../src/gtkconv.c:1565 ../src/protocols/oscar/oscar.c:714
-msgid "Send File"
-msgstr "发送文件"
-
-#: ../src/gtkconv.c:1572
+#: ../gtk/gtkconv.c:1557
msgid "Un-Ignore"
msgstr "取消忽略"
-#: ../src/gtkconv.c:1575
+#: ../gtk/gtkconv.c:1560
msgid "Ignore"
msgstr "忽略"
-#: ../src/gtkconv.c:1581
-msgid "Info"
-msgstr "信息"
-
-#: ../src/gtkconv.c:1587
+#: ../gtk/gtkconv.c:1580
msgid "Get Away Message"
msgstr "获得离开消息"
-#: ../src/gtkconv.c:1602
+#: ../gtk/gtkconv.c:1603
msgid "Last said"
msgstr "上次说道"
-#: ../src/gtkconv.c:2388
+#: ../gtk/gtkconv.c:2352
msgid "Unable to save icon file to disk."
msgstr "无法将图标文件保存到磁盘。"
-#: ../src/gtkconv.c:2412
+#: ../gtk/gtkconv.c:2376
msgid "Save Icon"
msgstr "保存图标"
-#: ../src/gtkconv.c:2461
+#: ../gtk/gtkconv.c:2425
msgid "Animate"
msgstr "动画"
-#: ../src/gtkconv.c:2466
+#: ../gtk/gtkconv.c:2430
msgid "Hide Icon"
msgstr "隐藏图标"
-#: ../src/gtkconv.c:2472
+#: ../gtk/gtkconv.c:2436
msgid "Save Icon As..."
msgstr "图标另存为..."
#. Conversation menu
-#: ../src/gtkconv.c:2613
+#: ../gtk/gtkconv.c:2576
msgid "/_Conversation"
msgstr "/对话(_C)"
-#: ../src/gtkconv.c:2615
+#: ../gtk/gtkconv.c:2578
msgid "/Conversation/New Instant _Message..."
msgstr "/对话(C)/新即时消息(_M)..."
-#: ../src/gtkconv.c:2620
+#: ../gtk/gtkconv.c:2583
msgid "/Conversation/_Find..."
msgstr "/对话(C)/查找(_F)..."
-#: ../src/gtkconv.c:2622
+#: ../gtk/gtkconv.c:2585
msgid "/Conversation/View _Log"
msgstr "/对话(C)/查看日志(_L)"
-#: ../src/gtkconv.c:2623
+#: ../gtk/gtkconv.c:2586
msgid "/Conversation/_Save As..."
msgstr "/对话(C)/另存为(_S)..."
-#: ../src/gtkconv.c:2625
+#: ../gtk/gtkconv.c:2588
msgid "/Conversation/Clea_r Scrollback"
msgstr "/对话(C)/清除回滚(_R)"
-#: ../src/gtkconv.c:2629
+#: ../gtk/gtkconv.c:2592
msgid "/Conversation/Se_nd File..."
msgstr "/对话(C)/发送文件(_N)..."
-#: ../src/gtkconv.c:2630
+#: ../gtk/gtkconv.c:2593
msgid "/Conversation/Add Buddy _Pounce..."
msgstr "/对话(C)/添加好友千里眼(_P)..."
-#: ../src/gtkconv.c:2632
+#: ../gtk/gtkconv.c:2595
msgid "/Conversation/_Get Info"
msgstr "/对话(C)/获取信息(_G)"
-#: ../src/gtkconv.c:2634
+#: ../gtk/gtkconv.c:2597
msgid "/Conversation/In_vite..."
msgstr "/对话(C)/邀请(_V)..."
-#: ../src/gtkconv.c:2639
+#: ../gtk/gtkconv.c:2599
+msgid "/Conversation/M_ore"
+msgstr "/对话(C)/更多(_O)"
+
+#: ../gtk/gtkconv.c:2603
msgid "/Conversation/Al_ias..."
msgstr "/对话(C)/别名(_L)..."
-#: ../src/gtkconv.c:2641
+#: ../gtk/gtkconv.c:2605
msgid "/Conversation/_Block..."
msgstr "/对话(C)/屏蔽(_B)..."
-#: ../src/gtkconv.c:2643
+#: ../gtk/gtkconv.c:2607
msgid "/Conversation/_Add..."
msgstr "/对话(C)/添加(_A)..."
-#: ../src/gtkconv.c:2645
+#: ../gtk/gtkconv.c:2609
msgid "/Conversation/_Remove..."
msgstr "/对话(C)/删除(_R)..."
-#: ../src/gtkconv.c:2650
+#: ../gtk/gtkconv.c:2614
msgid "/Conversation/Insert Lin_k..."
msgstr "/对话(C)/插入链接(_K)..."
-#: ../src/gtkconv.c:2652
+#: ../gtk/gtkconv.c:2616
msgid "/Conversation/Insert Imag_e..."
msgstr "/对话(C)/插入图像(_E)..."
-#: ../src/gtkconv.c:2657
+#: ../gtk/gtkconv.c:2621
msgid "/Conversation/_Close"
msgstr "/对话(C)/关闭(_C)"
#. Options
-#: ../src/gtkconv.c:2661
+#: ../gtk/gtkconv.c:2625
msgid "/_Options"
msgstr "/选项(_O)"
-#: ../src/gtkconv.c:2662
+#: ../gtk/gtkconv.c:2626
msgid "/Options/Enable _Logging"
msgstr "/选项(O)/允许记录日志(_L)"
-#: ../src/gtkconv.c:2663
+#: ../gtk/gtkconv.c:2627
msgid "/Options/Enable _Sounds"
msgstr "/选项(O)/允许声音(_S)"
-#: ../src/gtkconv.c:2664
+#: ../gtk/gtkconv.c:2628
msgid "/Options/Show Buddy _Icon"
msgstr "/选项(O)/显示好友图标(_I)"
-#: ../src/gtkconv.c:2666
+#: ../gtk/gtkconv.c:2630
msgid "/Options/Show Formatting _Toolbars"
msgstr "/选项(O)/显示格式工具栏(_T)"
-#: ../src/gtkconv.c:2667
+#: ../gtk/gtkconv.c:2631
msgid "/Options/Show Ti_mestamps"
msgstr "/选项(O)/显示时间戳(_I)"
-#: ../src/gtkconv.c:2759
+#: ../gtk/gtkconv.c:2706
+msgid "/Conversation/More"
+msgstr "/对话(C)/更多(O)"
+
+#: ../gtk/gtkconv.c:2744 ../gtk/gtkconv.c:2771
+msgid "/Conversation"
+msgstr "/对话(C)"
+
+#: ../gtk/gtkconv.c:2781
msgid "/Conversation/View Log"
msgstr "/对话(C)/查看日志(L)"
-#: ../src/gtkconv.c:2765
+#: ../gtk/gtkconv.c:2787
msgid "/Conversation/Send File..."
msgstr "/对话(C)/发送文件(N)..."
-#: ../src/gtkconv.c:2769
+#: ../gtk/gtkconv.c:2791
msgid "/Conversation/Add Buddy Pounce..."
msgstr "/对话(C)/添加好友千里眼(P)..."
-#: ../src/gtkconv.c:2775
+#: ../gtk/gtkconv.c:2797
msgid "/Conversation/Get Info"
msgstr "/对话(C)/获取信息(G)"
-#: ../src/gtkconv.c:2779
+#: ../gtk/gtkconv.c:2801
msgid "/Conversation/Invite..."
msgstr "/对话(C)/邀请(V)..."
-#: ../src/gtkconv.c:2785
+#: ../gtk/gtkconv.c:2807
msgid "/Conversation/Alias..."
msgstr "/对话(C)/别名(L)..."
-#: ../src/gtkconv.c:2789
+#: ../gtk/gtkconv.c:2811
msgid "/Conversation/Block..."
msgstr "/对话(C)/屏蔽(B)..."
-#: ../src/gtkconv.c:2793
+#: ../gtk/gtkconv.c:2815
msgid "/Conversation/Add..."
msgstr "/对话(C)/添加(A)..."
-#: ../src/gtkconv.c:2797
+#: ../gtk/gtkconv.c:2819
msgid "/Conversation/Remove..."
msgstr "/对话(C)/删除(R)..."
-#: ../src/gtkconv.c:2803
+#: ../gtk/gtkconv.c:2825
msgid "/Conversation/Insert Link..."
msgstr "/对话(C)/插入链接(K)..."
-#: ../src/gtkconv.c:2807
+#: ../gtk/gtkconv.c:2829
msgid "/Conversation/Insert Image..."
msgstr "/对话(C)/插入图像(I)..."
-#: ../src/gtkconv.c:2813
+#: ../gtk/gtkconv.c:2835
msgid "/Options/Enable Logging"
msgstr "/选项(O)/允许记录(L)"
-#: ../src/gtkconv.c:2816
+#: ../gtk/gtkconv.c:2838
msgid "/Options/Enable Sounds"
msgstr "/选项(O)/允许声音(S)"
-#: ../src/gtkconv.c:2829
+#: ../gtk/gtkconv.c:2851
msgid "/Options/Show Formatting Toolbars"
msgstr "/选项(O)/显示格式工具栏(T)"
-#: ../src/gtkconv.c:2832
+#: ../gtk/gtkconv.c:2854
msgid "/Options/Show Timestamps"
msgstr "/选项(O)/显示时间戳(I)"
-#: ../src/gtkconv.c:2835
+#: ../gtk/gtkconv.c:2857
msgid "/Options/Show Buddy Icon"
msgstr "/选项(O)/显示好友图标(I)"
-#: ../src/gtkconv.c:2915
+#: ../gtk/gtkconv.c:2933
msgid "User is typing..."
msgstr "用户正在打字..."
-#: ../src/gtkconv.c:2918
+#: ../gtk/gtkconv.c:2936
msgid "User has typed something and stopped"
msgstr "用户打了几个字,停了一下"
#. Build the Send To menu
-#: ../src/gtkconv.c:3101
+#: ../gtk/gtkconv.c:3119
msgid "_Send To"
msgstr "发送到(_S)"
-#: ../src/gtkconv.c:3753
+#: ../gtk/gtkconv.c:3825
msgid "_Send"
msgstr "发送(_S)"
-#: ../src/gtkconv.c:3808 ../src/protocols/sametime/sametime.c:3572
+#: ../gtk/gtkconv.c:3879 ../libgaim/protocols/sametime/sametime.c:3561
msgid "Topic:"
msgstr "话题:"
#. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3860
+#: ../gtk/gtkconv.c:3931
msgid "0 people in room"
msgstr "聊天室里没有人"
-#: ../src/gtkconv.c:3939
-msgid "IM the user"
-msgstr "给用户发送即时消息"
-
-#: ../src/gtkconv.c:3952
-msgid "Ignore the user"
-msgstr "忽略用户"
-
-#: ../src/gtkconv.c:3964
-msgid "Get the user's information"
-msgstr "获取用户信息"
-
-#: ../src/gtkconv.c:4938 ../src/gtkconv.c:5047
+#: ../gtk/gtkconv.c:4980 ../gtk/gtkconv.c:5101
#, c-format
msgid "%d person in room"
msgid_plural "%d people in room"
msgstr[0] "聊天室里有 %d 个人"
-#: ../src/gtkconv.c:6520
-msgid ""
-"say &lt;message&gt;: Send a message normally as if you weren't using a "
-"command."
-msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
+#: ../gtk/gtkconv.c:5647 ../gtk/gtkstatusbox.c:499
+msgid "Typing"
+msgstr "正打字"
-#: ../src/gtkconv.c:6523
-msgid "me &lt;action&gt;: Send an IRC style action to a buddy or chat."
-msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
+#: ../gtk/gtkconv.c:5653
+msgid "Stopped Typing"
+msgstr "停止打字"
-#: ../src/gtkconv.c:6526
-msgid ""
-"debug &lt;option&gt;: Send various debug information to the current "
-"conversation."
-msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
+#: ../gtk/gtkconv.c:5658
+msgid "Nick Said"
+msgstr "昵称说"
-#: ../src/gtkconv.c:6529
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: 清除对话回滚。"
+#: ../gtk/gtkconv.c:5663 ../gtk/plugins/docklet/docklet.c:489
+msgid "Unread Messages"
+msgstr "未读消息"
-#: ../src/gtkconv.c:6532
-msgid "help &lt;command&gt;: Help on a specific command."
-msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
+#: ../gtk/gtkconv.c:5668
+msgid "New Event"
+msgstr "新事件"
-#: ../src/gtkconv.c:6691
+#: ../gtk/gtkconv.c:6757
msgid "Confirm close"
msgstr "确认关闭"
-#: ../src/gtkconv.c:6723
+#: ../gtk/gtkconv.c:6789
msgid "You have unread messages. Are you sure you want to close the window?"
msgstr "您有未读取的消息。您确定真的想要关闭窗口吗?"
-#: ../src/gtkconv.c:7245
+#: ../gtk/gtkconv.c:7311
msgid "Close other tabs"
msgstr "关闭其它标签"
-#: ../src/gtkconv.c:7251
+#: ../gtk/gtkconv.c:7317
msgid "Close all tabs"
msgstr "关闭全部标签"
-#: ../src/gtkconv.c:7259
+#: ../gtk/gtkconv.c:7325
msgid "Detach this tab"
msgstr "此标签漂移"
-#: ../src/gtkconv.c:7265
+#: ../gtk/gtkconv.c:7331
msgid "Close this tab"
msgstr "关闭此标签"
-#: ../src/gtkconv.c:7527
+#: ../gtk/gtkconv.c:7587
msgid "Close conversation"
msgstr "关闭对话"
-#: ../src/gtkconv.c:7991
+#: ../gtk/gtkconv.c:8051
msgid "Last created window"
msgstr "上次创建的窗口"
-#: ../src/gtkconv.c:7993
+#: ../gtk/gtkconv.c:8053
msgid "Separate IM and Chat windows"
msgstr "分离即时消息和聊天窗口"
-#: ../src/gtkconv.c:7995 ../src/gtkprefs.c:1243
+#: ../gtk/gtkconv.c:8055 ../gtk/gtkprefs.c:1262
msgid "New window"
msgstr "新建窗口"
-#: ../src/gtkconv.c:7997
+#: ../gtk/gtkconv.c:8057
msgid "By group"
msgstr "按组"
-#: ../src/gtkconv.c:7999
+#: ../gtk/gtkconv.c:8059
msgid "By account"
msgstr "按账户"
-#: ../src/gtkdebug.c:232
+#: ../gtk/gtkdebug.c:232
msgid "Save Debug Log"
msgstr "保存调试日志"
-#: ../src/gtkdebug.c:586
+#: ../gtk/gtkdebug.c:586
msgid "Invert"
msgstr "反转"
-#: ../src/gtkdebug.c:589
+#: ../gtk/gtkdebug.c:589
msgid "Highlight matches"
msgstr "突出显示匹配项"
-#: ../src/gtkdebug.c:636
-msgid "Debug Window"
-msgstr "调试窗口"
-
-#: ../src/gtkdebug.c:689
+#: ../gtk/gtkdebug.c:689
msgid "Clear"
msgstr "清除"
-#: ../src/gtkdebug.c:698
+#: ../gtk/gtkdebug.c:698
msgid "Pause"
msgstr "暂停"
-#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
+#: ../gtk/gtkdebug.c:705 ../gtk/gtkdebug.c:706
msgid "Timestamps"
msgstr "时间戳"
-#: ../src/gtkdebug.c:724
+#: ../gtk/gtkdebug.c:724
msgid "Filter"
msgstr "过滤"
-#: ../src/gtkdebug.c:743
+#: ../gtk/gtkdebug.c:743
msgid "Right click for more options."
msgstr "用右键单击可查看更多选项。"
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
+#: ../gtk/gtkdialogs.c:61 ../gtk/gtkdialogs.c:104
msgid "lead developer"
msgstr "领导开发者"
-#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:74
+#: ../gtk/gtkdialogs.c:62 ../gtk/gtkdialogs.c:63 ../gtk/gtkdialogs.c:65
+#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:72
+#: ../gtk/gtkdialogs.c:73 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77
msgid "developer"
msgstr "开发者"
-#: ../src/gtkdialogs.c:64
+#: ../gtk/gtkdialogs.c:64
msgid "win32 port"
msgstr "Win32 移植"
-#: ../src/gtkdialogs.c:66
+#: ../gtk/gtkdialogs.c:67
msgid "developer & webmaster"
msgstr "开发者和网管"
-#: ../src/gtkdialogs.c:72
+#: ../gtk/gtkdialogs.c:74
msgid "support"
msgstr "支持"
-#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
+#: ../gtk/gtkdialogs.c:97 ../gtk/gtkdialogs.c:98
msgid "maintainer"
msgstr "维护者"
-#: ../src/gtkdialogs.c:96
+#: ../gtk/gtkdialogs.c:99
msgid "libfaim maintainer"
msgstr "libfaim 维护者"
-#: ../src/gtkdialogs.c:97
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../gtk/gtkdialogs.c:101
msgid "hacker and designated driver [lazy bum]"
msgstr "骇客和专属驱动程序[lazy bum]"
-#: ../src/gtkdialogs.c:98
+#: ../gtk/gtkdialogs.c:102
msgid "Jabber developer"
msgstr "Jabber 开发者"
-#: ../src/gtkdialogs.c:99
+#: ../gtk/gtkdialogs.c:103
msgid "original author"
msgstr "原作者"
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:160
+#: ../gtk/gtkdialogs.c:110 ../gtk/gtkdialogs.c:111 ../gtk/gtkdialogs.c:176
msgid "Bulgarian"
msgstr "保加利亚语"
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+#: ../gtk/gtkdialogs.c:112 ../gtk/gtkdialogs.c:113
msgid "Bengali"
msgstr ""
-#: ../src/gtkdialogs.c:110
+#: ../gtk/gtkdialogs.c:114
#, fuzzy
msgid "Bosnian"
msgstr "罗马尼亚语"
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:115 ../gtk/gtkdialogs.c:177 ../gtk/gtkdialogs.c:178
msgid "Catalan"
msgstr "加泰罗尼亚语"
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:163
+#: ../gtk/gtkdialogs.c:116 ../gtk/gtkdialogs.c:117
+msgid "Valencian-Catalan"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:179
msgid "Czech"
msgstr "捷克语"
-#: ../src/gtkdialogs.c:113
+#: ../gtk/gtkdialogs.c:119
msgid "Danish"
msgstr "丹麦语"
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:164
+#: ../gtk/gtkdialogs.c:120 ../gtk/gtkdialogs.c:121 ../gtk/gtkdialogs.c:180
msgid "German"
msgstr "德语"
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:123
msgid "Greek"
msgstr "希腊语"
-#: ../src/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:124
msgid "Australian English"
msgstr "澳大利亚英语"
-#: ../src/gtkdialogs.c:118
+#: ../gtk/gtkdialogs.c:125
msgid "Canadian English"
msgstr "加拿大英语"
-#: ../src/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:126
msgid "British English"
msgstr "英国英语"
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
-#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
+#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:182
+#: ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:184
msgid "Spanish"
msgstr "西班牙语"
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
+#: ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:129
+msgid "Euskera(Basque)"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
#, fuzzy
msgid "Persian"
msgstr "塞尔维亚语"
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:185 ../gtk/gtkdialogs.c:186
msgid "Finnish"
msgstr "芬兰语"
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
-#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
+#: ../gtk/gtkdialogs.c:133 ../gtk/gtkdialogs.c:187 ../gtk/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:189 ../gtk/gtkdialogs.c:190
msgid "French"
msgstr "法语"
-#: ../src/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:134
+#, fuzzy
+msgid "Galician"
+msgstr "意大利语"
+
+#: ../gtk/gtkdialogs.c:135
+msgid "Gujarati"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:191
msgid "Hebrew"
msgstr "希伯莱语"
-#: ../src/gtkdialogs.c:126
+#: ../gtk/gtkdialogs.c:137
msgid "Hindi"
msgstr "印地语"
-#: ../src/gtkdialogs.c:127
+#: ../gtk/gtkdialogs.c:138
msgid "Hungarian"
msgstr "匈牙利语"
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175
+#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:192
msgid "Italian"
msgstr "意大利语"
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
-#: ../src/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:140 ../gtk/gtkdialogs.c:193 ../gtk/gtkdialogs.c:194
+#: ../gtk/gtkdialogs.c:195
msgid "Japanese"
msgstr "日语"
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:179
+#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:196
#, fuzzy
msgid "Georgian"
msgstr "德语"
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:180
+#: ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:197
msgid "Korean"
msgstr "朝鲜语"
-#: ../src/gtkdialogs.c:132
+#: ../gtk/gtkdialogs.c:143 ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:145
#, fuzzy
msgid "Kurdish"
msgstr "土耳其语"
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:198 ../gtk/gtkdialogs.c:199
msgid "Lithuanian"
msgstr "立陶宛语"
-#: ../src/gtkdialogs.c:134
+#: ../gtk/gtkdialogs.c:147
msgid "Macedonian"
msgstr "马其顿语"
-#: ../src/gtkdialogs.c:135
+#: ../gtk/gtkdialogs.c:148
+msgid "Nepali"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:149
#, fuzzy
msgid "Dutch, Flemish"
msgstr "荷兰语"
-#: ../src/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:150
msgid "Norwegian"
msgstr "挪威语"
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:183
+#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:200
msgid "Polish"
msgstr "波兰语"
-#: ../src/gtkdialogs.c:139
+#: ../gtk/gtkdialogs.c:153
msgid "Portuguese"
msgstr "葡萄牙语"
-#: ../src/gtkdialogs.c:140
+#: ../gtk/gtkdialogs.c:154
msgid "Portuguese-Brazil"
msgstr "巴西葡萄牙语"
-#: ../src/gtkdialogs.c:141
+#: ../gtk/gtkdialogs.c:155
msgid "Romanian"
msgstr "罗马尼亚语"
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
+#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
msgid "Russian"
msgstr "俄语"
-#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
msgid "Serbian"
msgstr "塞尔维亚语"
-#: ../src/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:203
+msgid "Slovak"
+msgstr "斯洛伐克语"
+
+#: ../gtk/gtkdialogs.c:160
msgid "Slovenian"
msgstr "斯洛文尼亚语"
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:187
+#: ../gtk/gtkdialogs.c:161 ../gtk/gtkdialogs.c:204
msgid "Swedish"
msgstr "瑞典语"
-#: ../src/gtkdialogs.c:147
+#: ../gtk/gtkdialogs.c:162
msgid "Tamil"
msgstr ""
-#: ../src/gtkdialogs.c:148
+#: ../gtk/gtkdialogs.c:163
msgid "Telugu"
msgstr ""
-#: ../src/gtkdialogs.c:149
+#: ../gtk/gtkdialogs.c:164
+msgid "Thai"
+msgstr ""
+
+#: ../gtk/gtkdialogs.c:165
msgid "Turkish"
msgstr "土耳其语"
-#: ../src/gtkdialogs.c:150
+#: ../gtk/gtkdialogs.c:166
msgid "Vietnamese"
msgstr "越南语"
-#: ../src/gtkdialogs.c:150
+#: ../gtk/gtkdialogs.c:166
msgid "T.M.Thanh and the Gnome-Vi Team"
msgstr "T.M.Thanh 及 Gnome 越南语团队"
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:167 ../gtk/gtkdialogs.c:205
msgid "Simplified Chinese"
msgstr "简体中文"
-#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153 ../src/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:168 ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:206
msgid "Traditional Chinese"
msgstr "繁体中文"
-#: ../src/gtkdialogs.c:159
+#: ../gtk/gtkdialogs.c:175
msgid "Amharic"
msgstr "阿姆哈拉语"
-#: ../src/gtkdialogs.c:186
-msgid "Slovak"
-msgstr "斯洛伐克语"
-
-#: ../src/gtkdialogs.c:230
+#: ../gtk/gtkdialogs.c:287
msgid "About Gaim"
msgstr "关于 Gaim"
-#: ../src/gtkdialogs.c:254
+#: ../gtk/gtkdialogs.c:321
msgid ""
"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
-"and Gadu-Gadu all at once. It is written using GTK+.<BR><BR>You may modify "
-"and redistribute the program under the terms of the GPL (version 2 or "
-"later). A copy of the GPL is contained in the 'COPYING' file distributed "
-"with Gaim. Gaim is copyrighted by its contributors. See the 'COPYRIGHT' "
-"file for the complete list of contributors. We provide no warranty for this "
-"program.<BR><BR>"
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"and QQ all at once. It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later). A "
+"copy of the GPL is contained in the 'COPYING' file distributed with Gaim. "
+"Gaim is copyrighted by its contributors. See the 'COPYRIGHT' file for the "
+"complete list of contributors. We provide no warranty for this program."
+"<BR><BR>"
msgstr ""
-#: ../src/gtkdialogs.c:268
+#: ../gtk/gtkdialogs.c:335
msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #wingaim<BR><BR>"
-#: ../src/gtkdialogs.c:271
+#: ../gtk/gtkdialogs.c:338
msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #gaim<BR><BR>"
-#: ../src/gtkdialogs.c:277
+#: ../gtk/gtkdialogs.c:344
msgid "Current Developers"
msgstr "当前开发者"
-#: ../src/gtkdialogs.c:292
+#: ../gtk/gtkdialogs.c:359
msgid "Crazy Patch Writers"
msgstr "疯狂补丁编写者"
-#: ../src/gtkdialogs.c:307
+#: ../gtk/gtkdialogs.c:374
msgid "Retired Developers"
msgstr "退休开发者"
-#: ../src/gtkdialogs.c:322
+#: ../gtk/gtkdialogs.c:389
msgid "Current Translators"
msgstr "当前翻译者"
-#: ../src/gtkdialogs.c:342
+#: ../gtk/gtkdialogs.c:409
msgid "Past Translators"
msgstr "先前翻译者"
-#: ../src/gtkdialogs.c:360
+#: ../gtk/gtkdialogs.c:427
msgid "Debugging Information"
msgstr "调试信息"
-#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:766
+#: ../gtk/gtkdialogs.c:647 ../gtk/gtkdialogs.c:784 ../gtk/gtkdialogs.c:864
msgid "_Name"
msgstr "名称(_N)"
-#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:771
+#: ../gtk/gtkdialogs.c:652 ../gtk/gtkdialogs.c:789 ../gtk/gtkdialogs.c:869
msgid "_Account"
msgstr "账户(_A)"
-#: ../src/gtkdialogs.c:579
+#: ../gtk/gtkdialogs.c:660
msgid "New Instant Message"
msgstr "新即时消息"
-#: ../src/gtkdialogs.c:581
+#: ../gtk/gtkdialogs.c:662
msgid ""
"Please enter the screen name or alias of the person you would like to IM."
msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
-#: ../src/gtkdialogs.c:716
+#: ../gtk/gtkdialogs.c:797
msgid "Get User Info"
msgstr "获取用户信息"
-#: ../src/gtkdialogs.c:718
+#: ../gtk/gtkdialogs.c:799
msgid ""
"Please enter the screen name or alias of the person whose info you would "
"like to view."
msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
-#: ../src/gtkdialogs.c:780
+#: ../gtk/gtkdialogs.c:888
msgid "View User Log"
msgstr "查看用户日志"
-#: ../src/gtkdialogs.c:782
+#: ../gtk/gtkdialogs.c:890
msgid ""
"Please enter the screen name or alias of the person whose log you would like "
"to view."
msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
-#: ../src/gtkdialogs.c:801
+#: ../gtk/gtkdialogs.c:909
msgid "Alias Contact"
msgstr "给联系人起名"
-#: ../src/gtkdialogs.c:802
+#: ../gtk/gtkdialogs.c:910
msgid "Enter an alias for this contact."
msgstr "请输入此联系人的别名。"
-#: ../src/gtkdialogs.c:804 ../src/gtkdialogs.c:826 ../src/gtkdialogs.c:846
-#: ../src/gtkrequest.c:279 ../src/protocols/silc/chat.c:586
-msgid "Alias"
-msgstr "别名"
-
-#: ../src/gtkdialogs.c:822
+#: ../gtk/gtkdialogs.c:930
#, c-format
msgid "Enter an alias for %s."
msgstr "输入 %s 的别名。"
-#: ../src/gtkdialogs.c:824
+#: ../gtk/gtkdialogs.c:932
msgid "Alias Buddy"
msgstr "好友别名"
-#: ../src/gtkdialogs.c:843
+#: ../gtk/gtkdialogs.c:951
msgid "Alias Chat"
msgstr "给聊天起名"
-#: ../src/gtkdialogs.c:844
+#: ../gtk/gtkdialogs.c:952
msgid "Enter an alias for this chat."
msgstr "请输入此聊天的别名。"
-#: ../src/gtkdialogs.c:881
+#: ../gtk/gtkdialogs.c:989
#, c-format
msgid ""
"You are about to remove the contact containing %s and %d other buddy from "
@@ -3561,223 +2403,225 @@ msgstr[0] ""
"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
"吗?"
-#: ../src/gtkdialogs.c:889
+#: ../gtk/gtkdialogs.c:997
msgid "Remove Contact"
msgstr "删除联系人"
-#: ../src/gtkdialogs.c:890
+#: ../gtk/gtkdialogs.c:998
msgid "_Remove Contact"
msgstr "删除联系人(_R)"
-#: ../src/gtkdialogs.c:941
+#: ../gtk/gtkdialogs.c:1049
#, c-format
msgid ""
"You are about to remove the group %s and all its members from your buddy "
"list. Do you want to continue?"
msgstr "您即将从您的好友列表中删除组 %s 及其所有成员。您真的要这么做吗?"
-#: ../src/gtkdialogs.c:944
+#: ../gtk/gtkdialogs.c:1052
msgid "Remove Group"
msgstr "删除组"
-#: ../src/gtkdialogs.c:945
+#: ../gtk/gtkdialogs.c:1053
msgid "_Remove Group"
msgstr "删除组(_R)"
-#: ../src/gtkdialogs.c:978
+#: ../gtk/gtkdialogs.c:1086
#, c-format
msgid ""
"You are about to remove %s from your buddy list. Do you want to continue?"
msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
-#: ../src/gtkdialogs.c:981
+#: ../gtk/gtkdialogs.c:1089
msgid "Remove Buddy"
msgstr "删除好友"
-#: ../src/gtkdialogs.c:982
+#: ../gtk/gtkdialogs.c:1090
msgid "_Remove Buddy"
msgstr "删除好友(_R)"
-#: ../src/gtkdialogs.c:1003
+#: ../gtk/gtkdialogs.c:1111
#, c-format
msgid ""
"You are about to remove the chat %s from your buddy list. Do you want to "
"continue?"
msgstr "您即将从您的好友列表中删除聊天 %s。您真的要这么做吗?"
-#: ../src/gtkdialogs.c:1006
+#: ../gtk/gtkdialogs.c:1114
msgid "Remove Chat"
msgstr "删除聊天"
-#: ../src/gtkdialogs.c:1007
+#: ../gtk/gtkdialogs.c:1115
msgid "_Remove Chat"
msgstr "删除聊天(_R)"
-#: ../src/gtkft.c:139
+#: ../gtk/gtkft.c:133
#, c-format
msgid "%.2f KB/s"
msgstr "%.2f KB/秒"
-#: ../src/gtkft.c:160 ../src/gtkft.c:1063
+#: ../gtk/gtkft.c:153
+msgid "Not started"
+msgstr "未开始"
+
+#: ../gtk/gtkft.c:159 ../libgaim/account.c:1675
+#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:636
+#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libgaim/protocols/jabber/buddy.c:1380
+#: ../libgaim/protocols/novell/novell.c:2864
+msgid "Unknown"
+msgstr "未知"
+
+#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1063
msgid "Finished"
msgstr "已完成"
-#: ../src/gtkft.c:163 ../src/gtkft.c:1003
+#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1003
msgid "Canceled"
msgstr "已取消"
-#: ../src/gtkft.c:166 ../src/gtkft.c:922
+#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:922
msgid "Waiting for transfer to begin"
msgstr "正在传送开始"
-#: ../src/gtkft.c:219
+#: ../gtk/gtkft.c:221
msgid "<b>Receiving As:</b>"
msgstr "<b>接收为:</b>"
-#: ../src/gtkft.c:221
+#: ../gtk/gtkft.c:223
msgid "<b>Receiving From:</b>"
msgstr "<b>发送方:</b>"
-#: ../src/gtkft.c:225
+#: ../gtk/gtkft.c:227
msgid "<b>Sending To:</b>"
msgstr "<b>接收方:</b>"
-#: ../src/gtkft.c:227
+#: ../gtk/gtkft.c:229
msgid "<b>Sending As:</b>"
msgstr "<b>发送为:</b>"
-#: ../src/gtkft.c:443
+#: ../gtk/gtkft.c:445
msgid "There is no application configured to open this type of file."
msgstr "没有配置可打开此类型文件的应用程序。"
-#: ../src/gtkft.c:448
+#: ../gtk/gtkft.c:450
msgid "An error occurred while opening the file."
msgstr "打开文件时发生了错误。"
-#: ../src/gtkft.c:485
+#: ../gtk/gtkft.c:487
#, c-format
msgid "Error launching %s: %s"
msgstr "调用 %s 出错:%s"
-#: ../src/gtkft.c:494
+#: ../gtk/gtkft.c:496
#, c-format
msgid "Error running %s"
msgstr "运行 %s 出错"
-#: ../src/gtkft.c:495
+#: ../gtk/gtkft.c:497
#, c-format
msgid "Process returned error code %d"
msgstr "进程返回了错误代码 %d"
-#: ../src/gtkft.c:589
+#: ../gtk/gtkft.c:591
msgid "Progress"
msgstr "进度"
-#: ../src/gtkft.c:596
+#: ../gtk/gtkft.c:598
msgid "Filename"
msgstr "文件名"
-#: ../src/gtkft.c:603
+#: ../gtk/gtkft.c:605
msgid "Size"
msgstr "大小"
-#: ../src/gtkft.c:610
+#: ../gtk/gtkft.c:612
msgid "Remaining"
msgstr "剩余"
-#: ../src/gtkft.c:641
+#: ../gtk/gtkft.c:643
msgid "Filename:"
msgstr "文件名:"
-#: ../src/gtkft.c:642
+#: ../gtk/gtkft.c:644
msgid "Local File:"
msgstr "本地文件:"
-#: ../src/gtkft.c:643
-msgid "Status:"
-msgstr "状态:"
-
-#: ../src/gtkft.c:644
+#: ../gtk/gtkft.c:646
msgid "Speed:"
msgstr "速度:"
-#: ../src/gtkft.c:645
+#: ../gtk/gtkft.c:647
msgid "Time Elapsed:"
msgstr "已过时间:"
-#: ../src/gtkft.c:646
+#: ../gtk/gtkft.c:648
msgid "Time Remaining:"
msgstr "剩余时间:"
-#: ../src/gtkft.c:708
+#: ../gtk/gtkft.c:710
msgid "File Transfers"
msgstr "文件传送"
-#: ../src/gtkft.c:731
+#: ../gtk/gtkft.c:733
msgid "Close this window when all transfers _finish"
msgstr "全部传送完成时关闭此窗口(_F)"
-#: ../src/gtkft.c:741
+#: ../gtk/gtkft.c:743
msgid "C_lear finished transfers"
msgstr "清除未完成的传送(_L)"
#. "Download Details" arrow
-#: ../src/gtkft.c:750
+#: ../gtk/gtkft.c:752
msgid "File transfer _details"
msgstr "文件传送细节(_D)"
-#. Pause button
-#: ../src/gtkft.c:780 ../src/gtkstock.c:146
-msgid "_Pause"
-msgstr "暂停(_P)"
-
#. Resume button
-#: ../src/gtkft.c:790
+#: ../gtk/gtkft.c:792
msgid "_Resume"
msgstr "继续(_R)"
-#: ../src/gtkft.c:1005
+#: ../gtk/gtkft.c:1005
msgid "Failed"
msgstr "已失败"
-#: ../src/gtkimhtml.c:821
+#: ../gtk/gtkimhtml.c:814
msgid "Paste as Plain _Text"
msgstr "粘贴为纯文本(_T)"
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "清除格式"
+#: ../gtk/gtkimhtml.c:826
+msgid "_Reset formatting"
+msgstr "重置格式(_R)"
-#: ../src/gtkimhtml.c:1328
+#: ../gtk/gtkimhtml.c:1318
msgid "Hyperlink color"
msgstr "超级链接颜色"
-#: ../src/gtkimhtml.c:1329
+#: ../gtk/gtkimhtml.c:1319
msgid "Color to draw hyperlinks."
msgstr "绘制超级链接的颜色。"
-#: ../src/gtkimhtml.c:1332
+#: ../gtk/gtkimhtml.c:1322
msgid "Hyperlink prelight color"
msgstr "超级链接悬停颜色"
-#: ../src/gtkimhtml.c:1333
+#: ../gtk/gtkimhtml.c:1323
msgid "Color to draw hyperlinks when mouse is over them."
msgstr "绘制超级链接悬停时的颜色。"
-#: ../src/gtkimhtml.c:1554
+#: ../gtk/gtkimhtml.c:1544
msgid "_Copy E-Mail Address"
msgstr "复制电子邮件地址(_C)"
-#: ../src/gtkimhtml.c:1566
+#: ../gtk/gtkimhtml.c:1556
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
-#: ../src/gtkimhtml.c:1576
+#: ../gtk/gtkimhtml.c:1566
msgid "_Copy Link Location"
msgstr "复制链接地址(_C)"
-#: ../src/gtkimhtml.c:3273
+#: ../gtk/gtkimhtml.c:3291
msgid ""
"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
"\n"
@@ -3787,7 +2631,7 @@ msgstr ""
"\n"
"默认为 PNG。"
-#: ../src/gtkimhtml.c:3276
+#: ../gtk/gtkimhtml.c:3294
msgid ""
"Unrecognized file type\n"
"\n"
@@ -3797,7 +2641,7 @@ msgstr ""
"\n"
"默认为 PNG。"
-#: ../src/gtkimhtml.c:3289
+#: ../gtk/gtkimhtml.c:3307
#, c-format
msgid ""
"<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3808,7 +2652,7 @@ msgstr ""
"\n"
"%s"
-#: ../src/gtkimhtml.c:3292
+#: ../gtk/gtkimhtml.c:3310
#, c-format
msgid ""
"Error saving image\n"
@@ -3819,173 +2663,177 @@ msgstr ""
"\n"
"%s"
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
+#: ../gtk/gtkimhtml.c:3390 ../gtk/gtkimhtml.c:3402
msgid "Save Image"
msgstr "保存图像"
-#: ../src/gtkimhtml.c:3412
+#: ../gtk/gtkimhtml.c:3430
msgid "_Save Image..."
msgstr "保存图像(_S)..."
-#: ../src/gtkimhtmltoolbar.c:147
+#: ../gtk/gtkimhtmltoolbar.c:147
msgid "Select Font"
msgstr "选择字体"
-#: ../src/gtkimhtmltoolbar.c:226
+#: ../gtk/gtkimhtmltoolbar.c:226
msgid "Select Text Color"
msgstr "选择文字颜色"
-#: ../src/gtkimhtmltoolbar.c:305
+#: ../gtk/gtkimhtmltoolbar.c:305
msgid "Select Background Color"
msgstr "选择背景颜色"
-#: ../src/gtkimhtmltoolbar.c:394
+#: ../gtk/gtkimhtmltoolbar.c:394
msgid "_URL"
msgstr "_URL"
-#: ../src/gtkimhtmltoolbar.c:402
+#: ../gtk/gtkimhtmltoolbar.c:402
msgid "_Description"
msgstr "描述(_D)"
-#: ../src/gtkimhtmltoolbar.c:405
+#: ../gtk/gtkimhtmltoolbar.c:405
msgid ""
"Please enter the URL and description of the link that you want to insert. "
"The description is optional."
msgstr "请输入您想要插入的 URL 和链接描述。描述是可选的。"
-#: ../src/gtkimhtmltoolbar.c:409
+#: ../gtk/gtkimhtmltoolbar.c:409
msgid "Please enter the URL of the link that you want to insert."
msgstr "请输入您想要插入链接的 URL。"
-#: ../src/gtkimhtmltoolbar.c:414
+#: ../gtk/gtkimhtmltoolbar.c:414
msgid "Insert Link"
msgstr "插入链接"
-#: ../src/gtkimhtmltoolbar.c:418
+#: ../gtk/gtkimhtmltoolbar.c:418
msgid "_Insert"
msgstr "插入(_I)"
-#: ../src/gtkimhtmltoolbar.c:487
+#: ../gtk/gtkimhtmltoolbar.c:487
#, c-format
msgid "Failed to store image: %s\n"
msgstr "存储图像失败:%s\n"
-#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
+#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
msgid "Insert Image"
msgstr "插入图像"
-#: ../src/gtkimhtmltoolbar.c:721
+#: ../gtk/gtkimhtmltoolbar.c:721
msgid "This theme has no available smileys."
msgstr "此主题没有可用的笑脸。"
#. show everything
-#: ../src/gtkimhtmltoolbar.c:735
+#: ../gtk/gtkimhtmltoolbar.c:735
msgid "Smile!"
msgstr "笑脸"
-#: ../src/gtkimhtmltoolbar.c:923
+#: ../gtk/gtkimhtmltoolbar.c:922
msgid "Bold"
msgstr "粗体"
-#: ../src/gtkimhtmltoolbar.c:934
+#: ../gtk/gtkimhtmltoolbar.c:933
msgid "Italic"
msgstr "斜体"
-#: ../src/gtkimhtmltoolbar.c:945
+#: ../gtk/gtkimhtmltoolbar.c:944
msgid "Underline"
msgstr "下划线"
-#: ../src/gtkimhtmltoolbar.c:961
+#: ../gtk/gtkimhtmltoolbar.c:960
msgid "Larger font size"
msgstr "较大字体"
-#: ../src/gtkimhtmltoolbar.c:973
+#: ../gtk/gtkimhtmltoolbar.c:972
msgid "Smaller font size"
msgstr "较小字体"
-#: ../src/gtkimhtmltoolbar.c:990
+#: ../gtk/gtkimhtmltoolbar.c:989
msgid "Font Face"
msgstr "字体"
-#: ../src/gtkimhtmltoolbar.c:1002
+#: ../gtk/gtkimhtmltoolbar.c:1001
msgid "Foreground font color"
msgstr "字体颜色"
-#: ../src/gtkimhtmltoolbar.c:1014
+#: ../gtk/gtkimhtmltoolbar.c:1013
msgid "Background color"
msgstr "背景颜色"
-#: ../src/gtkimhtmltoolbar.c:1045
+#: ../gtk/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "重置格式"
+
+#: ../gtk/gtkimhtmltoolbar.c:1044
msgid "Insert link"
msgstr "插入链接"
-#: ../src/gtkimhtmltoolbar.c:1055
+#: ../gtk/gtkimhtmltoolbar.c:1054
msgid "Insert image"
msgstr "插入图像"
-#: ../src/gtkimhtmltoolbar.c:1066
+#: ../gtk/gtkimhtmltoolbar.c:1065
msgid "Insert smiley"
msgstr "插入笑脸"
-#: ../src/gtklog.c:188
+#: ../gtk/gtklog.c:238
#, c-format
msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
msgstr "<span size='larger' weight='bold'>于 %2$s 在 %1$s 的对话</span>"
-#: ../src/gtklog.c:193
+#: ../gtk/gtklog.c:243
#, c-format
msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
msgstr "<span size='larger' weight='bold'>在 %2$s 与 %1$s 的对话</span>"
-#: ../src/gtklog.c:242
+#: ../gtk/gtklog.c:292
msgid "%B %Y"
msgstr ""
-#: ../src/gtklog.c:295
+#: ../gtk/gtklog.c:339
msgid ""
"System events will only be logged if the \"Log all status changes to system "
"log\" preference is enabled."
msgstr "仅当启用了“将全部状态更改记录到系统日志”首选项时才会记录系统日志。"
-#: ../src/gtklog.c:299
+#: ../gtk/gtklog.c:343
msgid ""
"Instant messages will only be logged if the \"Log all instant messages\" "
"preference is enabled."
msgstr "仅当启用了“记录全部即时消息”时才会记录即时消息。"
-#: ../src/gtklog.c:302
+#: ../gtk/gtklog.c:346
msgid ""
"Chats will only be logged if the \"Log all chats\" preference is enabled."
msgstr "仅当启用了“记录所有聊天”首选项时才会记录聊天。"
-#: ../src/gtklog.c:306
+#: ../gtk/gtklog.c:350
msgid "No logs were found"
msgstr "未找到日志。"
-#: ../src/gtklog.c:382
+#: ../gtk/gtklog.c:429
msgid "Total log size:"
msgstr "总计日志大小:"
-#: ../src/gtklog.c:458
+#: ../gtk/gtklog.c:495
#, c-format
msgid "Conversations in %s"
msgstr "与 %s 的对话"
-#: ../src/gtklog.c:466 ../src/gtklog.c:517
+#: ../gtk/gtklog.c:503 ../gtk/gtklog.c:554
#, c-format
msgid "Conversations with %s"
msgstr "与 %s 的对话"
-#: ../src/gtklog.c:542
+#: ../gtk/gtklog.c:579
msgid "System Log"
msgstr "系统日志"
-#: ../src/gtkmain.c:308
+#: ../gtk/gtkmain.c:307
#, c-format
msgid "Gaim %s. Try `%s -h' for more information.\n"
msgstr "Gaim %s。试试“%s -h”查看帮助。\n"
-#: ../src/gtkmain.c:310
+#: ../gtk/gtkmain.c:309
#, c-format
msgid ""
"Gaim %s\n"
@@ -4009,7 +2857,7 @@ msgstr ""
" -l, --login[=名称] 自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
" -v, --version 显示当前版本并退出\n"
-#: ../src/gtkmain.c:493
+#: ../gtk/gtkmain.c:493
#, c-format
msgid ""
"Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4031,34 +2879,21 @@ msgid ""
"%scontactinfo.php\n"
msgstr ""
-#: ../src/gtknotify.c:327
-msgid "New Mail"
-msgstr "新邮件"
-
-#: ../src/gtknotify.c:343
+#: ../gtk/gtknotify.c:352
msgid "Open All Messages"
msgstr "打开全部消息"
-#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1114
-msgid "From"
-msgstr "来自"
-
-#: ../src/gtknotify.c:418
-msgid "Subject"
-msgstr "主题"
-
-#: ../src/gtknotify.c:427
+#: ../gtk/gtknotify.c:436
msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
-#: ../src/gtknotify.c:493
+#: ../gtk/gtknotify.c:502
#, c-format
msgid "%s has %d new message."
msgid_plural "%s has %d new messages."
msgstr[0] "%s 有 %d 封新邮件。"
-#: ../src/gtknotify.c:498
+#: ../gtk/gtknotify.c:507
#, c-format
msgid ""
"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4069,52 +2904,43 @@ msgstr ""
"\n"
"%s"
-#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
+#: ../gtk/gtknotify.c:696 ../libgaim/protocols/sametime/sametime.c:5459
msgid "Search Results"
msgstr "搜索结果"
-#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
-#, c-format
-msgid "Info for %s"
-msgstr "%s 的信息"
-
-#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
-msgid "Buddy Information"
-msgstr "好友信息"
-
-#: ../src/gtknotify.c:882
+#: ../gtk/gtknotify.c:894
#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "浏览器命令 <b>%s</b> 无效。"
+msgid "The browser command \"%s\" is invalid."
+msgstr "浏览器命令“%s”无效。"
-#: ../src/gtknotify.c:884 ../src/gtknotify.c:896 ../src/gtknotify.c:909
-#: ../src/gtknotify.c:1034
+#: ../gtk/gtknotify.c:896 ../gtk/gtknotify.c:908 ../gtk/gtknotify.c:921
+#: ../gtk/gtknotify.c:1044
msgid "Unable to open URL"
msgstr "无法打开 URL"
-#: ../src/gtknotify.c:894 ../src/gtknotify.c:907
+#: ../gtk/gtknotify.c:906 ../gtk/gtknotify.c:919
#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "调用 <b>%s</b> 出错: %s"
+msgid "Error launching \"%s\": %s"
+msgstr "调用“%s”出错:%s"
-#: ../src/gtknotify.c:1035
+#: ../gtk/gtknotify.c:1045
msgid ""
"The 'Manual' browser command has been chosen, but no command has been set."
msgstr "选择了“手动”浏览器命令,但未设置命令。"
-#: ../src/gtkplugin.c:274
+#: ../gtk/gtkplugin.c:274
msgid "The following plugins will be unloaded."
msgstr "下列插件将会被卸载。"
-#: ../src/gtkplugin.c:293
+#: ../gtk/gtkplugin.c:293
msgid "Multiple plugins will be unloaded."
msgstr "多个插件将会被卸载。"
-#: ../src/gtkplugin.c:295
+#: ../gtk/gtkplugin.c:295
msgid "Unload Plugins"
msgstr "卸载插件"
-#: ../src/gtkplugin.c:407
+#: ../gtk/gtkplugin.c:407
#, c-format
msgid ""
"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4125,420 +2951,450 @@ msgstr ""
"<span weight=\"bold\">网站:</span>\t\t%s\n"
"<span weight=\"bold\">文件名:</span>\t%s"
-#: ../src/gtkplugin.c:417
+#: ../gtk/gtkplugin.c:417
#, c-format
msgid ""
"%s\n"
"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
"Check the plugin website for an update.</span>"
msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">错误:%s\n"
+"请检查插件网站中的更新。</span>"
-#: ../src/gtkplugin.c:543
+#: ../gtk/gtkplugin.c:543
msgid "Configure Pl_ugin"
msgstr "配置插件(_U)"
-#: ../src/gtkplugin.c:601
+#: ../gtk/gtkplugin.c:603
msgid "<b>Plugin Details</b>"
msgstr "<b>插件细节</b>"
-#: ../src/gtkpounce.c:162
+#: ../gtk/gtkpounce.c:155
msgid "Select a file"
msgstr "选择文件"
-#: ../src/gtkpounce.c:259
+#: ../gtk/gtkpounce.c:252
msgid "Please enter a buddy to pounce."
msgstr "请输入要监视的好友。"
-#: ../src/gtkpounce.c:503
+#: ../gtk/gtkpounce.c:499
msgid "New Buddy Pounce"
msgstr "新建好友千里眼"
-#: ../src/gtkpounce.c:503
+#: ../gtk/gtkpounce.c:499
msgid "Edit Buddy Pounce"
msgstr "编辑好友千里眼"
#. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../gtk/gtkpounce.c:516
msgid "Pounce on Whom"
msgstr "监视对象"
-#: ../src/gtkpounce.c:547
+#: ../gtk/gtkpounce.c:543
msgid "_Buddy name:"
msgstr "好友名称(_B):"
#. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:573
+#: ../gtk/gtkpounce.c:569
msgid "Pounce When Buddy..."
msgstr "监视好友的行动..."
-#: ../src/gtkpounce.c:581
+#: ../gtk/gtkpounce.c:577
msgid "Si_gns on"
msgstr "登入(_G)"
-#: ../src/gtkpounce.c:583
+#: ../gtk/gtkpounce.c:579
msgid "Signs o_ff"
msgstr "登出(_F)"
-#: ../src/gtkpounce.c:585
+#: ../gtk/gtkpounce.c:581
msgid "Goes a_way"
msgstr "离开(_W)"
-#: ../src/gtkpounce.c:587
+#: ../gtk/gtkpounce.c:583
msgid "Ret_urns from away"
msgstr "回来(_U)"
-#: ../src/gtkpounce.c:589
+#: ../gtk/gtkpounce.c:585
msgid "Becomes _idle"
msgstr "发起了呆(_I)"
-#: ../src/gtkpounce.c:591
+#: ../gtk/gtkpounce.c:587
msgid "Is no longer i_dle"
msgstr "发完了呆(_D)"
-#: ../src/gtkpounce.c:593
+#: ../gtk/gtkpounce.c:589
msgid "Starts _typing"
msgstr "开始打字(_T)"
-#: ../src/gtkpounce.c:595
+#: ../gtk/gtkpounce.c:591
+msgid "P_auses while typing"
+msgstr "输入时暂停(_A)"
+
+#: ../gtk/gtkpounce.c:593
msgid "Stops t_yping"
msgstr "停止打字(_Y)"
-#: ../src/gtkpounce.c:597
+#: ../gtk/gtkpounce.c:595
msgid "Sends a _message"
msgstr "发送消息(_M)"
#. Create the "Action" frame.
-#: ../src/gtkpounce.c:629
+#: ../gtk/gtkpounce.c:630
msgid "Action"
msgstr "动作"
-#: ../src/gtkpounce.c:637
+#: ../gtk/gtkpounce.c:638
msgid "Ope_n an IM window"
msgstr "打开即时消息窗口(_N)"
-#: ../src/gtkpounce.c:639
+#: ../gtk/gtkpounce.c:640
msgid "_Pop up a notification"
msgstr "弹出通知(_P)"
-#: ../src/gtkpounce.c:641
+#: ../gtk/gtkpounce.c:642
msgid "Send a _message"
msgstr "发送消息(_M)"
-#: ../src/gtkpounce.c:643
+#: ../gtk/gtkpounce.c:644
msgid "E_xecute a command"
msgstr "执行命令(_X)"
-#: ../src/gtkpounce.c:645
+#: ../gtk/gtkpounce.c:646
msgid "P_lay a sound"
msgstr "播放声音(_L)"
-#: ../src/gtkpounce.c:650
+#: ../gtk/gtkpounce.c:651
msgid "Brows_e..."
msgstr "浏览(_E)..."
-#: ../src/gtkpounce.c:652
+#: ../gtk/gtkpounce.c:653
msgid "Br_owse..."
msgstr "浏览(_O)..."
-#: ../src/gtkpounce.c:653
+#: ../gtk/gtkpounce.c:654
msgid "Pre_view"
msgstr "预览(_V)"
#. Create the "Options" frame.
-#: ../src/gtkpounce.c:765
+#: ../gtk/gtkpounce.c:766
msgid "Options"
msgstr "选项"
-#: ../src/gtkpounce.c:773
+#: ../gtk/gtkpounce.c:774
msgid "P_ounce only when my status is not available"
msgstr "仅当我的状态不可用时才监视(_O)"
-#: ../src/gtkpounce.c:778
+#: ../gtk/gtkpounce.c:779
msgid "_Recurring"
msgstr "再现(_R)"
-#: ../src/gtkpounce.c:1092
+#: ../gtk/gtkpounce.c:1085
#, fuzzy, c-format
msgid "Are you sure you want to delete the pounce on %s for %s?"
msgstr "您真的想要删除 %s 吗?"
-#: ../src/gtkpounce.c:1240
+#: ../gtk/gtkpounce.c:1233
msgid "Pounce Target"
msgstr "监视目标"
-#: ../src/gtkpounce.c:1275
+#: ../gtk/gtkpounce.c:1268
msgid "Recurring"
msgstr "在线"
-#: ../src/gtkpounce.c:1322
+#: ../gtk/gtkpounce.c:1315
msgid "Buddy Pounces"
msgstr "好友千里眼"
-#: ../src/gtkpounce.c:1449
+#: ../gtk/gtkpounce.c:1442
#, c-format
msgid "%s has started typing to you (%s)"
msgstr "%s 开始向您打字(%s)"
-#: ../src/gtkpounce.c:1451
+#: ../gtk/gtkpounce.c:1444
+#, fuzzy, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s 开始向您打字(%s)"
+
+#: ../gtk/gtkpounce.c:1446
#, c-format
msgid "%s has signed on (%s)"
msgstr "%s 已登入(%s)"
-#: ../src/gtkpounce.c:1453
+#: ../gtk/gtkpounce.c:1448
#, c-format
msgid "%s has returned from being idle (%s)"
msgstr "%s 发完呆了(%s)"
-#: ../src/gtkpounce.c:1455
+#: ../gtk/gtkpounce.c:1450
#, c-format
msgid "%s has returned from being away (%s)"
msgstr "%s 回来了(%s)"
-#: ../src/gtkpounce.c:1457
+#: ../gtk/gtkpounce.c:1452
#, c-format
msgid "%s has stopped typing to you (%s)"
msgstr "%s 停止了给您打字(%s)"
-#: ../src/gtkpounce.c:1459
+#: ../gtk/gtkpounce.c:1454
#, c-format
msgid "%s has signed off (%s)"
msgstr "%s 已登出(%s)"
-#: ../src/gtkpounce.c:1461
+#: ../gtk/gtkpounce.c:1456
#, c-format
msgid "%s has become idle (%s)"
msgstr "%s 发起了呆(%s)"
-#: ../src/gtkpounce.c:1463
+#: ../gtk/gtkpounce.c:1458
#, c-format
msgid "%s has gone away. (%s)"
msgstr "%s 走了。(%s)"
-#: ../src/gtkpounce.c:1465
+#: ../gtk/gtkpounce.c:1460
#, c-format
msgid "%s has sent you a message. (%s)"
msgstr "%s 给您发送了消息。(%s)"
-#: ../src/gtkpounce.c:1466
+#: ../gtk/gtkpounce.c:1461
msgid "Unknown pounce event. Please report this!"
msgstr "未知的千里眼。请报告此错误!"
-#: ../src/gtkprefs.c:512
+#: ../gtk/gtkprefs.c:516
msgid "Smiley theme failed to unpack."
msgstr "表情主题解包失败。"
-#: ../src/gtkprefs.c:638
+#: ../gtk/gtkprefs.c:642
msgid ""
"Select a smiley theme that you would like to use from the list below. New "
"themes can be installed by dragging and dropping them onto the theme list."
msgstr "请从下面选择您要使用的笑脸主题。将主题拖曳到主题列表即可安装新主题。"
-#: ../src/gtkprefs.c:673
+#: ../gtk/gtkprefs.c:677
msgid "Icon"
msgstr "图标"
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
+#: ../gtk/gtkprefs.c:684 ../libgaim/protocols/jabber/buddy.c:286
+#: ../libgaim/protocols/jabber/buddy.c:927
+#: ../libgaim/protocols/jabber/chat.c:767
msgid "Description"
msgstr "描述"
-#: ../src/gtkprefs.c:821
+#: ../gtk/gtkprefs.c:825
msgid "_Hide new IM conversations"
msgstr "隐藏新的 IM 对话(_H)"
-#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1764
+#: ../gtk/gtkprefs.c:827 ../gtk/gtkprefs.c:1768 ../gtk/gtkprefs.c:1782
+#: ../gtk/plugins/docklet/docklet.c:684 ../gtk/plugins/docklet/docklet.c:692
+#: ../gtk/plugins/win32/winprefs/winprefs.c:458
+msgid "Never"
+msgstr "从不"
+
+#: ../gtk/gtkprefs.c:828 ../gtk/gtkprefs.c:1783
msgid "When away"
msgstr "离开时"
-#: ../src/gtkprefs.c:828
+#: ../gtk/gtkprefs.c:829 ../gtk/plugins/docklet/docklet.c:686
+#: ../gtk/plugins/docklet/docklet.c:694 ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/plugins/win32/winprefs/winprefs.c:459
+msgid "Always"
+msgstr "总是"
+
+#: ../gtk/gtkprefs.c:832
msgid "Send unknown \"_slash\" commands as messages"
msgstr "将未知的斜线命令发送为消息(_S)"
-#: ../src/gtkprefs.c:830
+#: ../gtk/gtkprefs.c:834
msgid "Show _formatting on incoming messages"
msgstr "收到的消息显示格式(_F)"
-#: ../src/gtkprefs.c:833
+#: ../gtk/gtkprefs.c:837
msgid "Show buddy _icons"
msgstr "显示好友图标(_I)"
-#: ../src/gtkprefs.c:835
+#: ../gtk/gtkprefs.c:839
msgid "Enable buddy ic_on animation"
msgstr "启用好友图标动画(_O)"
-#: ../src/gtkprefs.c:842
+#: ../gtk/gtkprefs.c:846
msgid "_Notify buddies that you are typing to them"
msgstr "提醒好友您正在打字给他们(_N)"
-#: ../src/gtkprefs.c:845
+#: ../gtk/gtkprefs.c:849
msgid "Highlight _misspelled words"
msgstr "突出显示拼错的单词(_M)"
-#: ../src/gtkprefs.c:849
+#: ../gtk/gtkprefs.c:853
msgid "Use smooth-scrolling"
msgstr "使用平滑滚动"
-#: ../src/gtkprefs.c:865
+#: ../gtk/gtkprefs.c:869
msgid ""
"This is how your outgoing message text will appear when you use protocols "
"that support formatting. :)"
msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
#. All the tab options!
-#: ../src/gtkprefs.c:887
+#: ../gtk/gtkprefs.c:891
msgid "Tab Options"
msgstr "标签选项"
-#: ../src/gtkprefs.c:889
+#: ../gtk/gtkprefs.c:893
msgid "Show IMs and chats in _tabbed windows"
msgstr "在同一标签窗口内显示即时消息和聊天(_T)"
-#: ../src/gtkprefs.c:903
+#: ../gtk/gtkprefs.c:907
msgid "Show close b_utton on tabs"
msgstr "在标签上显示关闭按钮(_U)"
-#: ../src/gtkprefs.c:909
+#: ../gtk/gtkprefs.c:913
msgid "_Placement:"
msgstr "放置(_P):"
-#: ../src/gtkprefs.c:911
+#: ../gtk/gtkprefs.c:915
msgid "Top"
msgstr "上"
-#: ../src/gtkprefs.c:912
+#: ../gtk/gtkprefs.c:916
msgid "Bottom"
msgstr "下"
-#: ../src/gtkprefs.c:913
+#: ../gtk/gtkprefs.c:917
msgid "Left"
msgstr "左"
-#: ../src/gtkprefs.c:914
+#: ../gtk/gtkprefs.c:918
msgid "Right"
msgstr "右"
-#: ../src/gtkprefs.c:916
+#: ../gtk/gtkprefs.c:920
msgid "Left Vertical"
msgstr ""
-#: ../src/gtkprefs.c:917
+#: ../gtk/gtkprefs.c:921
msgid "Right Vertical"
msgstr ""
-#: ../src/gtkprefs.c:922
+#: ../gtk/gtkprefs.c:926
msgid "N_ew conversations:"
msgstr "新建对话(_E):"
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:869
-#: ../src/protocols/oscar/oscar.c:6172
+#: ../gtk/gtkprefs.c:977 ../libgaim/protocols/oscar/oscar.c:780
+#: ../libgaim/protocols/oscar/oscar.c:3608
msgid "IP Address"
msgstr "IP 地址"
-#: ../src/gtkprefs.c:975
+#: ../gtk/gtkprefs.c:979
msgid "ST_UN server:"
msgstr "STUN 服务器(_U):"
-#: ../src/gtkprefs.c:977
+#: ../gtk/gtkprefs.c:991
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">例:stunserver.org</span>"
+
+#: ../gtk/gtkprefs.c:995
msgid "_Autodetect IP address"
msgstr "自动检测 IP 地址(_A)"
-#: ../src/gtkprefs.c:986
+#: ../gtk/gtkprefs.c:1004
msgid "Public _IP:"
msgstr "公网 _IP:"
-#: ../src/gtkprefs.c:1014
+#: ../gtk/gtkprefs.c:1033
msgid "Ports"
msgstr "端口"
-#: ../src/gtkprefs.c:1017
+#: ../gtk/gtkprefs.c:1036
msgid "_Manually specify range of ports to listen on"
msgstr "手动指定要监听的端口范围(_M)"
-#: ../src/gtkprefs.c:1020
+#: ../gtk/gtkprefs.c:1039
msgid "_Start port:"
msgstr "起始端口(_S):"
-#: ../src/gtkprefs.c:1027
+#: ../gtk/gtkprefs.c:1046
msgid "_End port:"
msgstr "终止端口(_E):"
-#: ../src/gtkprefs.c:1035
+#: ../gtk/gtkprefs.c:1054
msgid "Proxy Server"
msgstr "代理服务器"
-#: ../src/gtkprefs.c:1039
+#: ../gtk/gtkprefs.c:1058
msgid "No proxy"
msgstr "无代理"
-#: ../src/gtkprefs.c:1095
+#: ../gtk/gtkprefs.c:1114
msgid "_User:"
msgstr "用户(_U):"
-#: ../src/gtkprefs.c:1157
+#: ../gtk/gtkprefs.c:1176
msgid "Epiphany"
msgstr "Epiphany"
-#: ../src/gtkprefs.c:1158
+#: ../gtk/gtkprefs.c:1177
msgid "Firebird"
msgstr "Firebird"
-#: ../src/gtkprefs.c:1159
+#: ../gtk/gtkprefs.c:1178
msgid "Firefox"
msgstr "Firefox"
-#: ../src/gtkprefs.c:1160
+#: ../gtk/gtkprefs.c:1179
msgid "Galeon"
msgstr "Galeon"
-#: ../src/gtkprefs.c:1161
+#: ../gtk/gtkprefs.c:1180
msgid "GNOME Default"
msgstr "GNOME 默认"
-#: ../src/gtkprefs.c:1162
+#: ../gtk/gtkprefs.c:1181
msgid "Konqueror"
msgstr "Konqueror"
-#: ../src/gtkprefs.c:1163
+#: ../gtk/gtkprefs.c:1182
msgid "Mozilla"
msgstr "Mozilla"
-#: ../src/gtkprefs.c:1164
+#: ../gtk/gtkprefs.c:1183
msgid "Netscape"
msgstr "Netscape"
-#: ../src/gtkprefs.c:1165
+#: ../gtk/gtkprefs.c:1184
msgid "Opera"
msgstr "Opera"
-#: ../src/gtkprefs.c:1174
+#: ../gtk/gtkprefs.c:1193
msgid "Manual"
msgstr "手动"
-#: ../src/gtkprefs.c:1227
+#: ../gtk/gtkprefs.c:1246
msgid "Browser Selection"
msgstr "浏览器选择"
-#: ../src/gtkprefs.c:1231
+#: ../gtk/gtkprefs.c:1250
msgid "_Browser:"
msgstr "浏览器(_B):"
-#: ../src/gtkprefs.c:1239
+#: ../gtk/gtkprefs.c:1258
msgid "_Open link in:"
msgstr "打开链接的方式(_O):"
-#: ../src/gtkprefs.c:1241
+#: ../gtk/gtkprefs.c:1260
msgid "Browser default"
msgstr "浏览器默认"
-#: ../src/gtkprefs.c:1242
+#: ../gtk/gtkprefs.c:1261
msgid "Existing window"
msgstr "现有窗口"
-#: ../src/gtkprefs.c:1244
+#: ../gtk/gtkprefs.c:1263
msgid "New tab"
msgstr "新建标签"
-#: ../src/gtkprefs.c:1258
+#: ../gtk/gtkprefs.c:1277
#, c-format
msgid ""
"_Manual:\n"
@@ -4547,83 +3403,79 @@ msgstr ""
"手动(_M):\n"
"(%s 代表 URL)"
-#: ../src/gtkprefs.c:1294 ../src/gtkprefs.c:1875
-msgid "Logging"
-msgstr "日志"
-
-#: ../src/gtkprefs.c:1297
+#: ../gtk/gtkprefs.c:1316
msgid "Log _format:"
msgstr "日志格式(_F):"
-#: ../src/gtkprefs.c:1302
+#: ../gtk/gtkprefs.c:1321
msgid "Log all _instant messages"
msgstr "记录所有即时消息(_I)"
-#: ../src/gtkprefs.c:1304
+#: ../gtk/gtkprefs.c:1323
msgid "Log all c_hats"
msgstr "记录所有聊天(_H)"
-#: ../src/gtkprefs.c:1306
+#: ../gtk/gtkprefs.c:1325
msgid "Log all _status changes to system log"
-msgstr ""
+msgstr "将全部状态都记录到系统日志中(_S)"
-#: ../src/gtkprefs.c:1454
+#: ../gtk/gtkprefs.c:1473
msgid "Sound Selection"
msgstr "声音选择"
-#: ../src/gtkprefs.c:1462
+#: ../gtk/gtkprefs.c:1481
msgid "Quietest"
msgstr "最小"
-#: ../src/gtkprefs.c:1464
+#: ../gtk/gtkprefs.c:1483
msgid "Quieter"
msgstr "较小"
-#: ../src/gtkprefs.c:1466
+#: ../gtk/gtkprefs.c:1485
msgid "Quiet"
msgstr "小"
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
+#: ../gtk/gtkprefs.c:1487 ../libgaim/protocols/silc/silc.c:670
msgid "Normal"
msgstr "普通"
-#: ../src/gtkprefs.c:1470
+#: ../gtk/gtkprefs.c:1489
msgid "Loud"
msgstr "大"
-#: ../src/gtkprefs.c:1472
+#: ../gtk/gtkprefs.c:1491
msgid "Louder"
msgstr "较大"
-#: ../src/gtkprefs.c:1474
+#: ../gtk/gtkprefs.c:1493
msgid "Loudest"
msgstr "最大"
-#: ../src/gtkprefs.c:1537
+#: ../gtk/gtkprefs.c:1556
msgid "Sound Method"
msgstr "声音方式"
-#: ../src/gtkprefs.c:1538
+#: ../gtk/gtkprefs.c:1557
msgid "_Method:"
msgstr "方式(_M):"
-#: ../src/gtkprefs.c:1540
+#: ../gtk/gtkprefs.c:1559
msgid "Console beep"
msgstr "控制台响铃"
-#: ../src/gtkprefs.c:1542
+#: ../gtk/gtkprefs.c:1561
msgid "Automatic"
msgstr "自动"
-#: ../src/gtkprefs.c:1547
+#: ../gtk/gtkprefs.c:1566
msgid "Command"
msgstr "命令"
-#: ../src/gtkprefs.c:1548
+#: ../gtk/gtkprefs.c:1567
msgid "No sounds"
msgstr "无声音"
-#: ../src/gtkprefs.c:1556
+#: ../gtk/gtkprefs.c:1575
#, c-format
msgid ""
"Sound c_ommand:\n"
@@ -4632,487 +3484,447 @@ msgstr ""
"声音命令(_O):\n"
"(%s 代表文件名)"
-#: ../src/gtkprefs.c:1582
+#: ../gtk/gtkprefs.c:1601
msgid "Sound Options"
msgstr "声音选项"
-#: ../src/gtkprefs.c:1583
+#: ../gtk/gtkprefs.c:1602
msgid "Sounds when conversation has _focus"
msgstr "对话获得焦点后发声(_F)"
-#: ../src/gtkprefs.c:1585
+#: ../gtk/gtkprefs.c:1604
msgid "_Sounds while away"
msgstr "离开时发声(_S)"
-#: ../src/gtkprefs.c:1592
+#: ../gtk/gtkprefs.c:1611
msgid "Volume:"
msgstr "音量:"
-#: ../src/gtkprefs.c:1620
+#: ../gtk/gtkprefs.c:1639
msgid "Sound Events"
msgstr "声音事件"
-#: ../src/gtkprefs.c:1671
+#: ../gtk/gtkprefs.c:1690
msgid "Play"
msgstr "播放"
-#: ../src/gtkprefs.c:1678
+#: ../gtk/gtkprefs.c:1697
msgid "Event"
msgstr "事件"
-#: ../src/gtkprefs.c:1697
+#: ../gtk/gtkprefs.c:1716
msgid "Test"
msgstr "测试"
-#: ../src/gtkprefs.c:1701
+#: ../gtk/gtkprefs.c:1720
msgid "Reset"
msgstr "重置"
-#: ../src/gtkprefs.c:1705
+#: ../gtk/gtkprefs.c:1724
msgid "Choose..."
msgstr "选择..."
-#: ../src/gtkprefs.c:1747
+#: ../gtk/gtkprefs.c:1766
msgid "_Report idle time:"
msgstr "报告发呆时间(_R):"
-#: ../src/gtkprefs.c:1750
+#: ../gtk/gtkprefs.c:1769
msgid "From last sent message"
msgstr "根据上次发送的消息"
-#: ../src/gtkprefs.c:1752
+#: ../gtk/gtkprefs.c:1771
msgid "Based on keyboard or mouse use"
msgstr "根据键盘或鼠标使用"
-#: ../src/gtkprefs.c:1761
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../gtk/gtkprefs.c:1778 ../gtk/gtkstatusbox.c:807
+#: ../gtk/plugins/docklet/docklet.c:439 ../libgaim/protocols/gg/gg.c:999
+#: ../libgaim/protocols/irc/irc.c:511 ../libgaim/protocols/irc/msgs.c:223
+#: ../libgaim/protocols/jabber/buddy.c:1373
+#: ../libgaim/protocols/novell/novell.c:2852
+#: ../libgaim/protocols/oscar/oscar.c:695
+#: ../libgaim/protocols/oscar/oscar.c:4387
+#: ../libgaim/protocols/oscar/oscar.c:5451
+#: ../libgaim/protocols/silc/buddy.c:1469
+#: ../libgaim/protocols/yahoo/yahoo.c:3301
+#: ../libgaim/protocols/yahoo/yahoo.c:3377 ../libgaim/status.c:158
+msgid "Away"
+msgstr "离开"
+
+#: ../gtk/gtkprefs.c:1780
msgid "_Auto-reply:"
msgstr "自动回复(_A):"
-#: ../src/gtkprefs.c:1765
+#: ../gtk/gtkprefs.c:1784
msgid "When both away and idle"
msgstr "离开和发呆时"
#. Auto-away stuff
-#: ../src/gtkprefs.c:1771
+#: ../gtk/gtkprefs.c:1790
msgid "Auto-away"
msgstr "自动离开"
-#: ../src/gtkprefs.c:1773
+#: ../gtk/gtkprefs.c:1792
msgid "Change status when _idle"
msgstr "发呆时更改状态(_I)"
-#: ../src/gtkprefs.c:1777
+#: ../gtk/gtkprefs.c:1796
msgid "_Minutes before changing status:"
msgstr "更改状态前等几分钟(_M):"
-#: ../src/gtkprefs.c:1785
+#: ../gtk/gtkprefs.c:1804
msgid "Change _status to:"
msgstr "将状态更改为(_S):"
#. Signon status stuff
-#: ../src/gtkprefs.c:1806
-msgid "Status at startup"
+#: ../gtk/gtkprefs.c:1825
+msgid "Status at Startup"
msgstr "启动时的状态"
-#: ../src/gtkprefs.c:1808
+#: ../gtk/gtkprefs.c:1827
msgid "Use status from last _exit at startup"
msgstr "启动时使用上次退出时的状态(_E)"
-#: ../src/gtkprefs.c:1814
+#: ../gtk/gtkprefs.c:1833
msgid "Status to a_pply at startup:"
msgstr "启动时应用的状态(_P):"
-#: ../src/gtkprefs.c:1865
+#: ../gtk/gtkprefs.c:1884
msgid "Smiley Themes"
msgstr "笑脸主题"
-#: ../src/gtkprefs.c:1866
+#: ../gtk/gtkprefs.c:1885
msgid "Sounds"
msgstr "声音"
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
+#: ../gtk/gtkprefs.c:1886 ../libgaim/protocols/silc/silc.c:1850
msgid "Network"
msgstr "网络"
-#: ../src/gtkprefs.c:1872
+#: ../gtk/gtkprefs.c:1891
msgid "Browser"
msgstr "浏览器"
-#: ../src/gtkprefs.c:1876
+#: ../gtk/gtkprefs.c:1895
msgid "Away / Idle"
msgstr "离开/发呆"
-#: ../src/gtkprivacy.c:79
+#: ../gtk/gtkprivacy.c:79
msgid "Allow all users to contact me"
msgstr "允许所有用户联系我"
-#: ../src/gtkprivacy.c:80
+#: ../gtk/gtkprivacy.c:80
msgid "Allow only the users on my buddy list"
msgstr "只允许我的好友"
-#: ../src/gtkprivacy.c:81
+#: ../gtk/gtkprivacy.c:81
msgid "Allow only the users below"
msgstr "只允许以下用户"
-#: ../src/gtkprivacy.c:82
+#: ../gtk/gtkprivacy.c:82
msgid "Block all users"
msgstr "屏蔽全部用户"
-#: ../src/gtkprivacy.c:83
+#: ../gtk/gtkprivacy.c:83
msgid "Block only the users below"
msgstr "只屏蔽以下用户"
-#: ../src/gtkprivacy.c:372
+#: ../gtk/gtkprivacy.c:372
msgid "Privacy"
msgstr "隐私"
-#: ../src/gtkprivacy.c:385
+#: ../gtk/gtkprivacy.c:385
msgid "Changes to privacy settings take effect immediately."
msgstr "对隐私设置的更改将会立即生效。"
#. "Set privacy for:" label
-#: ../src/gtkprivacy.c:397
+#: ../gtk/gtkprivacy.c:397
msgid "Set privacy for:"
msgstr "设置隐私的账户:"
-#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
+#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
msgid "Permit User"
msgstr "允许用户"
-#: ../src/gtkprivacy.c:563
+#: ../gtk/gtkprivacy.c:561
msgid "Type a user you permit to contact you."
msgstr "输入允许联系您的用户。"
-#: ../src/gtkprivacy.c:564
+#: ../gtk/gtkprivacy.c:562
msgid "Please enter the name of the user you wish to be able to contact you."
msgstr "您想要允许哪个用户联系您,请输入他/它的名字。"
-#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
msgid "_Permit"
msgstr "允许(_P)"
-#: ../src/gtkprivacy.c:572
+#: ../gtk/gtkprivacy.c:570
#, c-format
msgid "Allow %s to contact you?"
msgstr "允许 %s 联系您吗?"
-#: ../src/gtkprivacy.c:574
+#: ../gtk/gtkprivacy.c:572
#, c-format
msgid "Are you sure you wish to allow %s to contact you?"
msgstr "您真的想要允许 %s 联系您吗?"
-#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
+#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
msgid "Block User"
msgstr "屏蔽用户"
-#: ../src/gtkprivacy.c:602
+#: ../gtk/gtkprivacy.c:600
msgid "Type a user to block."
msgstr "输入要屏蔽的用户。"
-#: ../src/gtkprivacy.c:603
+#: ../gtk/gtkprivacy.c:601
msgid "Please enter the name of the user you wish to block."
msgstr "请输入您想要屏蔽的用户名称。"
-#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
msgid "_Block"
msgstr "屏蔽(_B)"
-#: ../src/gtkprivacy.c:610
+#: ../gtk/gtkprivacy.c:608
#, c-format
msgid "Block %s?"
msgstr "屏蔽 %s 吗?"
-#: ../src/gtkprivacy.c:612
+#: ../gtk/gtkprivacy.c:610
#, c-format
msgid "Are you sure you want to block %s?"
msgstr "您真的想要屏蔽 %s 吗?"
-#: ../src/gtkrequest.c:269 ../src/protocols/msn/dialog.c:114
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
-#: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
+#. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
+#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1924
+#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
msgid "Yes"
msgstr "是"
-#: ../src/gtkrequest.c:270 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
-#: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
-#: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
+#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../libgaim/protocols/novell/novell.c:1925
+#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
msgid "No"
msgstr "否"
-#: ../src/gtkrequest.c:273
+#: ../gtk/gtkrequest.c:271
msgid "Apply"
msgstr "应用"
-#: ../src/gtkrequest.c:274 ../src/protocols/msn/msn.c:357
-#: ../src/protocols/silc/util.c:336
-msgid "Close"
-msgstr "关闭"
-
-#: ../src/gtkrequest.c:1469
+#: ../gtk/gtkrequest.c:1467
msgid "That file already exists"
msgstr "该文件已存在"
-#: ../src/gtkrequest.c:1470
+#: ../gtk/gtkrequest.c:1468
msgid "Would you like to overwrite it?"
msgstr "您是否想要覆盖?"
-#: ../src/gtkrequest.c:1514 ../src/gtkrequest.c:1555
+#: ../gtk/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: ../gtk/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "选择新名称"
+
+#: ../gtk/gtkrequest.c:1512 ../gtk/gtkrequest.c:1553
msgid "Save File..."
msgstr "保存文件..."
-#: ../src/gtkrequest.c:1515 ../src/gtkrequest.c:1556
+#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1554
msgid "Open File..."
msgstr "打开文件..."
-#: ../src/gtkroomlist.c:287
+#: ../gtk/gtkrequest.c:1601 ../gtk/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "选择文件夹..."
+
+#: ../gtk/gtkroomlist.c:287
msgid "_Add"
msgstr "添加(_A)"
-#: ../src/gtkroomlist.c:354
+#: ../gtk/gtkroomlist.c:354
msgid "Room List"
msgstr "房间列表"
#. list button
-#: ../src/gtkroomlist.c:424
+#: ../gtk/gtkroomlist.c:424
msgid "_Get List"
msgstr "获取列表(_G)"
#. add button
-#: ../src/gtkroomlist.c:432
+#: ../gtk/gtkroomlist.c:432
msgid "_Add Chat"
msgstr "添加聊天(_A)"
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
-msgid "Title"
-msgstr "标题"
-
-#: ../src/gtksavedstatuses.c:448
-msgid "Type"
-msgstr "类型"
-
-#. Available status messages are plain text
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
-#: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1417
-#: ../src/protocols/gg/gg.c:1427 ../src/protocols/gg/gg.c:1433
-#: ../src/protocols/gg/gg.c:1442 ../src/protocols/gg/gg.c:1447
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1181
-#: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
-#: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
-#: ../src/protocols/jabber/jabber.c:1233 ../src/protocols/novell/novell.c:2868
-#: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7795
-#: ../src/protocols/oscar/oscar.c:7810 ../src/protocols/oscar/oscar.c:7815
-#: ../src/protocols/oscar/oscar.c:8024 ../src/protocols/oscar/oscar.c:8036
-#: ../src/protocols/sametime/sametime.c:3274
-#: ../src/protocols/sametime/sametime.c:3280
-#: ../src/protocols/sametime/sametime.c:3286
-#: ../src/protocols/sametime/sametime.c:3365
-#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3280 ../src/protocols/yahoo/yahoo.c:3286
-#: ../src/protocols/zephyr/zephyr.c:2281
-msgid "Message"
-msgstr "消息"
-
-#: ../src/gtksavedstatuses.c:526
-msgid "Saved Statuses"
-msgstr "已存状态"
-
#. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1180
+#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
msgid "_Use"
msgstr "使用(_U)"
-#: ../src/gtksavedstatuses.c:695
+#: ../gtk/gtksavedstatuses.c:695
msgid "Title already in use. You must choose a unique title."
msgstr "标题已在使用中。您必须选择唯一的标题。"
-#: ../src/gtksavedstatuses.c:879
+#: ../gtk/gtksavedstatuses.c:883
msgid "Different"
msgstr "不同"
-#: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1400 ../src/protocols/gg/gg.c:1404
-#: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1152
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
-#: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
-#: ../src/protocols/yahoo/yahoo.c:2882
-msgid "Status"
-msgstr "状态"
-
-#: ../src/gtksavedstatuses.c:1073
+#: ../gtk/gtksavedstatuses.c:1076
msgid "_Title:"
msgstr "标题(_T):"
-#: ../src/gtksavedstatuses.c:1092 ../src/gtksavedstatuses.c:1413
+#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
msgid "_Status:"
msgstr "状态(_S):"
#. Different status message expander
-#: ../src/gtksavedstatuses.c:1124
+#: ../gtk/gtksavedstatuses.c:1127
msgid "Use a _different status for some accounts"
msgstr "为某些账户使用不同的状态(_D)"
#. Save & Use button
-#: ../src/gtksavedstatuses.c:1188
+#: ../gtk/gtksavedstatuses.c:1191
msgid "Sa_ve & Use"
msgstr "保存并使用(_V)"
-#: ../src/gtksavedstatuses.c:1394
+#: ../gtk/gtksavedstatuses.c:1397
#, c-format
msgid "Status for %s"
msgstr "%s 的状态"
-#: ../src/gtksound.c:61
+#: ../gtk/gtksound.c:63
msgid "Buddy logs in"
msgstr "好友登入"
-#: ../src/gtksound.c:62
+#: ../gtk/gtksound.c:64
msgid "Buddy logs out"
msgstr "好友登出"
-#: ../src/gtksound.c:63
+#: ../gtk/gtksound.c:65
msgid "Message received"
msgstr "消息已收到"
-#: ../src/gtksound.c:64
+#: ../gtk/gtksound.c:66
msgid "Message received begins conversation"
msgstr "收到的消息开始对话"
-#: ../src/gtksound.c:65
+#: ../gtk/gtksound.c:67
msgid "Message sent"
msgstr "消息已送出"
-#: ../src/gtksound.c:66
+#: ../gtk/gtksound.c:68
msgid "Person enters chat"
msgstr "有人进入聊天"
-#: ../src/gtksound.c:67
+#: ../gtk/gtksound.c:69
msgid "Person leaves chat"
msgstr "有人离开聊天"
-#: ../src/gtksound.c:68
+#: ../gtk/gtksound.c:70
msgid "You talk in chat"
msgstr "您在聊天中发言"
-#: ../src/gtksound.c:69
+#: ../gtk/gtksound.c:71
msgid "Others talk in chat"
msgstr "别人在聊天中发言"
-#: ../src/gtksound.c:72
-msgid "Someone says your name in chat"
+#: ../gtk/gtksound.c:74
+msgid "Someone says your screen name in chat"
msgstr "别人在聊天中提到您的名字"
-#: ../src/gtksound.c:489
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "无法播放声音,原因是所选的文件(%s)不存在。"
+#: ../gtk/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer 失败"
-#: ../src/gtksound.c:505
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr "无法播放声音,原因是选择了“命令”声音方法,但没有设置命令。"
-
-#: ../src/gtksound.c:517
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr "无法播放声音,原因是配置无法调用配置的声音命令: %s"
-
-#: ../src/gtkstatusbox.c:366
-msgid "Typing"
-msgstr "正打字"
+#: ../gtk/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer 初始化失败。"
#. connect to the server
-#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
-#: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
-#: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2572
-#: ../src/protocols/zephyr/zephyr.c:1565
+#: ../gtk/gtkstatusbox.c:501 ../libgaim/protocols/irc/irc.c:312
+#: ../libgaim/protocols/jabber/jabber.c:1000
+#: ../libgaim/protocols/msn/session.c:344
+#: ../libgaim/protocols/novell/novell.c:2186
+#: ../libgaim/protocols/oscar/oscar.c:1210 ../libgaim/protocols/qq/qq.c:134
+#: ../libgaim/protocols/sametime/sametime.c:3682
+#: ../libgaim/protocols/simple/simple.c:1667
+#: ../libgaim/protocols/yahoo/yahoo.c:2664
+#: ../libgaim/protocols/zephyr/zephyr.c:1565
msgid "Connecting"
msgstr "正连接"
-#: ../src/gtkstock.c:138
-msgid "_Alias"
-msgstr "别名(_A)"
-
-#: ../src/gtkstock.c:140
-msgid "Close _tabs"
-msgstr "关闭标签(_T)"
-
-#: ../src/gtkstock.c:142
-msgid "_Get Info"
-msgstr "获得信息(_G)"
-
-#: ../src/gtkstock.c:143
-msgid "_Invite"
-msgstr "邀请(_I)"
-
-#: ../src/gtkstock.c:144
-msgid "_Modify"
-msgstr "修改(_M)"
+#: ../gtk/gtkstatusbox.c:806 ../gtk/plugins/docklet/docklet.c:435
+#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1369
+#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
+#: ../libgaim/protocols/novell/novell.c:2849
+#: ../libgaim/protocols/yahoo/yahoo.c:2827 ../libgaim/status.c:155
+msgid "Available"
+msgstr "可用"
-#: ../src/gtkstock.c:145
-msgid "_Open Mail"
-msgstr "打开邮件(_O)"
+#: ../gtk/gtkstatusbox.c:808 ../gtk/plugins/docklet/docklet.c:443
+#: ../libgaim/protocols/oscar/oscar.c:699
+#: ../libgaim/protocols/yahoo/yahoo.c:2821 ../libgaim/status.c:157
+msgid "Invisible"
+msgstr "隐身"
-#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
+#: ../gtk/gtkutils.c:1306 ../gtk/gtkutils.c:1331
#, c-format
msgid "The following error has occurred loading %s: %s"
msgstr "装入 %s 时发生了下列错误: %s。"
-#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1308 ../gtk/gtkutils.c:1333
msgid "Failed to load image"
msgstr "装入图像失败"
-#: ../src/gtkutils.c:1408
+#: ../gtk/gtkutils.c:1408
#, c-format
msgid "Cannot send folder %s."
msgstr "无法发送文件夹 %s。"
-#: ../src/gtkutils.c:1410
+#: ../gtk/gtkutils.c:1410
msgid ""
"Gaim cannot transfer a folder. You will need to send the files within "
"individually"
msgstr "Gaim 无法传送文件夹。您需要选择需要传送的单个文件"
-#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
+#: ../gtk/gtkutils.c:1438 ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1452
msgid "You have dragged an image"
msgstr "您拖曳了图像"
-#: ../src/gtkutils.c:1439
+#: ../gtk/gtkutils.c:1439
msgid ""
"You can send this image as a file transfer, embed it into this message, or "
"use it as the buddy icon for this user."
msgstr ""
"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
-#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
+#: ../gtk/gtkutils.c:1443 ../gtk/gtkutils.c:1458
msgid "Set as buddy icon"
msgstr "设置为好友头像"
-#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1444 ../gtk/gtkutils.c:1459
msgid "Send image file"
msgstr "发送图像文件"
-#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
+#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1459
msgid "Insert in message"
msgstr "在消息中插入"
-#: ../src/gtkutils.c:1448
+#: ../gtk/gtkutils.c:1448
msgid "Would you like to set it as the buddy icon for this user?"
msgstr "您是否想要将其设置为此用户的头像?"
-#: ../src/gtkutils.c:1453
+#: ../gtk/gtkutils.c:1453
msgid ""
"You can send this image as a file transfer or embed it into this message, or "
"use it as the buddy icon for this user."
@@ -5120,7 +3932,7 @@ msgstr ""
"您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的好友图"
"标。"
-#: ../src/gtkutils.c:1455
+#: ../gtk/gtkutils.c:1455
msgid ""
"You can insert this image into this message, or use it as the buddy icon for "
"this user"
@@ -5131,11 +3943,11 @@ msgstr "您可以通过文件传送发送此图像,或者将其用作此用户
#. * send. The only logical one is "Application," but do we really want to send a binary and nothing else?
#. * Probably not. I'll just give an error and return.
#. The original patch sent the icon used by the launcher. That's probably wrong
-#: ../src/gtkutils.c:1509
+#: ../gtk/gtkutils.c:1509
msgid "Cannot send launcher"
msgstr "无法发送启动器"
-#: ../src/gtkutils.c:1509
+#: ../gtk/gtkutils.c:1509
msgid ""
"You dragged a desktop launcher. Most likely you wanted to send whatever this "
"launcher points to instead of this launcher itself."
@@ -5143,38 +3955,1615 @@ msgstr ""
"您拖曳的是桌面启动器。在大多数情况下,您可能想要发送此启动器所指向的文件,而"
"非启动器自身。"
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
+#: ../gtk/gtkutils.c:2338
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>文件:</b> %s\n"
+"<b>文件大小:</b> %s\n"
+"<b>图像大小:</b> %dx%d"
+
+#. Label
+#: ../gtk/gtkutils.c:2382 ../gtk/gtkutils.c:2404
+#: ../gtk/plugins/gevolution/new_person_dialog.c:338
+#: ../libgaim/protocols/oscar/oscar.c:601
+msgid "Buddy Icon"
+msgstr "好友图标"
+
+#: ../gtk/gtkutils.c:2724
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "打开文件“%s”:%s"
+
+#: ../gtk/gtkutils.c:2773
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "保存文件"
+
+#: ../gtk/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "选择颜色"
+
+#: ../gtk/plugins/cap/cap.c:398
+msgid "Display Statistics"
+msgstr "显示统计"
+
+#: ../gtk/plugins/cap/cap.c:410 ../gtk/plugins/cap/cap.c:412
+#, fuzzy
+msgid "Response Probability:"
+msgstr "响应丢失"
+
+#: ../gtk/plugins/cap/cap.c:823
+msgid "Database Configuration"
+msgstr "数据库配置"
+
+#: ../gtk/plugins/cap/cap.c:824
+msgid "Statistics Configuration"
+msgstr "统计配置"
+
+#. dbd path input folder selector button
+#: ../gtk/plugins/cap/cap.c:827
+msgid "libdbi driver path:"
+msgstr "libdbi 驱动程序路径:"
+
+#: ../gtk/plugins/cap/cap.c:829
+msgid "libdbi Drivers Path"
+msgstr "libdbi 驱动程序路径"
+
+#: ../gtk/plugins/cap/cap.c:830
+msgid "Verify"
+msgstr "验证"
+
+#: ../gtk/plugins/cap/cap.c:840
+msgid "Driver:"
+msgstr "驱动程序:"
+
+#: ../gtk/plugins/cap/cap.c:843 ../libgaim/protocols/sametime/sametime.c:1502
+msgid "Connected"
+msgstr "已连接"
+
+#: ../gtk/plugins/cap/cap.c:849
+msgid "Configure"
+msgstr "配置"
+
+#. msg_difference spinner
+#: ../gtk/plugins/cap/cap.c:857
+msgid "Maximum response timeout:"
+msgstr "最大响应超时:"
+
+#: ../gtk/plugins/cap/cap.c:860 ../gtk/plugins/cap/cap.c:867
+#: ../gtk/plugins/cap/cap.c:874
+msgid "minutes"
+msgstr "分钟"
+
+#. last_seen spinner
+#: ../gtk/plugins/cap/cap.c:864
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+#: ../gtk/plugins/cap/cap.c:871
+msgid "Threshold:"
+msgstr "阀值:"
+
+#: ../gtk/plugins/cap/cap.c:1097
+msgid "Username:"
+msgstr "用户名:"
+
+#: ../gtk/plugins/cap/cap.c:1101
+msgid "Host:"
+msgstr "主机:"
+
+#: ../gtk/plugins/cap/cap.c:1103
+msgid "Database:"
+msgstr "数据库:"
+
+#: ../gtk/plugins/cap/cap.c:1105
+msgid "Port:"
+msgstr "端口:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/cap/cap.c:1217
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. * summary
+#: ../gtk/plugins/cap/cap.c:1218
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+
+#: ../gtk/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "好友正发呆"
+
+#: ../gtk/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "好友已离开"
+
+#: ../gtk/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "好友为“扩展”离开"
+
+#. Not used yet.
+#: ../gtk/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "好友是移动用户"
+
+#: ../gtk/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "好友离线"
+
+#: ../gtk/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "程序内部所用的权值,当..."
+
+#: ../gtk/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+
+#: ../gtk/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+#: ../gtk/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "账户的权值..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "联系人优先级"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../gtk/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "允许控制好友不同状态所对应的值。"
+
+#. *< description
+#: ../gtk/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr "允许在进行好友优先级比较时为发呆/离开/离线状态所用的权值。"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:146
+msgid "Crazychat"
+msgstr "Crazychat"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr "建立 Crazychat 会话的插件。"
+
+#. * description
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr ""
+
+#. make the network configuration frame
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "网络配置"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "TCP 端口"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "UDP 端口"
+
+#. make the feature configuration frame
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr "特性校正"
+
+#: ../gtk/plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "已禁用"
+
+#: ../gtk/plugins/docklet/docklet.c:154
+msgid "Right-click for more unread messages...\n"
+msgstr "用鼠标右键单击可查看更多未读消息...\n"
+
+#: ../gtk/plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "更改状态"
+
+#: ../gtk/plugins/docklet/docklet.c:484
+msgid "Show Buddy List"
+msgstr "显示好友列表"
+
+#: ../gtk/plugins/docklet/docklet.c:510
+msgid "New Message..."
+msgstr "新消息..."
+
+#: ../gtk/plugins/docklet/docklet.c:525
+msgid "Mute Sounds"
+msgstr "静音"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
#.
-#: ../src/gtkwhiteboard.c:343 ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
+#: ../gtk/plugins/docklet/docklet.c:538
+msgid "Quit"
+msgstr "退出"
+
+#: ../gtk/plugins/docklet/docklet.c:679
+msgid "Blink tray icon for unread..."
+msgstr "有未读消息时闪烁托盘图标..."
+
+#: ../gtk/plugins/docklet/docklet.c:682
+msgid "_Instant Messages:"
+msgstr "即时消息(_I):"
+
+#: ../gtk/plugins/docklet/docklet.c:685
+msgid "In hidden conversations"
+msgstr "于隐藏对话"
+
+#: ../gtk/plugins/docklet/docklet.c:690
+msgid "C_hat Messages:"
+msgstr "聊天消息(_H):"
+
+#: ../gtk/plugins/docklet/docklet.c:693
+msgid "When my nick is said"
+msgstr "谈到我的昵称时"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/docklet/docklet.c:720
+msgid "System Tray Icon"
+msgstr "系统托盘图标"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../gtk/plugins/docklet/docklet.c:723
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "在系统托盘中显示 Gaim 的图标。"
+
+#. * description
+#: ../gtk/plugins/docklet/docklet.c:725
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
+msgstr ""
+"在系统的托盘区(如 GNOME、KDE 或 Windows)显示一个图标,表示 Gaim 的当前状态,"
+"并允许快速访问常用的功能,以及切换好友列表的显示。同时还提供有未读消息时闪烁"
+"的选项。"
+
+#: ../gtk/plugins/docklet/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "方向"
+
+#: ../gtk/plugins/docklet/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "托盘的方向。"
+
+#: ../gtk/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "按对话计数"
+
+#: ../gtk/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "交谈放置"
+
+#: ../gtk/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "每个窗口的对话数"
+
+#: ../gtk/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "按数字放置时分离即时消息和聊天窗口"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr "扩展放置"
+
+#. *< name
+#. *< version
+#: ../gtk/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr "额外的对话放置选项。"
+
+#. *< summary
+#. * description
+#: ../gtk/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr "限制每个窗口的对话数,可选分离即时消息和聊天窗口"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gaiminc.c:91
+msgid "Gaim Demonstration Plugin"
+msgstr "Gaim 演示插件"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../gtk/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "一个范例插件 - 参看描述。"
+
+#. * description
+#: ../gtk/plugins/gaiminc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"这个插件非常酷,它可以完成以下功能:\n"
+"- 在您登入后告诉您谁写的这个程序\n"
+"- 颠倒所有收到的文本\n"
+"- 当您的好友登入后立即给他们发送信息"
+
+#: ../gtk/plugins/gaimrc.c:41
+msgid "Cursor Color"
+msgstr "光标颜色"
+
+#: ../gtk/plugins/gaimrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "次要光标颜色"
+
+#: ../gtk/plugins/gaimrc.c:43
+msgid "Hyperlink Color"
+msgstr "超级链接颜色"
+
+#: ../gtk/plugins/gaimrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr "GtkTreeView 扩展柄大小"
+
+#: ../gtk/plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView 水平分隔"
+
+#: ../gtk/plugins/gaimrc.c:76
+msgid "Conversation Entry"
+msgstr "对话项"
+
+#: ../gtk/plugins/gaimrc.c:77
+msgid "Conversation History"
+msgstr "对话历史"
+
+#: ../gtk/plugins/gaimrc.c:78
+msgid "Log Viewer"
+msgstr "日志查看器"
+
+#: ../gtk/plugins/gaimrc.c:79
+msgid "Request Dialog"
+msgstr "请求对话框"
+
+#: ../gtk/plugins/gaimrc.c:80
+msgid "Notify Dialog"
+msgstr "提醒对话框"
+
+#: ../gtk/plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView 缩进扩展柄"
+
+#: ../gtk/plugins/gaimrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "选择 %s 的颜色"
+
+#: ../gtk/plugins/gaimrc.c:322
+msgid "Select Color"
+msgstr "选择颜色"
+
+#: ../gtk/plugins/gaimrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "选择 %s 的字体"
+
+#: ../gtk/plugins/gaimrc.c:398
+msgid "Select Interface Font"
+msgstr "选择界面字体"
+
+#: ../gtk/plugins/gaimrc.c:448
+msgid "General"
+msgstr "常规"
+
+#: ../gtk/plugins/gaimrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+ 界面字体"
+
+#: ../gtk/plugins/gaimrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ 文字快捷方式主题"
+
+#: ../gtk/plugins/gaimrc.c:508
+msgid "Interface colors"
+msgstr "界面颜色"
+
+#: ../gtk/plugins/gaimrc.c:532
+msgid "Widget Sizes"
+msgstr "部件大小"
+
+#: ../gtk/plugins/gaimrc.c:553
+msgid "Fonts"
+msgstr "字体"
+
+#: ../gtk/plugins/gaimrc.c:576
+msgid "Tools"
+msgstr "工具"
+
+#: ../gtk/plugins/gaimrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "将设置写入 %s%sgtkrc-2.0"
+
+#: ../gtk/plugins/gaimrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "重新读取 gtkrc 文件"
+
+#: ../gtk/plugins/gaimrc.c:616
+msgid "Gaim GTK+ Theme Control"
+msgstr "Gaim GTK+ 主题控制"
+
+#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "提供对常用 gtkrc 设置的访问。"
+
+#. Configuration frame
+#: ../gtk/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "鼠标手势配置"
+
+#: ../gtk/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "鼠标中键"
+
+#: ../gtk/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "鼠标右键"
+
+#. "Visual gesture display" checkbox
+#: ../gtk/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "可视手势显示(_V)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "鼠标手势"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../gtk/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "提供鼠标手势的支持"
+
+#. * description
+#: ../gtk/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"允许在对话窗口中支持鼠标手势。\n"
+"拖曳鼠标中键可执行特定操作:\n"
+"\n"
+"向下再向右可关闭对话。\n"
+"向上再向左可切换到上个对话。\n"
+"向上再向右可切换到下个对话。"
+
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:142
+msgid "Instant Messaging"
+msgstr "即时通讯"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:455
+msgid "Select a person from your address book below, or add a new person."
+msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
+
+#. "Search"
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:468
+#: ../gtk/plugins/gevolution/assoc-buddy.c:353
+#: ../libgaim/protocols/jabber/buddy.c:1726
+#: ../libgaim/protocols/oscar/oscar.c:6063 ../libgaim/protocols/qq/group.c:111
+#: ../libgaim/protocols/qq/group_im.c:137
+#: ../libgaim/protocols/qq/sys_msg.c:161 ../libgaim/protocols/qq/sys_msg.c:231
+#: ../libgaim/protocols/qq/sys_msg.c:249
+#: ../libgaim/protocols/sametime/sametime.c:5532
+msgid "Search"
+msgstr "搜索"
+
+#. "New Person" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:575
+#: ../gtk/plugins/gevolution/assoc-buddy.c:464
+#: ../gtk/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "新建联系人"
+
+#. "Select Buddy" button
+#: ../gtk/plugins/gevolution/add_buddy_dialog.c:592
+msgid "Select Buddy"
+msgstr "选择好友"
+
+#. Add the label.
+#: ../gtk/plugins/gevolution/assoc-buddy.c:340
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr "从您的地址簿中选择一个人可将其加为好友,您也可以创建一个新联系人。"
+
+#. Add the expander
+#: ../gtk/plugins/gevolution/assoc-buddy.c:428
+msgid "User _details"
+msgstr "用户资料(_D)"
+
+#. "Associate Buddy" button
+#: ../gtk/plugins/gevolution/assoc-buddy.c:481
+msgid "_Associate Buddy"
+msgstr "关联好友(_A)"
+
+#: ../gtk/plugins/gevolution/eds-utils.c:73
+#: ../gtk/plugins/gevolution/eds-utils.c:86
+#: ../libgaim/protocols/jabber/jabber.c:1148
+msgid "None"
+msgstr "无"
+
+#: ../gtk/plugins/gevolution/gevolution.c:262
+#: ../gtk/plugins/gevolution/gevolution.c:268
+msgid "Unable to send e-mail"
+msgstr "无法发送电子邮件。"
+
+#: ../gtk/plugins/gevolution/gevolution.c:263
+msgid "The evolution executable was not found in the PATH."
+msgstr "Evolution 可执行文件未在 PATH 中找到。"
+
+#: ../gtk/plugins/gevolution/gevolution.c:269
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr "指定的好友未在 Evolution 联系人中找到。"
+
+#: ../gtk/plugins/gevolution/gevolution.c:286
+msgid "Add to Address Book"
+msgstr "添加到地址簿"
+
+#: ../gtk/plugins/gevolution/gevolution.c:290
+msgid "Send E-Mail"
+msgstr "发送电子邮件"
+
+#. Configuration frame
+#: ../gtk/plugins/gevolution/gevolution.c:417
+msgid "Evolution Integration Configuration"
+msgstr "Evolution 集成配置"
+
+#. Label
+#: ../gtk/plugins/gevolution/gevolution.c:420
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "选择要将好友自动添加到哪些账户。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gevolution/gevolution.c:527
+msgid "Evolution Integration"
+msgstr "Evolution 集成"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../gtk/plugins/gevolution/gevolution.c:530
+#: ../gtk/plugins/gevolution/gevolution.c:532
+msgid "Provides integration with Evolution."
+msgstr "提供与 Evolution 的集成。"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr "请在下面输入联系人的信息。"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "请在下面输入好友的用户名和账户类型。"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "账户类型:"
+
+#. Optional Information section
+#: ../gtk/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "额外信息:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "名:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "姓:"
+
+#: ../gtk/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "电子邮件:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK 信号测试"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "测试看看所有的 UI 信号是否都工作正确。"
+
+#: ../gtk/plugins/history.c:188
+msgid "History"
+msgstr "历史"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "离开后变为图标"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "您离开后将好友列表和对话都变为图标。"
+
+#: ../gtk/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "邮件检查器"
+
+#: ../gtk/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "检查新的本地邮件。"
+
+#: ../gtk/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr "请求了音乐信使会话。请单击 MM 图标接受。"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "音乐信使会话已确认。"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
+msgid "Music Messaging"
+msgstr "音乐信使"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "运行命令时发生了冲突:"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
+msgid "Error Running Editor"
+msgstr "运行编辑器出错"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
+msgid "The following error has occured:"
+msgstr "发生了下列错误:"
+
+#. Configuration frame
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
+msgid "Music Messaging Configuration"
+msgstr "音乐信使配置"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr "计分编辑器路径"
+
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "合作作曲的音乐信使插件。"
+
+#. * summary
+#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr "音乐信使插件允许多个用户同时在同一份曲谱上工作。"
+
+#. ---------- "Notify For" ----------
+#: ../gtk/plugins/notify.c:686
+msgid "Notify For"
+msgstr "提醒"
+
+#: ../gtk/plugins/notify.c:690
+msgid "_IM windows"
+msgstr "即时消息窗口(_I)"
+
+#: ../gtk/plugins/notify.c:697
+msgid "C_hat windows"
+msgstr "聊天窗口(_H)"
+
+#: ../gtk/plugins/notify.c:705
+msgid "\t_Only when someone says your screen name"
+msgstr "\t仅当别人在聊天中提到您的名字(_O)"
+
+#: ../gtk/plugins/notify.c:715
+msgid "_Focused windows"
+msgstr "聚焦窗口(_F)"
+
+#. ---------- "Notification Methods" ----------
+#: ../gtk/plugins/notify.c:723
+msgid "Notification Methods"
+msgstr "通知方式"
+
+#: ../gtk/plugins/notify.c:730
+msgid "Prepend _string into window title:"
+msgstr "在窗口标题前追加字符串(_S):"
+
+#. Count method button
+#: ../gtk/plugins/notify.c:749
+msgid "Insert c_ount of new messages into window title"
+msgstr "在窗口标题中插入新消息数(_O)"
+
+#. Count xprop method button
+#: ../gtk/plugins/notify.c:758
+#, fuzzy
+msgid "Insert count of new message into _X property"
+msgstr "在窗口标题中插入新消息数(_O)"
+
+#. Urgent method button
+#: ../gtk/plugins/notify.c:766
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "设置窗口管理器“紧急”提示(_U)"
+
+#. Raise window method button
+#: ../gtk/plugins/notify.c:775
+msgid "R_aise conversation window"
+msgstr "升起对话窗口(_A)"
+
+#. ---------- "Notification Removals" ----------
+#: ../gtk/plugins/notify.c:783
+msgid "Notification Removal"
+msgstr "通知删除"
+
+#. Remove on focus button
+#: ../gtk/plugins/notify.c:788
+msgid "Remove when conversation window _gains focus"
+msgstr "对话窗口获得焦点后即删除(_G)"
+
+#. Remove on click button
+#: ../gtk/plugins/notify.c:795
+msgid "Remove when conversation window _receives click"
+msgstr "单击对话窗口后即删除(_R)"
+
+#. Remove on type button
+#: ../gtk/plugins/notify.c:803
+msgid "Remove when _typing in conversation window"
+msgstr "在对话窗口中打字后即删除(_T)"
+
+#. Remove on message send button
+#: ../gtk/plugins/notify.c:811
+msgid "Remove when a _message gets sent"
+msgstr "消息送出后即删除(_M)"
+
+#. Remove on conversation switch button
+#: ../gtk/plugins/notify.c:820
+msgid "Remove on switch to conversation ta_b"
+msgstr "切换对话标签后即删除(_B)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/notify.c:909
+msgid "Message Notification"
+msgstr "消息通知"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../gtk/plugins/notify.c:912 ../gtk/plugins/notify.c:914
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "提供各种方法通知您有未读消息。"
+
+#: ../gtk/plugins/raw.c:175
+msgid "Raw"
+msgstr "Raw"
+
+#: ../gtk/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "允许您发送原样输入基于文本的协议。"
+
+#: ../gtk/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"允许您将输入原样发送给基于文本的协议(Jabber,MSN,IRC,TOC)。在输入框中按回车"
+"键可以发送。看看调试窗口。"
+
+#: ../gtk/plugins/relnot.c:69
+#, c-format
+msgid "You are using Gaim version %s. The current version is %s.<hr>"
+msgstr "您正在使用 Gaim 版本 %s。而当前版本为 %s。<hr>"
+
+#: ../gtk/plugins/relnot.c:75
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
msgstr ""
+"<b>更新记录:</b>\n"
+"%s<br><br>"
+
+#: ../gtk/plugins/relnot.c:80
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"您可以从下面的地址获得版本 %s:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+
+#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "新版本可用"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "版本通知"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../gtk/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "定期检查新版本。"
+
+#. * description
+#: ../gtk/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr "定期检查新版本并通知用户更新记录。"
+
+#: ../gtk/plugins/spellchk.c:1945
+msgid "Duplicate Correction"
+msgstr "重复更正"
+
+#: ../gtk/plugins/spellchk.c:1946
+msgid "The specified word already exists in the correction list."
+msgstr "指定的单词已经在更正列表中存在了。"
+
+#: ../gtk/plugins/spellchk.c:2154
+msgid "Text Replacements"
+msgstr "文字替换"
-#: ../src/log.c:167
+#: ../gtk/plugins/spellchk.c:2177
+msgid "You type"
+msgstr "输入文字"
+
+#: ../gtk/plugins/spellchk.c:2191
+msgid "You send"
+msgstr "送出文字"
+
+#: ../gtk/plugins/spellchk.c:2205
+msgid "Whole words only"
+msgstr "整个单词"
+
+#: ../gtk/plugins/spellchk.c:2217
+msgid "Case sensitive"
+msgstr "区分大小写"
+
+#: ../gtk/plugins/spellchk.c:2243
+msgid "Add a new text replacement"
+msgstr "添加新的文字替换"
+
+#: ../gtk/plugins/spellchk.c:2259
+msgid "You _type:"
+msgstr "输入文字(_T):"
+
+#: ../gtk/plugins/spellchk.c:2276
+msgid "You _send:"
+msgstr "送出文字(_S):"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../gtk/plugins/spellchk.c:2288
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "区分大小写匹配(不选中代表自动处理大小写)"
+
+#: ../gtk/plugins/spellchk.c:2290
+msgid "Only replace _whole words"
+msgstr "只替换整个单词(_W)"
+
+#: ../gtk/plugins/spellchk.c:2315
+msgid "General Text Replacement Options"
+msgstr "常规文本替换选项"
+
+#: ../gtk/plugins/spellchk.c:2316
+msgid "Enable replacement of last word on send"
+msgstr "允许在发送时替换最后一个单词"
+
+#: ../gtk/plugins/spellchk.c:2341
+msgid "Text replacement"
+msgstr "文本替换"
+
+#: ../gtk/plugins/spellchk.c:2343 ../gtk/plugins/spellchk.c:2344
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "根据用户自定义的规则替换寄出消息中的文字。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "好友点点通"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "好友列表的水平滚动版本。"
+
+#: ../gtk/plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "iChat 时间戳"
+
+#: ../gtk/plugins/timestamp.c:193
+msgid "Delay"
+msgstr "延迟"
+
+#: ../gtk/plugins/timestamp.c:200
+msgid "minutes."
+msgstr "分钟。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp.c:256
+msgid "Timestamp"
+msgstr "时间戳"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr "每 N 分钟给对话添加 iChat 风格的时间戳。"
+
+#: ../gtk/plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "时间戳格式选项"
+
+#: ../gtk/plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "强制使用 24 小时制(_F)"
+
+#: ../gtk/plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "显示日期于..."
+
+#: ../gtk/plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "对话(_N):"
+
+#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "对迟发的消息"
+
+#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "对迟发的消息和聊天"
+
+#: ../gtk/plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "消息日志(_M):"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "消息时间戳格式"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../gtk/plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "自定义消息时间戳的格式。"
+
+#. * description
+#: ../gtk/plugins/timestamp_format.c:154
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr "此插件允许用户自定义会话和日志消息的时间戳格式。"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "不透明度:"
+
+#. IM Convo trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "即时消息对话窗口"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "即时消息窗口透明度(_I)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "在即时消息窗口中显示滑块(_S)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "聚焦时取消即时通讯窗口透明度"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "常居顶端"
+
+#. Buddy List trans options
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "好友列表窗口"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "好友列表窗口的透明度(_B)"
+
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "聚焦时取消好友列表窗口透明度"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "透明度"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "好友列表和对话窗口的可变透明度。"
+
+#. * description
+#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"此插件能够让对话窗口和好友列表有可变的 alpha 透明度。\n"
+"\n"
+"* 注意: 此插件需要 Win2000 或更高版本。"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:430
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ 运行时刻版本"
+
+#. Autostart
+#: ../gtk/plugins/win32/winprefs/winprefs.c:438
+msgid "Startup"
+msgstr "启动"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:439
+msgid "_Start Gaim on Windows startup"
+msgstr "Windows 启动时启动 Gaim(_S)"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:452
+msgid "_Dockable Buddy List"
+msgstr "可停靠的好友列表(_D)"
+
+#. Blist On Top
+#: ../gtk/plugins/win32/winprefs/winprefs.c:456
+msgid "_Keep Buddy List window on top:"
+msgstr "好友列表窗口常居顶端(_K):"
+
+#. XXX: Did this ever work?
+#: ../gtk/plugins/win32/winprefs/winprefs.c:461
+msgid "Only when docked"
+msgstr "仅停靠时"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:466
+msgid "_Flash window when IMs are received"
+msgstr "收到对话信息时闪烁窗口(_F)"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:468
+msgid "_Flash window when chat messages are received"
+msgstr "收到聊天信息时闪烁窗口(_F)"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:492
+msgid "WinGaim Options"
+msgstr "WinGaim 选项"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:494
+msgid "Options specific to Windows Gaim."
+msgstr "Windows Gaim 特定的选项。"
+
+#: ../gtk/plugins/win32/winprefs/winprefs.c:495
+msgid ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
+msgstr "提供 Gaim 在 Windows 下特定的选项,比如好友列表停靠和对话闪烁。"
+
+#: ../libgaim/account.c:773
+msgid "accounts"
+msgstr "账户"
+
+#: ../libgaim/account.c:917
+msgid "Password is required to sign on."
+msgstr "需要密码才能登入。"
+
+#: ../libgaim/account.c:942
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "输入 %s(%s) 的密码"
+
+#: ../libgaim/account.c:949
+msgid "Enter Password"
+msgstr "输入密码"
+
+#: ../libgaim/account.c:954
+msgid "Save password"
+msgstr "保存密码"
+
+#: ../libgaim/account.c:988 ../libgaim/connection.c:96
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "缺少 %s 的协议插件"
+
+#: ../libgaim/account.c:1070 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/protocols/jabber/jabber.c:1298
+msgid "New passwords do not match."
+msgstr "新密码不相同。"
+
+#: ../libgaim/account.c:1079
+msgid "Fill out all fields completely."
+msgstr "完全填入所有字段。"
+
+#: ../libgaim/account.c:1102
+msgid "Original password"
+msgstr "旧密码"
+
+#: ../libgaim/account.c:1109
+msgid "New password"
+msgstr "新密码"
+
+#: ../libgaim/account.c:1116
+msgid "New password (again)"
+msgstr "再次输入新密码"
+
+#: ../libgaim/account.c:1122
+#, c-format
+msgid "Change password for %s"
+msgstr "更改 %s 的密码"
+
+#: ../libgaim/account.c:1130
+msgid "Please enter your current password and your new password."
+msgstr "请输入您目前的密码和新密码。"
+
+#: ../libgaim/account.c:1163
+#, c-format
+msgid "Change user information for %s"
+msgstr "更改 %s 的用户信息"
+
+#: ../libgaim/account.c:1166 ../libgaim/protocols/toc/toc.c:1685
+msgid "Set User Info"
+msgstr "设置用户信息"
+
+#: ../libgaim/blist.c:543
+msgid "buddy list"
+msgstr "好友列表"
+
+#: ../libgaim/blist.c:1904
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline. This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline. These buddies and the group were "
+"not removed.\n"
+msgstr[0] ""
+"%2$s 组中的 %1$d 个好友未删除,原因是他们属于目前已禁用或离线的账户。这些好友"
+"和该组不会被删除。\n"
+
+#: ../libgaim/blist.c:1914
+msgid "Group not removed"
+msgstr "组未删除"
+
+#: ../libgaim/connection.c:98
+msgid "Registration Error"
+msgstr "注册错误"
+
+#: ../libgaim/connection.c:277
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s 已登入"
+
+#: ../libgaim/connection.c:310
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s 已登出"
+
+#: ../libgaim/conversation.c:164
+msgid "Unable to send message: The message is too large."
+msgstr "无法发送消息: 消息太大。"
+
+#: ../libgaim/conversation.c:167 ../libgaim/conversation.c:180
+#, c-format
+msgid "Unable to send message to %s."
+msgstr "无法给 %s 发送消息。"
+
+#: ../libgaim/conversation.c:168
+msgid "The message is too large."
+msgstr "消息太长。"
+
+#: ../libgaim/conversation.c:177
+msgid "Unable to send message."
+msgstr "无法发送消息。"
+
+#: ../libgaim/conversation.c:1528
+#, c-format
+msgid "%s entered the room."
+msgstr "%s 进入了聊天室。"
+
+#: ../libgaim/conversation.c:1531
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] 进入了聊天室。"
+
+#: ../libgaim/conversation.c:1636
+#, c-format
+msgid "You are now known as %s"
+msgstr "您现在叫做 %s"
+
+#: ../libgaim/conversation.c:1656
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s 现在叫做 %s。"
+
+#: ../libgaim/conversation.c:1729
+#, c-format
+msgid "%s left the room."
+msgstr "%s 离开了聊天室。"
+
+#: ../libgaim/conversation.c:1732
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s 离开了聊天室(%s)。"
+
+#: ../libgaim/dbus-server.c:576
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr "获得连接失败: %s"
+
+#: ../libgaim/dbus-server.c:584
+#, c-format
+msgid "Failed to get name: %s"
+msgstr "获得名称失败: %s"
+
+#: ../libgaim/dbus-server.c:597
+#, fuzzy, c-format
+msgid "Failed to get serv name: %s"
+msgstr "存储图像失败:%s\n"
+
+#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
+msgid "No name"
+msgstr "无名称"
+
+#: ../libgaim/dnsquery.c:474
+#, fuzzy
+msgid "Unable to create new resolver process\n"
+msgstr "无法创建套接字"
+
+#: ../libgaim/dnsquery.c:479
+#, fuzzy
+msgid "Unable to send request to resolver process\n"
+msgstr "无法给 %s 发送消息。"
+
+#: ../libgaim/dnsquery.c:512 ../libgaim/dnsquery.c:655
+#, fuzzy, c-format
+msgid "Error resolving %s: %s"
+msgstr ""
+"读取 %s 出错:\n"
+"%s。\n"
+
+#: ../libgaim/dnsquery.c:515 ../libgaim/dnsquery.c:669
+#: ../libgaim/dnsquery.c:770
+#, fuzzy, c-format
+msgid "Error resolving %s: %d"
+msgstr ""
+"读取 %s 出错:\n"
+"%s。\n"
+
+#: ../libgaim/dnsquery.c:537
+#, fuzzy, c-format
+msgid "Error reading from resolver process: %s"
+msgstr "从套接字读取时出错。"
+
+#: ../libgaim/dnsquery.c:541
+msgid "EOF while reading from resolver process"
+msgstr ""
+
+#: ../libgaim/dnsquery.c:713
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr "线程创建失败: %s"
+
+#: ../libgaim/dnsquery.c:714
+msgid "Unknown reason"
+msgstr "未知原因"
+
+#: ../libgaim/ft.c:189 ../libgaim/protocols/msn/msn.c:410
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"读取 %s 出错:\n"
+"%s。\n"
+
+#: ../libgaim/ft.c:193
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"写入 %s 出错:\n"
+"%s。\n"
+
+#: ../libgaim/ft.c:197
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"访问 %s 出错:\n"
+"%s。\n"
+
+#: ../libgaim/ft.c:230
+msgid "Cannot send a file of 0 bytes."
+msgstr "无法发送 0 字节的文件。"
+
+#: ../libgaim/ft.c:240
+msgid "Cannot send a directory."
+msgstr "无法发送目录。"
+
+#: ../libgaim/ft.c:249
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s 不是普通文件。该文件拒绝覆盖。\n"
+
+#: ../libgaim/ft.c:307
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s 想要给您发送 %s (%s)"
+
+#: ../libgaim/ft.c:314
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s 想要给您发送文件"
+
+#: ../libgaim/ft.c:355
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "接受来自 %s 的文件传送吗?"
+
+#: ../libgaim/ft.c:359
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"可从以下地址下载文件:\n"
+"远程主机: %s\n"
+"远程端口: %d"
+
+#: ../libgaim/ft.c:392
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s 正在发送文件 %s"
+
+#: ../libgaim/ft.c:444
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s 不是合法的文件名。\n"
+
+#: ../libgaim/ft.c:465
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%2$s 发送 %1$s"
+
+#: ../libgaim/ft.c:477
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr "开始来自 %2$s 的 %1$s 传送"
+
+#: ../libgaim/ft.c:631
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "文件 %s 传送完成"
+
+#: ../libgaim/ft.c:634
+msgid "File transfer complete"
+msgstr "文件传送完成"
+
+#: ../libgaim/ft.c:1023
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "您取消了 %s 的传送"
+
+#: ../libgaim/ft.c:1028
+msgid "File transfer cancelled"
+msgstr "文件传送已取消"
+
+#: ../libgaim/ft.c:1086
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s 取消了 %s 的传送"
+
+#: ../libgaim/ft.c:1091
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s 取消了文件传送"
+
+#: ../libgaim/ft.c:1148
+#, c-format
+msgid "File transfer to %s failed."
+msgstr "给 %s 传送文件失败。"
+
+#: ../libgaim/ft.c:1150
+#, c-format
+msgid "File transfer from %s failed."
+msgstr "来自 %s 的文件传送失败。"
+
+#: ../libgaim/log.c:181
msgid "<b><font color=\"red\">The logger has no read function</font></b>"
msgstr "<b><font color\"=red\">登录程序没有读取功能</font></b>"
-#: ../src/log.c:549
+#: ../libgaim/log.c:562
msgid "HTML"
msgstr "HTML"
-#: ../src/log.c:560
+#: ../libgaim/log.c:573
msgid "Plain text"
msgstr "纯文本"
-#: ../src/log.c:571
+#: ../libgaim/log.c:584
msgid "Old Gaim"
msgstr "旧 Gaim"
-#: ../src/log.c:666
+#: ../libgaim/log.c:691
msgid "Logging of this conversation failed."
msgstr "此对话的记录失败。"
-#: ../src/log.c:1009
+#: ../libgaim/log.c:1041
msgid "XML"
msgstr "XML"
-#: ../src/log.c:1077
+#: ../libgaim/log.c:1115
#, c-format
msgid ""
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5183,7 +5572,7 @@ msgstr ""
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
"</b></font> %s<br/>\n"
-#: ../src/log.c:1079
+#: ../libgaim/log.c:1117
#, c-format
msgid ""
"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5192,81 +5581,572 @@ msgstr ""
"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自动回复&gt;:"
"</b></font> %s<br/>\n"
-#: ../src/log.c:1136 ../src/log.c:1262
+#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
-#: ../src/log.c:1148 ../src/log.c:1276
+#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
#, c-format
msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
msgstr "<font color=\"red\"><b>无法读取文件: %s</b></font>"
-#: ../src/log.c:1205
+#: ../libgaim/log.c:1249
#, c-format
msgid "(%s) %s <AUTO-REPLY>: %s\n"
msgstr "(%s) %s <自动回复>: %s\n"
-#: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5128
+#: ../libgaim/plugin.c:281 ../libgaim/protocols/jabber/buddy.c:1651
+#: ../libgaim/protocols/msn/servconn.c:139
+#: ../libgaim/protocols/msn/session.c:321
+#: ../libgaim/protocols/oscar/oscar.c:2655
msgid "Unknown error"
msgstr "未知错误"
-#: ../src/plugin.c:424
+#: ../libgaim/plugin.c:424
#, c-format
msgid "Plugin magic mismatch %d (need %d)"
msgstr ""
-#: ../src/plugin.c:441
+#: ../libgaim/plugin.c:441
#, c-format
msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
msgstr ""
-#: ../src/plugin.c:458
+#: ../libgaim/plugin.c:458
msgid "Plugin does not implement all required functions"
msgstr ""
-#: ../src/plugin.c:523
+#: ../libgaim/plugin.c:523
#, c-format
msgid ""
"The required plugin %s was not found. Please install this plugin and try "
"again."
msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
-#: ../src/plugin.c:528
+#: ../libgaim/plugin.c:528
#, fuzzy
msgid "Gaim encountered errors loading the plugin."
msgstr "Gaim 与 ICQ 服务器通讯错误。"
-#: ../src/plugin.c:551
+#: ../libgaim/plugin.c:550
#, c-format
msgid "The required plugin %s was unable to load."
msgstr "所需插件 %s 无法装入。"
-#: ../src/plugin.c:555
+#: ../libgaim/plugin.c:554
msgid "Gaim was unable to load your plugin."
msgstr "Gaim 无法装入您的插件。"
-#: ../src/plugin.c:657
+#: ../libgaim/plugin.c:654
#, c-format
msgid "The dependent plugin %s failed to unload."
msgstr "依赖的插件 %s 装入失败。"
-#: ../src/plugin.c:662
+#: ../libgaim/plugin.c:659
msgid "Gaim encountered errors unloading the plugin."
msgstr "Gaim 卸载插件时遇到了错误。"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "DBus 示例"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+msgid "DBus Plugin Example"
+msgstr "DBus 插件示例"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/filectl.c:248
+msgid "Gaim File Control"
+msgstr "Gaim 文件控制"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr "允许您输入文件中的命令来控制 Gaim。"
+
+#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+msgid "Minutes"
+msgstr "分钟"
+
+#. This is a cultural reference. Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+msgid "I'dle Mak'er"
+msgstr "发呆器"
+
+#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+msgid "Set Account Idle Time"
+msgstr "设定账户发呆时间"
+
+#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+msgid "_Set"
+msgstr "设置(_S)"
+
+#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:228
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../libgaim/plugins/idle.c:183
+msgid "None of your accounts are idle."
+msgstr "您的全部账户都没有设为发呆。"
+
+#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+msgid "Unset Account Idle Time"
+msgstr "取消账户发呆时间的设定"
+
+#: ../libgaim/plugins/idle.c:202
+msgid "_Unset"
+msgstr "取消设置(_U)"
+
+#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "设定全部账户的发呆时间"
+
+#: ../libgaim/plugins/idle.c:268
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr "取消全部账户的发呆时间"
+
+#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr "允许您手动配置您发了多长时间呆"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "IPC 测试客户"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "测试插件 IPC 支持,作为客户。"
+
+#. * description
+#: ../libgaim/plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr "测试插件 IPC 支持,作为客户。这将定位服务器插件并调用注册的命令。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "IPC 测试服务器"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "测试插件 IPC 支持,作为服务器。"
+
+#. * description
+#: ../libgaim/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "测试插件 IPC 支持,作为服务器。这将注册 IPC 命令。"
+
+#: ../libgaim/plugins/log_reader.c:1412
+msgid "User is offline."
+msgstr "用户离线。"
+
+#: ../libgaim/plugins/log_reader.c:1418
+msgid "Auto-response sent:"
+msgstr "自动响应发送:"
+
+#: ../libgaim/plugins/log_reader.c:1428 ../libgaim/plugins/log_reader.c:1431
+#: ../libgaim/plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s 已登出。"
+
+#: ../libgaim/plugins/log_reader.c:1445
+msgid "One or more messages may have been undeliverable."
+msgstr ""
+
+#: ../libgaim/plugins/log_reader.c:1455
+msgid "You were disconnected from the server."
+msgstr "您已经断开与服务器的连接。"
+
+#: ../libgaim/plugins/log_reader.c:1463
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr "您目前已被断开。除非您再次登录,否则无法收到消息。"
+
+#: ../libgaim/plugins/log_reader.c:1478
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr "消息未发出,因为超过了最大长度。"
+
+#: ../libgaim/plugins/log_reader.c:1483
+msgid "Message could not be sent."
+msgstr "无法发送消息。"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1831 ../libgaim/plugins/log_reader.c:1940
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1844 ../libgaim/plugins/log_reader.c:1945
+msgid "Fire"
+msgstr "Fire"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1856 ../libgaim/plugins/log_reader.c:1949
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1869 ../libgaim/plugins/log_reader.c:1954
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them. Many translators
+#. choose to leave them alone. Choose what's best for your language.
+#: ../libgaim/plugins/log_reader.c:1881 ../libgaim/plugins/log_reader.c:1958
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../libgaim/plugins/log_reader.c:1922
+msgid "General Log Reading Configuration"
+msgstr "常规日志读取配置"
+
+#: ../libgaim/plugins/log_reader.c:1926
+msgid "Fast size calculations"
+msgstr "快速计算大小"
+
+#: ../libgaim/plugins/log_reader.c:1930
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+#: ../libgaim/plugins/log_reader.c:1936
+msgid "Log Directory"
+msgstr "日志目录"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/log_reader.c:1981
+msgid "Log Reader"
+msgstr "日志读取器"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../libgaim/plugins/log_reader.c:1985
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr "在日志查看器中包含其它即时通讯客户的日志。"
+
+#. * description
+#: ../libgaim/plugins/log_reader.c:1989
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently. Use it "
+"at your own risk!"
+msgstr ""
+"查看日志时,此插件将包含其它即时通讯客户端的日志。目前支持的即时通讯客户端包"
+"括 Adium、Fire、Messenger Plus!、MSN Messenger 和 Trillian。\n\n"
+"警告:此插件仍处于内测阶段,可能会经常崩溃。请小心使用!"
+
+#: ../libgaim/plugins/mono/loader/mono.c:213
+msgid "Mono Plugin Loader"
+msgstr "Mono 插件装入器"
+
+#: ../libgaim/plugins/mono/loader/mono.c:215
+#: ../libgaim/plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "装入 Mono 编写的 .NET 插件。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/perl/perl.c:583
+msgid "Perl Plugin Loader"
+msgstr "Perl 插件装入器"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../libgaim/plugins/perl/perl.c:585 ../libgaim/plugins/perl/perl.c:586
+msgid "Provides support for loading perl plugins."
+msgstr "提供装入 Perl 插件的支持。"
+
+#: ../libgaim/plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr ""
+
+#: ../libgaim/plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+#: ../libgaim/plugins/psychic.c:21
+msgid ""
+"Causes conversation windows to appear as other users begin to message you. "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+
+#. This is a quote from Star Wars. You should
+#. probably not translate it literally. If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../libgaim/plugins/psychic.c:63
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+#: ../libgaim/plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "仅对好友列表中的用户启用"
+
+#: ../libgaim/plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "离开时禁用"
+
+#: ../libgaim/plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "对话时显示通知消息"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/signals-test.c:684
+msgid "Signals Test"
+msgstr "信号测试"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+msgid "Test to see that all signals are working properly."
+msgstr "测试看看所有的信号是否都工作正确。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/simple.c:37
+msgid "Simple Plugin"
+msgstr "简单插件"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+msgid "Tests to see that most things are working."
+msgstr "测试看看大多数功能是否正常。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "提供 SSL 支持库。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
+#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+msgid "Provides SSL support through GNUTLS."
+msgstr "提供通过 GNUTLS 的 SSL 支持。"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/ssl/ssl-nss.c:409
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "提供通过 Mozilla NSS 的 SSL 支持。"
+
+#: ../libgaim/plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s 回来了。"
+
+#: ../libgaim/plugins/statenotify.c:52
+#, c-format
+msgid "%s has gone away."
+msgstr "%s 走了。"
+
+#: ../libgaim/plugins/statenotify.c:62
+#, c-format
+msgid "%s has become idle."
+msgstr "%s 发起了呆。"
+
+#: ../libgaim/plugins/statenotify.c:64
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s 发完呆了。"
+
+#: ../libgaim/plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s 已登入。"
+
+#: ../libgaim/plugins/statenotify.c:91
+msgid "Notify When"
+msgstr "通知情况"
+
+#: ../libgaim/plugins/statenotify.c:94
+msgid "Buddy Goes _Away"
+msgstr "好友离开(_A)"
+
+#: ../libgaim/plugins/statenotify.c:97
+msgid "Buddy Goes _Idle"
+msgstr "好友发呆(_I)"
+
+#: ../libgaim/plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "好友登入/登出(_S)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libgaim/plugins/statenotify.c:142
+msgid "Buddy State Notification"
+msgstr "好友状态通知"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr "好友离开/返回或发呆/睡醒时在对话窗口给出通知。"
+
+#: ../libgaim/plugins/tcl/tcl.c:413
+msgid "Tcl Plugin Loader"
+msgstr "Tcl 插件装入器"
+
+#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+msgid "Provides support for loading Tcl plugins"
+msgstr "提供装入 Tcl 插件的支持"
+
#. Send a message about the connection error
-#: ../src/protocols/bonjour/bonjour.c:111
+#: ../libgaim/protocols/bonjour/bonjour.c:111
msgid "Unable to listen for incoming IM connections\n"
msgstr "无法监听连入的 IM 连接\n"
-#: ../src/protocols/bonjour/bonjour.c:146
+#: ../libgaim/protocols/bonjour/bonjour.c:146
msgid ""
"Unable to establish connection with the local mDNS server. Is it running?"
msgstr "无法建立与本地 mDNS 服务器的连接。服务器是否在运行中?"
-#: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3251
+#: ../libgaim/protocols/bonjour/bonjour.c:337
+#: ../libgaim/protocols/sametime/sametime.c:3240
#, c-format
msgid ""
"\n"
@@ -5275,7 +6155,7 @@ msgstr ""
"\n"
"<b>状态:</b> %s"
-#: ../src/protocols/bonjour/bonjour.c:339
+#: ../libgaim/protocols/bonjour/bonjour.c:339
#, c-format
msgid ""
"\n"
@@ -5294,417 +6174,408 @@ msgstr ""
#. *< version
#. * summary
#. * description
-#: ../src/protocols/bonjour/bonjour.c:433
-#: ../src/protocols/bonjour/bonjour.c:435
+#: ../libgaim/protocols/bonjour/bonjour.c:434
+#: ../libgaim/protocols/bonjour/bonjour.c:436
msgid "Bonjour Protocol Plugin"
msgstr "Bonjour 协议插件"
-#: ../src/protocols/bonjour/bonjour.c:471
-#: ../src/protocols/bonjour/bonjour.c:479
-#: ../src/protocols/bonjour/bonjour.c:537
+#: ../libgaim/protocols/bonjour/bonjour.c:472
+#: ../libgaim/protocols/bonjour/bonjour.c:480
+#: ../libgaim/protocols/bonjour/bonjour.c:538
+#: ../libgaim/protocols/silc/silc.c:301
msgid "Gaim User"
msgstr "Gaim 用户"
#. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
+#: ../libgaim/protocols/bonjour/bonjour.c:576
+#: ../libgaim/protocols/silc/silc.c:935
msgid "Hostname"
msgstr "主机名"
#. Creating the options for the protocol
-#. port to connect to
-#: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
-msgid "Port"
-msgstr "端口"
-
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
-#: ../src/protocols/gg/gg.c:971
+#: ../libgaim/protocols/bonjour/bonjour.c:580 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/jabber/jabber.c:787
msgid "First name"
msgstr "名"
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
+#: ../libgaim/protocols/bonjour/bonjour.c:583 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/jabber/jabber.c:792
msgid "Last name"
msgstr "姓"
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Email"
+#: ../libgaim/protocols/bonjour/bonjour.c:586 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/jabber/jabber.c:777
+#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/silc.c:939
+msgid "E-mail"
msgstr "电子邮件"
-#: ../src/protocols/bonjour/jabber.c:357
+#: ../libgaim/protocols/bonjour/bonjour.c:589
+msgid "AIM Account"
+msgstr "AIM 账户"
+
+#: ../libgaim/protocols/bonjour/bonjour.c:592
+msgid "Jabber Account"
+msgstr "Jabber 账户"
+
+#: ../libgaim/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr ""
+
+#: ../libgaim/protocols/bonjour/jabber.c:374
#, c-format
msgid "%s has closed the conversation."
msgstr "%s 已经关闭了对话。"
-#: ../src/protocols/bonjour/jabber.c:439
+#: ../libgaim/protocols/bonjour/jabber.c:461
msgid "Cannot open socket"
msgstr "无法打开套接字"
-#: ../src/protocols/bonjour/jabber.c:447
-#, fuzzy
+#: ../libgaim/protocols/bonjour/jabber.c:469
msgid "Error setting socket options"
-msgstr "创建连接出错"
+msgstr "设置套接字选项出错"
-#: ../src/protocols/bonjour/jabber.c:458
-#, fuzzy
-msgid "Cannot bind socket to port"
-msgstr "无法设定话题"
+#: ../libgaim/protocols/bonjour/jabber.c:493
+msgid "Could not bind socket to port"
+msgstr "无法将套接字绑定到端口"
-#: ../src/protocols/bonjour/jabber.c:465
-#, fuzzy
-msgid "Cannot listen on socket"
-msgstr "无法创建套接字"
+#: ../libgaim/protocols/bonjour/jabber.c:501
+msgid "Could not listen on socket"
+msgstr "无法在套接字上监听"
-#: ../src/protocols/bonjour/jabber.c:559
-#, fuzzy
+#: ../libgaim/protocols/bonjour/jabber.c:594
msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "无法发送消息: 消息太大。"
+msgstr "无法发送消息,无法开始对话。"
+
+#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1684
+msgid "Invalid proxy settings"
+msgstr "无效的代理设置"
+
+#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1684
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr "您为给定代理类型所指定的主机名或端口号无效。"
-#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
-#: ../src/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:180
#, fuzzy
msgid "Token Error"
msgstr "未知错误"
-#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
-#: ../src/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:181
#, fuzzy
msgid "Unable to fetch the token.\n"
msgstr "无法获取房间列表。"
-#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
msgid "Save Buddylist..."
-msgstr "发送好友列表"
+msgstr "保存好友列表..."
-#: ../src/protocols/gg/gg.c:227
+#: ../libgaim/protocols/gg/gg.c:270
msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
+msgstr "您的好友列表为空,没有什么可保存到文件的。"
-#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
msgid "Couldn't open file"
-msgstr "无法发送文件"
+msgstr "无法打开文件"
-#: ../src/protocols/gg/gg.c:246
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:289
msgid "Buddylist saved successfully!"
-msgstr "密码成功更改"
+msgstr "好友列表成功保存!"
-#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
msgid "Couldn't load buddylist"
-msgstr "无法导出好友列表"
+msgstr "无法装入好友列表"
-#: ../src/protocols/gg/gg.c:281
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:324
msgid "Load Buddylist..."
-msgstr "好友别名(_A)..."
+msgstr "装入好友列表..."
-#: ../src/protocols/gg/gg.c:282
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:325
msgid "Buddylist loaded successfully!"
-msgstr "密码成功更改"
+msgstr "好友列表成功装入!"
-#: ../src/protocols/gg/gg.c:293
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:336
msgid "Save buddylist..."
-msgstr "好友列表"
+msgstr "保存好友列表..."
-#: ../src/protocols/gg/gg.c:337
+#: ../libgaim/protocols/gg/gg.c:380
msgid "Fill in the registration fields."
-msgstr ""
+msgstr "填入注册字段。"
-#: ../src/protocols/gg/gg.c:342
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:385
msgid "Passwords do not match."
-msgstr "新密码不相同。"
+msgstr "密码不匹配。"
-#: ../src/protocols/gg/gg.c:351
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:394
msgid "Unable to register new account. Error occurred.\n"
-msgstr "无法创建新连接。"
+msgstr "无法创建新账户。发生了错误。\n"
-#: ../src/protocols/gg/gg.c:364
+#: ../libgaim/protocols/gg/gg.c:407
msgid "New Gadu-Gadu Account Registered"
msgstr ""
-#: ../src/protocols/gg/gg.c:365
+#: ../libgaim/protocols/gg/gg.c:408
#, fuzzy
msgid "Registration completed successfully!"
msgstr "注册成功"
-#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "电子邮件"
-
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1306
+#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/jabber/jabber.c:766
+#: ../libgaim/protocols/jabber/jabber.c:1333
msgid "Password"
msgstr "密码"
-#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
#, fuzzy
msgid "Password (retype)"
msgstr "密码已送出"
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
#, fuzzy
msgid "Enter current token"
msgstr "%s 目前未登入。"
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
#, fuzzy
msgid "Current token"
msgstr "目前位于"
-#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
#, fuzzy
msgid "Register New Gadu-Gadu Account"
msgstr "注册新的 Jabber 账户"
-#: ../src/protocols/gg/gg.c:452
+#: ../libgaim/protocols/gg/gg.c:495
msgid "Please, fill in the following fields"
msgstr ""
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1606
-#, fuzzy
-msgid "Unable to initiate a new search"
-msgstr "无法写入网络"
-
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1607
-#, fuzzy
-msgid "You have a pending search. Please wait for it to finish."
-msgstr "您给 %s 发送消息的速度太快。"
-
-#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:1997 ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
-#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1035
+#. General
+#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
+#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2179
+#: ../libgaim/protocols/jabber/buddy.c:271
+#: ../libgaim/protocols/jabber/buddy.c:804
+#: ../libgaim/protocols/jabber/buddy.c:1528
+#: ../libgaim/protocols/jabber/buddy.c:1710
+#: ../libgaim/protocols/jabber/jabber.c:782
+#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1532
+#: ../libgaim/protocols/qq/buddy_info.c:55
+#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1035
+#: ../libgaim/protocols/silc/ops.c:1178 ../libgaim/protocols/silc/ops.c:1327
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1041
msgid "Nickname"
msgstr "昵称"
-#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
-#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
-#: ../src/protocols/oscar/oscar.c:6226
+#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
+#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:802
+#: ../libgaim/protocols/oscar/oscar.c:3664
+#: ../libgaim/protocols/oscar/oscar.c:3672
+#: ../libgaim/protocols/qq/buddy_info.c:79
msgid "City"
msgstr "城市"
-#: ../src/protocols/gg/gg.c:577
+#: ../libgaim/protocols/gg/gg.c:637
msgid "Year of birth"
-msgstr ""
+msgstr "出生年"
-#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1532
-#: ../src/protocols/oscar/oscar.c:6192
-#: ../src/protocols/yahoo/yahoo_profile.c:1060
+#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1534
+#: ../libgaim/protocols/oscar/oscar.c:3628
+#: ../libgaim/protocols/qq/buddy_info.c:62
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1066
msgid "Gender"
msgstr "性别"
-#: ../src/protocols/gg/gg.c:581
+#: ../libgaim/protocols/gg/gg.c:641
msgid "Male or female"
-msgstr ""
+msgstr "男或女"
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
+#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3628
+#: ../libgaim/protocols/qq/buddy_info.c:113
msgid "Male"
msgstr "男"
-#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
+#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3628
+#: ../libgaim/protocols/qq/buddy_info.c:114
msgid "Female"
msgstr "女"
-#: ../src/protocols/gg/gg.c:587
+#: ../libgaim/protocols/gg/gg.c:647
#, fuzzy
msgid "Only online"
msgstr "在线"
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
msgid "Find buddies"
msgstr "查找好友"
-#: ../src/protocols/gg/gg.c:593
+#: ../libgaim/protocols/gg/gg.c:653
msgid "Please, enter your search criteria below"
msgstr "请在下面输入您的搜索条件"
-#: ../src/protocols/gg/gg.c:630
+#: ../libgaim/protocols/gg/gg.c:690
msgid "Fill in the fields."
msgstr ""
-#: ../src/protocols/gg/gg.c:642
+#: ../libgaim/protocols/gg/gg.c:702
msgid "Your current password is different from the one that you specified."
-msgstr ""
+msgstr "您目前的密码与您所指定的密码不同。"
-#: ../src/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:716
msgid "Unable to change password. Error occured.\n"
msgstr "无法更改密码。发生了错误。\n"
-#: ../src/protocols/gg/gg.c:665
+#: ../libgaim/protocols/gg/gg.c:725
msgid "Change password for the Gadu-Gadu account"
msgstr "更改 Gadu-Gadu 帐户的密码"
-#: ../src/protocols/gg/gg.c:666
+#: ../libgaim/protocols/gg/gg.c:726
msgid "Password was changed successfully!"
msgstr "密码成功更改!"
-#: ../src/protocols/gg/gg.c:699
+#: ../libgaim/protocols/gg/gg.c:759
msgid "Current password"
msgstr "当前密码"
-#: ../src/protocols/gg/gg.c:724
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:784
msgid "Please, enter your current password and your new password for UIN: "
-msgstr "请输入您目前的密码和新密码。"
+msgstr "请输入您目前 UIN 的密码和新密码:"
-#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
msgid "Change Gadu-Gadu Password"
-msgstr "无法更改 Gadu-Gadu 密码"
+msgstr "更改 Gadu-Gadu 密码"
-#. TODO: s/screenname/alias/
-#: ../src/protocols/gg/gg.c:804
-#, fuzzy, c-format
+#: ../libgaim/protocols/gg/gg.c:863
+#, c-format
msgid "Select a chat for buddy: %s"
-msgstr "选择 %s 的字体"
+msgstr "为好友选择聊天:%s"
-#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
msgid "Add to chat..."
-msgstr "添加聊天(_H)"
+msgstr "添加到聊天..."
-#: ../src/protocols/gg/gg.c:950
-#, fuzzy
-msgid "No matching users found"
-msgstr "不匹配的主机"
-
-#: ../src/protocols/gg/gg.c:951
-msgid "There are no users matching your search criteria."
-msgstr ""
-
-#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
-#: ../src/protocols/oscar/oscar.c:6329
-#, fuzzy
-msgid "Unable to display the search results."
-msgstr "无法邀请用户(%s)。"
-
-#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6164
+#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/oscar/oscar.c:3600
msgid "UIN"
msgstr "UIN"
-#: ../src/protocols/gg/gg.c:980
-msgid "Birth year"
+#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
+#: ../libgaim/protocols/jabber/buddy.c:1524
+#: ../libgaim/protocols/jabber/buddy.c:1700
+#: ../libgaim/protocols/oscar/oscar.c:3611
+#: ../libgaim/protocols/silc/ops.c:1023
+msgid "First Name"
+msgstr "名"
+
+#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
+msgid "Birth Year"
msgstr "出生年份"
-#: ../src/protocols/gg/gg.c:1020
+#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/oscar/oscar.c:3775
+msgid "Unable to display the search results."
+msgstr "无法显示搜索结果。"
+
+#: ../libgaim/protocols/gg/gg.c:1152
msgid "Gadu-Gadu Public Directory"
-msgstr ""
+msgstr "Gadu-Gadu 公开目录"
-#: ../src/protocols/gg/gg.c:1021
+#: ../libgaim/protocols/gg/gg.c:1153
msgid "Search results"
msgstr "搜索结果"
-#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+#: ../libgaim/protocols/gg/gg.c:1196
+msgid "No matching users found"
+msgstr "未找到匹配的用户"
+
+#: ../libgaim/protocols/gg/gg.c:1197
+msgid "There are no users matching your search criteria."
+msgstr "没有与您的搜索条件匹配的用户。"
+
+#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1438
msgid "Unable to read socket"
msgstr "无法读取套接字"
-#: ../src/protocols/gg/gg.c:1201
+#: ../libgaim/protocols/gg/gg.c:1374
msgid "Buddy list downloaded"
msgstr "好友列表已下载"
-#: ../src/protocols/gg/gg.c:1202
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1375
msgid "Your buddy list was downloaded from the server."
-msgstr "您已经断开与服务器的连接。"
+msgstr "您的好友列表已经从服务器上下载。"
-#: ../src/protocols/gg/gg.c:1209
+#: ../libgaim/protocols/gg/gg.c:1382
msgid "Buddy list uploaded"
msgstr "好友列表已上传"
-#: ../src/protocols/gg/gg.c:1210
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1383
msgid "Your buddy list was stored on the server."
-msgstr "Gadu-Gadu 服务器没有存储好友列表。"
+msgstr "您的好友列表存储于服务器上。"
-#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1528
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1484 ../libgaim/protocols/gg/gg.c:1708
msgid "Connection failed."
-msgstr "连接失败"
+msgstr "连接失败。"
-#: ../src/protocols/gg/gg.c:1441 ../src/protocols/msn/msn.c:566
+#: ../libgaim/protocols/gg/gg.c:1614 ../libgaim/protocols/msn/msn.c:562
msgid "Blocked"
msgstr "被屏蔽"
-#: ../src/protocols/gg/gg.c:1464
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1637
msgid "Add to chat"
-msgstr "添加聊天"
+msgstr "添加到聊天"
-#: ../src/protocols/gg/gg.c:1473
+#: ../libgaim/protocols/gg/gg.c:1646
#, fuzzy
msgid "Unblock"
msgstr "屏蔽"
-#: ../src/protocols/gg/gg.c:1477
+#: ../libgaim/protocols/gg/gg.c:1650
msgid "Block"
msgstr "屏蔽"
-#: ../src/protocols/gg/gg.c:1494
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1667
msgid "Chat _name:"
-msgstr "姓:"
+msgstr "聊天名(_N):"
-#: ../src/protocols/gg/gg.c:1718
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1900
msgid "Chat error"
-msgstr "读取错误"
+msgstr "聊天错误"
-#: ../src/protocols/gg/gg.c:1719
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1901
msgid "This chat name is already in use"
-msgstr "该文件已存在"
+msgstr "此聊天名已经在使用中"
-#: ../src/protocols/gg/gg.c:1802
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:1984
msgid "Not connected to the server."
-msgstr "您已经断开与服务器的连接。"
+msgstr "未连接到服务器。"
-#: ../src/protocols/gg/gg.c:1825
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:2007
msgid "Find buddies..."
-msgstr "显示睡着的好友(_D)"
+msgstr "查找好友..."
-#: ../src/protocols/gg/gg.c:1831
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:2013
msgid "Change password..."
msgstr "更改密码..."
-#: ../src/protocols/gg/gg.c:1837
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:2019
msgid "Upload buddylist to Server"
-msgstr "将好友列表导出到服务器"
+msgstr "将好友列表上传到服务器"
-#: ../src/protocols/gg/gg.c:1841
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:2023
msgid "Download buddylist from Server"
-msgstr "从服务器删除好友列表"
+msgstr "从服务器下载好友列表"
-#: ../src/protocols/gg/gg.c:1845
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:2027
msgid "Delete buddylist from Server"
msgstr "从服务器删除好友列表"
-#: ../src/protocols/gg/gg.c:1849
+#: ../libgaim/protocols/gg/gg.c:2031
msgid "Save buddylist to file..."
-msgstr ""
+msgstr "将好友列表保存到文件..."
-#: ../src/protocols/gg/gg.c:1853
+#: ../libgaim/protocols/gg/gg.c:2035
msgid "Load buddylist from file..."
-msgstr ""
+msgstr "从文件装入好友列表..."
#. magic
#. major_version
@@ -5717,120 +6588,122 @@ msgstr ""
#. id
#. name
#. version
-#: ../src/protocols/gg/gg.c:1949
+#: ../libgaim/protocols/gg/gg.c:2131
msgid "Gadu-Gadu Protocol Plugin"
msgstr "Gadu-Gadu 协议插件"
#. summary
-#: ../src/protocols/gg/gg.c:1950
+#: ../libgaim/protocols/gg/gg.c:2132
msgid "Polish popular IM"
-msgstr ""
+msgstr "波兰流行的即时通讯软件"
-#: ../src/protocols/gg/gg.c:1998
-#, fuzzy
+#: ../libgaim/protocols/gg/gg.c:2180
msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu 搜索引擎"
+msgstr "Gadu-Gadu 用户"
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
+#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1585
#, c-format
msgid "Unknown command: %s"
msgstr "未知的错误代码: %s"
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1294
+#: ../libgaim/protocols/irc/cmds.c:501 ../libgaim/protocols/jabber/chat.c:590
+#: ../libgaim/protocols/silc/silc.c:1293
#, c-format
msgid "current topic is: %s"
msgstr "目前的话题为: %s"
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1298
+#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:594
+#: ../libgaim/protocols/silc/silc.c:1297
msgid "No topic is set"
msgstr "未设定话题"
-#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
-#: ../src/protocols/yahoo/yahoo_filexfer.c:252
-#: ../src/protocols/yahoo/yahoo_filexfer.c:261
-#: ../src/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libgaim/protocols/irc/dcc_send.c:293
+#: ../libgaim/protocols/irc/dcc_send.c:334
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
msgid "File Transfer Failed"
msgstr "文件传送失败"
-#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
+#: ../libgaim/protocols/irc/dcc_send.c:294
+#: ../libgaim/protocols/irc/dcc_send.c:335
msgid "Gaim could not open a listening port."
msgstr "Gaim 无法打开监听端口。"
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:78
msgid "Error displaying MOTD"
msgstr "显示 MOTD 出错"
-#: ../src/protocols/irc/irc.c:78
+#: ../libgaim/protocols/irc/irc.c:78
msgid "No MOTD available"
msgstr "没有可用的 MOTD"
-#: ../src/protocols/irc/irc.c:79
+#: ../libgaim/protocols/irc/irc.c:79
msgid "There is no MOTD associated with this connection."
msgstr "没有与此连接关联的 MOTD"
-#: ../src/protocols/irc/irc.c:82
+#: ../libgaim/protocols/irc/irc.c:82
#, c-format
msgid "MOTD for %s"
msgstr "%s 的 MOTD"
-#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
-#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
+#: ../libgaim/protocols/irc/irc.c:119 ../libgaim/protocols/irc/irc.c:149
+#: ../libgaim/protocols/irc/irc.c:595 ../libgaim/protocols/irc/irc.c:620
msgid "Server has disconnected"
msgstr "服务器已断开连接"
-#: ../src/protocols/irc/irc.c:242
+#: ../libgaim/protocols/irc/irc.c:242
msgid "View MOTD"
msgstr "查看 MOTD"
-#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
+#: ../libgaim/protocols/irc/irc.c:254 ../libgaim/protocols/silc/chat.c:33
msgid "_Channel:"
msgstr "频道(_C):"
-#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
+#: ../libgaim/protocols/irc/irc.c:260 ../libgaim/protocols/jabber/chat.c:59
msgid "_Password:"
msgstr "密码(_P):"
-#: ../src/protocols/irc/irc.c:292
+#: ../libgaim/protocols/irc/irc.c:291
msgid "IRC nicks may not contain whitespace"
msgstr "IRC 昵称不能包含空格"
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
+#: ../libgaim/protocols/irc/irc.c:320 ../libgaim/protocols/jabber/jabber.c:562
+#: ../libgaim/protocols/jabber/jabber.c:907
msgid "SSL support unavailable"
msgstr "SSL 支持不可用"
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
-#: ../src/protocols/simple/simple.c:1518
+#: ../libgaim/protocols/irc/irc.c:332 ../libgaim/protocols/simple/simple.c:466
+#: ../libgaim/protocols/simple/simple.c:1582
msgid "Couldn't create socket"
msgstr "无法创建套接字"
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1867 ../src/protocols/oscar/oscar.c:1934
+#: ../libgaim/protocols/irc/irc.c:396 ../libgaim/protocols/jabber/jabber.c:438
+#: ../libgaim/protocols/oscar/oscar.c:1206
msgid "Couldn't connect to host"
msgstr "无法连接到主机"
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
+#: ../libgaim/protocols/irc/irc.c:418 ../libgaim/protocols/jabber/jabber.c:462
msgid "Connection Failed"
msgstr "连接失败"
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
+#: ../libgaim/protocols/irc/irc.c:421 ../libgaim/protocols/jabber/jabber.c:465
msgid "SSL Handshake Failed"
msgstr "SSL 握手失败"
-#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
+#: ../libgaim/protocols/irc/irc.c:592 ../libgaim/protocols/irc/irc.c:617
msgid "Read error"
msgstr "读取错误"
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
-#: ../src/protocols/yahoo/yahoochat.c:1430
+#: ../libgaim/protocols/irc/irc.c:756 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/yahoo/yahoochat.c:1438
msgid "Users"
msgstr "用户"
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3362
-#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
-#: ../src/protocols/yahoo/yahoochat.c:1439
+#: ../libgaim/protocols/irc/irc.c:759
+#: ../libgaim/protocols/sametime/sametime.c:3351
+#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1379
+#: ../libgaim/protocols/yahoo/yahoochat.c:1447
msgid "Topic"
msgstr "话题"
@@ -5842,37 +6715,48 @@ msgstr "话题"
#. *< id
#. *< name
#. *< version
-#: ../src/protocols/irc/irc.c:877
+#: ../libgaim/protocols/irc/irc.c:868
msgid "IRC Protocol Plugin"
msgstr "IRC 协议插件"
#. * summary
-#: ../src/protocols/irc/irc.c:878
+#: ../libgaim/protocols/irc/irc.c:869
msgid "The IRC Protocol Plugin that Sucks Less"
msgstr "错误更少的 IRC 协议插件"
#. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1904
-#: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
+#: ../libgaim/protocols/irc/irc.c:888 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/jabber/jabber.c:1955
+#: ../libgaim/protocols/msn/msn.c:2046 ../libgaim/protocols/oscar/oscar.c:6508
+#: ../libgaim/protocols/sametime/sametime.c:5638
+#: ../libgaim/protocols/silc/ops.c:1241 ../libgaim/protocols/silc/ops.c:1343
+#: ../libgaim/protocols/simple/simple.c:1832
+#: ../libgaim/protocols/toc/toc.c:2341
msgid "Server"
msgstr "服务器"
-#: ../src/protocols/irc/irc.c:903
+#. port to connect to
+#: ../libgaim/protocols/irc/irc.c:891 ../libgaim/protocols/msn/msn.c:2051
+#: ../libgaim/protocols/oscar/oscar.c:6511
+#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libgaim/protocols/silc/silc.c:1858 ../libgaim/protocols/toc/toc.c:2345
+msgid "Port"
+msgstr "端口"
+
+#: ../libgaim/protocols/irc/irc.c:894
msgid "Encodings"
msgstr "编码"
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
-#: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
-#: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:933
+#: ../libgaim/protocols/irc/irc.c:897 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/jabber/jabber.c:762
+#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1188
+#: ../libgaim/protocols/silc/ops.c:1190 ../libgaim/protocols/silc/ops.c:1337
+#: ../libgaim/protocols/silc/ops.c:1339 ../libgaim/protocols/silc/silc.c:933
msgid "Username"
msgstr "用户名"
-#: ../src/protocols/irc/irc.c:909
+#: ../libgaim/protocols/irc/irc.c:900 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/silc/silc.c:937
msgid "Real name"
msgstr "真名"
@@ -5880,237 +6764,236 @@ msgstr "真名"
#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
#.
-#: ../src/protocols/irc/irc.c:917
+#: ../libgaim/protocols/irc/irc.c:908
msgid "Use SSL"
msgstr "使用 SSL"
-#: ../src/protocols/irc/msgs.c:103
+#: ../libgaim/protocols/irc/msgs.c:107
msgid "Bad mode"
msgstr "无效模式"
-#: ../src/protocols/irc/msgs.c:114
+#: ../libgaim/protocols/irc/msgs.c:118
#, c-format
msgid "You are banned from %s."
msgstr "您被 %s 屏蔽了。"
-#: ../src/protocols/irc/msgs.c:115
+#: ../libgaim/protocols/irc/msgs.c:119
msgid "Banned"
msgstr "屏蔽"
-#: ../src/protocols/irc/msgs.c:132
+#: ../libgaim/protocols/irc/msgs.c:136
#, c-format
msgid "Cannot ban %s: banlist is full"
msgstr "无法屏蔽 %s:屏蔽列表已满"
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/irc/msgs.c:248
#, c-format
msgid "<b>%s:</b> %s"
msgstr "<b>%s:</b> %s"
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3601
+#: ../libgaim/protocols/silc/ops.c:1411
msgid "Nick"
msgstr "昵称"
-#: ../src/protocols/irc/msgs.c:214
+#: ../libgaim/protocols/irc/msgs.c:218
msgid " <i>(ircop)</i>"
msgstr " <i>(ircop)</i>"
-#: ../src/protocols/irc/msgs.c:215
+#: ../libgaim/protocols/irc/msgs.c:219
msgid " <i>(identified)</i>"
msgstr " <i>(identified)</i>"
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
-#: ../src/protocols/yahoo/yahoo_profile.c:691
+#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:691
#, c-format
msgid "<b>%s:</b> %s<br>"
msgstr "<b>%s:</b> %s<br>"
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1040
-msgid "Realname"
-msgstr "真名"
-
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1254
msgid "Currently on"
msgstr "目前位于"
-#: ../src/protocols/irc/msgs.c:242
+#: ../libgaim/protocols/irc/msgs.c:246
#, c-format
msgid "<b>Idle for:</b> %s<br>"
msgstr "<b>发呆了:</b> %s<br>"
-#: ../src/protocols/irc/msgs.c:244
+#: ../libgaim/protocols/irc/msgs.c:248
msgid "Online since"
msgstr "上线时间"
-#: ../src/protocols/irc/msgs.c:248
+#: ../libgaim/protocols/irc/msgs.c:252
msgid "<br><b>Defining adjective:</b> Glorious<br>"
msgstr "<br><b>定义形容词:</b>显赫<br>"
-#: ../src/protocols/irc/msgs.c:318
+#: ../libgaim/protocols/irc/msgs.c:329
#, c-format
msgid "%s has changed the topic to: %s"
msgstr "%s 将话题改为: %s"
-#: ../src/protocols/irc/msgs.c:325
+#: ../libgaim/protocols/irc/msgs.c:331
+#, fuzzy, c-format
+msgid "%s has cleared the topic."
+msgstr "%s 将话题改为: %s"
+
+#: ../libgaim/protocols/irc/msgs.c:339
#, c-format
msgid "The topic for %s is: %s"
msgstr "%s 的话题为: %s"
-#: ../src/protocols/irc/msgs.c:343
+#: ../libgaim/protocols/irc/msgs.c:357
#, c-format
msgid "Unknown message '%s'"
msgstr "未知信息“%s”"
-#: ../src/protocols/irc/msgs.c:344
+#: ../libgaim/protocols/irc/msgs.c:358
msgid "Unknown message"
msgstr "未知信息"
-#: ../src/protocols/irc/msgs.c:344
+#: ../libgaim/protocols/irc/msgs.c:358
msgid "Gaim has sent a message the IRC server did not understand."
msgstr "Gaim 发送了 IRC 服务器无法理解的信息。"
-#: ../src/protocols/irc/msgs.c:367
+#: ../libgaim/protocols/irc/msgs.c:381
#, c-format
msgid "Users on %s: %s"
msgstr "%s 上的用户数: %s"
-#: ../src/protocols/irc/msgs.c:495
+#: ../libgaim/protocols/irc/msgs.c:509
msgid "Time Response"
msgstr "时间响应"
-#: ../src/protocols/irc/msgs.c:496
+#: ../libgaim/protocols/irc/msgs.c:510
msgid "The IRC server's local time is:"
msgstr "IRC 服务器的本地时间为:"
-#: ../src/protocols/irc/msgs.c:507
+#: ../libgaim/protocols/irc/msgs.c:521
msgid "No such channel"
msgstr "没有这样的频道"
#. does this happen?
-#: ../src/protocols/irc/msgs.c:518
+#: ../libgaim/protocols/irc/msgs.c:532
msgid "no such channel"
msgstr "没有这样的频道"
-#: ../src/protocols/irc/msgs.c:521
+#: ../libgaim/protocols/irc/msgs.c:535
msgid "User is not logged in"
msgstr "用户未登入"
-#: ../src/protocols/irc/msgs.c:526
+#: ../libgaim/protocols/irc/msgs.c:540
msgid "No such nick or channel"
msgstr "没有这样的昵称或频道"
-#: ../src/protocols/irc/msgs.c:546
+#: ../libgaim/protocols/irc/msgs.c:560
msgid "Could not send"
msgstr "无法发送"
-#: ../src/protocols/irc/msgs.c:602
+#: ../libgaim/protocols/irc/msgs.c:616
#, c-format
msgid "Joining %s requires an invitation."
msgstr "加入 %s 需要邀请。"
-#: ../src/protocols/irc/msgs.c:603
+#: ../libgaim/protocols/irc/msgs.c:617
msgid "Invitation only"
msgstr "只邀请"
-#: ../src/protocols/irc/msgs.c:704
+#: ../libgaim/protocols/irc/msgs.c:726
#, c-format
msgid "You have been kicked by %s: (%s)"
msgstr "您被 %s: %s 踢出了"
#. Remove user from channel
-#: ../src/protocols/irc/msgs.c:709 ../src/protocols/silc/ops.c:721
+#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
#, c-format
msgid "Kicked by %s (%s)"
msgstr "被 %s (%s) 踢出"
-#: ../src/protocols/irc/msgs.c:732
+#: ../libgaim/protocols/irc/msgs.c:754
#, c-format
msgid "mode (%s %s) by %s"
msgstr "由 %3$s 管理(%1$s %2$s)"
-#: ../src/protocols/irc/msgs.c:817 ../src/protocols/irc/msgs.c:818
+#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
msgid "Invalid nickname"
msgstr "无效的昵称"
-#: ../src/protocols/irc/msgs.c:819
+#: ../libgaim/protocols/irc/msgs.c:841
msgid ""
"Your selected nickname was rejected by the server. It probably contains "
"invalid characters."
msgstr "您所选的昵称被服务器拒绝。其中可能包含无效的字符。"
-#: ../src/protocols/irc/msgs.c:823
+#: ../libgaim/protocols/irc/msgs.c:845
msgid ""
"Your selected account name was rejected by the server. It probably contains "
"invalid characters."
msgstr "您所选的账户名称被服务器拒绝。其中可能包含无效的字符。"
-#: ../src/protocols/irc/msgs.c:863
+#: ../libgaim/protocols/irc/msgs.c:884
msgid "Cannot change nick"
msgstr "无法更改昵称"
-#: ../src/protocols/irc/msgs.c:863
+#: ../libgaim/protocols/irc/msgs.c:884
msgid "Could not change nick"
msgstr "无法更改昵称"
-#: ../src/protocols/irc/msgs.c:884
+#: ../libgaim/protocols/irc/msgs.c:905
#, c-format
msgid "You have parted the channel%s%s"
msgstr "您已经参与了频道%s%s"
-#: ../src/protocols/irc/msgs.c:926
+#: ../libgaim/protocols/irc/msgs.c:947
msgid "Error: invalid PONG from server"
msgstr "错误: 服务器的 PONG 无效"
-#: ../src/protocols/irc/msgs.c:928
+#: ../libgaim/protocols/irc/msgs.c:949
#, c-format
msgid "PING reply -- Lag: %lu seconds"
msgstr "PING 响应 -- 延后: %lu 秒"
-#: ../src/protocols/irc/msgs.c:1003
+#: ../libgaim/protocols/irc/msgs.c:1030
#, c-format
msgid "Cannot join %s:"
msgstr "无法加入 %s:"
-#: ../src/protocols/irc/msgs.c:1004 ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1031 ../libgaim/protocols/silc/ops.c:1127
msgid "Cannot join channel"
msgstr "无法加入频道"
-#: ../src/protocols/irc/msgs.c:1038
+#: ../libgaim/protocols/irc/msgs.c:1065
msgid "Nick or channel is temporarily unavailable."
msgstr "昵称或频道暂时不可用。"
-#: ../src/protocols/irc/msgs.c:1050
+#: ../libgaim/protocols/irc/msgs.c:1077
#, c-format
msgid "Wallops from %s"
msgstr "来自 %s 的冲击"
-#: ../src/protocols/irc/parse.c:114
+#: ../libgaim/protocols/irc/parse.c:114
msgid "action &lt;action to perform&gt;: Perform an action."
msgstr "action &lt;要执行的动作&gt;: 执行动作。"
-#: ../src/protocols/irc/parse.c:115
+#: ../libgaim/protocols/irc/parse.c:115
msgid ""
"away [message]: Set an away message, or use no message to return from being "
"away."
msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
-#: ../src/protocols/irc/parse.c:116
+#: ../libgaim/protocols/irc/parse.c:116
msgid "chanserv: Send a command to chanserv"
msgstr "chanserv: 向 chanserv 发送命令"
-#: ../src/protocols/irc/parse.c:117
+#: ../libgaim/protocols/irc/parse.c:117
msgid ""
"deop &lt;nick1&gt; [nick2] ...: Remove channel operator status from "
"someone. You must be a channel operator to do this."
msgstr ""
"deop &lt;昵称1&gt; [昵称2]……: 删除某人的管理员状态。您必须是频道管理员。"
-#: ../src/protocols/irc/parse.c:118
+#: ../libgaim/protocols/irc/parse.c:118
msgid ""
"devoice &lt;nick1&gt; [nick2] ...: Remove channel voice status from "
"someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -6119,13 +7002,13 @@ msgstr ""
"devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
"(+m)时说话。您必须是频道管理员。"
-#: ../src/protocols/irc/parse.c:119
+#: ../libgaim/protocols/irc/parse.c:119
msgid ""
"invite &lt;nick&gt; [room]: Invite someone to join you in the specified "
"channel, or the current channel."
msgstr "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道,或者当前频道。"
-#: ../src/protocols/irc/parse.c:120
+#: ../libgaim/protocols/irc/parse.c:120
msgid ""
"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
@@ -6133,7 +7016,7 @@ msgstr ""
"j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
"的话可选提供频道密钥。"
-#: ../src/protocols/irc/parse.c:121
+#: ../libgaim/protocols/irc/parse.c:121
msgid ""
"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]: Enter one or more "
"channels, optionally providing a channel key for each if needed."
@@ -6141,900 +7024,1009 @@ msgstr ""
"join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
"要的话可选提供频道密钥。"
-#: ../src/protocols/irc/parse.c:122
+#: ../libgaim/protocols/irc/parse.c:122
msgid ""
"kick &lt;nick&gt; [message]: Remove someone from a channel. You must be a "
"channel operator to do this."
msgstr "kick &lt;昵称&gt; [消息]: 将某人踢出频道。您必须是频道管理员。"
-#: ../src/protocols/irc/parse.c:123
+#: ../libgaim/protocols/irc/parse.c:123
msgid ""
"list: Display a list of chat rooms on the network. <i>Warning, some servers "
"may disconnect you upon doing this.</i>"
msgstr ""
"list: 显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
-#: ../src/protocols/irc/parse.c:124
+#: ../libgaim/protocols/irc/parse.c:124
msgid "me &lt;action to perform&gt;: Perform an action."
msgstr "me &lt;要执行的动作&gt;: 执行动作。"
-#: ../src/protocols/irc/parse.c:125
+#: ../libgaim/protocols/irc/parse.c:125
msgid "memoserv: Send a command to memoserv"
msgstr "memoserv: 向 memoserv 发送命令"
-#: ../src/protocols/irc/parse.c:126
+#: ../libgaim/protocols/irc/parse.c:126
msgid ""
"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;: Set or unset a channel "
"or user mode."
msgstr ""
"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;昵称|频道&gt;: 设置或取消频道或用户模式。"
-#: ../src/protocols/irc/parse.c:127
+#: ../libgaim/protocols/irc/parse.c:127
msgid ""
"msg &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as "
"opposed to a channel)."
msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
-#: ../src/protocols/irc/parse.c:128
+#: ../libgaim/protocols/irc/parse.c:128
msgid "names [channel]: List the users currently in a channel."
msgstr "name [频道]: 列出频道中目前的用户。"
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1742
+#: ../libgaim/protocols/irc/parse.c:129
+#: ../libgaim/protocols/jabber/jabber.c:1769
msgid "nick &lt;new nickname&gt;: Change your nickname."
msgstr "nick &lt;新昵称&gt;: 更改您的昵称。"
-#: ../src/protocols/irc/parse.c:130
+#: ../libgaim/protocols/irc/parse.c:130
#, fuzzy
msgid "nickserv: Send a command to nickserv"
msgstr "quot [……]: 向服务器发送原始命令。"
-#: ../src/protocols/irc/parse.c:131
+#: ../libgaim/protocols/irc/parse.c:131
msgid ""
"op &lt;nick1&gt; [nick2] ...: Grant channel operator status to someone. You "
"must be a channel operator to do this."
msgstr ""
"op &lt;昵称1&gt; [昵称2]……: 为某人授予频道管理员状态。您必须是频道管理员。"
-#: ../src/protocols/irc/parse.c:132
+#: ../libgaim/protocols/irc/parse.c:132
msgid ""
"operwall &lt;message&gt;: If you don't know what this is, you probably "
"can't use it."
msgstr "operwall &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
-#: ../src/protocols/irc/parse.c:133
+#: ../libgaim/protocols/irc/parse.c:133
#, fuzzy
msgid "operserv: Send a command to operserv"
msgstr "quot [……]: 向服务器发送原始命令。"
-#: ../src/protocols/irc/parse.c:134
+#: ../libgaim/protocols/irc/parse.c:134
msgid ""
"part [room] [message]: Leave the current channel, or a specified channel, "
"with an optional message."
msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
-#: ../src/protocols/irc/parse.c:135
+#: ../libgaim/protocols/irc/parse.c:135
msgid ""
"ping [nick]: Asks how much lag a user (or the server if no user specified) "
"has."
msgstr "ping [昵称]: 询问用户发了多长时间呆(若未指定用户则代表服务器)。"
-#: ../src/protocols/irc/parse.c:136
+#: ../libgaim/protocols/irc/parse.c:136
msgid ""
"query &lt;nick&gt; &lt;message&gt;: Send a private message to a user (as "
"opposed to a channel)."
msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
-#: ../src/protocols/irc/parse.c:137
+#: ../libgaim/protocols/irc/parse.c:137
msgid "quit [message]: Disconnect from the server, with an optional message."
msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
-#: ../src/protocols/irc/parse.c:138
+#: ../libgaim/protocols/irc/parse.c:138
msgid "quote [...]: Send a raw command to the server."
msgstr "quot [……]: 向服务器发送原始命令。"
-#: ../src/protocols/irc/parse.c:139
+#: ../libgaim/protocols/irc/parse.c:139
msgid ""
"remove &lt;nick&gt; [message]: Remove someone from a room. You must be a "
"channel operator to do this."
msgstr "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
-#: ../src/protocols/irc/parse.c:140
+#: ../libgaim/protocols/irc/parse.c:140
msgid "time: Displays the current local time at the IRC server."
msgstr "time: 显示 IRC 服务器上当前的本地时间。"
-#: ../src/protocols/irc/parse.c:141
+#: ../libgaim/protocols/irc/parse.c:141
msgid "topic [new topic]: View or change the channel topic."
msgstr "topic [新话题]: 查看或更改频道话题。"
-#: ../src/protocols/irc/parse.c:142
+#: ../libgaim/protocols/irc/parse.c:142
msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;: Set or unset a user mode."
msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 设置或取消用户模式。"
-#: ../src/protocols/irc/parse.c:143
+#: ../libgaim/protocols/irc/parse.c:143
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr ""
+
+#: ../libgaim/protocols/irc/parse.c:144
msgid ""
"voice &lt;nick1&gt; [nick2] ...: Grant channel voice status to someone. You "
"must be a channel operator to do this."
msgstr ""
"voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
-#: ../src/protocols/irc/parse.c:144
+#: ../libgaim/protocols/irc/parse.c:145
msgid ""
"wallops &lt;message&gt;: If you don't know what this is, you probably can't "
"use it."
msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
-#: ../src/protocols/irc/parse.c:145
+#: ../libgaim/protocols/irc/parse.c:146
msgid "whois [server] &lt;nick&gt;: Get information on a user."
msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
-#: ../src/protocols/irc/parse.c:439
+#: ../libgaim/protocols/irc/parse.c:440
#, c-format
msgid "Reply time from %s: %lu seconds"
msgstr "%s 的回复时间: %lu 秒"
-#: ../src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:441
msgid "PONG"
msgstr "PONG"
-#: ../src/protocols/irc/parse.c:440
+#: ../libgaim/protocols/irc/parse.c:441
msgid "CTCP PING reply"
msgstr "CTCP PING 响应"
-#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
-#: ../src/protocols/oscar/oscar.c:1774 ../src/protocols/toc/toc.c:190
-#: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
-#: ../src/protocols/toc/toc.c:780
+#: ../libgaim/protocols/irc/parse.c:543 ../libgaim/protocols/irc/parse.c:547
+#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:689
+#: ../libgaim/protocols/toc/toc.c:705 ../libgaim/protocols/toc/toc.c:781
msgid "Disconnected."
msgstr "已断开连接。"
-#: ../src/protocols/jabber/auth.c:51
+#: ../libgaim/protocols/jabber/auth.c:51
msgid ""
"Server requires TLS/SSL for login. Select \"Use TLS if available\" in "
"account properties"
msgstr "服务器需要 TLS/SSL 登录。请在账户属性中选择“若可用则使用 TLS”"
-#: ../src/protocols/jabber/auth.c:53
+#: ../libgaim/protocols/jabber/auth.c:53
msgid "Server requires TLS/SSL for login. No TLS/SSL support found."
msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
-#: ../src/protocols/jabber/auth.c:114
+#: ../libgaim/protocols/jabber/auth.c:114
msgid "Server requires plaintext authentication over an unencrypted stream"
msgstr "服务器需要在不加密流上使用纯文本验证"
-#: ../src/protocols/jabber/auth.c:234
+#: ../libgaim/protocols/jabber/auth.c:234
msgid "Server couldn't authenticate you without a password"
msgstr ""
-#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
-#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
-#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
+#: ../libgaim/protocols/jabber/auth.c:237
+#: ../libgaim/protocols/jabber/auth.c:238
+#: ../libgaim/protocols/jabber/auth.c:406
+#: ../libgaim/protocols/jabber/auth.c:407
+#: ../libgaim/protocols/jabber/auth.c:488
+#: ../libgaim/protocols/jabber/auth.c:489
msgid "Plaintext Authentication"
msgstr "纯文本认证"
-#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
-#: ../src/protocols/jabber/auth.c:482
+#: ../libgaim/protocols/jabber/auth.c:239
+#: ../libgaim/protocols/jabber/auth.c:408
+#: ../libgaim/protocols/jabber/auth.c:490
msgid ""
"This server requires plaintext authentication over an unencrypted "
"connection. Allow this and continue authentication?"
msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
-#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
-#: ../src/protocols/jabber/auth.c:490
+#: ../libgaim/protocols/jabber/auth.c:245
+#: ../libgaim/protocols/jabber/auth.c:416
+#: ../libgaim/protocols/jabber/auth.c:498
msgid "Server does not use any supported authentication method"
msgstr "服务器未使用任何支持的身份验证方法"
#. This should never happen!
-#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
-#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
-#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
-#: ../src/protocols/jabber/jabber.c:110
+#: ../libgaim/protocols/jabber/auth.c:329
+#: ../libgaim/protocols/jabber/auth.c:451
+#: ../libgaim/protocols/jabber/auth.c:619
+#: ../libgaim/protocols/jabber/auth.c:752
+#: ../libgaim/protocols/jabber/auth.c:764
+#: ../libgaim/protocols/jabber/auth.c:783
+#: ../libgaim/protocols/jabber/jabber.c:112
msgid "Invalid response from server."
msgstr "服务器的响应无效。"
-#: ../src/protocols/jabber/auth.c:632
+#: ../libgaim/protocols/jabber/auth.c:640
msgid "Invalid challenge from server"
msgstr "服务器的挑战无效"
-#: ../src/protocols/jabber/auth.c:719
+#: ../libgaim/protocols/jabber/auth.c:727
msgid "SASL error"
msgstr "SASL 错误"
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
-#: ../src/protocols/silc/ops.c:1020
+#: ../libgaim/protocols/jabber/buddy.c:268
+#: ../libgaim/protocols/jabber/buddy.c:773
+#: ../libgaim/protocols/silc/ops.c:1019
msgid "Full Name"
msgstr "全名"
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
-#: ../src/protocols/silc/ops.c:1032
+#: ../libgaim/protocols/jabber/buddy.c:269
+#: ../libgaim/protocols/jabber/buddy.c:786
+#: ../libgaim/protocols/silc/ops.c:1031
msgid "Family Name"
msgstr "姓"
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
+#: ../libgaim/protocols/jabber/buddy.c:270
+#: ../libgaim/protocols/jabber/buddy.c:790
msgid "Given Name"
msgstr "名"
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
+#: ../libgaim/protocols/jabber/buddy.c:272
+#: ../libgaim/protocols/jabber/jabber.c:822
msgid "URL"
msgstr "URL"
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
+#: ../libgaim/protocols/jabber/buddy.c:273
+#: ../libgaim/protocols/jabber/buddy.c:842
msgid "Street Address"
msgstr "街道地址"
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
+#: ../libgaim/protocols/jabber/buddy.c:274
+#: ../libgaim/protocols/jabber/buddy.c:838
msgid "Extended Address"
msgstr "额外地址"
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
+#: ../libgaim/protocols/jabber/buddy.c:275
+#: ../libgaim/protocols/jabber/buddy.c:846
msgid "Locality"
msgstr "地区"
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
+#: ../libgaim/protocols/jabber/buddy.c:276
+#: ../libgaim/protocols/jabber/buddy.c:850
msgid "Region"
msgstr "区域"
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
+#: ../libgaim/protocols/jabber/buddy.c:277
+#: ../libgaim/protocols/jabber/buddy.c:854
msgid "Postal Code"
msgstr "邮政编码"
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
-#: ../src/protocols/silc/silc.c:943
+#: ../libgaim/protocols/jabber/buddy.c:278
+#: ../libgaim/protocols/jabber/buddy.c:859
+#: ../libgaim/protocols/silc/silc.c:943
msgid "Country"
msgstr "国家"
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
-#: ../src/protocols/jabber/buddy.c:768
+#: ../libgaim/protocols/jabber/buddy.c:279
+#: ../libgaim/protocols/jabber/buddy.c:870
+#: ../libgaim/protocols/jabber/buddy.c:877
msgid "Telephone"
msgstr "电话号码"
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
+#: ../libgaim/protocols/jabber/buddy.c:280
+#: ../libgaim/protocols/jabber/buddy.c:888
+#: ../libgaim/protocols/jabber/buddy.c:896
+#: ../libgaim/protocols/jabber/buddy.c:1530
+#: ../libgaim/protocols/silc/ops.c:1074 ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "电子邮件"
+
+#: ../libgaim/protocols/jabber/buddy.c:281
+#: ../libgaim/protocols/jabber/buddy.c:911
msgid "Organization Name"
msgstr "组织名称"
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
+#: ../libgaim/protocols/jabber/buddy.c:282
+#: ../libgaim/protocols/jabber/buddy.c:915
msgid "Organization Unit"
msgstr "组织单元"
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
+#: ../libgaim/protocols/jabber/buddy.c:284
+#: ../libgaim/protocols/jabber/buddy.c:924
msgid "Role"
msgstr "职务"
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
+#: ../libgaim/protocols/jabber/buddy.c:285
+#: ../libgaim/protocols/jabber/buddy.c:807 ../libgaim/protocols/msn/msn.c:1591
+#: ../libgaim/protocols/oscar/oscar.c:3644
msgid "Birthday"
msgstr "生日"
-#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
+#: ../libgaim/protocols/jabber/buddy.c:588
+#: ../libgaim/protocols/jabber/buddy.c:589
msgid "Edit Jabber vCard"
msgstr "编辑 Jabber vCard"
-#: ../src/protocols/jabber/buddy.c:569
+#: ../libgaim/protocols/jabber/buddy.c:590
msgid ""
"All items below are optional. Enter only the information with which you feel "
"comfortable."
msgstr "所有下面的项目都是可选的。请只输入您愿意输入的信息。"
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1907
+#: ../libgaim/protocols/jabber/buddy.c:646
+msgid "Client:"
+msgstr "客户:"
+
+#: ../libgaim/protocols/jabber/buddy.c:650
+#: ../libgaim/protocols/jabber/buddy.c:681
+msgid "Operating System"
+msgstr "操作系统"
+
+#: ../libgaim/protocols/jabber/buddy.c:660
+#: ../libgaim/protocols/jabber/jabber.c:1958
msgid "Resource"
msgstr "资源"
-#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
+#: ../libgaim/protocols/jabber/buddy.c:677
+msgid "Client"
+msgstr "客户"
+
+#: ../libgaim/protocols/jabber/buddy.c:794
+#: ../libgaim/protocols/silc/ops.c:1027
msgid "Middle Name"
msgstr "中名"
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:6217 ../src/protocols/oscar/oscar.c:6225
-#: ../src/protocols/silc/ops.c:1064
+#: ../libgaim/protocols/jabber/buddy.c:827
+#: ../libgaim/protocols/jabber/jabber.c:797
+#: ../libgaim/protocols/oscar/oscar.c:3663
+#: ../libgaim/protocols/oscar/oscar.c:3671
+#: ../libgaim/protocols/qq/buddy_info.c:59
+#: ../libgaim/protocols/silc/ops.c:1063
msgid "Address"
msgstr "地址"
-#: ../src/protocols/jabber/buddy.c:725
+#: ../libgaim/protocols/jabber/buddy.c:834
msgid "P.O. Box"
msgstr "邮政信箱"
-#: ../src/protocols/jabber/buddy.c:839
+#: ../libgaim/protocols/jabber/buddy.c:948
msgid "Photo"
msgstr "相片"
-#: ../src/protocols/jabber/buddy.c:839
+#: ../libgaim/protocols/jabber/buddy.c:948
msgid "Logo"
msgstr "图符"
-#: ../src/protocols/jabber/buddy.c:1042
+#: ../libgaim/protocols/jabber/buddy.c:1310
msgid "Un-hide From"
msgstr "取消隐身"
-#: ../src/protocols/jabber/buddy.c:1046
+#: ../libgaim/protocols/jabber/buddy.c:1314
msgid "Temporarily Hide From"
msgstr "临时隐身"
#. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054
+#: ../libgaim/protocols/jabber/buddy.c:1322
msgid "Cancel Presence Notification"
msgstr "取消目前的通知"
-#: ../src/protocols/jabber/buddy.c:1061
+#: ../libgaim/protocols/jabber/buddy.c:1329
msgid "(Re-)Request authorization"
msgstr "(重新)请求认证"
#. if(NOT ME)
#. shouldn't this just happen automatically when the buddy is
#. removed?
-#: ../src/protocols/jabber/buddy.c:1070
+#: ../libgaim/protocols/jabber/buddy.c:1338
msgid "Unsubscribe"
msgstr "退订"
-#: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1164
-#: ../src/protocols/silc/ops.c:1449
-msgid "Error"
-msgstr "出错"
-
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1189
+#: ../libgaim/protocols/jabber/buddy.c:1371
+#: ../libgaim/protocols/jabber/jabber.c:1216
msgid "Chatty"
msgstr "唠叨"
-#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1375 ../libgaim/status.c:159
msgid "Extended Away"
msgstr "远远离开"
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
-#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8053
-#: ../src/protocols/sametime/sametime.c:3285
+#: ../libgaim/protocols/jabber/buddy.c:1377
+#: ../libgaim/protocols/jabber/jabber.c:1246
+#: ../libgaim/protocols/oscar/oscar.c:689
+#: ../libgaim/protocols/oscar/oscar.c:5632
+#: ../libgaim/protocols/sametime/sametime.c:3274
msgid "Do Not Disturb"
msgstr "请勿打扰"
-#: ../src/protocols/jabber/buddy.c:1289
+#: ../libgaim/protocols/jabber/buddy.c:1522
+msgid "JID"
+msgstr "JID"
+
+#: ../libgaim/protocols/jabber/buddy.c:1526
+#: ../libgaim/protocols/jabber/buddy.c:1705
+#: ../libgaim/protocols/oscar/oscar.c:3612
+msgid "Last Name"
+msgstr "姓"
+
+#: ../libgaim/protocols/jabber/buddy.c:1558
msgid "The following are the results of your search"
-msgstr ""
+msgstr "下面是您搜索的结果"
-#: ../src/protocols/jabber/buddy.c:1388
-msgid "Fill in one or more fields to search for any matching Jabber users."
+#. current comment from Jabber User Directory users.jabber.org
+#: ../libgaim/protocols/jabber/buddy.c:1633
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
msgstr ""
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
-msgid "First Name"
-msgstr "名"
+#: ../libgaim/protocols/jabber/buddy.c:1653
+msgid "Directory Query Failed"
+msgstr "目录查询失败"
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
-msgid "Last Name"
-msgstr "姓"
+#: ../libgaim/protocols/jabber/buddy.c:1654
+msgid "Could not query the directory server."
+msgstr "无法查询目录服务器。"
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../libgaim/protocols/jabber/buddy.c:1688
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "服务器指令:%s"
+
+#: ../libgaim/protocols/jabber/buddy.c:1695
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr ""
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../libgaim/protocols/jabber/buddy.c:1715
+#: ../libgaim/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/oscar/oscar.c:3614
+#: ../libgaim/protocols/oscar/oscar.c:3621
msgid "E-Mail Address"
msgstr "电子邮件地址"
-#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
+#: ../libgaim/protocols/jabber/buddy.c:1724
+#: ../libgaim/protocols/jabber/buddy.c:1725
msgid "Search for Jabber users"
msgstr "搜索 Jabber 用户"
-#: ../src/protocols/jabber/buddy.c:1431
+#: ../libgaim/protocols/jabber/buddy.c:1739
msgid "Invalid Directory"
msgstr "无效的目录"
-#: ../src/protocols/jabber/buddy.c:1448
+#: ../libgaim/protocols/jabber/buddy.c:1756
msgid "Enter a User Directory"
msgstr "进入用户目录"
-#: ../src/protocols/jabber/buddy.c:1449
+#: ../libgaim/protocols/jabber/buddy.c:1757
msgid "Select a user directory to search"
msgstr "选择要搜索的用户目录"
-#: ../src/protocols/jabber/buddy.c:1452
+#: ../libgaim/protocols/jabber/buddy.c:1760
msgid "Search Directory"
msgstr "搜索目录"
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7546
-#: ../src/protocols/yahoo/yahoochat.c:998
+#: ../libgaim/protocols/jabber/chat.c:41
+#: ../libgaim/protocols/oscar/oscar.c:5115
+#: ../libgaim/protocols/yahoo/yahoochat.c:999
msgid "_Room:"
msgstr "房间(_R):"
-#: ../src/protocols/jabber/chat.c:47
+#: ../libgaim/protocols/jabber/chat.c:47
msgid "_Server:"
msgstr "服务器(_S):"
-#: ../src/protocols/jabber/chat.c:53
+#: ../libgaim/protocols/jabber/chat.c:53
msgid "_Handle:"
msgstr "昵称(_H):"
-#: ../src/protocols/jabber/chat.c:223
+#: ../libgaim/protocols/jabber/chat.c:223
#, c-format
msgid "%s is not a valid room name"
msgstr "%s 不是有效的房间名"
-#: ../src/protocols/jabber/chat.c:224
+#: ../libgaim/protocols/jabber/chat.c:224
msgid "Invalid Room Name"
msgstr "无效的房间名"
-#: ../src/protocols/jabber/chat.c:229
+#: ../libgaim/protocols/jabber/chat.c:229
#, c-format
msgid "%s is not a valid server name"
msgstr "%s 不是有效的服务器名"
-#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
+#: ../libgaim/protocols/jabber/chat.c:230
+#: ../libgaim/protocols/jabber/chat.c:231
msgid "Invalid Server Name"
msgstr "无效的服务器名"
-#: ../src/protocols/jabber/chat.c:235
+#: ../libgaim/protocols/jabber/chat.c:235
#, c-format
msgid "%s is not a valid room handle"
msgstr "%s 不是有效的房间昵称"
-#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
+#: ../libgaim/protocols/jabber/chat.c:236
+#: ../libgaim/protocols/jabber/chat.c:237
msgid "Invalid Room Handle"
msgstr "无效的房间门昵称"
-#: ../src/protocols/jabber/chat.c:395
+#: ../libgaim/protocols/jabber/chat.c:395
msgid "Configuration error"
msgstr "配置错误"
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
+#: ../libgaim/protocols/jabber/chat.c:404
+#: ../libgaim/protocols/jabber/chat.c:547
msgid "Unable to configure"
msgstr "无法配置"
-#: ../src/protocols/jabber/chat.c:420
+#: ../libgaim/protocols/jabber/chat.c:419
msgid "Room Configuration Error"
msgstr "房间配置错误"
-#: ../src/protocols/jabber/chat.c:421
+#: ../libgaim/protocols/jabber/chat.c:420
msgid "This room is not capable of being configured"
msgstr "此房间无法进行配置"
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
+#: ../libgaim/protocols/jabber/chat.c:469
+#: ../libgaim/protocols/jabber/chat.c:538
msgid "Registration error"
msgstr "注册错误"
-#: ../src/protocols/jabber/chat.c:628
+#: ../libgaim/protocols/jabber/chat.c:626
msgid "Nick changing not supported in non-MUC chatrooms"
msgstr "不支持在非 MUC 聊天室中更改昵称"
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
-#: ../src/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/chat.c:676
+#: ../libgaim/protocols/jabber/chat.c:687 ../libgaim/protocols/silc/ops.c:1448
msgid "Error retrieving room list"
msgstr "收取房间列表时出错"
-#: ../src/protocols/jabber/chat.c:737
+#: ../libgaim/protocols/jabber/chat.c:735
msgid "Invalid Server"
msgstr "无效的服务器"
-#: ../src/protocols/jabber/chat.c:775
+#: ../libgaim/protocols/jabber/chat.c:773
msgid "Enter a Conference Server"
msgstr "进入会议服务器"
-#: ../src/protocols/jabber/chat.c:776
+#: ../libgaim/protocols/jabber/chat.c:774
msgid "Select a conference server to query"
msgstr "选择要查询的会议服务器"
-#: ../src/protocols/jabber/chat.c:779
+#: ../libgaim/protocols/jabber/chat.c:777
msgid "Find Rooms"
msgstr "查找房间"
-#: ../src/protocols/jabber/jabber.c:79
+#: ../libgaim/protocols/jabber/jabber.c:81
msgid "Error initializing session"
msgstr "初始化会话出错"
-#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
-#: ../src/protocols/jabber/jabber.c:303
+#: ../libgaim/protocols/jabber/jabber.c:240
+#: ../libgaim/protocols/jabber/jabber.c:289
+#: ../libgaim/protocols/jabber/jabber.c:317
msgid "Write error"
msgstr "写错误"
-#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
+#: ../libgaim/protocols/jabber/jabber.c:378
+#: ../libgaim/protocols/jabber/jabber.c:411
msgid "Read Error"
msgstr "读取错误"
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
+#: ../libgaim/protocols/jabber/jabber.c:484
+#: ../libgaim/protocols/jabber/jabber.c:917
msgid "Unable to create socket"
msgstr "无法创建套接字"
-#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
+#: ../libgaim/protocols/jabber/jabber.c:532
+#: ../libgaim/protocols/jabber/jabber.c:875
msgid "Invalid Jabber ID"
msgstr "无效的 Jabber ID"
-#: ../src/protocols/jabber/jabber.c:590
+#: ../libgaim/protocols/jabber/jabber.c:603
#, c-format
msgid "Registration of %s@%s successful"
msgstr "%s@%s 注册成功"
-#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
+#: ../libgaim/protocols/jabber/jabber.c:605
+#: ../libgaim/protocols/jabber/jabber.c:606
msgid "Registration Successful"
msgstr "注册成功"
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1455
+#: ../libgaim/protocols/jabber/jabber.c:612
+#: ../libgaim/protocols/jabber/jabber.c:1482
msgid "Unknown Error"
msgstr "未知错误"
-#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
+#: ../libgaim/protocols/jabber/jabber.c:614
+#: ../libgaim/protocols/jabber/jabber.c:615
msgid "Registration Failed"
msgstr "注册失败"
-#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
+#: ../libgaim/protocols/jabber/jabber.c:730
+#: ../libgaim/protocols/jabber/jabber.c:731
msgid "Already Registered"
msgstr "已注册"
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6219
-#: ../src/protocols/oscar/oscar.c:6227
+#: ../libgaim/protocols/jabber/jabber.c:807
+#: ../libgaim/protocols/oscar/oscar.c:3665
+#: ../libgaim/protocols/oscar/oscar.c:3673
msgid "State"
msgstr "州/省"
-#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
+#: ../libgaim/protocols/jabber/jabber.c:812
+msgid "Postal code"
+msgstr "邮政编码"
+
+#: ../libgaim/protocols/jabber/jabber.c:817
+#: ../libgaim/protocols/silc/ops.c:1068 ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/silc/util.c:555
msgid "Phone"
msgstr "电话"
-#: ../src/protocols/jabber/jabber.c:810
+#: ../libgaim/protocols/jabber/jabber.c:827
msgid "Date"
msgstr "日期"
-#: ../src/protocols/jabber/jabber.c:818
+#: ../libgaim/protocols/jabber/jabber.c:835
msgid "Please fill out the information below to register your new account."
msgstr "请在下面填入信息以注册您新的账户。"
-#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
+#: ../libgaim/protocols/jabber/jabber.c:838
+#: ../libgaim/protocols/jabber/jabber.c:839
msgid "Register New Jabber Account"
msgstr "注册新的 Jabber 账户"
-#: ../src/protocols/jabber/jabber.c:983
+#: ../libgaim/protocols/jabber/jabber.c:1004
msgid "Initializing Stream"
msgstr "初始化流"
-#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
+#: ../libgaim/protocols/jabber/jabber.c:1009
+#: ../libgaim/protocols/msn/session.c:350
msgid "Authenticating"
msgstr "正在认证"
-#: ../src/protocols/jabber/jabber.c:998
+#: ../libgaim/protocols/jabber/jabber.c:1018
msgid "Re-initializing Stream"
msgstr "重新初始化流"
-#: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
-#: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
-#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7843
+#: ../libgaim/protocols/jabber/jabber.c:1095
+#: ../libgaim/protocols/jabber/jabber.c:1460
+#: ../libgaim/protocols/jabber/jabber.c:1501
+#: ../libgaim/protocols/jabber/jabber.c:1535
+#: ../libgaim/protocols/oscar/oscar.c:767
+#: ../libgaim/protocols/oscar/oscar.c:5421
msgid "Not Authorized"
msgstr "未认证"
-#: ../src/protocols/jabber/jabber.c:1110
+#: ../libgaim/protocols/jabber/jabber.c:1137
msgid "Both"
msgstr "双向"
-#: ../src/protocols/jabber/jabber.c:1112
+#: ../libgaim/protocols/jabber/jabber.c:1139
msgid "From (To pending)"
msgstr "来自(待推迟)"
-#: ../src/protocols/jabber/jabber.c:1117
+#: ../libgaim/protocols/jabber/jabber.c:1144
msgid "To"
msgstr "到"
-#: ../src/protocols/jabber/jabber.c:1119
+#: ../libgaim/protocols/jabber/jabber.c:1146
msgid "None (To pending)"
msgstr "无(待推迟)"
-#: ../src/protocols/jabber/jabber.c:1123
+#: ../libgaim/protocols/jabber/jabber.c:1150
msgid "Subscription"
msgstr "订阅"
-#: ../src/protocols/jabber/jabber.c:1180 ../src/protocols/jabber/jabber.c:1190
-#: ../src/protocols/jabber/jabber.c:1200 ../src/protocols/jabber/jabber.c:1210
-#: ../src/protocols/jabber/jabber.c:1220
+#: ../libgaim/protocols/jabber/jabber.c:1207
+#: ../libgaim/protocols/jabber/jabber.c:1217
+#: ../libgaim/protocols/jabber/jabber.c:1227
+#: ../libgaim/protocols/jabber/jabber.c:1237
+#: ../libgaim/protocols/jabber/jabber.c:1247
msgid "Priority"
msgstr "优先级"
-#: ../src/protocols/jabber/jabber.c:1249
+#: ../libgaim/protocols/jabber/jabber.c:1276
msgid "Password Changed"
msgstr "密码已更改"
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../libgaim/protocols/jabber/jabber.c:1277
msgid "Your password has been changed."
msgstr "您的密码已更改。"
-#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/jabber/jabber.c:1255
+#: ../libgaim/protocols/jabber/jabber.c:1281
+#: ../libgaim/protocols/jabber/jabber.c:1282
msgid "Error changing password"
msgstr "更改密码出错"
-#: ../src/protocols/jabber/jabber.c:1311
+#: ../libgaim/protocols/jabber/jabber.c:1338
msgid "Password (again)"
msgstr "再次输入新密码"
-#: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
+#: ../libgaim/protocols/jabber/jabber.c:1343
+#: ../libgaim/protocols/jabber/jabber.c:1344
msgid "Change Jabber Password"
msgstr "更改 Jabber 密码"
-#: ../src/protocols/jabber/jabber.c:1317
+#: ../libgaim/protocols/jabber/jabber.c:1344
msgid "Please enter your new password"
msgstr "请输入您的新密码"
-#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8477
-#: ../src/protocols/silc/silc.c:1023
+#: ../libgaim/protocols/jabber/jabber.c:1354
+#: ../libgaim/protocols/oscar/oscar.c:6223
+#: ../libgaim/protocols/silc/silc.c:1023
msgid "Set User Info..."
msgstr "设置用户信息..."
#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8488
-#: ../src/protocols/silc/silc.c:1019
+#: ../libgaim/protocols/jabber/jabber.c:1359
+#: ../libgaim/protocols/oscar/oscar.c:6234
+#: ../libgaim/protocols/silc/silc.c:1019
msgid "Change Password..."
msgstr "更改密码..."
#. }
-#: ../src/protocols/jabber/jabber.c:1337
+#: ../libgaim/protocols/jabber/jabber.c:1364
msgid "Search for Users..."
msgstr "搜索用户..."
-#: ../src/protocols/jabber/jabber.c:1413
+#: ../libgaim/protocols/jabber/jabber.c:1440
msgid "Bad Request"
msgstr "无效请求"
-#: ../src/protocols/jabber/jabber.c:1415
+#: ../libgaim/protocols/jabber/jabber.c:1442
msgid "Conflict"
msgstr "冲突"
-#: ../src/protocols/jabber/jabber.c:1417
+#: ../libgaim/protocols/jabber/jabber.c:1444
msgid "Feature Not Implemented"
msgstr "特性未实现"
-#: ../src/protocols/jabber/jabber.c:1419
+#: ../libgaim/protocols/jabber/jabber.c:1446
msgid "Forbidden"
msgstr "禁止"
-#: ../src/protocols/jabber/jabber.c:1421
+#: ../libgaim/protocols/jabber/jabber.c:1448
msgid "Gone"
msgstr "已走"
-#: ../src/protocols/jabber/jabber.c:1423 ../src/protocols/jabber/jabber.c:1498
+#: ../libgaim/protocols/jabber/jabber.c:1450
+#: ../libgaim/protocols/jabber/jabber.c:1525
msgid "Internal Server Error"
msgstr "内部服务器错误"
-#: ../src/protocols/jabber/jabber.c:1425
+#: ../libgaim/protocols/jabber/jabber.c:1452
msgid "Item Not Found"
msgstr "项目未找到"
-#: ../src/protocols/jabber/jabber.c:1427
+#: ../libgaim/protocols/jabber/jabber.c:1454
msgid "Malformed Jabber ID"
msgstr "Jabber ID 格式错误"
-#: ../src/protocols/jabber/jabber.c:1429
+#: ../libgaim/protocols/jabber/jabber.c:1456
msgid "Not Acceptable"
msgstr "不可接受"
-#: ../src/protocols/jabber/jabber.c:1431
+#: ../libgaim/protocols/jabber/jabber.c:1458
msgid "Not Allowed"
msgstr "不允许"
-#: ../src/protocols/jabber/jabber.c:1435
+#: ../libgaim/protocols/jabber/jabber.c:1462
msgid "Payment Required"
msgstr "需要付费"
-#: ../src/protocols/jabber/jabber.c:1437
+#: ../libgaim/protocols/jabber/jabber.c:1464
msgid "Recipient Unavailable"
msgstr "收件人不可用"
-#: ../src/protocols/jabber/jabber.c:1441
+#: ../libgaim/protocols/jabber/jabber.c:1468
msgid "Registration Required"
msgstr "需要注册"
-#: ../src/protocols/jabber/jabber.c:1443
+#: ../libgaim/protocols/jabber/jabber.c:1470
msgid "Remote Server Not Found"
msgstr "远程服务器未找到"
-#: ../src/protocols/jabber/jabber.c:1445
+#: ../libgaim/protocols/jabber/jabber.c:1472
msgid "Remote Server Timeout"
msgstr "远程服务器超时"
-#: ../src/protocols/jabber/jabber.c:1447
+#: ../libgaim/protocols/jabber/jabber.c:1474
msgid "Server Overloaded"
msgstr "服务器超载"
-#: ../src/protocols/jabber/jabber.c:1449
+#: ../libgaim/protocols/jabber/jabber.c:1476
msgid "Service Unavailable"
msgstr "服务不可用"
-#: ../src/protocols/jabber/jabber.c:1451
+#: ../libgaim/protocols/jabber/jabber.c:1478
msgid "Subscription Required"
msgstr "需要订阅"
-#: ../src/protocols/jabber/jabber.c:1453
+#: ../libgaim/protocols/jabber/jabber.c:1480
msgid "Unexpected Request"
msgstr "未预期的请求"
-#: ../src/protocols/jabber/jabber.c:1460
+#: ../libgaim/protocols/jabber/jabber.c:1487
msgid "Authorization Aborted"
msgstr "认证被中断"
-#: ../src/protocols/jabber/jabber.c:1462
+#: ../libgaim/protocols/jabber/jabber.c:1489
msgid "Incorrect encoding in authorization"
msgstr "认证的编码不正确"
-#: ../src/protocols/jabber/jabber.c:1465
+#: ../libgaim/protocols/jabber/jabber.c:1492
msgid "Invalid authzid"
msgstr "无效的认证"
-#: ../src/protocols/jabber/jabber.c:1468
+#: ../libgaim/protocols/jabber/jabber.c:1495
msgid "Invalid Authorization Mechanism"
msgstr "无效的认证算法"
-#: ../src/protocols/jabber/jabber.c:1471
+#: ../libgaim/protocols/jabber/jabber.c:1498
msgid "Authorization mechanism too weak"
msgstr "认证算法太弱"
-#: ../src/protocols/jabber/jabber.c:1476
+#: ../libgaim/protocols/jabber/jabber.c:1503
msgid "Temporary Authentication Failure"
msgstr "临时认证失败"
-#: ../src/protocols/jabber/jabber.c:1479
+#: ../libgaim/protocols/jabber/jabber.c:1506
msgid "Authentication Failure"
msgstr "认证失败"
-#: ../src/protocols/jabber/jabber.c:1483
+#: ../libgaim/protocols/jabber/jabber.c:1510
msgid "Bad Format"
msgstr "格式无效"
-#: ../src/protocols/jabber/jabber.c:1485
+#: ../libgaim/protocols/jabber/jabber.c:1512
msgid "Bad Namespace Prefix"
msgstr "无效的命名空间前缀"
-#: ../src/protocols/jabber/jabber.c:1488
+#: ../libgaim/protocols/jabber/jabber.c:1515
msgid "Resource Conflict"
msgstr "资源冲突"
-#: ../src/protocols/jabber/jabber.c:1490 ../src/protocols/silc/ops.c:1728
+#: ../libgaim/protocols/jabber/jabber.c:1517
+#: ../libgaim/protocols/silc/ops.c:1726
msgid "Connection Timeout"
msgstr "连接超时"
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../libgaim/protocols/jabber/jabber.c:1519
msgid "Host Gone"
msgstr "主机宕机"
-#: ../src/protocols/jabber/jabber.c:1494
+#: ../libgaim/protocols/jabber/jabber.c:1521
msgid "Host Unknown"
msgstr "主机未知"
-#: ../src/protocols/jabber/jabber.c:1496
+#: ../libgaim/protocols/jabber/jabber.c:1523
msgid "Improper Addressing"
msgstr "寻址不恰当"
-#: ../src/protocols/jabber/jabber.c:1500
+#: ../libgaim/protocols/jabber/jabber.c:1527
msgid "Invalid ID"
msgstr "无效 ID"
-#: ../src/protocols/jabber/jabber.c:1502
+#: ../libgaim/protocols/jabber/jabber.c:1529
msgid "Invalid Namespace"
msgstr "无效的命名空间"
-#: ../src/protocols/jabber/jabber.c:1504
+#: ../libgaim/protocols/jabber/jabber.c:1531
msgid "Invalid XML"
msgstr "无效的 XML"
-#: ../src/protocols/jabber/jabber.c:1506
+#: ../libgaim/protocols/jabber/jabber.c:1533
msgid "Non-matching Hosts"
msgstr "不匹配的主机"
-#: ../src/protocols/jabber/jabber.c:1510
+#: ../libgaim/protocols/jabber/jabber.c:1537
msgid "Policy Violation"
msgstr "违背策略"
-#: ../src/protocols/jabber/jabber.c:1512
+#: ../libgaim/protocols/jabber/jabber.c:1539
msgid "Remote Connection Failed"
msgstr "远程连接失败"
-#: ../src/protocols/jabber/jabber.c:1514
+#: ../libgaim/protocols/jabber/jabber.c:1541
msgid "Resource Constraint"
msgstr "资源约束"
-#: ../src/protocols/jabber/jabber.c:1516
+#: ../libgaim/protocols/jabber/jabber.c:1543
msgid "Restricted XML"
msgstr "限制的 XML"
-#: ../src/protocols/jabber/jabber.c:1518
+#: ../libgaim/protocols/jabber/jabber.c:1545
msgid "See Other Host"
msgstr "查看其它主机"
-#: ../src/protocols/jabber/jabber.c:1520
+#: ../libgaim/protocols/jabber/jabber.c:1547
msgid "System Shutdown"
msgstr "系统关机"
-#: ../src/protocols/jabber/jabber.c:1522
+#: ../libgaim/protocols/jabber/jabber.c:1549
msgid "Undefined Condition"
msgstr "未定义的条件"
-#: ../src/protocols/jabber/jabber.c:1524
+#: ../libgaim/protocols/jabber/jabber.c:1551
msgid "Unsupported Encoding"
msgstr "不支持的编码"
-#: ../src/protocols/jabber/jabber.c:1526
+#: ../libgaim/protocols/jabber/jabber.c:1553
msgid "Unsupported Stanza Type"
msgstr "不支持的节类型"
-#: ../src/protocols/jabber/jabber.c:1528
+#: ../libgaim/protocols/jabber/jabber.c:1555
msgid "Unsupported Version"
msgstr "不支持的版本"
-#: ../src/protocols/jabber/jabber.c:1530
+#: ../libgaim/protocols/jabber/jabber.c:1557
msgid "XML Not Well Formed"
msgstr "XML 格式有错"
-#: ../src/protocols/jabber/jabber.c:1532
+#: ../libgaim/protocols/jabber/jabber.c:1559
msgid "Stream Error"
msgstr "流错误"
-#: ../src/protocols/jabber/jabber.c:1599
+#: ../libgaim/protocols/jabber/jabber.c:1626
#, c-format
msgid "Unable to ban user %s"
msgstr "无法屏蔽用户 %s"
-#: ../src/protocols/jabber/jabber.c:1619
+#: ../libgaim/protocols/jabber/jabber.c:1646
#, fuzzy, c-format
msgid "Unknown affiliation: \"%s\""
msgstr "未知的错误代码: %s"
-#: ../src/protocols/jabber/jabber.c:1624
+#: ../libgaim/protocols/jabber/jabber.c:1651
#, fuzzy, c-format
msgid "Unable to affiliate user %s as \"%s\""
msgstr "无法邀请用户(%s)。"
-#: ../src/protocols/jabber/jabber.c:1643
+#: ../libgaim/protocols/jabber/jabber.c:1670
#, c-format
msgid "Unknown role: \"%s\""
msgstr "未知角色:“%s”"
-#: ../src/protocols/jabber/jabber.c:1650
+#: ../libgaim/protocols/jabber/jabber.c:1677
#, fuzzy, c-format
msgid "Unable to set role \"%s\" for user: %s"
msgstr "无法发送消息: %s"
-#: ../src/protocols/jabber/jabber.c:1703
+#: ../libgaim/protocols/jabber/jabber.c:1730
#, c-format
msgid "Unable to kick user %s"
msgstr "无法踢出用户 %s"
-#: ../src/protocols/jabber/jabber.c:1734
+#: ../libgaim/protocols/jabber/jabber.c:1761
msgid "config: Configure a chat room."
msgstr "config: 配置聊天室。"
-#: ../src/protocols/jabber/jabber.c:1738
+#: ../libgaim/protocols/jabber/jabber.c:1765
msgid "configure: Configure a chat room."
msgstr "configure: 配置聊天室。"
-#: ../src/protocols/jabber/jabber.c:1747
+#: ../libgaim/protocols/jabber/jabber.c:1774
msgid "part [room]: Leave the room."
msgstr "part [房间]: 离开聊天室。"
-#: ../src/protocols/jabber/jabber.c:1752
+#: ../libgaim/protocols/jabber/jabber.c:1779
msgid "register: Register with a chat room."
msgstr "register: 注册聊天室。"
-#: ../src/protocols/jabber/jabber.c:1758
+#: ../libgaim/protocols/jabber/jabber.c:1785
msgid "topic [new topic]: View or change the topic."
msgstr "topic [新话题]: 查看或更改话题。"
-#: ../src/protocols/jabber/jabber.c:1764
+#: ../libgaim/protocols/jabber/jabber.c:1791
msgid "ban &lt;user&gt; [room]: Ban a user from the room."
msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
-#: ../src/protocols/jabber/jabber.c:1770
+#: ../libgaim/protocols/jabber/jabber.c:1797
msgid ""
"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
"affiliation with the room."
msgstr ""
-#: ../src/protocols/jabber/jabber.c:1776
+#: ../libgaim/protocols/jabber/jabber.c:1803
msgid ""
"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
"role in the room."
msgstr ""
-#: ../src/protocols/jabber/jabber.c:1782
+#: ../libgaim/protocols/jabber/jabber.c:1809
msgid "invite &lt;user&gt; [message]: Invite a user to the room."
msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入房间。"
-#: ../src/protocols/jabber/jabber.c:1788
+#: ../libgaim/protocols/jabber/jabber.c:1815
msgid "join: &lt;room&gt; [server]: Join a chat on this server."
msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
-#: ../src/protocols/jabber/jabber.c:1794
+#: ../libgaim/protocols/jabber/jabber.c:1821
msgid "kick &lt;user&gt; [room]: Kick a user from the room."
msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
-#: ../src/protocols/jabber/jabber.c:1799
+#: ../libgaim/protocols/jabber/jabber.c:1826
msgid ""
"msg &lt;user&gt; &lt;message&gt;: Send a private message to another user."
msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息。"
@@ -7049,132 +8041,138 @@ msgstr "msg &lt;用户&gt; &lt;消息&gt;: 向另外的好友发送私人消息
#. *< version
#. * summary
#. * description
-#: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
+#: ../libgaim/protocols/jabber/jabber.c:1933
+#: ../libgaim/protocols/jabber/jabber.c:1935
msgid "Jabber Protocol Plugin"
msgstr "Jabber 协议插件"
-#: ../src/protocols/jabber/jabber.c:1910
+#: ../libgaim/protocols/jabber/jabber.c:1961
msgid "Use TLS if available"
msgstr "若可用则使用 TLS"
-#: ../src/protocols/jabber/jabber.c:1915
+#: ../libgaim/protocols/jabber/jabber.c:1966
msgid "Require TLS"
msgstr "需要 TLS"
-#: ../src/protocols/jabber/jabber.c:1918
+#: ../libgaim/protocols/jabber/jabber.c:1969
msgid "Force old (port 5223) SSL"
msgstr "强制旧 SSL(5223 端口)"
-#: ../src/protocols/jabber/jabber.c:1923
+#: ../libgaim/protocols/jabber/jabber.c:1974
msgid "Allow plaintext auth over unencrypted streams"
msgstr "允许在不加密流上的纯文本验证"
-#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1760
-#, fuzzy
+#: ../libgaim/protocols/jabber/jabber.c:1979
+#: ../libgaim/protocols/simple/simple.c:1838
msgid "Connect port"
-msgstr "连接"
+msgstr "连接端口"
#. Account options
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1855
+#: ../libgaim/protocols/jabber/jabber.c:1983
+#: ../libgaim/protocols/silc/silc.c:1854
msgid "Connect server"
msgstr "连接服务器"
-#: ../src/protocols/jabber/message.c:114
+#: ../libgaim/protocols/jabber/message.c:117
#, c-format
msgid "Message from %s"
msgstr "来自 %s 的消息"
-#: ../src/protocols/jabber/message.c:178
+#: ../libgaim/protocols/jabber/message.c:181
#, c-format
msgid "%s has set the topic to: %s"
msgstr "%s 将话题改为: %s"
-#: ../src/protocols/jabber/message.c:180
+#: ../libgaim/protocols/jabber/message.c:183
#, c-format
msgid "The topic is: %s"
msgstr "话题为: %s"
-#: ../src/protocols/jabber/message.c:230
+#: ../libgaim/protocols/jabber/message.c:233
#, c-format
msgid "Message delivery to %s failed: %s"
msgstr "投递到 %s 的消息失败: %s"
-#: ../src/protocols/jabber/message.c:233
+#: ../libgaim/protocols/jabber/message.c:236
msgid "Jabber Message Error"
msgstr "Jabber 消息错误"
-#: ../src/protocols/jabber/message.c:300
+#: ../libgaim/protocols/jabber/message.c:316
#, c-format
msgid " (Code %s)"
msgstr " (代码 %s)"
-#: ../src/protocols/jabber/parser.c:131
+#: ../libgaim/protocols/jabber/parser.c:279
+#: ../libgaim/protocols/jabber/parser.c:288
msgid "XML Parse error"
msgstr "XML 分析错误"
-#: ../src/protocols/jabber/presence.c:309
+#: ../libgaim/protocols/jabber/presence.c:305
msgid "Unknown Error in presence"
msgstr "出现未知错误"
-#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
+#: ../libgaim/protocols/jabber/presence.c:310
+#: ../libgaim/protocols/msn/userlist.c:98
#, c-format
msgid "The user %s wants to add %s to his or her buddy list."
msgstr "用户 %s 想要将 %s 添加为好友。"
-#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
-#: ../src/protocols/oscar/oscar.c:7476
+#: ../libgaim/protocols/jabber/presence.c:319
+#: ../libgaim/protocols/oscar/oscar.c:2335
+#: ../libgaim/protocols/oscar/oscar.c:5046
msgid "_Authorize"
msgstr "同意(_A)"
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
-#: ../src/protocols/oscar/oscar.c:7477
+#: ../libgaim/protocols/jabber/presence.c:320
+#: ../libgaim/protocols/oscar/oscar.c:2337
+#: ../libgaim/protocols/oscar/oscar.c:5047
msgid "_Deny"
msgstr "拒绝(_D)"
-#: ../src/protocols/jabber/presence.c:381
-#: ../src/protocols/jabber/presence.c:382
+#: ../libgaim/protocols/jabber/presence.c:377
+#: ../libgaim/protocols/jabber/presence.c:378
msgid "Create New Room"
msgstr "创建新房间"
-#: ../src/protocols/jabber/presence.c:383
+#: ../libgaim/protocols/jabber/presence.c:379
msgid ""
"You are creating a new room. Would you like to configure it, or accept the "
"default settings?"
msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
-#: ../src/protocols/jabber/presence.c:386
+#: ../libgaim/protocols/jabber/presence.c:382
msgid "_Configure Room"
msgstr "配置房间(_C)"
-#: ../src/protocols/jabber/presence.c:388
+#: ../libgaim/protocols/jabber/presence.c:384
msgid "_Accept Defaults"
msgstr "接受默认值(_A)"
-#: ../src/protocols/jabber/presence.c:426
+#: ../libgaim/protocols/jabber/presence.c:422
#, c-format
msgid "Error in chat %s"
msgstr "聊天 %s 出错"
-#: ../src/protocols/jabber/presence.c:429
+#: ../libgaim/protocols/jabber/presence.c:425
#, c-format
msgid "Error joining chat %s"
msgstr "加入聊天 %s 出错"
-#: ../src/protocols/jabber/si.c:727
+#: ../libgaim/protocols/jabber/si.c:756
#, c-format
msgid "Unable to send file to %s, user does not support file transfers"
msgstr "无法给 %s 发送文件,用户不支持文件传送"
-#: ../src/protocols/jabber/si.c:728 ../src/protocols/jabber/si.c:729
+#: ../libgaim/protocols/jabber/si.c:757 ../libgaim/protocols/jabber/si.c:758
msgid "File Send Failed"
msgstr "发送文件失败"
-#: ../src/protocols/msn/dialog.c:92
+#: ../libgaim/protocols/msn/dialog.c:110
#, c-format
msgid "Buddy list synchronization issue in %s (%s)"
msgstr "%s (%s) 的好友列表同步问题"
-#: ../src/protocols/msn/dialog.c:98
+#: ../libgaim/protocols/msn/dialog.c:116
#, c-format
msgid ""
"%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -7182,271 +8180,272 @@ msgid ""
msgstr ""
"本地列表中的 %s 位于组“%s”中,但未出现在服务器列表中。您是否想要添加此好友?"
-#: ../src/protocols/msn/dialog.c:106
+#: ../libgaim/protocols/msn/dialog.c:124
#, c-format
msgid ""
"%s is on the local list but not on the server list. Do you want this buddy "
"to be added?"
msgstr "本地列表中的 %s 未出现在服务器列表中。您是否想要添加此好友?"
-#: ../src/protocols/msn/error.c:35
+#: ../libgaim/protocols/msn/error.c:35
msgid "Unable to parse message"
msgstr "无法处理消息"
-#: ../src/protocols/msn/error.c:38
+#: ../libgaim/protocols/msn/error.c:38
msgid "Syntax Error (probably a Gaim bug)"
msgstr "错误(可能是 Gaim 的 bug)"
-#: ../src/protocols/msn/error.c:42
+#: ../libgaim/protocols/msn/error.c:42
msgid "Invalid e-mail address"
msgstr "无效的电子邮件地址"
-#: ../src/protocols/msn/error.c:45
+#: ../libgaim/protocols/msn/error.c:45
msgid "User does not exist"
msgstr "用户不存在"
-#: ../src/protocols/msn/error.c:49
+#: ../libgaim/protocols/msn/error.c:49
msgid "Fully Qualified Domain Name missing"
msgstr "缺少全称域名"
-#: ../src/protocols/msn/error.c:52
+#: ../libgaim/protocols/msn/error.c:52
msgid "Already Logged In"
msgstr "已登入"
-#: ../src/protocols/msn/error.c:55
+#: ../libgaim/protocols/msn/error.c:55
msgid "Invalid Username"
msgstr "用户名无效"
-#: ../src/protocols/msn/error.c:58
+#: ../libgaim/protocols/msn/error.c:58
msgid "Invalid Friendly Name"
msgstr "友好的名称无效"
-#: ../src/protocols/msn/error.c:61
+#: ../libgaim/protocols/msn/error.c:61
msgid "List Full"
msgstr "列表满"
-#: ../src/protocols/msn/error.c:64
+#: ../libgaim/protocols/msn/error.c:64
msgid "Already there"
msgstr "已列出"
-#: ../src/protocols/msn/error.c:67
+#: ../libgaim/protocols/msn/error.c:67
msgid "Not on list"
msgstr "未列出"
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
+#: ../libgaim/protocols/msn/error.c:70
+#: ../libgaim/protocols/zephyr/zephyr.c:705
msgid "User is offline"
msgstr "用户离线"
-#: ../src/protocols/msn/error.c:73
+#: ../libgaim/protocols/msn/error.c:73
msgid "Already in the mode"
msgstr "已在模式中"
-#: ../src/protocols/msn/error.c:76
+#: ../libgaim/protocols/msn/error.c:76
msgid "Already in opposite list"
msgstr "已在相对列表"
-#: ../src/protocols/msn/error.c:79
+#: ../libgaim/protocols/msn/error.c:79
msgid "Too many groups"
msgstr "组太多"
-#: ../src/protocols/msn/error.c:82
+#: ../libgaim/protocols/msn/error.c:82
msgid "Invalid group"
msgstr "无效的组"
-#: ../src/protocols/msn/error.c:85
+#: ../libgaim/protocols/msn/error.c:85
msgid "User not in group"
msgstr "用户未在组中"
-#: ../src/protocols/msn/error.c:88
+#: ../libgaim/protocols/msn/error.c:88
msgid "Group name too long"
msgstr "组名太长"
-#: ../src/protocols/msn/error.c:91
+#: ../libgaim/protocols/msn/error.c:91
msgid "Cannot remove group zero"
msgstr "无法删除零组"
-#: ../src/protocols/msn/error.c:95
-#, fuzzy
+#: ../libgaim/protocols/msn/error.c:95
msgid "Tried to add a user to a group that doesn't exist"
msgstr "试图向不存在的组中添加联系人"
-#: ../src/protocols/msn/error.c:99
+#: ../libgaim/protocols/msn/error.c:99
msgid "Switchboard failed"
msgstr "切换板失败"
-#: ../src/protocols/msn/error.c:102
+#: ../libgaim/protocols/msn/error.c:102
msgid "Notify Transfer failed"
msgstr "通知传送失败"
-#: ../src/protocols/msn/error.c:106
+#: ../libgaim/protocols/msn/error.c:106
msgid "Required fields missing"
msgstr "缺少必需域"
-#: ../src/protocols/msn/error.c:109
+#: ../libgaim/protocols/msn/error.c:109
msgid "Too many hits to a FND"
msgstr "FND 的次数太多"
-#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:207
+#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:124
msgid "Not logged in"
msgstr "未登入"
-#: ../src/protocols/msn/error.c:116
+#: ../libgaim/protocols/msn/error.c:116
msgid "Service Temporarily Unavailable"
msgstr "服务暂时不可用"
-#: ../src/protocols/msn/error.c:119
+#: ../libgaim/protocols/msn/error.c:119
msgid "Database server error"
msgstr "数据库服务器错误"
-#: ../src/protocols/msn/error.c:122
+#: ../libgaim/protocols/msn/error.c:122
msgid "Command disabled"
msgstr "命令已禁用"
-#: ../src/protocols/msn/error.c:125
+#: ../libgaim/protocols/msn/error.c:125
msgid "File operation error"
msgstr "文件操作错误"
-#: ../src/protocols/msn/error.c:128
+#: ../libgaim/protocols/msn/error.c:128
msgid "Memory allocation error"
msgstr "内存分配错误"
-#: ../src/protocols/msn/error.c:131
+#: ../libgaim/protocols/msn/error.c:131
msgid "Wrong CHL value sent to server"
msgstr "给服务器发送的 CHL 值错误"
-#: ../src/protocols/msn/error.c:135
+#: ../libgaim/protocols/msn/error.c:135
msgid "Server busy"
msgstr "服务器忙"
-#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
-#: ../src/protocols/msn/error.c:206
+#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/protocols/msn/error.c:206
msgid "Server unavailable"
msgstr "服务器不可用"
-#: ../src/protocols/msn/error.c:141
+#: ../libgaim/protocols/msn/error.c:141
msgid "Peer Notification server down"
msgstr "点通知服务器维护中"
-#: ../src/protocols/msn/error.c:144
+#: ../libgaim/protocols/msn/error.c:144
msgid "Database connect error"
msgstr "数据库连接错误"
-#: ../src/protocols/msn/error.c:148
+#: ../libgaim/protocols/msn/error.c:148
msgid "Server is going down (abandon ship)"
msgstr "服务器即将维护"
-#: ../src/protocols/msn/error.c:155
+#: ../libgaim/protocols/msn/error.c:155
msgid "Error creating connection"
msgstr "创建连接出错"
-#: ../src/protocols/msn/error.c:159
+#: ../libgaim/protocols/msn/error.c:159
msgid "CVR parameters are either unknown or not allowed"
msgstr "CVR 参数未知或不允许"
-#: ../src/protocols/msn/error.c:162
+#: ../libgaim/protocols/msn/error.c:162
msgid "Unable to write"
msgstr "无法写入"
-#: ../src/protocols/msn/error.c:165
+#: ../libgaim/protocols/msn/error.c:165
msgid "Session overload"
msgstr "会话过载"
-#: ../src/protocols/msn/error.c:168
+#: ../libgaim/protocols/msn/error.c:168
msgid "User is too active"
msgstr "用户太活跃"
-#: ../src/protocols/msn/error.c:171
+#: ../libgaim/protocols/msn/error.c:171
msgid "Too many sessions"
msgstr "会话太多"
-#: ../src/protocols/msn/error.c:174
+#: ../libgaim/protocols/msn/error.c:174
msgid "Passport not verified"
msgstr "Passport 未验证"
-#: ../src/protocols/msn/error.c:177
+#: ../libgaim/protocols/msn/error.c:177
msgid "Bad friend file"
msgstr "无效的好友文件"
-#: ../src/protocols/msn/error.c:180
+#: ../libgaim/protocols/msn/error.c:180
msgid "Not expected"
msgstr "未期待"
-#: ../src/protocols/msn/error.c:185
+#: ../libgaim/protocols/msn/error.c:185
msgid "Friendly name changes too rapidly"
msgstr "友好的名称更改太频繁"
-#: ../src/protocols/msn/error.c:194
+#: ../libgaim/protocols/msn/error.c:194
msgid "Server too busy"
msgstr "服务器太忙"
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2929
-#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
+#: ../libgaim/protocols/msn/error.c:198
+#: ../libgaim/protocols/oscar/oscar.c:1291
+#: ../libgaim/protocols/silc/ops.c:1715 ../libgaim/protocols/toc/toc.c:723
msgid "Authentication failed"
msgstr "认证失败"
-#: ../src/protocols/msn/error.c:201
+#: ../libgaim/protocols/msn/error.c:201
msgid "Not allowed when offline"
msgstr "离线时不允许"
-#: ../src/protocols/msn/error.c:209
+#: ../libgaim/protocols/msn/error.c:209
msgid "Not accepting new users"
msgstr "不接受新用户"
-#: ../src/protocols/msn/error.c:213
+#: ../libgaim/protocols/msn/error.c:213
msgid "Kids Passport without parental consent"
msgstr "没有父母在的儿童 Passport"
-#: ../src/protocols/msn/error.c:217
+#: ../libgaim/protocols/msn/error.c:217
msgid "Passport account not yet verified"
msgstr "Passport 账户未验证"
-#: ../src/protocols/msn/error.c:220
+#: ../libgaim/protocols/msn/error.c:220
msgid "Bad ticket"
msgstr "无效的票证"
-#: ../src/protocols/msn/error.c:224
+#: ../libgaim/protocols/msn/error.c:224
#, c-format
msgid "Unknown Error Code %d"
msgstr "未知的错误代码 %d"
-#: ../src/protocols/msn/error.c:236
+#: ../libgaim/protocols/msn/error.c:236
#, c-format
msgid "MSN Error: %s\n"
msgstr "MSN 错误: %s\n"
-#: ../src/protocols/msn/msn.c:113
+#: ../libgaim/protocols/msn/msn.c:113
msgid "You have just sent a Nudge!"
-msgstr ""
+msgstr "您刚刚发送了闪屏振动!"
-#: ../src/protocols/msn/msn.c:138
+#: ../libgaim/protocols/msn/msn.c:138
msgid "Your new MSN friendly name is too long."
msgstr "新的 MSN 友好名称太长。"
-#: ../src/protocols/msn/msn.c:246
+#: ../libgaim/protocols/msn/msn.c:246
msgid "Set your friendly name."
msgstr "设置您的友好名称。"
-#: ../src/protocols/msn/msn.c:247
+#: ../libgaim/protocols/msn/msn.c:247
msgid "This is the name that other MSN buddies will see you as."
msgstr "这是其他的 MSN 好友看到的名字。"
-#: ../src/protocols/msn/msn.c:263
+#: ../libgaim/protocols/msn/msn.c:263
msgid "Set your home phone number."
msgstr "设置您的家庭电话号码。"
-#: ../src/protocols/msn/msn.c:278
+#: ../libgaim/protocols/msn/msn.c:278
msgid "Set your work phone number."
msgstr "设置您的工作电话号码。"
-#: ../src/protocols/msn/msn.c:293
+#: ../libgaim/protocols/msn/msn.c:293
msgid "Set your mobile phone number."
msgstr "设置您的移动电话号码。"
-#: ../src/protocols/msn/msn.c:306
+#: ../libgaim/protocols/msn/msn.c:306
msgid "Allow MSN Mobile pages?"
msgstr "允许 MSN 移动寻呼吗?"
-#: ../src/protocols/msn/msn.c:307
+#: ../libgaim/protocols/msn/msn.c:307
msgid ""
"Do you want to allow or disallow people on your buddy list to send you MSN "
"Mobile pages to your cell phone or other mobile device?"
@@ -7454,29 +8453,31 @@ msgstr ""
"在您的允许之下,您的好友可以给您的移动电话或其它移动设备发送 MSN 移动寻呼。您"
"想要允许还是禁止这一功能?"
-#: ../src/protocols/msn/msn.c:311
+#: ../libgaim/protocols/msn/msn.c:311
msgid "Allow"
msgstr "允许"
-#: ../src/protocols/msn/msn.c:312
+#: ../libgaim/protocols/msn/msn.c:312
msgid "Disallow"
msgstr "禁止"
-#: ../src/protocols/msn/msn.c:328
+#: ../libgaim/protocols/msn/msn.c:328
msgid "This Hotmail account may not be active."
-msgstr ""
+msgstr "此 Hotmail 账户可能未激活。"
-#: ../src/protocols/msn/msn.c:354
+#: ../libgaim/protocols/msn/msn.c:354
msgid "Send a mobile message."
msgstr "发送移动消息。"
-#: ../src/protocols/msn/msn.c:356
+#: ../libgaim/protocols/msn/msn.c:356
msgid "Page"
msgstr "寻呼"
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
+#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/sametime/sametime.c:3236
+#: ../libgaim/protocols/yahoo/yahoo.c:2974
+#: ../libgaim/protocols/yahoo/yahoo.c:2980
#, c-format
msgid ""
"\n"
@@ -7485,69 +8486,73 @@ msgstr ""
"\n"
"<b>%s:</b> %s"
-#: ../src/protocols/msn/msn.c:557
+#: ../libgaim/protocols/msn/msn.c:553
msgid "Has you"
msgstr "有你"
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3290
+#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/yahoo/yahoo.c:2803
+#: ../libgaim/protocols/yahoo/yahoo.c:3411
msgid "Be Right Back"
msgstr "马上回来"
-#: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
-#: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
-#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3293
+#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/novell/novell.c:2855
+#: ../libgaim/protocols/novell/novell.c:2989
+#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/yahoo/yahoo.c:2805
+#: ../libgaim/protocols/yahoo/yahoo.c:3414
msgid "Busy"
msgstr "忙碌"
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3305
+#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2813
+#: ../libgaim/protocols/yahoo/yahoo.c:3426
msgid "On the Phone"
msgstr "接听电话"
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/protocols/yahoo/yahoo.c:3311
+#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2817
+#: ../libgaim/protocols/yahoo/yahoo.c:3432
msgid "Out to Lunch"
msgstr "外出就餐"
-#: ../src/protocols/msn/msn.c:623
+#: ../libgaim/protocols/msn/msn.c:619
msgid "Set Friendly Name..."
msgstr "设置友好的名称..."
-#: ../src/protocols/msn/msn.c:628
+#: ../libgaim/protocols/msn/msn.c:624
msgid "Set Home Phone Number..."
msgstr "设置家庭电话号码..."
-#: ../src/protocols/msn/msn.c:632
+#: ../libgaim/protocols/msn/msn.c:628
msgid "Set Work Phone Number..."
msgstr "设置工作电话号码..."
-#: ../src/protocols/msn/msn.c:636
+#: ../libgaim/protocols/msn/msn.c:632
msgid "Set Mobile Phone Number..."
msgstr "设置移动电话号码..."
-#: ../src/protocols/msn/msn.c:642
+#: ../libgaim/protocols/msn/msn.c:638
msgid "Enable/Disable Mobile Devices..."
msgstr "启用/禁用移动设备..."
-#: ../src/protocols/msn/msn.c:647
+#: ../libgaim/protocols/msn/msn.c:643
msgid "Allow/Disallow Mobile Pages..."
msgstr "允许/禁止移动寻呼..."
-#: ../src/protocols/msn/msn.c:657
+#: ../libgaim/protocols/msn/msn.c:653
msgid "Open Hotmail Inbox"
msgstr "打开 Hotmail 收件箱"
-#: ../src/protocols/msn/msn.c:681
+#: ../libgaim/protocols/msn/msn.c:677
msgid "Send to Mobile"
msgstr "发送到移动设备"
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
+#: ../libgaim/protocols/msn/msn.c:687
+#: ../libgaim/protocols/novell/novell.c:3445
msgid "Initiate _Chat"
msgstr "发起聊天(_C)"
-#: ../src/protocols/msn/msn.c:729
+#: ../libgaim/protocols/msn/msn.c:725
msgid ""
"SSL support is needed for MSN. Please install a supported SSL library. See "
"http://gaim.sf.net/faq-ssl.php for more information."
@@ -7555,85 +8560,241 @@ msgstr ""
"MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。请参看 http://gaim.sf.net/faq-"
"ssl.php 中的更多信息。"
-#: ../src/protocols/msn/msn.c:757
+#: ../libgaim/protocols/msn/msn.c:752
msgid "Failed to connect to server."
msgstr "连接到服务器失败。"
-#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
+#: ../libgaim/protocols/msn/msn.c:1363
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:685
+#: ../libgaim/protocols/zephyr/zephyr.c:736
+#: ../libgaim/protocols/zephyr/zephyr.c:1153
#, c-format
msgid "<b>Alias:</b> %s<br>"
msgstr "<b>别名:</b> %s<br>"
#. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1055
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1208 ../libgaim/util.c:1108
#, c-format
msgid "<b>%s:</b> "
msgstr "<b>%s:</b>"
-#: ../src/protocols/msn/msn.c:1456
+#: ../libgaim/protocols/msn/msn.c:1460
msgid "MSN Profile"
msgstr "MSN 个人资料"
-#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1800
-#: ../src/protocols/yahoo/yahoo_profile.c:795
+#: ../libgaim/protocols/msn/msn.c:1465 ../libgaim/protocols/msn/msn.c:1791
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:795
msgid "Error retrieving profile"
msgstr "获取配置文件出错"
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6204
-#: ../src/protocols/yahoo/yahoo_profile.c:1050
+#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/oscar/oscar.c:3650
+#: ../libgaim/protocols/qq/buddy_info.c:61
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1056
msgid "Age"
msgstr "年龄"
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1065
+#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/qq/buddy_info.c:70
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1071
msgid "Occupation"
msgstr "职业"
-#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1045
+#: ../libgaim/protocols/msn/msn.c:1536
+#: ../libgaim/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1051
msgid "Location"
msgstr "位置"
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1729
-#: ../src/protocols/msn/msn.c:1735 ../src/protocols/msn/msn.c:1742
+#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/msn/msn.c:1720
+#: ../libgaim/protocols/msn/msn.c:1726 ../libgaim/protocols/msn/msn.c:1733
msgid "Hobbies and Interests"
msgstr "嗜好和兴趣"
-#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1663
-#: ../src/protocols/msn/msn.c:1669 ../src/protocols/msn/msn.c:1676
-#: ../src/protocols/msn/msn.c:1684 ../src/protocols/msn/msn.c:1691
+#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1654
+#: ../libgaim/protocols/msn/msn.c:1660 ../libgaim/protocols/msn/msn.c:1667
+#: ../libgaim/protocols/msn/msn.c:1675 ../libgaim/protocols/msn/msn.c:1682
msgid "A Little About Me"
msgstr "自我介绍"
+#: ../libgaim/protocols/msn/msn.c:1553
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>常规</b><br>%s"
+
#. Social
-#: ../src/protocols/msn/msn.c:1563 ../src/protocols/yahoo/yahoo_profile.c:1055
+#: ../libgaim/protocols/msn/msn.c:1562
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1061
msgid "Marital Status"
msgstr "婚姻状况"
-#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1751
-#: ../src/protocols/msn/msn.c:1757 ../src/protocols/yahoo/yahoo_profile.c:1107
+#: ../libgaim/protocols/msn/msn.c:1563
+msgid "Interests"
+msgstr "兴趣"
+
+#: ../libgaim/protocols/msn/msn.c:1564
+msgid "Pets"
+msgstr "宠物"
+
+#: ../libgaim/protocols/msn/msn.c:1565
+#, fuzzy
+msgid "Hometown"
+msgstr "主机未知"
+
+#: ../libgaim/protocols/msn/msn.c:1566
+#, fuzzy
+msgid "Places Lived"
+msgstr "已取消"
+
+#: ../libgaim/protocols/msn/msn.c:1567
+msgid "Fashion"
+msgstr "时尚"
+
+#: ../libgaim/protocols/msn/msn.c:1568
+msgid "Humor"
+msgstr ""
+
+#: ../libgaim/protocols/msn/msn.c:1569
+msgid "Music"
+msgstr "音乐"
+
+#: ../libgaim/protocols/msn/msn.c:1570 ../libgaim/protocols/msn/msn.c:1742
+#: ../libgaim/protocols/msn/msn.c:1748
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1113
msgid "Favorite Quote"
msgstr "格言"
-#: ../src/protocols/msn/msn.c:1700 ../src/protocols/msn/msn.c:1706
-#: ../src/protocols/msn/msn.c:1713 ../src/protocols/msn/msn.c:1720
+#: ../libgaim/protocols/msn/msn.c:1574
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>社交</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1583
+msgid "Significant Other"
+msgstr ""
+
+#: ../libgaim/protocols/msn/msn.c:1584
+msgid "Home Phone"
+msgstr "家庭电话"
+
+#: ../libgaim/protocols/msn/msn.c:1585
+msgid "Home Phone 2"
+msgstr "家庭电话 2"
+
+#: ../libgaim/protocols/msn/msn.c:1586 ../libgaim/protocols/oscar/oscar.c:3662
+msgid "Home Address"
+msgstr "家庭住址"
+
+#: ../libgaim/protocols/msn/msn.c:1587
+msgid "Personal Mobile"
+msgstr "个人手机"
+
+#: ../libgaim/protocols/msn/msn.c:1588
+msgid "Home Fax"
+msgstr "家庭传真"
+
+#: ../libgaim/protocols/msn/msn.c:1589
+msgid "Personal E-Mail"
+msgstr "个人电子邮件"
+
+#: ../libgaim/protocols/msn/msn.c:1590
+msgid "Personal IM"
+msgstr "个人 IM"
+
+#: ../libgaim/protocols/msn/msn.c:1592
+msgid "Anniversary"
+msgstr "纪念日"
+
+#: ../libgaim/protocols/msn/msn.c:1593 ../libgaim/protocols/msn/msn.c:1617
+msgid "Notes"
+msgstr "备注"
+
+#: ../libgaim/protocols/msn/msn.c:1597
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>个人</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/silc/ops.c:1043
+msgid "Job Title"
+msgstr "职称"
+
+#: ../libgaim/protocols/msn/msn.c:1605 ../libgaim/protocols/oscar/oscar.c:3679
+msgid "Company"
+msgstr "公司"
+
+#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libgaim/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "部门"
+
+#: ../libgaim/protocols/msn/msn.c:1607
+msgid "Profession"
+msgstr "职业"
+
+#: ../libgaim/protocols/msn/msn.c:1608
+msgid "Work Phone"
+msgstr "工作电话"
+
+#: ../libgaim/protocols/msn/msn.c:1609
+msgid "Work Phone 2"
+msgstr "办公电话 2"
+
+#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3670
+msgid "Work Address"
+msgstr "办公地址"
+
+#: ../libgaim/protocols/msn/msn.c:1611
+msgid "Work Mobile"
+msgstr "办公手机"
+
+#: ../libgaim/protocols/msn/msn.c:1612
+msgid "Work Pager"
+msgstr "办公寻呼"
+
+#: ../libgaim/protocols/msn/msn.c:1613
+msgid "Work Fax"
+msgstr "办公传真"
+
+#: ../libgaim/protocols/msn/msn.c:1614
+msgid "Work E-Mail"
+msgstr "办公电子邮件"
+
+#: ../libgaim/protocols/msn/msn.c:1615
+msgid "Work IM"
+msgstr "办公 IM"
+
+#: ../libgaim/protocols/msn/msn.c:1616
+msgid "Start Date"
+msgstr "开始日期"
+
+#: ../libgaim/protocols/msn/msn.c:1621
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>工作</b><br>%s"
+
+#: ../libgaim/protocols/msn/msn.c:1632
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>联系日期</b>%s%s"
+
+#: ../libgaim/protocols/msn/msn.c:1691 ../libgaim/protocols/msn/msn.c:1697
+#: ../libgaim/protocols/msn/msn.c:1704 ../libgaim/protocols/msn/msn.c:1711
msgid "Favorite Things"
msgstr "收藏"
-#: ../src/protocols/msn/msn.c:1765
+#: ../libgaim/protocols/msn/msn.c:1756
msgid "Last Updated"
msgstr "上次更新"
-#: ../src/protocols/msn/msn.c:1777 ../src/protocols/silc/ops.c:1060
+#: ../libgaim/protocols/msn/msn.c:1768 ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libgaim/protocols/silc/ops.c:1059
msgid "Homepage"
msgstr "主页"
-#: ../src/protocols/msn/msn.c:1802
+#: ../libgaim/protocols/msn/msn.c:1793
msgid "The user has not created a public profile."
msgstr "用户尚未创建公开的个人资料。"
-#: ../src/protocols/msn/msn.c:1803
+#: ../libgaim/protocols/msn/msn.c:1794
msgid ""
"MSN reported not being able to find the user's profile. This either means "
"that the user does not exist, or that the user exists but has not created a "
@@ -7642,14 +8803,20 @@ msgstr ""
"MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
"个人资料。"
-#: ../src/protocols/msn/msn.c:1807
+#: ../libgaim/protocols/msn/msn.c:1798
msgid ""
"Gaim could not find any information in the user's profile. The user most "
"likely does not exist."
msgstr "Gaim 在用户的个人资料中找不到任何信息。用户可能不存在。"
-#: ../src/protocols/msn/msn.c:1813 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202
+#. put a link to the actual profile URL
+#: ../libgaim/protocols/msn/msn.c:1803
+#, fuzzy, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<b>%s:</b>"
+
+#: ../libgaim/protocols/msn/msn.c:1803
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1208
msgid "Profile URL"
msgstr "配置文件 URL"
@@ -7663,85 +8830,96 @@ msgstr "配置文件 URL"
#. *< version
#. * summary
#. * description
-#: ../src/protocols/msn/msn.c:2022 ../src/protocols/msn/msn.c:2024
+#: ../libgaim/protocols/msn/msn.c:2025 ../libgaim/protocols/msn/msn.c:2027
msgid "MSN Protocol Plugin"
msgstr "MSN 协议插件"
-#: ../src/protocols/msn/msn.c:2043
-msgid "Login server"
-msgstr "登录服务器"
-
-#: ../src/protocols/msn/msn.c:2052
+#: ../libgaim/protocols/msn/msn.c:2055
msgid "Use HTTP Method"
msgstr "使用 HTTP 方式"
-#: ../src/protocols/msn/msn.c:2057
+#: ../libgaim/protocols/msn/msn.c:2060
msgid "Show custom smileys"
msgstr "显示自定义如下:"
-#: ../src/protocols/msn/msn.c:2065
+#: ../libgaim/protocols/msn/msn.c:2068
msgid "nudge: nudge a user to get their attention"
msgstr "nudge:向用户发送闪屏震动,以便引起他的注意"
-#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
+#: ../libgaim/protocols/msn/nexus.c:146
+#: ../libgaim/protocols/msn/servconn.c:133
+#: ../libgaim/protocols/qq/qq_proxy.c:242
+#: ../libgaim/protocols/qq/qq_proxy.c:321
+#: ../libgaim/protocols/qq/qq_proxy.c:366
+#: ../libgaim/protocols/qq/qq_proxy.c:399
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:62
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:162
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:186
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:199
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:228
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:242
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:267
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:301
+#: ../libgaim/protocols/qq/udp_proxy_s5.c:331
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
msgid "Unable to connect"
msgstr "无法连接"
-#: ../src/protocols/msn/notification.c:178
+#: ../libgaim/protocols/msn/notification.c:178
#, c-format
msgid "%s is not a valid group."
msgstr "%s 不是有效的组名。"
-#: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:334
+#: ../libgaim/protocols/msn/notification.c:184
+#: ../libgaim/protocols/msn/notification.c:532
+#: ../libgaim/protocols/msn/session.c:329
msgid "Unknown error."
msgstr "未知错误。"
-#: ../src/protocols/msn/notification.c:187
+#: ../libgaim/protocols/msn/notification.c:187
#, c-format
msgid "%s on %s (%s)"
msgstr "%2$s(%3$s) 上的 %1$s"
-#: ../src/protocols/msn/notification.c:498
+#: ../libgaim/protocols/msn/notification.c:498
#, c-format
msgid "Unable to add user on %s (%s)"
msgstr "无法在 %s(%s) 上添加用户"
-#: ../src/protocols/msn/notification.c:502
+#: ../libgaim/protocols/msn/notification.c:502
#, c-format
msgid "Unable to block user on %s (%s)"
msgstr "无法在 %s(%s) 上屏蔽用户"
-#: ../src/protocols/msn/notification.c:506
+#: ../libgaim/protocols/msn/notification.c:506
#, c-format
msgid "Unable to permit user on %s (%s)"
msgstr "无法允许 %s(%s) 上的拥护"
-#: ../src/protocols/msn/notification.c:514
+#: ../libgaim/protocols/msn/notification.c:514
#, c-format
msgid "%s could not be added because your buddy list is full."
msgstr "无法添加 %s,原因是您的好友列表已满。"
-#: ../src/protocols/msn/notification.c:523
+#: ../libgaim/protocols/msn/notification.c:523
#, c-format
msgid "%s is not a valid passport account."
msgstr "%s 不是有效的通行证账户。"
-#: ../src/protocols/msn/notification.c:528
+#: ../libgaim/protocols/msn/notification.c:528
msgid "Service Temporarily Unavailable."
msgstr "服务暂时不可用。"
-#: ../src/protocols/msn/notification.c:821
+#: ../libgaim/protocols/msn/notification.c:820
msgid "Unable to rename group"
msgstr "无法重命名组"
-#: ../src/protocols/msn/notification.c:876
+#: ../libgaim/protocols/msn/notification.c:875
msgid "Unable to delete group"
msgstr "无法删除组"
-#: ../src/protocols/msn/notification.c:1309
+#: ../libgaim/protocols/msn/notification.c:1308
#, c-format
msgid ""
"The MSN server will shut down for maintenance in %d minute. You will "
@@ -7763,15 +8941,15 @@ msgstr[0] ""
"\n"
"维护完成后,您将能够成功登入。"
-#: ../src/protocols/msn/servconn.c:135
+#: ../libgaim/protocols/msn/servconn.c:135
msgid "Writing error"
msgstr "写入错误"
-#: ../src/protocols/msn/servconn.c:137
+#: ../libgaim/protocols/msn/servconn.c:137
msgid "Reading error"
msgstr "读取错误"
-#: ../src/protocols/msn/servconn.c:144
+#: ../libgaim/protocols/msn/servconn.c:144
#, c-format
msgid ""
"Connection error from %s server:\n"
@@ -7780,443 +8958,375 @@ msgstr ""
"%s 服务器的连接错误:\n"
"%s"
-#: ../src/protocols/msn/session.c:304
+#: ../libgaim/protocols/msn/session.c:299
msgid "Our protocol is not supported by the server."
msgstr "服务器不支持此协议。"
-#: ../src/protocols/msn/session.c:308
+#: ../libgaim/protocols/msn/session.c:303
msgid "Error parsing HTTP."
msgstr "分析 HTTP 出错。"
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5881 ../src/protocols/yahoo/yahoo.c:193
+#: ../libgaim/protocols/msn/session.c:307
+#: ../libgaim/protocols/oscar/oscar.c:3387
+#: ../libgaim/protocols/yahoo/yahoo.c:191
msgid "You have signed on from another location."
msgstr "您在其它位置用此用户名登入了。"
-#: ../src/protocols/msn/session.c:315
+#: ../libgaim/protocols/msn/session.c:310
msgid "The MSN servers are temporarily unavailable. Please wait and try again."
msgstr "MSN 服务器临时不可用。请稍候再试一次。"
-#: ../src/protocols/msn/session.c:320
+#: ../libgaim/protocols/msn/session.c:315
msgid "The MSN servers are going down temporarily."
msgstr "MSN 服务器目前维护中。"
-#: ../src/protocols/msn/session.c:324
+#: ../libgaim/protocols/msn/session.c:319
#, c-format
msgid "Unable to authenticate: %s"
msgstr "无法通过身份验证: %s"
-#: ../src/protocols/msn/session.c:329
+#: ../libgaim/protocols/msn/session.c:324
msgid ""
"Your MSN buddy list is temporarily unavailable. Please wait and try again."
msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
-#: ../src/protocols/msn/session.c:350 ../src/protocols/msn/session.c:352
+#: ../libgaim/protocols/msn/session.c:345
+#: ../libgaim/protocols/msn/session.c:347
msgid "Handshaking"
msgstr "握手"
-#: ../src/protocols/msn/session.c:351
+#: ../libgaim/protocols/msn/session.c:346
msgid "Transferring"
msgstr "文件传送"
-#: ../src/protocols/msn/session.c:353
+#: ../libgaim/protocols/msn/session.c:348
msgid "Starting authentication"
msgstr "开始身份验证"
-#: ../src/protocols/msn/session.c:354
+#: ../libgaim/protocols/msn/session.c:349
msgid "Getting cookie"
msgstr "获得 cookie"
-#: ../src/protocols/msn/session.c:356
+#: ../libgaim/protocols/msn/session.c:351
msgid "Sending cookie"
msgstr "发送 cookie"
-#: ../src/protocols/msn/session.c:357
+#: ../libgaim/protocols/msn/session.c:352
msgid "Retrieving buddy list"
msgstr "正在获取好友列表"
-#: ../src/protocols/msn/state.c:34
+#: ../libgaim/protocols/msn/state.c:34
msgid "Away From Computer"
msgstr "远离电脑"
-#: ../src/protocols/msn/state.c:35
+#: ../libgaim/protocols/msn/state.c:35
msgid "On The Phone"
msgstr "接听电话"
-#: ../src/protocols/msn/state.c:36
+#: ../libgaim/protocols/msn/state.c:36
msgid "Out To Lunch"
msgstr "外出就餐"
-#: ../src/protocols/msn/switchboard.c:406
+#: ../libgaim/protocols/msn/switchboard.c:400
msgid "Message may have not been sent because a timeout occurred:"
msgstr "消息未发出,因为发生了超时:"
-#: ../src/protocols/msn/switchboard.c:414
+#: ../libgaim/protocols/msn/switchboard.c:408
msgid "Message could not be sent, not allowed while invisible:"
msgstr "消息未发出,隐身时不允许:"
-#: ../src/protocols/msn/switchboard.c:418
+#: ../libgaim/protocols/msn/switchboard.c:412
msgid "Message could not be sent because the user is offline:"
msgstr "消息未发出,因为用户离线:"
-#: ../src/protocols/msn/switchboard.c:422
+#: ../libgaim/protocols/msn/switchboard.c:416
msgid "Message could not be sent because a connection error occurred:"
msgstr "消息未发出,因为发生了连接错误:"
-#: ../src/protocols/msn/switchboard.c:426
+#: ../libgaim/protocols/msn/switchboard.c:420
msgid "Message could not be sent because we are sending too quickly:"
msgstr "消息未发出,因为发送的频率太高:"
-#: ../src/protocols/msn/switchboard.c:430
+#: ../libgaim/protocols/msn/switchboard.c:424
msgid ""
"Message could not be sent because an error with the switchboard occurred:"
msgstr "消息未发出,因为切换板发生了错误:"
-#: ../src/protocols/msn/switchboard.c:438
+#: ../libgaim/protocols/msn/switchboard.c:432
msgid "Message may have not been sent because an unknown error occurred:"
msgstr "消息未发出,因为发生了未知错误:"
-#: ../src/protocols/msn/switchboard.c:959
+#: ../libgaim/protocols/msn/switchboard.c:952
#, c-format
msgid "%s just sent you a Nudge!"
msgstr "%s 刚刚给您发送了闪屏振动!"
-#: ../src/protocols/msn/userlist.c:96
+#: ../libgaim/protocols/msn/userlist.c:90
#, c-format
msgid "The user %s (%s) wants to add %s to his or her buddy list."
msgstr "用户 %s(%s) 想要将 %s 添加为好友。"
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:915
+#: ../libgaim/protocols/msn/userlist.c:105
+#: ../libgaim/protocols/yahoo/yahoo.c:981
msgid "Authorize"
msgstr "同意"
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
+#: ../libgaim/protocols/msn/userlist.c:106
+#: ../libgaim/protocols/yahoo/yahoo.c:983
msgid "Deny"
msgstr "拒绝"
-#: ../src/protocols/msn/userlist.c:286
+#: ../libgaim/protocols/msn/userlist.c:280
#, c-format
msgid "%s has added you to his or her buddy list."
msgstr "%s 已将您添加为好友。"
-#: ../src/protocols/msn/userlist.c:350
+#: ../libgaim/protocols/msn/userlist.c:349
#, c-format
msgid "%s has removed you from his or her buddy list."
msgstr "%s 已经将您从好友名单中删除。"
-#: ../src/protocols/msn/userlist.c:679
+#: ../libgaim/protocols/msn/userlist.c:671
#, c-format
msgid "Unable to add \"%s\"."
msgstr "无法添加“%s”。"
-#: ../src/protocols/msn/userlist.c:681
+#: ../libgaim/protocols/msn/userlist.c:673
msgid "The screen name specified is invalid."
msgstr "指定的用户名无效。"
-#: ../src/protocols/napster/napster.c:266
-msgid "Unable to read header from server"
-msgstr "无法从服务器读取头"
-
-#: ../src/protocols/napster/napster.c:280
-#, c-format
-msgid "Unable to read message from server: %s. Command is %hd, length is %hd."
-msgstr "无法从服务器 %s 读取信息。命令为 %hd,长度为 %hd。"
-
-#: ../src/protocols/napster/napster.c:296
-msgid "Unknown server error."
-msgstr "未知服务器错误。"
-
-#: ../src/protocols/napster/napster.c:345
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr "用户数: %s,文件数: %s,大小: %sGB"
-
-#. MSG_SERVER_HOTLIST_ERROR
-#: ../src/protocols/napster/napster.c:356
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr "无法将“%s”添加到您的 Napster 快捷栏中"
-
-#. MSG_CLIENT_WHOIS
-#: ../src/protocols/napster/napster.c:420
-#, c-format
-msgid "%s requested your information"
-msgstr "%s 请求您的信息"
-
-#. MSG_CLIENT_PING
-#: ../src/protocols/napster/napster.c:460
-#, c-format
-msgid "%s requested a PING"
-msgstr "%s 请求 PING"
-
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../src/protocols/napster/napster.c:507
-#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2239 ../src/protocols/yahoo/yahoo.c:2266
-#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
-#: ../src/protocols/yahoo/yahoo_filexfer.c:74
-#: ../src/protocols/yahoo/yahoo_filexfer.c:137
-#: ../src/protocols/yahoo/ycht.c:540
-msgid "Unable to connect."
-msgstr "无法连接。"
-
-#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "组(_G):"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../src/protocols/napster/napster.c:699
-#: ../src/protocols/napster/napster.c:701
-msgid "NAPSTER Protocol Plugin"
-msgstr "NAPSTER 协议插件"
-
-#: ../src/protocols/novell/nmuser.c:1868
+#: ../libgaim/protocols/novell/nmuser.c:1868
msgid "Required parameters not passed in"
msgstr "请求的参数未传入"
-#: ../src/protocols/novell/nmuser.c:1871
+#: ../libgaim/protocols/novell/nmuser.c:1871
msgid "Unable to write to network"
msgstr "无法写入网络"
-#: ../src/protocols/novell/nmuser.c:1874
+#: ../libgaim/protocols/novell/nmuser.c:1874
msgid "Unable to read from network"
msgstr "无法从网络读取套接字"
-#: ../src/protocols/novell/nmuser.c:1877
+#: ../libgaim/protocols/novell/nmuser.c:1877
msgid "Error communicating with server"
msgstr "与服务器通讯出错"
-#: ../src/protocols/novell/nmuser.c:1881
+#: ../libgaim/protocols/novell/nmuser.c:1881
msgid "Conference not found"
msgstr "会议未找到"
-#: ../src/protocols/novell/nmuser.c:1884
+#: ../libgaim/protocols/novell/nmuser.c:1884
msgid "Conference does not exist"
msgstr "会议不存在"
-#: ../src/protocols/novell/nmuser.c:1888
+#: ../libgaim/protocols/novell/nmuser.c:1888
msgid "A folder with that name already exists"
msgstr "已存在同名文件夹"
-#: ../src/protocols/novell/nmuser.c:1891
+#: ../libgaim/protocols/novell/nmuser.c:1891
msgid "Not supported"
msgstr "支持"
-#: ../src/protocols/novell/nmuser.c:1895
+#: ../libgaim/protocols/novell/nmuser.c:1895
msgid "Password has expired"
msgstr "密码已过期"
-#: ../src/protocols/novell/nmuser.c:1898
+#: ../libgaim/protocols/novell/nmuser.c:1898
msgid "Invalid password"
msgstr "无效的密码"
-#: ../src/protocols/novell/nmuser.c:1901
+#: ../libgaim/protocols/novell/nmuser.c:1901
msgid "User not found"
msgstr "用户未找到"
-#: ../src/protocols/novell/nmuser.c:1904
+#: ../libgaim/protocols/novell/nmuser.c:1904
msgid "Account has been disabled"
msgstr "账户已经被禁用"
-#: ../src/protocols/novell/nmuser.c:1907
+#: ../libgaim/protocols/novell/nmuser.c:1907
msgid "The server could not access the directory"
msgstr "服务器无法访问目录"
-#: ../src/protocols/novell/nmuser.c:1910
+#: ../libgaim/protocols/novell/nmuser.c:1910
msgid "Your system administrator has disabled this operation"
msgstr "您的系统管理员已经禁用此操作"
-#: ../src/protocols/novell/nmuser.c:1913
+#: ../libgaim/protocols/novell/nmuser.c:1913
msgid "The server is unavailable; try again later"
msgstr "服务器不可用;请稍候再试"
-#: ../src/protocols/novell/nmuser.c:1916
+#: ../libgaim/protocols/novell/nmuser.c:1916
msgid "Cannot add a contact to the same folder twice"
msgstr "无法为同一个文件夹添加两次联系人"
-#: ../src/protocols/novell/nmuser.c:1919
+#: ../libgaim/protocols/novell/nmuser.c:1919
msgid "Cannot add yourself"
msgstr "无法添加您自己"
-#: ../src/protocols/novell/nmuser.c:1922
+#: ../libgaim/protocols/novell/nmuser.c:1922
msgid "Master archive is misconfigured"
msgstr "主存档配置错误"
-#: ../src/protocols/novell/nmuser.c:1926
+#: ../libgaim/protocols/novell/nmuser.c:1926
msgid "Invalid username or password"
msgstr "无效的用户名或密码"
-#: ../src/protocols/novell/nmuser.c:1929
+#: ../libgaim/protocols/novell/nmuser.c:1929
msgid "Could not recognize the host of the username you entered"
msgstr "无法识别您输入用户名的主机"
-#: ../src/protocols/novell/nmuser.c:1932
+#: ../libgaim/protocols/novell/nmuser.c:1932
msgid ""
"Your account has been disabled because too many invalid passwords were "
"entered"
msgstr "您的账户已经被禁用,原因是输错密码的次数太多"
-#: ../src/protocols/novell/nmuser.c:1935
+#: ../libgaim/protocols/novell/nmuser.c:1935
msgid "You cannot add the same person twice to a conversation"
msgstr "您无法将同一个人两次添加到对话"
-#: ../src/protocols/novell/nmuser.c:1939
+#: ../libgaim/protocols/novell/nmuser.c:1939
msgid "You have reached your limit for the number of contacts allowed"
msgstr "您达到了所允许联系人的最大数目"
-#: ../src/protocols/novell/nmuser.c:1942
+#: ../libgaim/protocols/novell/nmuser.c:1942
msgid "You have entered an invalid username"
msgstr "您输入了无效的用户名"
-#: ../src/protocols/novell/nmuser.c:1945
+#: ../libgaim/protocols/novell/nmuser.c:1945
msgid "An error occurred while updating the directory"
msgstr "更新目录时发生了错误"
-#: ../src/protocols/novell/nmuser.c:1948
+#: ../libgaim/protocols/novell/nmuser.c:1948
msgid "Incompatible protocol version"
msgstr "不兼容的协议版本"
-#: ../src/protocols/novell/nmuser.c:1951
+#: ../libgaim/protocols/novell/nmuser.c:1951
msgid "The user has blocked you"
msgstr "用户已经屏蔽了您"
-#: ../src/protocols/novell/nmuser.c:1954
+#: ../libgaim/protocols/novell/nmuser.c:1954
msgid ""
"This evaluation version does not allow more than ten users to log in at one "
"time"
msgstr "试用版本不允许超过十个用户同时在线"
-#: ../src/protocols/novell/nmuser.c:1957
+#: ../libgaim/protocols/novell/nmuser.c:1957
msgid "The user is either offline or you are blocked"
msgstr "用户或者离线,或者已经屏蔽了您"
-#: ../src/protocols/novell/nmuser.c:1960
+#: ../libgaim/protocols/novell/nmuser.c:1960
#, c-format
msgid "Unknown error: 0x%X"
msgstr "未知错误: 0x%X"
-#: ../src/protocols/novell/novell.c:124
+#: ../libgaim/protocols/novell/novell.c:124
#, c-format
msgid "Login failed (%s)."
msgstr "登录失败(%s)。"
-#: ../src/protocols/novell/novell.c:247
+#: ../libgaim/protocols/novell/novell.c:247
#, c-format
msgid "Unable to send message. Could not get details for user (%s)."
msgstr "无法发送消息。无法获得用户的详细信息(%s)。"
-#: ../src/protocols/novell/novell.c:396
+#: ../libgaim/protocols/novell/novell.c:396
#, c-format
msgid "Unable to add %s to your buddy list (%s)."
msgstr "无法将 %s 添加到您的好友列表中(%s)。"
#. TODO: Improve this! message to who or for what conference?
-#: ../src/protocols/novell/novell.c:422
+#: ../libgaim/protocols/novell/novell.c:422
#, c-format
msgid "Unable to send message (%s)."
msgstr "无法发送消息(%s)。"
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
+#: ../libgaim/protocols/novell/novell.c:493
+#: ../libgaim/protocols/novell/novell.c:985
#, c-format
msgid "Unable to invite user (%s)."
msgstr "无法邀请用户(%s)。"
-#: ../src/protocols/novell/novell.c:532
+#: ../libgaim/protocols/novell/novell.c:532
#, c-format
msgid "Unable to send message to %s. Could not create the conference (%s)."
msgstr "无法给 %s 发送消息。无法创建会议(%s)。"
-#: ../src/protocols/novell/novell.c:537
+#: ../libgaim/protocols/novell/novell.c:537
#, c-format
msgid "Unable to send message. Could not create the conference (%s)."
msgstr "无法发送消息。无法创建会议(%s)。"
-#: ../src/protocols/novell/novell.c:584
+#: ../libgaim/protocols/novell/novell.c:584
#, c-format
msgid ""
"Unable to move user %s to folder %s in the server side list. Error while "
"creating folder (%s)."
msgstr "无法将用户 %s 在服务器端移动到文件夹 %s。创建文件夹出错(%s)。"
-#: ../src/protocols/novell/novell.c:632
+#: ../libgaim/protocols/novell/novell.c:632
#, c-format
msgid ""
"Unable to add %s to your buddy list. Error creating folder in server side "
"list (%s)."
msgstr "无法将 %s 添加到您的好友列表。在服务器端创建文件夹出错(%s)。"
-#: ../src/protocols/novell/novell.c:705
+#: ../libgaim/protocols/novell/novell.c:705
#, c-format
msgid "Could not get details for user %s (%s)."
msgstr "无法获得用户 %s 的详细信息(%s)。"
-#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
+#: ../libgaim/protocols/novell/novell.c:751
+#: ../libgaim/protocols/novell/novell.c:897
#, c-format
msgid "Unable to add user to privacy list (%s)."
msgstr "无法将用户添加到您的隐私列表中(%s)。"
-#: ../src/protocols/novell/novell.c:798
+#: ../libgaim/protocols/novell/novell.c:798
#, c-format
msgid "Unable to add %s to deny list (%s)."
msgstr "无法将“%s”添加到您的好友列表中(%s)。"
-#: ../src/protocols/novell/novell.c:851
+#: ../libgaim/protocols/novell/novell.c:851
#, c-format
msgid "Unable to add %s to permit list (%s)."
msgstr "无法将 %s 添加到您的许可列表中(%s)。"
-#: ../src/protocols/novell/novell.c:919
+#: ../libgaim/protocols/novell/novell.c:919
#, c-format
msgid "Unable to remove %s from privacy list (%s)."
msgstr "无法将 %s 从隐私列表中删除(%s)。"
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
+#: ../libgaim/protocols/novell/novell.c:942
+#: ../libgaim/protocols/novell/novell.c:1652
#, c-format
msgid "Unable to change server side privacy settings (%s)."
msgstr "无法更改服务器端的隐私设置(%s)。"
-#: ../src/protocols/novell/novell.c:1014
+#: ../libgaim/protocols/novell/novell.c:1012
#, c-format
msgid "Unable to create conference (%s)."
msgstr "无法创建会议(%s)。"
-#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
+#: ../libgaim/protocols/novell/novell.c:1121
+#: ../libgaim/protocols/novell/novell.c:1697
msgid "Error communicating with server. Closing connection."
msgstr "与服务器通讯出错。关闭连接。"
-#: ../src/protocols/novell/novell.c:1478
+#: ../libgaim/protocols/novell/novell.c:1476
msgid "Telephone Number"
msgstr "电话号码"
-#: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "部门"
-
-#: ../src/protocols/novell/novell.c:1484
+#: ../libgaim/protocols/novell/novell.c:1482
msgid "Personal Title"
msgstr "个人称谓"
-#: ../src/protocols/novell/novell.c:1488
+#: ../libgaim/protocols/novell/novell.c:1486
msgid "Mailstop"
msgstr "邮箱"
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "电子邮件地址"
-
-#: ../src/protocols/novell/novell.c:1506
+#: ../libgaim/protocols/novell/novell.c:1504
+#: ../libgaim/protocols/qq/buddy_info.c:54
msgid "User ID"
msgstr "用户 ID"
@@ -8227,41 +9337,41 @@ msgstr "用户 ID"
#. tag, value);
#. }
#.
-#: ../src/protocols/novell/novell.c:1520
+#: ../libgaim/protocols/novell/novell.c:1518
msgid "Full name"
msgstr "全名"
-#: ../src/protocols/novell/novell.c:1644
+#: ../libgaim/protocols/novell/novell.c:1642
#, c-format
msgid "GroupWise Conference %d"
msgstr "GroupWise 会议 %d"
-#: ../src/protocols/novell/novell.c:1669
+#: ../libgaim/protocols/novell/novell.c:1673
msgid "Unable to make SSL connection to server."
msgstr "无法通过 SSL 连接到服务器。"
-#: ../src/protocols/novell/novell.c:1726
+#: ../libgaim/protocols/novell/novell.c:1729
msgid "Authenticating..."
msgstr "正在认证..."
-#: ../src/protocols/novell/novell.c:1738
+#: ../libgaim/protocols/novell/novell.c:1741
msgid "Unable to connect to server."
msgstr "无法连接到服务器。"
-#: ../src/protocols/novell/novell.c:1741
+#: ../libgaim/protocols/novell/novell.c:1744
msgid "Waiting for response..."
msgstr "正在等候响应..."
-#: ../src/protocols/novell/novell.c:1876
+#: ../libgaim/protocols/novell/novell.c:1879
#, c-format
msgid "%s has been invited to this conversation."
msgstr "已经邀请 %s 加入此对话。"
-#: ../src/protocols/novell/novell.c:1904
+#: ../libgaim/protocols/novell/novell.c:1907
msgid "Invitation to Conversation"
msgstr "对话邀请"
-#: ../src/protocols/novell/novell.c:1905
+#: ../libgaim/protocols/novell/novell.c:1908
#, c-format
msgid ""
"Invitation from: %s\n"
@@ -8272,15 +9382,15 @@ msgstr ""
"\n"
"发出时间: %s"
-#: ../src/protocols/novell/novell.c:1907
+#: ../libgaim/protocols/novell/novell.c:1910
msgid "Would you like to join the conversation?"
msgstr "您是否想要加入对话?"
-#: ../src/protocols/novell/novell.c:2014
+#: ../libgaim/protocols/novell/novell.c:2017
msgid "You have been logged out because you logged in at another workstation."
msgstr "您已被注销,因为您已从其它计算机上登录。"
-#: ../src/protocols/novell/novell.c:2070
+#: ../libgaim/protocols/novell/novell.c:2073
#, c-format
msgid ""
"%s appears to be offline and did not receive the message that you just sent."
@@ -8290,17 +9400,17 @@ msgstr "%s 显示为离线,因此未接受到您刚刚发出的消息。"
#. * gaim_request_fields(gc, _("Server Address"),...);
#.
#. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
+#: ../libgaim/protocols/novell/novell.c:2171
msgid ""
"Unable to connect to server. Please enter the address of the server you wish "
"to connect to."
msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
-#: ../src/protocols/novell/novell.c:2190
+#: ../libgaim/protocols/novell/novell.c:2194
msgid "Error. SSL support is not installed."
msgstr "出错。SSL 支持未安装。"
-#: ../src/protocols/novell/novell.c:2499
+#: ../libgaim/protocols/novell/novell.c:2503
msgid "This conference has been closed. No more messages can be sent."
msgstr "此会议已关筹。不会再送出消息。"
@@ -8314,296 +9424,316 @@ msgstr "此会议已关筹。不会再送出消息。"
#. *< version
#. * summary
#. * description
-#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
+#: ../libgaim/protocols/novell/novell.c:3547
+#: ../libgaim/protocols/novell/novell.c:3549
msgid "Novell GroupWise Messenger Protocol Plugin"
msgstr "Novell GroupWise Messenger 协议插件"
-#: ../src/protocols/novell/novell.c:3564
+#: ../libgaim/protocols/novell/novell.c:3568
msgid "Server address"
msgstr "服务器地址"
-#: ../src/protocols/novell/novell.c:3568
+#: ../libgaim/protocols/novell/novell.c:3572
msgid "Server port"
msgstr "服务器端口"
-#: ../src/protocols/oscar/oscar.c:203
+#: ../libgaim/protocols/oscar/flap_connection.c:240
+#, fuzzy
+msgid "Server closed the connection."
+msgstr "%s 已经关闭了对话。"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:527
+#, fuzzy
+msgid "Lost connection with server for an unknown reason."
+msgstr "您的命令失败,原因未知。"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:244
+#, fuzzy
+msgid "Received invalid data on connection with server."
+msgstr "无法通过 SSL 连接到服务器。"
+
+#: ../libgaim/protocols/oscar/flap_connection.c:246
+#, fuzzy
+msgid "Could not establish a connection with the server."
+msgstr "无法建立与本地 mDNS 服务器的连接。服务器是否在运行中?"
+
+#: ../libgaim/protocols/oscar/odc.c:40
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "%s 已经关闭了对话。"
+
+#: ../libgaim/protocols/oscar/odc.c:42
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "用户已经屏蔽了您"
+
+#: ../libgaim/protocols/oscar/odc.c:44
+#, fuzzy
+msgid "Lost connection with the remote user for an unknown reason."
+msgstr "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
+
+#: ../libgaim/protocols/oscar/odc.c:46
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+
+#: ../libgaim/protocols/oscar/odc.c:48
+msgid "Could not establish a connection with the remote user."
+msgstr "无法建立与远程用户的连接。"
+
+#: ../libgaim/protocols/oscar/odc.c:557
+msgid "Direct IM established"
+msgstr "二人世界已建立"
+
+#: ../libgaim/protocols/oscar/oscar.c:120
msgid "Invalid error"
msgstr "无效错误"
-#: ../src/protocols/oscar/oscar.c:204
+#: ../libgaim/protocols/oscar/oscar.c:121
msgid "Invalid SNAC"
msgstr "无效 SNAC"
-#: ../src/protocols/oscar/oscar.c:205
+#: ../libgaim/protocols/oscar/oscar.c:122
msgid "Rate to host"
msgstr "主机等级"
-#: ../src/protocols/oscar/oscar.c:206
+#: ../libgaim/protocols/oscar/oscar.c:123
msgid "Rate to client"
msgstr "客户等级"
-#: ../src/protocols/oscar/oscar.c:208
+#: ../libgaim/protocols/oscar/oscar.c:125
msgid "Service unavailable"
msgstr "服务不可用"
-#: ../src/protocols/oscar/oscar.c:209
+#: ../libgaim/protocols/oscar/oscar.c:126
msgid "Service not defined"
msgstr "服务未定义"
-#: ../src/protocols/oscar/oscar.c:210
+#: ../libgaim/protocols/oscar/oscar.c:127
msgid "Obsolete SNAC"
msgstr "废旧 SNAC"
-#: ../src/protocols/oscar/oscar.c:211
+#: ../libgaim/protocols/oscar/oscar.c:128
msgid "Not supported by host"
msgstr "主机不支持"
-#: ../src/protocols/oscar/oscar.c:212
+#: ../libgaim/protocols/oscar/oscar.c:129
msgid "Not supported by client"
msgstr "客户不支持"
-#: ../src/protocols/oscar/oscar.c:213
+#: ../libgaim/protocols/oscar/oscar.c:130
msgid "Refused by client"
msgstr "客户拒绝"
-#: ../src/protocols/oscar/oscar.c:214
+#: ../libgaim/protocols/oscar/oscar.c:131
msgid "Reply too big"
msgstr "回复太大"
-#: ../src/protocols/oscar/oscar.c:215
+#: ../libgaim/protocols/oscar/oscar.c:132
msgid "Responses lost"
msgstr "响应丢失"
-#: ../src/protocols/oscar/oscar.c:216
+#: ../libgaim/protocols/oscar/oscar.c:133
msgid "Request denied"
msgstr "请求被禁止"
-#: ../src/protocols/oscar/oscar.c:217
+#: ../libgaim/protocols/oscar/oscar.c:134
msgid "Busted SNAC payload"
msgstr "SNAC 有效负载激增"
-#: ../src/protocols/oscar/oscar.c:218
+#: ../libgaim/protocols/oscar/oscar.c:135
msgid "Insufficient rights"
msgstr "权限不够"
-#: ../src/protocols/oscar/oscar.c:219
+#: ../libgaim/protocols/oscar/oscar.c:136
msgid "In local permit/deny"
msgstr "本地许可/禁止"
-#: ../src/protocols/oscar/oscar.c:220
+#: ../libgaim/protocols/oscar/oscar.c:137
msgid "Too evil (sender)"
msgstr "太邪恶(发送者)"
-#: ../src/protocols/oscar/oscar.c:221
+#: ../libgaim/protocols/oscar/oscar.c:138
msgid "Too evil (receiver)"
msgstr "太邪恶(接收者)"
-#: ../src/protocols/oscar/oscar.c:222
+#: ../libgaim/protocols/oscar/oscar.c:139
msgid "User temporarily unavailable"
msgstr "用户临时不可用"
-#: ../src/protocols/oscar/oscar.c:223
+#: ../libgaim/protocols/oscar/oscar.c:140
msgid "No match"
msgstr "无匹配"
-#: ../src/protocols/oscar/oscar.c:224
+#: ../libgaim/protocols/oscar/oscar.c:141
msgid "List overflow"
msgstr "列表溢出"
-#: ../src/protocols/oscar/oscar.c:225
+#: ../libgaim/protocols/oscar/oscar.c:142
msgid "Request ambiguous"
msgstr "请求含糊"
-#: ../src/protocols/oscar/oscar.c:226
+#: ../libgaim/protocols/oscar/oscar.c:143
msgid "Queue full"
msgstr "队列满"
-#: ../src/protocols/oscar/oscar.c:227
+#: ../libgaim/protocols/oscar/oscar.c:144
msgid "Not while on AOL"
msgstr "不位于 AOL 上"
-#: ../src/protocols/oscar/oscar.c:421 ../src/protocols/oscar/oscar.c:523
+#: ../libgaim/protocols/oscar/oscar.c:322
+msgid ""
+"(There was an error receiving this message. The buddy you are speaking with "
+"is probably using a different encoding than expected. If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#: ../libgaim/protocols/oscar/oscar.c:425
msgid ""
"(There was an error receiving this message. The buddy you are speaking to "
"most likely has a buggy client.)"
msgstr "(转换此信息出错。与您对话的好友可能正在使用存在问题的客户端。)"
-#: ../src/protocols/oscar/oscar.c:702
+#: ../libgaim/protocols/oscar/oscar.c:604
msgid "Voice"
msgstr "语音"
-#: ../src/protocols/oscar/oscar.c:705
+#: ../libgaim/protocols/oscar/oscar.c:607
msgid "AIM Direct IM"
msgstr "AIM 二人世界"
-#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
-#: ../src/protocols/silc/util.c:510
+#: ../libgaim/protocols/oscar/oscar.c:610 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/util.c:551
msgid "Chat"
msgstr "聊天"
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8168
+#: ../libgaim/protocols/oscar/oscar.c:613
+#: ../libgaim/protocols/oscar/oscar.c:5830
msgid "Get File"
msgstr "获取文件"
-#: ../src/protocols/oscar/oscar.c:718
+#: ../libgaim/protocols/oscar/oscar.c:620
msgid "Games"
msgstr "游戏"
-#: ../src/protocols/oscar/oscar.c:721
+#: ../libgaim/protocols/oscar/oscar.c:623
msgid "Add-Ins"
msgstr "外挂"
-#: ../src/protocols/oscar/oscar.c:724
+#: ../libgaim/protocols/oscar/oscar.c:626
msgid "Send Buddy List"
msgstr "发送好友列表"
-#: ../src/protocols/oscar/oscar.c:727
+#: ../libgaim/protocols/oscar/oscar.c:629
msgid "ICQ Direct Connect"
msgstr "ICQ 直接连接"
-#: ../src/protocols/oscar/oscar.c:730
+#: ../libgaim/protocols/oscar/oscar.c:632
msgid "AP User"
msgstr "AP 用户"
-#: ../src/protocols/oscar/oscar.c:733
+#: ../libgaim/protocols/oscar/oscar.c:635
msgid "ICQ RTF"
msgstr "ICQ RTF"
-#: ../src/protocols/oscar/oscar.c:736
+#: ../libgaim/protocols/oscar/oscar.c:638
msgid "Nihilist"
msgstr "Nihilist"
-#: ../src/protocols/oscar/oscar.c:739
+#: ../libgaim/protocols/oscar/oscar.c:641
msgid "ICQ Server Relay"
msgstr "ICQ 服务器转发"
-#: ../src/protocols/oscar/oscar.c:742
+#: ../libgaim/protocols/oscar/oscar.c:644
msgid "Old ICQ UTF8"
msgstr "旧的 ICQ UTF8"
-#: ../src/protocols/oscar/oscar.c:745
+#: ../libgaim/protocols/oscar/oscar.c:647
msgid "Trillian Encryption"
msgstr "Trillian 加密"
-#: ../src/protocols/oscar/oscar.c:748
+#: ../libgaim/protocols/oscar/oscar.c:650
msgid "ICQ UTF8"
msgstr "ICQ UTF8"
-#: ../src/protocols/oscar/oscar.c:751
+#: ../libgaim/protocols/oscar/oscar.c:653
msgid "Hiptop"
msgstr "Hiptop"
-#: ../src/protocols/oscar/oscar.c:754
+#: ../libgaim/protocols/oscar/oscar.c:656
msgid "Security Enabled"
msgstr "安全已启用"
-#: ../src/protocols/oscar/oscar.c:757
+#: ../libgaim/protocols/oscar/oscar.c:659
msgid "Video Chat"
msgstr "可视聊天"
-#: ../src/protocols/oscar/oscar.c:761
+#: ../libgaim/protocols/oscar/oscar.c:663
msgid "iChat AV"
msgstr "iChat AV"
-#: ../src/protocols/oscar/oscar.c:764
+#: ../libgaim/protocols/oscar/oscar.c:666
msgid "Live Video"
msgstr "实时视频"
-#: ../src/protocols/oscar/oscar.c:767
+#: ../libgaim/protocols/oscar/oscar.c:669
msgid "Camera"
msgstr "相机"
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8030
+#: ../libgaim/protocols/oscar/oscar.c:687
+#: ../libgaim/protocols/oscar/oscar.c:5607
msgid "Free For Chat"
msgstr "无事闲聊"
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8058
+#: ../libgaim/protocols/oscar/oscar.c:691
+#: ../libgaim/protocols/oscar/oscar.c:5639
msgid "Not Available"
msgstr "不可用"
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8048
+#: ../libgaim/protocols/oscar/oscar.c:693
+#: ../libgaim/protocols/oscar/oscar.c:5625
msgid "Occupied"
msgstr "琐事缠身"
-#: ../src/protocols/oscar/oscar.c:795
+#: ../libgaim/protocols/oscar/oscar.c:697
msgid "Web Aware"
msgstr "网上留意"
-#: ../src/protocols/oscar/oscar.c:799
+#: ../libgaim/protocols/oscar/oscar.c:701
msgid "Online"
msgstr "在线"
-#: ../src/protocols/oscar/oscar.c:876 ../src/protocols/oscar/oscar.c:5253
+#: ../libgaim/protocols/oscar/oscar.c:787
+#: ../libgaim/protocols/oscar/oscar.c:2782
msgid "Warning Level"
msgstr "警告级别"
-#: ../src/protocols/oscar/oscar.c:885
+#: ../libgaim/protocols/oscar/oscar.c:796
msgid "Buddy Comment"
msgstr "好友注释"
-#: ../src/protocols/oscar/oscar.c:1034
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "与 %s 的二人世界已关闭"
-
-#: ../src/protocols/oscar/oscar.c:1036
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "与 %s 的二人世界失败"
+#: ../libgaim/protocols/oscar/oscar.c:930
+msgid "Could not connect to authentication server"
+msgstr "无法连接到身份验证服务器"
-#: ../src/protocols/oscar/oscar.c:1044
-msgid "Direct Connect failed"
-msgstr "二人世界连接失败"
+#: ../libgaim/protocols/oscar/oscar.c:932
+msgid "Could not connect to BOS server"
+msgstr "无法连接到 BOS 服务器"
-#: ../src/protocols/oscar/oscar.c:1124 ../src/protocols/oscar/oscar.c:1253
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "与 %s 的二人世界已建立"
-
-#: ../src/protocols/oscar/oscar.c:1205
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "试图连接到 %2$s:%3$hu 的 %1$s 进行二人世界。"
-
-#: ../src/protocols/oscar/oscar.c:1608
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
-
-#: ../src/protocols/oscar/oscar.c:1613 ../src/protocols/oscar/oscar.c:1660
-msgid "Unable to open Direct IM"
-msgstr "无法开始二人世界"
-
-#: ../src/protocols/oscar/oscar.c:1696
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "您选择了与 %s 进行二人世界连接。"
-
-#: ../src/protocols/oscar/oscar.c:1700
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk. "
-"Do you wish to continue?"
-msgstr ""
-"由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
-
-#: ../src/protocols/oscar/oscar.c:1704 ../src/protocols/oscar/oscar.c:4564
-msgid "_Connect"
-msgstr "连接(_C)"
-
-#: ../src/protocols/oscar/oscar.c:1782
-#, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "您已经丢失与聊天室 %s 的连接。"
-
-#: ../src/protocols/oscar/oscar.c:1805
-msgid "Chat is currently unavailable"
-msgstr "聊天目前不可用"
-
-#: ../src/protocols/oscar/oscar.c:1877
+#: ../libgaim/protocols/oscar/oscar.c:965
msgid "Screen name sent"
msgstr "用户名已发送"
-#: ../src/protocols/oscar/oscar.c:1893
+#: ../libgaim/protocols/oscar/oscar.c:970
+msgid "Connection established, cookie sent"
+msgstr "连接已建立,已发送 cookie"
+
+#. TODO: Don't call this with ssi
+#: ../libgaim/protocols/oscar/oscar.c:999
+msgid "Finalizing connection"
+msgstr "完成连接"
+
+#: ../libgaim/protocols/oscar/oscar.c:1183
#, c-format
msgid ""
"Unable to login: Could not sign on as %s because the screen name is "
@@ -8613,76 +9743,20 @@ msgstr ""
"无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须以字母开头,其中只能包"
"含字母、数字和空格,或者只包含数字。"
-#: ../src/protocols/oscar/oscar.c:1921
-msgid "Unable to login to AIM"
-msgstr "无法登入 AIM"
-
-#: ../src/protocols/oscar/oscar.c:2024 ../src/protocols/oscar/oscar.c:3016
-msgid "Could Not Connect"
-msgstr "无法连接"
-
-#: ../src/protocols/oscar/oscar.c:2035
-msgid "Connection established, cookie sent"
-msgstr "连接已建立,已发送 cookie"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. *
-#. * Above, we checked if we had previously attempted a connection
-#. * redirect to prevent a conflict with the joscar library
-#.
-#. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2194
-msgid "Attempting connection redirect..."
-msgstr "正在尝试连接重定向..."
-
-#. proxyip timed out
-#. * Yes, it's a bit odd to ask the user to enable proxied file transfers
-#. * when it's a proxied transfer that timed out. It is possible that a
-#. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2240
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
-msgstr ""
-
-#: ../src/protocols/oscar/oscar.c:2338
-#: ../src/protocols/yahoo/yahoo_filexfer.c:253
-#: ../src/protocols/yahoo/yahoo_filexfer.c:262
-#: ../src/protocols/yahoo/yahoo_filexfer.c:271
-msgid "Unable to establish file descriptor."
-msgstr "无法建立文件描述符。"
-
-#: ../src/protocols/oscar/oscar.c:2343
-msgid "Unable to create new connection."
-msgstr "无法创建新连接。"
-
-#: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
-#: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
-msgid "Unable to log into file transfer proxy."
-msgstr "无法登录到文件传送代理服务器。"
-
-#: ../src/protocols/oscar/oscar.c:2668
-#, fuzzy
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "无法建立监听套接字。"
-
-#: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
+#: ../libgaim/protocols/oscar/oscar.c:1268 ../libgaim/protocols/toc/toc.c:544
msgid "Incorrect nickname or password."
msgstr "昵称或密码不对。"
-#: ../src/protocols/oscar/oscar.c:2911
+#: ../libgaim/protocols/oscar/oscar.c:1273
msgid "Your account is currently suspended."
msgstr "您的账户被停用。"
#. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2915
+#: ../libgaim/protocols/oscar/oscar.c:1277
msgid "The AOL Instant Messenger service is temporarily unavailable."
msgstr "AOL 即时通讯服务暂时不可用。"
-#: ../src/protocols/oscar/oscar.c:2920
+#: ../libgaim/protocols/oscar/oscar.c:1282
msgid ""
"You have been connecting and disconnecting too frequently. Wait ten minutes "
"and try again. If you continue to try, you will need to wait even longer."
@@ -8690,33 +9764,33 @@ msgstr ""
"您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
"能会更长。"
-#: ../src/protocols/oscar/oscar.c:2925
+#: ../libgaim/protocols/oscar/oscar.c:1287
#, c-format
msgid "The client version you are using is too old. Please upgrade at %s"
msgstr "您使用的客户版本太老。请在 %s 升级"
-#: ../src/protocols/oscar/oscar.c:2953
-msgid "Internal Error"
-msgstr "内部错误"
+#: ../libgaim/protocols/oscar/oscar.c:1322
+msgid "Could Not Connect"
+msgstr "无法连接"
-#: ../src/protocols/oscar/oscar.c:3023
+#: ../libgaim/protocols/oscar/oscar.c:1327
msgid "Received authorization"
msgstr "收到的认证"
-#: ../src/protocols/oscar/oscar.c:3047
+#: ../libgaim/protocols/oscar/oscar.c:1350
msgid "The SecurID key entered is invalid."
msgstr "输入的 SecurID 密钥无效。"
-#: ../src/protocols/oscar/oscar.c:3061
+#: ../libgaim/protocols/oscar/oscar.c:1364
msgid "Enter SecurID"
msgstr "输入 SecurID"
-#: ../src/protocols/oscar/oscar.c:3062
+#: ../libgaim/protocols/oscar/oscar.c:1365
msgid "Enter the 6 digit number from the digital display."
msgstr "输入所显示的六位数字。"
-#: ../src/protocols/oscar/oscar.c:3102 ../src/protocols/oscar/oscar.c:3132
-#: ../src/protocols/oscar/oscar.c:3223
+#: ../libgaim/protocols/oscar/oscar.c:1405
+#: ../libgaim/protocols/oscar/oscar.c:1448
#, c-format
msgid ""
"You may be disconnected shortly. You may want to use TOC until this is "
@@ -8724,70 +9798,65 @@ msgid ""
msgstr ""
"您即将被断开。您可能想要使用 TOC 直到这一问题被修正。请检查 %s 上的更新。"
-#: ../src/protocols/oscar/oscar.c:3105 ../src/protocols/oscar/oscar.c:3135
+#: ../libgaim/protocols/oscar/oscar.c:1408
+#: ../libgaim/protocols/oscar/oscar.c:1451
msgid "Gaim was unable to get a valid AIM login hash."
msgstr "Gaim 无法获取有效的 AIM 登录码。"
-#: ../src/protocols/oscar/oscar.c:3226
+#: ../libgaim/protocols/oscar/oscar.c:1537
+#, c-format
+msgid "You may be disconnected shortly. Check %s for updates."
+msgstr "您即将被断开。请检查 %s 上的更新。"
+
+#: ../libgaim/protocols/oscar/oscar.c:1540
msgid "Gaim was unable to get a valid login hash."
msgstr "Gaim 无法获取有效的登录码。"
-#: ../src/protocols/oscar/oscar.c:3247
+#: ../libgaim/protocols/oscar/oscar.c:1566
msgid "Password sent"
msgstr "密码已送出"
-#: ../src/protocols/oscar/oscar.c:4555
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s 刚刚请求和 %s 二人世界"
-
-#: ../src/protocols/oscar/oscar.c:4558
-msgid ""
-"This requires a direct connection between the two computers and is necessary "
-"for IM Images. Because your IP address will be revealed, this may be "
-"considered a privacy risk."
-msgstr ""
-"现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
-"露您的 IP 地址,所以可能造成潜在的隐私风险。"
-
-#: ../src/protocols/oscar/oscar.c:4597
+#: ../libgaim/protocols/oscar/oscar.c:2118
msgid "Please authorize me so I can add you to my buddy list."
msgstr "请同意我将您加入好友。"
-#: ../src/protocols/oscar/oscar.c:4605
+#: ../libgaim/protocols/oscar/oscar.c:2127
msgid "Authorization Request Message:"
msgstr "认证请求消息:"
-#: ../src/protocols/oscar/oscar.c:4606
+#: ../libgaim/protocols/oscar/oscar.c:2128
msgid "Please authorize me!"
msgstr "请同意我将您加入好友!"
-#: ../src/protocols/oscar/oscar.c:4636
+#: ../libgaim/protocols/oscar/oscar.c:2160
#, c-format
msgid ""
"The user %s requires authorization before being added to a buddy list. Do "
"you want to send an authorization request?"
msgstr "用户 %s 在被加为您的好友之前需要认证。您是否想要发送认证请求?"
-#: ../src/protocols/oscar/oscar.c:4641
+#: ../libgaim/protocols/oscar/oscar.c:2165
msgid "Request Authorization"
msgstr "请求认证"
-#: ../src/protocols/oscar/oscar.c:4643
+#: ../libgaim/protocols/oscar/oscar.c:2167
msgid "_Request Authorization"
msgstr "请求认证(_R)"
-#: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
-#: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7462 ../src/protocols/oscar/oscar.c:7514
+#: ../libgaim/protocols/oscar/oscar.c:2208
+#: ../libgaim/protocols/oscar/oscar.c:2215
+#: ../libgaim/protocols/oscar/oscar.c:2321
+#: ../libgaim/protocols/oscar/oscar.c:2345
+#: ../libgaim/protocols/oscar/oscar.c:5032
+#: ../libgaim/protocols/oscar/oscar.c:5084
msgid "No reason given."
msgstr "没有给出理由。"
-#: ../src/protocols/oscar/oscar.c:4686
+#: ../libgaim/protocols/oscar/oscar.c:2214
msgid "Authorization Denied Message:"
msgstr "认证拒绝消息:"
-#: ../src/protocols/oscar/oscar.c:4793
+#: ../libgaim/protocols/oscar/oscar.c:2323
#, c-format
msgid ""
"The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8796,11 +9865,12 @@ msgstr ""
"用户 %u 想要将 %s 加为他/她的好友,理由如下:\n"
"%s"
-#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7474
+#: ../libgaim/protocols/oscar/oscar.c:2333
+#: ../libgaim/protocols/oscar/oscar.c:5044
msgid "Authorization Request"
msgstr "认证请求"
-#: ../src/protocols/oscar/oscar.c:4815
+#: ../libgaim/protocols/oscar/oscar.c:2345
#, c-format
msgid ""
"The user %u has denied your request to add them to your buddy list for the "
@@ -8810,17 +9880,17 @@ msgstr ""
"用户 %u 拒绝了您将他/她加为好友的请求,原因如下:\n"
"%s"
-#: ../src/protocols/oscar/oscar.c:4816
+#: ../libgaim/protocols/oscar/oscar.c:2346
msgid "ICQ authorization denied."
msgstr "ICQ 请求认证被拒绝。"
#. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4823
+#: ../libgaim/protocols/oscar/oscar.c:2353
#, c-format
msgid "The user %u has granted your request to add them to your buddy list."
msgstr "用户 %u 同意您将他/她加为好友。"
-#: ../src/protocols/oscar/oscar.c:4831
+#: ../libgaim/protocols/oscar/oscar.c:2361
#, c-format
msgid ""
"You have received a special message\n"
@@ -8833,7 +9903,7 @@ msgstr ""
"发出人: %s [%s]\n"
"%s"
-#: ../src/protocols/oscar/oscar.c:4839
+#: ../libgaim/protocols/oscar/oscar.c:2369
#, c-format
msgid ""
"You have received an ICQ page\n"
@@ -8846,7 +9916,7 @@ msgstr ""
"发出人:%s [%s]\n"
"%s"
-#: ../src/protocols/oscar/oscar.c:4847
+#: ../libgaim/protocols/oscar/oscar.c:2377
#, c-format
msgid ""
"You have received an ICQ e-mail from %s [%s]\n"
@@ -8859,32 +9929,32 @@ msgstr ""
"内容是:\n"
"%s"
-#: ../src/protocols/oscar/oscar.c:4868
+#: ../libgaim/protocols/oscar/oscar.c:2398
#, c-format
msgid "ICQ user %u has sent you a buddy: %s (%s)"
msgstr "ICQ 用户 %u 给您发送了一个好友:%s (%s)"
-#: ../src/protocols/oscar/oscar.c:4874
+#: ../libgaim/protocols/oscar/oscar.c:2404
msgid "Do you want to add this buddy to your buddy list?"
msgstr "您是否想要将此人加为好友?"
-#: ../src/protocols/oscar/oscar.c:4878
+#: ../libgaim/protocols/oscar/oscar.c:2408
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../src/protocols/oscar/oscar.c:4962
+#: ../libgaim/protocols/oscar/oscar.c:2492
#, c-format
msgid "You missed %hu message from %s because it was invalid."
msgid_plural "You missed %hu messages from %s because they were invalid."
msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
-#: ../src/protocols/oscar/oscar.c:4971
+#: ../libgaim/protocols/oscar/oscar.c:2501
#, c-format
msgid "You missed %hu message from %s because it was too large."
msgid_plural "You missed %hu messages from %s because they were too large."
msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
-#: ../src/protocols/oscar/oscar.c:4980
+#: ../libgaim/protocols/oscar/oscar.c:2510
#, c-format
msgid ""
"You missed %hu message from %s because the rate limit has been exceeded."
@@ -8892,94 +9962,96 @@ msgid_plural ""
"You missed %hu messages from %s because the rate limit has been exceeded."
msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
-#: ../src/protocols/oscar/oscar.c:4989
+#: ../libgaim/protocols/oscar/oscar.c:2519
#, c-format
msgid "You missed %hu message from %s because he/she was too evil."
msgid_plural "You missed %hu messages from %s because he/she was too evil."
msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
-#: ../src/protocols/oscar/oscar.c:4998
+#: ../libgaim/protocols/oscar/oscar.c:2528
#, c-format
msgid "You missed %hu message from %s because you are too evil."
msgid_plural "You missed %hu messages from %s because you are too evil."
msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
-#: ../src/protocols/oscar/oscar.c:5007
+#: ../libgaim/protocols/oscar/oscar.c:2537
#, c-format
msgid "You missed %hu message from %s for an unknown reason."
msgid_plural "You missed %hu messages from %s for an unknown reason."
msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
-#: ../src/protocols/oscar/oscar.c:5066
+#: ../libgaim/protocols/oscar/oscar.c:2593
#, c-format
msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
msgstr "<B>UIN:</B> %s<BR><B>状态:</B> %s<HR>%s"
-#: ../src/protocols/oscar/oscar.c:5127
+#: ../libgaim/protocols/oscar/oscar.c:2654
#, c-format
msgid "SNAC threw error: %s\n"
msgstr "SNAC 扔出错误:%s\n"
#. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:5164
+#: ../libgaim/protocols/oscar/oscar.c:2690
#, c-format
msgid "Unable to send message: %s"
msgstr "无法发送消息: %s"
-#: ../src/protocols/oscar/oscar.c:5164 ../src/protocols/oscar/oscar.c:5169
-#: ../src/protocols/oscar/oscar.c:5227 ../src/protocols/oscar/oscar.c:5231
+#: ../libgaim/protocols/oscar/oscar.c:2690
+#: ../libgaim/protocols/oscar/oscar.c:2695
+#: ../libgaim/protocols/oscar/oscar.c:2757
+#: ../libgaim/protocols/oscar/oscar.c:2761
msgid "Unknown reason."
msgstr "未知原因。"
-#: ../src/protocols/oscar/oscar.c:5167
-#: ../src/protocols/sametime/sametime.c:2373
+#: ../libgaim/protocols/oscar/oscar.c:2693
+#: ../libgaim/protocols/sametime/sametime.c:2364
#, c-format
msgid "Unable to send message to %s:"
msgstr "无法给 %s 发送消息:"
-#: ../src/protocols/oscar/oscar.c:5227
+#: ../libgaim/protocols/oscar/oscar.c:2757
#, c-format
msgid "User information not available: %s"
msgstr "用户信息不可用:%s"
-#: ../src/protocols/oscar/oscar.c:5230
+#: ../libgaim/protocols/oscar/oscar.c:2760
#, c-format
msgid "User information for %s unavailable:"
msgstr "%s 的用户信息不可用:"
-#: ../src/protocols/oscar/oscar.c:5257
+#: ../libgaim/protocols/oscar/oscar.c:2786
msgid "Online Since"
msgstr "上线时间"
-#: ../src/protocols/oscar/oscar.c:5262
-#: ../src/protocols/yahoo/yahoo_profile.c:1153
+#: ../libgaim/protocols/oscar/oscar.c:2791
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1159
msgid "Member Since"
msgstr "注册时间"
-#: ../src/protocols/oscar/oscar.c:5267
+#: ../libgaim/protocols/oscar/oscar.c:2796
msgid "Capabilities"
msgstr "能力"
-#: ../src/protocols/oscar/oscar.c:5285
+#: ../libgaim/protocols/oscar/oscar.c:2814
msgid "Available Message"
msgstr "可用消息"
-#: ../src/protocols/oscar/oscar.c:5402
+#: ../libgaim/protocols/oscar/oscar.c:2914
msgid "Your AIM connection may be lost."
msgstr "您的 AIM 连接可能已丢失。"
#. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5588
+#: ../libgaim/protocols/oscar/oscar.c:3095
msgid ""
"[Unable to display a message from this user because it contained invalid "
"characters.]"
msgstr "[无法显示来自此用户的信息,原因是其中包含了无效的字符。"
-#: ../src/protocols/oscar/oscar.c:5809
+#: ../libgaim/protocols/oscar/oscar.c:3316
msgid "Rate limiting error."
msgstr "速度限制错误。"
-#: ../src/protocols/oscar/oscar.c:5810
+#: ../libgaim/protocols/oscar/oscar.c:3317
msgid ""
"The last action you attempted could not be performed because you are over "
"the rate limit. Please wait 10 seconds and try again."
@@ -8987,138 +10059,127 @@ msgstr ""
"您试图的最后一次操作未执行,原因是您已经得到了速度极限。请等 10 秒,然后再试"
"一次。"
-#: ../src/protocols/oscar/oscar.c:5883
+#: ../libgaim/protocols/oscar/oscar.c:3389
msgid "You have been signed off for an unknown reason."
msgstr "您已经登出了,原因未知。"
-#: ../src/protocols/oscar/oscar.c:5896 ../src/protocols/toc/toc.c:971
+#: ../libgaim/protocols/oscar/oscar.c:3402 ../libgaim/protocols/toc/toc.c:972
#, c-format
msgid "You have been disconnected from chat room %s."
msgstr "您已经断开与聊天室 %s 的连接。"
-#. XXX - Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:5925
-msgid "Finalizing connection"
-msgstr "完成连接"
-
-#: ../src/protocols/oscar/oscar.c:6190 ../src/protocols/silc/util.c:542
+#: ../libgaim/protocols/oscar/oscar.c:3626
+#: ../libgaim/protocols/silc/util.c:583
msgid "Mobile Phone"
msgstr "移动电话"
-#: ../src/protocols/oscar/oscar.c:6207
+#: ../libgaim/protocols/oscar/oscar.c:3653
msgid "Personal Web Page"
msgstr "个人主页"
-#: ../src/protocols/oscar/oscar.c:6211
+#: ../libgaim/protocols/oscar/oscar.c:3657
msgid "Additional Information"
msgstr "额外信息"
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "家庭住址"
-
-#: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
+#: ../libgaim/protocols/oscar/oscar.c:3666
+#: ../libgaim/protocols/oscar/oscar.c:3674
msgid "Zip Code"
msgstr "邮政编码"
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "办公地址"
-
-#: ../src/protocols/oscar/oscar.c:6232
+#: ../libgaim/protocols/oscar/oscar.c:3678
msgid "Work Information"
msgstr "工作信息"
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "公司"
-
-#: ../src/protocols/oscar/oscar.c:6234
+#: ../libgaim/protocols/oscar/oscar.c:3680
msgid "Division"
msgstr "部门"
-#: ../src/protocols/oscar/oscar.c:6235
+#: ../libgaim/protocols/oscar/oscar.c:3681
msgid "Position"
msgstr "职务"
-#: ../src/protocols/oscar/oscar.c:6237
+#: ../libgaim/protocols/oscar/oscar.c:3683
msgid "Web Page"
msgstr "网页"
-#: ../src/protocols/oscar/oscar.c:6295
+#: ../libgaim/protocols/oscar/oscar.c:3741
msgid "Pop-Up Message"
msgstr "弹出消息"
-#: ../src/protocols/oscar/oscar.c:6335
+#: ../libgaim/protocols/oscar/oscar.c:3781
#, c-format
msgid "The following screen name is associated with %s"
msgid_plural "The following screen names are associated with %s"
msgstr[0] "下列用户名已经和 %s 关联"
-#: ../src/protocols/oscar/oscar.c:6366
+#: ../libgaim/protocols/oscar/oscar.c:3786
+msgid "Screen name"
+msgstr "用户名"
+
+#: ../libgaim/protocols/oscar/oscar.c:3812
#, c-format
msgid "No results found for e-mail address %s"
msgstr "未找到与电子邮件地址 %s 匹配的结果"
-#: ../src/protocols/oscar/oscar.c:6387
+#: ../libgaim/protocols/oscar/oscar.c:3833
#, c-format
msgid "You should receive an e-mail asking to confirm %s."
msgstr "您应当收到询问确认 %s 的邮件。"
-#: ../src/protocols/oscar/oscar.c:6389
+#: ../libgaim/protocols/oscar/oscar.c:3835
msgid "Account Confirmation Requested"
msgstr "请求了账户确认"
-#: ../src/protocols/oscar/oscar.c:6420
+#: ../libgaim/protocols/oscar/oscar.c:3866
msgid "Error Changing Account Info"
msgstr "更改账户信息出错"
-#: ../src/protocols/oscar/oscar.c:6423
+#: ../libgaim/protocols/oscar/oscar.c:3869
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
"differs from the original."
msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名与原始用户名不符。"
-#: ../src/protocols/oscar/oscar.c:6426
+#: ../libgaim/protocols/oscar/oscar.c:3872
#, c-format
msgid "Error 0x%04x: Unable to format screen name because it is invalid."
msgstr "错误 0x%04x:无法格式化用户名,原因是用户名无效。"
-#: ../src/protocols/oscar/oscar.c:6429
+#: ../libgaim/protocols/oscar/oscar.c:3875
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
"is too long."
msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名太长。"
-#: ../src/protocols/oscar/oscar.c:6432
+#: ../libgaim/protocols/oscar/oscar.c:3878
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because there is already a "
"request pending for this screen name."
msgstr "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
-#: ../src/protocols/oscar/oscar.c:6435
+#: ../libgaim/protocols/oscar/oscar.c:3881
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because the given address has "
"too many screen names associated with it."
msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址关联的用户名太多。"
-#: ../src/protocols/oscar/oscar.c:6438
+#: ../libgaim/protocols/oscar/oscar.c:3884
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because the given address is "
"invalid."
msgstr "错误 0x%04x:无法更改电子邮件地址,原因是给定的地址无效。"
-#: ../src/protocols/oscar/oscar.c:6441
+#: ../libgaim/protocols/oscar/oscar.c:3887
#, c-format
msgid "Error 0x%04x: Unknown error."
msgstr "错误 0x%04x:未知错误。"
-#: ../src/protocols/oscar/oscar.c:6451
+#: ../libgaim/protocols/oscar/oscar.c:3897
#, c-format
msgid ""
"Your screen name is currently formatted as follows:\n"
@@ -9127,25 +10188,26 @@ msgstr ""
"您的用户名格式化后如下:\n"
"%s"
-#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/oscar/oscar.c:6459
+#: ../libgaim/protocols/oscar/oscar.c:3898
+#: ../libgaim/protocols/oscar/oscar.c:3905
msgid "Account Info"
msgstr "账户信息"
-#: ../src/protocols/oscar/oscar.c:6457
+#: ../libgaim/protocols/oscar/oscar.c:3903
#, c-format
msgid "The e-mail address for %s is %s"
msgstr "%s 的电子邮件地址为 %s"
-#: ../src/protocols/oscar/oscar.c:6535
+#: ../libgaim/protocols/oscar/oscar.c:4078
msgid ""
"Your IM Image was not sent. You must be Direct Connected to send IM Images."
msgstr "您的聊天图像未送出。要发送聊天图像,您必须连接为二人世界。"
-#: ../src/protocols/oscar/oscar.c:6775
+#: ../libgaim/protocols/oscar/oscar.c:4330
msgid "Unable to set AIM profile."
msgstr "无法设置 AIM 配置文件。"
-#: ../src/protocols/oscar/oscar.c:6776
+#: ../libgaim/protocols/oscar/oscar.c:4331
msgid ""
"You have probably requested to set your profile before the login procedure "
"completed. Your profile remains unset; try setting it again when you are "
@@ -9154,7 +10216,7 @@ msgstr ""
"您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
"再试一次。"
-#: ../src/protocols/oscar/oscar.c:6790
+#: ../libgaim/protocols/oscar/oscar.c:4345
#, c-format
msgid ""
"The maximum profile length of %d byte has been exceeded. Gaim has truncated "
@@ -9164,11 +10226,11 @@ msgid_plural ""
"truncated it for you."
msgstr[0] "已经超过了配置文件的最大长度 %d 字节。Gaim 为您自动截断了。"
-#: ../src/protocols/oscar/oscar.c:6795
+#: ../libgaim/protocols/oscar/oscar.c:4350
msgid "Profile too long."
msgstr "配置文件太长。"
-#: ../src/protocols/oscar/oscar.c:6837
+#: ../libgaim/protocols/oscar/oscar.c:4394
#, c-format
msgid ""
"The maximum away message length of %d byte has been exceeded. Gaim has "
@@ -9180,11 +10242,11 @@ msgstr[0] ""
"已经超过了离开消息的最大长度 %d 字节。Gaim 自动为您截断了消息,并将您设为离"
"开。"
-#: ../src/protocols/oscar/oscar.c:6842
+#: ../libgaim/protocols/oscar/oscar.c:4399
msgid "Away message too long."
msgstr "离开消息太长。"
-#: ../src/protocols/oscar/oscar.c:6911
+#: ../libgaim/protocols/oscar/oscar.c:4468
#, c-format
msgid ""
"Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -9194,16 +10256,17 @@ msgstr ""
"无法添加好友 %s,原因是用户名无效。用户名必须以字母开头,其中只能包含字母、数"
"字和空格,或者只包含数字。该好友将从您的好友列表中删除。"
-#: ../src/protocols/oscar/oscar.c:6913 ../src/protocols/oscar/oscar.c:7320
-#: ../src/protocols/oscar/oscar.c:7334
+#: ../libgaim/protocols/oscar/oscar.c:4470
+#: ../libgaim/protocols/oscar/oscar.c:4880
+#: ../libgaim/protocols/oscar/oscar.c:4894
msgid "Unable To Add"
msgstr "无法添加"
-#: ../src/protocols/oscar/oscar.c:7020
+#: ../libgaim/protocols/oscar/oscar.c:4574
msgid "Unable To Retrieve Buddy List"
msgstr "无法获取好友列表"
-#: ../src/protocols/oscar/oscar.c:7021
+#: ../libgaim/protocols/oscar/oscar.c:4575
msgid ""
"Gaim was temporarily unable to retrieve your buddy list from the AIM "
"servers. Your buddy list is not lost, and will probably become available in "
@@ -9212,13 +10275,16 @@ msgstr ""
"Gaim 暂时无法从 AIM 服务器获取您的好友列表。您的好友列表没有丢失,可能稍等几"
"小时就能用了。"
-#: ../src/protocols/oscar/oscar.c:7218 ../src/protocols/oscar/oscar.c:7219
-#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7378
-#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/oscar/oscar.c:7384
+#: ../libgaim/protocols/oscar/oscar.c:4778
+#: ../libgaim/protocols/oscar/oscar.c:4779
+#: ../libgaim/protocols/oscar/oscar.c:4784
+#: ../libgaim/protocols/oscar/oscar.c:4948
+#: ../libgaim/protocols/oscar/oscar.c:4949
+#: ../libgaim/protocols/oscar/oscar.c:4954
msgid "Orphans"
msgstr "孤儿"
-#: ../src/protocols/oscar/oscar.c:7318
+#: ../libgaim/protocols/oscar/oscar.c:4878
#, c-format
msgid ""
"Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9226,11 +10292,12 @@ msgid ""
msgstr ""
"无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
-#: ../src/protocols/oscar/oscar.c:7318 ../src/protocols/oscar/oscar.c:7332
+#: ../libgaim/protocols/oscar/oscar.c:4878
+#: ../libgaim/protocols/oscar/oscar.c:4892
msgid "(no name)"
msgstr "(无名称)"
-#: ../src/protocols/oscar/oscar.c:7332
+#: ../libgaim/protocols/oscar/oscar.c:4892
#, c-format
msgid ""
"Could not add the buddy %s for an unknown reason. The most common reason "
@@ -9240,18 +10307,18 @@ msgstr ""
"无法添加好友 %s,原因未知。最可能的原因是您的好友列表中好友的数目已经达到了所"
"允许的最大值。"
-#: ../src/protocols/oscar/oscar.c:7415
+#: ../libgaim/protocols/oscar/oscar.c:4985
#, c-format
msgid ""
"The user %s has given you permission to add you to their buddy list. Do you "
"want to add them?"
msgstr "用户 %s 允许您将他/她加为好友。您是否想要添加?"
-#: ../src/protocols/oscar/oscar.c:7421
+#: ../libgaim/protocols/oscar/oscar.c:4991
msgid "Authorization Given"
msgstr "给出的认证"
-#: ../src/protocols/oscar/oscar.c:7465
+#: ../libgaim/protocols/oscar/oscar.c:5035
#, c-format
msgid ""
"The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9261,17 +10328,17 @@ msgstr ""
"%s"
#. Granted
-#: ../src/protocols/oscar/oscar.c:7510
+#: ../libgaim/protocols/oscar/oscar.c:5080
#, c-format
msgid "The user %s has granted your request to add them to your buddy list."
msgstr "用户 %s 允许您将他/她加入好友。"
-#: ../src/protocols/oscar/oscar.c:7511
+#: ../libgaim/protocols/oscar/oscar.c:5081
msgid "Authorization Granted"
msgstr "认证被许可"
#. Denied
-#: ../src/protocols/oscar/oscar.c:7514
+#: ../libgaim/protocols/oscar/oscar.c:5084
#, c-format
msgid ""
"The user %s has denied your request to add them to your buddy list for the "
@@ -9281,88 +10348,109 @@ msgstr ""
"用户 %s 拒绝了您将其加入好友列表的请求,原因如下:\n"
"%s"
-#: ../src/protocols/oscar/oscar.c:7515
+#: ../libgaim/protocols/oscar/oscar.c:5085
msgid "Authorization Denied"
msgstr "认证被拒绝"
-#: ../src/protocols/oscar/oscar.c:7552 ../src/protocols/toc/toc.c:1372
+#: ../libgaim/protocols/oscar/oscar.c:5121 ../libgaim/protocols/toc/toc.c:1373
msgid "_Exchange:"
msgstr "交换(_E):"
-#: ../src/protocols/oscar/oscar.c:7588
+#: ../libgaim/protocols/oscar/oscar.c:5161
msgid "Invalid chat name specified."
msgstr "指定的聊天名称无效。"
-#: ../src/protocols/oscar/oscar.c:7658
+#: ../libgaim/protocols/oscar/oscar.c:5231
msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
msgstr "您的聊天图像未送出。您不能再 AIM 聊天中发送聊天图像。"
-#: ../src/protocols/oscar/oscar.c:7815
+#: ../libgaim/protocols/oscar/oscar.c:5393
msgid "<i>(retrieving)</i>"
msgstr "<i>(正获取)</i>"
-#: ../src/protocols/oscar/oscar.c:8121
+#: ../libgaim/protocols/oscar/oscar.c:5706
#, c-format
msgid "Buddy Comment for %s"
msgstr "%s 的好友注释"
-#: ../src/protocols/oscar/oscar.c:8122
+#: ../libgaim/protocols/oscar/oscar.c:5707
msgid "Buddy Comment:"
msgstr "好友注释:"
-#: ../src/protocols/oscar/oscar.c:8141
+#: ../libgaim/protocols/oscar/oscar.c:5753
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "您选择了与 %s 进行二人世界连接。"
+
+#: ../libgaim/protocols/oscar/oscar.c:5757
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk. "
+"Do you wish to continue?"
+msgstr ""
+"由于这样将暴露您的 IP 地址,所以可能带来潜在的隐私风险。您是否想要继续?"
+
+#: ../libgaim/protocols/oscar/oscar.c:5761
+#: ../libgaim/protocols/oscar/peer.c:981
+msgid "_Connect"
+msgstr "连接(_C)"
+
+#: ../libgaim/protocols/oscar/oscar.c:5795
+msgid "Get AIM Info"
+msgstr "获得 AIM 信息"
+
+#: ../libgaim/protocols/oscar/oscar.c:5801
msgid "Edit Buddy Comment"
msgstr "编辑好友注释"
-#: ../src/protocols/oscar/oscar.c:8148
+#: ../libgaim/protocols/oscar/oscar.c:5809
msgid "Get Status Msg"
msgstr "获取状态消息"
-#: ../src/protocols/oscar/oscar.c:8161
+#: ../libgaim/protocols/oscar/oscar.c:5822
msgid "Direct IM"
msgstr "二人世界"
-#: ../src/protocols/oscar/oscar.c:8180
+#: ../libgaim/protocols/oscar/oscar.c:5844
msgid "Re-request Authorization"
msgstr "重新请求认证"
-#: ../src/protocols/oscar/oscar.c:8237
+#: ../libgaim/protocols/oscar/oscar.c:5903
msgid "Require authorization"
msgstr "请求认证"
-#: ../src/protocols/oscar/oscar.c:8240
+#: ../libgaim/protocols/oscar/oscar.c:5906
msgid "Web aware (enabling this will cause you to receive SPAM!)"
msgstr ""
-#: ../src/protocols/oscar/oscar.c:8245
+#: ../libgaim/protocols/oscar/oscar.c:5911
msgid "ICQ Privacy Options"
msgstr "ICQ 隐私选项"
-#: ../src/protocols/oscar/oscar.c:8262
+#: ../libgaim/protocols/oscar/oscar.c:5928
msgid "The new formatting is invalid."
msgstr "新格式化无效。"
-#: ../src/protocols/oscar/oscar.c:8263
+#: ../libgaim/protocols/oscar/oscar.c:5929
msgid "Screen name formatting can change only capitalization and whitespace."
msgstr "用户名格式化只更改大写和空格。"
-#: ../src/protocols/oscar/oscar.c:8270
+#: ../libgaim/protocols/oscar/oscar.c:5936
msgid "New screen name formatting:"
msgstr "新的用户名格式化:"
-#: ../src/protocols/oscar/oscar.c:8322
+#: ../libgaim/protocols/oscar/oscar.c:5992
msgid "Change Address To:"
msgstr "将地址更改为:"
-#: ../src/protocols/oscar/oscar.c:8367
+#: ../libgaim/protocols/oscar/oscar.c:6037
msgid "<i>you are not waiting for authorization</i>"
msgstr "<i>您并不在等候认证</i>"
-#: ../src/protocols/oscar/oscar.c:8370
+#: ../libgaim/protocols/oscar/oscar.c:6040
msgid "You are awaiting authorization from the following buddies"
msgstr "您正在等待下列好友的认证"
-#: ../src/protocols/oscar/oscar.c:8371
+#: ../libgaim/protocols/oscar/oscar.c:6041
msgid ""
"You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -9370,64 +10458,72 @@ msgstr ""
"如果您想要向这些好友重新请求认证,只需用鼠标右键单击这些好友,然后单击“重新请"
"求认证”。"
-#: ../src/protocols/oscar/oscar.c:8388
+#: ../libgaim/protocols/oscar/oscar.c:6058
msgid "Find Buddy by E-Mail"
msgstr "按电子邮件查找好友"
-#: ../src/protocols/oscar/oscar.c:8389
+#: ../libgaim/protocols/oscar/oscar.c:6059
msgid "Search for a buddy by e-mail address"
msgstr "按电子邮件地址搜索好友"
-#: ../src/protocols/oscar/oscar.c:8390
+#: ../libgaim/protocols/oscar/oscar.c:6060
msgid "Type the e-mail address of the buddy you are searching for."
msgstr "输入您想要搜索的好友的电子邮件地址。"
-#: ../src/protocols/oscar/oscar.c:8483
+#: ../libgaim/protocols/oscar/oscar.c:6229
msgid "Set User Info (URL)..."
msgstr "设置用户信息(URL)..."
-#: ../src/protocols/oscar/oscar.c:8494
+#: ../libgaim/protocols/oscar/oscar.c:6240
msgid "Change Password (URL)"
msgstr "更改密码(URL)"
-#: ../src/protocols/oscar/oscar.c:8498
+#: ../libgaim/protocols/oscar/oscar.c:6244
msgid "Configure IM Forwarding (URL)"
msgstr "配置 IM 转发(URL)"
#. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8508
+#: ../libgaim/protocols/oscar/oscar.c:6254
msgid "Set Privacy Options..."
msgstr "显示隐私选项..."
#. AIM actions
-#: ../src/protocols/oscar/oscar.c:8515
+#: ../libgaim/protocols/oscar/oscar.c:6261
msgid "Format Screen Name..."
msgstr "格式化用户名..."
-#: ../src/protocols/oscar/oscar.c:8519
+#: ../libgaim/protocols/oscar/oscar.c:6265
msgid "Confirm Account"
msgstr "确认账户"
-#: ../src/protocols/oscar/oscar.c:8523
-msgid "Display Currently Registered Address"
-msgstr "显示当前注册的地址"
+#: ../libgaim/protocols/oscar/oscar.c:6269
+msgid "Display Currently Registered E-Mail Address"
+msgstr "显示当前注册的电子邮件地址"
-#: ../src/protocols/oscar/oscar.c:8527
-msgid "Change Currently Registered Address..."
-msgstr "更改当前注册的地址..."
+#: ../libgaim/protocols/oscar/oscar.c:6273
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "更改当前注册的电子邮件地址..."
-#: ../src/protocols/oscar/oscar.c:8534
+#: ../libgaim/protocols/oscar/oscar.c:6280
msgid "Show Buddies Awaiting Authorization"
msgstr "显示正在等候认证的好友"
-#: ../src/protocols/oscar/oscar.c:8540
-msgid "Search for Buddy by E-Mail..."
+#: ../libgaim/protocols/oscar/oscar.c:6286
+msgid "Search for Buddy by E-Mail Address..."
msgstr "按电子邮件搜索好友..."
-#: ../src/protocols/oscar/oscar.c:8545
+#: ../libgaim/protocols/oscar/oscar.c:6291
msgid "Search for Buddy by Information"
msgstr "按信息搜索好友"
+#: ../libgaim/protocols/oscar/oscar.c:6359
+msgid "Use recent buddies group"
+msgstr "使用最近的好友组"
+
+#: ../libgaim/protocols/oscar/oscar.c:6362
+msgid "Show how long you have been idle"
+msgstr "显示您发了多长时间呆"
+
#. *< type
#. *< ui_requirement
#. *< flags
@@ -9438,157 +10534,810 @@ msgstr "按信息搜索好友"
#. *< version
#. * summary
#. * description
-#: ../src/protocols/oscar/oscar.c:8723 ../src/protocols/oscar/oscar.c:8725
+#: ../libgaim/protocols/oscar/oscar.c:6487
+#: ../libgaim/protocols/oscar/oscar.c:6489
msgid "AIM/ICQ Protocol Plugin"
msgstr "AIM/ICQ 协议插件"
-#: ../src/protocols/oscar/oscar.c:8744
-msgid "Auth host"
-msgstr "认证主机"
-
-#: ../src/protocols/oscar/oscar.c:8747
-msgid "Auth port"
-msgstr "认证端口"
-
-#: ../src/protocols/oscar/oscar.c:8750 ../src/protocols/zephyr/zephyr.c:2920
+#: ../libgaim/protocols/oscar/oscar.c:6514
+#: ../libgaim/protocols/yahoo/yahoo.c:3894
+#: ../libgaim/protocols/zephyr/zephyr.c:2927
msgid "Encoding"
msgstr "编码"
-#: ../src/protocols/oscar/oscar.c:8754
+#: ../libgaim/protocols/oscar/oscar.c:6518
+msgid ""
+"Always use AIM/ICQ proxy server\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"总是使用 AIM/ICQ 代理服务器\n"
+"(较慢,但不会暴露您的 IP 地址)"
+
+#: ../libgaim/protocols/oscar/peer.c:614
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
+
+#: ../libgaim/protocols/oscar/peer.c:694 ../libgaim/protocols/oscar/peer.c:729
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "正在试图连接到 %s:%hu。"
+
+#: ../libgaim/protocols/oscar/peer.c:794
+msgid "Attempting to connect via proxy server."
+msgstr "正在试图通过代理服务器连接。"
+
+#: ../libgaim/protocols/oscar/peer.c:971
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s 刚刚请求和 %s 二人世界"
+
+#: ../libgaim/protocols/oscar/peer.c:975
msgid ""
-"Use AIM/ICQ proxy server\n"
-"(slower, but usually works)"
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images. Because your IP address will be revealed, this may be "
+"considered a privacy risk."
msgstr ""
+"现在需要在两台计算机之间建立直接连接,这对于即时传送图像是必要的。但是这将暴"
+"露您的 IP 地址,所以可能造成潜在的隐私风险。"
+
+#: ../libgaim/protocols/qq/buddy_info.c:56
+msgid "Country/Region"
+msgstr "国家/地区"
+
+#: ../libgaim/protocols/qq/buddy_info.c:57
+msgid "Province/State"
+msgstr "省"
+
+#: ../libgaim/protocols/qq/buddy_info.c:58
+msgid "Zipcode"
+msgstr "邮政编码"
+
+#: ../libgaim/protocols/qq/buddy_info.c:60
+msgid "Phone Number"
+msgstr "电话号码"
+
+#: ../libgaim/protocols/qq/buddy_info.c:64
+msgid "Email"
+msgstr "电子邮件"
+
+#: ../libgaim/protocols/qq/buddy_info.c:76
+msgid "Cellphone Number"
+msgstr "手机号码"
+
+#: ../libgaim/protocols/qq/buddy_info.c:78
+msgid "Personal Introduction"
+msgstr "个人简介"
+
+#: ../libgaim/protocols/qq/buddy_info.c:85
+msgid "College"
+msgstr "大学"
+
+#: ../libgaim/protocols/qq/buddy_info.c:86
+msgid "Horoscope Symbol"
+msgstr "星座"
+
+#: ../libgaim/protocols/qq/buddy_info.c:87
+msgid "Zodiac Symbol"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_info.c:88
+msgid "Blood Type"
+msgstr "血型"
+
+#: ../libgaim/protocols/qq/buddy_info.c:109
+msgid "A"
+msgstr "A"
+
+#: ../libgaim/protocols/qq/buddy_info.c:109
+msgid "B"
+msgstr "B"
+
+#: ../libgaim/protocols/qq/buddy_info.c:109
+msgid "O"
+msgstr "O"
+
+#: ../libgaim/protocols/qq/buddy_info.c:109
+msgid "AB"
+msgstr "AB"
+
+#: ../libgaim/protocols/qq/buddy_info.c:109
+msgid "Other"
+msgstr "其它"
+
+#: ../libgaim/protocols/qq/buddy_info.c:510
+#: ../libgaim/protocols/qq/buddy_info.c:511
+msgid "Modify my information"
+msgstr "修改我的信息"
+
+#: ../libgaim/protocols/qq/buddy_info.c:512
+msgid "Update my information"
+msgstr "更新我的信息"
+
+#: ../libgaim/protocols/qq/buddy_info.c:536
+msgid "Your information has been updated"
+msgstr "您的信息已更新"
+
+#: ../libgaim/protocols/qq/buddy_list.c:420
+#: ../libgaim/protocols/qq/group_im.c:128
+#: ../libgaim/protocols/qq/group_im.c:172
+#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libgaim/protocols/qq/group_im.c:247
+#: ../libgaim/protocols/qq/group_im.c:281
+#: ../libgaim/protocols/qq/group_join.c:224
+#: ../libgaim/protocols/qq/group_join.c:355
+#: ../libgaim/protocols/qq/group_opt.c:229
+#: ../libgaim/protocols/qq/group_opt.c:299
+#: ../libgaim/protocols/qq/group_opt.c:385
+msgid "QQ Qun Operation"
+msgstr "QQ 群操作"
+
+#: ../libgaim/protocols/qq/buddy_list.c:421
+msgid ""
+"Find one Qun in the server list, but i don't know its external id, please re-"
+"rejoin it manually"
+msgstr ""
+"查找服务器中的群,但我不知道群的号码,请手动重新加入该群"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:209
+#: ../libgaim/protocols/qq/group_opt.c:134
+#, c-format
+msgid "You rejected %d's request"
+msgstr "您拒绝了 %d 的请求"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libgaim/protocols/qq/group_opt.c:135
+msgid "Input your reason:"
+msgstr "输入您的原因:"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:212
+msgid "Reject request"
+msgstr "拒绝请求"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:213
+#: ../libgaim/protocols/qq/group_opt.c:138
+msgid "Sorry, you are not my type..."
+msgstr "抱歉,我不接受好友..."
+
+#: ../libgaim/protocols/qq/buddy_opt.c:214
+#: ../libgaim/protocols/qq/group_im.c:134
+#: ../libgaim/protocols/qq/group_opt.c:124
+#: ../libgaim/protocols/qq/sys_msg.c:84 ../libgaim/protocols/qq/sys_msg.c:227
+msgid "Reject"
+msgstr "拒绝"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:275
+msgid "Add buddy with auth request fails"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:307
+msgid "You have successfully removed a buddy"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:336
+msgid "You have successfully removed yourself from a buddy"
+msgstr ""
+
+#: ../libgaim/protocols/qq/buddy_opt.c:401
+#, c-format
+msgid "User %d needs authentication"
+msgstr "用户 %d 需要身份验证"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:403
+#: ../libgaim/protocols/qq/group_join.c:120
+msgid "Input request here"
+msgstr "在此输入请求"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:404
+#: ../libgaim/protocols/qq/group_join.c:121
+#, fuzzy
+msgid "Would you be my friend?"
+msgstr "您是否想要覆盖?"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:405
+#: ../libgaim/protocols/qq/group_join.c:122
+#: ../libgaim/protocols/qq/group_opt.c:139
+#: ../libgaim/protocols/qq/sendqueue.c:200
+msgid "Send"
+msgstr "发送"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:412
+#, c-format
+msgid "You have added %d in buddy list"
+msgstr "您已经将 %d 添加为好友"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:513
+msgid "QQid Error"
+msgstr "QQ 号错误"
+
+#: ../libgaim/protocols/qq/buddy_opt.c:514
+msgid "Invalid QQid"
+msgstr "无效的 QQ 号"
+
+#: ../libgaim/protocols/qq/group.c:55
+msgid "ID: "
+msgstr "号码:"
+
+#: ../libgaim/protocols/qq/group.c:60
+msgid "Admin: "
+msgstr "管理员:"
+
+#: ../libgaim/protocols/qq/group.c:65
+msgid "Status: "
+msgstr "状态:"
+
+#: ../libgaim/protocols/qq/group.c:87
+msgid "Group ID"
+msgstr "组号"
+
+#: ../libgaim/protocols/qq/group.c:89
+msgid "Creator"
+msgstr "创始人"
+
+#: ../libgaim/protocols/qq/group.c:92
+msgid "Group Description"
+msgstr "组描述"
+
+#: ../libgaim/protocols/qq/group.c:98
+#, fuzzy
+msgid "Auth"
+msgstr "同意"
+
+#: ../libgaim/protocols/qq/group.c:108
+msgid "QQ Qun"
+msgstr "QQ 群"
+
+#: ../libgaim/protocols/qq/group.c:109
+msgid "Please input external group ID"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group.c:110
+msgid ""
+"You can only search for permanent QQ group\n"
+"Input 0 or leave it blank to search for demo groups"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_hash.c:38
+msgid "I am not member"
+msgstr "我不是群成员"
+
+#: ../libgaim/protocols/qq/group_hash.c:41
+msgid "I am a member"
+msgstr "我是群成员"
+
+#: ../libgaim/protocols/qq/group_hash.c:44
+msgid "I am applying to join"
+msgstr "我请求加入"
+
+#: ../libgaim/protocols/qq/group_hash.c:47
+msgid "I am the admin"
+msgstr "我是管理员"
+
+#: ../libgaim/protocols/qq/group_hash.c:50
+msgid "Unknown status"
+msgstr "未知状态"
+
+#: ../libgaim/protocols/qq/group_im.c:120
+#, c-format
+msgid "User %d applied to join group %d"
+msgstr "用户 %d 申请加入 %d 群"
+
+#: ../libgaim/protocols/qq/group_im.c:121
+#: ../libgaim/protocols/qq/group_im.c:170
+#: ../libgaim/protocols/qq/sys_msg.c:179
+#, c-format
+msgid "Reason: %s"
+msgstr "原因: %s"
+
+#: ../libgaim/protocols/qq/group_im.c:131
+#: ../libgaim/protocols/qq/group_opt.c:126
+#: ../libgaim/protocols/qq/sys_msg.c:86 ../libgaim/protocols/qq/sys_msg.c:229
+msgid "Approve"
+msgstr "同意"
+
+#: ../libgaim/protocols/qq/group_im.c:169
+#, c-format
+msgid "You request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:210
+#, c-format
+msgid "You request to join group %d has been approved by admin %d"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:246
+#, c-format
+msgid "You [%d] has exit group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:280
+#, c-format
+msgid "You [%d] has been added by group \"%d\""
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_im.c:281
+#, fuzzy
+msgid "OpenQ has added this group to your buddy list"
+msgstr "%s 已将您添加为好友。"
+
+#: ../libgaim/protocols/qq/group_join.c:224
+msgid "You have successfully exit group"
+msgstr "您已经成功退出了该群"
+
+#: ../libgaim/protocols/qq/group_join.c:249
+msgid "QQ Group Auth"
+msgstr "QQ 群认证"
+
+#: ../libgaim/protocols/qq/group_join.c:249
+msgid "You authorization operation has been accepted by QQ server"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:331
+#, fuzzy
+msgid "This group does not allow others to join"
+msgstr "试用版本不允许超过十个用户同时在线"
+
+#: ../libgaim/protocols/qq/group_join.c:356
+#, fuzzy
+msgid "Are you sure to exit this Qun?"
+msgstr "您真的想要删除 %s 吗?"
+
+#: ../libgaim/protocols/qq/group_join.c:358
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_join.c:361
+msgid "Go ahead"
+msgstr "继续"
+
+#: ../libgaim/protocols/qq/group_network.c:87
+#, c-format
+msgid "Code [0x%02X]: %s"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_network.c:88
+msgid "Group Operation Error"
+msgstr "群操作错误"
+
+#: ../libgaim/protocols/qq/group_opt.c:123
+#: ../libgaim/protocols/qq/sys_msg.c:83
+msgid "Do you wanna approve the request?"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:229
+msgid "You have successfully modify Qun member"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:299
+msgid "You have successfully modify Qun information"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:386
+msgid "You have successfully created a Qun"
+msgstr ""
+
+#: ../libgaim/protocols/qq/group_opt.c:388
+#, fuzzy
+msgid "Would you like to set up the Qun details now?"
+msgstr "您是否想要将其设置为此用户的头像?"
+
+#: ../libgaim/protocols/qq/group_opt.c:389
+msgid "Setup"
+msgstr "设置"
+
+#: ../libgaim/protocols/qq/im.c:421
+msgid "System Message"
+msgstr "系统消息"
+
+#: ../libgaim/protocols/qq/im.c:569
+msgid "Server ACK"
+msgstr "服务器响应"
+
+#: ../libgaim/protocols/qq/im.c:569
+msgid "Send IM fail\n"
+msgstr "发送对话失败\n"
+
+#: ../libgaim/protocols/qq/keep_alive.c:84
+msgid "Keep alive error, seems connection lost!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:415
+msgid "Request login token error!"
+msgstr ""
+
+#: ../libgaim/protocols/qq/login_logout.c:489
+msgid "Wrong password!"
+msgstr "密码错误!"
+
+#: ../libgaim/protocols/qq/login_logout.c:492
+msgid "Unable to login, check debug log"
+msgstr "无法登录,请检查调试日志"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../libgaim/protocols/qq/qq.c:137 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/yahoo/yahoo.c:2320
+#: ../libgaim/protocols/yahoo/yahoo.c:2347
+#: ../libgaim/protocols/yahoo/yahoo.c:2443
+#: ../libgaim/protocols/yahoo/yahoo.c:2464
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libgaim/protocols/yahoo/ycht.c:540
+msgid "Unable to connect."
+msgstr "无法连接。"
+
+#: ../libgaim/protocols/qq/qq.c:287
+msgid "QQ: Available"
+msgstr "QQ: 在线"
+
+#: ../libgaim/protocols/qq/qq.c:291
+msgid "QQ: Away"
+msgstr "QQ: 离开"
+
+#: ../libgaim/protocols/qq/qq.c:295
+msgid "QQ: Invisible"
+msgstr "QQ: 隐身"
+
+#: ../libgaim/protocols/qq/qq.c:299
+msgid "QQ: Offline"
+msgstr "QQ: 离线"
+
+#: ../libgaim/protocols/qq/qq.c:377
+msgid "Invalid name"
+msgstr "名称无效"
+
+#: ../libgaim/protocols/qq/qq.c:452
+msgid "Selection"
+msgstr "选择"
+
+#: ../libgaim/protocols/qq/qq.c:455
+msgid "Select a number"
+msgstr "选择号码"
+
+#: ../libgaim/protocols/qq/qq.c:462
+msgid "Faces"
+msgstr "头像"
+
+#: ../libgaim/protocols/qq/qq.c:467
+msgid "Change Your QQ Face"
+msgstr "更改您的 QQ 头像"
+
+#: ../libgaim/protocols/qq/qq.c:468
+msgid "Change Face"
+msgstr "更改头像"
+
+#: ../libgaim/protocols/qq/qq.c:469
+msgid "Update"
+msgstr "更新"
+
+#: ../libgaim/protocols/qq/qq.c:525
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr "<b>目前在线人数</b>: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:526
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr "<b>上次刷新</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:530
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr "<b>连接方式</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:531
+#, c-format
+msgid "<b>Server IP</b>: %s: %d<br>\n"
+msgstr "<b>服务器 IP</b>: %s: %d<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:532
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr "<b>我的公网 IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:537
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr "<b>登录时间</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:538
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr "<b>上次登录 IP</b>: %s<br>\n"
+
+#: ../libgaim/protocols/qq/qq.c:539
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr ""
+"<b>上次登录时间</b>: %s\n"
+
+#: ../libgaim/protocols/qq/qq.c:543
+msgid "Login Information"
+msgstr "登录信息"
+
+#: ../libgaim/protocols/qq/qq.c:829
+msgid "Modify My Information"
+msgstr "修改我的信息"
+
+#: ../libgaim/protocols/qq/qq.c:832
+msgid "Change My Face"
+msgstr "更改我的头像"
+
+#: ../libgaim/protocols/qq/qq.c:835 ../libgaim/protocols/toc/toc.c:1695
+msgid "Change Password"
+msgstr "更改密码"
+
+#: ../libgaim/protocols/qq/qq.c:838
+msgid "Show Login Information"
+msgstr "显示登录信息"
+
+#: ../libgaim/protocols/qq/qq.c:953
+msgid "This function has not be implemented yet"
+msgstr "此功能尚未实现"
+
+#: ../libgaim/protocols/qq/qq.c:953
+msgid "Please wait for new version"
+msgstr "请等待新版本"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libgaim/protocols/qq/qq.c:1034 ../libgaim/protocols/qq/qq.c:1036
+msgid "QQ Protocol\tPlugin"
+msgstr "QQ 协议插件"
+
+#: ../libgaim/protocols/qq/qq.c:1055
+msgid "Login in TCP"
+msgstr "以 TCP 方式登录"
+
+#: ../libgaim/protocols/qq/qq.c:1058
+msgid "Login Hidden"
+msgstr "隐身登录"
+
+#: ../libgaim/protocols/qq/qq.c:1061
+msgid "QQ Server"
+msgstr "QQ 服务器"
+
+#: ../libgaim/protocols/qq/qq.c:1064
+msgid "QQ Port"
+msgstr "QQ 端口"
+
+#: ../libgaim/protocols/qq/qq_proxy.c:492
+msgid "Socket send error"
+msgstr "套接字发送错误"
-#: ../src/protocols/sametime/sametime.c:415
+#: ../libgaim/protocols/qq/qq_proxy.c:495
+msgid "Connection refused"
+msgstr "连接被拒绝"
+
+#: ../libgaim/protocols/qq/recv_core.c:300
+msgid "Socket error"
+msgstr "套接字错误"
+
+#: ../libgaim/protocols/qq/recv_core.c:310
+msgid "Unable to read from socket"
+msgstr "无法读取套接字"
+
+#: ../libgaim/protocols/qq/send_file.c:715
+#, c-format
+msgid "Your request to send file[%s] has been rejected by buddy[%d]"
+msgstr ""
+
+#: ../libgaim/protocols/qq/send_file.c:718
+#: ../libgaim/protocols/qq/send_file.c:747
+msgid "File Send"
+msgstr "发送文件"
+
+#: ../libgaim/protocols/qq/send_file.c:744
+#, c-format
+msgid "The sending process of file[%s] has been cancaled by buddy[%d]"
+msgstr ""
+
+#: ../libgaim/protocols/qq/sendqueue.c:169
+msgid "Connection lost!"
+msgstr "连接丢失!"
+
+#. cancel logging progress
+#: ../libgaim/protocols/qq/sendqueue.c:176
+msgid "Login failed, no reply!"
+msgstr "登录失败,无回应!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:181
+msgid "Connection timeout!"
+msgstr "连接超时!"
+
+#: ../libgaim/protocols/qq/sendqueue.c:181
+msgid "User info is not updated"
+msgstr "用户信息未更新"
+
+#: ../libgaim/protocols/qq/sendqueue.c:196
+msgid "Send packet"
+msgstr "发送包"
+
+#: ../libgaim/protocols/qq/sendqueue.c:198
+msgid "Packets lost, send again?"
+msgstr ""
+
+#: ../libgaim/protocols/qq/sys_msg.c:102
+msgid "Do you wanna add this buddy?"
+msgstr "您是否想要将此人加为好友?"
+
+#. only need to get value
+#: ../libgaim/protocols/qq/sys_msg.c:154
+#, c-format
+msgid "You have been added by %s"
+msgstr "您被 %s 添加为好友"
+
+#: ../libgaim/protocols/qq/sys_msg.c:157
+msgid "Would like to add him?"
+msgstr "您是否想要添加他?"
+
+#: ../libgaim/protocols/qq/sys_msg.c:163
+#, c-format
+msgid "%s has added you [%s]"
+msgstr "%s 已经将您[%s]添加为好友"
+
+#: ../libgaim/protocols/qq/sys_msg.c:178
+#, c-format
+msgid "User %s rejected your request"
+msgstr "用户 %s 拒绝了您的请求"
+
+#: ../libgaim/protocols/qq/sys_msg.c:198
+#, c-format
+msgid "User %s has approved your request"
+msgstr "用户 %s 批准了您的请求"
+
+#: ../libgaim/protocols/qq/sys_msg.c:221
+#, c-format
+msgid "%s wanna add you [%s] as friends"
+msgstr "%s 想要将您[%s]添加为好友"
+
+#: ../libgaim/protocols/qq/sys_msg.c:222
+#, c-format
+msgid "Message: %s"
+msgstr "消息:%s"
+
+#: ../libgaim/protocols/qq/sys_msg.c:243
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr "%s 不在您的好友列表中"
+
+#: ../libgaim/protocols/qq/sys_msg.c:245
+msgid "Would you like to add him?"
+msgstr "您是否想要添加他?"
+
+#: ../libgaim/protocols/sametime/sametime.c:416
msgid "Connection closed (writing)"
msgstr "连接已关闭(写入)"
-#: ../src/protocols/sametime/sametime.c:1267
+#: ../libgaim/protocols/sametime/sametime.c:1262
#, c-format
msgid "<b>Group Title:</b> %s<br>"
msgstr "<b>组标题:</b> %s<br>"
-#: ../src/protocols/sametime/sametime.c:1268
+#: ../libgaim/protocols/sametime/sametime.c:1263
#, c-format
msgid "<b>Notes Group ID:</b> %s<br>"
msgstr "<b>Notes 组 ID:</b> %s<br>"
-#: ../src/protocols/sametime/sametime.c:1270
+#: ../libgaim/protocols/sametime/sametime.c:1265
#, c-format
msgid "Info for Group %s"
msgstr "组 %s 的信息"
-#: ../src/protocols/sametime/sametime.c:1272
+#: ../libgaim/protocols/sametime/sametime.c:1267
msgid "Notes Address Book Information"
msgstr "Notes 地址簿信息"
-#: ../src/protocols/sametime/sametime.c:1304
+#: ../libgaim/protocols/sametime/sametime.c:1299
msgid "Invite Group to Conference..."
msgstr "邀请组加入会议..."
-#: ../src/protocols/sametime/sametime.c:1314
+#: ../libgaim/protocols/sametime/sametime.c:1309
msgid "Get Notes Address Book Info"
msgstr "获得 Notes 地址簿信息"
-#: ../src/protocols/sametime/sametime.c:1467
+#: ../libgaim/protocols/sametime/sametime.c:1462
msgid "Sending Handshake"
msgstr "发送握手"
-#: ../src/protocols/sametime/sametime.c:1472
+#: ../libgaim/protocols/sametime/sametime.c:1467
msgid "Waiting for Handshake Acknowledgement"
msgstr "等候握手应答"
-#: ../src/protocols/sametime/sametime.c:1477
+#: ../libgaim/protocols/sametime/sametime.c:1472
msgid "Handshake Acknowledged, Sending Login"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:1482
+#: ../libgaim/protocols/sametime/sametime.c:1477
msgid "Waiting for Login Acknowledgement"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:1487
+#: ../libgaim/protocols/sametime/sametime.c:1482
msgid "Login Redirected"
msgstr "登录被重定向"
-#: ../src/protocols/sametime/sametime.c:1493
+#: ../libgaim/protocols/sametime/sametime.c:1488
msgid "Forcing Login"
msgstr "强制登入"
-#: ../src/protocols/sametime/sametime.c:1497
+#: ../libgaim/protocols/sametime/sametime.c:1492
msgid "Login Acknowledged"
msgstr "登录被接受"
-#: ../src/protocols/sametime/sametime.c:1502
+#: ../libgaim/protocols/sametime/sametime.c:1497
msgid "Starting Services"
msgstr "启动服务"
-#: ../src/protocols/sametime/sametime.c:1507
-msgid "Connected"
-msgstr "已连接"
-
-#: ../src/protocols/sametime/sametime.c:1605
+#: ../libgaim/protocols/sametime/sametime.c:1600
#, c-format
msgid ""
"A Sametime administrator has issued the following announcement on server %s"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:1610
+#: ../libgaim/protocols/sametime/sametime.c:1605
msgid "Sametime Administrator Announcement"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:1662
+#: ../libgaim/protocols/sametime/sametime.c:1657
msgid "Connection reset"
msgstr "连接重置"
-#: ../src/protocols/sametime/sametime.c:1669
+#: ../libgaim/protocols/sametime/sametime.c:1664
#, fuzzy, c-format
msgid "Error reading from socket: %s"
msgstr "从套接字读取时出错。"
#. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1698
-#: ../src/protocols/sametime/sametime.c:3696
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:1689
+#: ../libgaim/protocols/sametime/sametime.c:3686
msgid "Unable to connect to host"
-msgstr "无法连接到服务器。"
+msgstr "无法连接到主机"
-#: ../src/protocols/sametime/sametime.c:1736
+#: ../libgaim/protocols/sametime/sametime.c:1727
#, c-format
msgid "Announcement from %s"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:1910
+#: ../libgaim/protocols/sametime/sametime.c:1901
msgid "Conference Closed"
msgstr "会议已关闭"
-#: ../src/protocols/sametime/sametime.c:2367
+#: ../libgaim/protocols/sametime/sametime.c:2358
#, fuzzy
msgid "Unable to send message: "
msgstr "无法发送消息: %s"
-#: ../src/protocols/sametime/sametime.c:2926
+#: ../libgaim/protocols/sametime/sametime.c:2915
#, fuzzy
msgid "Place Closed"
msgstr "已取消"
-#: ../src/protocols/sametime/sametime.c:3217
+#: ../libgaim/protocols/sametime/sametime.c:3206
msgid "Microphone"
msgstr "话筒"
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../libgaim/protocols/sametime/sametime.c:3207
msgid "Speakers"
msgstr "扬声器"
-#: ../src/protocols/sametime/sametime.c:3219
+#: ../libgaim/protocols/sametime/sametime.c:3208
msgid "Video Camera"
msgstr "摄像头"
-#: ../src/protocols/sametime/sametime.c:3223
+#: ../libgaim/protocols/sametime/sametime.c:3212
msgid "File Transfer"
msgstr "文件传送"
-#: ../src/protocols/sametime/sametime.c:3257
+#: ../libgaim/protocols/sametime/sametime.c:3246
#, c-format
msgid ""
"\n"
@@ -9597,7 +11346,7 @@ msgstr ""
"\n"
"<b>支持:</b> %s"
-#: ../src/protocols/sametime/sametime.c:3262
+#: ../libgaim/protocols/sametime/sametime.c:3251
msgid ""
"\n"
"<b>External User</b>"
@@ -9605,38 +11354,38 @@ msgstr ""
"\n"
"<b>外部用户</b>"
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../libgaim/protocols/sametime/sametime.c:3357
msgid "Create conference with user"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:3369
+#: ../libgaim/protocols/sametime/sametime.c:3358
#, c-format
msgid ""
"Please enter a topic for the new conference, and an invitation message to be "
"sent to %s"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:3373
+#: ../libgaim/protocols/sametime/sametime.c:3362
msgid "New Conference"
msgstr "新建会议"
-#: ../src/protocols/sametime/sametime.c:3375
+#: ../libgaim/protocols/sametime/sametime.c:3364
msgid "Create"
msgstr "创建"
-#: ../src/protocols/sametime/sametime.c:3439
+#: ../libgaim/protocols/sametime/sametime.c:3428
msgid "Available Conferences"
msgstr "可用会议"
-#: ../src/protocols/sametime/sametime.c:3445
+#: ../libgaim/protocols/sametime/sametime.c:3434
msgid "Create New Conference..."
msgstr "创建新会议..."
-#: ../src/protocols/sametime/sametime.c:3452
+#: ../libgaim/protocols/sametime/sametime.c:3441
msgid "Invite user to a conference"
msgstr "邀请用户加入会议"
-#: ../src/protocols/sametime/sametime.c:3453
+#: ../libgaim/protocols/sametime/sametime.c:3442
#, c-format
msgid ""
"Select a conference from the list below to send an invite to user %s. Select "
@@ -9644,90 +11393,86 @@ msgid ""
"this user to."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:3458
+#: ../libgaim/protocols/sametime/sametime.c:3447
msgid "Invite to Conference"
msgstr "邀请会议"
-#: ../src/protocols/sametime/sametime.c:3460
-msgid "Invite"
-msgstr "邀请"
-
-#: ../src/protocols/sametime/sametime.c:3548
+#: ../libgaim/protocols/sametime/sametime.c:3537
msgid "Invite to Conference..."
msgstr "邀请会议..."
-#: ../src/protocols/sametime/sametime.c:3553
+#: ../libgaim/protocols/sametime/sametime.c:3542
msgid "Send TEST Announcement"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:3600
+#: ../libgaim/protocols/sametime/sametime.c:3589
msgid "No Sametime Community Server specified"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:3622
+#: ../libgaim/protocols/sametime/sametime.c:3611
#, c-format
msgid ""
"No host or IP address has been configured for the Meanwhile account %s. "
"Please enter one below to continue logging in."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:3627
+#: ../libgaim/protocols/sametime/sametime.c:3616
#, fuzzy
msgid "Meanwhile Connection Setup"
msgstr "远程连接失败"
-#: ../src/protocols/sametime/sametime.c:3628
+#: ../libgaim/protocols/sametime/sametime.c:3617
msgid "No Sametime Community Server Specified"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:4085
+#: ../libgaim/protocols/sametime/sametime.c:4085
msgid "<b>External User</b><br>"
msgstr "<b>外部用户</b><br>"
-#: ../src/protocols/sametime/sametime.c:4088
+#: ../libgaim/protocols/sametime/sametime.c:4088
#, c-format
msgid "<b>User ID:</b> %s<br>"
msgstr "<b>用户 ID:</b> %s<br>"
-#: ../src/protocols/sametime/sametime.c:4094
+#: ../libgaim/protocols/sametime/sametime.c:4094
#, c-format
msgid "<b>Full Name:</b> %s<br>"
msgstr "<b>全名:</b> %s<br>"
-#: ../src/protocols/sametime/sametime.c:4100
+#: ../libgaim/protocols/sametime/sametime.c:4100
msgid "<b>Last Known Client:</b> "
msgstr ""
-#: ../src/protocols/sametime/sametime.c:4108
+#: ../libgaim/protocols/sametime/sametime.c:4108
#, c-format
msgid "Unknown (0x%04x)<br>"
msgstr "未知 (0x%04x)<br>"
-#: ../src/protocols/sametime/sametime.c:4115
+#: ../libgaim/protocols/sametime/sametime.c:4115
#, c-format
msgid "<b>Supports:</b> %s<br>"
msgstr "<b>支持:</b> %s<br>"
-#: ../src/protocols/sametime/sametime.c:4121
+#: ../libgaim/protocols/sametime/sametime.c:4121
#, c-format
msgid "<b>Status:</b> %s"
msgstr "<b>状态:</b> %s"
-#: ../src/protocols/sametime/sametime.c:4264
-#: ../src/protocols/sametime/sametime.c:5427
+#: ../libgaim/protocols/sametime/sametime.c:4264
+#: ../libgaim/protocols/sametime/sametime.c:5427
msgid "User Name"
msgstr "用户名"
-#: ../src/protocols/sametime/sametime.c:4267
-#: ../src/protocols/sametime/sametime.c:5430
+#: ../libgaim/protocols/sametime/sametime.c:4267
+#: ../libgaim/protocols/sametime/sametime.c:5430
msgid "Sametime ID"
msgstr "Sametime ID"
-#: ../src/protocols/sametime/sametime.c:4291
+#: ../libgaim/protocols/sametime/sametime.c:4291
msgid "An ambiguous user ID was entered"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:4292
+#: ../libgaim/protocols/sametime/sametime.c:4292
#, fuzzy, c-format
msgid ""
"The identifier '%s' may possibly refer to any of the following users. Please "
@@ -9735,27 +11480,27 @@ msgid ""
msgstr ""
"发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
-#: ../src/protocols/sametime/sametime.c:4297
+#: ../libgaim/protocols/sametime/sametime.c:4297
msgid "Select User"
msgstr "选择用户"
-#: ../src/protocols/sametime/sametime.c:4367
+#: ../libgaim/protocols/sametime/sametime.c:4367
#, fuzzy
msgid "Unable to add user: user not found"
msgstr "无法添加 %s (%s) 上的用户"
-#: ../src/protocols/sametime/sametime.c:4369
+#: ../libgaim/protocols/sametime/sametime.c:4369
#, c-format
msgid ""
"The identifier '%s' did not match any users in your Sametime community. This "
"entry has been removed from your buddy list."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:4374
+#: ../libgaim/protocols/sametime/sametime.c:4374
msgid "Unable to add user"
msgstr "无法添加用户"
-#: ../src/protocols/sametime/sametime.c:4946
+#: ../libgaim/protocols/sametime/sametime.c:4946
#, c-format
msgid ""
"Error reading file %s: \n"
@@ -9764,63 +11509,63 @@ msgstr ""
"读取文件 %s 出错:\n"
"%s。\n"
-#: ../src/protocols/sametime/sametime.c:5077
+#: ../libgaim/protocols/sametime/sametime.c:5077
msgid "Remotely Stored Buddy List"
msgstr "远程存储好友列表"
-#: ../src/protocols/sametime/sametime.c:5082
+#: ../libgaim/protocols/sametime/sametime.c:5082
msgid "Buddy List Storage Mode"
msgstr "好友列表存储模式"
-#: ../src/protocols/sametime/sametime.c:5085
+#: ../libgaim/protocols/sametime/sametime.c:5085
msgid "Local Buddy List Only"
msgstr "本地好友列表"
-#: ../src/protocols/sametime/sametime.c:5087
+#: ../libgaim/protocols/sametime/sametime.c:5087
msgid "Merge List from Server"
msgstr "与服务器上的列表合并"
-#: ../src/protocols/sametime/sametime.c:5089
+#: ../libgaim/protocols/sametime/sametime.c:5089
msgid "Merge and Save List to Server"
msgstr "合并并将列表保存到服务器"
-#: ../src/protocols/sametime/sametime.c:5091
+#: ../libgaim/protocols/sametime/sametime.c:5091
msgid "Synchronize List with Server"
msgstr "与服务器同步列表"
-#: ../src/protocols/sametime/sametime.c:5140
+#: ../libgaim/protocols/sametime/sametime.c:5140
#, c-format
msgid "Import Sametime List for Account %s"
msgstr "为账户 %s 导入 Sametime 列表"
-#: ../src/protocols/sametime/sametime.c:5179
+#: ../libgaim/protocols/sametime/sametime.c:5179
#, c-format
msgid "Export Sametime List for Account %s"
msgstr "为账户 %s 导出 Sametime 列表"
-#: ../src/protocols/sametime/sametime.c:5232
+#: ../libgaim/protocols/sametime/sametime.c:5232
msgid "Unable to add group: group exists"
msgstr "无法添加组:组已经存在"
-#: ../src/protocols/sametime/sametime.c:5233
+#: ../libgaim/protocols/sametime/sametime.c:5233
#, c-format
msgid "A group named '%s' already exists in your buddy list."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:5236
-#: ../src/protocols/sametime/sametime.c:5365
+#: ../libgaim/protocols/sametime/sametime.c:5236
+#: ../libgaim/protocols/sametime/sametime.c:5365
msgid "Unable to add group"
msgstr "无法添加组"
-#: ../src/protocols/sametime/sametime.c:5295
+#: ../libgaim/protocols/sametime/sametime.c:5295
msgid "Possible Matches"
msgstr ""
-#: ../src/protocols/sametime/sametime.c:5311
+#: ../libgaim/protocols/sametime/sametime.c:5311
msgid "Notes Address Book group results"
msgstr "Notes 地址簿组结果"
-#: ../src/protocols/sametime/sametime.c:5312
+#: ../libgaim/protocols/sametime/sametime.c:5312
#, c-format
msgid ""
"The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -9828,39 +11573,39 @@ msgid ""
"to your buddy list."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:5317
+#: ../libgaim/protocols/sametime/sametime.c:5317
msgid "Select Notes Address Book"
msgstr "选择 Notes 地址簿"
-#: ../src/protocols/sametime/sametime.c:5359
+#: ../libgaim/protocols/sametime/sametime.c:5359
#, fuzzy
msgid "Unable to add group: group not found"
msgstr "无法从网络读取套接字"
-#: ../src/protocols/sametime/sametime.c:5361
+#: ../libgaim/protocols/sametime/sametime.c:5361
#, c-format
msgid ""
"The identifier '%s' did not match any Notes Address Book groups in your "
"Sametime community."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:5402
+#: ../libgaim/protocols/sametime/sametime.c:5402
#, fuzzy
msgid "Notes Address Book Group"
msgstr "添加到地址簿"
-#: ../src/protocols/sametime/sametime.c:5403
+#: ../libgaim/protocols/sametime/sametime.c:5403
msgid ""
"Enter the name of a Notes Address Book group in the field below to add the "
"group and its members to your buddy list."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../libgaim/protocols/sametime/sametime.c:5451
#, c-format
msgid "Search results for '%s'"
msgstr "“%s”的搜索结果"
-#: ../src/protocols/sametime/sametime.c:5452
+#: ../libgaim/protocols/sametime/sametime.c:5452
#, c-format
msgid ""
"The identifier '%s' may possibly refer to any of the following users. You "
@@ -9868,114 +11613,113 @@ msgid ""
"buttons below."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:5484
-#, fuzzy
+#: ../libgaim/protocols/sametime/sametime.c:5484
msgid "No matches"
msgstr "无匹配"
-#: ../src/protocols/sametime/sametime.c:5485
+#: ../libgaim/protocols/sametime/sametime.c:5485
#, c-format
msgid "The identifier '%s' did not match any users in your Sametime community."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:5489
+#: ../libgaim/protocols/sametime/sametime.c:5489
msgid "No Matches"
msgstr "无匹配"
-#: ../src/protocols/sametime/sametime.c:5526
+#: ../libgaim/protocols/sametime/sametime.c:5526
msgid "Search for a user"
msgstr "搜索用户"
-#: ../src/protocols/sametime/sametime.c:5527
+#: ../libgaim/protocols/sametime/sametime.c:5527
msgid ""
"Enter a name or partial ID in the field below to search for matching users "
"in your Sametime community."
msgstr ""
-#: ../src/protocols/sametime/sametime.c:5530
+#: ../libgaim/protocols/sametime/sametime.c:5530
msgid "User Search"
msgstr "用户搜索"
-#: ../src/protocols/sametime/sametime.c:5542
+#: ../libgaim/protocols/sametime/sametime.c:5542
msgid "Import Sametime List..."
msgstr "导入 Sametime 列表..."
-#: ../src/protocols/sametime/sametime.c:5546
+#: ../libgaim/protocols/sametime/sametime.c:5546
msgid "Export Sametime List..."
msgstr "导出 Sametime 列表..."
-#: ../src/protocols/sametime/sametime.c:5550
+#: ../libgaim/protocols/sametime/sametime.c:5550
msgid "Add Notes Address Book Group..."
msgstr "添加 Notes 地址簿组..."
-#: ../src/protocols/sametime/sametime.c:5554
+#: ../libgaim/protocols/sametime/sametime.c:5554
msgid "User Search..."
msgstr "用户搜索..."
-#: ../src/protocols/sametime/sametime.c:5651
+#: ../libgaim/protocols/sametime/sametime.c:5651
msgid "Force login (ignore server redirects)"
msgstr "强制登录(忽略服务器重定向)"
#. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5661
+#: ../libgaim/protocols/sametime/sametime.c:5661
msgid "Hide client identity"
msgstr "隐藏客户端身份"
-#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
-#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
-#: ../src/protocols/silc/ft.c:338
+#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/ft.c:338
#, c-format
msgid "User %s is not present in the network"
msgstr "用户 %s 未出现于网络中"
-#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
-#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
-#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
-#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
+#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
msgid "Key Agreement"
msgstr "密钥协议"
-#: ../src/protocols/silc/buddy.c:54
+#: ../libgaim/protocols/silc/buddy.c:54
msgid "Cannot perform the key agreement"
msgstr "无法执行密钥协议"
-#: ../src/protocols/silc/buddy.c:116
+#: ../libgaim/protocols/silc/buddy.c:116
msgid "Error occurred during key agreement"
msgstr "密钥协议中发生了错误"
-#: ../src/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:120
msgid "Key Agreement failed"
msgstr "密钥协议失败"
-#: ../src/protocols/silc/buddy.c:125
+#: ../libgaim/protocols/silc/buddy.c:125
msgid "Timeout during key agreement"
msgstr "密钥协议时超时"
-#: ../src/protocols/silc/buddy.c:130
+#: ../libgaim/protocols/silc/buddy.c:130
msgid "Key agreement was aborted"
msgstr "密钥协议已中止"
-#: ../src/protocols/silc/buddy.c:135
+#: ../libgaim/protocols/silc/buddy.c:135
msgid "Key agreement is already started"
msgstr "密钥协议已经开始"
-#: ../src/protocols/silc/buddy.c:140
+#: ../libgaim/protocols/silc/buddy.c:140
msgid "Key agreement cannot be started with yourself"
msgstr "无法与您自己进行密钥协议"
-#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
-#: ../src/protocols/silc/buddy.c:513
+#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:513
msgid "The remote user is not present in the network any more"
msgstr "远程用户已经从网络中消失了"
-#: ../src/protocols/silc/buddy.c:294
+#: ../libgaim/protocols/silc/buddy.c:294
#, c-format
msgid ""
"Key agreement request received from %s. Would you like to perform the key "
"agreement?"
msgstr "收到来自 %s 的密钥协议请求。您想要执行密钥协议吗?"
-#: ../src/protocols/silc/buddy.c:298
+#: ../libgaim/protocols/silc/buddy.c:298
#, c-format
msgid ""
"The remote user is waiting key agreement on:\n"
@@ -9986,59 +11730,60 @@ msgstr ""
"远程主机: %s\n"
"远程端口: %d"
-#: ../src/protocols/silc/buddy.c:311
+#: ../libgaim/protocols/silc/buddy.c:311
msgid "Key Agreement Request"
msgstr "密钥协议请求"
-#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
-#: ../src/protocols/silc/buddy.c:464
+#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:464
msgid "IM With Password"
msgstr "带密码开聊"
-#: ../src/protocols/silc/buddy.c:423
+#: ../libgaim/protocols/silc/buddy.c:423
msgid "Cannot set IM key"
msgstr "无法设定聊天密钥"
-#: ../src/protocols/silc/buddy.c:465
+#: ../libgaim/protocols/silc/buddy.c:465
msgid "Set IM Password"
msgstr "设定聊天密码"
-#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
-#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1491 ../libgaim/protocols/silc/ops.c:1502
msgid "Get Public Key"
msgstr "获取公钥"
-#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
-#: ../src/protocols/silc/ops.c:1504
+#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1492
+#: ../libgaim/protocols/silc/ops.c:1503
msgid "Cannot fetch the public key"
msgstr "无法获取公钥"
-#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
+#: ../libgaim/protocols/silc/buddy.c:634
+#: ../libgaim/protocols/silc/buddy.c:1647
msgid "Show Public Key"
msgstr "显示公钥"
-#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:236
+#: ../libgaim/protocols/silc/buddy.c:635
+#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
msgid "Could not load public key"
msgstr "无法装入公钥"
-#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
-#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
-#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
+#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1086
+#: ../libgaim/protocols/silc/ops.c:1158 ../libgaim/protocols/silc/ops.c:1293
+#: ../libgaim/protocols/silc/ops.c:1294 ../libgaim/protocols/silc/ops.c:1312
msgid "User Information"
msgstr "用户信息"
-#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
-#: ../src/protocols/silc/ops.c:1314
+#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1159
+#: ../libgaim/protocols/silc/ops.c:1313
msgid "Cannot get user information"
msgstr "无法获取用户信息"
-#: ../src/protocols/silc/buddy.c:734
+#: ../libgaim/protocols/silc/buddy.c:734
#, c-format
msgid "The %s buddy is not trusted"
msgstr "%s 好友不可信"
-#: ../src/protocols/silc/buddy.c:737
+#: ../libgaim/protocols/silc/buddy.c:737
msgid ""
"You cannot receive buddy notifications until you import his/her public key. "
"You can use the Get Public Key command to get the public key."
@@ -10047,250 +11792,250 @@ msgstr ""
"钥。"
#. Open file selector to select the public key.
-#: ../src/protocols/silc/buddy.c:1064
+#: ../libgaim/protocols/silc/buddy.c:1064
msgid "Open..."
msgstr "打开..."
-#: ../src/protocols/silc/buddy.c:1073
+#: ../libgaim/protocols/silc/buddy.c:1073
#, c-format
msgid "The %s buddy is not present in the network"
msgstr "%s 好友未出现于网络中"
-#: ../src/protocols/silc/buddy.c:1076
+#: ../libgaim/protocols/silc/buddy.c:1076
msgid ""
"To add the buddy you must import his/her public key. Press Import to import "
"a public key."
msgstr "要添加好友,您必须导入他/她的公钥。请按[导入]以导入公钥。"
-#: ../src/protocols/silc/buddy.c:1079
+#: ../libgaim/protocols/silc/buddy.c:1079
msgid "_Import..."
msgstr "导入(_I)..."
-#: ../src/protocols/silc/buddy.c:1175
+#: ../libgaim/protocols/silc/buddy.c:1175
msgid "Select correct user"
msgstr "选择正确用户"
-#: ../src/protocols/silc/buddy.c:1177
+#: ../libgaim/protocols/silc/buddy.c:1177
msgid ""
"More than one user was found with the same public key. Select the correct "
"user from the list to add to the buddy list."
msgstr ""
"发现了多个用户使用同样的公钥。请从列表中选择想要添加到好友列表中的那个人。"
-#: ../src/protocols/silc/buddy.c:1179
+#: ../libgaim/protocols/silc/buddy.c:1179
msgid ""
"More than one user was found with the same name. Select the correct user "
"from the list to add to the buddy list."
msgstr ""
"发现了多个用户使用同样的名称。请从列表中选择想要添加到好友列表中的那个人。"
-#: ../src/protocols/silc/buddy.c:1467
+#: ../libgaim/protocols/silc/buddy.c:1467
msgid "Detached"
msgstr "已脱离"
-#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
+#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
msgid "Indisposed"
msgstr "不舒服"
-#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
+#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
msgid "Wake Me Up"
msgstr "叫醒我"
-#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
+#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
msgid "Hyper Active"
msgstr "多动"
-#: ../src/protocols/silc/buddy.c:1479
+#: ../libgaim/protocols/silc/buddy.c:1479
msgid "Robot"
msgstr "机器人"
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
-#: ../src/protocols/silc/util.c:473
+#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/util.c:514
msgid "Happy"
msgstr "高兴"
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
-#: ../src/protocols/silc/util.c:475
+#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/util.c:516
msgid "Sad"
msgstr "郁闷"
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
-#: ../src/protocols/silc/util.c:477
+#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/util.c:518
msgid "Angry"
msgstr "生气"
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
-#: ../src/protocols/silc/util.c:479
+#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/util.c:520
msgid "Jealous"
msgstr "警惕"
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:481
+#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:680
+#: ../libgaim/protocols/silc/util.c:522
msgid "Ashamed"
msgstr "害羞"
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
-#: ../src/protocols/silc/util.c:483
+#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/util.c:524
msgid "Invincible"
msgstr "无敌"
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:485
+#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
msgid "In Love"
msgstr "热恋"
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
-#: ../src/protocols/silc/util.c:487
+#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/util.c:528
msgid "Sleepy"
msgstr "打盹"
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
-#: ../src/protocols/silc/util.c:489
+#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/util.c:530
msgid "Bored"
msgstr "枯燥"
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
-#: ../src/protocols/silc/util.c:491
+#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:690
+#: ../libgaim/protocols/silc/util.c:532
msgid "Excited"
msgstr "激动"
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
-#: ../src/protocols/silc/util.c:493
+#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:692
+#: ../libgaim/protocols/silc/util.c:534
msgid "Anxious"
msgstr "饥渴"
-#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1195
msgid "User Modes"
msgstr "用户模式"
-#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1204
msgid "Mood"
msgstr "心情"
-#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
+#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1216
msgid "Preferred Contact"
msgstr "首选联系人"
-#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1221
msgid "Preferred Language"
msgstr "首选语言"
-#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
+#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1226
msgid "Device"
msgstr "设备"
-#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
+#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1231
+#: ../libgaim/protocols/silc/silc.c:740 ../libgaim/protocols/silc/silc.c:742
msgid "Timezone"
msgstr "时区"
-#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
+#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1236
msgid "Geolocation"
msgstr "地理位置"
-#: ../src/protocols/silc/buddy.c:1629
+#: ../libgaim/protocols/silc/buddy.c:1629
msgid "Reset IM Key"
msgstr "重置聊天密钥"
-#: ../src/protocols/silc/buddy.c:1635
+#: ../libgaim/protocols/silc/buddy.c:1635
msgid "IM with Key Exchange"
msgstr "带密钥交换开聊"
-#: ../src/protocols/silc/buddy.c:1640
+#: ../libgaim/protocols/silc/buddy.c:1640
msgid "IM with Password"
msgstr "带密码开聊"
-#: ../src/protocols/silc/buddy.c:1653
+#: ../libgaim/protocols/silc/buddy.c:1653
msgid "Get Public Key..."
msgstr "获取公钥..."
-#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
+#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1621
msgid "Kill User"
msgstr "杀死用户"
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
msgid "Draw On Whiteboard"
msgstr "在白板上绘画"
-#: ../src/protocols/silc/chat.c:39
+#: ../libgaim/protocols/silc/chat.c:39
msgid "_Passphrase:"
msgstr "密码句(_P):"
-#: ../src/protocols/silc/chat.c:80
+#: ../libgaim/protocols/silc/chat.c:80
#, c-format
msgid "Channel %s does not exist in the network"
msgstr "频道 %s 不在网络中"
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
+#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
msgid "Channel Information"
msgstr "频道信息"
-#: ../src/protocols/silc/chat.c:82
+#: ../libgaim/protocols/silc/chat.c:82
msgid "Cannot get channel information"
msgstr "无法获取频道信息信息"
-#: ../src/protocols/silc/chat.c:119
+#: ../libgaim/protocols/silc/chat.c:119
#, c-format
msgid "<b>Channel Name:</b> %s"
msgstr "<b>频道名称:</b> %s"
-#: ../src/protocols/silc/chat.c:122
+#: ../libgaim/protocols/silc/chat.c:122
#, c-format
msgid "<br><b>User Count:</b> %d"
msgstr "<br><b>用户数:</b> %d"
-#: ../src/protocols/silc/chat.c:129
+#: ../libgaim/protocols/silc/chat.c:129
#, c-format
msgid "<br><b>Channel Founder:</b> %s"
msgstr "<br><b>频道创建人:</b> %s"
-#: ../src/protocols/silc/chat.c:138
+#: ../libgaim/protocols/silc/chat.c:138
#, c-format
msgid "<br><b>Channel Cipher:</b> %s"
msgstr "<br><b>频道密码句:</b> %s"
-#: ../src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../libgaim/protocols/silc/chat.c:142
#, c-format
msgid "<br><b>Channel HMAC:</b> %s"
msgstr "<br><b>频道 HMAC:</b> %s"
-#: ../src/protocols/silc/chat.c:146
+#: ../libgaim/protocols/silc/chat.c:147
#, c-format
msgid "<br><b>Channel Topic:</b><br>%s"
msgstr "<br><b>频道话题:</b><br>%s"
-#: ../src/protocols/silc/chat.c:151
+#: ../libgaim/protocols/silc/chat.c:152
msgid "<br><b>Channel Modes:</b> "
msgstr "<br><b>频道模式:</b> "
-#: ../src/protocols/silc/chat.c:164
+#: ../libgaim/protocols/silc/chat.c:165
#, c-format
msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
msgstr "<br><b>创建者密钥指纹:</b><br%s"
-#: ../src/protocols/silc/chat.c:165
+#: ../libgaim/protocols/silc/chat.c:166
#, c-format
msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
msgstr "<br><b>创建者密钥漏印:</b><br>%s"
-#: ../src/protocols/silc/chat.c:235
+#: ../libgaim/protocols/silc/chat.c:236
msgid "Add Channel Public Key"
msgstr "添加频道公钥"
#. Add new public key
-#: ../src/protocols/silc/chat.c:290
+#: ../libgaim/protocols/silc/chat.c:291
msgid "Open Public Key..."
msgstr "打开公钥..."
-#: ../src/protocols/silc/chat.c:399
+#: ../libgaim/protocols/silc/chat.c:400
msgid "Channel Passphrase"
msgstr "频道密码句"
-#: ../src/protocols/silc/chat.c:406
+#: ../libgaim/protocols/silc/chat.c:407
msgid "Channel Public Keys List"
msgstr "频道公钥列表"
-#: ../src/protocols/silc/chat.c:411
+#: ../libgaim/protocols/silc/chat.c:412
msgid ""
"Channel authentication is used to secure the channel from unauthorized "
"access. The authentication may be based on passphrase and digital "
@@ -10302,324 +12047,317 @@ msgstr ""
"如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
"些公钥已经列出的用户才能加入。"
-#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:905
+#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:906
msgid "Channel Authentication"
msgstr "频道认证"
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
msgid "Add / Remove"
msgstr "添加/删除"
-#: ../src/protocols/silc/chat.c:577
+#: ../libgaim/protocols/silc/chat.c:578
msgid "Group Name"
msgstr "组名称"
-#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:948
+#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1906
+#: ../libgaim/protocols/silc/silc.c:948
msgid "Passphrase"
msgstr "密码句"
-#: ../src/protocols/silc/chat.c:592
+#: ../libgaim/protocols/silc/chat.c:593
#, c-format
msgid "Please enter the %s channel private group name and passphrase."
msgstr "请输入 %s 频道私有组的名称和密码句。"
-#: ../src/protocols/silc/chat.c:594
+#: ../libgaim/protocols/silc/chat.c:595
msgid "Add Channel Private Group"
msgstr "添加频道私有组"
-#: ../src/protocols/silc/chat.c:721
+#: ../libgaim/protocols/silc/chat.c:722
msgid "User Limit"
msgstr "允许限制"
-#: ../src/protocols/silc/chat.c:722
+#: ../libgaim/protocols/silc/chat.c:723
msgid "Set user limit on channel. Set to zero to reset user limit."
msgstr "设定频道的用户限制。设为 0 将重置用户限制。"
-#: ../src/protocols/silc/chat.c:877
-msgid "Get Info"
-msgstr "信息"
-
-#: ../src/protocols/silc/chat.c:885
+#: ../libgaim/protocols/silc/chat.c:886
msgid "Invite List"
msgstr "邀请列表"
-#: ../src/protocols/silc/chat.c:890
+#: ../libgaim/protocols/silc/chat.c:891
msgid "Ban List"
msgstr "屏蔽列表"
-#: ../src/protocols/silc/chat.c:898
+#: ../libgaim/protocols/silc/chat.c:899
msgid "Add Private Group"
msgstr "添加私有组"
-#: ../src/protocols/silc/chat.c:911
+#: ../libgaim/protocols/silc/chat.c:912
msgid "Reset Permanent"
msgstr "重置永久"
-#: ../src/protocols/silc/chat.c:916
+#: ../libgaim/protocols/silc/chat.c:917
msgid "Set Permanent"
msgstr "设置永久"
-#: ../src/protocols/silc/chat.c:924
+#: ../libgaim/protocols/silc/chat.c:925
msgid "Set User Limit"
msgstr "设置用户限制"
-#: ../src/protocols/silc/chat.c:930
+#: ../libgaim/protocols/silc/chat.c:931
msgid "Reset Topic Restriction"
msgstr "重置话题限制"
-#: ../src/protocols/silc/chat.c:935
+#: ../libgaim/protocols/silc/chat.c:936
msgid "Set Topic Restriction"
msgstr "设定话题限制"
-#: ../src/protocols/silc/chat.c:942
+#: ../libgaim/protocols/silc/chat.c:943
msgid "Reset Private Channel"
msgstr "重置私有频道"
-#: ../src/protocols/silc/chat.c:947
+#: ../libgaim/protocols/silc/chat.c:948
msgid "Set Private Channel"
msgstr "设定私有频道"
-#: ../src/protocols/silc/chat.c:954
+#: ../libgaim/protocols/silc/chat.c:955
msgid "Reset Secret Channel"
msgstr "重置绝密频道"
-#: ../src/protocols/silc/chat.c:959
+#: ../libgaim/protocols/silc/chat.c:960
msgid "Set Secret Channel"
msgstr "设定绝密频道"
-#: ../src/protocols/silc/chat.c:1033
+#: ../libgaim/protocols/silc/chat.c:1034
#, c-format
msgid "You are channel founder on <I>%s</I>"
msgstr "您是 <I>%s</I> 的频道建立者"
-#: ../src/protocols/silc/chat.c:1037
+#: ../libgaim/protocols/silc/chat.c:1038
#, c-format
msgid "Channel founder on <I>%s</I> is <I>%s</I>"
msgstr "<I>%s</I> 的频道建立者是 <I>%s</I>"
-#: ../src/protocols/silc/chat.c:1096
+#: ../libgaim/protocols/silc/chat.c:1097
#, c-format
msgid ""
"You have to join the %s channel before you are able to join the private group"
msgstr "在您加入私有组之前,必须先加入 %s 频道"
-#: ../src/protocols/silc/chat.c:1098
+#: ../libgaim/protocols/silc/chat.c:1099
msgid "Join Private Group"
msgstr "加入私有组"
-#: ../src/protocols/silc/chat.c:1099
+#: ../libgaim/protocols/silc/chat.c:1100
msgid "Cannot join private group"
msgstr "无法加入私有组"
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
msgid "Call Command"
msgstr "调用命令"
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1156
msgid "Cannot call command"
msgstr "无法调用命令"
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
+#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1157
msgid "Unknown command"
msgstr "未知命令"
-#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
-#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
-#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
-#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
-#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
+#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
msgid "Secure File Transfer"
msgstr "安全文件传送"
-#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
-#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
-#: ../src/protocols/silc/ft.c:105
+#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:105
msgid "Error during file transfer"
msgstr "文件传送时出错"
-#: ../src/protocols/silc/ft.c:94
+#: ../libgaim/protocols/silc/ft.c:94
msgid "Permission denied"
msgstr "权限被禁止"
-#: ../src/protocols/silc/ft.c:98
+#: ../libgaim/protocols/silc/ft.c:98
msgid "Key agreement failed"
msgstr "密钥协议失败"
-#: ../src/protocols/silc/ft.c:102
+#: ../libgaim/protocols/silc/ft.c:102
msgid "File transfer session does not exist"
msgstr "文件传送会话不存在"
-#: ../src/protocols/silc/ft.c:206
+#: ../libgaim/protocols/silc/ft.c:206
msgid "No file transfer session active"
msgstr "没有激活的文件传送会话"
-#: ../src/protocols/silc/ft.c:211
+#: ../libgaim/protocols/silc/ft.c:211
msgid "File transfer already started"
msgstr "文件传送已开始"
-#: ../src/protocols/silc/ft.c:216
+#: ../libgaim/protocols/silc/ft.c:216
msgid "Could not perform key agreement for file transfer"
msgstr "无法执行文件传送的密钥协议"
-#: ../src/protocols/silc/ft.c:222
+#: ../libgaim/protocols/silc/ft.c:222
msgid "Could not start the file transfer"
msgstr "无法开始传送文件"
-#: ../src/protocols/silc/ft.c:341
+#: ../libgaim/protocols/silc/ft.c:341
msgid "Cannot send file"
msgstr "无法发送文件"
-#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
-#: ../src/protocols/silc/ops.c:573
+#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/ops.c:572
#, c-format
msgid "%s has changed the topic of <I>%s</I> to: %s"
msgstr "%s 已经将 <I>%s</I> 的话题改为: %s"
-#: ../src/protocols/silc/ops.c:639
+#: ../libgaim/protocols/silc/ops.c:638
#, c-format
msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
msgstr "<I>%s</I> 已经将频道 <I>%s</I> 的模式设定为: %s"
-#: ../src/protocols/silc/ops.c:643
+#: ../libgaim/protocols/silc/ops.c:642
#, c-format
msgid "<I>%s</I> removed all channel <I>%s</I> modes"
msgstr "<I>%s</I> 删除了频道 <I>%s</I> 的全部模式"
-#: ../src/protocols/silc/ops.c:676
+#: ../libgaim/protocols/silc/ops.c:675
#, c-format
msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
msgstr "<I>%s</I> 将 <I>%s</I> 的模式设定为: %s"
-#: ../src/protocols/silc/ops.c:684
+#: ../libgaim/protocols/silc/ops.c:683
#, c-format
msgid "<I>%s</I> removed all <I>%s's</I> modes"
msgstr "<I>%s</I> 删除了 <I>%s</I> 的全部模式"
-#: ../src/protocols/silc/ops.c:713
+#: ../libgaim/protocols/silc/ops.c:712
#, c-format
msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
msgstr "您被 <I>%2$s</I> (%3$s) 从 <I>%1$s</I> 踢出了"
-#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
-#: ../src/protocols/silc/ops.c:753
+#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:752
#, c-format
msgid "You have been killed by %s (%s)"
msgstr "您被 %s (%s) 杀死了"
-#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
-#: ../src/protocols/silc/ops.c:784
+#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:783
#, c-format
msgid "Killed by %s (%s)"
msgstr "被 %s (%s) 杀死"
-#: ../src/protocols/silc/ops.c:830
+#: ../libgaim/protocols/silc/ops.c:829
msgid "Server signoff"
msgstr "服务器登出"
-#: ../src/protocols/silc/ops.c:1017
+#: ../libgaim/protocols/silc/ops.c:1016
msgid "Personal Information"
msgstr "个人信息"
-#: ../src/protocols/silc/ops.c:1040
+#: ../libgaim/protocols/silc/ops.c:1039
msgid "Birth Day"
msgstr "生日"
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "职称"
-
-#: ../src/protocols/silc/ops.c:1048
+#: ../libgaim/protocols/silc/ops.c:1047
msgid "Job Role"
msgstr "职位"
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
+#: ../libgaim/protocols/silc/ops.c:1051 ../libgaim/protocols/silc/silc.c:941
msgid "Organization"
msgstr "组织"
-#: ../src/protocols/silc/ops.c:1056
+#: ../libgaim/protocols/silc/ops.c:1055
msgid "Unit"
msgstr "单元"
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "电子邮件"
-
-#: ../src/protocols/silc/ops.c:1080
+#: ../libgaim/protocols/silc/ops.c:1079
msgid "Note"
msgstr "备注"
-#: ../src/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/silc/ops.c:1127
msgid "Join Chat"
msgstr "加入聊天"
-#: ../src/protocols/silc/ops.c:1211
+#: ../libgaim/protocols/silc/ops.c:1182 ../libgaim/protocols/silc/ops.c:1331
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "真名"
+
+#: ../libgaim/protocols/silc/ops.c:1210
msgid "Status Text"
msgstr "状态文本"
-#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1283 ../libgaim/protocols/silc/ops.c:1353
msgid "Public Key Fingerprint"
msgstr "公钥指纹"
-#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
msgid "Public Key Babbleprint"
msgstr "公钥漏印"
-#: ../src/protocols/silc/ops.c:1298
+#: ../libgaim/protocols/silc/ops.c:1297
msgid "_More..."
msgstr "更多(_M)..."
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
+#: ../libgaim/protocols/silc/ops.c:1368 ../libgaim/protocols/silc/silc.c:1007
msgid "Detach From Server"
msgstr "与服务器脱离"
-#: ../src/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/ops.c:1368
msgid "Cannot detach"
msgstr "无法脱离"
-#: ../src/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/ops.c:1379
msgid "Cannot set topic"
msgstr "无法设定话题"
-#: ../src/protocols/silc/ops.c:1412
+#: ../libgaim/protocols/silc/ops.c:1411
msgid "Failed to change nickname"
msgstr "更改昵称失败"
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1459
msgid "Roomlist"
msgstr "房间列表"
-#: ../src/protocols/silc/ops.c:1460
+#: ../libgaim/protocols/silc/ops.c:1459
msgid "Cannot get room list"
msgstr "无法获取房间列表"
-#: ../src/protocols/silc/ops.c:1505
+#: ../libgaim/protocols/silc/ops.c:1504
msgid "No public key was received"
msgstr "没有收到公钥"
-#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
+#: ../libgaim/protocols/silc/ops.c:1516 ../libgaim/protocols/silc/ops.c:1529
msgid "Server Information"
msgstr "服务器信息"
-#: ../src/protocols/silc/ops.c:1519
+#: ../libgaim/protocols/silc/ops.c:1517
msgid "Cannot get server information"
msgstr "无法获取服务器信息"
-#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
+#: ../libgaim/protocols/silc/ops.c:1546 ../libgaim/protocols/silc/ops.c:1555
msgid "Server Statistics"
msgstr "服务器统计"
-#: ../src/protocols/silc/ops.c:1549
+#: ../libgaim/protocols/silc/ops.c:1547
msgid "Cannot get server statistics"
msgstr "无法获取服务器统计"
-#: ../src/protocols/silc/ops.c:1558
+#: ../libgaim/protocols/silc/ops.c:1556
msgid "No server statistics available"
msgstr "没有可用的服务器统计"
-#: ../src/protocols/silc/ops.c:1580
+#: ../libgaim/protocols/silc/ops.c:1578
#, c-format
msgid ""
"Local server start time: %s\n"
@@ -10654,113 +12392,113 @@ msgstr ""
"总计服务器管理员数: %d\n"
"总计路由器管理员数: %d\n"
-#: ../src/protocols/silc/ops.c:1603
+#: ../libgaim/protocols/silc/ops.c:1601
msgid "Network Statistics"
msgstr "网络统计"
-#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1609 ../libgaim/protocols/silc/ops.c:1614
msgid "Ping"
msgstr "Ping"
-#: ../src/protocols/silc/ops.c:1611
+#: ../libgaim/protocols/silc/ops.c:1609
msgid "Ping failed"
msgstr "Ping 失败"
-#: ../src/protocols/silc/ops.c:1616
+#: ../libgaim/protocols/silc/ops.c:1614
msgid "Ping reply received from server"
msgstr "服务器对 ping 的响应"
-#: ../src/protocols/silc/ops.c:1624
+#: ../libgaim/protocols/silc/ops.c:1622
msgid "Could not kill user"
msgstr "无法杀死用户"
-#: ../src/protocols/silc/ops.c:1708
+#: ../libgaim/protocols/silc/ops.c:1706
msgid "Error during connecting to SILC Server"
msgstr "连接到 SILC 服务器时出错"
-#: ../src/protocols/silc/ops.c:1713
+#: ../libgaim/protocols/silc/ops.c:1711
msgid "Key Exchange failed"
msgstr "密钥交换失败"
-#: ../src/protocols/silc/ops.c:1722
+#: ../libgaim/protocols/silc/ops.c:1720
msgid ""
"Resuming detached session failed. Press Reconnect to create new connection."
msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
-#: ../src/protocols/silc/ops.c:1757
+#: ../libgaim/protocols/silc/ops.c:1755
msgid "Disconnected by server"
msgstr "服务器断开连接"
-#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:199
+#: ../libgaim/protocols/silc/ops.c:1817 ../libgaim/protocols/silc/ops.c:1864
+#: ../libgaim/protocols/silc/silc.c:189
msgid "Resuming session"
msgstr "恢复会话"
-#: ../src/protocols/silc/ops.c:1821
+#: ../libgaim/protocols/silc/ops.c:1819
msgid "Authenticating connection"
msgstr "身份验证连接"
-#: ../src/protocols/silc/ops.c:1868
+#: ../libgaim/protocols/silc/ops.c:1866
msgid "Verifying server public key"
msgstr "校验服务器公钥"
-#: ../src/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/ops.c:1907
msgid "Passphrase required"
msgstr "请求密码句"
-#: ../src/protocols/silc/ops.c:1938
+#: ../libgaim/protocols/silc/ops.c:1936
msgid "Failure: Version mismatch, upgrade your client"
msgstr "失败: 版本不匹配,请升级您的客户端"
-#: ../src/protocols/silc/ops.c:1941
+#: ../libgaim/protocols/silc/ops.c:1939
msgid "Failure: Remote does not trust/support your public key"
msgstr "失败: 远程不信任或不支持您的公钥"
-#: ../src/protocols/silc/ops.c:1944
+#: ../libgaim/protocols/silc/ops.c:1942
msgid "Failure: Remote does not support proposed KE group"
msgstr "失败: 远程不支持提议的 KE 组"
-#: ../src/protocols/silc/ops.c:1947
+#: ../libgaim/protocols/silc/ops.c:1945
msgid "Failure: Remote does not support proposed cipher"
msgstr "失败: 远程不支持提议的密码算法"
-#: ../src/protocols/silc/ops.c:1950
+#: ../libgaim/protocols/silc/ops.c:1948
msgid "Failure: Remote does not support proposed PKCS"
msgstr "失败: 远程不支持提议的 PKCS"
-#: ../src/protocols/silc/ops.c:1953
+#: ../libgaim/protocols/silc/ops.c:1951
msgid "Failure: Remote does not support proposed hash function"
msgstr "失败: 远程不支持提议的散列函数"
-#: ../src/protocols/silc/ops.c:1956
+#: ../libgaim/protocols/silc/ops.c:1954
msgid "Failure: Remote does not support proposed HMAC"
msgstr "失败: 远程不支持 HMAC"
-#: ../src/protocols/silc/ops.c:1958
+#: ../libgaim/protocols/silc/ops.c:1956
msgid "Failure: Incorrect signature"
msgstr "失败: 签名不正确"
-#: ../src/protocols/silc/ops.c:1960
+#: ../libgaim/protocols/silc/ops.c:1958
msgid "Failure: Invalid cookie"
msgstr "失败: 无效的 cookie"
-#: ../src/protocols/silc/ops.c:1971
+#: ../libgaim/protocols/silc/ops.c:1969
msgid "Failure: Authentication failed"
msgstr "失败: 身份验证失败"
-#: ../src/protocols/silc/pk.c:103
+#: ../libgaim/protocols/silc/pk.c:103
#, c-format
msgid ""
"Received %s's public key. Your local copy does not match this key. Would you "
"still like to accept this public key?"
msgstr "收到了 %s 的公钥。您的本地副本与此密钥不符。您仍然想要接受此公钥吗?"
-#: ../src/protocols/silc/pk.c:108
+#: ../libgaim/protocols/silc/pk.c:108
#, c-format
msgid "Received %s's public key. Would you like to accept this public key?"
msgstr "收到了 %s 的公钥。您想要接受此公钥吗?"
-#: ../src/protocols/silc/pk.c:112
+#: ../libgaim/protocols/silc/pk.c:112
#, c-format
msgid ""
"Fingerprint and babbleprint for the %s key are:\n"
@@ -10773,64 +12511,65 @@ msgstr ""
"%s\n"
"%s\n"
-#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
+#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
msgid "Verify Public Key"
msgstr "校验公钥"
-#: ../src/protocols/silc/pk.c:119
-#, fuzzy
+#: ../libgaim/protocols/silc/pk.c:119
msgid "_View..."
-msgstr "查看..."
+msgstr "查看(_V)..."
-#: ../src/protocols/silc/pk.c:141
+#: ../libgaim/protocols/silc/pk.c:141
msgid "Unsupported public key type"
msgstr "不支持的公钥类型"
-#: ../src/protocols/silc/silc.c:158
+#: ../libgaim/protocols/silc/silc.c:160
msgid "Connection failed"
msgstr "连接失败"
-#: ../src/protocols/silc/silc.c:191
+#: ../libgaim/protocols/silc/silc.c:181
msgid "Cannot initialize SILC Client connection"
msgstr "无法初始化 SILC 客户连接"
-#: ../src/protocols/silc/silc.c:202
+#: ../libgaim/protocols/silc/silc.c:192
msgid "Performing key exchange"
msgstr "执行密钥交换"
-#: ../src/protocols/silc/silc.c:287
+#: ../libgaim/protocols/silc/silc.c:278
msgid "Out of memory"
msgstr "内存溢出"
-#: ../src/protocols/silc/silc.c:328
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:324
msgid "Cannot initialize SILC protocol"
-msgstr "无法初始化 SILC 客户连接"
+msgstr "无法初始化 SILC 协议"
-#: ../src/protocols/silc/silc.c:335
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:331
msgid "Cannot find/access ~/.silc directory"
-msgstr "无法发送目录。"
+msgstr "找不到或无法访问 ~/.silc 目录"
#. Progress
-#: ../src/protocols/silc/silc.c:340
+#: ../libgaim/protocols/silc/silc.c:336
msgid "Connecting to SILC Server"
msgstr "连接到 SILC 服务器"
-#: ../src/protocols/silc/silc.c:349
+#: ../libgaim/protocols/silc/silc.c:345
#, fuzzy, c-format
msgid "Could not load SILC key pair: %s"
msgstr "无法装入公钥"
-#: ../src/protocols/silc/silc.c:369
+#: ../libgaim/protocols/silc/silc.c:367
msgid "Unable to create connection"
msgstr "无法创建连接"
-#: ../src/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/silc.c:668
msgid "Your Current Mood"
msgstr "您目前的心情"
-#: ../src/protocols/silc/silc.c:695
+#: ../libgaim/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "热恋"
+
+#: ../libgaim/protocols/silc/silc.c:695
msgid ""
"\n"
"Your Preferred Contact Methods"
@@ -10838,43 +12577,43 @@ msgstr ""
"\n"
"您首选的联系方式"
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
+#: ../libgaim/protocols/silc/silc.c:703 ../libgaim/protocols/silc/util.c:559
msgid "SMS"
msgstr "短信"
-#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
+#: ../libgaim/protocols/silc/silc.c:705 ../libgaim/protocols/silc/util.c:561
msgid "MMS"
msgstr "彩信"
-#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+#: ../libgaim/protocols/silc/silc.c:707
+msgid "Video conferencing"
msgstr "视频会议"
-#: ../src/protocols/silc/silc.c:712
+#: ../libgaim/protocols/silc/silc.c:712
msgid "Your Current Status"
msgstr "您的当前状态"
-#: ../src/protocols/silc/silc.c:719
+#: ../libgaim/protocols/silc/silc.c:719
msgid "Online Services"
msgstr "在线服务"
-#: ../src/protocols/silc/silc.c:722
+#: ../libgaim/protocols/silc/silc.c:722
msgid "Let others see what services you are using"
msgstr "让其它人看到您正在使用何种服务"
-#: ../src/protocols/silc/silc.c:728
+#: ../libgaim/protocols/silc/silc.c:728
msgid "Let others see what computer you are using"
msgstr "让其它人看到您正在使用哪台计算机"
-#: ../src/protocols/silc/silc.c:735
+#: ../libgaim/protocols/silc/silc.c:735
msgid "Your VCard File"
msgstr "您的 VCard 文件"
-#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
+#: ../libgaim/protocols/silc/silc.c:747 ../libgaim/protocols/silc/silc.c:748
msgid "User Online Status Attributes"
msgstr "用户在线状态属性"
-#: ../src/protocols/silc/silc.c:749
+#: ../libgaim/protocols/silc/silc.c:749
msgid ""
"You can let other users see your online status information and your personal "
"information. Please fill the information you would like other users to see "
@@ -10883,233 +12622,220 @@ msgstr ""
"您可以让其它用户看到您的在线状态信息以及您的个人信息。请填入您想要其它用户看"
"到的有关您自己的信息。"
-#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1435
+#: ../libgaim/protocols/silc/silc.c:789 ../libgaim/protocols/silc/silc.c:795
+#: ../libgaim/protocols/silc/silc.c:1434
msgid "Message of the Day"
msgstr "每日消息"
-#: ../src/protocols/silc/silc.c:789
+#: ../libgaim/protocols/silc/silc.c:789
msgid "No Message of the Day available"
msgstr "没有可用的每日消息"
-#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
+#: ../libgaim/protocols/silc/silc.c:790 ../libgaim/protocols/silc/silc.c:1429
msgid "There is no Message of the Day associated with this connection"
msgstr "没有与此连接关联的每日消息"
-#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
-#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:841 ../libgaim/protocols/silc/silc.c:885
+#: ../libgaim/protocols/silc/silc.c:956 ../libgaim/protocols/silc/silc.c:957
msgid "Create New SILC Key Pair"
-msgstr "创建 SILC 密钥对..."
+msgstr "创建新的 SILC 密钥对"
-#: ../src/protocols/silc/silc.c:841
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:841
msgid "Passphrases do not match"
-msgstr "新密码不相同。"
+msgstr "密码句不匹配"
-#: ../src/protocols/silc/silc.c:885
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:885
msgid "Key Pair Generation failed"
-msgstr "密钥协议失败"
+msgstr "密钥对生成失败"
-#: ../src/protocols/silc/silc.c:924
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:924
msgid "Key length"
-msgstr "密钥长度:\t%d 位\n"
+msgstr "密钥长度"
-#: ../src/protocols/silc/silc.c:926
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:926
msgid "Public key file"
msgstr "公钥文件"
-#: ../src/protocols/silc/silc.c:928
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:928
msgid "Private key file"
msgstr "私钥文件"
-#: ../src/protocols/silc/silc.c:937
-#, fuzzy
-msgid "Real Name"
-msgstr "真名"
-
-#: ../src/protocols/silc/silc.c:951
-#, fuzzy
-msgid "Re-type Passphrase"
-msgstr "密码句"
+#: ../libgaim/protocols/silc/silc.c:951
+msgid "Passphrase (retype)"
+msgstr "密码句(重输)"
-#: ../src/protocols/silc/silc.c:958
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:958
msgid "Generate Key Pair"
-msgstr "私钥文件"
+msgstr "创建密钥对"
-#: ../src/protocols/silc/silc.c:1002
+#: ../libgaim/protocols/silc/silc.c:1002
msgid "Online Status"
msgstr "在线状态"
-#: ../src/protocols/silc/silc.c:1011
+#: ../libgaim/protocols/silc/silc.c:1011
msgid "View Message of the Day"
msgstr "查看每日消息"
-#: ../src/protocols/silc/silc.c:1015
-#, fuzzy
+#: ../libgaim/protocols/silc/silc.c:1015
msgid "Create SILC Key Pair..."
msgstr "创建 SILC 密钥对..."
-#: ../src/protocols/silc/silc.c:1114
+#: ../libgaim/protocols/silc/silc.c:1114
#, c-format
msgid "User <I>%s</I> is not present in the network"
msgstr "用户 <I>%s</I> 未出现于网络中"
-#: ../src/protocols/silc/silc.c:1306
+#: ../libgaim/protocols/silc/silc.c:1305
msgid "Topic too long"
msgstr "话题太长"
-#: ../src/protocols/silc/silc.c:1387
+#: ../libgaim/protocols/silc/silc.c:1386
msgid "You must specify a nick"
msgstr "您必须指定昵称"
-#: ../src/protocols/silc/silc.c:1489
+#: ../libgaim/protocols/silc/silc.c:1488
#, c-format
msgid "channel %s not found"
msgstr "频道 %s 未找到"
-#: ../src/protocols/silc/silc.c:1494
+#: ../libgaim/protocols/silc/silc.c:1493
#, c-format
msgid "channel modes for %s: %s"
msgstr "%s 的频道模式: %s"
-#: ../src/protocols/silc/silc.c:1496
+#: ../libgaim/protocols/silc/silc.c:1495
#, c-format
msgid "no channel modes are set on %s"
msgstr "%s 未设置频道模式"
-#: ../src/protocols/silc/silc.c:1509
+#: ../libgaim/protocols/silc/silc.c:1508
#, c-format
msgid "Failed to set cmodes for %s"
msgstr "为 %s 设置频道模式失败"
-#: ../src/protocols/silc/silc.c:1539
+#: ../libgaim/protocols/silc/silc.c:1538
#, c-format
msgid "Unknown command: %s, (may be a Gaim bug)"
msgstr "未知命令: %s,(可能是 Gaim bug)"
-#: ../src/protocols/silc/silc.c:1602
+#: ../libgaim/protocols/silc/silc.c:1601
msgid "part [channel]: Leave the chat"
msgstr "part [频道]: 离开聊天"
-#: ../src/protocols/silc/silc.c:1606
+#: ../libgaim/protocols/silc/silc.c:1605
msgid "leave [channel]: Leave the chat"
msgstr "leave [频道]: 离开聊天"
-#: ../src/protocols/silc/silc.c:1610
+#: ../libgaim/protocols/silc/silc.c:1609
msgid "topic [&lt;new topic&gt;]: View or change the topic"
msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
-#: ../src/protocols/silc/silc.c:1615
+#: ../libgaim/protocols/silc/silc.c:1614
msgid "join &lt;channel&gt; [&lt;password&gt;]: Join a chat on this network"
msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
-#: ../src/protocols/silc/silc.c:1619
+#: ../libgaim/protocols/silc/silc.c:1618
msgid "list: List channels on this network"
msgstr "list: 列出此网络上的频道"
-#: ../src/protocols/silc/silc.c:1623
+#: ../libgaim/protocols/silc/silc.c:1622
msgid "whois &lt;nick&gt;: View nick's information"
msgstr "whois &lt;昵称&gt;: 查看昵称信息"
-#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2622
+#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libgaim/protocols/zephyr/zephyr.c:2629
msgid "msg &lt;nick&gt; &lt;message&gt;: Send a private message to a user"
msgstr "msg &lt;昵称&gt; &lt;消息&gt;: 向用户发送私人消息"
-#: ../src/protocols/silc/silc.c:1631
+#: ../libgaim/protocols/silc/silc.c:1630
msgid "query &lt;nick&gt; [&lt;message&gt;]: Send a private message to a user"
msgstr "query &lt;昵称&gt; [&lt;消息&gt;]: 向另外的好友发送私人消息"
-#: ../src/protocols/silc/silc.c:1635
+#: ../libgaim/protocols/silc/silc.c:1634
msgid "motd: View the server's Message Of The Day"
msgstr "motd: 查看服务器的每日消息"
-#: ../src/protocols/silc/silc.c:1639
+#: ../libgaim/protocols/silc/silc.c:1638
msgid "detach: Detach this session"
msgstr "detach: 脱离此会话"
-#: ../src/protocols/silc/silc.c:1643
+#: ../libgaim/protocols/silc/silc.c:1642
msgid "quit [message]: Disconnect from the server, with an optional message"
msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息"
-#: ../src/protocols/silc/silc.c:1647
+#: ../libgaim/protocols/silc/silc.c:1646
msgid "call &lt;command&gt;: Call any silc client command"
msgstr "call &lt;命令&gt;: 调用任何 silc 客户端命令"
-#: ../src/protocols/silc/silc.c:1653
+#: ../libgaim/protocols/silc/silc.c:1652
msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]: Kill nick"
msgstr "kill &lt;昵称&gt; [-pubkey|&lt;原因&gt;]: 杀死昵称"
-#: ../src/protocols/silc/silc.c:1657
+#: ../libgaim/protocols/silc/silc.c:1656
msgid "nick &lt;newnick&gt;: Change your nickname"
msgstr "nick &lt;新昵称&gt;: 更改您的昵称"
-#: ../src/protocols/silc/silc.c:1661
+#: ../libgaim/protocols/silc/silc.c:1660
msgid "whowas &lt;nick&gt;: View nick's information"
msgstr "whowas &lt;昵称&gt;: 查看昵称信息"
-#: ../src/protocols/silc/silc.c:1665
+#: ../libgaim/protocols/silc/silc.c:1664
msgid ""
"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]: Change or display "
"channel modes"
msgstr "cmode &lt;频道&gt; [+|-&lt;模式&gt] [参数]: 更改或显示频道模式"
-#: ../src/protocols/silc/silc.c:1669
+#: ../libgaim/protocols/silc/silc.c:1668
msgid ""
"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;: Change nick's modes "
"on channel"
msgstr ""
"cumode &lt;频道&gt; +|-&lt;模式&gt; &lt;昵称&gt;: 更改昵称在频道上的模式"
-#: ../src/protocols/silc/silc.c:1673
+#: ../libgaim/protocols/silc/silc.c:1672
msgid "umode &lt;usermodes&gt;: Set your modes in the network"
msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
-#: ../src/protocols/silc/silc.c:1677
+#: ../libgaim/protocols/silc/silc.c:1676
msgid "oper &lt;nick&gt; [-pubkey]: Get server operator privileges"
msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
-#: ../src/protocols/silc/silc.c:1681
+#: ../libgaim/protocols/silc/silc.c:1680
msgid ""
"invite &lt;channel&gt; [-|+]&lt;nick&gt;: invite nick or add/remove from "
"channel invite list"
msgstr ""
"invite &lt;频道&gt; [-|+]&lt;昵称&gt;: 邀请昵称或从频道邀请列表中添加/删除"
-#: ../src/protocols/silc/silc.c:1685
+#: ../libgaim/protocols/silc/silc.c:1684
msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]: Kick client from channel"
msgstr "kick &lt;频道&gt; &lt;昵称&gt; [注释]: 从频道踢出客户"
-#: ../src/protocols/silc/silc.c:1689
+#: ../libgaim/protocols/silc/silc.c:1688
msgid "info [server]: View server administrative details"
msgstr "info [服务器]: 查看服务器管理细节"
-#: ../src/protocols/silc/silc.c:1693
+#: ../libgaim/protocols/silc/silc.c:1692
msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]: Ban client from channel"
msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
-#: ../src/protocols/silc/silc.c:1697
+#: ../libgaim/protocols/silc/silc.c:1696
msgid "getkey &lt;nick|server&gt;: Retrieve client's or server's public key"
msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
-#: ../src/protocols/silc/silc.c:1701
+#: ../libgaim/protocols/silc/silc.c:1700
msgid "stats: View server and network statistics"
msgstr "stat: 查看服务器和网络统计"
-#: ../src/protocols/silc/silc.c:1705
+#: ../libgaim/protocols/silc/silc.c:1704
msgid "ping: Send PING to the connected server"
msgstr "ping: 向连接的服务器发送 PING"
-#: ../src/protocols/silc/silc.c:1710
+#: ../libgaim/protocols/silc/silc.c:1709
msgid "users &lt;channel&gt;: List users in channel"
msgstr "users &lt;频道&gt;: 列出频道中目前的用户"
-#: ../src/protocols/silc/silc.c:1714
+#: ../libgaim/protocols/silc/silc.c:1713
msgid ""
"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;: List "
"specific users in channel(s)"
@@ -11126,112 +12852,112 @@ msgstr ""
#. *< name
#. *< version
#. * summary
-#: ../src/protocols/silc/silc.c:1823
+#: ../libgaim/protocols/silc/silc.c:1822
msgid "SILC Protocol Plugin"
msgstr "SILC 协议插件"
#. * description
-#: ../src/protocols/silc/silc.c:1825
+#: ../libgaim/protocols/silc/silc.c:1824
msgid "Secure Internet Live Conferencing (SILC) Protocol"
msgstr "安全网际实时会议(SILC)协议"
-#: ../src/protocols/silc/silc.c:1862
+#: ../libgaim/protocols/silc/silc.c:1861
msgid "Public Key file"
msgstr "公钥文件"
-#: ../src/protocols/silc/silc.c:1866
+#: ../libgaim/protocols/silc/silc.c:1865
msgid "Private Key file"
msgstr "私钥文件"
-#: ../src/protocols/silc/silc.c:1876
+#: ../libgaim/protocols/silc/silc.c:1875
msgid "Cipher"
msgstr ""
-#: ../src/protocols/silc/silc.c:1886
+#: ../libgaim/protocols/silc/silc.c:1885
msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
-#: ../src/protocols/silc/silc.c:1889
+#: ../libgaim/protocols/silc/silc.c:1888
msgid "Public key authentication"
msgstr "公钥认证"
-#: ../src/protocols/silc/silc.c:1892
+#: ../libgaim/protocols/silc/silc.c:1891
msgid "Reject watching by other users"
msgstr "拒绝其他用户监视"
-#: ../src/protocols/silc/silc.c:1895
+#: ../libgaim/protocols/silc/silc.c:1894
msgid "Block invites"
msgstr "屏蔽邀请"
-#: ../src/protocols/silc/silc.c:1898
+#: ../libgaim/protocols/silc/silc.c:1897
msgid "Block IMs without Key Exchange"
msgstr "屏蔽没有密钥交换的聊天"
-#: ../src/protocols/silc/silc.c:1901
+#: ../libgaim/protocols/silc/silc.c:1900
msgid "Reject online status attribute requests"
msgstr "拒绝在线状态属性请求"
-#: ../src/protocols/silc/silc.c:1904
+#: ../libgaim/protocols/silc/silc.c:1903
msgid "Block messages to whiteboard"
msgstr ""
-#: ../src/protocols/silc/silc.c:1907
+#: ../libgaim/protocols/silc/silc.c:1906
msgid "Automatically open whiteboard"
msgstr "自动打开白板"
-#: ../src/protocols/silc/silc.c:1910
+#: ../libgaim/protocols/silc/silc.c:1909
#, fuzzy
msgid "Digitally sign and verify all messages"
msgstr "对全部聊天消息进行数字签名"
-#: ../src/protocols/silc/util.c:206 ../src/protocols/silc/util.c:231
+#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
msgid "Creating SILC key pair..."
msgstr "创建 SILC 密钥对..."
#. Hint for translators: Please check the tabulator width here and in
#. the next strings (short strings: 2 tabs, longer strings 1 tab,
#. sum: 3 tabs or 24 characters)
-#: ../src/protocols/silc/util.c:314
+#: ../libgaim/protocols/silc/util.c:355
#, c-format
msgid "Real Name: \t%s\n"
msgstr "真名:\t%s\n"
-#: ../src/protocols/silc/util.c:316
+#: ../libgaim/protocols/silc/util.c:357
#, c-format
msgid "User Name: \t%s\n"
msgstr "用户名:\t%s\n"
-#: ../src/protocols/silc/util.c:318
+#: ../libgaim/protocols/silc/util.c:359
#, c-format
-msgid "EMail: \t\t%s\n"
-msgstr "电子邮件:\t%s\n"
+msgid "E-Mail: \t\t%s\n"
+msgstr "电子邮件:\t\t%s\n"
-#: ../src/protocols/silc/util.c:320
+#: ../libgaim/protocols/silc/util.c:361
#, c-format
msgid "Host Name: \t%s\n"
msgstr "主机名:\t%s\n"
-#: ../src/protocols/silc/util.c:322
+#: ../libgaim/protocols/silc/util.c:363
#, c-format
msgid "Organization: \t%s\n"
msgstr "组织:\t%s\n"
-#: ../src/protocols/silc/util.c:324
+#: ../libgaim/protocols/silc/util.c:365
#, c-format
msgid "Country: \t%s\n"
msgstr "国家:\t%s\n"
-#: ../src/protocols/silc/util.c:325
+#: ../libgaim/protocols/silc/util.c:366
#, c-format
msgid "Algorithm: \t%s\n"
msgstr "算法:\t%s\n"
-#: ../src/protocols/silc/util.c:326
+#: ../libgaim/protocols/silc/util.c:367
#, c-format
-msgid "Key length: \t%d bits\n"
+msgid "Key Length: \t%d bits\n"
msgstr "密钥长度:\t%d 位\n"
-#: ../src/protocols/silc/util.c:328
+#: ../libgaim/protocols/silc/util.c:369
#, c-format
msgid ""
"Public Key Fingerprint:\n"
@@ -11242,7 +12968,7 @@ msgstr ""
"%s\n"
"\n"
-#: ../src/protocols/silc/util.c:329
+#: ../libgaim/protocols/silc/util.c:370
#, c-format
msgid ""
"Public Key Babbleprint:\n"
@@ -11251,71 +12977,78 @@ msgstr ""
"公钥漏印:\n"
"%s"
-#: ../src/protocols/silc/util.c:333 ../src/protocols/silc/util.c:334
+#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
msgid "Public Key Information"
msgstr "公钥信息"
-#: ../src/protocols/silc/util.c:516
+#: ../libgaim/protocols/silc/util.c:557
msgid "Paging"
msgstr "寻呼"
-#: ../src/protocols/silc/util.c:540
+#: ../libgaim/protocols/silc/util.c:563
+msgid "Video Conferencing"
+msgstr "视频会议"
+
+#: ../libgaim/protocols/silc/util.c:581
msgid "Computer"
msgstr "计算机"
-#: ../src/protocols/silc/util.c:544
+#: ../libgaim/protocols/silc/util.c:585
msgid "PDA"
msgstr "PDA"
-#: ../src/protocols/silc/util.c:546
+#: ../libgaim/protocols/silc/util.c:587
msgid "Terminal"
msgstr "终端"
-#: ../src/protocols/silc/wb.c:284
+#: ../libgaim/protocols/silc/wb.c:284
#, c-format
msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
msgstr ""
-#: ../src/protocols/silc/wb.c:288
+#: ../libgaim/protocols/silc/wb.c:288
#, c-format
msgid ""
"%s sent message to whiteboard on %s channel. Would you like to open the "
"whiteboard?"
msgstr ""
-#: ../src/protocols/silc/wb.c:302
+#: ../libgaim/protocols/silc/wb.c:302
msgid "Whiteboard"
-msgstr ""
+msgstr "白板"
#. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:409
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:416
msgid "Could not write"
-msgstr "无法发送"
+msgstr "无法写入"
-#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
+#: ../libgaim/protocols/simple/simple.c:438
+#: ../libgaim/protocols/simple/simple.c:1478
msgid "Could not connect"
msgstr "无法连接"
-#: ../src/protocols/simple/simple.c:994
+#: ../libgaim/protocols/simple/simple.c:1031
msgid "Wrong Password"
msgstr "密码错误"
-#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
-#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1512
+#: ../libgaim/protocols/simple/simple.c:1554
+#: ../libgaim/protocols/simple/simple.c:1568
+#: ../libgaim/protocols/simple/simple.c:1620
msgid "Could not create listen socket"
-msgstr "无法创建套接字"
+msgstr "无法创建监听套接字"
-#: ../src/protocols/simple/simple.c:1474
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1535
msgid "Couldn't resolve host"
-msgstr "无法连接到主机"
+msgstr "无法解析主机"
-#: ../src/protocols/simple/simple.c:1572
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1628
+msgid "Could not resolve hostname"
+msgstr "无法解析主机名"
+
+#: ../libgaim/protocols/simple/simple.c:1645
msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "IRC 昵称不能包含空格"
+msgstr "SIP 用户名不能包含空格或 @ 符号"
#. *< type
#. *< ui_requirement
@@ -11325,160 +13058,155 @@ msgstr "IRC 昵称不能包含空格"
#. *< id
#. *< name
#. *< version
-#: ../src/protocols/simple/simple.c:1734
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1812
msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SILC 协议插件"
+msgstr "SIP/SIMPLE 协议插件"
#. * summary
-#: ../src/protocols/simple/simple.c:1735
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1813
msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SILC 协议插件"
+msgstr "SIP/SIMPLE 协议插件"
-#: ../src/protocols/simple/simple.c:1757
+#: ../libgaim/protocols/simple/simple.c:1835
msgid "Publish status (note: everyone may watch you)"
-msgstr ""
+msgstr "公布状态(注意: 所有人都可以看到您)"
-#: ../src/protocols/simple/simple.c:1763
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1841
msgid "Use UDP"
-msgstr "用户 ID"
+msgstr "使用 UDP"
-#: ../src/protocols/simple/simple.c:1765
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1843
msgid "Use proxy"
-msgstr "无代理"
+msgstr "使用代理"
-#: ../src/protocols/simple/simple.c:1767
-#, fuzzy
+#: ../libgaim/protocols/simple/simple.c:1845
msgid "Proxy"
-msgstr "无代理"
+msgstr "代理"
-#: ../src/protocols/simple/simple.c:1769
+#: ../libgaim/protocols/simple/simple.c:1847
#, fuzzy
msgid "Auth User"
msgstr "AP 用户"
-#: ../src/protocols/simple/simple.c:1771
+#: ../libgaim/protocols/simple/simple.c:1849
#, fuzzy
msgid "Auth Domain"
msgstr "自动"
-#: ../src/protocols/toc/toc.c:139
+#: ../libgaim/protocols/toc/toc.c:139
#, c-format
msgid "Looking up %s"
msgstr "查阅 %s"
-#: ../src/protocols/toc/toc.c:148
+#: ../libgaim/protocols/toc/toc.c:148
#, c-format
msgid "Connect to %s failed"
msgstr "连接到 %s 失败"
-#: ../src/protocols/toc/toc.c:200
+#: ../libgaim/protocols/toc/toc.c:201
#, c-format
msgid "Signon: %s"
msgstr "登录名: %s"
-#: ../src/protocols/toc/toc.c:482
+#: ../libgaim/protocols/toc/toc.c:483
#, c-format
msgid "Unable to write file %s."
msgstr "无法写入文件 %s。"
-#: ../src/protocols/toc/toc.c:485
+#: ../libgaim/protocols/toc/toc.c:486
#, c-format
msgid "Unable to read file %s."
msgstr "无法读取文件 %s。"
-#: ../src/protocols/toc/toc.c:488
+#: ../libgaim/protocols/toc/toc.c:489
#, c-format
msgid "Message too long, last %s bytes truncated."
msgstr "消息太长,最后 %s 字节被截断。"
-#: ../src/protocols/toc/toc.c:491
+#: ../libgaim/protocols/toc/toc.c:492
#, c-format
msgid "%s not currently logged in."
msgstr "%s 目前未登入。"
-#: ../src/protocols/toc/toc.c:494
+#: ../libgaim/protocols/toc/toc.c:495
#, c-format
msgid "Warning of %s not allowed."
msgstr "不允许对 %s 发出警告。"
-#: ../src/protocols/toc/toc.c:497
+#: ../libgaim/protocols/toc/toc.c:498
msgid "A message has been dropped, you are exceeding the server speed limit."
msgstr "丢失了一条消息,您超过了服务器速度限制。"
-#: ../src/protocols/toc/toc.c:500
+#: ../libgaim/protocols/toc/toc.c:501
#, c-format
msgid "Chat in %s is not available."
msgstr "在 %s 中无法聊天。"
-#: ../src/protocols/toc/toc.c:503
+#: ../libgaim/protocols/toc/toc.c:504
#, c-format
msgid "You are sending messages too fast to %s."
msgstr "您给 %s 发送消息的速度太快。"
-#: ../src/protocols/toc/toc.c:506
+#: ../libgaim/protocols/toc/toc.c:507
#, c-format
msgid "You missed an IM from %s because it was too big."
msgstr "您错过了来自 %s 的消息,原因是该消息太大。"
-#: ../src/protocols/toc/toc.c:509
+#: ../libgaim/protocols/toc/toc.c:510
#, c-format
msgid "You missed an IM from %s because it was sent too fast."
msgstr "您错过了来自 %s 的消息,原因是发送太快。"
-#: ../src/protocols/toc/toc.c:512
+#: ../libgaim/protocols/toc/toc.c:513
msgid "Failure."
msgstr "失败。"
-#: ../src/protocols/toc/toc.c:515
+#: ../libgaim/protocols/toc/toc.c:516
msgid "Too many matches."
msgstr "匹配太多。"
-#: ../src/protocols/toc/toc.c:518
+#: ../libgaim/protocols/toc/toc.c:519
msgid "Need more qualifiers."
msgstr "需要更多条件。"
-#: ../src/protocols/toc/toc.c:521
+#: ../libgaim/protocols/toc/toc.c:522
msgid "Dir service temporarily unavailable."
msgstr "目录服务暂时不可用。"
-#: ../src/protocols/toc/toc.c:524
+#: ../libgaim/protocols/toc/toc.c:525
msgid "E-mail lookup restricted."
msgstr "电子邮件查阅被限制。"
-#: ../src/protocols/toc/toc.c:527
+#: ../libgaim/protocols/toc/toc.c:528
msgid "Keyword ignored."
msgstr "关键字被忽略。"
-#: ../src/protocols/toc/toc.c:530
+#: ../libgaim/protocols/toc/toc.c:531
msgid "No keywords."
msgstr "无关键字。"
-#: ../src/protocols/toc/toc.c:533
+#: ../libgaim/protocols/toc/toc.c:534
msgid "User has no directory information."
msgstr "用户没有目录信息。"
-#: ../src/protocols/toc/toc.c:537
+#: ../libgaim/protocols/toc/toc.c:538
msgid "Country not supported."
msgstr "国家不被支持。"
-#: ../src/protocols/toc/toc.c:540
+#: ../libgaim/protocols/toc/toc.c:541
#, c-format
msgid "Failure unknown: %s."
msgstr "未知失败: %s。"
-#: ../src/protocols/toc/toc.c:546
+#: ../libgaim/protocols/toc/toc.c:547
msgid "The service is temporarily unavailable."
msgstr "服务暂时不可用。"
-#: ../src/protocols/toc/toc.c:549
+#: ../libgaim/protocols/toc/toc.c:550
msgid "Your warning level is currently too high to log in."
msgstr "您的警告级别太高,无法登入。"
-#: ../src/protocols/toc/toc.c:552
+#: ../libgaim/protocols/toc/toc.c:553
msgid ""
"You have been connecting and disconnecting too frequently. Wait ten minutes "
"and try again. If you continue to try, you will need to wait even longer."
@@ -11486,41 +13214,41 @@ msgstr ""
"您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
"能会更长。"
-#: ../src/protocols/toc/toc.c:554
+#: ../libgaim/protocols/toc/toc.c:555
#, c-format
msgid "An unknown signon error has occurred: %s."
msgstr "发生了未知登入错误: %s。"
-#: ../src/protocols/toc/toc.c:557
+#: ../libgaim/protocols/toc/toc.c:558
#, c-format
msgid "An unknown error, %d, has occurred. Info: %s"
msgstr "发生了未知错误 %d。信息: %s"
-#: ../src/protocols/toc/toc.c:584
+#: ../libgaim/protocols/toc/toc.c:585
msgid "Invalid Groupname"
msgstr "无效的组名"
-#: ../src/protocols/toc/toc.c:668
+#: ../libgaim/protocols/toc/toc.c:669
msgid "Connection Closed"
msgstr "连接已关闭"
-#: ../src/protocols/toc/toc.c:708
+#: ../libgaim/protocols/toc/toc.c:709
msgid "Waiting for reply..."
msgstr "正在等候回复..."
-#: ../src/protocols/toc/toc.c:786
+#: ../libgaim/protocols/toc/toc.c:787
msgid "TOC has come back from its pause. You may now send messages again."
msgstr "TOC 从暂停中恢复。您现在可以再次发送消息了。"
-#: ../src/protocols/toc/toc.c:989
+#: ../libgaim/protocols/toc/toc.c:990
msgid "Password Change Successful"
msgstr "密码更改成功"
-#: ../src/protocols/toc/toc.c:993
+#: ../libgaim/protocols/toc/toc.c:994
msgid "TOC has sent a PAUSE command."
msgstr "TOC 发送了 PAUSE 命令。"
-#: ../src/protocols/toc/toc.c:994
+#: ../libgaim/protocols/toc/toc.c:995
msgid ""
"When this happens, TOC ignores any messages sent to it, and may kick you off "
"if you send a message. Gaim will prevent anything from going through. This "
@@ -11530,51 +13258,47 @@ msgstr ""
"将您踢出去。Gaim 将会自动拦截送出的任何内容。这仅仅是临时的,所以请耐心稍等片"
"刻。"
-#: ../src/protocols/toc/toc.c:1549
+#: ../libgaim/protocols/toc/toc.c:1368
+msgid "_Group:"
+msgstr "组(_G):"
+
+#: ../libgaim/protocols/toc/toc.c:1550
msgid "Get Dir Info"
msgstr "获取目录信息"
-#: ../src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "设置用户信息"
-
-#: ../src/protocols/toc/toc.c:1689
+#: ../libgaim/protocols/toc/toc.c:1690
msgid "Set Dir Info"
msgstr "设置目录信息"
-#: ../src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "更改密码"
-
-#: ../src/protocols/toc/toc.c:1811
+#: ../libgaim/protocols/toc/toc.c:1812
#, c-format
msgid "Could not open %s for writing!"
msgstr "无法打开 %s 写入!"
-#: ../src/protocols/toc/toc.c:1847
+#: ../libgaim/protocols/toc/toc.c:1848
msgid "File transfer failed; other side probably canceled."
msgstr "文件传送失败;可能其中一端取消了传送。"
-#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
-#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
+#: ../libgaim/protocols/toc/toc.c:1893 ../libgaim/protocols/toc/toc.c:1933
+#: ../libgaim/protocols/toc/toc.c:2057 ../libgaim/protocols/toc/toc.c:2145
msgid "Could not connect for transfer."
msgstr "无法连接进行传送。"
-#: ../src/protocols/toc/toc.c:2089
+#: ../libgaim/protocols/toc/toc.c:2090
msgid "Could not write file header. The file will not be transferred."
msgstr "无法写入文件头。文件将不会被传送。"
-#: ../src/protocols/toc/toc.c:2189
+#: ../libgaim/protocols/toc/toc.c:2190
msgid "Gaim - Save As..."
msgstr "Gaim - 另存为..."
-#: ../src/protocols/toc/toc.c:2223
+#: ../libgaim/protocols/toc/toc.c:2224
#, c-format
msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
msgstr[0] "%s 请求 %s 接受 %d 个文件: %s (%.2f %s)%s%s"
-#: ../src/protocols/toc/toc.c:2230
+#: ../libgaim/protocols/toc/toc.c:2231
#, c-format
msgid "%s requests you to send them a file"
msgstr "%s 请求您发送文件"
@@ -11589,27 +13313,20 @@ msgstr "%s 请求您发送文件"
#. *< version
#. * summary
#. * description
-#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
+#: ../libgaim/protocols/toc/toc.c:2320 ../libgaim/protocols/toc/toc.c:2322
msgid "TOC Protocol Plugin"
msgstr "TOC 协议插件"
-#: ../src/protocols/toc/toc.c:2340
-msgid "TOC host"
-msgstr "TOC 主机"
-
-#: ../src/protocols/toc/toc.c:2344
-msgid "TOC port"
-msgstr "TOC 端口"
-
-#: ../src/protocols/yahoo/yahoo.c:712
+#: ../libgaim/protocols/yahoo/yahoo.c:772
msgid "Your Yahoo! message did not get sent."
msgstr "未发送您的 Yahoo! 消息。"
-#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3563
+#: ../libgaim/protocols/yahoo/yahoo.c:831
+#: ../libgaim/protocols/yahoo/yahoo.c:3683
msgid "Buzz!!"
msgstr "闪屏震动"
-#: ../src/protocols/yahoo/yahoo.c:811
+#: ../libgaim/protocols/yahoo/yahoo.c:877
#, c-format
msgid "Yahoo! system message for %s:"
msgstr "%s 的 Yahoo! 系统消息:"
@@ -11617,32 +13334,32 @@ msgstr "%s 的 Yahoo! 系统消息:"
#. TODO: this is almost exactly the same as what MSN does,
#. * this should probably be moved to the core.
#.
-#: ../src/protocols/yahoo/yahoo.c:907
+#: ../libgaim/protocols/yahoo/yahoo.c:973
#, c-format
msgid "The user %s wants to add %s to his or her buddy list%s%s."
msgstr "用户 %s 想要将 %s 添加为好友%s%s。"
-#: ../src/protocols/yahoo/yahoo.c:913
+#: ../libgaim/protocols/yahoo/yahoo.c:979
msgid "Message (optional) :"
msgstr "消息(可选):"
-#: ../src/protocols/yahoo/yahoo.c:955
+#: ../libgaim/protocols/yahoo/yahoo.c:1021
#, c-format
msgid "%s has (retroactively) denied your request to add them to your list."
msgstr "%s 拒绝您将他/她加入好友。"
-#: ../src/protocols/yahoo/yahoo.c:958
+#: ../libgaim/protocols/yahoo/yahoo.c:1024
#, c-format
msgid ""
"%s has (retroactively) denied your request to add them to your list for the "
"following reason: %s."
msgstr "%s 拒绝了您将其加为好友的请求,原因如下:%s。"
-#: ../src/protocols/yahoo/yahoo.c:961
+#: ../libgaim/protocols/yahoo/yahoo.c:1027
msgid "Add buddy rejected"
msgstr "添加拒绝的好友"
-#: ../src/protocols/yahoo/yahoo.c:1704
+#: ../libgaim/protocols/yahoo/yahoo.c:1778
#, c-format
msgid ""
"The Yahoo server has requested the use of an unrecognized authentication "
@@ -11652,11 +13369,11 @@ msgstr ""
"Yahoo 服务器请求使用未识别的认证方式。此版本的 Gaim 可能无法成功登入 Yahoo。"
"请检查 %s 上的更新。"
-#: ../src/protocols/yahoo/yahoo.c:1707
+#: ../libgaim/protocols/yahoo/yahoo.c:1781
msgid "Failed Yahoo! Authentication"
msgstr "Yahoo! 认证失败"
-#: ../src/protocols/yahoo/yahoo.c:1773
+#: ../libgaim/protocols/yahoo/yahoo.c:1847
#, c-format
msgid ""
"You have tried to ignore %s, but the user is on your buddy list. Clicking "
@@ -11664,19 +13381,19 @@ msgid ""
msgstr ""
"您试图忽略 %s,但是该用户位于您的好友列表中。单击“是”将删除并忽略好友。"
-#: ../src/protocols/yahoo/yahoo.c:1776
+#: ../libgaim/protocols/yahoo/yahoo.c:1850
msgid "Ignore buddy?"
msgstr "忽略好友?"
-#: ../src/protocols/yahoo/yahoo.c:1810
+#: ../libgaim/protocols/yahoo/yahoo.c:1884
msgid "Invalid username."
msgstr "用户名无效。"
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../libgaim/protocols/yahoo/yahoo.c:1895
msgid "Normal authentication failed!"
msgstr "普通认证失败!"
-#: ../src/protocols/yahoo/yahoo.c:1822
+#: ../libgaim/protocols/yahoo/yahoo.c:1896
msgid ""
"The normal authentication method has failed. This means either your password "
"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11687,136 +13404,149 @@ msgstr ""
"法发生了变化。Gaim 将会尝试使用 Web 信使方式的身份验证,这会损失一部分功能和"
"特性。"
-#: ../src/protocols/yahoo/yahoo.c:1830
+#: ../libgaim/protocols/yahoo/yahoo.c:1904
msgid "Incorrect password."
msgstr "密码不对。"
-#: ../src/protocols/yahoo/yahoo.c:1833
+#: ../libgaim/protocols/yahoo/yahoo.c:1907
msgid "Your account is locked, please log in to the Yahoo! website."
msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
-#: ../src/protocols/yahoo/yahoo.c:1836
+#: ../libgaim/protocols/yahoo/yahoo.c:1910
#, c-format
msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
-#: ../src/protocols/yahoo/yahoo.c:1890
+#: ../libgaim/protocols/yahoo/yahoo.c:1964
#, c-format
msgid "Could not add buddy %s to group %s to the server list on account %s."
msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
-#: ../src/protocols/yahoo/yahoo.c:1893
+#: ../libgaim/protocols/yahoo/yahoo.c:1967
msgid "Could not add buddy to server list"
msgstr "无法将好友添加到服务器列表"
-#: ../src/protocols/yahoo/yahoo.c:2012
+#: ../libgaim/protocols/yahoo/yahoo.c:2086
#, c-format
msgid "[ Audible %s/%s/%s.swf ] %s"
msgstr ""
-#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
-#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
+#: ../libgaim/protocols/yahoo/yahoo.c:2232
+#: ../libgaim/protocols/yahoo/yahoo.c:2379
+#: ../libgaim/protocols/yahoo/yahoo.c:2394
+#: ../libgaim/protocols/yahoo/ycht.c:472
msgid "Unable to read"
msgstr "无法读取"
-#: ../src/protocols/yahoo/yahoo.c:2337 ../src/protocols/yahoo/yahoo.c:2494
-#: ../src/protocols/yahoo/yahoo.c:2596 ../src/protocols/yahoo/yahoo.c:2606
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
+#: ../libgaim/protocols/yahoo/yahoo.c:2418
+#: ../libgaim/protocols/yahoo/yahoo.c:2586
+#: ../libgaim/protocols/yahoo/yahoo.c:2689
+#: ../libgaim/protocols/yahoo/yahoo.c:2699
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libgaim/protocols/yahoo/ycht.c:576
msgid "Connection problem"
msgstr "连接问题"
-#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3296
+#: ../libgaim/protocols/yahoo/yahoo.c:2807
+#: ../libgaim/protocols/yahoo/yahoo.c:3417
msgid "Not at Home"
msgstr "不在家"
-#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3299
+#: ../libgaim/protocols/yahoo/yahoo.c:2809
+#: ../libgaim/protocols/yahoo/yahoo.c:3420
msgid "Not at Desk"
msgstr "不在桌前"
-#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3302
+#: ../libgaim/protocols/yahoo/yahoo.c:2811
+#: ../libgaim/protocols/yahoo/yahoo.c:3423
msgid "Not in Office"
msgstr "不在办公室"
-#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3308
+#: ../libgaim/protocols/yahoo/yahoo.c:2815
+#: ../libgaim/protocols/yahoo/yahoo.c:3429
msgid "On Vacation"
msgstr "度假中"
-#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3314
+#: ../libgaim/protocols/yahoo/yahoo.c:2819
+#: ../libgaim/protocols/yahoo/yahoo.c:3435
msgid "Stepped Out"
msgstr "郊游"
-#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
+#: ../libgaim/protocols/yahoo/yahoo.c:2912
+#: ../libgaim/protocols/yahoo/yahoo.c:2942
msgid "Not on server list"
msgstr "不在服务器列表中"
-#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
+#: ../libgaim/protocols/yahoo/yahoo.c:2959
+#: ../libgaim/protocols/yahoo/yahoo.c:3018
msgid "Appear Online"
msgstr "显示为在线"
-#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
+#: ../libgaim/protocols/yahoo/yahoo.c:2962
+#: ../libgaim/protocols/yahoo/yahoo.c:3039
msgid "Appear Permanently Offline"
msgstr "显示为临时离线"
-#: ../src/protocols/yahoo/yahoo.c:2889
+#: ../libgaim/protocols/yahoo/yahoo.c:2981
#, fuzzy
msgid "Presence"
msgstr "首选项"
-#: ../src/protocols/yahoo/yahoo.c:2932
+#: ../libgaim/protocols/yahoo/yahoo.c:3024
msgid "Appear Offline"
msgstr "显示为离线"
-#: ../src/protocols/yahoo/yahoo.c:2941
+#: ../libgaim/protocols/yahoo/yahoo.c:3033
msgid "Don't Appear Permanently Offline"
msgstr "不显示临时离线"
-#: ../src/protocols/yahoo/yahoo.c:2989
+#: ../libgaim/protocols/yahoo/yahoo.c:3081
msgid "Join in Chat"
msgstr "加入聊天"
-#: ../src/protocols/yahoo/yahoo.c:2995
+#: ../libgaim/protocols/yahoo/yahoo.c:3087
msgid "Initiate Conference"
msgstr "发起会议"
-#: ../src/protocols/yahoo/yahoo.c:3023
+#: ../libgaim/protocols/yahoo/yahoo.c:3115
#, fuzzy
msgid "Presence Settings"
msgstr "使用环境设置"
-#: ../src/protocols/yahoo/yahoo.c:3029
+#: ../libgaim/protocols/yahoo/yahoo.c:3121
msgid "Start Doodling"
msgstr ""
-#: ../src/protocols/yahoo/yahoo.c:3061
+#: ../libgaim/protocols/yahoo/yahoo.c:3153
msgid "Active which ID?"
msgstr "激活哪个 ID?"
-#: ../src/protocols/yahoo/yahoo.c:3070
+#: ../libgaim/protocols/yahoo/yahoo.c:3162
msgid "Join who in chat?"
msgstr "将谁加入聊天?"
-#: ../src/protocols/yahoo/yahoo.c:3080
+#: ../libgaim/protocols/yahoo/yahoo.c:3172
msgid "Activate ID..."
msgstr "激活 ID..."
-#: ../src/protocols/yahoo/yahoo.c:3084
+#: ../libgaim/protocols/yahoo/yahoo.c:3176
msgid "Join User in Chat..."
msgstr "在聊天中加入用户..."
-#: ../src/protocols/yahoo/yahoo.c:3622
+#: ../libgaim/protocols/yahoo/yahoo.c:3742
msgid "join &lt;room&gt;: Join a chat room on the Yahoo network"
msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
-#: ../src/protocols/yahoo/yahoo.c:3627
+#: ../libgaim/protocols/yahoo/yahoo.c:3747
msgid "list: List rooms on the Yahoo network"
msgstr "list: 列出 Yahoo 网络上的房间"
-#: ../src/protocols/yahoo/yahoo.c:3631
+#: ../libgaim/protocols/yahoo/yahoo.c:3751
msgid "buzz: Buzz a user to get their attention"
msgstr "buzz: 向联系人发送闪屏震动,以便引起他的注意"
-#: ../src/protocols/yahoo/yahoo.c:3635
+#: ../libgaim/protocols/yahoo/yahoo.c:3755
msgid "doodle: Request user to start a Doodle session"
msgstr ""
@@ -11830,141 +13560,224 @@ msgstr ""
#. *< version
#. * summary
#. * description
-#: ../src/protocols/yahoo/yahoo.c:3728 ../src/protocols/yahoo/yahoo.c:3730
+#: ../libgaim/protocols/yahoo/yahoo.c:3848
+#: ../libgaim/protocols/yahoo/yahoo.c:3850
msgid "Yahoo Protocol Plugin"
msgstr "Yahoo 协议插件"
-#: ../src/protocols/yahoo/yahoo.c:3747
+#: ../libgaim/protocols/yahoo/yahoo.c:3867
msgid "Yahoo Japan"
msgstr "Yahoo 日本"
-#: ../src/protocols/yahoo/yahoo.c:3750
-msgid "Pager host"
-msgstr "寻呼主机"
+#: ../libgaim/protocols/yahoo/yahoo.c:3870
+msgid "Pager server"
+msgstr "寻呼服务器"
-#: ../src/protocols/yahoo/yahoo.c:3753
-msgid "Japan Pager host"
-msgstr "日本寻呼主机"
+#: ../libgaim/protocols/yahoo/yahoo.c:3873
+msgid "Japan Pager server"
+msgstr "日本寻呼服务器"
-#: ../src/protocols/yahoo/yahoo.c:3756
+#: ../libgaim/protocols/yahoo/yahoo.c:3876
msgid "Pager port"
msgstr "寻呼端口"
-#: ../src/protocols/yahoo/yahoo.c:3759
-msgid "File transfer host"
-msgstr "文件传送主机"
+#: ../libgaim/protocols/yahoo/yahoo.c:3879
+msgid "File transfer server"
+msgstr "文件传送服务器"
-#: ../src/protocols/yahoo/yahoo.c:3762
-msgid "Japan file transfer host"
-msgstr "日本文件传送主机"
+#: ../libgaim/protocols/yahoo/yahoo.c:3882
+msgid "Japan file transfer server"
+msgstr "日本文件传送服务器"
-#: ../src/protocols/yahoo/yahoo.c:3765
+#: ../libgaim/protocols/yahoo/yahoo.c:3885
msgid "File transfer port"
msgstr "文件传送端口"
-#: ../src/protocols/yahoo/yahoo.c:3768
+#: ../libgaim/protocols/yahoo/yahoo.c:3888
msgid "Chat room locale"
msgstr "聊天房间语系"
-#: ../src/protocols/yahoo/yahoo.c:3771
+#: ../libgaim/protocols/yahoo/yahoo.c:3891
msgid "Ignore conference and chatroom invitations"
-msgstr ""
+msgstr "忽略会议和聊天室邀请"
-#: ../src/protocols/yahoo/yahoo.c:3775
+#: ../libgaim/protocols/yahoo/yahoo.c:3899
msgid "Chat room list URL"
msgstr "聊天房间列表 URL"
-#: ../src/protocols/yahoo/yahoo.c:3778
-msgid "YCHT host"
-msgstr "YCHT 主机"
+#: ../libgaim/protocols/yahoo/yahoo.c:3902
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天服务器"
+
+#: ../libgaim/protocols/yahoo/yahoo.c:3905
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天端口"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:205
+msgid "Invitation Rejected"
+msgstr "邀请已拒绝"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:361
+msgid "Failed to join chat"
+msgstr "加入聊天失败"
+
+#. -6
+#: ../libgaim/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "未知房间"
+
+#. -15
+#: ../libgaim/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "可能房间已满"
+
+#. -35
+#: ../libgaim/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "不可用"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "您现在正在 %s 中聊天。"
-#: ../src/protocols/yahoo/yahoo.c:3781
-msgid "YCHT port"
-msgstr "YCHT 端口"
+#: ../libgaim/protocols/yahoo/yahoochat.c:627
+msgid "Failed to join buddy in chat"
+msgstr "在聊天中加入好友失败"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:628
+msgid "Maybe they're not in a chat?"
+msgstr "可能他们未在聊天中?"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1357
+#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+msgid "Fetching the room list failed."
+msgstr "获取房间列表失败。"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+msgid "Voices"
+msgstr "语音"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+msgid "Webcams"
+msgstr "摄像头"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1455
+#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+msgid "Unable to fetch room list."
+msgstr "无法获取房间列表。"
+
+#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+msgid "User Rooms"
+msgstr "用户房间"
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../libgaim/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr ""
+
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+msgid "Unable to establish file descriptor."
+msgstr "无法建立文件描述符。"
#. TODO: what to do here - do we really have to disconnect?
-#: ../src/protocols/yahoo/yahoo_packet.c:265
+#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
msgid "Write Error"
msgstr "写错误"
-#: ../src/protocols/yahoo/yahoo_profile.c:707
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:707
#, c-format
msgid "<b>IP Address:</b> %s<br>"
msgstr "<b>IP 地址:</b> %s<br>"
-#: ../src/protocols/yahoo/yahoo_profile.c:783
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:783
msgid "Yahoo! Japan Profile"
msgstr "Yahoo 日本资料"
-#: ../src/protocols/yahoo/yahoo_profile.c:784
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
msgid "Yahoo! Profile"
msgstr "Yahoo! 资料"
-#: ../src/protocols/yahoo/yahoo_profile.c:828
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:828
msgid ""
"Sorry, profiles marked as containing adult content are not supported at this "
"time."
msgstr "抱歉,标为含有成人内容的个人资料目前不被支持。"
-#: ../src/protocols/yahoo/yahoo_profile.c:830
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:830
msgid ""
"If you wish to view this profile, you will need to visit this link in your "
"web browser"
msgstr "如果您想要查看此资料,您需要在您的 Web 浏览器中浏览此链接"
-#: ../src/protocols/yahoo/yahoo_profile.c:1006
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1012
msgid "Yahoo! ID"
msgstr "Yahoo! ID"
-#: ../src/protocols/yahoo/yahoo_profile.c:1078
-#: ../src/protocols/yahoo/yahoo_profile.c:1082
-#: ../src/protocols/yahoo/yahoo_profile.c:1086
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1084
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1088
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1092
msgid "Hobbies"
msgstr "嗜好"
-#: ../src/protocols/yahoo/yahoo_profile.c:1096
-#: ../src/protocols/yahoo/yahoo_profile.c:1100
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1102
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1106
msgid "Latest News"
msgstr "最新新闻"
-#: ../src/protocols/yahoo/yahoo_profile.c:1121
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
msgid "Home Page"
msgstr "主页"
-#: ../src/protocols/yahoo/yahoo_profile.c:1136
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1142
msgid "Cool Link 1"
msgstr "酷链接 1"
-#: ../src/protocols/yahoo/yahoo_profile.c:1141
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1147
msgid "Cool Link 2"
msgstr "酷链接 2"
-#: ../src/protocols/yahoo/yahoo_profile.c:1145
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1151
msgid "Cool Link 3"
msgstr "酷链接 3"
-#: ../src/protocols/yahoo/yahoo_profile.c:1158
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1164
msgid "Last Update"
msgstr "上次更新"
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1170
#, c-format
msgid "User information for %s unavailable"
msgstr "%s 的用户信息不可用"
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1176
msgid ""
"Sorry, this profile seems to be in a language or format that is not "
"supported at this time."
msgstr "抱歉,此配置文件似乎是目前并不支持的语言或格式。"
-#: ../src/protocols/yahoo/yahoo_profile.c:1186
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1192
msgid ""
"Could not retrieve the user's profile. This most likely is a temporary "
"server-side problem. Please try again later."
msgstr "无法获取用户的个人资料。可能临时出现了服务器端问题。请稍后再试。"
-#: ../src/protocols/yahoo/yahoo_profile.c:1189
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1195
msgid ""
"Could not retrieve the user's profile. This most likely means that the user "
"does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -11973,166 +13786,101 @@ msgstr ""
"无法获取用户的个人资料。可能是用户不存在;但是,Yahoo! 有时会无法找到用户的个"
"人资料。如果您确定用户存在的话,请稍候再试。"
-#: ../src/protocols/yahoo/yahoo_profile.c:1197
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1203
msgid "The user's profile is empty."
msgstr "用户的配置文件为空。"
-#: ../src/protocols/yahoo/yahoochat.c:203
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
-
-#: ../src/protocols/yahoo/yahoochat.c:205
-msgid "Invitation Rejected"
-msgstr "邀请已拒绝"
-
-#: ../src/protocols/yahoo/yahoochat.c:361
-msgid "Failed to join chat"
-msgstr "加入聊天失败"
-
-#. -6
-#: ../src/protocols/yahoo/yahoochat.c:364
-msgid "Unknown room"
-msgstr "未知房间"
-
-#. -15
-#: ../src/protocols/yahoo/yahoochat.c:367
-msgid "Maybe the room is full"
-msgstr "可能房间已满"
-
-#. -35
-#: ../src/protocols/yahoo/yahoochat.c:370
-msgid "Not available"
-msgstr "不可用"
-
-#: ../src/protocols/yahoo/yahoochat.c:374
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr ""
-
-#: ../src/protocols/yahoo/yahoochat.c:452
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "您现在正在 %s 中聊天。"
-
-#: ../src/protocols/yahoo/yahoochat.c:626
-msgid "Failed to join buddy in chat"
-msgstr "在聊天中加入好友失败"
-
-#: ../src/protocols/yahoo/yahoochat.c:627
-msgid "Maybe they're not in a chat?"
-msgstr "可能他们未在聊天中?"
-
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
-msgid "Fetching the room list failed."
-msgstr "获取房间列表失败。"
-
-#: ../src/protocols/yahoo/yahoochat.c:1433
-msgid "Voices"
-msgstr "语音"
-
-#: ../src/protocols/yahoo/yahoochat.c:1436
-msgid "Webcams"
-msgstr "摄像头"
-
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517
-msgid "Unable to fetch room list."
-msgstr "无法获取房间列表。"
-
-#: ../src/protocols/yahoo/yahoochat.c:1510
-msgid "User Rooms"
-msgstr "用户房间"
-
-#: ../src/protocols/yahoo/ycht.c:456
+#: ../libgaim/protocols/yahoo/ycht.c:456
msgid "Connection problem with the YCHT server."
msgstr "YCHT 服务器连接出现问题。"
-#: ../src/protocols/zephyr/zephyr.c:346
+#: ../libgaim/protocols/zephyr/zephyr.c:346
msgid ""
"(There was an error converting this message.\t Check the 'Encoding' option "
"in the Account Editor)"
msgstr "(转换此信息出错。\t请检查账户编辑器中的“编码”选项)"
-#: ../src/protocols/zephyr/zephyr.c:701
+#: ../libgaim/protocols/zephyr/zephyr.c:701
#, c-format
msgid "Unable to send to chat %s,%s,%s"
msgstr "无法发送给聊天 %s,%s,%s"
-#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
+#: ../libgaim/protocols/zephyr/zephyr.c:734
+#: ../libgaim/protocols/zephyr/zephyr.c:1151
#, c-format
msgid "<b>User:</b> %s<br>"
msgstr "<b>用户:</b> %s<br>"
-#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
+#: ../libgaim/protocols/zephyr/zephyr.c:738
+#: ../libgaim/protocols/zephyr/zephyr.c:1156
msgid "<br>Hidden or not logged-in"
msgstr "<br>隐身或未登入"
-#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
+#: ../libgaim/protocols/zephyr/zephyr.c:743
+#: ../libgaim/protocols/zephyr/zephyr.c:1158
#, c-format
msgid "<br>At %s since %s"
msgstr "<br>从 %s,自 %s 起"
-#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
+#: ../libgaim/protocols/zephyr/zephyr.c:1490
+#: ../libgaim/protocols/zephyr/zephyr.c:1491
msgid "Anyone"
msgstr "任何人"
-#: ../src/protocols/zephyr/zephyr.c:2298
+#: ../libgaim/protocols/zephyr/zephyr.c:2298
msgid "_Class:"
msgstr "类(_C):"
-#: ../src/protocols/zephyr/zephyr.c:2304
+#: ../libgaim/protocols/zephyr/zephyr.c:2304
msgid "_Instance:"
msgstr "实例(_I):"
-#: ../src/protocols/zephyr/zephyr.c:2310
+#: ../libgaim/protocols/zephyr/zephyr.c:2310
msgid "_Recipient:"
msgstr "接收者(_R):"
-#: ../src/protocols/zephyr/zephyr.c:2321
+#: ../libgaim/protocols/zephyr/zephyr.c:2321
#, c-format
msgid "Attempt to subscribe to %s,%s,%s failed"
msgstr "试图订阅 %s,%s,%s 失败。"
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../libgaim/protocols/zephyr/zephyr.c:2634
msgid "zlocate &lt;nick&gt;: Locate user"
msgstr "zlocate &lt;昵称&gt;: 定位用户"
-#: ../src/protocols/zephyr/zephyr.c:2632
+#: ../libgaim/protocols/zephyr/zephyr.c:2639
msgid "zl &lt;nick&gt;: Locate user"
msgstr "zl &lt;昵称&gt;: 定位用户"
-#: ../src/protocols/zephyr/zephyr.c:2637
+#: ../libgaim/protocols/zephyr/zephyr.c:2644
msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
msgstr "instance &lt;实例&gt;: 设置在此类上使用的实例"
-#: ../src/protocols/zephyr/zephyr.c:2642
+#: ../libgaim/protocols/zephyr/zephyr.c:2649
msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
msgstr "inst &lt;实例&gt;: 设置在此类上使用的实例"
-#: ../src/protocols/zephyr/zephyr.c:2647
+#: ../libgaim/protocols/zephyr/zephyr.c:2654
msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
msgstr "topic &lt;实例&gt;: 设置在此类上使用的实例"
-#: ../src/protocols/zephyr/zephyr.c:2653
+#: ../libgaim/protocols/zephyr/zephyr.c:2660
msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
msgstr "sub &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 加入新聊天"
-#: ../src/protocols/zephyr/zephyr.c:2658
+#: ../libgaim/protocols/zephyr/zephyr.c:2665
msgid ""
"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
msgstr "zi &lt;实例&gt;: 向 &lt;消息,<i>实例</i>,*&gt; 发送消息"
-#: ../src/protocols/zephyr/zephyr.c:2664
+#: ../libgaim/protocols/zephyr/zephyr.c:2671
msgid ""
"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
"<i>instance</i>,*&gt;"
msgstr ""
"zci &lt;类&gt; &lt;实例&gt;: 向 &lt;<i>类</i>,<i>实例</i>,*&gt; 发送消息"
-#: ../src/protocols/zephyr/zephyr.c:2670
+#: ../libgaim/protocols/zephyr/zephyr.c:2677
msgid ""
"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -12140,7 +13888,7 @@ msgstr ""
"zcir &lt;类&gt; &lt;实例&gt; &lt;收件人&gt;: 向 &lt;<i>类</i>,<i>实例</i>,<i>"
"收件人</i>&gt; 发送消息"
-#: ../src/protocols/zephyr/zephyr.c:2676
+#: ../libgaim/protocols/zephyr/zephyr.c:2683
msgid ""
"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
"<i>instance</i>,<i>recipient</i>&gt;"
@@ -12148,15 +13896,15 @@ msgstr ""
"zir &lt;实例&gt; &lt;收件人&gt;: 向 &lt;消息,<i>实例</i>,<i>收件人</i>&gt; 发"
"送消息"
-#: ../src/protocols/zephyr/zephyr.c:2681
+#: ../libgaim/protocols/zephyr/zephyr.c:2688
msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
msgstr "zc &lt;类&gt;: 向 &lt;<i>类</i>,个人,*&gt; 发送消息"
-#: ../src/protocols/zephyr/zephyr.c:2787
+#: ../libgaim/protocols/zephyr/zephyr.c:2794
msgid "Resubscribe"
msgstr "重订"
-#: ../src/protocols/zephyr/zephyr.c:2790
+#: ../libgaim/protocols/zephyr/zephyr.c:2797
msgid "Retrieve subscriptions from server"
msgstr "从服务器获取订阅"
@@ -12170,70 +13918,87 @@ msgstr "从服务器获取订阅"
#. *< version
#. * summary
#. * description
-#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
+#: ../libgaim/protocols/zephyr/zephyr.c:2882
+#: ../libgaim/protocols/zephyr/zephyr.c:2884
msgid "Zephyr Protocol Plugin"
msgstr "Zephyr 协议插件"
-#: ../src/protocols/zephyr/zephyr.c:2902
+#: ../libgaim/protocols/zephyr/zephyr.c:2903
+msgid "Use tzc"
+msgstr "使用 tzc"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2906
+msgid "tzc command"
+msgstr "tzc 命令"
+
+#: ../libgaim/protocols/zephyr/zephyr.c:2909
msgid "Export to .anyone"
msgstr "导出到 .anyone"
-#: ../src/protocols/zephyr/zephyr.c:2905
+#: ../libgaim/protocols/zephyr/zephyr.c:2912
msgid "Export to .zephyr.subs"
msgstr "导出到 .zephyr.subs"
-#: ../src/protocols/zephyr/zephyr.c:2908
+#: ../libgaim/protocols/zephyr/zephyr.c:2915
msgid "Import from .anyone"
msgstr "从 .anyone 导入"
-#: ../src/protocols/zephyr/zephyr.c:2911
+#: ../libgaim/protocols/zephyr/zephyr.c:2918
msgid "Import from .zephyr.subs"
msgstr "从 .zephyr.subs 导入"
-#: ../src/protocols/zephyr/zephyr.c:2914
+#: ../libgaim/protocols/zephyr/zephyr.c:2921
msgid "Realm"
msgstr "域"
-#: ../src/protocols/zephyr/zephyr.c:2917
+#: ../libgaim/protocols/zephyr/zephyr.c:2924
msgid "Exposure"
msgstr "暴露"
-#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
-#: ../src/proxy.c:1338
+#: ../libgaim/proxy.c:615 ../libgaim/proxy.c:664 ../libgaim/proxy.c:703
+#: ../libgaim/proxy.c:714
#, c-format
-msgid "Proxy connection error %d"
-msgstr "代理服务器连接错误 %d"
+msgid "HTTP proxy connection error %d"
+msgstr "HTTP 代理服务器连接错误 %d"
#. Forbidden
-#: ../src/proxy.c:1327
+#: ../libgaim/proxy.c:710
#, c-format
-msgid "Access denied: proxy server forbids port %d tunnelling."
-msgstr "访问被禁止: 代理服务器禁止端口 %d 流过。"
+msgid "Access denied: HTTP proxy server forbids port %d tunnelling."
+msgstr "访问被禁止: HTTP 代理服务器禁止端口 %d 流过。"
-#: ../src/proxy.c:2327
-msgid "Invalid proxy settings"
-msgstr "无效的代理设置"
+#: ../libgaim/proxy.c:1524
+msgid "Could not resolve host name"
+msgstr "无法解析主机名"
-#: ../src/proxy.c:2327
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr "您为给定代理类型所指定的主机名或端口号无效。"
+#: ../libgaim/proxy.c:1567
+msgid "Unable to establish a connection"
+msgstr "无法创建连接"
-#: ../src/savedstatuses.c:514
-msgid "saved statuses"
-msgstr "已存状态"
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../libgaim/request.h:1354
+msgid "_Accept"
+msgstr "接受(_A)"
-#: ../src/savedstatuses.c:767
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../libgaim/savedstatuses.c:46
msgid "I'm not here right now"
msgstr "我目前不在"
-#: ../src/server.c:227
+#: ../libgaim/savedstatuses.c:525
+msgid "saved statuses"
+msgstr "已存状态"
+
+#: ../libgaim/server.c:225
#, c-format
msgid "%s is now known as %s.\n"
msgstr "%s 现在叫做 %s。\n"
-#: ../src/server.c:681
+#: ../libgaim/server.c:686
#, c-format
msgid ""
"%s has invited %s to the chat room %s:\n"
@@ -12242,129 +14007,123 @@ msgstr ""
"%s 邀请了 %s 加入聊天室 %s:\n"
"%s"
-#: ../src/server.c:686
+#: ../libgaim/server.c:691
#, c-format
msgid "%s has invited %s to the chat room %s\n"
msgstr "%s 邀请了 %s 加入聊天室 %s\n"
-#: ../src/server.c:690
+#: ../libgaim/server.c:695
msgid "Accept chat invitation?"
msgstr "接受聊天邀请吗?"
-#: ../src/status.c:153
+#: ../libgaim/status.c:153
msgid "Unset"
msgstr "取消设置"
-#: ../src/status.c:156
+#: ../libgaim/status.c:156
msgid "Unavailable"
msgstr "不可用"
-#: ../src/status.c:160
+#: ../libgaim/status.c:160
msgid "Mobile"
msgstr "移动"
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s 已登入"
-
-#: ../src/status.c:627
-#, c-format
-msgid "%s came back"
-msgstr "%s 回来了"
+#: ../libgaim/status.c:611
+#, fuzzy, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s 将话题改为: %s"
-#: ../src/status.c:634
-#, c-format
-msgid "%s signed off"
-msgstr "%s 已登出"
+#: ../libgaim/status.c:621
+#, fuzzy, c-format
+msgid "%s is now %s"
+msgstr "%s 现在叫做 %s。"
-#: ../src/status.c:638
-#, c-format
-msgid "%s went away"
-msgstr "%s 走了"
+#: ../libgaim/status.c:626
+#, fuzzy, c-format
+msgid "%s is no longer %s"
+msgstr "%s 发完呆了。"
-#: ../src/status.c:1317
+#: ../libgaim/status.c:1296
#, c-format
msgid "%s became idle"
msgstr "%s 发起了呆"
-#: ../src/status.c:1330
+#: ../libgaim/status.c:1313
#, c-format
msgid "%s became unidle"
msgstr "%s 发完呆了"
-#: ../src/status.c:1392
+#: ../libgaim/status.c:1379
#, c-format
msgid "+++ %s became idle"
msgstr "+++ %s 发起了呆"
-#: ../src/status.c:1394
+#: ../libgaim/status.c:1381
#, c-format
msgid "+++ %s became unidle"
msgstr "+++ %s 发完呆了"
-#: ../src/util.c:679
+#: ../libgaim/util.c:679
#, c-format
msgid "%x %X"
msgstr "%x %X"
-#: ../src/util.c:2457
+#: ../libgaim/util.c:2428
#, c-format
msgid "Error Reading %s"
msgstr "读取 %s 出错"
-#: ../src/util.c:2458
+#: ../libgaim/util.c:2429
#, c-format
msgid ""
"An error was encountered reading your %s. They have not been loaded, and "
"the old file has been renamed to %s~."
msgstr "读取您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中了。"
-#: ../src/util.c:2897
+#: ../libgaim/util.c:2882
msgid "Calculating..."
msgstr "正在计算..."
-#: ../src/util.c:2900
+#: ../libgaim/util.c:2885
msgid "Unknown."
msgstr "未知。"
-#: ../src/util.c:2926
+#: ../libgaim/util.c:2911
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d 秒"
-#: ../src/util.c:2938
+#: ../libgaim/util.c:2923
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d 天"
-#: ../src/util.c:2946
+#: ../libgaim/util.c:2931
#, c-format
msgid "%s, %d hour"
msgid_plural "%s, %d hours"
msgstr[0] "%s %d 小时"
-#: ../src/util.c:2952
+#: ../libgaim/util.c:2937
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d 小时"
-#: ../src/util.c:2960
+#: ../libgaim/util.c:2945
#, c-format
msgid "%s, %d minute"
msgid_plural "%s, %d minutes"
msgstr[0] "%s %d 分"
-#: ../src/util.c:2966
+#: ../libgaim/util.c:2951
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d 分"
-#: ../src/util.c:3441
+#: ../libgaim/util.c:3434
msgid "g003: Error opening connection.\n"
msgstr "g003: 打开连接出错。\n"
-