diff po/zh_CN.po @ 3388:83314a9985ef

[gaim-migrate @ 3407] Here it is. Added gettext 0.11.x support! It should work fine, but please let me know if anything is broken in 0.10.x or 0.11.x (in my tests, it all worked fine) committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Thu, 08 Aug 2002 18:11:17 +0000
parents c47ae88151ac
children 3fa89049fe6c
line wrap: on
line diff
--- a/po/zh_CN.po	Thu Aug 08 17:42:08 2002 +0000
+++ b/po/zh_CN.po	Thu Aug 08 18:11:17 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2002-06-25 00:10-0400\n"
+"POT-Creation-Date: 2002-08-08 02:18-0700\n"
 "PO-Revision-Date: 2000-06-17 17:55+08\n"
 "Last-Translator: hashao <hashao@china.com>\n"
 "Language-Team: Simplified Chinese <zh@li.org>\n"
@@ -25,11 +25,11 @@
 msgid "Gaim Chat"
 msgstr "Gaim 聊天"
 
-#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2716
-#: src/buddy_chat.c:1322 src/buddy_chat.c:1419 src/buddy_chat.c:1449
-#: src/conversation.c:2864 src/dialogs.c:567 src/dialogs.c:3899
-#: src/multi.c:1069 src/plugins.c:277 src/prefs.c:2547 src/prpl.c:438
-#: src/prpl.c:685 src/server.c:1072
+#: plugins/chatlist.c:339 src/about.c:165 src/aim.c:320 src/buddy.c:2720
+#: src/buddy_chat.c:1325 src/buddy_chat.c:1422 src/buddy_chat.c:1452
+#: src/conversation.c:2889 src/dialogs.c:592 src/dialogs.c:1527
+#: src/dialogs.c:4277 src/multi.c:1076 src/plugins.c:347 src/prefs.c:1853
+#: src/prpl.c:446 src/prpl.c:693 src/server.c:1097
 msgid "Close"
 msgstr "关闭"
 
@@ -41,17 +41,16 @@
 msgid "Refresh"
 msgstr "刷新"
 
-#. Put the buttons in the box
-#: plugins/chatlist.c:364 src/buddy.c:492 src/buddy.c:2827
-#: src/buddy_chat.c:1454 src/conversation.c:2389 src/conversation.c:2879
-#: src/dialogs.c:932 src/dialogs.c:1114 src/dialogs.c:2095 src/multi.c:1053
-#: src/prefs.c:2041 src/prefs.c:2383 src/prefs.c:2417
+#: plugins/chatlist.c:364 src/buddy.c:494 src/buddy.c:2833
+#: src/buddy_chat.c:1457 src/conversation.c:2406 src/conversation.c:2904
+#: src/dialogs.c:957 src/dialogs.c:1139 src/dialogs.c:1478 src/dialogs.c:1512
+#: src/dialogs.c:2507 src/multi.c:1060 src/prefs.c:1565
 msgid "Add"
 msgstr "增加"
 
-#: plugins/chatlist.c:365 src/buddy.c:494 src/buddy.c:2829
-#: src/buddy_chat.c:1456 src/conversation.c:2375 src/conversation.c:2876
-#: src/prefs.c:2055 src/prefs.c:2387 src/prefs.c:2421
+#: plugins/chatlist.c:365 src/buddy.c:496 src/buddy.c:2835
+#: src/buddy_chat.c:1459 src/conversation.c:2392 src/conversation.c:2901
+#: src/dialogs.c:1482 src/dialogs.c:1516 src/prefs.c:1577
 msgid "Remove"
 msgstr "删除"
 
@@ -75,7 +74,6 @@
 msgid "Enter symbols delimited with \"+\" in the box below."
 msgstr ""
 
-#. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:737
 msgid "Check this box to display only symbols and price:"
 msgstr ""
@@ -94,7 +92,7 @@
 msgid "Change"
 msgstr "取消"
 
-#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1919
+#: src/protocols/gg/gg.c:71 src/protocols/msn/msn.c:1921
 msgid "Available"
 msgstr ""
 
@@ -102,8 +100,8 @@
 msgid "Available for friends only"
 msgstr ""
 
-#: src/applet.c:197 src/buddy.c:497 src/buddy.c:2582 src/buddy.c:2727
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1118
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:1141
+#: src/applet.c:197 src/buddy.c:499 src/buddy.c:2586 src/buddy.c:2731
 msgid "Away"
 msgstr "暂时离开"
 
@@ -120,7 +118,7 @@
 msgid "Invisible for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1114
+#: src/protocols/gg/gg.c:77 src/protocols/jabber/jabber.c:1137
 msgid "Unavailable"
 msgstr ""
 
@@ -157,7 +155,7 @@
 msgid "Unknown Error Code."
 msgstr ""
 
-#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2050
+#: src/protocols/gg/gg.c:302 src/protocols/msn/msn.c:2052
 #, c-format
 msgid "Status: %s"
 msgstr ""
@@ -294,8 +292,7 @@
 msgid "Sex"
 msgstr ""
 
-#. Line 5
-#: src/dialogs.c:1624 src/dialogs.c:2332 src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2036 src/dialogs.c:2744
 msgid "City"
 msgstr "市"
 
@@ -374,12 +371,9 @@
 msgid "Directory Search"
 msgstr "姓名地址录"
 
-#.
-#. } else if (!strcmp(act, _("Set Dir Info"))) {
-#. show_set_dir(gc);
-#.
-#: src/dialogs.c:1741 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
-#: src/protocols/jabber/jabber.c:3748 src/protocols/jabber/jabber.c:3761
+#: src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+#: src/protocols/jabber/jabber.c:3953 src/protocols/jabber/jabber.c:3966
+#: src/dialogs.c:2153
 msgid "Change Password"
 msgstr "更改密码"
 
@@ -403,7 +397,7 @@
 msgstr "发送信息"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1851
-#: src/protocols/jabber/jabber.c:2860 src/protocols/oscar/oscar.c:3593
+#: src/protocols/jabber/jabber.c:3041 src/protocols/oscar/oscar.c:3608
 #: src/protocols/toc/toc.c:1219
 msgid "Get Info"
 msgstr "用户详细资料"
@@ -472,7 +466,7 @@
 msgid "Channel:"
 msgstr "取消"
 
-#: src/multi.c:549 src/protocols/irc/irc.c:1675
+#: src/protocols/irc/irc.c:1675 src/multi.c:549
 msgid "Password:"
 msgstr "密码:"
 
@@ -481,259 +475,268 @@
 msgid "DCC Chat"
 msgstr "聊天"
 
-#: src/protocols/jabber/jabber.c:942
+#: src/protocols/jabber/jabber.c:950
 msgid "Incorrect current password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:943 src/protocols/jabber/jabber.c:948
+#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jabber.c:956
 #, fuzzy
 msgid "Password Change Error!"
 msgstr "Gaim - 更改密码"
 
-#: src/protocols/jabber/jabber.c:947
+#: src/protocols/jabber/jabber.c:955
 msgid "New password same as old password! Password NOT Changed!"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1092
+#: src/protocols/jabber/jabber.c:1115
 msgid "Unknown"
 msgstr ""
 
-#: src/buddy.c:2887 src/protocols/jabber/jabber.c:1120
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1161
+#: src/buddy.c:2893
 msgid "Online"
 msgstr "在线"
 
-#: src/protocols/jabber/jabber.c:1122
+#: src/protocols/jabber/jabber.c:1145
 msgid "Extended Away"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1124
+#: src/protocols/jabber/jabber.c:1147
 msgid "Do Not Disturb"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1434
+#: src/protocols/jabber/jabber.c:1457
 #, c-format
 msgid "Error %s: %s"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1437
+#: src/protocols/jabber/jabber.c:1460
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1607
+#: src/protocols/jabber/jabber.c:1630
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1632
+#: src/protocols/jabber/jabber.c:1655
 msgid "No such user"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1634 src/protocols/jabber/jabber.c:2341
-#: src/protocols/jabber/jabber.c:2506
+#: src/protocols/jabber/jabber.c:1657 src/protocols/jabber/jabber.c:2413
+#: src/protocols/jabber/jabber.c:2681
 #, fuzzy
 msgid "Jabber Error"
 msgstr "消息内容"
 
-#: src/dialogs.c:887 src/protocols/jabber/jabber.c:1719
-#: src/protocols/msn/msn.c:1110
+#: src/protocols/jabber/jabber.c:1742 src/protocols/msn/msn.c:1112
+#: src/dialogs.c:912
 msgid "Buddies"
 msgstr "哥们儿们"
 
-#: src/protocols/jabber/jabber.c:1782
+#: src/protocols/jabber/jabber.c:1805
 #, fuzzy
 msgid "Authenticating"
 msgstr "身份验证失败"
 
-#: src/protocols/jabber/jabber.c:1819
+#: src/protocols/jabber/jabber.c:1842
 #, fuzzy
 msgid "Unknown login error"
 msgstr "登录错误"
 
-#: src/protocols/jabber/jabber.c:2010
+#: src/protocols/jabber/jabber.c:2033
 #, fuzzy
 msgid "Password successfully changed."
 msgstr "Gaim - 更改密码"
 
-#: src/protocols/jabber/jabber.c:2012
+#: src/protocols/jabber/jabber.c:2035
 #, fuzzy
 msgid "Password Change"
 msgstr "Gaim - 更改密码"
 
-#: src/protocols/jabber/jabber.c:2054 src/protocols/jabber/jabber.c:3676
+#: src/protocols/jabber/jabber.c:2077 src/protocols/jabber/jabber.c:3881
 #, fuzzy
 msgid "Connection lost"
 msgstr "连接已关闭"
 
-#: src/protocols/jabber/jabber.c:2056 src/protocols/jabber/jabber.c:2088
-#: src/protocols/jabber/jabber.c:3678 src/protocols/jabber/jabber.c:3724
-#: src/protocols/msn/msn.c:1741 src/protocols/msn/msn.c:1770
+#: src/protocols/jabber/jabber.c:2079 src/protocols/jabber/jabber.c:2111
+#: src/protocols/jabber/jabber.c:3883 src/protocols/jabber/jabber.c:3929
+#: src/protocols/msn/msn.c:1743 src/protocols/msn/msn.c:1772
 #, fuzzy
 msgid "Unable to connect"
 msgstr "不能建立直接连接"
 
-#: src/protocols/jabber/jabber.c:2062
+#: src/protocols/jabber/jabber.c:2085
 #, fuzzy
 msgid "Connected"
 msgstr "已断开。"
 
-#: src/protocols/jabber/jabber.c:2065
+#: src/protocols/jabber/jabber.c:2088
 #, fuzzy
 msgid "Requesting Authentication Method"
 msgstr "身份验证失败"
 
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2083 src/protocols/msn/msn.c:1762
+#: src/protocols/jabber/jabber.c:2106 src/protocols/msn/msn.c:1764
 #, fuzzy
 msgid "Connecting"
 msgstr "连接已关闭"
 
-#: src/protocols/jabber/jabber.c:2340 src/protocols/jabber/jabber.c:2505
+#: src/protocols/jabber/jabber.c:2412 src/protocols/jabber/jabber.c:2680
 #, fuzzy
 msgid "Invalid Jabber I.D."
 msgstr "娘家姓"
 
-#: src/protocols/jabber/jabber.c:2473
+#: src/protocols/jabber/jabber.c:2648
 msgid "Room:"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:2477
+#: src/protocols/jabber/jabber.c:2652
 #, fuzzy
 msgid "Server:"
 msgstr "代理服务器设置"
 
-#: src/protocols/jabber/jabber.c:2482
+#: src/protocols/jabber/jabber.c:2657
 #, fuzzy
 msgid "Handle:"
 msgstr "空闲时间:"
 
-#: src/protocols/jabber/jabber.c:2539
+#: src/protocols/jabber/jabber.c:2714
 #, fuzzy
 msgid "Chats"
 msgstr "聊天"
 
-#: src/protocols/jabber/jabber.c:2854
+#: src/protocols/jabber/jabber.c:3029
 #, fuzzy
 msgid "View Error Msg"
 msgstr "查看记录"
 
-#: src/buddy_chat.c:886 src/protocols/jabber/jabber.c:2865
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/jabber/jabber.c:3046 src/protocols/oscar/oscar.c:3621
+#: src/buddy_chat.c:889
 msgid "Get Away Msg"
 msgstr "收到暂时离开信息"
 
-#: src/protocols/jabber/jabber.c:2882
+#: src/protocols/jabber/jabber.c:3053
+msgid "Un-hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3056
+msgid "Temporarily Hide From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3074
 msgid "Remove From Roster"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3076
+#: src/protocols/jabber/jabber.c:3079
+msgid "Cancel Presence Notification"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:3281
 #, fuzzy
 msgid "Full Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3077
+#: src/protocols/jabber/jabber.c:3282
 #, fuzzy
 msgid "Family Name"
 msgstr "名"
 
-#: src/protocols/jabber/jabber.c:3078
+#: src/protocols/jabber/jabber.c:3283
 #, fuzzy
 msgid "Given Name"
 msgstr "娘家姓"
 
-#: src/protocols/jabber/jabber.c:3079
+#: src/protocols/jabber/jabber.c:3284
 msgid "Nickname"
 msgstr ""
 
-#: src/dialogs.c:2525 src/protocols/jabber/jabber.c:3080
+#: src/protocols/jabber/jabber.c:3285 src/dialogs.c:2937
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3081
+#: src/protocols/jabber/jabber.c:3286
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3082
+#: src/protocols/jabber/jabber.c:3287
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3083
+#: src/protocols/jabber/jabber.c:3288
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3084
+#: src/protocols/jabber/jabber.c:3289
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3085
+#: src/protocols/jabber/jabber.c:3290
 msgid "Postal Code"
 msgstr ""
 
-#. Line 7
-#: src/dialogs.c:1646 src/dialogs.c:2354 src/protocols/jabber/jabber.c:3086
+#: src/protocols/jabber/jabber.c:3291 src/dialogs.c:2058 src/dialogs.c:2766
 msgid "Country"
 msgstr "国"
 
-#: src/protocols/jabber/jabber.c:3087
+#: src/protocols/jabber/jabber.c:3292
 #, fuzzy
 msgid "Telephone"
 msgstr "全部不选"
 
-#: src/dialogs.c:2430 src/protocols/jabber/jabber.c:3088
+#: src/protocols/jabber/jabber.c:3293 src/dialogs.c:2842
 msgid "Email"
 msgstr "电邮"
 
-#: src/protocols/jabber/jabber.c:3089
+#: src/protocols/jabber/jabber.c:3294
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3090
+#: src/protocols/jabber/jabber.c:3295
 msgid "Organization Unit"
 msgstr ""
 
-#: src/prefs.c:2000 src/protocols/jabber/jabber.c:3091
+#: src/protocols/jabber/jabber.c:3296
 msgid "Title"
 msgstr "标题"
 
-#: src/protocols/jabber/jabber.c:3092
+#: src/protocols/jabber/jabber.c:3297
 #, fuzzy
 msgid "Role"
 msgstr "删除"
 
-#: src/protocols/jabber/jabber.c:3093
+#: src/protocols/jabber/jabber.c:3298
 msgid "Birthday"
 msgstr ""
 
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2533 src/plugins.c:211 src/protocols/jabber/jabber.c:3094
+#: src/protocols/jabber/jabber.c:3299 src/dialogs.c:2945
 msgid "Description"
 msgstr "描述"
 
-#: src/protocols/jabber/jabber.c:3119
+#: src/protocols/jabber/jabber.c:3324
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3120
+#: src/protocols/jabber/jabber.c:3325
 #, fuzzy
 msgid "User Identity"
 msgstr "用户详细资料"
 
-#: src/protocols/jabber/jabber.c:3532
+#: src/protocols/jabber/jabber.c:3737
 msgid "Gaim - Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3606
+#: src/protocols/jabber/jabber.c:3811
 #, fuzzy
 msgid "Server Registration successful!"
 msgstr "新用户注册"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3838
 msgid "Unknown registration error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:3742 src/protocols/jabber/jabber.c:3757
+#: src/protocols/jabber/jabber.c:3947 src/protocols/jabber/jabber.c:3962
 #, fuzzy
 msgid "Set User Info"
 msgstr "用户详细资料"
@@ -903,8 +906,8 @@
 msgstr "登录错误"
 
 #: src/protocols/msn/msn.c:351 src/protocols/msn/msn.c:558
-#: src/protocols/msn/msn.c:813 src/protocols/msn/msn.c:2114
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:815 src/protocols/msn/msn.c:2116
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 #, fuzzy
 msgid "MSN Error"
 msgstr "错误"
@@ -913,111 +916,111 @@
 msgid "A message may not have been received."
 msgstr ""
 
-#: src/protocols/msn/msn.c:813
+#: src/protocols/msn/msn.c:815
 #, fuzzy
 msgid "Gaim was unable to send a message"
 msgstr ""
 "%s\n"
 "%s 无法登录: %s"
 
-#: src/protocols/msn/msn.c:917
+#: src/protocols/msn/msn.c:919
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1074
+#: src/protocols/msn/msn.c:1076
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1175
+#: src/protocols/msn/msn.c:1177
 #, fuzzy
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "你被从聊天室 (%s) 里赶出来了!"
 
-#: src/protocols/msn/msn.c:1435 src/protocols/msn/msn.c:1679
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1681
 #, fuzzy
 msgid "Error reading from server"
 msgstr "读取文件 %s 发生错误"
 
-#: src/protocols/msn/msn.c:1568
+#: src/protocols/msn/msn.c:1570
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1620
 #, fuzzy
 msgid "Unable to send password"
 msgstr "不能读入文件 %s。"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1625
 #, fuzzy
 msgid "Password sent"
 msgstr "密码:"
 
-#: src/protocols/msn/msn.c:1748
+#: src/protocols/msn/msn.c:1750
 #, fuzzy
 msgid "Unable to write to server"
 msgstr "不能登录到 AIM"
 
-#: src/protocols/msn/msn.c:1754
+#: src/protocols/msn/msn.c:1756
 #, fuzzy
 msgid "Synching with server"
 msgstr "注册新的用户"
 
-#: src/protocols/msn/msn.c:1920
+#: src/protocols/msn/msn.c:1922
 msgid "Away From Computer"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1921
+#: src/protocols/msn/msn.c:1923
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1922
+#: src/protocols/msn/msn.c:1924
 #, fuzzy
 msgid "Busy"
 msgstr "朋友"
 
-#: src/protocols/msn/msn.c:1923
+#: src/protocols/msn/msn.c:1925
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1924
+#: src/protocols/msn/msn.c:1926
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1925
+#: src/protocols/msn/msn.c:1927
 #, fuzzy
 msgid "Hidden"
 msgstr "隐藏哥们儿们的图标"
 
-#: src/protocols/msn/msn.c:2041
+#: src/protocols/msn/msn.c:2043
 msgid "Reset friendly name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2114
+#: src/protocols/msn/msn.c:2116
 msgid "Friendly name too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:2129 src/protocols/msn/msn.c:2150
+#: src/protocols/msn/msn.c:2131 src/protocols/msn/msn.c:2152
 #, fuzzy
 msgid "Set Friendly Name"
 msgstr "登录名:"
 
-#: src/protocols/msn/msn.c:2130
+#: src/protocols/msn/msn.c:2132
 #, fuzzy
 msgid "Set Friendly Name:"
 msgstr "登录名:"
 
-#: src/protocols/msn/msn.c:2131
+#: src/protocols/msn/msn.c:2133
 msgid "Reset All Friendly Names"
 msgstr ""
 
-#: src/protocols/msn/msn.c:2283 src/protocols/msn/msn.c:2336
+#: src/protocols/msn/msn.c:2285 src/protocols/msn/msn.c:2338
 #, fuzzy
 msgid "Invalid name"
 msgstr "娘家姓"
 
-#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3209
+#: src/protocols/napster/napster.c:457 src/protocols/oscar/oscar.c:3224
 #: src/protocols/toc/toc.c:1104
 msgid "Join what group:"
 msgstr "要加入的组:"
@@ -1095,17 +1098,14 @@
 msgid "Connection established, cookie sent"
 msgstr "连接成功,送出饼干。。啊!饼干?!"
 
-#. Incorrect nick/password
 #: src/protocols/oscar/oscar.c:639 src/protocols/toc/toc.c:459
 msgid "Incorrect nickname or password."
 msgstr "昵名或者密码错误。"
 
-#. Suspended account
 #: src/protocols/oscar/oscar.c:644
 msgid "Your account is currently suspended."
 msgstr ""
 
-#. connecting too frequently
 #: src/protocols/oscar/oscar.c:648
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1113,7 +1113,6 @@
 msgstr ""
 "你连接,断开的频率太高了,等十分钟再试。如果你非要接着试,等的时间会更长。"
 
-#. client too old
 #: src/protocols/oscar/oscar.c:653
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "你所使用的软件版本太旧了。让你妈妈给你买个新的吧!"
@@ -1126,7 +1125,7 @@
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3420
+#: src/protocols/oscar/oscar.c:1248 src/protocols/oscar/oscar.c:3435
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "<HR><B>已建立和 %s 的直接连接。</B><BR><HR>"
@@ -1217,9 +1216,9 @@
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "你莫名其妙地丢失了一条 %s 发来的消息"
 
-#: src/dialogs.c:3076 src/dialogs.c:3082 src/protocols/oscar/oscar.c:1640
-#: src/protocols/oscar/oscar.c:1755 src/protocols/oscar/oscar.c:1773
-#: src/protocols/oscar/oscar.c:2226 src/protocols/yahoo/yahoo.c:594
+#: src/protocols/oscar/oscar.c:1640 src/protocols/oscar/oscar.c:1755
+#: src/protocols/oscar/oscar.c:1773 src/protocols/oscar/oscar.c:2226
+#: src/protocols/yahoo/yahoo.c:594 src/dialogs.c:3432 src/dialogs.c:3438
 msgid "Gaim - Error"
 msgstr "Gaim - 错误"
 
@@ -1244,10 +1243,14 @@
 msgstr "Gaim - 错误"
 
 #: src/protocols/oscar/oscar.c:1753
-#, c-format
+#, fuzzy, c-format
 msgid "Your message to %s did not get sent: %s"
-msgstr "你给 %s 的消息没有被发送"
-
+msgstr "消息无法送出"
+
+# #: src/protocols/oscar/oscar.c:1753
+# #, c-format
+# msgid "Your message to %s did not get sent: %s"
+# msgstr "你给 %s 的消息没有被发送"
 #: src/protocols/oscar/oscar.c:1754 src/protocols/oscar/oscar.c:1772
 msgid "Reason unknown"
 msgstr "原因不明"
@@ -1255,73 +1258,77 @@
 #: src/protocols/oscar/oscar.c:1771
 #, c-format
 msgid "User information for %s unavailable: %s"
-msgstr "无法查到用户 %s 的信息"
-
-#: src/buddy.c:2131 src/protocols/oscar/oscar.c:1802
+msgstr ""
+
+# #: src/protocols/oscar/oscar.c:1771
+# #, c-format
+# msgid "User information for %s unavailable: %s"
+# msgstr "无法查到用户 %s 的信息"
+#: src/protocols/oscar/oscar.c:1802 src/buddy.c:2133
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "朋友图标"
 
-#: src/buddy.c:2134 src/protocols/oscar/oscar.c:1805
+#: src/protocols/oscar/oscar.c:1805 src/buddy.c:2136
 msgid "Voice"
 msgstr "声音"
 
-#: src/buddy.c:2137 src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1808 src/buddy.c:2139
 msgid "IM Image"
 msgstr "IM 图案"
 
-#: src/buddy.c:498 src/buddy.c:2140 src/buddy.c:2581 src/prefs.c:2926
-#: src/protocols/oscar/oscar.c:1811
+#: src/protocols/oscar/oscar.c:1811 src/buddy.c:500 src/buddy.c:2142
+#: src/buddy.c:2585
 msgid "Chat"
 msgstr "聊天"
 
-#: src/buddy.c:2143 src/protocols/oscar/oscar.c:1814
+#: src/protocols/oscar/oscar.c:1814 src/buddy.c:2145
 msgid "Get File"
 msgstr "接收文件"
 
-#: src/buddy.c:2146 src/protocols/oscar/oscar.c:1817
+#: src/protocols/oscar/oscar.c:1817 src/buddy.c:2148
 msgid "Send File"
 msgstr "发送文件"
 
-#: src/buddy.c:2150 src/protocols/oscar/oscar.c:1821
+#: src/protocols/oscar/oscar.c:1821 src/buddy.c:2152
 msgid "Games"
 msgstr "游戏"
 
-#: src/buddy.c:2153 src/protocols/oscar/oscar.c:1824
+#: src/protocols/oscar/oscar.c:1824 src/buddy.c:2155
 msgid "Stocks"
 msgstr "股票"
 
-#: src/buddy.c:2156 src/protocols/oscar/oscar.c:1827
+#: src/protocols/oscar/oscar.c:1827 src/buddy.c:2158
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "朋友列表"
 
-#: src/buddy.c:2159 src/protocols/oscar/oscar.c:1830
+#: src/protocols/oscar/oscar.c:1830 src/buddy.c:2161
 msgid "EveryBuddy Bug"
 msgstr ""
 
-#: src/buddy.c:2162 src/protocols/oscar/oscar.c:1833
+#: src/protocols/oscar/oscar.c:1833 src/buddy.c:2164
 #, fuzzy
 msgid "AP User"
 msgstr "登录用户"
 
-#: src/buddy.c:2165 src/protocols/oscar/oscar.c:1836
+#: src/protocols/oscar/oscar.c:1836 src/buddy.c:2167
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/buddy.c:2168 src/protocols/oscar/oscar.c:1839
+#: src/protocols/oscar/oscar.c:1839 src/buddy.c:2170
 msgid "Nihilist"
 msgstr ""
 
-#: src/buddy.c:2171 src/protocols/oscar/oscar.c:1842
+#: src/protocols/oscar/oscar.c:1842 src/buddy.c:2173
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/buddy.c:2174 src/protocols/oscar/oscar.c:1845
+#: src/protocols/oscar/oscar.c:1845 src/buddy.c:2176
 msgid "ICQ Unknown"
 msgstr ""
 
-#: src/buddy.c:2177 src/protocols/oscar/oscar.c:1848
+#: src/protocols/oscar/oscar.c:1848 src/buddy.c:2179
 msgid "Trillian Encryption"
 msgstr ""
 
@@ -1384,35 +1391,35 @@
 "wait 10 seconds and try again."
 msgstr ""
 
-#: src/dialogs.c:3604 src/protocols/oscar/oscar.c:2589
-#: src/protocols/oscar/oscar.c:3541 src/protocols/toc/toc.c:1564
-#: src/protocols/toc/toc.c:1581 src/protocols/toc/toc.c:1641
-#: src/protocols/toc/toc.c:1683 src/protocols/toc/toc.c:1802
-#: src/protocols/toc/toc.c:1832 src/protocols/toc/toc.c:1888
+#: src/protocols/oscar/oscar.c:2589 src/protocols/oscar/oscar.c:3556
+#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1581
+#: src/protocols/toc/toc.c:1641 src/protocols/toc/toc.c:1683
+#: src/protocols/toc/toc.c:1802 src/protocols/toc/toc.c:1832
+#: src/protocols/toc/toc.c:1888 src/dialogs.c:3982
 msgid "Error"
 msgstr "错误"
 
-#: src/protocols/oscar/oscar.c:3192
+#: src/protocols/oscar/oscar.c:3207
 #, c-format
 msgid ""
 "The maximum number of buddies allowed in your buddy list is %d, and you have "
 "%d.  Until you are below the limit, some buddies will not show up as online."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3210
 #, fuzzy
 msgid "Gaim - Warning"
 msgstr "Gaim - 警告用户?"
 
-#: src/protocols/oscar/oscar.c:3213 src/protocols/toc/toc.c:1108
+#: src/protocols/oscar/oscar.c:3228 src/protocols/toc/toc.c:1108
 msgid "Exchange:"
 msgstr "交换:"
 
-#: src/protocols/oscar/oscar.c:3541
+#: src/protocols/oscar/oscar.c:3556
 msgid "Unable to open Direct IM"
 msgstr "不能建立直接连接"
 
-#: src/protocols/oscar/oscar.c:3551
+#: src/protocols/oscar/oscar.c:3566
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -1420,30 +1427,30 @@
 "continue?"
 msgstr "你想跟 %s 套近乎。这样会露出你的狐狸尾巴,这有风险。你想继续吗?"
 
-#: src/protocols/oscar/oscar.c:3568
+#: src/protocols/oscar/oscar.c:3583
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>Remote client does not "
 "support sending status messages.</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3575
+#: src/protocols/oscar/oscar.c:3590
 #, c-format
 msgid ""
 "<B>UIN:</B> %s<BR><B>Status:</B> %s<BR><HR><BR><I>User has no status message."
 "</I><BR>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3615
 #, fuzzy
 msgid "Get Status Msg"
 msgstr "收到暂时离开信息"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3628
 msgid "Direct IM"
 msgstr "直接消息"
 
-#: src/protocols/oscar/oscar.c:3621
+#: src/protocols/oscar/oscar.c:3636
 #, fuzzy
 msgid "Get Capabilities"
 msgstr "兼容性:%s\n"
@@ -1588,7 +1595,7 @@
 msgid "Password Change Successful"
 msgstr "Gaim - 更改密码"
 
-#: src/dialogs.c:1730 src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:782 src/dialogs.c:2142
 msgid "Gaim - Password Change"
 msgstr "Gaim - 更改密码"
 
@@ -1704,14 +1711,11 @@
 "Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
 #: src/about.c:185
 msgid "Web Site"
 msgstr "网址"
 
-#: src/aim.c:153 src/buddy.c:2709
+#: src/aim.c:153 src/buddy.c:2713
 msgid "Signoff"
 msgstr "离开"
 
@@ -1719,7 +1723,7 @@
 msgid "Please enter your logon"
 msgstr "请输入您的登录名称"
 
-#: src/aim.c:165 src/multi.c:1400 src/server.c:55
+#: src/aim.c:165 src/multi.c:1407 src/server.c:55
 msgid "Signon Error"
 msgstr "登录错误"
 
@@ -1735,11 +1739,11 @@
 msgid "Password: "
 msgstr "密码:"
 
-#: src/aim.c:318 src/buddy.c:2713
+#: src/aim.c:318 src/buddy.c:2717
 msgid "Quit"
 msgstr "退出"
 
-#: src/aim.c:323 src/aim.c:831 src/buddy.c:2739
+#: src/aim.c:323 src/aim.c:837 src/buddy.c:2743
 msgid "Accounts"
 msgstr "所有帐号"
 
@@ -1751,19 +1755,19 @@
 msgid "About"
 msgstr "关于"
 
-#: src/aim.c:358 src/prefs.c:1633 src/prefs.c:1905
+#: src/aim.c:358
 msgid "Options"
 msgstr "选  项"
 
-#: src/aim.c:360 src/aim.c:834 src/buddy.c:2757
+#: src/aim.c:360 src/aim.c:840 src/buddy.c:2763
 msgid "Plugins"
 msgstr "插    件"
 
-#: src/aim.c:828 src/buddy.c:2749
+#: src/aim.c:834 src/buddy.c:2755
 msgid "Preferences"
 msgstr "属性设置"
 
-#: src/aim.c:838 src/multi.c:1472
+#: src/aim.c:844 src/multi.c:1479
 #, fuzzy
 msgid "Auto-login"
 msgstr "自动登录"
@@ -1818,74 +1822,73 @@
 msgid "Set All Away"
 msgstr "将所有帐号设为离开"
 
-#: src/buddy.c:493 src/buddy.c:2828 src/dialogs.c:942 src/dialogs.c:1089
+#: src/buddy.c:495 src/buddy.c:2834 src/dialogs.c:967 src/dialogs.c:1114
 msgid "Group"
 msgstr "组群"
 
-#: src/buddy.c:499 src/buddy.c:664 src/buddy.c:834 src/buddy.c:2579
-#: src/buddy_chat.c:861 src/buddy_chat.c:1278
+#: src/buddy.c:501 src/buddy.c:666 src/buddy.c:836 src/buddy.c:2583
+#: src/buddy_chat.c:864 src/buddy_chat.c:1281
 msgid "IM"
 msgstr "即时信息"
 
-#: src/buddy.c:500 src/buddy.c:2580 src/buddy_chat.c:877 src/buddy_chat.c:1286
-#: src/buddy_chat.c:1462 src/conversation.c:2897
+#: src/buddy.c:502 src/buddy.c:2584 src/buddy_chat.c:880 src/buddy_chat.c:1289
+#: src/buddy_chat.c:1465 src/conversation.c:2922
 msgid "Info"
 msgstr "详细资料"
 
-#. Put the buttons in the box
-#: src/buddy.c:669 src/buddy.c:839 src/dialogs.c:1081 src/dialogs.c:3458
-#: src/dialogs.c:3473
+#: src/buddy.c:671 src/buddy.c:841 src/dialogs.c:1106 src/dialogs.c:3836
+#: src/dialogs.c:3851
 msgid "Alias"
 msgstr "外号儿"
 
-#: src/buddy.c:674 src/buddy.c:858
+#: src/buddy.c:676 src/buddy.c:860
 msgid "Add Buddy Pounce"
 msgstr "增加监视朋友"
 
-#: src/buddy.c:681 src/buddy.c:864
+#: src/buddy.c:683 src/buddy.c:866
 msgid "View Log"
 msgstr "查看记录"
 
-#: src/buddy.c:821 src/buddy.c:852
+#: src/buddy.c:823 src/buddy.c:854
 msgid "Rename"
 msgstr "重命名"
 
-#: src/buddy.c:846
+#: src/buddy.c:848
 msgid "Un-Alias"
 msgstr "去除外号儿"
 
-#: src/buddy.c:1645 src/buddy.c:2732
+#: src/buddy.c:1647 src/buddy.c:2736
 msgid "Buddy Pounce"
 msgstr "监视朋友"
 
-#: src/buddy.c:1725
+#: src/buddy.c:1727
 msgid "New Buddy Pounce"
 msgstr "新增监视朋友"
 
-#: src/buddy.c:1743
+#: src/buddy.c:1745
 msgid "Remove Buddy Pounce"
 msgstr "取消监视朋友"
 
-#: src/buddy.c:1771
+#: src/buddy.c:1773
 msgid "[Click to edit]"
 msgstr ""
 
-#: src/buddy.c:2254
+#: src/buddy.c:2258
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "已登录帐号: %s\n"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2270
 #, c-format
 msgid "Warnings: %d%%\n"
 msgstr "警告:%d%%\n"
 
-#: src/buddy.c:2278
+#: src/buddy.c:2282
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "兼容性:%s\n"
 
-#: src/buddy.c:2282
+#: src/buddy.c:2286
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1894,130 +1897,138 @@
 msgstr ""
 "外号儿:%s                \n"
 "登录名:%s\n"
-"%s%s%s"
-
-#: src/buddy.c:2286
+"%s%s%s%s%s%s"
+
+#: src/buddy.c:2290
 msgid "Idle: "
 msgstr "空闲时间:"
 
-#: src/buddy.c:2359 src/buddy.c:2364
+#: src/buddy.c:2363 src/buddy.c:2368
 #, c-format
 msgid "%s logged in."
 msgstr "<HR><B>%s 已登录。</B><BR><HR>"
 
-#: src/buddy.c:2424 src/buddy.c:2429
-#, c-format
+#: src/buddy.c:2428 src/buddy.c:2433
+#, fuzzy, c-format
 msgid "%s logged out."
-msgstr "<HR><B>%s 离开了 %s%s 。</B><BR><HR>"
-
-#: src/buddy.c:2614
+msgstr "<HR><B>%s 已登录。</B><BR><HR>"
+
+# #: src/buddy.c:2428 src/buddy.c:2433
+# #, c-format
+# msgid "%s logged out."
+# msgstr "<HR><B>%s 离开了 %s%s 。</B><BR><HR>"
+#: src/buddy.c:2618
 msgid "Information on selected Buddy"
 msgstr "选中的朋友的资料"
 
-#: src/buddy.c:2615 src/dialogs.c:697
+#: src/buddy.c:2619 src/dialogs.c:722
 msgid "Send Instant Message"
 msgstr "发出即时信息"
 
-#: src/buddy.c:2616
+#: src/buddy.c:2620
 msgid "Start/join a Buddy Chat"
 msgstr "发起或加入一个聊天室"
 
-#: src/buddy.c:2617
+#: src/buddy.c:2621
 msgid "Activate Away Message"
 msgstr "激活暂时离开信息"
 
-#: src/buddy.c:2689
-msgid "File"
-msgstr "文件"
-
 #: src/buddy.c:2693
+msgid "File"
+msgstr "文件"
+
+#: src/buddy.c:2697
 msgid "Add A Buddy"
 msgstr "加入一个哥们儿"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2699
 msgid "Join A Chat"
 msgstr "加入聊天"
 
-#: src/buddy.c:2697
+#: src/buddy.c:2701
 msgid "New Instant Message"
 msgstr "发出即时信息"
 
-#: src/buddy.c:2699 src/dialogs.c:759
+#: src/buddy.c:2703 src/dialogs.c:784
 msgid "Get User Info"
 msgstr "用户详细资料"
 
-#: src/buddy.c:2704
+#: src/buddy.c:2708
 msgid "Import Buddy List"
 msgstr "导入朋友列表"
 
-#: src/buddy.c:2722
+#: src/buddy.c:2726
 msgid "Tools"
 msgstr "工具"
 
-#: src/buddy.c:2745
+#: src/buddy.c:2749
 msgid "Protocol Actions"
 msgstr "协议动作"
 
-#: src/buddy.c:2751
+#: src/buddy.c:2753
+msgid "Privacy"
+msgstr "隐私"
+
+#: src/buddy.c:2757
 msgid "View System Log"
 msgstr "查看系统记录"
 
-#: src/buddy.c:2763
+#: src/buddy.c:2769
 msgid "Perl"
 msgstr "Perl 插件"
 
-#: src/buddy.c:2766
+#: src/buddy.c:2772
 msgid "Load Script"
 msgstr "加载脚本"
 
-#: src/buddy.c:2770
+#: src/buddy.c:2776
 msgid "Unload All Scripts"
 msgstr "卸载脚本"
 
-#: src/buddy.c:2774
+#: src/buddy.c:2780
 msgid "List Scripts"
 msgstr "列出已加载脚本"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2788
 msgid "Help"
 msgstr "帮助"
 
-#: src/buddy.c:2787
+#: src/buddy.c:2793
 #, fuzzy
 msgid "Online Help"
 msgstr "在线"
 
-#: src/buddy.c:2788
+#: src/buddy.c:2794
 #, fuzzy
 msgid "Debug Window"
 msgstr "显示 Debug 窗口"
 
-#: src/buddy.c:2789
+#: src/buddy.c:2795
 msgid "About Gaim"
 msgstr "关于 Gaim"
 
-#: src/buddy.c:2807 src/prefs.c:2905
+#: src/buddy.c:2813 src/prefs.c:1659
 msgid "Buddy List"
 msgstr "朋友列表"
 
-#: src/buddy.c:2860
+#: src/buddy.c:2866
 msgid "Add a new Buddy"
 msgstr "增加一个新哥们儿"
 
-#: src/buddy.c:2861
+#: src/buddy.c:2867
 msgid "Add a new Group"
 msgstr "增加一个新哥们儿"
 
-#: src/buddy.c:2862
+#: src/buddy.c:2868
 #, fuzzy
 msgid "Remove selected Buddy/Group"
 msgstr "删除选中的哥们儿"
 
-#: src/buddy.c:2889
+#: src/buddy.c:2895
 msgid "Edit Buddies"
 msgstr "修改朋友列表"
 
-#: src/buddy.c:2932
+#: src/buddy.c:2938
 msgid "Gaim - Buddy List"
 msgstr "Gaim - 朋友列表"
 
@@ -2029,13 +2040,13 @@
 msgid "Join Chat As:"
 msgstr "设定加入聊天使用的昵称:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:449
-#: src/dialogs.c:539 src/dialogs.c:715 src/dialogs.c:816 src/dialogs.c:934
-#: src/dialogs.c:1110 src/dialogs.c:1473 src/dialogs.c:1678 src/dialogs.c:1802
-#: src/dialogs.c:1862 src/dialogs.c:2084 src/dialogs.c:2266 src/dialogs.c:2441
-#: src/dialogs.c:2512 src/dialogs.c:3208 src/dialogs.c:3460 src/dialogs.c:3641
-#: src/dialogs.c:4012 src/dialogs.c:4118 src/dialogs.c:4777 src/multi.c:781
-#: src/multi.c:911 src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:451
+#: src/dialogs.c:541 src/dialogs.c:740 src/dialogs.c:841 src/dialogs.c:959
+#: src/dialogs.c:1135 src/dialogs.c:1885 src/dialogs.c:2090 src/dialogs.c:2214
+#: src/dialogs.c:2274 src/dialogs.c:2496 src/dialogs.c:2678 src/dialogs.c:2853
+#: src/dialogs.c:2924 src/dialogs.c:3586 src/dialogs.c:3838 src/dialogs.c:4019
+#: src/dialogs.c:4394 src/dialogs.c:4500 src/dialogs.c:5185 src/multi.c:781
+#: src/multi.c:911 src/prpl.c:158 src/prpl.c:232
 msgid "Cancel"
 msgstr "取消"
 
@@ -2043,16 +2054,16 @@
 msgid "Join"
 msgstr "加入"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1328
-#: src/buddy_chat.c:1418
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1331
+#: src/buddy_chat.c:1421
 msgid "Invite"
 msgstr "邀请"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1301 src/dialogs.c:3468
+#: src/buddy_chat.c:412 src/dialogs.c:1713 src/dialogs.c:3846
 msgid "Buddy"
 msgstr "朋友"
 
-#: src/buddy_chat.c:417 src/prefs.c:2004
+#: src/buddy_chat.c:417
 msgid "Message"
 msgstr "消息内容"
 
@@ -2061,69 +2072,73 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "请人聊天"
 
-#: src/buddy_chat.c:868
+#: src/buddy_chat.c:871
 #, fuzzy
 msgid "Un-Ignore"
 msgstr "不理他"
 
-#: src/buddy_chat.c:870 src/buddy_chat.c:1282
+#: src/buddy_chat.c:873 src/buddy_chat.c:1285
 msgid "Ignore"
 msgstr "不理他"
 
-#. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:933 src/buddy_chat.c:1045 src/buddy_chat.c:1508
-#: src/buddy_chat.c:1541
-#, c-format
+#: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+#: src/buddy_chat.c:1544
+#, fuzzy, c-format
 msgid "%d %s in room"
-msgstr "聊天室有 %d 家伙"
-
-#: src/buddy_chat.c:941
+msgstr "聊天室现在没有人,爱干嘛干嘛去"
+
+# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+# #: src/buddy_chat.c:1544
+# #, c-format
+# msgid "%d %s in room"
+# msgstr "聊天室有 %d 家伙"
+#: src/buddy_chat.c:944
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 进了聊天室"
 
-#: src/buddy_chat.c:1007
+#: src/buddy_chat.c:1010
 #, c-format
 msgid "%s is now known as %s"
 msgstr "[%s] 现在使用化名 [%s]"
 
-#: src/buddy_chat.c:1054
+#: src/buddy_chat.c:1057
 #, fuzzy, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 灰溜溜地离开了聊天室"
 
-#: src/buddy_chat.c:1056
+#: src/buddy_chat.c:1059
 #, c-format
 msgid "%s left the room."
 msgstr "%s 灰溜溜地离开了聊天室"
 
-#: src/buddy_chat.c:1155
+#: src/buddy_chat.c:1158
 msgid "Gaim - Group Chats"
 msgstr "Gaim 群体聊天"
 
-#: src/buddy_chat.c:1218
+#: src/buddy_chat.c:1221
 msgid "Topic:"
 msgstr "主题:"
 
-#: src/buddy_chat.c:1259
+#: src/buddy_chat.c:1262
 msgid "0 people in room"
 msgstr "聊天室现在没有人,爱干嘛干嘛去"
 
-#: src/buddy_chat.c:1333 src/buddy_chat.c:1417
+#: src/buddy_chat.c:1336 src/buddy_chat.c:1420
 msgid "Whisper"
 msgstr "悄悄话"
 
-#: src/buddy_chat.c:1338 src/buddy_chat.c:1415 src/buddy_chat.c:1464
-#: src/conversation.c:2908
+#: src/buddy_chat.c:1341 src/buddy_chat.c:1418 src/buddy_chat.c:1467
+#: src/conversation.c:2933
 msgid "Send"
 msgstr "送出"
 
-#: src/buddy_chat.c:1458 src/conversation.c:2885
+#: src/buddy_chat.c:1461 src/conversation.c:2910
 msgid "Block"
 msgstr "堵住他的嘴!"
 
-#: src/buddy_chat.c:1460 src/conversation.c:2891 src/dialogs.c:424
-#: src/dialogs.c:453
+#: src/buddy_chat.c:1463 src/conversation.c:2916 src/dialogs.c:426
+#: src/dialogs.c:455
 msgid "Warn"
 msgstr "警告"
 
@@ -2160,565 +2175,593 @@
 msgid "Setting position to %d\n"
 msgstr "把位置设定到 %d\n"
 
-#: src/conversation.c:2170 src/prefs.c:1308
+#: src/conversation.c:2187
 msgid "Bold Text"
 msgstr "粗体文字"
 
-#: src/conversation.c:2170
+#: src/conversation.c:2187 src/prefs.c:312
 msgid "Bold"
 msgstr "粗体"
 
-#: src/conversation.c:2174
+#: src/conversation.c:2191
 msgid "Italics Text"
 msgstr "斜体文字"
 
-#: src/conversation.c:2175
+#: src/conversation.c:2192 src/prefs.c:313
 msgid "Italics"
 msgstr "斜体"
 
-#: src/conversation.c:2178 src/prefs.c:1320
+#: src/conversation.c:2195
 msgid "Underline Text"
 msgstr "下加线文字"
 
-#: src/conversation.c:2179
+#: src/conversation.c:2196 src/prefs.c:314
 msgid "Underline"
 msgstr "下加线"
 
-#: src/conversation.c:2183 src/prefs.c:1326
+#: src/conversation.c:2200
 msgid "Strike through Text"
 msgstr "划掉的文字"
 
-#: src/conversation.c:2183
+#: src/conversation.c:2200
 msgid "Strike"
 msgstr "划掉"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Decrease font size"
 msgstr "缩小字体"
 
-#: src/conversation.c:2189
+#: src/conversation.c:2206
 msgid "Small"
 msgstr "小"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal font size"
 msgstr "正常字体大小"
 
-#: src/conversation.c:2192
+#: src/conversation.c:2209
 msgid "Normal"
 msgstr "正常"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Increase font size"
 msgstr "增大字体"
 
-#: src/conversation.c:2195
+#: src/conversation.c:2212
 msgid "Big"
 msgstr "大"
 
-#: src/conversation.c:2202 src/dialogs.c:2883 src/dialogs.c:2907
+#: src/conversation.c:2219 src/dialogs.c:3239 src/dialogs.c:3263
 msgid "Select Font"
 msgstr "选择字型"
 
-#: src/conversation.c:2203
+#: src/conversation.c:2220
 msgid "Font"
 msgstr "字型"
 
-#: src/conversation.c:2206 src/prefs.c:1356
+#: src/conversation.c:2223
 msgid "Text Color"
 msgstr "文字颜色"
 
-#: src/conversation.c:2207 src/conversation.c:2211
+#: src/conversation.c:2224 src/conversation.c:2228
 msgid "Color"
 msgstr "颜色"
 
-#: src/conversation.c:2211 src/prefs.c:1374
+#: src/conversation.c:2228
 msgid "Background Color"
 msgstr "背景颜色"
 
-#: src/conversation.c:2218 src/dialogs.c:2506
+#: src/conversation.c:2235 src/dialogs.c:2918
 msgid "Insert Link"
 msgstr "插入超连接"
 
-#: src/conversation.c:2219
+#: src/conversation.c:2236
 msgid "Link"
 msgstr "超连接"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Insert smiley face"
 msgstr "插入笑脸图形"
 
-#: src/conversation.c:2222
+#: src/conversation.c:2239
 msgid "Smiley"
 msgstr "笑脸符"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Insert IM Image"
 msgstr "IM 图案"
 
-#: src/conversation.c:2225
+#: src/conversation.c:2242
 #, fuzzy
 msgid "Image"
 msgstr "IM 图案"
 
-#: src/conversation.c:2232
+#: src/conversation.c:2249
 msgid "Enable logging"
 msgstr "开始记录"
 
-#: src/conversation.c:2233 src/prefs.c:254
+#: src/conversation.c:2250 src/prefs.c:1666
 msgid "Logging"
 msgstr "记录"
 
-#: src/conversation.c:2242
+#: src/conversation.c:2259
 msgid "Save Conversation"
 msgstr "保存对话内容"
 
-#: src/conversation.c:2243 src/dialogs.c:1682 src/dialogs.c:1866
-#: src/dialogs.c:3220 src/dialogs.c:3908 src/dialogs.c:4785
+#: src/conversation.c:2260 src/dialogs.c:2094 src/dialogs.c:2278
+#: src/dialogs.c:3598 src/dialogs.c:4286 src/dialogs.c:5193
 msgid "Save"
 msgstr "存盘"
 
-#: src/conversation.c:2247 src/conversation.c:2248
+#: src/conversation.c:2264 src/conversation.c:2265
 msgid "Sound"
 msgstr "声音"
 
-#: src/conversation.c:2729
+#: src/conversation.c:2752
 msgid "Gaim - Conversations"
 msgstr "Gaim - 所有对话"
 
-#: src/conversation.c:2816
+#: src/conversation.c:2839
 msgid "Send message as: "
 msgstr "发送信息"
 
-#: src/conversation.c:3453
+#: src/conversation.c:3503
 #, fuzzy
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 存盘为……"
 
-#: src/conversation.c:3487
+#: src/conversation.c:3537
 msgid "Disable Animation"
 msgstr ""
 
-#: src/conversation.c:3492
+#: src/conversation.c:3548
 #, fuzzy
 msgid "Enable Animation"
 msgstr "打开声音"
 
-#: src/conversation.c:3498
+#: src/conversation.c:3554
 #, fuzzy
 msgid "Hide Icon"
 msgstr "隐藏哥们儿们的图标"
 
-#: src/conversation.c:3504
+#: src/conversation.c:3560
 #, fuzzy
 msgid "Save Icon As..."
 msgstr "Gaim - 存盘为……"
 
-#: src/dialogs.c:412
+#: src/dialogs.c:414
 msgid "Gaim - Warn user?"
 msgstr "Gaim - 警告用户?"
 
-#: src/dialogs.c:432
+#: src/dialogs.c:434
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "你真的想警告 %s?"
 
-#: src/dialogs.c:437
+#: src/dialogs.c:439
 msgid "Warn anonymously?"
 msgstr "发匿名警告?"
 
-#: src/dialogs.c:441
+#: src/dialogs.c:443
 msgid "Anonymous warnings are less harsh."
 msgstr "匿名警告不那么严厉。"
 
-#: src/dialogs.c:469
+#: src/dialogs.c:471
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "把 “%s”从朋友表上删去\n"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:496
 #, fuzzy, c-format
 msgid "Gaim - Remove %s?"
 msgstr "Gaim - 重命名组"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:509
 #, fuzzy
 msgid "Remove Buddy"
 msgstr "重命名哥们儿"
 
-#: src/dialogs.c:517
+#: src/dialogs.c:519
 #, c-format
 msgid ""
 "You are about to remove '%s' from\n"
 "your buddylist. Do you want to continue?"
 msgstr ""
 
-#: src/dialogs.c:529 src/prpl.c:154 src/prpl.c:228
+#: src/dialogs.c:531 src/prpl.c:162 src/prpl.c:236
 msgid "Accept"
 msgstr "接受"
 
-#. Build OK Button
-#: src/dialogs.c:635 src/dialogs.c:720 src/dialogs.c:821 src/dialogs.c:1477
-#: src/dialogs.c:1806 src/dialogs.c:1957 src/dialogs.c:2265 src/dialogs.c:2445
-#: src/dialogs.c:2511 src/dialogs.c:4017 src/dialogs.c:4123 src/multi.c:786
+#: src/dialogs.c:660 src/dialogs.c:745 src/dialogs.c:846 src/dialogs.c:1889
+#: src/dialogs.c:2218 src/dialogs.c:2369 src/dialogs.c:2677 src/dialogs.c:2857
+#: src/dialogs.c:2923 src/dialogs.c:4399 src/dialogs.c:4505 src/multi.c:786
+#: src/prefs.c:1830
 msgid "OK"
 msgstr "确认"
 
-#: src/dialogs.c:687
+#: src/dialogs.c:712
 msgid "Gaim - IM user"
 msgstr "Gaim - 即时信息用户"
 
-#: src/dialogs.c:704
+#: src/dialogs.c:729
 msgid "IM who:"
 msgstr "给这家伙即时信息:"
 
-#: src/dialogs.c:768
+#: src/dialogs.c:793
 msgid "User:"
 msgstr "用户:"
 
-#: src/dialogs.c:777
+#: src/dialogs.c:802
 #, fuzzy
 msgid "Account:"
 msgstr "所有帐号"
 
-#. Finish up
-#: src/dialogs.c:826
+#: src/dialogs.c:851
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 取得用户资料"
 
-#: src/dialogs.c:940
-msgid "Add Group"
-msgstr "添加组"
-
 #: src/dialogs.c:965
+msgid "Add Group"
+msgstr "添加组"
+
+#: src/dialogs.c:990
 msgid "Gaim - Add Group"
 msgstr "Gaim - 添加组"
 
-#: src/dialogs.c:1049
+#: src/dialogs.c:1074
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 增加朋友"
 
-#: src/dialogs.c:1061
+#: src/dialogs.c:1086
 msgid "Add Buddy"
 msgstr "增加朋友"
 
-#: src/dialogs.c:1071
+#: src/dialogs.c:1096
 #, fuzzy
 msgid "Contact"
 msgstr "字体外观"
 
-#. Set up stuff for the account box
-#: src/dialogs.c:1097
+#: src/dialogs.c:1122
 #, fuzzy
 msgid "Add To"
 msgstr "增加"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1417
+#, fuzzy
+msgid "Gaim - Privacy"
+msgstr "Gaim - 暂时离开"
+
+#: src/dialogs.c:1429
+msgid "Privacy settings are affected immediately."
+msgstr ""
+
+#: src/dialogs.c:1437
+msgid "Set privacy for:"
+msgstr "设置隐私选项为:"
+
+#: src/dialogs.c:1456
+msgid "Allow all users to contact me"
+msgstr "允许所有的用户和我联系"
+
+#: src/dialogs.c:1457
+msgid "Allow only the users below"
+msgstr "只允许如下用户和我联系"
+
+#: src/dialogs.c:1459
+msgid "Allow List"
+msgstr "允许的用户列表"
+
+#: src/dialogs.c:1490
+msgid "Deny all users"
+msgstr "拒绝所有用户和我联系"
+
+#: src/dialogs.c:1491
+msgid "Block the users below"
+msgstr "堵住这些家伙的嘴"
+
+#: src/dialogs.c:1493
+msgid "Block List"
+msgstr "被堵住嘴的家伙"
+
+#: src/dialogs.c:1546
 msgid "Please enter a buddy to pounce."
 msgstr "请输入您要监视的;’哥们儿"
 
-#: src/dialogs.c:1134
+#: src/dialogs.c:1546
 msgid "Buddy Pounce Error"
 msgstr "监视朋友时出错"
 
-#: src/dialogs.c:1270
+#: src/dialogs.c:1682
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - 新增监视朋友"
 
-#. <pounce type="who">
-#: src/dialogs.c:1281
+#: src/dialogs.c:1693
 msgid "Pounce Who"
 msgstr ""
 
-#: src/dialogs.c:1292
+#: src/dialogs.c:1704
 #, fuzzy
 msgid "Account"
 msgstr "所有帐号"
 
-#. </pounce type="who">
-#. <pounce type="when">
-#: src/dialogs.c:1318
+#: src/dialogs.c:1730
 msgid "Pounce When"
 msgstr ""
 
-#: src/dialogs.c:1328
+#: src/dialogs.c:1740
 msgid "Pounce on sign on"
 msgstr "监视何时登录"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1749
 msgid "Pounce on return from away"
 msgstr "监视何时回来"
 
-#: src/dialogs.c:1346
+#: src/dialogs.c:1758
 msgid "Pounce on return from idle"
 msgstr "监视何时神志恢复清醒"
 
-#: src/dialogs.c:1355
+#: src/dialogs.c:1767
 #, fuzzy
 msgid "Pounce when buddy is typing to you"
 msgstr "朋友登录声"
 
-#. </pounce type="when">
-#. <pounce type="action">
-#: src/dialogs.c:1365
+#: src/dialogs.c:1777
 #, fuzzy
 msgid "Pounce Action"
 msgstr "连接"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1788
 #, fuzzy
 msgid "Open IM Window"
 msgstr "即时消息窗口"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1797
 msgid "Popup Notification"
 msgstr ""
 
-#: src/dialogs.c:1394
+#: src/dialogs.c:1806
 #, fuzzy
 msgid "Send Message"
 msgstr "发送信息"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1827
 msgid "Execute command on pounce"
 msgstr "发现动静就执行命令"
 
-#: src/dialogs.c:1437
+#: src/dialogs.c:1849
 msgid "Play sound on pounce"
 msgstr "发现动静就播放声音"
 
-#. </pounce type="action">
-#: src/dialogs.c:1459
+#: src/dialogs.c:1871
 msgid "Save this pounce after activation"
 msgstr "下次发现仍然执行"
 
-#: src/dialogs.c:1545
+#: src/dialogs.c:1957
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 设定姓名地址录"
 
-#: src/dialogs.c:1554
+#: src/dialogs.c:1966
 msgid "Directory Info"
 msgstr "姓名地址录"
 
-#: src/dialogs.c:1576
+#: src/dialogs.c:1988
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允许从网页搜寻找到你的资料"
 
-#. Line 1
-#: src/dialogs.c:1579 src/dialogs.c:2284
+#: src/dialogs.c:1991 src/dialogs.c:2696
 msgid "First Name"
 msgstr "名"
 
-#. Line 2
-#: src/dialogs.c:1590 src/dialogs.c:2296
+#: src/dialogs.c:2002 src/dialogs.c:2708
 msgid "Middle Name"
 msgstr "字"
 
-#. Line 3
-#: src/dialogs.c:1602 src/dialogs.c:2308
+#: src/dialogs.c:2014 src/dialogs.c:2720
 msgid "Last Name"
 msgstr "姓"
 
-#. Line 4
-#: src/dialogs.c:1613 src/dialogs.c:2320
+#: src/dialogs.c:2025 src/dialogs.c:2732
 msgid "Maiden Name"
 msgstr "娘家姓"
 
-#. Line 6
-#: src/dialogs.c:1635 src/dialogs.c:2343
+#: src/dialogs.c:2047 src/dialogs.c:2755
 msgid "State"
 msgstr "省"
 
-#: src/dialogs.c:1700
+#: src/dialogs.c:2112
 msgid "New Passwords Do Not Match"
 msgstr "新密码不一致"
 
-#: src/dialogs.c:1700 src/dialogs.c:1705
+#: src/dialogs.c:2112 src/dialogs.c:2117
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - 更改密码错误"
 
-#: src/dialogs.c:1705
+#: src/dialogs.c:2117
 msgid "Fill out all fields completely"
 msgstr "把所有的表格都添了"
 
-#: src/dialogs.c:1760
+#: src/dialogs.c:2172
 msgid "Original Password"
 msgstr "旧密码"
 
-#: src/dialogs.c:1774
+#: src/dialogs.c:2186
 msgid "New Password"
 msgstr "新密码"
 
-#: src/dialogs.c:1788
+#: src/dialogs.c:2200
 msgid "New Password (again)"
 msgstr "新密码(确定)"
 
-#: src/dialogs.c:1829
+#: src/dialogs.c:2241
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 设定用户资料"
 
-#: src/dialogs.c:1941
+#: src/dialogs.c:2353
 msgid "Below are the results of your search: "
 msgstr "以下是你搜索的结果:"
 
-#: src/dialogs.c:2074 src/dialogs.c:2081
+#: src/dialogs.c:2486 src/dialogs.c:2493
 msgid "Permit"
 msgstr "允许"
 
-#: src/dialogs.c:2076 src/dialogs.c:2083
+#: src/dialogs.c:2488 src/dialogs.c:2495
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/dialogs.c:2120
+#: src/dialogs.c:2532
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 增加允许人"
 
-#: src/dialogs.c:2122
+#: src/dialogs.c:2534
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 增加禁止人"
 
-#: src/dialogs.c:2182
+#: src/dialogs.c:2594
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 记录对话内容"
 
-#: src/dialogs.c:2260 src/dialogs.c:2423
+#: src/dialogs.c:2672 src/dialogs.c:2835
 msgid "Search for Buddy"
 msgstr "搜寻朋友"
 
-#: src/dialogs.c:2388
+#: src/dialogs.c:2800
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 根据用户资料查寻朋友"
 
-#: src/dialogs.c:2417
+#: src/dialogs.c:2829
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 根据电邮查寻朋友"
 
-#: src/dialogs.c:2557
+#: src/dialogs.c:2969
 msgid "Gaim - Add URL"
 msgstr "Gaim - 增加 URL"
 
-#: src/dialogs.c:2708 src/dialogs.c:2729 src/dialogs.c:2783
+#: src/dialogs.c:3083 src/dialogs.c:3104 src/dialogs.c:3158
 msgid "Select Text Color"
 msgstr "设定文字颜色"
 
-#: src/dialogs.c:2762
+#: src/dialogs.c:3137
 msgid "Select Background Color"
 msgstr "设定背景颜色"
 
-#: src/dialogs.c:2984
+#: src/dialogs.c:3340
 msgid "Import to:"
 msgstr ""
 
-#: src/dialogs.c:3008
+#: src/dialogs.c:3364
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 导入朋友列表"
 
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3075
+#: src/dialogs.c:3431
 msgid "You cannot create an away message with a blank title"
 msgstr "暂时离开消息不能没有标题"
 
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3082
+#: src/dialogs.c:3438
 msgid "You cannot create an empty away message"
 msgstr "暂时离开消息不能为空"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3506
 msgid "Gaim - New away message"
 msgstr "Gaim - 更新暂时离开信息"
 
-#: src/dialogs.c:3160
+#: src/dialogs.c:3516
 msgid "New away message"
 msgstr "新的暂时离开信息"
 
-#: src/dialogs.c:3173
+#: src/dialogs.c:3529
 msgid "Away title: "
 msgstr "暂时离开标题:"
 
-#: src/dialogs.c:3212
+#: src/dialogs.c:3590
 msgid "Use"
 msgstr "使用"
 
-#: src/dialogs.c:3216
+#: src/dialogs.c:3594
 msgid "Save & Use"
 msgstr "保存并使用"
 
-#. show everything
-#: src/dialogs.c:3413
+#: src/dialogs.c:3791
 msgid "Smile!"
 msgstr "笑脸"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3844
 msgid "Alias Buddy"
 msgstr "给朋友取一个外号儿"
 
-#: src/dialogs.c:3499
+#: src/dialogs.c:3877
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 给朋友取一个外号儿"
 
-#: src/dialogs.c:3571
+#: src/dialogs.c:3949
 msgid "Gaim - Save Log File"
 msgstr "Gaim - 保存记录为……"
 
-#: src/dialogs.c:3603
-#, c-format
+#: src/dialogs.c:3981
+#, fuzzy, c-format
 msgid "Unable to remove file %s - %s"
-msgstr "不能删除文件 %s。"
-
-#: src/dialogs.c:3631
+msgstr "不能读入文件 %s。"
+
+# #: src/dialogs.c:3981
+# #, c-format
+# msgid "Unable to remove file %s - %s"
+# msgstr "不能删除文件 %s。"
+#: src/dialogs.c:4009
 msgid "Really clear log?"
 msgstr "真得要清楚记录?"
 
-#: src/dialogs.c:3646
+#: src/dialogs.c:4024
 msgid "Okay"
 msgstr "确定"
 
-#: src/dialogs.c:3817
+#: src/dialogs.c:4195
 #, fuzzy
 msgid "Date"
 msgstr "省"
 
-#: src/dialogs.c:3880
+#: src/dialogs.c:4258
 #, fuzzy
 msgid "Conversation"
 msgstr "对话"
 
-#: src/dialogs.c:3903
+#: src/dialogs.c:4281
 msgid "Clear"
 msgstr "清除"
 
-#: src/dialogs.c:3981
+#: src/dialogs.c:4363
 msgid "Gaim - Rename Group"
 msgstr "Gaim - 重命名组"
 
-#: src/dialogs.c:3991
+#: src/dialogs.c:4373
 msgid "Rename Group"
 msgstr "重命名组"
 
-#: src/dialogs.c:3998 src/dialogs.c:4104
+#: src/dialogs.c:4380 src/dialogs.c:4486
 msgid "New name:"
 msgstr "新名字:"
 
-#: src/dialogs.c:4087
+#: src/dialogs.c:4469
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - 重命名哥们儿"
 
-#: src/dialogs.c:4097
+#: src/dialogs.c:4479
 msgid "Rename Buddy"
 msgstr "重命名哥们儿"
 
-#. Below is basically stolen from plugins.c
-#: src/dialogs.c:4181
+#: src/dialogs.c:4563
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - 选择 Perl 脚本"
 
-#: src/gaimrc.c:1136
+#: src/gaimrc.c:1137
 #, c-format
 msgid "Could not open config file %s."
-msgstr "无法打开配置文件"
-
-#: src/gaimrc.c:1137
+msgstr ""
+
+# #: src/gaimrc.c:1137
+# #, c-format
+# msgid "Could not open config file %s."
+# msgstr "无法打开配置文件"
+#: src/gaimrc.c:1138
 msgid "Preferences Error"
 msgstr "选项错误"
 
@@ -2750,7 +2793,7 @@
 msgid "Browse"
 msgstr "浏览器"
 
-#: src/multi.c:513 src/prefs.c:1548
+#: src/multi.c:513 src/prefs.c:1343
 msgid "Reset"
 msgstr "重置"
 
@@ -2792,7 +2835,18 @@
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: src/multi.c:947
+#: src/multi.c:948
+msgid ""
+"You have attempted to login an IM account using the TOC protocol.  Because "
+"this protocol is inferior to OSCAR, it is now compiled as a plugin by "
+"default.  To login, edit this account to use OSCAR or load the TOC plugin."
+msgstr ""
+
+#: src/multi.c:952 src/multi.c:956
+msgid "Login Error"
+msgstr "登录错误"
+
+#: src/multi.c:954
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2801,70 +2855,66 @@
 "cannot log this account in; you do not have the protocol it uses loaded, or "
 "the protocol does not have a login function."
 
-#: src/multi.c:949
-msgid "Login Error"
-msgstr "登录错误"
-
-#: src/multi.c:978
+#: src/multi.c:985
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "你真的想删除 %s?"
 
-#: src/multi.c:1015
+#: src/multi.c:1022
 msgid "Gaim - Account Editor"
 msgstr "Gaim - 帐号编辑器"
 
-#: src/multi.c:1034
+#: src/multi.c:1041
 msgid "Select All"
 msgstr "全选"
 
-#: src/multi.c:1039
+#: src/multi.c:1046
 msgid "Select Autos"
 msgstr "选择自动回复消息"
 
-#: src/multi.c:1043
+#: src/multi.c:1050
 msgid "Select None"
 msgstr "全部不选"
 
-#: src/multi.c:1057
+#: src/multi.c:1064
 msgid "Modify"
 msgstr "修改"
 
-#: src/multi.c:1061
+#: src/multi.c:1068
 msgid "Sign On/Off"
 msgstr "登录/离开"
 
-#: src/multi.c:1065
+#: src/multi.c:1072
 msgid "Delete"
 msgstr "删除"
 
-#: src/multi.c:1380
+#: src/multi.c:1387
 #, c-format
 msgid ""
 "%s\n"
 "%s: %s"
 msgstr ""
 
-#: src/multi.c:1399
+#: src/multi.c:1406
 #, fuzzy, c-format
 msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s 无法登录: %s"
 
-#: src/multi.c:1410
+#: src/multi.c:1417
 #, fuzzy
 msgid "Notice"
 msgstr "声音"
 
-#: src/multi.c:1420
+#: src/multi.c:1427
 #, fuzzy, c-format
 msgid "%s has been signed off"
 msgstr ""
 "%s\n"
 "%s 无法登录: %s"
 
-#: src/multi.c:1421
+#: src/multi.c:1428
 #, fuzzy
 msgid "Connection Error"
 msgstr "连接已关闭"
@@ -2873,558 +2923,363 @@
 msgid "Perl Scripts"
 msgstr "Perl 脚本"
 
-#: src/plugins.c:113
+#: src/plugins.c:120
 msgid "Gaim - Plugin List"
 msgstr "Gaim - 插件列表"
 
-#: src/plugins.c:178
+#: src/plugins.c:205
 msgid "Gaim - Plugins"
 msgstr "Gaim - 插件"
 
-#. Left side: frame with list of plugin file names
-#: src/plugins.c:192
+#: src/plugins.c:221
 #, fuzzy
 msgid "Loaded Plugins"
 msgstr "载入插件"
 
-#: src/plugins.c:238
+#: src/plugins.c:265
+#, fuzzy
+msgid "Selected Plugin"
+msgstr "全选"
+
+#: src/plugins.c:308
 msgid "Filepath:"
 msgstr "文件路径:"
 
-#: src/plugins.c:256
+#: src/plugins.c:326
 msgid "Load"
 msgstr "加载"
 
-#: src/plugins.c:259
+#: src/plugins.c:329
 msgid "Load a plugin from a file"
 msgstr "从文件加载插件"
 
-#: src/plugins.c:261
+#: src/plugins.c:331
 msgid "Configure"
 msgstr "设定插件"
 
-#: src/plugins.c:264
+#: src/plugins.c:334
 msgid "Configure settings of the selected plugin"
 msgstr "配置选定的插件"
 
-#: src/plugins.c:266
+#: src/plugins.c:336
 msgid "Reload"
 msgstr "重新加载"
 
-#: src/plugins.c:270
+#: src/plugins.c:340
 msgid "Reload the selected plugin"
 msgstr "重新加载选中的插件"
 
-#: src/plugins.c:272
+#: src/plugins.c:342
 msgid "Unload"
 msgstr "卸载插件"
 
-#: src/plugins.c:275
+#: src/plugins.c:345
 msgid "Unload the selected plugin"
 msgstr "卸载选定的插件"
 
-#: src/plugins.c:280
+#: src/plugins.c:350
 msgid "Close this window"
 msgstr "在交谈窗口显示登录/登出信息"
 
-#: src/prefs.c:192
-msgid "General Options"
-msgstr "一般选项"
-
-#: src/prefs.c:200 src/prefs.c:384 src/prefs.c:552 src/prefs.c:667
-#: src/prefs.c:921 src/prefs.c:1071 src/prefs.c:1296 src/prefs.c:1629
-#: src/prefs.c:1901 src/prefs.c:2334
-msgid "All options take effect immediately unless otherwise noted."
-msgstr "如果没有意外,所有的设定马上生效"
-
-#: src/prefs.c:212
-msgid "Miscellaneous"
-msgstr "杂项"
-
-#: src/prefs.c:220
-msgid "Use borderless buttons"
-msgstr "使用无边框按钮"
-
-#: src/prefs.c:224
-msgid "Show Buddy Ticker"
-msgstr "显示朋友类别图形"
-
-#: src/prefs.c:229
-msgid "Show Debug Window"
-msgstr "显示 Debug 窗口"
-
-#. Preferences should be positive
-#: src/prefs.c:233
-msgid "Notify buddies that you are typing to them"
-msgstr ""
-
-#: src/prefs.c:240
-msgid "Report Idle Times"
-msgstr "报告发呆时间"
-
-#: src/prefs.c:248
-msgid "None"
-msgstr "无"
-
-#: src/prefs.c:249
-msgid "Gaim Use"
-msgstr "Gaim 使用"
-
-#: src/prefs.c:251
-msgid "X Use"
-msgstr "X 使用"
-
-#: src/prefs.c:262
-msgid "Log all conversations"
-msgstr "记录所有对话内容"
-
-#: src/prefs.c:263
-msgid "Strip HTML from logs"
-msgstr "清除记录文件内的 HTML 标记"
-
 #: src/prefs.c:269
-msgid "Log when buddies sign on/sign off"
-msgstr "记录哥们儿登录/退出时间"
-
-#: src/prefs.c:271
-msgid "Log when buddies become idle/un-idle"
-msgstr "记录哥们儿什么时候发呆,什么时候清醒"
-
-#: src/prefs.c:273
-msgid "Log when buddies go away/come back"
-msgstr "记录哥们儿什么时候离开,什么时候回来"
-
-#: src/prefs.c:274
-msgid "Log your own signons/idleness/awayness"
-msgstr "记录自己何时登录/发呆/离开"
-
-#: src/prefs.c:276
-msgid "Individual log file for each buddy's signons"
-msgstr "每一个哥们儿使用不同的记录文件"
+#, fuzzy
+msgid "Windows"
+msgstr "即时消息窗口"
 
 #: src/prefs.c:279
-msgid "Browser"
-msgstr "浏览器"
-
-#: src/prefs.c:291
-msgid "Konqueror"
-msgstr ""
-
-#: src/prefs.c:292
-msgid "Opera"
-msgstr ""
-
-#: src/prefs.c:293
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/prefs.c:294
-msgid "Mozilla"
-msgstr ""
-
-#: src/prefs.c:297
-msgid "Pop up new window by default"
-msgstr "缺省弹出新窗口"
-
-#: src/prefs.c:304
-msgid "GNOME URL Handler"
-msgstr "GNOME URL Handler"
-
-#: src/prefs.c:306
-msgid "Galeon"
+msgid "Show Buddy Ticker"
+msgstr "显示朋友类别图形"
+
+#: src/prefs.c:280
+msgid "Show Debug Window"
+msgstr "显示 Debug 窗口"
+
+#: src/prefs.c:284 src/prefs.c:306
+#, fuzzy
+msgid "Style"
+msgstr "字体样式"
+
+#: src/prefs.c:290
+msgid "Use borderless buttons"
+msgstr "使用无边框按钮"
+
+#: src/prefs.c:315
+#, fuzzy
+msgid "Strikethough"
+msgstr "划掉的文字"
+
+#: src/prefs.c:319
+#, fuzzy
+msgid "Face"
+msgstr "取消"
+
+#: src/prefs.c:327
+#, fuzzy
+msgid "Use custom face"
+msgstr "插入笑脸图形"
+
+#: src/prefs.c:331 src/prefs.c:370 src/prefs.c:391
+msgid "Select"
+msgstr "选择"
+
+#: src/prefs.c:345
+msgid "Use custom size"
 msgstr ""
 
-#: src/prefs.c:307
-#, c-format
-msgid "Manual (%s for URL)"
-msgstr ""
-
-#: src/prefs.c:376
-msgid "Proxy Options"
-msgstr "代理服务器选项"
-
-#: src/prefs.c:388
-msgid ""
-"Not all protocols can use these proxy options. Please see the README file "
-"for details."
-msgstr "不是所有的协议都使用这些代理服务器设置,详情请参阅 README 文件。"
-
-#: src/prefs.c:393
-msgid "Proxy Type"
-msgstr "代理服务器类型"
-
-#: src/prefs.c:405
-msgid "Proxy Server"
-msgstr "代理服务器设置"
-
-#: src/prefs.c:408
-msgid "No Proxy"
-msgstr "无代理服务器"
-
-#: src/prefs.c:420
+#: src/prefs.c:363
+#, fuzzy
+msgid "Text color"
+msgstr "文字颜色"
+
+#: src/prefs.c:385
 #, fuzzy
-msgid "SOCKS 4"
-msgstr "SOCKS v4 代理"
-
-#: src/prefs.c:430
-msgid "SOCKS 5"
-msgstr ""
+msgid "Background color"
+msgstr "背景颜色"
+
+#: src/prefs.c:423
+msgid "Show graphical smileys"
+msgstr "显示图形笑脸"
+
+#: src/prefs.c:424
+msgid "Show timestamp on messages"
+msgstr "在信息里显示时间"
+
+#: src/prefs.c:425
+msgid "Show URLs as links"
+msgstr "以超连接方式显示 URL"
+
+#: src/prefs.c:426
+msgid "Highlight misspelled words"
+msgstr "高亮显示拼错的单词"
+
+#: src/prefs.c:436
+msgid "Ignore colors"
+msgstr "忽略收到消息的颜色标记"
+
+#: src/prefs.c:437
+msgid "Ignore font faces"
+msgstr "忽略收到消息的字体标记"
+
+#: src/prefs.c:438
+msgid "Ignore font sizes"
+msgstr "忽略收到消息的字体大小设置"
 
 #: src/prefs.c:439
-msgid "HTTP"
-msgstr ""
-
-#: src/prefs.c:463
-msgid "Host"
-msgstr "主机地址"
-
-#: src/prefs.c:479
-msgid "Port"
-msgstr "端口"
-
-#: src/prefs.c:496
-msgid "User"
-msgstr "登录用户"
-
-#: src/prefs.c:512
-msgid "Password"
-msgstr "登录密码"
-
-#: src/prefs.c:544
-msgid "Buddy List Options"
-msgstr "朋友列表选项"
-
-#: src/prefs.c:556
-msgid "Buddy List Window"
-msgstr "朋友列表窗口"
-
-#: src/prefs.c:569
-#, fuzzy
-msgid "Tab Placement:"
-msgstr "对话活页位置"
-
-#: src/prefs.c:573 src/prefs.c:1004 src/prefs.c:1154
-msgid "Top"
-msgstr "顶端"
-
-#: src/prefs.c:574 src/prefs.c:1006 src/prefs.c:1156
-msgid "Bottom"
-msgstr "底端"
-
-#: src/prefs.c:586
-msgid "Hide IM/Info/Chat buttons"
-msgstr "隐藏 消息/信息/聊天 按钮"
-
-#: src/prefs.c:588
-msgid "Automatically show buddy list on sign on"
-msgstr "登录后自动显示朋友列表"
-
-#: src/prefs.c:590
-msgid "Display Buddy List near applet"
-msgstr "在 applet 附近显示朋友列表"
-
-#: src/prefs.c:593
-msgid "Save Window Size/Position"
-msgstr "保存窗口的大小和位置"
-
-#: src/prefs.c:596
-msgid "Show pictures on buttons"
-msgstr "在按钮上显示图形"
-
-#: src/prefs.c:600
-msgid "Raise Buddy List on Signons and Signoffs"
-msgstr ""
-
-#: src/prefs.c:602
-msgid "Group Displays"
-msgstr "朋友组显示"
-
-#: src/prefs.c:614
-msgid "Hide groups with no online buddies"
-msgstr "隐藏没有哥们儿登录的组"
-
-#: src/prefs.c:620
-msgid "Show numbers in groups"
-msgstr "在组里显示号码"
-
-#: src/prefs.c:622
-msgid "Buddy Displays"
-msgstr "朋友列表显示"
-
-#: src/prefs.c:634
-msgid "Show buddy type icons"
-msgstr "显示朋友类别图形"
-
-#: src/prefs.c:635
-msgid "Show warning levels"
-msgstr "显示警告级别"
-
-#: src/prefs.c:641
-msgid "Show idle times"
-msgstr "显示空转时间"
-
-#: src/prefs.c:642
-msgid "Grey idle buddies"
-msgstr ""
-
-#: src/prefs.c:659
-msgid "Conversation Options"
-msgstr "对话选项"
-
-#: src/prefs.c:671
-msgid "Keyboard Options"
-msgstr "键盘选项"
-
-#: src/prefs.c:683
+msgid "Ignore TiK Automated Messages"
+msgstr "忽略自动生成的消息"
+
+#: src/prefs.c:459
 msgid "Enter sends message"
 msgstr "单击 Enter 键发送信息"
 
-#: src/prefs.c:684
+#: src/prefs.c:460
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Enter 健发送信息"
 
-#: src/prefs.c:685
+#: src/prefs.c:469
 msgid "Escape closes window"
 msgstr "ESC 健关闭窗口"
 
-#: src/prefs.c:686
+#: src/prefs.c:470
 #, fuzzy
 msgid "Control-W closes window"
 msgstr "ESC 健关闭窗口"
 
-#: src/prefs.c:692
+#: src/prefs.c:480
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S} 插入 HTML 标记"
 
-#: src/prefs.c:693
+#: src/prefs.c:481
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-数字 插入笑脸图标"
 
-#: src/prefs.c:694
-msgid "F2 toggles timestamp display"
-msgstr "F2 切换时间戳显示"
-
-#: src/prefs.c:696
-msgid "Display and General Options"
-msgstr "显示和一般选项"
-
-#: src/prefs.c:708
-msgid "Show graphical smileys"
-msgstr "显示图形笑脸"
-
-#: src/prefs.c:709
-msgid "Show timestamp on messages"
-msgstr "在信息里显示时间"
-
-#: src/prefs.c:710
-msgid "Show URLs as links"
-msgstr "以超连接方式显示 URL"
-
-#: src/prefs.c:711
-msgid "Highlight misspelled words"
-msgstr "高亮显示拼错的单词"
-
-#: src/prefs.c:712 src/prefs.c:1923
-msgid "Sending messages removes away status"
-msgstr "发出信息时自动取消暂时离开状态"
-
-#: src/prefs.c:713 src/prefs.c:1936
-msgid "Queue new messages when away"
-msgstr "暂时离开时收到的消息放到队列里"
-
-#: src/prefs.c:719
-msgid "Ignore colors"
-msgstr "忽略收到消息的颜色标记"
-
-#: src/prefs.c:720
-msgid "Ignore font faces"
-msgstr "忽略收到消息的字体标记"
-
-#: src/prefs.c:721
-msgid "Ignore font sizes"
-msgstr "忽略收到消息的字体大小设置"
-
-#: src/prefs.c:722
-msgid "Ignore TiK Automated Messages"
-msgstr "忽略自动生成的消息"
-
-#: src/prefs.c:723 src/prefs.c:1921
-msgid "Ignore new conversations when away"
-msgstr "暂时离开时,忽略新的对话"
-
-#: src/prefs.c:912
-msgid "IM Options"
-msgstr "即时消息选项"
-
-#: src/prefs.c:925 src/prefs.c:2921
-msgid "IM Window"
-msgstr "即时消息窗口"
-
-#: src/prefs.c:941 src/prefs.c:1091
-msgid "Show buttons as: "
-msgstr "按钮显示设置:"
-
-#: src/prefs.c:945 src/prefs.c:1096
-msgid "Pictures And Text"
-msgstr "图形和文字"
-
-#: src/prefs.c:946 src/prefs.c:1098
-msgid "Pictures"
-msgstr "图形"
-
-#: src/prefs.c:947 src/prefs.c:1099
-msgid "Text"
-msgstr "文字"
-
-#: src/prefs.c:958
-msgid "Show all conversations in one tabbed window"
-msgstr "在一个活页窗口中显示所有对话"
-
-#: src/prefs.c:960
-msgid "Show chats in the same tabbed window"
-msgstr "在同一个一个活页窗口中显示对话"
-
-#: src/prefs.c:967 src/prefs.c:1119
+#: src/prefs.c:500
+msgid "Hide IM/Info/Chat buttons"
+msgstr "隐藏 消息/信息/聊天 按钮"
+
+#: src/prefs.c:501
+msgid "Show pictures on buttons"
+msgstr "在按钮上显示图形"
+
+#: src/prefs.c:511
+msgid "Automatically show buddy list on sign on"
+msgstr "登录后自动显示朋友列表"
+
+#: src/prefs.c:513
+msgid "Display Buddy List near applet"
+msgstr "在 applet 附近显示朋友列表"
+
+#: src/prefs.c:516
+msgid "Save Window Size/Position"
+msgstr "保存窗口的大小和位置"
+
+#: src/prefs.c:517
+#, fuzzy
+msgid "Raise Window on Events"
+msgstr "有事件发生时提升窗口"
+
+#: src/prefs.c:526
+msgid "Hide groups with no online buddies"
+msgstr "隐藏没有哥们儿登录的组"
+
+#: src/prefs.c:527
+msgid "Show numbers in groups"
+msgstr "在组里显示号码"
+
+#: src/prefs.c:536
+msgid "Show buddy type icons"
+msgstr "显示朋友类别图形"
+
+#: src/prefs.c:537
+msgid "Show warning levels"
+msgstr "显示警告级别"
+
+#: src/prefs.c:538
+msgid "Show idle times"
+msgstr "显示空转时间"
+
+#: src/prefs.c:539
+msgid "Grey idle buddies"
+msgstr ""
+
+#: src/prefs.c:568 src/prefs.c:630
+msgid "New window width:"
+msgstr "新的窗口宽度设定:"
+
+#: src/prefs.c:569 src/prefs.c:631
+msgid "New window height:"
+msgstr "新的窗口高度设定:"
+
+#: src/prefs.c:570 src/prefs.c:632
+msgid "Entry widget height:"
+msgstr "输入窗口高度:"
+
+#: src/prefs.c:571 src/prefs.c:633
 msgid "Raise windows on events"
 msgstr "有事件发生时提升窗口"
 
-#: src/prefs.c:968
-msgid "Show logins in window"
-msgstr "在交谈窗口显示登录/登出信息"
-
-#: src/prefs.c:969
-#, fuzzy
-msgid "Show aliases in tabs/titles/ticker"
-msgstr "在窗口或活页的标题中显示外号儿"
-
-#: src/prefs.c:970
+#: src/prefs.c:572
 msgid "Hide window on send"
 msgstr "发出消息后隐藏窗口"
 
-#: src/prefs.c:972 src/prefs.c:1122
-msgid "Window Sizes"
-msgstr "窗口大小设定"
-
-#: src/prefs.c:980 src/prefs.c:1130
-msgid "New window width:"
-msgstr "新的窗口宽度设定:"
-
-#: src/prefs.c:981 src/prefs.c:1131
-msgid "New window height:"
-msgstr "新的窗口高度设定:"
-
-#: src/prefs.c:982 src/prefs.c:1132
-msgid "Entry widget height:"
-msgstr "输入窗口高度:"
-
-#: src/prefs.c:984 src/prefs.c:1134
-msgid "Tab Placement"
-msgstr "对话活页位置"
-
-#: src/prefs.c:1013 src/prefs.c:1163
-msgid "Left"
-msgstr "左边"
-
-#: src/prefs.c:1015 src/prefs.c:1165
-msgid "Right"
-msgstr "右边"
-
-#: src/prefs.c:1019
-msgid "Buddy Icons"
-msgstr "朋友图标"
-
-#: src/prefs.c:1031
+#: src/prefs.c:581
 msgid "Hide Buddy Icons"
 msgstr "隐藏哥们儿们的图标"
 
-#: src/prefs.c:1037
+#: src/prefs.c:582
 #, fuzzy
 msgid "Disable Buddy Icon Animation"
 msgstr "打开声音"
 
-#: src/prefs.c:1063
-msgid "Chat Options"
-msgstr "聊天选项"
-
-#: src/prefs.c:1075
-msgid "Group Chat Window"
-msgstr "组聊天窗口"
-
-#: src/prefs.c:1110
-msgid "Show all chats in one tabbed window"
-msgstr "在一个活页窗口中显示所有聊天"
-
-#: src/prefs.c:1112
-msgid "Show conversations in the same tabbed window"
-msgstr "在一个活页窗口中显示所有对话"
-
-#: src/prefs.c:1120
-msgid "Show people joining/leaving in window"
-msgstr "在窗口中显示人们加入/离开的信息"
-
-#: src/prefs.c:1168
-msgid "Tab Completion"
-msgstr "TAB 键自动补全"
-
-#: src/prefs.c:1180
+#: src/prefs.c:591
+msgid "Show logins in window"
+msgstr "在交谈窗口显示登录/登出信息"
+
+#: src/prefs.c:600
+msgid "Notify buddies that you are typing to them"
+msgstr ""
+
+#: src/prefs.c:642
 msgid "Tab-Complete Nicks"
 msgstr "TAB 键自动补全昵称"
 
-#: src/prefs.c:1186
+#: src/prefs.c:643
 msgid "Old-Style Tab Completion"
 msgstr "老式的 TAB 键自动补全"
 
-#: src/prefs.c:1288 src/prefs.c:2931
-msgid "Font Options"
-msgstr "字体选项"
-
-#: src/prefs.c:1314
-msgid "Italic Text"
-msgstr "斜体文字"
-
-#: src/prefs.c:1358 src/prefs.c:1376 src/prefs.c:1398
-msgid "Select"
-msgstr "选择"
-
-#: src/prefs.c:1396
-msgid "Font Face for Text"
-msgstr "文字的字型"
-
-#: src/prefs.c:1411
-msgid "Font Size for Text"
-msgstr "文字的字体大小"
-
-#: src/prefs.c:1508
-msgid "Gaim - Sound Configuration"
-msgstr "Gaim - 声音设置"
-
-#: src/prefs.c:1543
+#: src/prefs.c:652
+msgid "Show people joining/leaving in window"
+msgstr "在窗口中显示人们加入/离开的信息"
+
+#: src/prefs.c:653
+msgid "Colorize screennames"
+msgstr ""
+
+#: src/prefs.c:678
+#, fuzzy
+msgid ""
+"Show all Instant Messages in one tabbed\n"
+"window"
+msgstr "在一个活页窗口中显示所有聊天"
+
+#: src/prefs.c:679
+#, fuzzy
+msgid "Show aliases in tabs/titles"
+msgstr "在窗口或活页的标题中显示外号儿"
+
+#: src/prefs.c:694
+msgid "Show all chats in one tabbed window"
+msgstr "在一个活页窗口中显示所有聊天"
+
+#: src/prefs.c:704
 #, fuzzy
-msgid "Test"
-msgstr "文字"
-
-#: src/prefs.c:1553
-msgid "Choose..."
-msgstr "选择"
-
-#: src/prefs.c:1621
-msgid "Sound Options"
-msgstr "声音选项"
-
-#: src/prefs.c:1649
+msgid ""
+"Show IMs and chats in same tabbed\n"
+"window."
+msgstr "在同一个一个活页窗口中显示对话"
+
+#: src/prefs.c:751
+msgid "Proxy Server"
+msgstr "代理服务器设置"
+
+#: src/prefs.c:768
+msgid "Host"
+msgstr "主机地址"
+
+#: src/prefs.c:784
+msgid "Port"
+msgstr "端口"
+
+#: src/prefs.c:801
+msgid "User"
+msgstr "登录用户"
+
+#: src/prefs.c:817
+msgid "Password"
+msgstr "登录密码"
+
+#: src/prefs.c:877
+#, fuzzy
+msgid "Open new window by default"
+msgstr "缺省弹出新窗口"
+
+#: src/prefs.c:896
+msgid "Log all conversations"
+msgstr "记录所有对话内容"
+
+#: src/prefs.c:897
+msgid "Strip HTML from logs"
+msgstr "清除记录文件内的 HTML 标记"
+
+#: src/prefs.c:906
+msgid "Log when buddies sign on/sign off"
+msgstr "记录哥们儿登录/退出时间"
+
+#: src/prefs.c:908
+msgid "Log when buddies become idle/un-idle"
+msgstr "记录哥们儿什么时候发呆,什么时候清醒"
+
+#: src/prefs.c:910
+msgid "Log when buddies go away/come back"
+msgstr "记录哥们儿什么时候离开,什么时候回来"
+
+#: src/prefs.c:911
+msgid "Log your own signons/idleness/awayness"
+msgstr "记录自己何时登录/发呆/离开"
+
+#: src/prefs.c:913
+msgid "Individual log file for each buddy's signons"
+msgstr "每一个哥们儿使用不同的记录文件"
+
+#: src/prefs.c:956
 msgid "No sounds when you log in"
 msgstr "悄悄地进去,打枪地不要"
 
-#: src/prefs.c:1655 src/prefs.c:1922
+#: src/prefs.c:957
 msgid "Sounds while away"
 msgstr "离开时的声音"
 
-#: src/prefs.c:1665
-#, fuzzy
-msgid "Sound method"
-msgstr "声音"
-
-#: src/prefs.c:1739
+#: src/prefs.c:994
 #, fuzzy, c-format
 msgid ""
 "Sound command\n"
@@ -3433,107 +3288,125 @@
 "播放声音的命令\n"
 "(声音文件完整路径使用 %s; 如果为空则使用内部命令)"
 
-#: src/prefs.c:1751
-#, fuzzy
-msgid "Sound played when:"
-msgstr "声音播放器:"
-
-#: src/prefs.c:1893 src/prefs.c:2953
-msgid "Away Messages"
-msgstr "暂时离开信息"
-
-#: src/prefs.c:1930
+#: src/prefs.c:1036
+msgid "Sending messages removes away status"
+msgstr "发出信息时自动取消暂时离开状态"
+
+#: src/prefs.c:1037
+msgid "Queue new messages when away"
+msgstr "暂时离开时收到的消息放到队列里"
+
+#: src/prefs.c:1038
+msgid "Ignore new conversations when away"
+msgstr "暂时离开时,忽略新的对话"
+
+#: src/prefs.c:1050
+msgid "Seconds before resending:"
+msgstr ""
+
+#: src/prefs.c:1053
 msgid "Don't send auto-response"
 msgstr "不要发送自动回复"
 
-#: src/prefs.c:1931
+#: src/prefs.c:1054
 msgid "Only send auto-response when idle"
 msgstr "只有在发呆的时候才发送自动回复"
 
-#: src/prefs.c:1946
-msgid "Time between sending auto-responses (in seconds):"
-msgstr "发送自动回复的间隔 (秒):"
-
-#: src/prefs.c:1961
-msgid "Auto Away after"
-msgstr "自动在"
-
-#: src/prefs.c:1975
-msgid "minutes using"
-msgstr "分钟时使用"
-
-#: src/prefs.c:1988
-msgid "Messages"
-msgstr "消息设置"
-
-#: src/prefs.c:2045
+#: src/prefs.c:1081
+msgid "Set away when idle"
+msgstr ""
+
+#: src/prefs.c:1190
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - 声音设置"
+
+#: src/prefs.c:1338
+#, fuzzy
+msgid "Test"
+msgstr "文字"
+
+#: src/prefs.c:1348
+msgid "Choose..."
+msgstr "选择"
+
+#: src/prefs.c:1586
+#, fuzzy
+msgid "_Edit"
+msgstr "编辑"
+
+#: src/prefs.c:1589
 msgid "Edit"
 msgstr "编辑"
 
-#: src/prefs.c:2049
-msgid "Make Away"
-msgstr "立即设定为暂时离开"
-
-#: src/prefs.c:2326
-msgid "Privacy Options"
-msgstr "个人隐私选项"
-
-#: src/prefs.c:2342
-msgid "Set privacy for:"
-msgstr "设置隐私选项为:"
-
-#: src/prefs.c:2361
-msgid "Allow all users to contact me"
-msgstr "允许所有的用户和我联系"
-
-#: src/prefs.c:2362
-msgid "Allow only the users below"
-msgstr "只允许如下用户和我联系"
-
-#: src/prefs.c:2364
-msgid "Allow List"
-msgstr "允许的用户列表"
-
-#: src/prefs.c:2395
-msgid "Deny all users"
-msgstr "拒绝所有用户和我联系"
-
-#: src/prefs.c:2396
-msgid "Block the users below"
-msgstr "堵住这些家伙的嘴"
-
-#: src/prefs.c:2398
-msgid "Block List"
-msgstr "被堵住嘴的家伙"
-
-#: src/prefs.c:2493
+#: src/prefs.c:1655
+msgid "Interface"
+msgstr ""
+
+#: src/prefs.c:1656
+#, fuzzy
+msgid "Fonts"
+msgstr "字型"
+
+#: src/prefs.c:1657
+#, fuzzy
+msgid "Message Text"
+msgstr "消息设置"
+
+#: src/prefs.c:1658
+msgid "Shortcuts"
+msgstr ""
+
+#: src/prefs.c:1660
+msgid "IM Window"
+msgstr "即时消息窗口"
+
+#: src/prefs.c:1661
+#, fuzzy
+msgid "Chat Window"
+msgstr "组聊天窗口"
+
+#: src/prefs.c:1662
+msgid "Tabs"
+msgstr ""
+
+#: src/prefs.c:1663
+msgid "Proxy"
+msgstr "代理服务器"
+
+#: src/prefs.c:1664
+msgid "Browser"
+msgstr "浏览器"
+
+#: src/prefs.c:1667
+msgid "Sounds"
+msgstr "声音"
+
+#: src/prefs.c:1668
+#, fuzzy
+msgid "Sound Events"
+msgstr "事件声效"
+
+#: src/prefs.c:1669
+#, fuzzy
+msgid "Away / Idle"
+msgstr "暂时离开标题:"
+
+#: src/prefs.c:1670
+msgid "Away Messages"
+msgstr "暂时离开信息"
+
+#: src/prefs.c:1731
 msgid "Gaim - Preferences"
 msgstr "Gaim - 设定"
 
-#: src/prefs.c:2576
+#: src/prefs.c:1841
+msgid "Apply"
+msgstr ""
+
+#: src/prefs.c:1890
 msgid "Gaim debug output window"
 msgstr "Gaim 除虫输出窗口"
 
-#: src/prefs.c:2887
-msgid "General"
-msgstr "一般设定"
-
-#: src/prefs.c:2892
-msgid "Proxy"
-msgstr "代理服务器"
-
-#: src/prefs.c:2916
-msgid "Conversations"
-msgstr "对话"
-
-#: src/prefs.c:2942
-msgid "Sounds"
-msgstr "声音"
-
-#: src/prefs.c:2964
-msgid "Privacy"
-msgstr "隐私"
-
 #: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
@@ -3546,60 +3419,73 @@
 msgid "Protocol Error"
 msgstr "协议错误"
 
-#: src/prpl.c:93
+#: src/prpl.c:79
+msgid ""
+"Gaim has loaded the ICQ plugin.  This plugin has been deprecated. As such, "
+"it was probably not compiled from the same version of the source as this "
+"application was, and cannot be guaranteed to work.  It is reccomended that "
+"you use the AIM/ICQ protocol to connect to ICQ"
+msgstr ""
+
+#: src/prpl.c:83
+#, fuzzy
+msgid "Protocol Warning"
+msgstr "协议动作"
+
+#: src/prpl.c:101
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s 曾经使用 %s,但是现在已经被删除了。%s 现在离线。"
 
-#: src/prpl.c:96
+#: src/prpl.c:104
 msgid "Disconnect"
 msgstr "断开"
 
-#: src/prpl.c:133
+#: src/prpl.c:141
 msgid "Accept?"
 msgstr "接受?"
 
-#: src/prpl.c:199
+#: src/prpl.c:207
 msgid "Gaim - Prompt"
 msgstr "Gaim - 提示"
 
-#: src/prpl.c:419
+#: src/prpl.c:427
 #, fuzzy
 msgid "Gaim - New Mail"
 msgstr "Gaim - 发送文件"
 
-#: src/prpl.c:445
+#: src/prpl.c:453
 msgid "Open Mail"
 msgstr ""
 
-#: src/prpl.c:570
+#: src/prpl.c:578
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s has made %s their buddy%s%s"
 
-#: src/prpl.c:578
+#: src/prpl.c:586
 msgid ""
 "\n"
 "\n"
 "Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/prpl.c:621
+#: src/prpl.c:629
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr ""
 
-#: src/prpl.c:658
+#: src/prpl.c:666
 #, fuzzy
 msgid "Gaim - Registration"
 msgstr "Gaim - 新用户注册"
 
-#: src/prpl.c:673
+#: src/prpl.c:681
 msgid "Registration Information"
 msgstr ""
 
-#: src/prpl.c:690
+#: src/prpl.c:698
 msgid "Register"
 msgstr "注册"
 
@@ -3607,29 +3493,29 @@
 msgid "Please enter your password"
 msgstr "请输入您的登录口令"
 
-#: src/server.c:585
+#: src/server.c:610
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d 条消息)"
 
-#: src/server.c:591
+#: src/server.c:616
 msgid "(1 message)"
 msgstr "(1 条消息):"
 
-#: src/server.c:783
+#: src/server.c:808
 #, fuzzy
 msgid "Warned"
 msgstr "警告"
 
-#: src/server.c:876
+#: src/server.c:901
 msgid "Yes"
 msgstr "Yes"
 
-#: src/server.c:877
+#: src/server.c:902
 msgid "No"
 msgstr "No"
 
-#: src/server.c:1076
+#: src/server.c:1101
 #, fuzzy
 msgid "More Info"
 msgstr "用户详细资料"
@@ -3679,6 +3565,174 @@
 msgid "Someone says your name in chat"
 msgstr ""
 
+#~ msgid "General Options"
+#~ msgstr "一般选项"
+
+#~ msgid "All options take effect immediately unless otherwise noted."
+#~ msgstr "如果没有意外,所有的设定马上生效"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "杂项"
+
+#~ msgid "Report Idle Times"
+#~ msgstr "报告发呆时间"
+
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgid "Gaim Use"
+#~ msgstr "Gaim 使用"
+
+#~ msgid "X Use"
+#~ msgstr "X 使用"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "GNOME URL Handler"
+#~ msgstr "GNOME URL Handler"
+
+#~ msgid "Proxy Options"
+#~ msgstr "代理服务器选项"
+
+#~ msgid ""
+#~ "Not all protocols can use these proxy options. Please see the README file "
+#~ "for details."
+#~ msgstr "不是所有的协议都使用这些代理服务器设置,详情请参阅 README 文件。"
+
+#~ msgid "Proxy Type"
+#~ msgstr "代理服务器类型"
+
+#~ msgid "No Proxy"
+#~ msgstr "无代理服务器"
+
+#, fuzzy
+#~ msgid "SOCKS 4"
+#~ msgstr "SOCKS v4 代理"
+
+#~ msgid "Buddy List Options"
+#~ msgstr "朋友列表选项"
+
+#~ msgid "Buddy List Window"
+#~ msgstr "朋友列表窗口"
+
+#, fuzzy
+#~ msgid "Tab Placement:"
+#~ msgstr "对话活页位置"
+
+#~ msgid "Top"
+#~ msgstr "顶端"
+
+#~ msgid "Bottom"
+#~ msgstr "底端"
+
+#~ msgid "Group Displays"
+#~ msgstr "朋友组显示"
+
+#~ msgid "Buddy Displays"
+#~ msgstr "朋友列表显示"
+
+#~ msgid "Conversation Options"
+#~ msgstr "对话选项"
+
+#~ msgid "Keyboard Options"
+#~ msgstr "键盘选项"
+
+#~ msgid "F2 toggles timestamp display"
+#~ msgstr "F2 切换时间戳显示"
+
+#~ msgid "Display and General Options"
+#~ msgstr "显示和一般选项"
+
+#~ msgid "IM Options"
+#~ msgstr "即时消息选项"
+
+#~ msgid "Show buttons as: "
+#~ msgstr "按钮显示设置:"
+
+#~ msgid "Pictures And Text"
+#~ msgstr "图形和文字"
+
+#~ msgid "Pictures"
+#~ msgstr "图形"
+
+#~ msgid "Text"
+#~ msgstr "文字"
+
+#~ msgid "Show all conversations in one tabbed window"
+#~ msgstr "在一个活页窗口中显示所有对话"
+
+#~ msgid "Window Sizes"
+#~ msgstr "窗口大小设定"
+
+#~ msgid "Tab Placement"
+#~ msgstr "对话活页位置"
+
+#~ msgid "Left"
+#~ msgstr "左边"
+
+#~ msgid "Right"
+#~ msgstr "右边"
+
+#~ msgid "Buddy Icons"
+#~ msgstr "朋友图标"
+
+#~ msgid "Chat Options"
+#~ msgstr "聊天选项"
+
+#~ msgid "Show conversations in the same tabbed window"
+#~ msgstr "在一个活页窗口中显示所有对话"
+
+#~ msgid "Tab Completion"
+#~ msgstr "TAB 键自动补全"
+
+#~ msgid "Font Options"
+#~ msgstr "字体选项"
+
+#~ msgid "Italic Text"
+#~ msgstr "斜体文字"
+
+#~ msgid "Font Face for Text"
+#~ msgstr "文字的字型"
+
+#~ msgid "Font Size for Text"
+#~ msgstr "文字的字体大小"
+
+#~ msgid "Sound Options"
+#~ msgstr "声音选项"
+
+#, fuzzy
+#~ msgid "Sound method"
+#~ msgstr "声音"
+
+#, fuzzy
+#~ msgid "Sound played when:"
+#~ msgstr "声音播放器:"
+
+#~ msgid "Time between sending auto-responses (in seconds):"
+#~ msgstr "发送自动回复的间隔 (秒):"
+
+#~ msgid "Auto Away after"
+#~ msgstr "自动在"
+
+#~ msgid "minutes using"
+#~ msgstr "分钟时使用"
+
+#~ msgid "Messages"
+#~ msgstr "消息设置"
+
+#~ msgid "Make Away"
+#~ msgstr "立即设定为暂时离开"
+
+#~ msgid "Privacy Options"
+#~ msgstr "个人隐私选项"
+
+#~ msgid "General"
+#~ msgstr "一般设定"
+
+#~ msgid "Conversations"
+#~ msgstr "对话"
+
 #~ msgid "Enable sounds"
 #~ msgstr "打开声音"
 
@@ -3688,9 +3742,6 @@
 #~ msgid "Manual"
 #~ msgstr "用户手册"
 
-#~ msgid "Events"
-#~ msgstr "事件声效"
-
 #~ msgid "Sound when buddy logs in"
 #~ msgstr "朋友登录声"
 
@@ -3779,9 +3830,6 @@
 #~ msgid "Tabbed Window Options"
 #~ msgstr "活页窗口选项"
 
-#~ msgid "Font Style"
-#~ msgstr "字体样式"
-
 #~ msgid "Underlined Text"
 #~ msgstr "下加线文字"