diff po/zh_CN.po @ 1638:f2645224b30a

[gaim-migrate @ 1648] I guess we should update configure.in and doc/gaim.1 :-) committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Fri, 23 Mar 2001 18:01:53 +0000
parents 0af0a11af61e
children a0b1609d28fe
line wrap: on
line diff
--- a/po/zh_CN.po	Fri Mar 23 17:34:03 2001 +0000
+++ b/po/zh_CN.po	Fri Mar 23 18:01:53 2001 +0000
@@ -3,11 +3,10 @@
 # Hashao <hashao@china.com>, 2000.
 # 
 # 请随便修正,添加,更新,领功。我没有毅力长期维护。多谢
-#: src/gnome_applet_mgr.c:256
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2000-12-03 23:24-0800\n"
+"POT-Creation-Date: 2001-03-23 09:31-0800\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"
@@ -15,12 +14,61 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:72
+#: plugins/icq/gaim_icq.c:394 src/oscar.c:2236 src/toc.c:917
+#, fuzzy
+msgid "Get Info"
+msgstr "用户详细资料"
+
+#: plugins/yay/yay.c:169
+#, fuzzy
+msgid "Your message did not get sent."
+msgstr "发出信息声"
+
+#: plugins/yay/yay.c:169 src/dialogs.c:3030 src/dialogs.c:3037
+#: src/oscar.c:1294 src/oscar.c:1299 src/oscar.c:1335 src/oscar.c:1354
+#: src/oscar.c:1390
+#, fuzzy
+msgid "Gaim - Error"
+msgstr "Gaim - 错误 %d"
+
+#: plugins/yay/yay.c:187
+#, c-format
+msgid "%s has made %s their buddy%s%s"
+msgstr ""
+
+#: plugins/yay/yay.c:189
+#, fuzzy
+msgid "Gaim - Buddy"
+msgstr "Gaim - 增加朋友"
+
+#: plugins/yay/yay.c:233 src/about.c:169 src/aim.c:301 src/buddy.c:2302
+#: src/buddy_chat.c:849 src/buddy_chat.c:985 src/buddy_chat.c:1012
+#: src/conversation.c:2041 src/dialogs.c:432 src/dialogs.c:3777
+#: src/multi.c:674 src/plugins.c:308 src/prefs.c:1970 src/prpl.c:355
+msgid "Close"
+msgstr "关闭"
+
+#: plugins/napster.c:1060
+msgid "Napster registration is currently under development"
+msgstr ""
+
+#: src/about.c:77
 #, c-format
 msgid "About GAIM v%s"
 msgstr "关于 GAIM 第 %s 版"
 
-#: src/aim.c:133 src/buddy.c:2100
+#: src/about.c:114
+msgid ""
+"GAIM is a client that supports AOL's Instant Messenger protocol. It is "
+"written using Gtk+ and is licensed under the GPL.\n"
+"URL: http://www.marko.net/gaim/"
+msgstr ""
+
+#: src/about.c:189
+msgid "Web Site"
+msgstr ""
+
+#: src/aim.c:135 src/buddy.c:2295
 msgid "Signoff"
 msgstr "离开"
 
@@ -28,7 +76,7 @@
 msgid "Please enter your logon"
 msgstr "请输入您的登录名称"
 
-#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#: src/aim.c:147 src/aim.c:152 src/multi.c:838
 #, fuzzy
 msgid "Signon Error"
 msgstr "登录"
@@ -38,1186 +86,1278 @@
 msgid "Please enter your password"
 msgstr "请输入您的登录名称"
 
-#: src/aim.c:254 src/multi.c:608
-msgid "Signon"
-msgstr "登录"
-
-#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+#: src/aim.c:246
+msgid "Gaim - Login"
+msgstr "Gaim - 登入"
+
+#: src/aim.c:264
+msgid "Screen Name: "
+msgstr "显示的姓名:"
+
+#: src/aim.c:278
+msgid "Password: "
+msgstr "密码:"
+
+#: src/aim.c:299 src/buddy.c:2299
+msgid "Quit"
+msgstr "退出"
+
+#: src/aim.c:304 src/aim.c:641 src/buddy.c:2358
 msgid "Accounts"
 msgstr ""
 
-#. Build OK Button
-#: src/aim.c:258 src/buddy_chat.c:202 src/buddy_chat.c:243 src/dialogs.c:347
-#: src/dialogs.c:666 src/dialogs.c:741 src/dialogs.c:892 src/dialogs.c:1029
-#: src/dialogs.c:1167 src/dialogs.c:1360 src/dialogs.c:1654 src/dialogs.c:1739
-#: src/dialogs.c:1953 src/dialogs.c:2141 src/dialogs.c:2305 src/dialogs.c:2397
-#: src/dialogs.c:3176 src/dialogs.c:3435 src/multi.c:494 src/multi.c:604
-#: src/multi.c:835 src/oscar.c:879 src/rvous.c:327 src/rvous.c:464
-#: src/rvous.c:696
-msgid "Cancel"
-msgstr "取消"
-
-#: src/aim.c:259
+#: src/aim.c:306 src/multi.c:578
+msgid "Signon"
+msgstr "登录"
+
+#: src/aim.c:338 src/prpl.c:359
 msgid "Register"
 msgstr "注册"
 
-#: src/aim.c:260
+#: src/aim.c:339
 msgid "Options"
 msgstr "选项"
 
-#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
+#: src/aim.c:341 src/aim.c:644 src/buddy.c:2375
 msgid "Plugins"
 msgstr "插件"
 
-#. Labels for selectors and text boxes
-#: src/aim.c:338
-msgid "Screen Name: "
-msgstr "显示的姓名:"
-
-#: src/aim.c:341
-msgid "Password: "
-msgstr "密码:"
-
-#: src/aim.c:380
-msgid "Gaim - Login"
-msgstr "Gaim - 登入"
-
-#: src/aim.c:599 src/buddy.c:2163
+#: src/aim.c:638 src/buddy.c:2367
 msgid "Preferences"
 msgstr "优先选项"
 
-#: src/away.c:110 src/away.c:227
-msgid "Back"
-msgstr "返回"
-
-#: src/away.c:121
+#: src/applet.c:89
+#, c-format
+msgid "file not found: %s\n"
+msgstr "找不到文件: %s\n"
+
+#: src/applet.c:113
+msgid "Attempting to sign on...."
+msgstr "正在登录……"
+
+#: src/applet.c:119
+msgid "Offilne. Click to bring up login box."
+msgstr "离线。点击这里启动登录窗"
+
+#: src/applet.c:136 src/applet.c:174 src/buddy.c:2313
+msgid "Away"
+msgstr "暂时离开"
+
+#: src/applet.c:177 src/away.c:266
+msgid "New Away Message"
+msgstr "新的暂时离开信息"
+
+#: src/applet.c:317
+msgid "Can't create GAIM applet!"
+msgstr "无法建立 GAIM applet!"
+
+#: src/applet.c:348
+msgid "Offline"
+msgstr "离线"
+
+#: src/applet.c:362
+msgid "Font does not exist"
+msgstr "字型不存在"
+
+#: src/applet.c:377
+msgid "About..."
+msgstr "关于……"
+
+#: src/away.c:96
 msgid "I'm Back!"
 msgstr "我胡汉三又回来了!"
 
-#: src/away.c:160
+#: src/away.c:133
 msgid "Gaim - Away!"
 msgstr "Gaim - 暂时离开"
 
-#: src/away.c:266 src/gnome_applet_mgr.c:200
-msgid "New Away Message"
-msgstr "新的暂时离开信息"
-
-#: src/away.c:284
+#: src/away.c:147 src/away.c:228 src/away.c:393
+msgid "Back"
+msgstr "返回"
+
+#: src/away.c:286
 msgid "Remove Away Message"
 msgstr "删除离开信息"
 
+#: src/away.c:462
+msgid "Set All Away"
+msgstr ""
+
 #. Put the buttons in the box
-#: src/buddy.c:239 src/buddy.c:2234 src/buddy_chat.c:845
-#: src/conversation.c:1641 src/conversation.c:1740 src/dialogs.c:890
-#: src/dialogs.c:1023 src/dialogs.c:1964 src/multi.c:693 src/prefs.c:639
-#: src/prefs.c:1249 src/prefs.c:1700 src/prefs.c:1735
+#: src/buddy.c:245 src/buddy.c:2443 src/buddy_chat.c:1017
+#: src/conversation.c:1738 src/conversation.c:2055 src/dialogs.c:868
+#: src/dialogs.c:992 src/dialogs.c:1867 src/multi.c:658 src/prefs.c:798
+#: src/prefs.c:1460 src/prefs.c:1810 src/prefs.c:1844
 msgid "Add"
 msgstr "增加"
 
-#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
+#: src/buddy.c:246 src/buddy.c:2444 src/dialogs.c:878 src/dialogs.c:974
 msgid "Group"
 msgstr "组群"
 
-#: src/buddy.c:241 src/buddy.c:2236 src/buddy_chat.c:847
-#: src/conversation.c:1639 src/conversation.c:1738 src/prefs.c:640
-#: src/prefs.c:1261 src/prefs.c:1704 src/prefs.c:1739
+#: src/buddy.c:247 src/buddy.c:2445 src/buddy_chat.c:1019
+#: src/conversation.c:1728 src/conversation.c:2053 src/prefs.c:799
+#: src/prefs.c:1474 src/prefs.c:1814 src/prefs.c:1848
 msgid "Remove"
 msgstr "删除"
 
-#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
+#: src/buddy.c:250 src/buddy.c:1830 src/buddy.c:2186
 msgid "Chat"
 msgstr "聊天"
 
-#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
+#: src/buddy.c:251 src/buddy.c:443 src/buddy.c:2184 src/buddy_chat.c:474
+#: src/buddy_chat.c:804
 msgid "IM"
 msgstr "即时信息"
 
-#: src/buddy.c:246 src/buddy.c:2002 src/buddy_chat.c:564 src/buddy_chat.c:853
-#: src/conversation.c:1734 src/rvous.c:694
+#: src/buddy.c:252 src/buddy.c:2185 src/buddy_chat.c:487 src/buddy_chat.c:812
+#: src/buddy_chat.c:1025 src/conversation.c:2073
 msgid "Info"
 msgstr "详细资料"
 
 #. Put the buttons in the box
-#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
+#: src/buddy.c:449 src/buddy.c:554 src/dialogs.c:968 src/dialogs.c:3395
+#: src/dialogs.c:3410 src/dialogs.c:3487 src/dialogs.c:3502
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:425
+#: src/buddy.c:455 src/buddy.c:568
 msgid "Add Buddy Pounce"
 msgstr "增加监视朋友"
 
-#: src/buddy.c:1368
+#: src/buddy.c:461 src/buddy.c:574
+msgid "View Log"
+msgstr ""
+
+#: src/buddy.c:561
+msgid "Un-Alias"
+msgstr ""
+
+#: src/buddy.c:1512
 msgid "New Buddy Pounce"
 msgstr "新增监视朋友"
 
-#: src/buddy.c:1386
+#: src/buddy.c:1530
 msgid "Remove Buddy Pounce"
 msgstr "取消监视朋友"
 
-#: src/buddy.c:1675
+#: src/buddy.c:1821
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "监视朋友"
 
-#: src/buddy.c:1678
+#: src/buddy.c:1824
 msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1681
+#: src/buddy.c:1827
 msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1687
+#: src/buddy.c:1833
 #, fuzzy
 msgid "Get File"
 msgstr "文件"
 
-#: src/buddy.c:1690
+#: src/buddy.c:1836
 #, fuzzy
 msgid "Send File"
 msgstr "文件"
 
-#: src/buddy.c:1749
+#: src/buddy.c:1839
+msgid "Games"
+msgstr ""
+
+#: src/buddy.c:1842
+msgid "Stocks"
+msgstr ""
+
+#: src/buddy.c:1894
+#, fuzzy, c-format
+msgid "Logged in: %s\n"
+msgstr "连接到: %s\n"
+
+#: src/buddy.c:1905
 msgid "Warnings: %d%%\n"
 msgstr "警告:%d%%\n"
 
-#: src/buddy.c:1754
+#: src/buddy.c:1917
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1758
+#: src/buddy.c:1921
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
 "Screen Name: %s\n"
-"Logged in: %s\n"
-"%s%s%s%s%s"
+"%s%s%s%s%s%s"
 msgstr ""
 "姓名:%s                \n"
 "登入到:%s\n"
 "%s%s%s"
 
-#: src/buddy.c:1761
+#: src/buddy.c:1925
 msgid "Idle: "
 msgstr "空转时间:"
 
-#: src/buddy.c:1828
+#: src/buddy.c:1995
 #, c-format
 msgid "<HR><B>%s logged in%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s 登入到 %s%s。</B><BR><HR>"
 
-#: src/buddy.c:1878
+#: src/buddy.c:2047
 #, c-format
 msgid "<HR><B>%s logged out%s%s.</B><BR><HR>"
 msgstr "<HR><B>%s 离开了 %s%s 。</B><BR><HR>"
 
-#: src/buddy.c:2028
+#: src/buddy.c:2211
 msgid "Information on selected Buddy"
 msgstr "选中的朋友的资料"
 
-#: src/buddy.c:2029 src/dialogs.c:657
+#: src/buddy.c:2212 src/dialogs.c:663
 msgid "Send Instant Message"
 msgstr "发出即时信息"
 
-#: src/buddy.c:2030
+#: src/buddy.c:2213
 msgid "Start/join a Buddy Chat"
 msgstr "发起/加入一个聊天室"
 
-#: src/buddy.c:2088
+#: src/buddy.c:2277
 msgid "File"
 msgstr "文件"
 
-#: src/buddy.c:2092 src/buddy.c:2093
+#: src/buddy.c:2281
 msgid "Add A Buddy"
 msgstr "加入一个哥们儿"
 
-#: src/buddy.c:2094
+#: src/buddy.c:2283
 #, fuzzy
 msgid "Join A Chat"
 msgstr "加入聊天"
 
-#: src/buddy.c:2095
+#: src/buddy.c:2285
 #, fuzzy
 msgid "New Instant Message"
 msgstr "发出即时信息"
 
-#: src/buddy.c:2097
+#: src/buddy.c:2290
 msgid "Import Buddy List"
 msgstr "导入朋友列表"
 
-#: src/buddy.c:2098
+#: src/buddy.c:2292
 msgid "Export Buddy List"
 msgstr "导出朋友列表"
 
-#: src/buddy.c:2103
-msgid "Quit"
-msgstr "退出"
-
-#: src/buddy.c:2105 src/buddy_chat.c:556 src/buddy_chat.c:818
-#: src/buddy_chat.c:841 src/conversation.c:1736 src/dialogs.c:425
-#: src/multi.c:709 src/plugins.c:314 src/prefs.c:1844
-msgid "Close"
-msgstr "关闭"
-
-#: src/buddy.c:2110
+#: src/buddy.c:2308
 msgid "Tools"
 msgstr "工具"
 
-#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
-msgid "Away"
-msgstr "暂时离开"
-
-#: src/buddy.c:2120
+#: src/buddy.c:2318
 msgid "Buddy Pounce"
 msgstr "监视朋友"
 
-#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
+#: src/buddy.c:2327 src/dialogs.c:2039 src/dialogs.c:2206
 msgid "Search for Buddy"
 msgstr "搜寻朋友"
 
-#: src/buddy.c:2131
+#: src/buddy.c:2330
 msgid "by Email"
 msgstr "使用电邮"
 
-#: src/buddy.c:2135
+#: src/buddy.c:2334
 msgid "by Dir Info"
 msgstr "使用姓名地址录"
 
-#: src/buddy.c:2142 src/buddy.c:2143
+#: src/buddy.c:2341 src/buddy.c:2342
 msgid "Settings"
 msgstr "设定"
 
-#: src/buddy.c:2146
+#: src/buddy.c:2345
 msgid "User Info"
 msgstr "用户详细资料"
 
-#: src/buddy.c:2150 src/dialogs.c:1353
+#: src/buddy.c:2349 src/dialogs.c:1326
 msgid "Directory Info"
 msgstr "姓名地址录"
 
-#: src/buddy.c:2154 src/dialogs.c:1592
+#: src/buddy.c:2353 src/dialogs.c:1517
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/buddy.c:2171
+#: src/buddy.c:2362
+#, fuzzy
+msgid "Protocol Actions"
+msgstr "选项"
+
+#: src/buddy.c:2369
+msgid "View System Log"
+msgstr ""
+
+#: src/buddy.c:2380
 #, fuzzy
 msgid "Perl"
 msgstr "允许"
 
-#: src/buddy.c:2174
+#: src/buddy.c:2383
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2178
+#: src/buddy.c:2387
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2182
+#: src/buddy.c:2391
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2190
+#: src/buddy.c:2399
 msgid "Help"
 msgstr "帮助"
 
-#: src/buddy.c:2195
+#: src/buddy.c:2404
 #, fuzzy
 msgid "About Gaim"
 msgstr "关于"
 
-#: src/buddy.c:2214 src/prefs.c:2053
+#: src/buddy.c:2423 src/prefs.c:2208
 msgid "Buddy List"
 msgstr "朋友列表"
 
-#: src/buddy.c:2266
+#: src/buddy.c:2477
 msgid "Add a new Buddy"
 msgstr "增加一个新哥们儿"
 
-#: src/buddy.c:2267
+#: src/buddy.c:2478
 #, fuzzy
 msgid "Add a new Group"
 msgstr "增加一个新哥们儿"
 
-#: src/buddy.c:2268
+#: src/buddy.c:2479
 msgid "Remove selected Buddy"
 msgstr "删除选中的朋友"
 
-#: src/buddy.c:2293
+#: src/buddy.c:2504
 msgid "Online"
 msgstr "在线"
 
-#: src/buddy.c:2295
+#: src/buddy.c:2506
 msgid "Edit Buddies"
 msgstr "修改朋友表"
 
-#: src/buddy.c:2332
+#: src/buddy.c:2543
 msgid "Gaim - Buddy List"
 msgstr "Gaim - 朋友列表"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:156
 msgid "Join Chat"
 msgstr "加入聊天"
 
-#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
+#: src/buddy_chat.c:163 src/buddy_chat.c:917 src/buddy_chat.c:929
 msgid "Buddy Chat"
 msgstr "朋友聊天"
 
-#: src/buddy_chat.c:151
+#: src/buddy_chat.c:173
 msgid "Join what group:"
 msgstr "要加入的组:"
 
-#: src/buddy_chat.c:167
+#: src/buddy_chat.c:186
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "加入聊天"
 
-#: src/buddy_chat.c:181
+#: src/buddy_chat.c:198
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:189
+#: src/buddy_chat.c:205
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:197
+#: src/buddy_chat.c:213 src/buddy_chat.c:258 src/dialogs.c:402
+#: src/dialogs.c:682 src/dialogs.c:742 src/dialogs.c:870 src/dialogs.c:987
+#: src/dialogs.c:1240 src/dialogs.c:1450 src/dialogs.c:1578 src/dialogs.c:1643
+#: src/dialogs.c:1856 src/dialogs.c:2045 src/dialogs.c:2225 src/dialogs.c:2299
+#: src/dialogs.c:3163 src/dialogs.c:3397 src/dialogs.c:3489 src/dialogs.c:3676
+#: src/multi.c:463 src/multi.c:574 src/multi.c:821 src/prpl.c:156
+#: src/prpl.c:227
+msgid "Cancel"
+msgstr "取消"
+
+#: src/buddy_chat.c:218
 msgid "Join"
 msgstr "加入"
 
-#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
+#: src/buddy_chat.c:259 src/buddy_chat.c:855 src/buddy_chat.c:984
 msgid "Invite"
 msgstr "邀请"
 
-#: src/buddy_chat.c:261
+#: src/buddy_chat.c:275
 msgid "Invite who?"
 msgstr "想请谁?"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:279
 msgid "With message:"
 msgstr "邀请信息:"
 
-#: src/buddy_chat.c:292
+#: src/buddy_chat.c:303
 msgid "Invite to Buddy Chat"
 msgstr "请人聊天"
 
-#: src/buddy_chat.c:420
+#: src/buddy_chat.c:480 src/buddy_chat.c:808
+msgid "Ignore"
+msgstr "不理他"
+
+#: src/buddy_chat.c:532 src/buddy_chat.c:638
+#, c-format
+msgid "%d %s in room"
+msgstr ""
+
+#: src/buddy_chat.c:539
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:459
+#: src/buddy_chat.c:602
+#, c-format
+msgid "<B>%s is now known as %s</B>"
+msgstr ""
+
+#: src/buddy_chat.c:645
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:559 src/buddy_chat.c:816
+#: src/buddy_chat.c:785
+msgid "0 people in room"
+msgstr ""
+
+#: src/buddy_chat.c:860 src/buddy_chat.c:983
 msgid "Whisper"
 msgstr "悄悄话"
 
-#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
-#: src/conversation.c:1733
+#: src/buddy_chat.c:865 src/buddy_chat.c:981 src/buddy_chat.c:1027
+#: src/conversation.c:2084
 msgid "Send"
 msgstr "送出"
 
-#: src/buddy_chat.c:563
-msgid "Ignore"
-msgstr "不理他"
-
-#: src/buddy_chat.c:849 src/conversation.c:1741
+#: src/buddy_chat.c:1021 src/conversation.c:2061
 msgid "Block"
 msgstr "块"
 
-#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
-#: src/dialogs.c:345 src/rvous.c:695
+#: src/buddy_chat.c:1023 src/conversation.c:2067 src/dialogs.c:372
+#: src/dialogs.c:397
 msgid "Warn"
 msgstr "警告"
 
-#: src/conversation.c:426
+#: src/conversation.c:352
+#, fuzzy
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - 记录对话内容"
+
+#: src/conversation.c:484
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "把 “%s”从朋友表上删去\n"
 
-#: src/conversation.c:902
+#: src/conversation.c:1044
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "目前在 %d\n"
 
-#: src/conversation.c:911
+#: src/conversation.c:1052
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "把位置设定到 %d\n"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1574
 msgid "Bold"
 msgstr "粗体"
 
-#: src/conversation.c:1497 src/prefs.c:818
+#: src/conversation.c:1574 src/prefs.c:974
 msgid "Bold Text"
 msgstr "粗体文字"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1578 src/conversation.c:1579
 msgid "Italics"
 msgstr "斜体"
 
-#: src/conversation.c:1501 src/prefs.c:819
+#: src/conversation.c:1578 src/prefs.c:975
 msgid "Italics Text"
 msgstr "斜体文字"
 
-#: src/conversation.c:1505 src/conversation.c:1506
+#: src/conversation.c:1582 src/conversation.c:1583
 msgid "Underline"
 msgstr "下加线"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1582
 msgid "Underline Text"
 msgstr "下加线文字"
 
-#: src/conversation.c:1509 src/conversation.c:1510
+#: src/conversation.c:1587
 msgid "Strike"
 msgstr "划掉"
 
-#: src/conversation.c:1509
+#: src/conversation.c:1587
 msgid "Strike through Text"
 msgstr "划掉的文字"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Small"
 msgstr "小"
 
-#: src/conversation.c:1513
+#: src/conversation.c:1593
 msgid "Decrease font size"
 msgstr "缩小字体"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal"
 msgstr "正常"
 
-#: src/conversation.c:1516
+#: src/conversation.c:1596
 msgid "Normal font size"
 msgstr "正常字体大小"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Big"
 msgstr "大"
 
-#: src/conversation.c:1519
+#: src/conversation.c:1599
 msgid "Increase font size"
 msgstr "增大字体"
 
-#: src/conversation.c:1526 src/conversation.c:1527
+#: src/conversation.c:1606 src/conversation.c:1607
 msgid "Font"
 msgstr "字型"
 
-#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
+#: src/conversation.c:1606 src/dialogs.c:2648 src/dialogs.c:2664
 msgid "Select Font"
 msgstr "选择字型"
 
-#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
-#: src/conversation.c:1535
+#: src/conversation.c:1610 src/conversation.c:1611 src/conversation.c:1615
 msgid "Color"
 msgstr "颜色"
 
-#: src/conversation.c:1530 src/prefs.c:832
+#: src/conversation.c:1610 src/prefs.c:988
 msgid "Text Color"
 msgstr "文字颜色"
 
-#: src/conversation.c:1534 src/prefs.c:849
+#: src/conversation.c:1615 src/prefs.c:1006
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1541 src/conversation.c:1542
+#: src/conversation.c:1622 src/conversation.c:1623
 msgid "Link"
 msgstr "连接"
 
-#: src/conversation.c:1541 src/dialogs.c:2391
+#: src/conversation.c:1622 src/dialogs.c:2293
 msgid "Insert Link"
 msgstr "插入连接"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 #, fuzzy
 msgid "Smiley"
 msgstr "文件"
 
-#: src/conversation.c:1545
+#: src/conversation.c:1626
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1552 src/conversation.c:1553
+#: src/conversation.c:1633 src/conversation.c:1634 src/prefs.c:2195
 msgid "Logging"
 msgstr "记录"
 
-#: src/conversation.c:1552
+#: src/conversation.c:1633
 msgid "Enable logging"
 msgstr "打开记录"
 
-#: src/conversation.c:1556 src/conversation.c:1557
+#: src/conversation.c:1643 src/conversation.c:1644 src/dialogs.c:1455
+#: src/dialogs.c:1648 src/dialogs.c:3175 src/dialogs.c:3786
+msgid "Save"
+msgstr "存盘"
+
+#: src/conversation.c:1643
+#, fuzzy
+msgid "Save Conversation"
+msgstr "记录所有对话内容"
+
+#: src/conversation.c:1648 src/conversation.c:1649
 msgid "Sound"
 msgstr "声音"
 
-#: src/conversation.c:1556
+#: src/conversation.c:1648
 msgid "Enable sounds"
 msgstr "打开声音"
 
-#: src/conversation.c:1768
+#: src/conversation.c:1928
+#, fuzzy
+msgid "Gaim - Conversations"
+msgstr "Gaim - 记录对话内容"
+
+#: src/conversation.c:2003
 #, fuzzy
 msgid "Send message as: "
 msgstr "发出信息声"
 
-#: src/dialogs.c:360
+#: src/dialogs.c:359
+msgid "Gaim - Warn user?"
+msgstr "Gaim - 警告用户?"
+
+#: src/dialogs.c:380
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "你真的想警告%s?"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:385
 msgid "Warn anonymously?"
 msgstr "发匿名警告?"
 
-#: src/dialogs.c:367
+#: src/dialogs.c:389
 msgid "Anonymous warnings are less harsh."
 msgstr "匿名警告不那么严厉。"
 
-#: src/dialogs.c:393
-msgid "Gaim - Warn user?"
-msgstr "Gaim - 警告用户?"
-
-#: src/dialogs.c:458
+#: src/dialogs.c:465
 #, c-format
 msgid "Unable to write file %s."
 msgstr "不能写入文件 %s。"
 
-#: src/dialogs.c:461
+#: src/dialogs.c:468
 #, c-format
 msgid "Unable to read file %s."
 msgstr "不能读入文件 %s。"
 
-#: src/dialogs.c:464
+#: src/dialogs.c:471
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "信息太长,后面 %s 字元被砍掉了。"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:474
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 现在没有登入。"
 
-#: src/dialogs.c:470
+#: src/dialogs.c:477
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许警告 %s 。"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:480
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "取消了一个信息,你超出了服侍器的速度限制。"
 
-#: src/dialogs.c:476
+#: src/dialogs.c:483
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中没有聊天。"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:486
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "你发送给 %s 的速度太快了。"
 
-#: src/dialogs.c:482
+#: src/dialogs.c:489
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/dialogs.c:485
+#: src/dialogs.c:492
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息发送的速度太快。"
 
-#: src/dialogs.c:488
+#: src/dialogs.c:495
 msgid "Failure."
 msgstr "失败了。"
 
-#: src/dialogs.c:491
+#: src/dialogs.c:498
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/dialogs.c:494
+#: src/dialogs.c:501
 msgid "Need more qualifiers."
 msgstr "需要更多的参数。"
 
-#: src/dialogs.c:497
+#: src/dialogs.c:504
 msgid "Dir service temporarily unavailable."
 msgstr "姓名地址录服务器暂时连不上。"
 
-#: src/dialogs.c:500
+#: src/dialogs.c:507
 msgid "Email lookup restricted."
 msgstr "电邮查找限制。"
 
-#: src/dialogs.c:503
+#: src/dialogs.c:510
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/dialogs.c:506
+#: src/dialogs.c:513
 msgid "No keywords."
 msgstr "没有关键字。"
 
-#: src/dialogs.c:509
+#: src/dialogs.c:516
 msgid "User has no directory information."
 msgstr "该用户没有姓名地址录"
 
-#: src/dialogs.c:513
+#: src/dialogs.c:520
 msgid "Country not supported."
 msgstr "不支持这个国家。"
 
-#: src/dialogs.c:516
+#: src/dialogs.c:523
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "不明错误: %s 。"
 
 #. Incorrect nick/password
-#: src/dialogs.c:519 src/oscar.c:471
+#: src/dialogs.c:526 src/oscar.c:523
 msgid "Incorrect nickname or password."
 msgstr "昵名或者密码错误。"
 
-#: src/dialogs.c:522
+#: src/dialogs.c:529
 msgid "The service is temporarily unavailable."
 msgstr "暂时没有该服务。"
 
-#: src/dialogs.c:525
+#: src/dialogs.c:532
 msgid "Your warning level is currently too high to log in."
 msgstr "你目前的警告级别太高,无法登入。"
 
-#: src/dialogs.c:528
+#: src/dialogs.c:535
 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."
 msgstr ""
 "你连接,断开的频率太高了,等十分钟再试。如果你非要接着试,等的时间会更长。"
 
-#: src/dialogs.c:531
+#: src/dialogs.c:538
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生不明的登录错误: %s。"
 
-#: src/dialogs.c:534
+#: src/dialogs.c:541
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "不明错误 %d 发生了。具体讯息: %s"
 
-#: src/dialogs.c:537
+#: src/dialogs.c:544
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - 错误 %d"
 
 #. Build OK Button
-#: src/dialogs.c:596 src/dialogs.c:661 src/dialogs.c:736 src/dialogs.c:1172
-#: src/dialogs.c:1659 src/dialogs.c:1806 src/dialogs.c:2140 src/dialogs.c:2310
-#: src/dialogs.c:2396 src/multi.c:499
+#: src/dialogs.c:603 src/dialogs.c:687 src/dialogs.c:747 src/dialogs.c:1245
+#: src/dialogs.c:1583 src/dialogs.c:1696 src/dialogs.c:2044 src/dialogs.c:2230
+#: src/dialogs.c:2298 src/multi.c:467
 msgid "OK"
 msgstr "确认"
 
-#: src/dialogs.c:671
+#: src/dialogs.c:653
+msgid "Gaim - IM user"
+msgstr "Gaim - 即时信息用户"
+
+#: src/dialogs.c:670
 #, fuzzy
 msgid "IM who:"
 msgstr "给谁即时信息:"
 
-#: src/dialogs.c:695
-msgid "Gaim - IM user"
-msgstr "Gaim - 即时信息用户"
-
-#: src/dialogs.c:732
+#: src/dialogs.c:718
 #, fuzzy
 msgid "Get User Info"
 msgstr "用户详细资料"
 
-#: src/dialogs.c:746
+#: src/dialogs.c:725
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:770
+#. Finish up
+#: src/dialogs.c:753
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 设定用户资料"
 
-#: src/dialogs.c:845
+#: src/dialogs.c:823
 msgid "Buddies"
 msgstr "哥们儿们"
 
-#: src/dialogs.c:898
+#: src/dialogs.c:876
 #, fuzzy
 msgid "Add Group"
 msgstr "组群"
 
-#: src/dialogs.c:928
+#: src/dialogs.c:906
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - 增加朋友"
 
-#: src/dialogs.c:957
+#: src/dialogs.c:933
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 增加朋友"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:947
 msgid "Add Buddy"
 msgstr "增加朋友"
 
-#: src/dialogs.c:979 src/dialogs.c:3443
+#: src/dialogs.c:957 src/dialogs.c:3405 src/dialogs.c:3497
 msgid "Buddy"
 msgstr "朋友"
 
-#: src/dialogs.c:1109
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Please enter a buddy to pounce."
+msgstr "请输入您的登录名称"
+
+#: src/dialogs.c:1011
+#, fuzzy
+msgid "Buddy Pounce Error"
+msgstr "监视朋友"
+
+#: src/dialogs.c:1076
 #, fuzzy
 msgid "Pounce buddy as:"
 msgstr "朋友登录声"
 
-#: src/dialogs.c:1181
+#: src/dialogs.c:1126
+msgid "Gaim - New Buddy Pounce"
+msgstr "Gaim - 新增监视朋友"
+
+#: src/dialogs.c:1143
 #, fuzzy
 msgid "Buddy:"
 msgstr "朋友"
 
+#: src/dialogs.c:1158
+msgid "Pounce on sign on"
+msgstr ""
+
+#: src/dialogs.c:1163
+msgid "Pounce on return from away"
+msgstr ""
+
+#: src/dialogs.c:1167
+msgid "Pounce on return from idle"
+msgstr ""
+
+#: src/dialogs.c:1175
+#, fuzzy
+msgid "Open IM window on pounce"
+msgstr "朋友登录时打开即时信息窗口"
+
+#: src/dialogs.c:1180
+#, fuzzy
+msgid "Send IM on pounce"
+msgstr "朋友登录时发送即时信息"
+
 #: src/dialogs.c:1189
 #, fuzzy
 msgid "Message:"
 msgstr "创作信息"
 
-#: src/dialogs.c:1196 src/prefs.c:2100
-msgid "Events"
-msgstr ""
-
-#. Set up the different options
 #: src/dialogs.c:1201
-msgid "Pounce on sign on"
-msgstr ""
-
-#: src/dialogs.c:1203
-msgid "Pounce on return from away"
-msgstr ""
-
-#: src/dialogs.c:1204
-msgid "Pounce on return from idle"
-msgstr ""
-
-#: src/dialogs.c:1226
 #, fuzzy
-msgid "Actions"
-msgstr "选项"
-
-#. And now the other stuff
-#: src/dialogs.c:1231
-#, fuzzy
-msgid "Open IM window on pounce"
-msgstr "朋友登录时打开即时信息窗口"
-
-#: src/dialogs.c:1234
-#, fuzzy
-msgid "Send IM on pounce"
+msgid "Execute command on pounce"
 msgstr "朋友登录时发送即时信息"
 
-#: src/dialogs.c:1263
-msgid "Gaim - New Buddy Pounce"
-msgstr "Gaim - 新增监视朋友"
-
-#. Build Save Button
-#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
-msgid "Save"
-msgstr "存盘"
-
-#: src/dialogs.c:1376
+#: src/dialogs.c:1210
+msgid "Command:"
+msgstr ""
+
+#: src/dialogs.c:1227
+msgid "Save this pounce after activation"
+msgstr ""
+
+#: src/dialogs.c:1316
+msgid "Gaim - Set Dir Info"
+msgstr "Gaim - 设定姓名地址录"
+
+#: src/dialogs.c:1348
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允许从网页搜寻找到你的资料"
 
 #. Line 1
-#: src/dialogs.c:1379 src/dialogs.c:2159
+#: src/dialogs.c:1351 src/dialogs.c:2063
 msgid "First Name"
 msgstr "名"
 
 #. Line 2
-#: src/dialogs.c:1390 src/dialogs.c:2171
+#: src/dialogs.c:1362 src/dialogs.c:2075
 msgid "Middle Name"
 msgstr "字"
 
 #. Line 3
-#: src/dialogs.c:1402 src/dialogs.c:2183
+#: src/dialogs.c:1374 src/dialogs.c:2087
 msgid "Last Name"
 msgstr "姓"
 
 #. Line 4
-#: src/dialogs.c:1413 src/dialogs.c:2195
+#: src/dialogs.c:1385 src/dialogs.c:2099
 msgid "Maiden Name"
 msgstr "娘家姓"
 
 #. Line 5
-#: src/dialogs.c:1424 src/dialogs.c:2207
+#: src/dialogs.c:1396 src/dialogs.c:2111
 msgid "City"
 msgstr "市"
 
 #. Line 6
-#: src/dialogs.c:1435 src/dialogs.c:2218
+#: src/dialogs.c:1407 src/dialogs.c:2122
 msgid "State"
 msgstr "省"
 
 #. Line 7
-#: src/dialogs.c:1446 src/dialogs.c:2229
+#: src/dialogs.c:1418 src/dialogs.c:2133
 msgid "Country"
 msgstr "国"
 
-#: src/dialogs.c:1490
-msgid "Gaim - Set Dir Info"
-msgstr "Gaim - 设定姓名地址录"
-
-#: src/dialogs.c:1507
+#: src/dialogs.c:1473
 msgid "New Passwords Do Not Match"
 msgstr "新密码不一致"
 
-#: src/dialogs.c:1507 src/dialogs.c:1512
+#: src/dialogs.c:1473 src/dialogs.c:1478
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - 更改密码错误"
 
-#: src/dialogs.c:1512
+#: src/dialogs.c:1478
 msgid "Fill out all fields completely"
 msgstr "把所有的表格都添了"
 
-#: src/dialogs.c:1541
-#, fuzzy
-msgid "Change password for:"
-msgstr "更改密码"
-
-#: src/dialogs.c:1580 src/toc.c:515
+#: src/dialogs.c:1505 src/toc.c:560
 msgid "Gaim - Password Change"
 msgstr "Gaim - 更改密码"
 
-#: src/dialogs.c:1612
+#: src/dialogs.c:1536
 msgid "Original Password"
 msgstr "旧密码"
 
-#: src/dialogs.c:1626
+#: src/dialogs.c:1550
 msgid "New Password"
 msgstr "新密码"
 
-#: src/dialogs.c:1640
+#: src/dialogs.c:1564
 msgid "New Password (again)"
 msgstr "新密码(确定)"
 
-#: src/dialogs.c:1693
-msgid "Set info for:"
-msgstr ""
-
-#: src/dialogs.c:1776
+#: src/dialogs.c:1609
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 设定用户资料"
 
-#: src/dialogs.c:1817
+#: src/dialogs.c:1707
 msgid "Below are the results of your search: "
 msgstr "以下是你搜索的结果:"
 
-#: src/dialogs.c:1943 src/dialogs.c:1950
+#: src/dialogs.c:1846 src/dialogs.c:1853
 msgid "Permit"
 msgstr "允许"
 
-#: src/dialogs.c:1945 src/dialogs.c:1952
+#: src/dialogs.c:1848 src/dialogs.c:1855
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/dialogs.c:1993
+#: src/dialogs.c:1896
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - 增加 允许/禁止"
 
-#: src/dialogs.c:1995
+#: src/dialogs.c:1898
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - 增加 允许/禁止"
 
-#: src/dialogs.c:2057
+#: src/dialogs.c:1960
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 记录对话内容"
 
-#: src/dialogs.c:2266
+#: src/dialogs.c:2170
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 根据用户资料查寻朋友"
 
-#: src/dialogs.c:2315
-msgid "Email"
-msgstr "电邮"
-
-#: src/dialogs.c:2328
+#: src/dialogs.c:2200
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 根据电邮查寻朋友"
 
-#: src/dialogs.c:2410
+#: src/dialogs.c:2213
+msgid "Email"
+msgstr "电邮"
+
+#: src/dialogs.c:2312
 msgid "URL"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2320
 msgid "Description"
 msgstr "描述"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2346
 msgid "GAIM - Add URL"
 msgstr "GAIM - 增加 URL"
 
-#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
+#: src/dialogs.c:2487 src/dialogs.c:2500 src/dialogs.c:2537
 msgid "Select Text Color"
 msgstr "设定文字颜色"
 
-#: src/dialogs.c:2624
+#: src/dialogs.c:2524
 #, fuzzy
 msgid "Select Background Color"
 msgstr "设定文字颜色"
 
-#: src/dialogs.c:2847 src/rvous.c:265
+#: src/dialogs.c:2769
 #, c-format
 msgid "Error writing file %s"
 msgstr "写入文件 %s 发生错误"
 
-#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
-#: src/rvous.c:548
+#: src/dialogs.c:2770 src/dialogs.c:2892 src/dialogs.c:3637 src/oscar.c:1800
+#: src/oscar.c:2216 src/toc.c:1394 src/toc.c:1411 src/toc.c:1499
+#: src/toc.c:1676 src/toc.c:1706
 msgid "Error"
 msgstr "错误"
 
-#: src/dialogs.c:2901
+#: src/dialogs.c:2823
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - 导出朋友列表"
 
-#: src/dialogs.c:2967 src/rvous.c:547
+#: src/dialogs.c:2891
 #, c-format
 msgid "Error reading file %s"
 msgstr "读取文件 %s 发生错误"
 
-#: src/dialogs.c:3045
+#: src/dialogs.c:2967
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 导入朋友列表"
 
-#: src/dialogs.c:3124
+#. We shouldn't allow a blank title
+#: src/dialogs.c:3030
+msgid "You cannot create an away message with a blank title"
+msgstr ""
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:3037
+msgid "You cannot create an empty away message"
+msgstr ""
+
+#: src/dialogs.c:3104
 msgid "Gaim - New away message"
 msgstr "Gaim - 更新暂时离开信息"
 
-#. Put frame and button-box in the toplevel
-#: src/dialogs.c:3136
+#: src/dialogs.c:3114
 #, fuzzy
 msgid "New away message"
 msgstr "新的暂时离开信息"
 
-#: src/dialogs.c:3149
+#: src/dialogs.c:3127
 msgid "Away title: "
 msgstr "暂时离开标题:"
 
-#. Checkbox for showing away msg
-#: src/dialogs.c:3193
+#: src/dialogs.c:3167
 #, fuzzy
-msgid "Make Away Now"
-msgstr "立即设定为暂时离开"
+msgid "Use"
+msgstr "GAIM 使用"
+
+#: src/dialogs.c:3171
+msgid "Save & Use"
+msgstr ""
 
 #. show everything
-#: src/dialogs.c:3370
+#: src/dialogs.c:3340
 #, fuzzy
 msgid "Smile!"
 msgstr "文件"
 
-#: src/dialogs.c:3441
+#: src/dialogs.c:3403 src/dialogs.c:3495
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "增加朋友"
 
-#: src/dialogs.c:3478
+#: src/dialogs.c:3440 src/dialogs.c:3532
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 增加朋友"
 
-#: src/gnome_applet_mgr.c:95
-#, c-format
-msgid "file not found: %s\n"
-msgstr "找不到文件: %s\n"
-
-#: src/gnome_applet_mgr.c:121
-msgid "Offilne. Click to bring up login box."
-msgstr "离线。点击这里启动登录窗"
-
-#: src/gnome_applet_mgr.c:128
-msgid "Attempting to sign on...."
-msgstr "正在登录……"
-
-#: src/gnome_applet_mgr.c:254
-msgid "GAIM"
+#: src/dialogs.c:3604
+#, fuzzy
+msgid "Gaim - Save Log File"
+msgstr "Gaim - 存盘为……"
+
+#: src/dialogs.c:3635
+#, fuzzy, c-format
+msgid "Unable to remove file %s - %s"
+msgstr "不能读入文件 %s。"
+
+#: src/dialogs.c:3666
+msgid "Really clear log?"
 msgstr ""
 
-#: src/gnome_applet_mgr.c:366
-msgid "Can't create GAIM applet!"
-msgstr "无法建立 GAIM applet!"
-
-#: src/gnome_applet_mgr.c:397
-msgid "Offline"
-msgstr "离线"
-
-#: src/gnome_applet_mgr.c:411
-msgid "Font does not exist"
-msgstr "字型不存在"
-
-#: src/gnome_applet_mgr.c:427
-msgid "About..."
-msgstr "关于……"
-
-#: src/gtkhtml.c:1383
-msgid "HTML Link:"
-msgstr "超文本连接:"
-
-#: src/gtkhtml.c:1796
-msgid "Open URL in existing window"
-msgstr "在已有的窗口内打开 URL"
-
-#: src/gtkhtml.c:1805
-msgid "Open URL in new window"
-msgstr "新建窗口打开 URL"
-
-#: src/gtkhtml.c:1813
-msgid "Add URL as bookmark"
-msgstr "把 URL 加入书签"
-
-#: src/html.c:122 src/html.c:125
+#: src/dialogs.c:3684
+#, fuzzy
+msgid "Okay"
+msgstr "确定"
+
+#: src/dialogs.c:3781
+#, fuzzy
+msgid "Clear"
+msgstr "关闭"
+
+#: src/gaimrc.c:870
+#, c-format
+msgid "Could not open config file %s."
+msgstr ""
+
+#: src/gaimrc.c:871
+#, fuzzy
+msgid "Preferences Error"
+msgstr "优先选项"
+
+#: src/html.c:121 src/html.c:124
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接错误\n"
 
-#: src/html.c:158
+#: src/html.c:156
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "接收到 %d 字元,来源: %s"
 
-#: src/html.c:171
+#: src/html.c:169
 msgid "Getting Data"
 msgstr "接收数据"
 
-#: src/html.c:204
+#: src/html.c:201
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "收到了:“%s”\n"
 
-#: src/multi.c:367 src/prefs.c:112
+#: src/multi.c:345 src/prefs.c:114
 #, fuzzy
 msgid "General Options"
 msgstr "选项"
 
-#: src/multi.c:402
+#: src/multi.c:350
 #, fuzzy
 msgid "Screenname:"
 msgstr "显示的姓名:"
 
-#: src/multi.c:414
+#: src/multi.c:359
 #, fuzzy
 msgid "Password:"
 msgstr "密码:"
 
-#: src/multi.c:429
+#: src/multi.c:370
+msgid "Protocol:"
+msgstr ""
+
+#: src/multi.c:375
 msgid "Remember Password"
 msgstr "记住密码"
 
-#: src/multi.c:430
+#: src/multi.c:376
 #, fuzzy
 msgid "Auto-Login"
 msgstr "自动登录"
 
-#: src/multi.c:431
+#: src/multi.c:377
 msgid "Send KeepAlive packet (6 bytes/second)"
 msgstr ""
 
-#: src/multi.c:473
+#: src/multi.c:442
 #, fuzzy
 msgid "Gaim - Modify Account"
 msgstr "Gaim - 登入"
 
-#: src/multi.c:482
-msgid "Modify Account"
-msgstr ""
-
-#: src/multi.c:576
+#: src/multi.c:546
 #, fuzzy
 msgid "Enter Password"
 msgstr "新密码"
 
-#: src/multi.c:669
+#: src/multi.c:641
 #, fuzzy
 msgid "Gaim - Account Editor"
 msgstr "Gaim - 插件列表"
 
-#: src/multi.c:678
-msgid "Account Editor"
-msgstr ""
-
-#: src/multi.c:697
+#: src/multi.c:662
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:701
+#: src/multi.c:666
 #, fuzzy
 msgid "Sign On/Off"
 msgstr "离开"
 
-#: src/multi.c:705
+#: src/multi.c:670
 #, fuzzy
 msgid "Delete"
 msgstr "选择字型"
 
-#: src/multi.c:851
+#: src/multi.c:837
 #, c-format
 msgid "%s was unable to sign on: %s"
 msgstr ""
 
-#: src/oscar.c:300 src/oscar.c:317 src/toc.c:280 src/toc.c:290 src/toc.c:347
+#: src/oscar.c:294 src/oscar.c:311 src/toc.c:317 src/toc.c:327 src/toc.c:384
 msgid "Disconnected."
 msgstr "已断开。"
 
-#: src/oscar.c:308
+#: src/oscar.c:302
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "连接错误!\n"
 
-#: src/oscar.c:316
+#: src/oscar.c:310
 #, fuzzy
 msgid "major connection error\n"
 msgstr "连接错误!\n"
 
-#: src/oscar.c:330 src/toc.c:500
+#: src/oscar.c:323 src/toc.c:545
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:331
+#: src/oscar.c:324
 #, fuzzy
 msgid "Chat Error!"
 msgstr "错误"
 
-#: src/oscar.c:362
+#: src/oscar.c:334
+#, fuzzy
+msgid "Chat is currently unavailable"
+msgstr "在 %s 中没有聊天。"
+
+#: src/oscar.c:335
+#, fuzzy
+msgid "Gaim - Chat"
+msgstr "Gaim 聊天"
+
+#: src/oscar.c:382
 #, c-format
 msgid "Logging in %s\n"
 msgstr "连接到: %s\n"
 
-#: src/oscar.c:399
+#: src/oscar.c:420
 msgid "internal connection error\n"
 msgstr "内部连接错误\n"
 
-#: src/oscar.c:400
+#: src/oscar.c:421
 msgid "Unable to login to AIM"
 msgstr "不能登录到 AIM"
 
-#: src/oscar.c:405
+#: src/oscar.c:426
 #, fuzzy
 msgid "couldn't resolve host"
 msgstr "不能解析主机\n"
 
-#: src/oscar.c:409
+#: src/oscar.c:430
 #, fuzzy
 msgid "couldn't connect to host"
 msgstr "不能连接到主机\n"
 
-#: src/oscar.c:416
+#: src/oscar.c:437
 #, c-format
 msgid "Signon: %s"
 msgstr "登录: %s"
 
-#: src/oscar.c:426
+#: src/oscar.c:447
 msgid "Password sent, waiting for response\n"
 msgstr "密码已送出,等候回应\n"
 
-#: src/oscar.c:451
+#: src/oscar.c:474
 msgid "Signed off.\n"
 msgstr "登出。\n"
 
 #. connecting too frequently
-#: src/oscar.c:466
+#: src/oscar.c:518
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1226,157 +1366,122 @@
 "你连接,断开的频率太高了,等十分钟再试。如果你非要接着试,等的时间会更长。"
 
 #. client too old
-#: src/oscar.c:476
+#: src/oscar.c:528
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:480 src/toc.c:303
+#: src/oscar.c:532 src/toc.c:341
 msgid "Authentication Failed"
 msgstr "验证失败"
 
-#: src/oscar.c:513
+#: src/oscar.c:562
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/oscar.c:520
+#: src/oscar.c:566
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/oscar.c:551
+#: src/oscar.c:600
 msgid "Connection established, cookie sent"
 msgstr "连接成功,送出饼干。。啊!饼干?!"
 
-#: src/oscar.c:787 src/oscar.c:1860
+#: src/oscar.c:843 src/oscar.c:2100
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s established</B>"
 msgstr "<HR><B>%s 登入到 %s%s。</B><BR><HR>"
 
-#: src/oscar.c:862 src/rvous.c:333 src/rvous.c:470
-msgid "Gaim - File Transfer"
-msgstr "Gaim - 传输文件"
-
-#: src/oscar.c:866 src/rvous.c:454
-#, c-format
-msgid "Sending %s to %s"
-msgstr "送 %s 给 %s"
-
-#: src/oscar.c:898
-msgid "Error in transfer"
-msgstr ""
-
-#: src/oscar.c:959
-msgid "Transfer complete."
-msgstr ""
-
-#: src/oscar.c:1012
-#, fuzzy
-msgid "Error examining file"
-msgstr "读取文件 %s 发生错误"
-
-#: src/oscar.c:1012 src/oscar.c:1020 src/oscar.c:1043
-#, fuzzy
-msgid "GetFile Error"
-msgstr "Gaim - 错误 %d"
-
-#: src/oscar.c:1020
-msgid "Could not open temporary file, aborting"
-msgstr ""
-
-#: src/oscar.c:1043
-#, fuzzy
-msgid "Error connecting for transfer"
-msgstr "连接端口时出错。\n"
-
-#: src/oscar.c:1065
-#, fuzzy
-msgid "Gaim - Send File..."
-msgstr "Gaim - 存盘为……"
-
 #. message too large
-#: src/oscar.c:1194
+#: src/oscar.c:1293
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/oscar.c:1195 src/oscar.c:1200 src/oscar.c:1222 src/oscar.c:1241
-#: src/oscar.c:1266
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - 错误 %d"
-
-#: src/oscar.c:1199
+#: src/oscar.c:1298
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:1220
+#: src/oscar.c:1333
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:1221 src/oscar.c:1240
+#: src/oscar.c:1334 src/oscar.c:1353
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:1239
+#: src/oscar.c:1352
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:1265
+#: src/oscar.c:1388
 #, c-format
-msgid "%s has no info/away message."
+msgid "%s has no %s."
 msgstr ""
 
-#: src/oscar.c:1271
+#: src/oscar.c:1395
 msgid ""
-"Username : <B>%s</B>\n"
-"<BR>Warning Level : <B>%d %%</B>\n"
-"<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
+"Username : <B>%s</B>  %s <BR>\n"
+"Warning Level : <B>%d %%</B><BR>\n"
+"Online Since : <B>%s</B><BR>\n"
+"Idle Minutes : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+"%s<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
 msgstr ""
-"用户名称: <B>%s</B>\n"
-"<BR>警告级别: <B>%d %%</B>\n"
-"<BR>连线时刻: <B>%s</B><BR>空转时间(分钟): <B>%d</B>\n"
-"<BR><HR><BR>%s\n"
-
-#: src/oscar.c:1305
+
+#: src/oscar.c:1430
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:1306
+#: src/oscar.c:1431
 msgid "AOL error"
 msgstr ""
 
-#: src/oscar.c:1913
+#: src/oscar.c:2157
 #, fuzzy, c-format
 msgid "<B>Direct IM with %s closed</B>"
 msgstr "<HR><B>%s 登入到 %s%s。</B><BR><HR>"
 
-#: src/oscar.c:1958
+#: src/oscar.c:2216
 #, fuzzy
 msgid "Unable to open Direct IM"
 msgstr "不能登录到 AIM"
 
-#: src/oscar.c:1967 src/toc.c:970
-#, fuzzy
-msgid "Get Info"
-msgstr "用户详细资料"
-
-#: src/oscar.c:1974
+#: src/oscar.c:2226
+#, c-format
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+
+#: src/oscar.c:2243
 #, fuzzy
 msgid "Get Away Msg"
 msgstr "暂时离开信息"
 
-#: src/oscar.c:1982
+#: src/oscar.c:2251
 #, fuzzy
 msgid "Direct IM"
 msgstr "姓名地址录"
 
+#: src/oscar.c:2443
+msgid ""
+"Unfortunately, currently Oscar only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
 #. Below is basically stolen from plugins.c
-#: src/perl.c:639
+#: src/perl.c:638
 #, fuzzy
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - 设定用户资料"
@@ -1385,563 +1490,725 @@
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:104
+#: src/plugins.c:105
 msgid "Gaim - Plugin List"
 msgstr "Gaim - 插件列表"
 
-#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
+#: src/plugins.c:185 src/plugins.c:191 src/plugins.c:215
 msgid "Plugin Error"
 msgstr "插件错误"
 
-#: src/plugins.c:262
+#: src/plugins.c:261
 msgid "Gaim - Plugins"
 msgstr "Gaim - 插件"
 
 #. Build the bottom button bar
-#: src/plugins.c:294
+#: src/plugins.c:290
 msgid "Load Plugin"
 msgstr "载入插件"
 
-#: src/plugins.c:301
+#: src/plugins.c:296
 msgid "Configure Plugin"
 msgstr "设定插件"
 
-#: src/plugins.c:307
+#: src/plugins.c:302
 msgid "Unload Plugin"
 msgstr "卸载插件"
 
-#: src/prefs.c:120 src/prefs.c:180 src/prefs.c:227 src/prefs.c:339
-#: src/prefs.c:425 src/prefs.c:814 src/prefs.c:900 src/prefs.c:1043
-#: src/prefs.c:1408 src/prefs.c:1649
+#: src/prefs.c:122 src/prefs.c:232 src/prefs.c:287 src/prefs.c:325
+#: src/prefs.c:379 src/prefs.c:491 src/prefs.c:582 src/prefs.c:970
+#: src/prefs.c:1075 src/prefs.c:1230 src/prefs.c:1761
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#.
-#. prefrem = gaim_button(_("Remember password"), &general_options, OPT_GEN_REMEMBER_PASS, box);
-#. gtk_signal_connect(GTK_OBJECT(prefrem), "destroy", GTK_SIGNAL_FUNC(remdes), 0);
-#. gaim_button(_("Auto-login"), &general_options, OPT_GEN_AUTO_LOGIN, box);
-#.
-#. sep = gtk_hseparator_new();
-#. gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 5);
-#. gtk_widget_show(sep);
-#.
-#: src/prefs.c:134
+#: src/prefs.c:126
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:135
+#: src/prefs.c:128
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:138
+#: src/prefs.c:132
 msgid "Show Debug Window"
 msgstr ""
 
+#: src/prefs.c:144
+#, fuzzy
+msgid "Report Idle Times:"
+msgstr "显示空转时间"
+
+#: src/prefs.c:147
+msgid "None"
+msgstr ""
+
+#: src/prefs.c:148
+msgid "GAIM Use"
+msgstr "GAIM 使用"
+
 #: src/prefs.c:150
 #, fuzzy
-msgid "Report Idle Times:"
-msgstr "显示空转时间"
-
-#: src/prefs.c:153
-msgid "None"
-msgstr ""
-
-#: src/prefs.c:154
-msgid "GAIM Use"
-msgstr "GAIM 使用"
-
-#: src/prefs.c:156
-#, fuzzy
 msgid "X Use"
 msgstr "GAIM 使用"
 
-#: src/prefs.c:172
+#: src/prefs.c:224
+#, fuzzy
+msgid "Browser Options"
+msgstr "选项"
+
+#: src/prefs.c:236
+msgid "Netscape"
+msgstr ""
+
+#: src/prefs.c:237
+msgid "KFM"
+msgstr ""
+
+#: src/prefs.c:239
+msgid "GNOME URL Handler"
+msgstr ""
+
+#: src/prefs.c:241
+msgid "Manual"
+msgstr "用户手册"
+
+#: src/prefs.c:252
+msgid "Pop up new window by default"
+msgstr "缺省弹出新窗口"
+
+#: src/prefs.c:279
+#, fuzzy
+msgid "Logging Options"
+msgstr "连接到: %s\n"
+
+#: src/prefs.c:291
+#, fuzzy
+msgid "Log all conversations"
+msgstr "记录所有对话内容"
+
+#: src/prefs.c:292
+#, fuzzy
+msgid "Strip HTML from logs"
+msgstr "清除记录文件内的 HTML 标记"
+
+#: src/prefs.c:298
+msgid "Log when buddies sign on/sign off"
+msgstr ""
+
+#: src/prefs.c:299
+msgid "Log when buddies become idle/un-idle"
+msgstr ""
+
+#: src/prefs.c:300
+msgid "Log when buddies go away/come back"
+msgstr ""
+
+#: src/prefs.c:301
+msgid "Log your own signons/idleness/awayness (as set by options above)"
+msgstr ""
+
+#: src/prefs.c:302
+msgid "Individual log file for each buddy's signons"
+msgstr ""
+
+#: src/prefs.c:317
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "朋友列表"
 
-#: src/prefs.c:184
-msgid "Show numbers in groups"
-msgstr "在组里显示号码"
-
-#: src/prefs.c:185
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:186
-msgid "Show idle times"
-msgstr "显示空转时间"
-
-#: src/prefs.c:187
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "显示朋友类别图形"
-
-#: src/prefs.c:193
-msgid "Hide IM/Info/Chat buttons"
-msgstr ""
-
-#: src/prefs.c:194
-msgid "Show pictures on buttons"
-msgstr ""
-
-#: src/prefs.c:200
+#: src/prefs.c:329
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "保存某些窗口大小和位置"
 
-#: src/prefs.c:202
+#: src/prefs.c:331
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "自动显示朋友列表"
 
-#: src/prefs.c:203
+#: src/prefs.c:333
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "在 applet 附近显示朋友列表"
 
-#: src/prefs.c:219
+#: src/prefs.c:340
+msgid "Hide groups with no online buddies"
+msgstr ""
+
+#: src/prefs.c:341
+msgid "Show numbers in groups"
+msgstr "在组里显示号码"
+
+#: src/prefs.c:347
+#, fuzzy
+msgid "Show buddy type icons"
+msgstr "显示朋友类别图形"
+
+#: src/prefs.c:348
+msgid "Show warning levels"
+msgstr ""
+
+#: src/prefs.c:349
+msgid "Show idle times"
+msgstr "显示空转时间"
+
+#: src/prefs.c:355
+msgid "Hide IM/Info/Chat buttons"
+msgstr ""
+
+#: src/prefs.c:356
+msgid "Show pictures on buttons"
+msgstr ""
+
+#: src/prefs.c:371
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:231
+#: src/prefs.c:383
 msgid "Enter sends message"
 msgstr "输入发送信息"
 
-#: src/prefs.c:232
+#: src/prefs.c:384
+#, fuzzy
+msgid "Control-Enter sends message"
+msgstr "输入发送信息"
+
+#: src/prefs.c:385
+msgid "Escape closes window"
+msgstr ""
+
+#: src/prefs.c:386
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:233
+#: src/prefs.c:387
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:239
+#: src/prefs.c:388
+msgid "F2 toggles timestamp display"
+msgstr ""
+
+#: src/prefs.c:394
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "显示图形笑脸 (试验阶段)"
 
-#: src/prefs.c:240
+#: src/prefs.c:395
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "在信息里显示时间"
 
-#: src/prefs.c:241
+#: src/prefs.c:396
 #, fuzzy
-msgid "Ignore incoming colors"
+msgid "Ignore colors"
 msgstr "不理进来的颜色"
 
-#: src/prefs.c:242
-msgid "Ignore white backgrounds"
-msgstr ""
-
-#: src/prefs.c:248
+#: src/prefs.c:397
 #, fuzzy
-msgid "Log all conversations"
-msgstr "记录所有对话内容"
-
-#: src/prefs.c:249
+msgid "Ignore font faces"
+msgstr "增大字体"
+
+#: src/prefs.c:398
 #, fuzzy
-msgid "Strip HTML from logs"
-msgstr "清除记录文件内的 HTML 标记"
-
-#: src/prefs.c:255
+msgid "Ignore font sizes"
+msgstr "增大字体"
+
+#: src/prefs.c:404
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "自动突出拼错的单词"
 
-#: src/prefs.c:256
+#: src/prefs.c:405
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "把 URL 以连接方式送出"
 
-#: src/prefs.c:257
+#: src/prefs.c:406
 msgid "Sending messages removes away status"
 msgstr "发出信息时自动取消暂时离开状态"
 
-#: src/prefs.c:298 src/prefs.c:386
+#: src/prefs.c:447 src/prefs.c:540
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:303 src/prefs.c:391
+#: src/prefs.c:453 src/prefs.c:546
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:308 src/prefs.c:396
+#: src/prefs.c:459 src/prefs.c:552
 #, fuzzy
 msgid "Text Only"
 msgstr "文字颜色"
 
-#: src/prefs.c:331
+#: src/prefs.c:483
 #, fuzzy
 msgid "IM Options"
 msgstr "选项"
 
-#: src/prefs.c:343
+#: src/prefs.c:495
+#, fuzzy
+msgid "Show all conversations in one tabbed window"
+msgstr "在交谈窗口显示登录/登出信息"
+
+#: src/prefs.c:496
 #, fuzzy
 msgid "Show logins in window"
 msgstr "在交谈窗口显示登录/登出信息"
 
-#: src/prefs.c:349 src/prefs.c:435
+#: src/prefs.c:502 src/prefs.c:593
 #, fuzzy
 msgid "Show buttons as "
 msgstr "显示图形按钮"
 
-#: src/prefs.c:358 src/prefs.c:445
+#: src/prefs.c:511 src/prefs.c:603
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:359 src/prefs.c:446
+#: src/prefs.c:513 src/prefs.c:605
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "收到信息时升起窗口"
 
-#: src/prefs.c:360
+#: src/prefs.c:514
 msgid "Ignore new conversations when away"
 msgstr "暂时离开时,忽略新的对话"
 
-#: src/prefs.c:361
+#: src/prefs.c:516
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "创作信息"
 
-#: src/prefs.c:417 src/prefs.c:620
+#: src/prefs.c:574
 #, fuzzy
 msgid "Chat Options"
 msgstr "选项"
 
-#: src/prefs.c:429
+#: src/prefs.c:586
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
+#: src/prefs.c:636 src/prefs.c:638 src/prefs.c:841 src/prefs.c:843
 msgid "Gaim Chat"
 msgstr "Gaim 聊天"
 
-#: src/prefs.c:638
+#: src/prefs.c:779 src/prefs.c:2234
+msgid "Chat Rooms"
+msgstr ""
+
+#: src/prefs.c:797
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/prefs.c:666
+#: src/prefs.c:822
 msgid "List of available chats"
 msgstr "现有聊天列表"
 
-#: src/prefs.c:680
+#: src/prefs.c:832
 msgid "List of subscribed chats"
 msgstr "订阅的聊天列表"
 
-#: src/prefs.c:806 src/prefs.c:2084
+#: src/prefs.c:962 src/prefs.c:2239
 #, fuzzy
 msgid "Font Options"
 msgstr "选项"
 
-#: src/prefs.c:820
+#: src/prefs.c:976
 msgid "Underlined Text"
 msgstr "下加线文字"
 
-#: src/prefs.c:821
+#: src/prefs.c:977
 msgid "Strike Text"
 msgstr "划掉的文字"
 
-#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
+#: src/prefs.c:990 src/prefs.c:1008 src/prefs.c:1029
 #, fuzzy
 msgid "Select"
 msgstr "选择字型"
 
-#: src/prefs.c:869
+#: src/prefs.c:1027
 msgid "Font Face for Text"
 msgstr "文字的字型"
 
-#: src/prefs.c:892
+#: src/prefs.c:1042
+#, fuzzy
+msgid "Font Size for Text"
+msgstr "文字的字型"
+
+#: src/prefs.c:1067
 #, fuzzy
 msgid "Sound Options"
 msgstr "选项"
 
-#: src/prefs.c:904
+#: src/prefs.c:1079
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "朋友登录声"
 
-#: src/prefs.c:905 src/prefs.c:1296
+#: src/prefs.c:1080 src/prefs.c:1511
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:906
+#: src/prefs.c:1081
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:968
+#: src/prefs.c:1146
 #, fuzzy
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - 记录对话内容"
 
-#: src/prefs.c:1002
+#: src/prefs.c:1181
 #, fuzzy
 msgid "Reset"
 msgstr "注册"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1186
 #, fuzzy
-msgid "Choose"
+msgid "Choose..."
 msgstr "关闭"
 
-#: src/prefs.c:1035
+#: src/prefs.c:1222
 #, fuzzy
 msgid "Sound Events"
 msgstr "声音"
 
-#: src/prefs.c:1047
+#: src/prefs.c:1234
 msgid "Sound when buddy logs in"
 msgstr "朋友登录声"
 
-#: src/prefs.c:1048
+#: src/prefs.c:1235
 msgid "Sound when buddy logs out"
 msgstr "朋友登出声"
 
-#: src/prefs.c:1054
+#: src/prefs.c:1241
 msgid "Sound when message is received"
 msgstr "收到信息声"
 
-#: src/prefs.c:1055
+#: src/prefs.c:1242
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "收到信息声"
 
-#: src/prefs.c:1056
+#: src/prefs.c:1243
 msgid "Sound when message is sent"
 msgstr "发出信息声"
 
-#: src/prefs.c:1062
+#: src/prefs.c:1249
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "聊天室里,朋友进入/离开声"
 
-#: src/prefs.c:1063
+#: src/prefs.c:1250
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "聊天室里,朋友进入/离开声"
 
-#: src/prefs.c:1064
+#: src/prefs.c:1251
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "聊天室有人说话声"
 
-#: src/prefs.c:1065
+#: src/prefs.c:1252
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "聊天室有人说话声"
 
-#: src/prefs.c:1197 src/prefs.c:2111
+#: src/prefs.c:1262
+#, c-format
+msgid "Command to play sound files (%s for filename; internal if empty)"
+msgstr ""
+
+#: src/prefs.c:1408 src/prefs.c:2266
 #, fuzzy
 msgid "Away Messages"
 msgstr "新的暂时离开信息"
 
-#: src/prefs.c:1209
+#: src/prefs.c:1420
 #, fuzzy
 msgid "Title"
 msgstr "文件"
 
-#: src/prefs.c:1213
+#: src/prefs.c:1424
 #, fuzzy
 msgid "Message"
 msgstr "创作信息"
 
-#: src/prefs.c:1253
+#: src/prefs.c:1464
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1257
+#: src/prefs.c:1468
 #, fuzzy
 msgid "Make Away"
 msgstr "立即设定为暂时离开"
 
-#: src/prefs.c:1295
+#: src/prefs.c:1509
 #, fuzzy
 msgid "Ignore new conversations when away   "
 msgstr "暂时离开时,忽略新的对话"
 
-#: src/prefs.c:1306
+#: src/prefs.c:1521
 msgid "Auto Away after"
 msgstr ""
 
-#: src/prefs.c:1318
+#: src/prefs.c:1534
 msgid "minutes using"
 msgstr ""
 
-#: src/prefs.c:1400
-#, fuzzy
-msgid "Browser Options"
-msgstr "选项"
-
-#: src/prefs.c:1412
-msgid "Netscape"
-msgstr ""
-
-#: src/prefs.c:1413
-msgid "KFM"
-msgstr ""
-
-#: src/prefs.c:1415
-msgid "GNOME URL Handler"
-msgstr ""
-
-#: src/prefs.c:1417
-msgid "Manual"
-msgstr "用户手册"
-
-#: src/prefs.c:1426
-msgid "Pop up new window by default"
-msgstr "缺省弹出新窗口"
-
-#: src/prefs.c:1641
+#: src/prefs.c:1753
 #, fuzzy
 msgid "Privacy Options"
 msgstr "选项"
 
-#: src/prefs.c:1657
+#: src/prefs.c:1769
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:1677
+#: src/prefs.c:1788
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:1678
+#: src/prefs.c:1789
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:1680
+#: src/prefs.c:1791
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:1712
+#: src/prefs.c:1822
 #, fuzzy
 msgid "Deny all users"
 msgstr "拒绝某些人"
 
-#: src/prefs.c:1713
+#: src/prefs.c:1823
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:1715
+#: src/prefs.c:1825
 #, fuzzy
 msgid "Block List"
 msgstr "块"
 
-#: src/prefs.c:1791
+#: src/prefs.c:1920
 msgid "Gaim - Preferences"
 msgstr "Gaim - 优先设定"
 
-#: src/prefs.c:1877
+#: src/prefs.c:2000
 msgid "GAIM debug output window"
 msgstr "GAIM 除虫输出窗口"
 
-#: src/prefs.c:2040
+#: src/prefs.c:2185
 msgid "General"
 msgstr "一般设定"
 
-#: src/prefs.c:2064
+#: src/prefs.c:2190
+msgid "Browser"
+msgstr "浏览器"
+
+#: src/prefs.c:2219
 #, fuzzy
 msgid "Conversations"
 msgstr "记录所有对话内容"
 
-#: src/prefs.c:2069
+#: src/prefs.c:2224
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2074
+#: src/prefs.c:2229
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2079
-msgid "Chat Rooms"
-msgstr ""
-
-#: src/prefs.c:2095
+#: src/prefs.c:2250
 msgid "Sounds"
 msgstr "声音"
 
-#: src/prefs.c:2122
-msgid "Browser"
-msgstr "浏览器"
-
-#: src/prefs.c:2133
+#: src/prefs.c:2255
+msgid "Events"
+msgstr ""
+
+#: src/prefs.c:2277
 msgid "Privacy"
 msgstr ""
 
-#: src/rvous.c:148
-msgid "Gaim - Save As..."
-msgstr "Gaim - 存盘为……"
-
-#: src/rvous.c:317
+#: src/prpl.c:73
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
+msgstr ""
+
+#: src/prpl.c:77
+#, fuzzy
+msgid "Protocol Error"
+msgstr "插件错误"
+
+#: src/prpl.c:97
 #, c-format
-msgid "Receiving %s from %s"
-msgstr "收到 %s ,来源: %s"
-
-#: src/rvous.c:693
+msgid "%s was using %s, which got removed. %s is now offline."
+msgstr ""
+
+#: src/prpl.c:100
+#, fuzzy
+msgid "Disconnect"
+msgstr "已断开。"
+
+#: src/prpl.c:140
+#, fuzzy
+msgid "Accept?"
+msgstr "接受"
+
+#: src/prpl.c:160 src/prpl.c:231
 msgid "Accept"
 msgstr "接受"
 
-#: src/rvous.c:720
-#, c-format
-msgid "%s requests you to accept the file: %s (%d bytes)"
-msgstr "%s 请求你接受文件: %s (%d 字元 )"
-
-#: src/rvous.c:723
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s 请求你给他们发送一个文件"
-
-#: src/rvous.c:733
-msgid "Gaim - File Transfer?"
-msgstr "Gaim - 传送文件?"
-
-#: src/server.c:581
+#: src/prpl.c:204
+#, fuzzy
+msgid "Gaim - Prompt"
+msgstr "Gaim - 增加 允许/禁止"
+
+#: src/prpl.c:299
+#, fuzzy
+msgid "Gaim - New User Registration"
+msgstr "Gaim - 记录对话内容"
+
+#: src/prpl.c:308
+msgid "New User Registration"
+msgstr ""
+
+#: src/prpl.c:320
+msgid "Register new user for"
+msgstr ""
+
+#: src/server.c:608
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:582
+#: src/server.c:609
 msgid "No"
 msgstr ""
 
-#: src/toc.c:253 src/toc.c:260
+#: src/toc.c:290 src/toc.c:297
 #, fuzzy
 msgid "Connection Closed"
 msgstr "连接"
 
-#: src/toc.c:295
+#: src/toc.c:332
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/toc.c:354
+#: src/toc.c:391
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/toc.c:355
+#: src/toc.c:392
 msgid "TOC Resume"
 msgstr ""
 
-#: src/toc.c:515
+#: src/toc.c:560
 #, fuzzy
 msgid "Password Change Successeful"
 msgstr "Gaim - 更改密码"
 
-#: src/toc.c:518
+#: src/toc.c:563
 msgid ""
 "TOC has sent a PAUSE command. 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 is only temporary, please be patient."
 msgstr ""
 
-#: src/toc.c:521
+#: src/toc.c:566
 msgid "TOC Pause"
 msgstr ""
 
-#: src/toc.c:977
+#: src/toc.c:923
 #, fuzzy
 msgid "Get Dir Info"
 msgstr "姓名地址录"
 
+#: src/toc.c:1190
+msgid ""
+"Unfortunately, currently TOC only allows new user registration by going to "
+"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+". Clicking the Register button will open the URL for you."
+msgstr ""
+
+#: src/toc.c:1499 src/toc.c:1676
+#, fuzzy
+msgid "Could not connect for transfer!"
+msgstr "连接端口时出错。\n"
+
+#: src/toc.c:1706
+msgid "Could not write file header!"
+msgstr ""
+
+#: src/toc.c:1741
+msgid "Gaim - Save As..."
+msgstr "Gaim - 存盘为……"
+
+#: src/toc.c:1780
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+msgstr "%s 请求你接受文件: %s (%d 字元 )"
+
+#: src/toc.c:1785
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s 请求你给他们发送一个文件"
+
+#, fuzzy
+#~ msgid "Change password for:"
+#~ msgstr "更改密码"
+
+#, fuzzy
+#~ msgid "Make Away Now"
+#~ msgstr "立即设定为暂时离开"
+
+#~ msgid "HTML Link:"
+#~ msgstr "超文本连接:"
+
+#~ msgid "Open URL in existing window"
+#~ msgstr "在已有的窗口内打开 URL"
+
+#~ msgid "Open URL in new window"
+#~ msgstr "新建窗口打开 URL"
+
+#~ msgid "Add URL as bookmark"
+#~ msgstr "把 URL 加入书签"
+
+#~ msgid "Gaim - File Transfer"
+#~ msgstr "Gaim - 传输文件"
+
+#~ msgid "Sending %s to %s"
+#~ msgstr "送 %s 给 %s"
+
+#, fuzzy
+#~ msgid "Error examining file"
+#~ msgstr "读取文件 %s 发生错误"
+
+#, fuzzy
+#~ msgid "GetFile Error"
+#~ msgstr "Gaim - 错误 %d"
+
+#~ msgid ""
+#~ "Username : <B>%s</B>\n"
+#~ "<BR>Warning Level : <B>%d %%</B>\n"
+#~ "<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+#~ msgstr ""
+#~ "用户名称: <B>%s</B>\n"
+#~ "<BR>警告级别: <B>%d %%</B>\n"
+#~ "<BR>连线时刻: <B>%s</B><BR>空转时间(分钟): <B>%d</B>\n"
+#~ "<BR><HR><BR>%s\n"
+
+#~ msgid "Receiving %s from %s"
+#~ msgstr "收到 %s ,来源: %s"
+
+#~ msgid "Gaim - File Transfer?"
+#~ msgstr "Gaim - 传送文件?"
+
 #~ msgid "You must give your password"
 #~ msgstr "你需要输入密码"
 
@@ -2046,9 +2313,6 @@
 #~ msgid "Remove buddy from permit/deny"
 #~ msgstr "把某人从允许/拒绝表删除"
 
-#~ msgid "Ok"
-#~ msgstr "确定"
-
 #~ msgid "Idle"
 #~ msgstr "空转"