diff po/zh_CN.po @ 1195:0af0a11af61e

[gaim-migrate @ 1205] Fixes Fixes fixes :) committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Mon, 04 Dec 2000 07:58:38 +0000
parents 034d5d1d53eb
children f2645224b30a
line wrap: on
line diff
--- a/po/zh_CN.po	Mon Dec 04 07:13:31 2000 +0000
+++ b/po/zh_CN.po	Mon Dec 04 07:58:38 2000 +0000
@@ -3,11 +3,11 @@
 # Hashao <hashao@china.com>, 2000.
 # 
 # 请随便修正,添加,更新,领功。我没有毅力长期维护。多谢
-#: src/gnome_applet_mgr.c:254
+#: src/gnome_applet_mgr.c:256
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2000-10-09 11:11-0700\n"
+"POT-Creation-Date: 2000-12-03 23:24-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,197 +15,178 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/about.c:73
+#: src/about.c:72
 #, c-format
 msgid "About GAIM v%s"
 msgstr "关于 GAIM 第 %s 版"
 
-#: src/aim.c:168
+#: src/aim.c:133 src/buddy.c:2100
+msgid "Signoff"
+msgstr "离开"
+
+#: src/aim.c:147
 msgid "Please enter your logon"
 msgstr "请输入您的登录名称"
 
-#: src/aim.c:172
-msgid "You must give your password"
-msgstr "你需要输入密码"
+#: src/aim.c:147 src/aim.c:152 src/multi.c:852
+#, fuzzy
+msgid "Signon Error"
+msgstr "登录"
 
-#: src/aim.c:222 src/buddy.c:1873
-msgid "Signoff"
-msgstr "离开"
+#: src/aim.c:152
+#, fuzzy
+msgid "Please enter your password"
+msgstr "请输入您的登录名称"
 
-#: src/aim.c:325 src/aim.c:570 src/buddy.c:319
+#: src/aim.c:254 src/multi.c:608
 msgid "Signon"
 msgstr "登录"
 
-#: src/aim.c:326 src/buddy_chat.c:124 src/buddy_chat.c:216 src/dialogs.c:428
-#: src/dialogs.c:747 src/dialogs.c:822 src/dialogs.c:979 src/dialogs.c:1056
-#: src/dialogs.c:1173 src/dialogs.c:1305 src/dialogs.c:1492 src/dialogs.c:1597
-#: src/dialogs.c:1678 src/dialogs.c:1923 src/dialogs.c:2111 src/dialogs.c:2277
-#: src/dialogs.c:2372 src/dialogs.c:3098 src/dialogs.c:3360 src/oscar.c:655
-#: src/rvous.c:279 src/rvous.c:416 src/rvous.c:638
+#: src/aim.c:256 src/aim.c:604 src/buddy.c:2159
+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:327 src/buddy.c:1870
+#: src/aim.c:259
 msgid "Register"
 msgstr "注册"
 
-#: src/aim.c:328
+#: src/aim.c:260
 msgid "Options"
 msgstr "选项"
 
-#: src/aim.c:330 src/aim.c:576 src/buddy.c:1936
+#: src/aim.c:262 src/aim.c:610 src/buddy.c:2166
 msgid "Plugins"
 msgstr "插件"
 
-#: src/aim.c:404
+#. Labels for selectors and text boxes
+#: src/aim.c:338
 msgid "Screen Name: "
 msgstr "显示的姓名:"
 
-#: src/aim.c:407
+#: src/aim.c:341
 msgid "Password: "
 msgstr "密码:"
 
-#: src/aim.c:410
-msgid "Remember Password"
-msgstr "记住密码"
-
-#: src/aim.c:457
+#: src/aim.c:380
 msgid "Gaim - Login"
 msgstr "Gaim - 登入"
 
-#: src/aim.c:565 src/buddy.c:1933
+#: src/aim.c:599 src/buddy.c:2163
 msgid "Preferences"
 msgstr "优先选项"
 
-#: src/away.c:88 src/away.c:203
+#: src/away.c:110 src/away.c:227
 msgid "Back"
 msgstr "返回"
 
-#: src/away.c:99
+#: src/away.c:121
 msgid "I'm Back!"
 msgstr "我胡汉三又回来了!"
 
-#: src/away.c:141
+#: src/away.c:160
 msgid "Gaim - Away!"
 msgstr "Gaim - 暂时离开"
 
-#: src/away.c:242 src/gnome_applet_mgr.c:198
+#: src/away.c:266 src/gnome_applet_mgr.c:200
 msgid "New Away Message"
 msgstr "新的暂时离开信息"
 
-#: src/away.c:260
+#: src/away.c:284
 msgid "Remove Away Message"
 msgstr "删除离开信息"
 
-#: src/buddy.c:161
-#, c-format
-msgid "%d/%d Buddies Online"
-msgstr "%d/%d 朋友来了"
-
 #. Put the buttons in the box
-#: src/buddy.c:260 src/buddy.c:2005 src/buddy_chat.c:816
-#: src/conversation.c:440 src/conversation.c:1658 src/dialogs.c:977
-#: src/dialogs.c:1055 src/dialogs.c:1922 src/dialogs.c:1944 src/dialogs.c:3358
-#: src/prefs.c:667 src/prefs.c:1108 src/prefs.c:1565
+#: 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
 msgid "Add"
 msgstr "增加"
 
-#: src/buddy.c:261 src/buddy.c:2006 src/dialogs.c:987 src/dialogs.c:1071
+#: src/buddy.c:240 src/buddy.c:2235 src/dialogs.c:900 src/dialogs.c:1008
 msgid "Group"
 msgstr "组群"
 
-#: src/buddy.c:262 src/buddy.c:2007 src/buddy_chat.c:818
-#: src/conversation.c:1656 src/dialogs.c:885 src/prefs.c:671 src/prefs.c:1109
-#: src/prefs.c:1577
+#: 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
 msgid "Remove"
 msgstr "删除"
 
-#: src/buddy.c:265 src/buddy.c:1777
+#: src/buddy.c:244 src/buddy.c:1684 src/buddy.c:2003
 msgid "Chat"
 msgstr "聊天"
 
-#: src/buddy.c:266 src/buddy.c:406 src/buddy.c:1775 src/buddy_chat.c:543
+#: src/buddy.c:245 src/buddy.c:413 src/buddy.c:2001 src/buddy_chat.c:562
 msgid "IM"
 msgstr "即时信息"
 
-#: src/buddy.c:267 src/buddy.c:412 src/buddy.c:1776 src/buddy_chat.c:545
-#: src/buddy_chat.c:824 src/conversation.c:1652 src/rvous.c:636
+#: 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
 msgid "Info"
 msgstr "详细资料"
 
-#: src/buddy.c:418 src/dialogs.c:3372
+#. Put the buttons in the box
+#: src/buddy.c:419 src/dialogs.c:996 src/dialogs.c:3433 src/dialogs.c:3448
 msgid "Alias"
 msgstr ""
 
 #: src/buddy.c:425
-msgid "Dir Info"
-msgstr "姓名地址录"
-
-#: src/buddy.c:432
-#, fuzzy
-msgid "Direct IM"
-msgstr "姓名地址录"
-
-#: src/buddy.c:438
-msgid "Away Msg"
-msgstr "暂时离开信息"
-
-#: src/buddy.c:445
-msgid "Toggle Logging"
-msgstr "打开/关闭记录"
-
-#: src/buddy.c:451
 msgid "Add Buddy Pounce"
 msgstr "增加监视朋友"
 
-#: src/buddy.c:1270
+#: src/buddy.c:1368
 msgid "New Buddy Pounce"
 msgstr "新增监视朋友"
 
-#: src/buddy.c:1288
+#: src/buddy.c:1386
 msgid "Remove Buddy Pounce"
 msgstr "取消监视朋友"
 
-#: src/buddy.c:1376
-#, fuzzy, c-format
-msgid "%sBuddy Icon"
+#: src/buddy.c:1675
+#, fuzzy
+msgid "Buddy Icon"
 msgstr "监视朋友"
 
-#: src/buddy.c:1379
-#, c-format
-msgid "%sVoice"
-msgstr ""
-
-#: src/buddy.c:1382
-#, c-format
-msgid "%sIM Image"
+#: src/buddy.c:1678
+msgid "Voice"
 msgstr ""
 
-#: src/buddy.c:1385
-#, fuzzy, c-format
-msgid "%sChat"
-msgstr "聊天"
-
-#: src/buddy.c:1388
-#, c-format
-msgid "%sGet File"
+#: src/buddy.c:1681
+msgid "IM Image"
 msgstr ""
 
-#: src/buddy.c:1391
-#, c-format
-msgid "%sSend File"
-msgstr ""
+#: src/buddy.c:1687
+#, fuzzy
+msgid "Get File"
+msgstr "文件"
 
-#: src/buddy.c:1446
+#: src/buddy.c:1690
+#, fuzzy
+msgid "Send File"
+msgstr "文件"
+
+#: src/buddy.c:1749
 msgid "Warnings: %d%%\n"
 msgstr "警告:%d%%\n"
 
-#: src/buddy.c:1452
+#: src/buddy.c:1754
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:1456
+#: src/buddy.c:1758
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -217,790 +198,823 @@
 "登入到:%s\n"
 "%s%s%s"
 
-#: src/buddy.c:1456
+#: src/buddy.c:1761
 msgid "Idle: "
 msgstr "空转时间:"
 
-#: src/buddy.c:1501
+#: src/buddy.c:1828
 #, 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:1644
+#: src/buddy.c:1878
 #, 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:1802
+#: src/buddy.c:2028
 msgid "Information on selected Buddy"
 msgstr "选中的朋友的资料"
 
-#: src/buddy.c:1803 src/dialogs.c:738
+#: src/buddy.c:2029 src/dialogs.c:657
 msgid "Send Instant Message"
 msgstr "发出即时信息"
 
-#: src/buddy.c:1804
+#: src/buddy.c:2030
 msgid "Start/join a Buddy Chat"
 msgstr "发起/加入一个聊天室"
 
-#: src/buddy.c:1857
+#: src/buddy.c:2088
 msgid "File"
 msgstr "文件"
 
-#: src/buddy.c:1861 src/buddy.c:1862
+#: src/buddy.c:2092 src/buddy.c:2093
 msgid "Add A Buddy"
 msgstr "加入一个哥们儿"
 
-#: src/buddy.c:1863
+#: src/buddy.c:2094
 #, fuzzy
 msgid "Join A Chat"
 msgstr "加入聊天"
 
-#: src/buddy.c:1865
+#: src/buddy.c:2095
+#, fuzzy
+msgid "New Instant Message"
+msgstr "发出即时信息"
+
+#: src/buddy.c:2097
 msgid "Import Buddy List"
 msgstr "导入朋友列表"
 
-#: src/buddy.c:1866
+#: src/buddy.c:2098
 msgid "Export Buddy List"
 msgstr "导出朋友列表"
 
-#: src/buddy.c:1876
+#: src/buddy.c:2103
 msgid "Quit"
 msgstr "退出"
 
-#: src/buddy.c:1878 src/buddy_chat.c:537 src/buddy_chat.c:791
-#: src/buddy_chat.c:812 src/conversation.c:1654 src/dialogs.c:505
-#: src/plugins.c:317 src/prefs.c:1810
+#: 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:1883
+#: src/buddy.c:2110
 msgid "Tools"
 msgstr "工具"
 
-#: src/buddy.c:1888 src/gnome_applet_mgr.c:142 src/gnome_applet_mgr.c:195
+#: src/buddy.c:2115 src/gnome_applet_mgr.c:147 src/gnome_applet_mgr.c:197
 msgid "Away"
 msgstr "暂时离开"
 
-#: src/buddy.c:1893
+#: src/buddy.c:2120
 msgid "Buddy Pounce"
 msgstr "监视朋友"
 
-#: src/buddy.c:1901 src/dialogs.c:2105 src/dialogs.c:2262
+#: src/buddy.c:2128 src/dialogs.c:2135 src/dialogs.c:2295
 msgid "Search for Buddy"
 msgstr "搜寻朋友"
 
-#: src/buddy.c:1904
+#: src/buddy.c:2131
 msgid "by Email"
 msgstr "使用电邮"
 
-#: src/buddy.c:1908
+#: src/buddy.c:2135
 msgid "by Dir Info"
 msgstr "使用姓名地址录"
 
-#: src/buddy.c:1915 src/buddy.c:1916
+#: src/buddy.c:2142 src/buddy.c:2143
 msgid "Settings"
 msgstr "设定"
 
-#: src/buddy.c:1919
+#: src/buddy.c:2146
 msgid "User Info"
 msgstr "用户详细资料"
 
-#: src/buddy.c:1923 src/dialogs.c:1299
+#: src/buddy.c:2150 src/dialogs.c:1353
 msgid "Directory Info"
 msgstr "姓名地址录"
 
-#: src/buddy.c:1927 src/dialogs.c:1486
+#: src/buddy.c:2154 src/dialogs.c:1592
 msgid "Change Password"
 msgstr "更改密码"
 
-#: src/buddy.c:1941
+#: src/buddy.c:2171
 #, fuzzy
 msgid "Perl"
 msgstr "允许"
 
-#: src/buddy.c:1944
+#: src/buddy.c:2174
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:1948
+#: src/buddy.c:2178
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:1952
+#: src/buddy.c:2182
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:1960
+#: src/buddy.c:2190
 msgid "Help"
 msgstr "帮助"
 
-#: src/buddy.c:1965
+#: src/buddy.c:2195
 #, fuzzy
 msgid "About Gaim"
 msgstr "关于"
 
-#: src/buddy.c:1984 src/prefs.c:2045
+#: src/buddy.c:2214 src/prefs.c:2053
 msgid "Buddy List"
 msgstr "朋友列表"
 
-#: src/buddy.c:2036
+#: src/buddy.c:2266
 msgid "Add a new Buddy"
 msgstr "增加一个新哥们儿"
 
-#: src/buddy.c:2037
+#: src/buddy.c:2267
 #, fuzzy
 msgid "Add a new Group"
 msgstr "增加一个新哥们儿"
 
-#: src/buddy.c:2038
+#: src/buddy.c:2268
 msgid "Remove selected Buddy"
 msgstr "删除选中的朋友"
 
-#: src/buddy.c:2063
+#: src/buddy.c:2293
 msgid "Online"
 msgstr "在线"
 
-#: src/buddy.c:2065
+#: src/buddy.c:2295
 msgid "Edit Buddies"
 msgstr "修改朋友表"
 
-#: src/buddy.c:2102
+#: src/buddy.c:2332
 msgid "Gaim - Buddy List"
 msgstr "Gaim - 朋友列表"
 
-#: src/buddy_chat.c:121 src/buddy_chat.c:729 src/buddy_chat.c:741
+#: src/buddy_chat.c:135
+msgid "Join Chat"
+msgstr "加入聊天"
+
+#: src/buddy_chat.c:139 src/buddy_chat.c:750 src/buddy_chat.c:762
 msgid "Buddy Chat"
 msgstr "朋友聊天"
 
-#: src/buddy_chat.c:123
-msgid "Join"
-msgstr "加入"
-
-#: src/buddy_chat.c:129
+#: src/buddy_chat.c:151
 msgid "Join what group:"
 msgstr "要加入的组:"
 
-#: src/buddy_chat.c:135
+#: src/buddy_chat.c:167
+#, fuzzy
+msgid "Join Chat As:"
+msgstr "加入聊天"
+
+#: src/buddy_chat.c:181
 msgid "AIM Private Chats"
 msgstr ""
 
-#: src/buddy_chat.c:143
+#: src/buddy_chat.c:189
 msgid "AOL Community Chats"
 msgstr ""
 
-#: src/buddy_chat.c:172
-msgid "Join Chat"
-msgstr "加入聊天"
+#: src/buddy_chat.c:197
+msgid "Join"
+msgstr "加入"
 
-#: src/buddy_chat.c:217 src/buddy_chat.c:539 src/buddy_chat.c:790
+#: src/buddy_chat.c:244 src/buddy_chat.c:558 src/buddy_chat.c:817
 msgid "Invite"
 msgstr "邀请"
 
-#: src/buddy_chat.c:234
+#: src/buddy_chat.c:261
 msgid "Invite who?"
 msgstr "想请谁?"
 
-#: src/buddy_chat.c:238
+#: src/buddy_chat.c:265
 msgid "With message:"
 msgstr "邀请信息:"
 
-#: src/buddy_chat.c:265
+#: src/buddy_chat.c:292
 msgid "Invite to Buddy Chat"
 msgstr "请人聊天"
 
-#: src/buddy_chat.c:424
+#: src/buddy_chat.c:420
 #, c-format
 msgid "<B>%s entered the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:452
+#: src/buddy_chat.c:459
 #, c-format
 msgid "<B>%s left the room.</B>"
 msgstr ""
 
-#: src/buddy_chat.c:540 src/buddy_chat.c:789
+#: src/buddy_chat.c:559 src/buddy_chat.c:816
 msgid "Whisper"
 msgstr "悄悄话"
 
-#: src/buddy_chat.c:541 src/buddy_chat.c:788 src/buddy_chat.c:826
-#: src/conversation.c:1651 src/dialogs.c:1679
+#: src/buddy_chat.c:560 src/buddy_chat.c:815 src/buddy_chat.c:855
+#: src/conversation.c:1733
 msgid "Send"
 msgstr "送出"
 
-#: src/buddy_chat.c:544
+#: src/buddy_chat.c:563
 msgid "Ignore"
 msgstr "不理他"
 
-#: src/buddy_chat.c:820 src/conversation.c:1659
+#: src/buddy_chat.c:849 src/conversation.c:1741
 msgid "Block"
 msgstr "块"
 
-#: src/buddy_chat.c:822 src/conversation.c:1653 src/dialogs.c:424
-#: src/dialogs.c:426 src/rvous.c:637
+#: src/buddy_chat.c:851 src/conversation.c:1735 src/dialogs.c:343
+#: src/dialogs.c:345 src/rvous.c:695
 msgid "Warn"
 msgstr "警告"
 
-#: src/conversation.c:171
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s established.</B><BR><HR>"
-msgstr "<HR><B>%s 登入到 %s%s。</B><BR><HR>"
-
-#: src/conversation.c:178
-#, fuzzy, c-format
-msgid "<HR><B>Direct Connection with %s closed.</B><BR><HR>"
-msgstr "<HR><B>%s 登入到 %s%s。</B><BR><HR>"
-
-#: src/conversation.c:435
+#: src/conversation.c:426
 #, c-format
 msgid "Removing '%s' from buddylist.\n"
 msgstr "把 “%s”从朋友表上删去\n"
 
-#: src/conversation.c:688
-msgid "Message too long, some data truncated."
-msgstr "信息太长了,后面的被砍掉了。"
-
-#: src/conversation.c:688 src/dialogs.c:2825 src/dialogs.c:2895
-#: src/rvous.c:221 src/rvous.c:492
-msgid "Error"
-msgstr "错误"
-
-#: src/conversation.c:875
+#: src/conversation.c:902
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "目前在 %d\n"
 
-#: src/conversation.c:884
+#: src/conversation.c:911
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "把位置设定到 %d\n"
 
-#: src/conversation.c:1489
+#: src/conversation.c:1497
 msgid "Bold"
 msgstr "粗体"
 
-#: src/conversation.c:1489 src/prefs.c:1292
+#: src/conversation.c:1497 src/prefs.c:818
 msgid "Bold Text"
 msgstr "粗体文字"
 
-#: src/conversation.c:1493 src/conversation.c:1494
+#: src/conversation.c:1501 src/conversation.c:1502
 msgid "Italics"
 msgstr "斜体"
 
-#: src/conversation.c:1493 src/prefs.c:1293
+#: src/conversation.c:1501 src/prefs.c:819
 msgid "Italics Text"
 msgstr "斜体文字"
 
-#: src/conversation.c:1497 src/conversation.c:1498
+#: src/conversation.c:1505 src/conversation.c:1506
 msgid "Underline"
 msgstr "下加线"
 
-#: src/conversation.c:1497
+#: src/conversation.c:1505
 msgid "Underline Text"
 msgstr "下加线文字"
 
-#: src/conversation.c:1501 src/conversation.c:1502
+#: src/conversation.c:1509 src/conversation.c:1510
 msgid "Strike"
 msgstr "划掉"
 
-#: src/conversation.c:1501
+#: src/conversation.c:1509
 msgid "Strike through Text"
 msgstr "划掉的文字"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Small"
 msgstr "小"
 
-#: src/conversation.c:1505
+#: src/conversation.c:1513
 msgid "Decrease font size"
 msgstr "缩小字体"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal"
 msgstr "正常"
 
-#: src/conversation.c:1508
+#: src/conversation.c:1516
 msgid "Normal font size"
 msgstr "正常字体大小"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Big"
 msgstr "大"
 
-#: src/conversation.c:1511
+#: src/conversation.c:1519
 msgid "Increase font size"
 msgstr "增大字体"
 
-#: src/conversation.c:1518 src/conversation.c:1519
+#: src/conversation.c:1526 src/conversation.c:1527
 msgid "Font"
 msgstr "字型"
 
-#: src/conversation.c:1518 src/dialogs.c:2724 src/dialogs.c:2740
+#: src/conversation.c:1526 src/dialogs.c:2749 src/dialogs.c:2765
 msgid "Select Font"
 msgstr "选择字型"
 
-#: src/conversation.c:1522 src/conversation.c:1523 src/conversation.c:1526
-#: src/conversation.c:1527
+#: src/conversation.c:1530 src/conversation.c:1531 src/conversation.c:1534
+#: src/conversation.c:1535
 msgid "Color"
 msgstr "颜色"
 
-#: src/conversation.c:1522 src/prefs.c:1306
+#: src/conversation.c:1530 src/prefs.c:832
 msgid "Text Color"
 msgstr "文字颜色"
 
-#: src/conversation.c:1526 src/prefs.c:1323
+#: src/conversation.c:1534 src/prefs.c:849
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1533 src/conversation.c:1534
+#: src/conversation.c:1541 src/conversation.c:1542
 msgid "Link"
 msgstr "连接"
 
-#: src/conversation.c:1533 src/dialogs.c:2366
+#: src/conversation.c:1541 src/dialogs.c:2391
 msgid "Insert Link"
 msgstr "插入连接"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 #, fuzzy
 msgid "Smiley"
 msgstr "文件"
 
-#: src/conversation.c:1537
+#: src/conversation.c:1545
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1544 src/conversation.c:1545
+#: src/conversation.c:1552 src/conversation.c:1553
 msgid "Logging"
 msgstr "记录"
 
-#: src/conversation.c:1544
+#: src/conversation.c:1552
 msgid "Enable logging"
 msgstr "打开记录"
 
-#: src/conversation.c:1548 src/conversation.c:1549
+#: src/conversation.c:1556 src/conversation.c:1557
 msgid "Sound"
 msgstr "声音"
 
-#: src/conversation.c:1548
+#: src/conversation.c:1556
 msgid "Enable sounds"
 msgstr "打开声音"
 
-#: src/dialogs.c:225
-msgid "Error Resolving Mail Server.\n"
-msgstr "解析电邮服务器时出错。\n"
+#: src/conversation.c:1768
+#, fuzzy
+msgid "Send message as: "
+msgstr "发出信息声"
 
-#: src/dialogs.c:231
-msgid "Error Connecting to Socket.\n"
-msgstr "连接端口时出错。\n"
-
-#: src/dialogs.c:441
+#: src/dialogs.c:360
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "你真的想警告%s?"
 
-#: src/dialogs.c:445
+#: src/dialogs.c:364
 msgid "Warn anonymously?"
 msgstr "发匿名警告?"
 
-#: src/dialogs.c:448
+#: src/dialogs.c:367
 msgid "Anonymous warnings are less harsh."
 msgstr "匿名警告不那么严厉。"
 
-#: src/dialogs.c:473
+#: src/dialogs.c:393
 msgid "Gaim - Warn user?"
 msgstr "Gaim - 警告用户?"
 
-#: src/dialogs.c:541
+#: src/dialogs.c:458
 #, c-format
 msgid "Unable to write file %s."
 msgstr "不能写入文件 %s。"
 
-#: src/dialogs.c:544
+#: src/dialogs.c:461
 #, c-format
 msgid "Unable to read file %s."
 msgstr "不能读入文件 %s。"
 
-#: src/dialogs.c:547
+#: src/dialogs.c:464
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "信息太长,后面 %s 字元被砍掉了。"
 
-#: src/dialogs.c:550
+#: src/dialogs.c:467
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 现在没有登入。"
 
-#: src/dialogs.c:553
+#: src/dialogs.c:470
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允许警告 %s 。"
 
-#: src/dialogs.c:556
+#: src/dialogs.c:473
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "取消了一个信息,你超出了服侍器的速度限制。"
 
-#: src/dialogs.c:559
+#: src/dialogs.c:476
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 中没有聊天。"
 
-#: src/dialogs.c:562
+#: src/dialogs.c:479
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "你发送给 %s 的速度太快了。"
 
-#: src/dialogs.c:565
+#: src/dialogs.c:482
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/dialogs.c:568
+#: src/dialogs.c:485
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息发送的速度太快。"
 
-#: src/dialogs.c:571
+#: src/dialogs.c:488
 msgid "Failure."
 msgstr "失败了。"
 
-#: src/dialogs.c:574
+#: src/dialogs.c:491
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/dialogs.c:577
+#: src/dialogs.c:494
 msgid "Need more qualifiers."
 msgstr "需要更多的参数。"
 
-#: src/dialogs.c:580
+#: src/dialogs.c:497
 msgid "Dir service temporarily unavailable."
 msgstr "姓名地址录服务器暂时连不上。"
 
-#: src/dialogs.c:583
+#: src/dialogs.c:500
 msgid "Email lookup restricted."
 msgstr "电邮查找限制。"
 
-#: src/dialogs.c:586
+#: src/dialogs.c:503
 msgid "Keyword ignored."
 msgstr "关键字被忽略。"
 
-#: src/dialogs.c:589
+#: src/dialogs.c:506
 msgid "No keywords."
 msgstr "没有关键字。"
 
-#: src/dialogs.c:592
+#: src/dialogs.c:509
 msgid "User has no directory information."
 msgstr "该用户没有姓名地址录"
 
-#: src/dialogs.c:596
+#: src/dialogs.c:513
 msgid "Country not supported."
 msgstr "不支持这个国家。"
 
-#: src/dialogs.c:599
+#: src/dialogs.c:516
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "不明错误: %s 。"
 
 #. Incorrect nick/password
-#: src/dialogs.c:602 src/oscar.c:318
+#: src/dialogs.c:519 src/oscar.c:471
 msgid "Incorrect nickname or password."
 msgstr "昵名或者密码错误。"
 
-#: src/dialogs.c:605
+#: src/dialogs.c:522
 msgid "The service is temporarily unavailable."
 msgstr "暂时没有该服务。"
 
-#: src/dialogs.c:608
+#: src/dialogs.c:525
 msgid "Your warning level is currently too high to log in."
 msgstr "你目前的警告级别太高,无法登入。"
 
-#: src/dialogs.c:611
+#: src/dialogs.c:528
 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:614
+#: src/dialogs.c:531
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "发生不明的登录错误: %s。"
 
-#: src/dialogs.c:617
+#: src/dialogs.c:534
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "不明错误 %d 发生了。具体讯息: %s"
 
-#: src/dialogs.c:620
+#: src/dialogs.c:537
 #, c-format
 msgid "Gaim - Error %d"
 msgstr "Gaim - 错误 %d"
 
 #. Build OK Button
-#: src/dialogs.c:677 src/dialogs.c:742 src/dialogs.c:817 src/dialogs.c:1168
-#: src/dialogs.c:1491 src/dialogs.c:1777 src/dialogs.c:2110 src/dialogs.c:2272
-#: src/dialogs.c:2371
+#: 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
 msgid "OK"
 msgstr "确认"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:671
 #, fuzzy
 msgid "IM who:"
 msgstr "给谁即时信息:"
 
-#: src/dialogs.c:776
+#: src/dialogs.c:695
 msgid "Gaim - IM user"
 msgstr "Gaim - 即时信息用户"
 
-#: src/dialogs.c:813
+#: src/dialogs.c:732
 #, fuzzy
 msgid "Get User Info"
 msgstr "用户详细资料"
 
-#: src/dialogs.c:827
+#: src/dialogs.c:746
 msgid "User:"
 msgstr ""
 
-#: src/dialogs.c:851
+#: src/dialogs.c:770
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - 设定用户资料"
 
-#: src/dialogs.c:933
+#: src/dialogs.c:845
 msgid "Buddies"
 msgstr "哥们儿们"
 
-#: src/dialogs.c:985
+#: src/dialogs.c:898
 #, fuzzy
 msgid "Add Group"
 msgstr "组群"
 
-#: src/dialogs.c:1015
+#: src/dialogs.c:928
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - 增加朋友"
 
-#: src/dialogs.c:1062
-msgid "Add Buddy"
-msgstr "增加朋友"
-
-#: src/dialogs.c:1064 src/dialogs.c:3368
-msgid "Buddy"
-msgstr "朋友"
-
-#: src/dialogs.c:1103
+#: src/dialogs.c:957
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - 增加朋友"
 
-#. Put the buttons in the box
-#: src/dialogs.c:1179
-msgid "Buddy To Pounce:"
-msgstr "被监视的朋友:"
+#: src/dialogs.c:967
+msgid "Add Buddy"
+msgstr "增加朋友"
+
+#: src/dialogs.c:979 src/dialogs.c:3443
+msgid "Buddy"
+msgstr "朋友"
+
+#: src/dialogs.c:1109
+#, fuzzy
+msgid "Pounce buddy as:"
+msgstr "朋友登录声"
+
+#: src/dialogs.c:1181
+#, fuzzy
+msgid "Buddy:"
+msgstr "朋友"
+
+#: src/dialogs.c:1189
+#, fuzzy
+msgid "Message:"
+msgstr "创作信息"
 
-#: src/dialogs.c:1184
-msgid "Open IM Window on Buddy Logon"
+#: 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:1187
-msgid "Send IM on Buddy Logon"
+#: src/dialogs.c:1234
+#, fuzzy
+msgid "Send IM on pounce"
 msgstr "朋友登录时发送即时信息"
 
-#: src/dialogs.c:1195
-msgid "Message to send:"
-msgstr "发送信息:"
-
-#: src/dialogs.c:1216
+#: src/dialogs.c:1263
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - 新增监视朋友"
 
 #. Build Save Button
-#: src/dialogs.c:1303 src/dialogs.c:1596 src/dialogs.c:3093
+#: src/dialogs.c:1359 src/dialogs.c:1738 src/dialogs.c:3180
 msgid "Save"
 msgstr "存盘"
 
-#: src/dialogs.c:1321
+#: src/dialogs.c:1376
 msgid "Allow Web Searches To Find Your Info"
 msgstr "允许从网页搜寻找到你的资料"
 
 #. Line 1
-#: src/dialogs.c:1324 src/dialogs.c:2128
+#: src/dialogs.c:1379 src/dialogs.c:2159
 msgid "First Name"
 msgstr "名"
 
 #. Line 2
-#: src/dialogs.c:1335 src/dialogs.c:2140
+#: src/dialogs.c:1390 src/dialogs.c:2171
 msgid "Middle Name"
 msgstr "字"
 
 #. Line 3
-#: src/dialogs.c:1347 src/dialogs.c:2152
+#: src/dialogs.c:1402 src/dialogs.c:2183
 msgid "Last Name"
 msgstr "姓"
 
 #. Line 4
-#: src/dialogs.c:1358 src/dialogs.c:2164
+#: src/dialogs.c:1413 src/dialogs.c:2195
 msgid "Maiden Name"
 msgstr "娘家姓"
 
 #. Line 5
-#: src/dialogs.c:1369 src/dialogs.c:2176
+#: src/dialogs.c:1424 src/dialogs.c:2207
 msgid "City"
 msgstr "市"
 
 #. Line 6
-#: src/dialogs.c:1380 src/dialogs.c:2187
+#: src/dialogs.c:1435 src/dialogs.c:2218
 msgid "State"
 msgstr "省"
 
 #. Line 7
-#: src/dialogs.c:1391 src/dialogs.c:2198
+#: src/dialogs.c:1446 src/dialogs.c:2229
 msgid "Country"
 msgstr "国"
 
-#: src/dialogs.c:1436
+#: src/dialogs.c:1490
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - 设定姓名地址录"
 
-#: src/dialogs.c:1453
+#: src/dialogs.c:1507
 msgid "New Passwords Do Not Match"
 msgstr "新密码不一致"
 
-#: src/dialogs.c:1453 src/dialogs.c:1458
+#: src/dialogs.c:1507 src/dialogs.c:1512
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - 更改密码错误"
 
-#: src/dialogs.c:1458
+#: src/dialogs.c:1512
 msgid "Fill out all fields completely"
 msgstr "把所有的表格都添了"
 
-#: src/dialogs.c:1500
+#: src/dialogs.c:1541
+#, fuzzy
+msgid "Change password for:"
+msgstr "更改密码"
+
+#: src/dialogs.c:1580 src/toc.c:515
+msgid "Gaim - Password Change"
+msgstr "Gaim - 更改密码"
+
+#: src/dialogs.c:1612
 msgid "Original Password"
 msgstr "旧密码"
 
-#: src/dialogs.c:1516
+#: src/dialogs.c:1626
 msgid "New Password"
 msgstr "新密码"
 
-#: src/dialogs.c:1530
+#: src/dialogs.c:1640
 msgid "New Password (again)"
 msgstr "新密码(确定)"
 
-#: src/dialogs.c:1567
-msgid "Gaim - Password Change"
-msgstr "Gaim - 更改密码"
+#: src/dialogs.c:1693
+msgid "Set info for:"
+msgstr ""
 
-#: src/dialogs.c:1630
+#: src/dialogs.c:1776
 msgid "Gaim - Set User Info"
 msgstr "Gaim - 设定用户资料"
 
-#: src/dialogs.c:1786
+#: src/dialogs.c:1817
 msgid "Below are the results of your search: "
 msgstr "以下是你搜索的结果:"
 
-#: src/dialogs.c:1918
-#, fuzzy
-msgid "Permit / Deny"
-msgstr "只允许某些人"
+#: src/dialogs.c:1943 src/dialogs.c:1950
+msgid "Permit"
+msgstr "允许"
 
-#: src/dialogs.c:1929 src/prefs.c:471
+#: src/dialogs.c:1945 src/dialogs.c:1952
 msgid "Deny"
 msgstr "拒绝"
 
-#: src/dialogs.c:1934 src/prefs.c:455 src/prefs.c:512
-msgid "Permit"
-msgstr "允许"
-
-#: src/dialogs.c:1975
-msgid "Gaim - Add Permit/Deny"
+#: src/dialogs.c:1993
+#, fuzzy
+msgid "Gaim - Add Permit"
 msgstr "Gaim - 增加 允许/禁止"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:1995
+#, fuzzy
+msgid "Gaim - Add Deny"
+msgstr "Gaim - 增加 允许/禁止"
+
+#: src/dialogs.c:2057
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - 记录对话内容"
 
-#: src/dialogs.c:2235
+#: src/dialogs.c:2266
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - 根据用户资料查寻朋友"
 
-#: src/dialogs.c:2282
+#: src/dialogs.c:2315
 msgid "Email"
 msgstr "电邮"
 
-#: src/dialogs.c:2301
+#: src/dialogs.c:2328
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - 根据电邮查寻朋友"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2410
 msgid "URL"
 msgstr ""
 
-#: src/dialogs.c:2393
+#: src/dialogs.c:2418
 msgid "Description"
 msgstr "描述"
 
-#: src/dialogs.c:2419
+#: src/dialogs.c:2444
 msgid "GAIM - Add URL"
 msgstr "GAIM - 增加 URL"
 
-#: src/dialogs.c:2562 src/dialogs.c:2575 src/dialogs.c:2612
+#: src/dialogs.c:2587 src/dialogs.c:2600 src/dialogs.c:2637
 msgid "Select Text Color"
 msgstr "设定文字颜色"
 
-#: src/dialogs.c:2599
+#: src/dialogs.c:2624
 #, fuzzy
 msgid "Select Background Color"
 msgstr "设定文字颜色"
 
-#: src/dialogs.c:2824 src/rvous.c:220
+#: src/dialogs.c:2847 src/rvous.c:265
 #, c-format
 msgid "Error writing file %s"
 msgstr "写入文件 %s 发生错误"
 
-#: src/dialogs.c:2841
+#: src/dialogs.c:2848 src/dialogs.c:2968 src/oscar.c:1958 src/rvous.c:266
+#: src/rvous.c:548
+msgid "Error"
+msgstr "错误"
+
+#: src/dialogs.c:2901
 msgid "Gaim - Export Buddy List"
 msgstr "Gaim - 导出朋友列表"
 
-#: src/dialogs.c:2894 src/rvous.c:491
+#: src/dialogs.c:2967 src/rvous.c:547
 #, c-format
 msgid "Error reading file %s"
 msgstr "读取文件 %s 发生错误"
 
-#: src/dialogs.c:2973
+#: src/dialogs.c:3045
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - 导入朋友列表"
 
-#: src/dialogs.c:3054
+#: src/dialogs.c:3124
 msgid "Gaim - New away message"
 msgstr "Gaim - 更新暂时离开信息"
 
-#. Set up our frame
-#: src/dialogs.c:3061
+#. Put frame and button-box in the toplevel
+#: src/dialogs.c:3136
 #, fuzzy
 msgid "New away message"
 msgstr "新的暂时离开信息"
 
-#. Make a label for away entry
-#: src/dialogs.c:3071
+#: src/dialogs.c:3149
 msgid "Away title: "
 msgstr "暂时离开标题:"
 
 #. Checkbox for showing away msg
-#: src/dialogs.c:3121
+#: src/dialogs.c:3193
 #, fuzzy
 msgid "Make Away Now"
 msgstr "立即设定为暂时离开"
 
 #. show everything
-#: src/dialogs.c:3299
+#: src/dialogs.c:3370
 #, fuzzy
 msgid "Smile!"
 msgstr "文件"
 
-#: src/dialogs.c:3366
+#: src/dialogs.c:3441
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "增加朋友"
 
-#: src/dialogs.c:3404
+#: src/dialogs.c:3478
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - 增加朋友"
@@ -1010,19 +1024,19 @@
 msgid "file not found: %s\n"
 msgstr "找不到文件: %s\n"
 
-#: src/gnome_applet_mgr.c:122
+#: src/gnome_applet_mgr.c:121
 msgid "Offilne. Click to bring up login box."
 msgstr "离线。点击这里启动登录窗"
 
-#: src/gnome_applet_mgr.c:129
+#: src/gnome_applet_mgr.c:128
 msgid "Attempting to sign on...."
 msgstr "正在登录……"
 
-#: src/gnome_applet_mgr.c:252
+#: src/gnome_applet_mgr.c:254
 msgid "GAIM"
 msgstr ""
 
-#: src/gnome_applet_mgr.c:364
+#: src/gnome_applet_mgr.c:366
 msgid "Can't create GAIM applet!"
 msgstr "无法建立 GAIM applet!"
 
@@ -1030,117 +1044,180 @@
 msgid "Offline"
 msgstr "离线"
 
-#: src/gnome_applet_mgr.c:408
+#: src/gnome_applet_mgr.c:411
 msgid "Font does not exist"
 msgstr "字型不存在"
 
-#: src/gnome_applet_mgr.c:424
+#: src/gnome_applet_mgr.c:427
 msgid "About..."
 msgstr "关于……"
 
-#: src/gtkhtml.c:1385
+#: src/gtkhtml.c:1383
 msgid "HTML Link:"
 msgstr "超文本连接:"
 
-#: src/gtkhtml.c:1798
+#: src/gtkhtml.c:1796
 msgid "Open URL in existing window"
 msgstr "在已有的窗口内打开 URL"
 
-#: src/gtkhtml.c:1807
+#: src/gtkhtml.c:1805
 msgid "Open URL in new window"
 msgstr "新建窗口打开 URL"
 
-#: src/gtkhtml.c:1815
+#: src/gtkhtml.c:1813
 msgid "Add URL as bookmark"
 msgstr "把 URL 加入书签"
 
-#: src/html.c:120
-msgid "g001: Error resolving host\n"
-msgstr "g001: 解析主机错误\n"
-
-#: src/html.c:122
+#: src/html.c:122 src/html.c:125
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 打开连接错误\n"
 
-#: src/html.c:154
+#: src/html.c:158
 #, c-format
 msgid "Getting %d bytes from %s"
 msgstr "接收到 %d 字元,来源: %s"
 
-#: src/html.c:167
+#: src/html.c:171
 msgid "Getting Data"
 msgstr "接收数据"
 
-#: src/html.c:200
+#: src/html.c:204
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "收到了:“%s”\n"
 
-#: src/oscar.c:157 src/oscar.c:184
+#: src/multi.c:367 src/prefs.c:112
+#, fuzzy
+msgid "General Options"
+msgstr "选项"
+
+#: src/multi.c:402
+#, fuzzy
+msgid "Screenname:"
+msgstr "显示的姓名:"
+
+#: src/multi.c:414
+#, fuzzy
+msgid "Password:"
+msgstr "密码:"
+
+#: src/multi.c:429
+msgid "Remember Password"
+msgstr "记住密码"
+
+#: src/multi.c:430
+#, fuzzy
+msgid "Auto-Login"
+msgstr "自动登录"
+
+#: src/multi.c:431
+msgid "Send KeepAlive packet (6 bytes/second)"
+msgstr ""
+
+#: src/multi.c:473
+#, fuzzy
+msgid "Gaim - Modify Account"
+msgstr "Gaim - 登入"
+
+#: src/multi.c:482
+msgid "Modify Account"
+msgstr ""
+
+#: src/multi.c:576
+#, fuzzy
+msgid "Enter Password"
+msgstr "新密码"
+
+#: src/multi.c:669
+#, fuzzy
+msgid "Gaim - Account Editor"
+msgstr "Gaim - 插件列表"
+
+#: src/multi.c:678
+msgid "Account Editor"
+msgstr ""
+
+#: src/multi.c:697
+msgid "Modify"
+msgstr ""
+
+#: src/multi.c:701
+#, fuzzy
+msgid "Sign On/Off"
+msgstr "离开"
+
+#: src/multi.c:705
+#, fuzzy
+msgid "Delete"
+msgstr "选择字型"
+
+#: src/multi.c:851
+#, 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
 msgid "Disconnected."
 msgstr "已断开。"
 
-#: src/oscar.c:165
+#: src/oscar.c:308
 #, fuzzy
 msgid "connection error (rend)\n"
 msgstr "连接错误!\n"
 
-#: src/oscar.c:182
+#: src/oscar.c:316
 #, fuzzy
 msgid "major connection error\n"
 msgstr "连接错误!\n"
 
-#: src/oscar.c:196
+#: src/oscar.c:330 src/toc.c:500
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/oscar.c:197
+#: src/oscar.c:331
 #, fuzzy
 msgid "Chat Error!"
 msgstr "错误"
 
-#: src/oscar.c:220
+#: src/oscar.c:362
 #, c-format
 msgid "Logging in %s\n"
 msgstr "连接到: %s\n"
 
-#: src/oscar.c:230
-#, c-format
-msgid "Looking up %s"
-msgstr "寻找 %s"
-
-#: src/oscar.c:235
+#: src/oscar.c:399
 msgid "internal connection error\n"
 msgstr "内部连接错误\n"
 
-#: src/oscar.c:240
+#: src/oscar.c:400
 msgid "Unable to login to AIM"
 msgstr "不能登录到 AIM"
 
-#: src/oscar.c:248
-msgid "couldn't resolve host\n"
+#: src/oscar.c:405
+#, fuzzy
+msgid "couldn't resolve host"
 msgstr "不能解析主机\n"
 
-#: src/oscar.c:252
-msgid "couldn't connect to host\n"
+#: src/oscar.c:409
+#, fuzzy
+msgid "couldn't connect to host"
 msgstr "不能连接到主机\n"
 
-#: src/oscar.c:258
+#: src/oscar.c:416
 #, c-format
 msgid "Signon: %s"
 msgstr "登录: %s"
 
-#: src/oscar.c:283
+#: src/oscar.c:426
 msgid "Password sent, waiting for response\n"
 msgstr "密码已送出,等候回应\n"
 
-#: src/oscar.c:299
+#: src/oscar.c:451
 msgid "Signed off.\n"
 msgstr "登出。\n"
 
 #. connecting too frequently
-#: src/oscar.c:313
+#: src/oscar.c:466
 #, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -1148,79 +1225,112 @@
 msgstr ""
 "你连接,断开的频率太高了,等十分钟再试。如果你非要接着试,等的时间会更长。"
 
-#: src/oscar.c:313 src/oscar.c:318 src/oscar.c:323 src/oscar.c:761
-#: src/oscar.c:766 src/oscar.c:788 src/oscar.c:807 src/oscar.c:831
-#, fuzzy
-msgid "Gaim - Error"
-msgstr "Gaim - 错误 %d"
-
 #. client too old
-#: src/oscar.c:323
+#: src/oscar.c:476
 msgid ""
 "The client version you are using is too old. Please upgrade at "
 "http://www.marko.net/gaim/"
 msgstr ""
 
-#: src/oscar.c:338
+#: src/oscar.c:480 src/toc.c:303
 msgid "Authentication Failed"
 msgstr "验证失败"
 
-#: src/oscar.c:362
+#: src/oscar.c:513
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: src/oscar.c:370
+#: src/oscar.c:520
 msgid "Could Not Connect"
 msgstr "无法连接"
 
-#: src/oscar.c:401
+#: src/oscar.c:551
 msgid "Connection established, cookie sent"
 msgstr "连接成功,送出饼干。。啊!饼干?!"
 
-#: src/oscar.c:632
-msgid "Accept Direct IM?"
+#: src/oscar.c:787 src/oscar.c:1860
+#, 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:642
-#, c-format
-msgid "%s has requested to directly connect to your computer. Do you accept?"
+#: 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:652 src/rvous.c:635
-msgid "Accept"
-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:760
+#: src/oscar.c:1194
 #, fuzzy, c-format
 msgid "You missed a message from %s because it was too large."
 msgstr "你错过了一个从 %s 发来的即时信息,该信息太大了。"
 
-#: src/oscar.c:765
+#: 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
 #, c-format
 msgid "You missed a message from %s for unknown reasons."
 msgstr ""
 
-#: src/oscar.c:786
+#: src/oscar.c:1220
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr ""
 
-#: src/oscar.c:787 src/oscar.c:806
+#: src/oscar.c:1221 src/oscar.c:1240
 msgid "Reason unknown"
 msgstr ""
 
-#: src/oscar.c:805
+#: src/oscar.c:1239
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr ""
 
-#: src/oscar.c:830
+#: src/oscar.c:1265
 #, c-format
 msgid "%s has no info/away message."
 msgstr ""
 
-#: src/oscar.c:836
+#: src/oscar.c:1271
 msgid ""
 "Username : <B>%s</B>\n"
 "<BR>Warning Level : <B>%d %%</B>\n"
@@ -1232,610 +1342,703 @@
 "<BR>连线时刻: <B>%s</B><BR>空转时间(分钟): <B>%d</B>\n"
 "<BR><HR><BR>%s\n"
 
-#: src/oscar.c:869
+#: src/oscar.c:1305
 msgid "Your connection may be lost."
 msgstr ""
 
-#: src/oscar.c:870
+#: src/oscar.c:1306
 msgid "AOL error"
 msgstr ""
 
-#: src/plugins.c:103
+#: src/oscar.c:1913
+#, fuzzy, c-format
+msgid "<B>Direct IM with %s closed</B>"
+msgstr "<HR><B>%s 登入到 %s%s。</B><BR><HR>"
+
+#: src/oscar.c:1958
+#, 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
+#, fuzzy
+msgid "Get Away Msg"
+msgstr "暂时离开信息"
+
+#: src/oscar.c:1982
+#, fuzzy
+msgid "Direct IM"
+msgstr "姓名地址录"
+
+#. Below is basically stolen from plugins.c
+#: src/perl.c:639
+#, fuzzy
+msgid "Gaim - Select Perl Script"
+msgstr "Gaim - 设定用户资料"
+
+#: src/perl.c:686
+msgid "Perl Scripts"
+msgstr ""
+
+#: src/plugins.c:104
 msgid "Gaim - Plugin List"
 msgstr "Gaim - 插件列表"
 
-#: src/plugins.c:155
-#, c-format
-msgid "Already loaded %s, not reloading.\n"
-msgstr ""
-
-#: src/plugins.c:177 src/plugins.c:185 src/plugins.c:217
+#: src/plugins.c:186 src/plugins.c:192 src/plugins.c:218
 msgid "Plugin Error"
 msgstr "插件错误"
 
-#: src/plugins.c:265
+#: src/plugins.c:262
 msgid "Gaim - Plugins"
 msgstr "Gaim - 插件"
 
 #. Build the bottom button bar
-#: src/plugins.c:297
+#: src/plugins.c:294
 msgid "Load Plugin"
 msgstr "载入插件"
 
-#: src/plugins.c:304
+#: src/plugins.c:301
 msgid "Configure Plugin"
 msgstr "设定插件"
 
-#: src/plugins.c:310
+#: src/plugins.c:307
 msgid "Unload Plugin"
 msgstr "卸载插件"
 
-#: src/prefs.c:93
-#, fuzzy
-msgid "General Options"
-msgstr "选项"
-
-#: src/prefs.c:100 src/prefs.c:358 src/prefs.c:387 src/prefs.c:414
-#: src/prefs.c:614 src/prefs.c:701 src/prefs.c:810 src/prefs.c:895
-#: src/prefs.c:1288 src/prefs.c:1373 src/prefs.c:1404 src/prefs.c:1691
+#: 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
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:104
-#, fuzzy
-msgid "Remember password"
-msgstr "记住密码"
-
-#: src/prefs.c:106
-msgid "Auto-login"
-msgstr "自动登录"
-
-#: src/prefs.c:112
+#.
+#. 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
 msgid "Use borderless buttons (requires restart for some buttons)"
 msgstr ""
 
-#: src/prefs.c:113
+#: src/prefs.c:135
 msgid "Show Buddy Ticker after restart"
 msgstr ""
 
-#: src/prefs.c:116
+#: src/prefs.c:138
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:124
+#: 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
 #, fuzzy
-msgid "Report Idle Times"
+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
+#, fuzzy
+msgid "Save Window Size/Position"
+msgstr "保存某些窗口大小和位置"
+
 #: src/prefs.c:202
 #, fuzzy
-msgid "Connection Options"
-msgstr "连接"
-
-#: src/prefs.c:210
-msgid ""
-"AOL has two protocols for connecting to AIM. One of them is Oscar and the "
-"other is TOC.\n"
-"\n"
-"TOC is a published protocol; AOL allows people to use the TOC protocol in "
-"their clients to connect. It is a simplified version of Oscar; it is capable "
-"of most tasks, but cannot perform all of the functions of Oscar. Because TOC "
-"is published, using TOC in gaim tends to be more stable and reliable.\n"
-"\n"
-"Oscar is a proprietary protocol. AOL has not published any information about "
-"it. Gaim is able to use Oscar thanks to libfaim, which reverse-engineered "
-"the Oscar protocol and is able to emulate it. While libfaim has not decoded "
-"or implemented all of the functions of Oscar, it is still able to perform "
-"most functions TOC provides as well as several others. However, using Oscar "
-"in gaim tends to be less reliable, though more usable.\n"
-"\n"
-"Changing this option takes effect at signon time."
-msgstr ""
-
-#: src/prefs.c:216
-msgid "Use Oscar Protocol"
-msgstr ""
-
-#: src/prefs.c:222
-msgid "Send Keep-Alive Packet (6 bytes/minute)"
-msgstr ""
-
-#: src/prefs.c:239 src/prefs.c:2016
-#, fuzzy
-msgid "TOC Options"
-msgstr "选项"
-
-#: src/prefs.c:251
-msgid "TOC Host:"
-msgstr "TOC 主机:"
+msgid "Automatically show buddy list on sign on"
+msgstr "自动显示朋友列表"
 
-#: src/prefs.c:261 src/prefs.c:286 src/prefs.c:320
-msgid "Port:"
-msgstr "端口:"
-
-#: src/prefs.c:276
-msgid "Login Host:"
-msgstr "登入主机:"
-
-#: src/prefs.c:297
-msgid "No Proxy"
-msgstr "没有代理"
-
-#: src/prefs.c:298
-msgid "HTTP Proxy"
-msgstr "HTTP 代理"
-
-#: src/prefs.c:299
-#, fuzzy
-msgid "Socks 4 Proxy"
-msgstr "没有代理"
-
-#: src/prefs.c:300
-#, fuzzy
-msgid "Socks 5 Proxy"
-msgstr "没有代理"
-
-#: src/prefs.c:306
-msgid "Proxy Host:"
-msgstr "代理主机:"
-
-#: src/prefs.c:351 src/prefs.c:2021
-#, fuzzy
-msgid "Oscar Options"
-msgstr "选项"
-
-#: src/prefs.c:362
-msgid "No options currently (Isn't that sad)"
-msgstr ""
-
-#: src/prefs.c:380
-#, fuzzy
-msgid "Applet Options"
-msgstr "选项"
-
-#: src/prefs.c:391
+#: src/prefs.c:203
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "在 applet 附近显示朋友列表"
 
-#: src/prefs.c:407
-#, fuzzy
-msgid "Buddy List Options"
-msgstr "朋友列表"
-
-#: src/prefs.c:418
-msgid "Show numbers in groups"
-msgstr "在组里显示号码"
-
-#: src/prefs.c:419
-msgid "Hide groups with no online buddies"
-msgstr ""
-
-#: src/prefs.c:420
-msgid "Show idle times"
-msgstr "显示空转时间"
-
-#: src/prefs.c:421
-#, fuzzy
-msgid "Show buddy type icons"
-msgstr "显示朋友类别图形"
-
-#: src/prefs.c:427
-msgid "Hide IM/Info/Chat buttons"
-msgstr ""
-
-#: src/prefs.c:428
-msgid "Show pictures on buttons"
-msgstr ""
-
-#: src/prefs.c:434
-#, fuzzy
-msgid "Save Window Size/Position"
-msgstr "保存某些窗口大小和位置"
-
-#: src/prefs.c:436
-#, fuzzy
-msgid "Automatically show buddy list on sign on"
-msgstr "自动显示朋友列表"
-
-#: src/prefs.c:586
-msgid "Please sign on before editing the permit/deny lists."
-msgstr ""
-
-#: src/prefs.c:587
-msgid "Please sign on"
-msgstr ""
-
-#: src/prefs.c:607
-msgid "Permit/Deny List Options"
-msgstr ""
-
-#: src/prefs.c:622
-msgid ""
-"The permit/deny configuration will change between users,\n"
-"and changes while you are signed off will not be saved."
-msgstr ""
-
-#: src/prefs.c:635
-#, fuzzy
-msgid "Allow Anyone"
-msgstr "任何人都可以"
-
-#. This doesn't work because TOC doesn't have a PERMIT_BUDDY setting
-#. * and merging the two would be very difficult at best, most likely
-#. * impossible. If we can guarantee only Oscar than this is easy
-#: src/prefs.c:640
-msgid "Allow only users on Buddy List"
-msgstr ""
-
-#: src/prefs.c:642
-msgid "Allow only the users in \"Permit\""
-msgstr ""
-
-#: src/prefs.c:648
-msgid "Block all users"
-msgstr ""
-
-#: src/prefs.c:649
-msgid "Block the users in \"Deny\""
-msgstr ""
-
-#: src/prefs.c:694
+#: src/prefs.c:219
 msgid "Conversation Window Options"
 msgstr ""
 
-#: src/prefs.c:705
+#: src/prefs.c:231
 msgid "Enter sends message"
 msgstr "输入发送信息"
 
-#: src/prefs.c:706
+#: src/prefs.c:232
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:707
+#: src/prefs.c:233
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:713
+#: src/prefs.c:239
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "显示图形笑脸 (试验阶段)"
 
-#: src/prefs.c:714
+#: src/prefs.c:240
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "在信息里显示时间"
 
-#: src/prefs.c:715
+#: src/prefs.c:241
 #, fuzzy
 msgid "Ignore incoming colors"
 msgstr "不理进来的颜色"
 
-#: src/prefs.c:716
+#: src/prefs.c:242
 msgid "Ignore white backgrounds"
 msgstr ""
 
-#: src/prefs.c:722
+#: src/prefs.c:248
 #, fuzzy
 msgid "Log all conversations"
 msgstr "记录所有对话内容"
 
-#: src/prefs.c:723
+#: src/prefs.c:249
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "清除记录文件内的 HTML 标记"
 
-#: src/prefs.c:729
+#: src/prefs.c:255
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "自动突出拼错的单词"
 
-#: src/prefs.c:730
+#: src/prefs.c:256
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "把 URL 以连接方式送出"
 
-#: src/prefs.c:731
+#: src/prefs.c:257
 msgid "Sending messages removes away status"
 msgstr "发出信息时自动取消暂时离开状态"
 
-#: src/prefs.c:772 src/prefs.c:857
+#: src/prefs.c:298 src/prefs.c:386
 msgid "Pictures and Text"
 msgstr ""
 
-#: src/prefs.c:777 src/prefs.c:862
+#: src/prefs.c:303 src/prefs.c:391
 msgid "Pictures Only"
 msgstr ""
 
-#: src/prefs.c:782 src/prefs.c:867
+#: src/prefs.c:308 src/prefs.c:396
 #, fuzzy
 msgid "Text Only"
 msgstr "文字颜色"
 
-#: src/prefs.c:803
+#: src/prefs.c:331
 #, fuzzy
 msgid "IM Options"
 msgstr "选项"
 
-#: src/prefs.c:814
+#: src/prefs.c:343
 #, fuzzy
 msgid "Show logins in window"
 msgstr "在交谈窗口显示登录/登出信息"
 
-#: src/prefs.c:820 src/prefs.c:905
+#: src/prefs.c:349 src/prefs.c:435
 #, fuzzy
 msgid "Show buttons as "
 msgstr "显示图形按钮"
 
-#: src/prefs.c:829 src/prefs.c:915
+#: src/prefs.c:358 src/prefs.c:445
 msgid "Show larger entry box on new windows"
 msgstr ""
 
-#: src/prefs.c:830 src/prefs.c:916
+#: src/prefs.c:359 src/prefs.c:446
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "收到信息时升起窗口"
 
-#: src/prefs.c:831 src/prefs.c:1611
+#: src/prefs.c:360
 msgid "Ignore new conversations when away"
 msgstr "暂时离开时,忽略新的对话"
 
-#: src/prefs.c:832
+#: src/prefs.c:361
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "创作信息"
 
-#: src/prefs.c:888 src/prefs.c:1090
+#: src/prefs.c:417 src/prefs.c:620
 #, fuzzy
 msgid "Chat Options"
 msgstr "选项"
 
-#: src/prefs.c:899
+#: src/prefs.c:429
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:947 src/prefs.c:949 src/prefs.c:1161 src/prefs.c:1163
+#: src/prefs.c:477 src/prefs.c:479 src/prefs.c:692 src/prefs.c:694
 msgid "Gaim Chat"
 msgstr "Gaim 聊天"
 
-#: src/prefs.c:1107
+#: src/prefs.c:638
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/prefs.c:1135
+#: src/prefs.c:666
 msgid "List of available chats"
 msgstr "现有聊天列表"
 
-#: src/prefs.c:1149
+#: src/prefs.c:680
 msgid "List of subscribed chats"
 msgstr "订阅的聊天列表"
 
-#: src/prefs.c:1281 src/prefs.c:2082
+#: src/prefs.c:806 src/prefs.c:2084
 #, fuzzy
 msgid "Font Options"
 msgstr "选项"
 
-#: src/prefs.c:1294
+#: src/prefs.c:820
 msgid "Underlined Text"
 msgstr "下加线文字"
 
-#: src/prefs.c:1295
+#: src/prefs.c:821
 msgid "Strike Text"
 msgstr "划掉的文字"
 
-#: src/prefs.c:1308 src/prefs.c:1325 src/prefs.c:1345
+#: src/prefs.c:834 src/prefs.c:851 src/prefs.c:871
 #, fuzzy
 msgid "Select"
 msgstr "选择字型"
 
-#: src/prefs.c:1343
+#: src/prefs.c:869
 msgid "Font Face for Text"
 msgstr "文字的字型"
 
-#: src/prefs.c:1366
+#: src/prefs.c:892
 #, fuzzy
 msgid "Sound Options"
 msgstr "选项"
 
-#: src/prefs.c:1378
-msgid "Sounds go through GNOME"
-msgstr "声音通过 GNOME"
-
-#: src/prefs.c:1380
+#: src/prefs.c:904
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "朋友登录声"
 
-#: src/prefs.c:1381 src/prefs.c:1612
+#: src/prefs.c:905 src/prefs.c:1296
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1382
+#: src/prefs.c:906
 msgid "Beep instead of playing sound"
 msgstr ""
 
-#: src/prefs.c:1397
+#: src/prefs.c:968
+#, fuzzy
+msgid "Gaim - Sound Configuration"
+msgstr "Gaim - 记录对话内容"
+
+#: src/prefs.c:1002
+#, fuzzy
+msgid "Reset"
+msgstr "注册"
+
+#: src/prefs.c:1007
+#, fuzzy
+msgid "Choose"
+msgstr "关闭"
+
+#: src/prefs.c:1035
 #, fuzzy
 msgid "Sound Events"
 msgstr "声音"
 
-#: src/prefs.c:1408
+#: src/prefs.c:1047
 msgid "Sound when buddy logs in"
 msgstr "朋友登录声"
 
-#: src/prefs.c:1409
+#: src/prefs.c:1048
 msgid "Sound when buddy logs out"
 msgstr "朋友登出声"
 
-#: src/prefs.c:1415
+#: src/prefs.c:1054
 msgid "Sound when message is received"
 msgstr "收到信息声"
 
-#: src/prefs.c:1416
+#: src/prefs.c:1055
 #, fuzzy
 msgid "Sound when message is first received"
 msgstr "收到信息声"
 
-#: src/prefs.c:1417
+#: src/prefs.c:1056
 msgid "Sound when message is sent"
 msgstr "发出信息声"
 
-#: src/prefs.c:1423
+#: src/prefs.c:1062
 #, fuzzy
-msgid "Sound in chat rooms when people enter/leave"
+msgid "Sound in chat rooms when people enter"
+msgstr "聊天室里,朋友进入/离开声"
+
+#: src/prefs.c:1063
+#, fuzzy
+msgid "Sound in chat rooms when people leave"
 msgstr "聊天室里,朋友进入/离开声"
 
-#: src/prefs.c:1424
+#: src/prefs.c:1064
 #, fuzzy
-msgid "Sound in chat rooms when people talk"
+msgid "Sound in chat rooms when you talk"
 msgstr "聊天室有人说话声"
 
-#: src/prefs.c:1509 src/prefs.c:2109
+#: src/prefs.c:1065
+#, fuzzy
+msgid "Sound in chat rooms when others talk"
+msgstr "聊天室有人说话声"
+
+#: src/prefs.c:1197 src/prefs.c:2111
 #, fuzzy
 msgid "Away Messages"
 msgstr "新的暂时离开信息"
 
-#: src/prefs.c:1525
+#: src/prefs.c:1209
 #, fuzzy
 msgid "Title"
 msgstr "文件"
 
-#: src/prefs.c:1529
+#: src/prefs.c:1213
 #, fuzzy
 msgid "Message"
 msgstr "创作信息"
 
-#: src/prefs.c:1569
+#: src/prefs.c:1253
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1573
+#: src/prefs.c:1257
 #, fuzzy
 msgid "Make Away"
 msgstr "立即设定为暂时离开"
 
-#: src/prefs.c:1684
+#: src/prefs.c:1295
+#, fuzzy
+msgid "Ignore new conversations when away   "
+msgstr "暂时离开时,忽略新的对话"
+
+#: src/prefs.c:1306
+msgid "Auto Away after"
+msgstr ""
+
+#: src/prefs.c:1318
+msgid "minutes using"
+msgstr ""
+
+#: src/prefs.c:1400
 #, fuzzy
 msgid "Browser Options"
 msgstr "选项"
 
-#: src/prefs.c:1695
+#: src/prefs.c:1412
 msgid "Netscape"
 msgstr ""
 
-#: src/prefs.c:1696
+#: src/prefs.c:1413
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:1698
+#: src/prefs.c:1415
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:1700
-#, fuzzy
-msgid "Internal HTML Widget (Quite likely a bad idea!)"
-msgstr "内部超文本文件控件 (最好别用!)"
-
-#: src/prefs.c:1701
+#: src/prefs.c:1417
 msgid "Manual"
 msgstr "用户手册"
 
-#: src/prefs.c:1710
+#: src/prefs.c:1426
 msgid "Pop up new window by default"
 msgstr "缺省弹出新窗口"
 
-#: src/prefs.c:1755
+#: src/prefs.c:1641
+#, fuzzy
+msgid "Privacy Options"
+msgstr "选项"
+
+#: src/prefs.c:1657
+msgid "Set privacy for:"
+msgstr ""
+
+#: src/prefs.c:1677
+msgid "Allow all users to contact me"
+msgstr ""
+
+#: src/prefs.c:1678
+msgid "Allow only the users below"
+msgstr ""
+
+#: src/prefs.c:1680
+msgid "Allow List"
+msgstr ""
+
+#: src/prefs.c:1712
+#, fuzzy
+msgid "Deny all users"
+msgstr "拒绝某些人"
+
+#: src/prefs.c:1713
+msgid "Block the users below"
+msgstr ""
+
+#: src/prefs.c:1715
+#, fuzzy
+msgid "Block List"
+msgstr "块"
+
+#: src/prefs.c:1791
 msgid "Gaim - Preferences"
 msgstr "Gaim - 优先设定"
 
-#: src/prefs.c:1843
+#: src/prefs.c:1877
 msgid "GAIM debug output window"
 msgstr "GAIM 除虫输出窗口"
 
-#: src/prefs.c:1998
+#: src/prefs.c:2040
 msgid "General"
 msgstr "一般设定"
 
-#: src/prefs.c:2011
-msgid "Connection"
-msgstr "连接"
-
-#: src/prefs.c:2033
-msgid "Applet"
-msgstr ""
-
-#. FIXME ! We shouldn't be showing this if we're not signed on
-#: src/prefs.c:2051
-#, fuzzy
-msgid "Permit/Deny"
-msgstr "只允许某些人"
-
-#: src/prefs.c:2062
+#: src/prefs.c:2064
 #, fuzzy
 msgid "Conversations"
 msgstr "记录所有对话内容"
 
-#: src/prefs.c:2067
+#: src/prefs.c:2069
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:2072
+#: src/prefs.c:2074
 msgid "Chat Window"
 msgstr ""
 
-#: src/prefs.c:2077
+#: src/prefs.c:2079
 msgid "Chat Rooms"
 msgstr ""
 
-#: src/prefs.c:2093
+#: src/prefs.c:2095
 msgid "Sounds"
 msgstr "声音"
 
-#: src/prefs.c:2098
-msgid "Events"
-msgstr ""
-
-#: src/prefs.c:2120
+#: src/prefs.c:2122
 msgid "Browser"
 msgstr "浏览器"
 
-#: src/rvous.c:108
+#: src/prefs.c:2133
+msgid "Privacy"
+msgstr ""
+
+#: src/rvous.c:148
 msgid "Gaim - Save As..."
 msgstr "Gaim - 存盘为……"
 
-#: src/rvous.c:269
+#: src/rvous.c:317
 #, c-format
 msgid "Receiving %s from %s"
 msgstr "收到 %s ,来源: %s"
 
-#: src/rvous.c:285 src/rvous.c:422
-msgid "Gaim - File Transfer"
-msgstr "Gaim - 传输文件"
+#: src/rvous.c:693
+msgid "Accept"
+msgstr "接受"
 
-#: src/rvous.c:406
-#, c-format
-msgid "Sending %s to %s"
-msgstr "送 %s 给 %s"
-
-#: src/rvous.c:662
+#: src/rvous.c:720
 #, c-format
 msgid "%s requests you to accept the file: %s (%d bytes)"
 msgstr "%s 请求你接受文件: %s (%d 字元 )"
 
-#: src/rvous.c:665
+#: src/rvous.c:723
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 请求你给他们发送一个文件"
 
-#: src/rvous.c:675
+#: src/rvous.c:733
 msgid "Gaim - File Transfer?"
 msgstr "Gaim - 传送文件?"
 
-#~ msgid "Permit some"
+#: src/server.c:581
+msgid "Yes"
+msgstr ""
+
+#: src/server.c:582
+msgid "No"
+msgstr ""
+
+#: src/toc.c:253 src/toc.c:260
+#, fuzzy
+msgid "Connection Closed"
+msgstr "连接"
+
+#: src/toc.c:295
+msgid "Waiting for reply..."
+msgstr ""
+
+#: src/toc.c:354
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr ""
+
+#: src/toc.c:355
+msgid "TOC Resume"
+msgstr ""
+
+#: src/toc.c:515
+#, fuzzy
+msgid "Password Change Successeful"
+msgstr "Gaim - 更改密码"
+
+#: src/toc.c:518
+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
+msgid "TOC Pause"
+msgstr ""
+
+#: src/toc.c:977
+#, fuzzy
+msgid "Get Dir Info"
+msgstr "姓名地址录"
+
+#~ msgid "You must give your password"
+#~ msgstr "你需要输入密码"
+
+#~ msgid "%d/%d Buddies Online"
+#~ msgstr "%d/%d 朋友来了"
+
+#~ msgid "Toggle Logging"
+#~ msgstr "打开/关闭记录"
+
+#, fuzzy
+#~ msgid "%sChat"
+#~ msgstr "聊天"
+
+#~ msgid "Message too long, some data truncated."
+#~ msgstr "信息太长了,后面的被砍掉了。"
+
+#~ msgid "Error Resolving Mail Server.\n"
+#~ msgstr "解析电邮服务器时出错。\n"
+
+#~ msgid "Buddy To Pounce:"
+#~ msgstr "被监视的朋友:"
+
+#~ msgid "Message to send:"
+#~ msgstr "发送信息:"
+
+#, fuzzy
+#~ msgid "Permit / Deny"
 #~ msgstr "只允许某些人"
 
-#~ msgid "Deny some"
-#~ msgstr "拒绝某些人"
+#~ msgid "g001: Error resolving host\n"
+#~ msgstr "g001: 解析主机错误\n"
+
+#~ msgid "Looking up %s"
+#~ msgstr "寻找 %s"
+
+#, fuzzy
+#~ msgid "Remember password"
+#~ msgstr "记住密码"
+
+#, fuzzy
+#~ msgid "TOC Options"
+#~ msgstr "选项"
+
+#~ msgid "TOC Host:"
+#~ msgstr "TOC 主机:"
+
+#~ msgid "Port:"
+#~ msgstr "端口:"
+
+#~ msgid "Login Host:"
+#~ msgstr "登入主机:"
+
+#~ msgid "No Proxy"
+#~ msgstr "没有代理"
+
+#~ msgid "HTTP Proxy"
+#~ msgstr "HTTP 代理"
+
+#, fuzzy
+#~ msgid "Socks 4 Proxy"
+#~ msgstr "没有代理"
+
+#, fuzzy
+#~ msgid "Socks 5 Proxy"
+#~ msgstr "没有代理"
+
+#~ msgid "Proxy Host:"
+#~ msgstr "代理主机:"
+
+#, fuzzy
+#~ msgid "Oscar Options"
+#~ msgstr "选项"
+
+#, fuzzy
+#~ msgid "Applet Options"
+#~ msgstr "选项"
+
+#, fuzzy
+#~ msgid "Allow Anyone"
+#~ msgstr "任何人都可以"
+
+#~ msgid "Sounds go through GNOME"
+#~ msgstr "声音通过 GNOME"
+
+#, fuzzy
+#~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
+#~ msgstr "内部超文本文件控件 (最好别用!)"
+
+#~ msgid "Connection"
+#~ msgstr "连接"
+
+#, fuzzy
+#~ msgid "Permit/Deny"
+#~ msgstr "只允许某些人"
+
+#~ msgid "Permit some"
+#~ msgstr "只允许某些人"
 
 #~ msgid "Add buddy to permit/deny"
 #~ msgstr "把某人加入允许/拒绝表"
@@ -1861,9 +2064,6 @@
 #~ msgid "No Idle"
 #~ msgstr "没有空转"
 
-#~ msgid "GAIM Use"
-#~ msgstr "GAIM 使用"
-
 #~ msgid "SOCKS v4 Proxy"
 #~ msgstr "SOCKS v4 代理"