changeset 5594:cb39185b49c8

[gaim-migrate @ 5998] Wang (fundawang) updated the zh_CN(Simplified Chinese) po committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Sat, 31 May 2003 14:22:20 +0000 (2003-05-31)
parents b07aa997ddd8
children 21cd613ae2be
files po/zh_CN.po
diffstat 1 files changed, 1496 insertions(+), 1524 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Sat May 31 08:42:55 2003 +0000
+++ b/po/zh_CN.po	Sat May 31 14:22:20 2003 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-05-23 09:33+0800\n"
-"PO-Revision-Date: 2003-05-23 09:39+0800\n"
+"POT-Creation-Date: 2003-05-31 22:01+0800\n"
+"PO-Revision-Date: 2003-05-28 11:51+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -15,68 +15,64 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/docklet/docklet.c:94 src/multi.c:285 src/win32/systray.c:359
+#: plugins/docklet/docklet.c:91 src/win32/systray.c:359
 msgid "Auto-login"
 msgstr "�����糸�"
 
-#: plugins/docklet/docklet.c:97
+#: plugins/docklet/docklet.c:95
 msgid "New Message.."
 msgstr "�井���..."
 
-#: plugins/docklet/docklet.c:98
+#: plugins/docklet/docklet.c:96
 msgid "Join A Chat..."
 msgstr "���ヨ��紊�..."
 
-#: plugins/docklet/docklet.c:129
+#: plugins/docklet/docklet.c:127
 msgid "New..."
 msgstr "�医産..."
 
-#: plugins/docklet/docklet.c:133 src/protocols/gg/gg.c:71
-#: src/protocols/irc/irc.c:1035 src/protocols/jabber/jabber.c:1182
-#: src/protocols/jabber/jabber.c:3439 src/protocols/jabber/jabber.c:3493
-#: src/protocols/oscar/oscar.c:2799 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:5362 src/protocols/oscar/oscar.c:5684
-#: src/gtkblist.c:1517 src/gtkpounce.c:566 src/gtkprefs.c:1092
+#: plugins/docklet/docklet.c:131 src/protocols/gg/gg.c:71
+#: src/protocols/irc/irc.c:1033 src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:3443 src/protocols/jabber/jabber.c:3497
+#: src/protocols/oscar/oscar.c:2822 src/protocols/oscar/oscar.c:4510
+#: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5727
+#: src/gtkblist.c:1529 src/gtkpounce.c:565 src/gtkprefs.c:1439
 msgid "Away"
 msgstr "胼糸�"
 
-#: plugins/docklet/docklet.c:139 src/away.c:530
+#: plugins/docklet/docklet.c:137 src/away.c:534
 msgid "Back"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:147
+#: plugins/docklet/docklet.c:145
 msgid "Mute Sounds"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:152
+#: plugins/docklet/docklet.c:150
 msgid "File Transfers..."
 msgstr "��篁銀���..."
 
-#: plugins/docklet/docklet.c:153
+#: plugins/docklet/docklet.c:151
 msgid "Accounts..."
 msgstr "茣���..."
 
-#: plugins/docklet/docklet.c:154
+#: plugins/docklet/docklet.c:152
 msgid "Preferences..."
 msgstr "薤���蕁�..."
 
-#: plugins/docklet/docklet.c:163 src/win32/systray.c:159
+#: plugins/docklet/docklet.c:161 src/win32/systray.c:159
 msgid "Signoff"
 msgstr "�糸��"
 
-#: plugins/docklet/docklet.c:167
+#: plugins/docklet/docklet.c:165
 msgid "Quit"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:451
+#: plugins/docklet/docklet.c:462
 msgid "Tray Icon Configuration"
 msgstr "�����丈����臀�"
 
-#. toggle = gtk_check_button_new_with_mnemonic(_("_Automatically show buddy list on sign on"));
-#. gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle), blist_options & OPT_BLIST_APP_BUDDY_SHOW);
-#. g_signal_connect(G_OBJECT(toggle), "clicked", G_CALLBACK(docklet_toggle_blist_show), NULL);
-#. gtk_box_pack_start(GTK_BOX(vbox), toggle, FALSE, FALSE, 0);
-#: plugins/docklet/docklet.c:460
+#: plugins/docklet/docklet.c:466
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "�翫�亥�劫�紙�����丈�����丞ず�井���(_H)"
 
@@ -87,19 +83,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:484
+#: plugins/docklet/docklet.c:490
 msgid "System Tray Icon"
 msgstr "膤紫������丈��"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:487
+#: plugins/docklet/docklet.c:493
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "��鎧膸�����筝㊥�丞ず Gaim ���丈����"
 
 #. *  description
-#: plugins/docklet/docklet.c:489
+#: plugins/docklet/docklet.c:495
 msgid ""
 "Interacts with a Notification Area applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
@@ -273,31 +269,31 @@
 msgid "Iconifies the away box and the buddy list when you go away."
 msgstr "���綣����胼糸�罅���絅遵���茵��遵�筝阪�丈����"
 
-#: plugins/idle.c:78 src/protocols/irc/irc.c:951
+#: plugins/idle.c:86 src/protocols/irc/irc.c:948
 msgid "Idle Time"
 msgstr "���≧�狗��"
 
-#: plugins/idle.c:86
+#: plugins/idle.c:94
 msgid "Set"
 msgstr "莅丞舟"
 
-#: plugins/idle.c:91
+#: plugins/idle.c:99
 msgid "idle for"
 msgstr "������"
 
-#: plugins/idle.c:98 plugins/timestamp.c:86
+#: plugins/idle.c:106 plugins/timestamp.c:86
 msgid "minutes."
 msgstr "������"
 
-#: plugins/idle.c:104
+#: plugins/idle.c:112
 msgid "_Set"
 msgstr "莅丞舟(_S)"
 
-#: plugins/idle.c:127
+#: plugins/idle.c:135
 msgid "I'dle Mak'er"
 msgstr "���∴��"
 
-#: plugins/idle.c:129 plugins/idle.c:130
+#: plugins/idle.c:137 plugins/idle.c:138
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "��莅御��������臀����>�紊��炊�狗��"
 
@@ -590,7 +586,7 @@
 msgstr "���恰�倶�����d賢�丞ず羯���(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:429 src/gtkprefs.c:606
+#: plugins/win32/transparency/win2ktrans.c:429 src/gtkprefs.c:903
 msgid "Buddy List Window"
 msgstr "絅遵���茵����"
 
@@ -655,13 +651,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1376
+#: plugins/perl/perl.c:1382
 msgid "Perl Plugin Loader"
 msgstr "Perl ��篁区��ュ��"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1378 plugins/perl/perl.c:1379
+#: plugins/perl/perl.c:1384 plugins/perl/perl.c:1385
 msgid "Provides support for loading perl plugins."
 msgstr "��箴�茖��� Perl ��篁句��������"
 
@@ -685,11 +681,11 @@
 "idle."
 msgstr "絅遵�胼糸�/菴���������/�♂���九���莚�腦��g��咲���ャ��"
 
-#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1190
-#: src/protocols/msn/msn.c:327 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1189
+#: src/protocols/msn/msn.c:308 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1273
-#: src/protocols/yahoo/yahoo.c:1352
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1265
+#: src/protocols/yahoo/yahoo.c:1344
 msgid "Available"
 msgstr "����"
 
@@ -701,11 +697,11 @@
 msgid "Away for friends only"
 msgstr "���絅遵�胼糸�"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3442
-#: src/protocols/jabber/jabber.c:3505 src/protocols/oscar/oscar.c:2803
-#: src/protocols/oscar/oscar.c:4472 src/protocols/oscar/oscar.c:4499
-#: src/protocols/oscar/oscar.c:5689 src/protocols/yahoo/yahoo.c:1087
-#: src/protocols/yahoo/yahoo.c:1295 src/protocols/yahoo/yahoo.c:1362
+#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3446
+#: src/protocols/jabber/jabber.c:3509 src/protocols/oscar/oscar.c:2826
+#: src/protocols/oscar/oscar.c:4498 src/protocols/oscar/oscar.c:4525
+#: src/protocols/oscar/oscar.c:5732 src/protocols/yahoo/yahoo.c:1080
+#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1354
 msgid "Invisible"
 msgstr "��荳�"
 
@@ -717,183 +713,183 @@
 msgid "Unavailable"
 msgstr "筝�����"
 
-#: src/protocols/gg/gg.c:157
+#: src/protocols/gg/gg.c:159
 msgid "Unable to resolve hostname."
 msgstr "��羈�茹f��筝紙�阪����"
 
-#: src/protocols/gg/gg.c:160
+#: src/protocols/gg/gg.c:162
 msgid "Unable to connect to server."
 msgstr "��羈�菴��ュ�井���≦����"
 
-#: src/protocols/gg/gg.c:163
+#: src/protocols/gg/gg.c:165
 msgid "Invalid response from server."
 msgstr "���≦������綺�������"
 
-#: src/protocols/gg/gg.c:166
+#: src/protocols/gg/gg.c:168
 msgid "Error while reading from socket."
 msgstr "篁���ュ�莚糸��九�咲����"
 
-#: src/protocols/gg/gg.c:169
+#: src/protocols/gg/gg.c:171
 msgid "Error while writing to socket."
 msgstr "��絅��ュ����ユ�九�咲����"
 
-#: src/protocols/gg/gg.c:172
+#: src/protocols/gg/gg.c:174
 msgid "Authentication failed."
 msgstr "莅よ�紊沿乾��"
 
-#: src/protocols/gg/gg.c:175
+#: src/protocols/gg/gg.c:177
 msgid "Unknown Error Code."
 msgstr "���ョ����莚�撮����"
 
-#: src/protocols/gg/gg.c:280
+#: src/protocols/gg/gg.c:282
 #, c-format
 msgid "Status: %s"
 msgstr "�倶��鐚�%s"
 
-#: src/protocols/gg/gg.c:301
+#: src/protocols/gg/gg.c:303
 msgid "Could not connect"
 msgstr "��羈�菴���"
 
-#: src/protocols/gg/gg.c:308
+#: src/protocols/gg/gg.c:310
 msgid "Unable to read socket"
 msgstr "��羈�莚糸�絅��ュ�"
 
-#: src/protocols/gg/gg.c:418
+#: src/protocols/gg/gg.c:420
 msgid "Unable to connect."
 msgstr "��羈�菴��ャ��"
 
-#: src/protocols/gg/gg.c:434
+#: src/protocols/gg/gg.c:436
 msgid "Reading data"
 msgstr "罩e������井��"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:439
 msgid "Balancer handshake"
 msgstr "綛活 �����"
 
-#: src/protocols/gg/gg.c:440
+#: src/protocols/gg/gg.c:442
 msgid "Reading server key"
 msgstr "罩e��������≦�����"
 
-#: src/protocols/gg/gg.c:443
+#: src/protocols/gg/gg.c:445
 msgid "Exchanging key hash"
 msgstr "罩e��困�√���"
 
-#: src/protocols/gg/gg.c:452
+#: src/protocols/gg/gg.c:454
 msgid "Critical error in GG library\n"
 msgstr "GG 綺����渇����莚�\n"
 
-#: src/protocols/gg/gg.c:471 src/protocols/gg/gg.c:567
+#: src/protocols/gg/gg.c:473 src/protocols/gg/gg.c:569
 #, c-format
 msgid "Connect to %s failed"
 msgstr "菴��ュ�� %s 紊沿乾"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:522
 msgid "Unable to ping server"
 msgstr "��羈�菴������≦��"
 
-#: src/protocols/gg/gg.c:532
+#: src/protocols/gg/gg.c:535
 msgid "Send as message"
 msgstr "����筝堺���"
 
-#: src/protocols/gg/gg.c:540
+#: src/protocols/gg/gg.c:542
 msgid "Looking up GG server"
 msgstr "罩e���ラ�� GG ���≦��"
 
-#: src/protocols/gg/gg.c:543
+#: src/protocols/gg/gg.c:545
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "��絎��� Gadu-Gadu UIN ����"
 
-#: src/protocols/gg/gg.c:592
+#: src/protocols/gg/gg.c:594
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "����上�������� Gadu-Gadu UIN ����羔�����"
 
-#: src/protocols/gg/gg.c:655
+#: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "��羈��桁���膣∝���"
 
-#: src/protocols/gg/gg.c:660
+#: src/protocols/gg/gg.c:662
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu ��膣√���"
 
-#: src/protocols/gg/gg.c:685
+#: src/protocols/gg/gg.c:687
 msgid "Active"
 msgstr "羇肢�"
 
-#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4984 src/gtkft.c:1033
+#: src/protocols/gg/gg.c:688
 msgid "Yes"
 msgstr "��"
 
-#: src/protocols/gg/gg.c:686 src/protocols/oscar/oscar.c:4984 src/gtkft.c:1034
+#: src/protocols/gg/gg.c:688
 msgid "No"
 msgstr "��"
 
-#: src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:692
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:694
+#: src/protocols/gg/gg.c:696
 msgid "First name"
 msgstr "��"
 
-#: src/protocols/gg/gg.c:699
+#: src/protocols/gg/gg.c:701
 msgid "Second Name"
 msgstr "紮�"
 
-#: src/protocols/gg/gg.c:703
+#: src/protocols/gg/gg.c:705
 msgid "Nick"
 msgstr "�窮О"
 
-#: src/protocols/gg/gg.c:710 src/protocols/gg/gg.c:713
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
 msgid "Birth year"
 msgstr "�榊��綛岩蚕"
 
-#: src/protocols/gg/gg.c:719 src/protocols/gg/gg.c:721
-#: src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:725
 msgid "Sex"
 msgstr "�у��"
 
 #. Line 5
-#: src/protocols/gg/gg.c:727 src/dialogs.c:2028 src/dialogs.c:2667
+#: src/protocols/gg/gg.c:729 src/dialogs.c:2065 src/dialogs.c:2709
 msgid "City"
 msgstr "���"
 
-#: src/protocols/gg/gg.c:760
+#: src/protocols/gg/gg.c:762
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu ���≦��押��絖���ソ����茵���"
 
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:770
 msgid "Couldn't Import Buddy List from Server"
 msgstr "��羈�篁����≦����ュソ����茵�"
 
-#: src/protocols/gg/gg.c:829
+#: src/protocols/gg/gg.c:831
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "絅遵���茵�群膸����鋍����� Gadu-Gadu ���≦���"
 
-#: src/protocols/gg/gg.c:836
+#: src/protocols/gg/gg.c:838
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "��羈�絨�絅遵���茵������ Gadu-Gadu ���≦��"
 
-#: src/protocols/gg/gg.c:844
+#: src/protocols/gg/gg.c:846
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "絅遵���茵�群膸����鋌� Gadu-Gadu ���≦������"
 
-#: src/protocols/gg/gg.c:851
+#: src/protocols/gg/gg.c:853
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "��羈�篁� Gadu-Gadu ���≦�����ゅソ����茵�"
 
-#: src/protocols/gg/gg.c:859
+#: src/protocols/gg/gg.c:861
 msgid "Password changed successfully"
 msgstr "絲��������贋��"
 
-#: src/protocols/gg/gg.c:865
+#: src/protocols/gg/gg.c:867
 msgid "Password couldn't be changed"
 msgstr "絲�����羈��贋��"
 
-#: src/protocols/gg/gg.c:977
+#: src/protocols/gg/gg.c:979
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "筝� Gadu-Gadu ���≦����莅��咲��"
 
-#: src/protocols/gg/gg.c:978
+#: src/protocols/gg/gg.c:980
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -901,77 +897,77 @@
 "Gaim ��羈�絎�������莚傑�鐚�������� Gadu-Gadu HTTP ���≦����莅��榊ー�����莚欠�����莚�"
 "筝�罨<��"
 
-#: src/protocols/gg/gg.c:1006
+#: src/protocols/gg/gg.c:1008
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "��羈�絲弱�� Gadu-Gadu 絅遵���茵�"
 
-#: src/protocols/gg/gg.c:1007
+#: src/protocols/gg/gg.c:1009
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim ��羈�菴��ュ�� Gadu-Gadu 絅遵���茵����≦����莚欠�����莚�筝�罨<��"
 
-#: src/protocols/gg/gg.c:1076
+#: src/protocols/gg/gg.c:1078
 msgid "Couldn't export buddy list"
 msgstr "��羈�絲弱�阪ソ����茵�"
 
-#: src/protocols/gg/gg.c:1077 src/protocols/gg/gg.c:1100
+#: src/protocols/gg/gg.c:1079 src/protocols/gg/gg.c:1102
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim ��羈�菴��ュ�医ソ����茵����≦����莚欠�����莚�筝�罨<��"
 
-#: src/protocols/gg/gg.c:1099
+#: src/protocols/gg/gg.c:1101
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "��羈����� Gadu-Gadu 絅遵���茵�"
 
-#: src/protocols/gg/gg.c:1148
+#: src/protocols/gg/gg.c:1150
 msgid "Unable to access directory"
 msgstr "��羈�莅翠�����"
 
-#: src/protocols/gg/gg.c:1149
+#: src/protocols/gg/gg.c:1151
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
 msgstr "Gaim ��羈���膣∝���鐚���������羈�筝�������≦����ャ��莚欠�����莚�筝�罨<��"
 
-#: src/protocols/gg/gg.c:1182
+#: src/protocols/gg/gg.c:1184
 msgid "Unable to change Gadu-Gadu password"
 msgstr "��羈��贋�� Gadu-Gadu 絲���"
 
-#: src/protocols/gg/gg.c:1183
+#: src/protocols/gg/gg.c:1185
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 "Gaim ��羈��贋�号����絲���鐚�������� Gadu-Gadu ���≦����ュ�咲����莚欠�����莚�筝�罨<��"
 
-#: src/protocols/gg/gg.c:1199
+#: src/protocols/gg/gg.c:1201
 msgid "Directory Search"
 msgstr "�����膣�"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:4328
-#: src/protocols/oscar/oscar.c:5882 src/protocols/toc/toc.c:1453
-#: src/dialogs.c:2137 src/dialogs.c:2146
+#: src/protocols/gg/gg.c:1209 src/protocols/jabber/jabber.c:4325
+#: src/protocols/oscar/oscar.c:5927 src/protocols/toc/toc.c:1453
+#: src/dialogs.c:2176 src/dialogs.c:2185
 msgid "Change Password"
 msgstr "�贋�劫���"
 
-#: src/protocols/gg/gg.c:1215
+#: src/protocols/gg/gg.c:1217
 msgid "Import Buddy List from Server"
 msgstr "篁����≦����ュソ����茵�"
 
-#: src/protocols/gg/gg.c:1221
+#: src/protocols/gg/gg.c:1223
 msgid "Export Buddy List to Server"
 msgstr "絨�絅遵���茵���阪�井���≦��"
 
-#: src/protocols/gg/gg.c:1227
+#: src/protocols/gg/gg.c:1229
 msgid "Delete Buddy List from Server"
 msgstr "篁����≦�����ゅソ����茵�"
 
-#: src/protocols/gg/gg.c:1260
+#: src/protocols/gg/gg.c:1262
 msgid "Unable to access user profile."
 msgstr "��羈�莅翠�����潔��臀���篁吟��"
 
-#: src/protocols/gg/gg.c:1261
+#: src/protocols/gg/gg.c:1263
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -988,7 +984,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
+#: src/protocols/gg/gg.c:1375 src/protocols/gg/gg.c:1377
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu �顒��篁�"
 
@@ -996,26 +992,25 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 筝� ICQ ���≦����莅���莚���"
 
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2648
-#: src/dialogs.c:2434 src/gtkconv.c:807 src/gtkconv.c:2646 src/gtkconv.c:3790
-#: src/prpl.c:632
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2670
+#: src/dialogs.c:2477 src/gtkconv.c:813 src/gtkconv.c:2656 src/gtkconv.c:3798
+#: src/prpl.c:414
 msgid "Add"
 msgstr "羞糸��"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1118
-#: src/protocols/irc/irc.c:1440 src/protocols/msn/msn.c:172
-#: src/protocols/msn/msn.c:183 src/protocols/msn/msn.c:194
-#: src/protocols/msn/msn.c:205 src/protocols/oscar/oscar.c:2396
-#: src/protocols/oscar/oscar.c:2433 src/protocols/oscar/oscar.c:2463
-#: src/protocols/oscar/oscar.c:2508 src/protocols/oscar/oscar.c:5563
-#: src/protocols/oscar/oscar.c:5767 src/protocols/oscar/oscar.c:5815
-#: src/protocols/toc/toc.c:1991 src/protocols/yahoo/yahoo.c:1205
-#: src/buddy_chat.c:309 src/dialogs.c:468 src/dialogs.c:475 src/dialogs.c:483
-#: src/dialogs.c:2085 src/dialogs.c:2198 src/dialogs.c:2258 src/dialogs.c:2423
-#: src/dialogs.c:2609 src/dialogs.c:2758 src/dialogs.c:3406 src/dialogs.c:3898
-#: src/dialogs.c:4376 src/dialogs.c:4949 src/gtkft.c:1112 src/multi.c:1547
-#: src/multi.c:1911 src/prpl.c:632 src/server.c:1239
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1116
+#: src/protocols/irc/irc.c:1445 src/protocols/msn/msn.c:168
+#: src/protocols/msn/msn.c:179 src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:201 src/protocols/msn/msn.c:214
+#: src/protocols/oscar/oscar.c:2402 src/protocols/oscar/oscar.c:2439
+#: src/protocols/oscar/oscar.c:2474 src/protocols/oscar/oscar.c:2519
+#: src/protocols/oscar/oscar.c:5605 src/protocols/oscar/oscar.c:5810
+#: src/protocols/oscar/oscar.c:5858 src/protocols/yahoo/yahoo.c:1197
+#: src/buddy_chat.c:312 src/dialogs.c:470 src/dialogs.c:481 src/dialogs.c:493
+#: src/dialogs.c:2122 src/dialogs.c:2237 src/dialogs.c:2298 src/dialogs.c:2466
+#: src/dialogs.c:2651 src/dialogs.c:2800 src/dialogs.c:3469 src/dialogs.c:3961
+#: src/dialogs.c:4442 src/dialogs.c:5015 src/multi.c:177 src/prpl.c:415
 msgid "Cancel"
 msgstr "��羔�"
 
@@ -1024,16 +1019,16 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "���� %s (%s%s%s%s%s) ��荀����������"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
-#: src/protocols/msn/notification.c:444 src/protocols/msn/notification.c:719
-#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1721
+#: src/protocols/msn/notification.c:461 src/protocols/msn/notification.c:721
+#: src/protocols/oscar/oscar.c:2598 src/protocols/oscar/oscar.c:5053
 msgid "Authorize"
 msgstr "����"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1718
-#: src/protocols/msn/notification.c:445 src/protocols/msn/notification.c:720
-#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
-#: src/dialogs.c:2422
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1722
+#: src/protocols/msn/notification.c:462 src/protocols/msn/notification.c:723
+#: src/protocols/oscar/oscar.c:2600 src/protocols/oscar/oscar.c:5054
+#: src/dialogs.c:2465
 msgid "Deny"
 msgstr "��靳�"
 
@@ -1041,10 +1036,10 @@
 msgid "Send message through server"
 msgstr "��菴����≦��賢莉����"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2336
-#: src/protocols/jabber/jabber.c:2371 src/protocols/jabber/jabber.c:4245
-#: src/protocols/jabber/jabber.c:4292 src/protocols/msn/dispatch.c:165
-#: src/protocols/msn/msn.c:442 src/protocols/msn/notification.c:1279
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2341
+#: src/protocols/jabber/jabber.c:2375 src/protocols/jabber/jabber.c:4244
+#: src/protocols/jabber/jabber.c:4290 src/protocols/msn/dispatch.c:160
+#: src/protocols/msn/msn.c:422 src/protocols/msn/notification.c:1333
 #: src/protocols/napster/napster.c:515
 msgid "Unable to connect"
 msgstr "��羈�菴���"
@@ -1053,7 +1048,7 @@
 msgid "Connecting..."
 msgstr "罩e�����..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3881
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3905
 msgid "Nick:"
 msgstr "�窮О鐚�"
 
@@ -1061,117 +1056,117 @@
 msgid "Gaim User"
 msgstr "Gaim ����"
 
-#: src/protocols/irc/irc.c:202
+#: src/protocols/irc/irc.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(莉��∽④羔����咲����莚傑��ヨ侃�欠�莨���賢����膽�������蕁�)"
 
-#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2623
+#: src/protocols/irc/irc.c:500 src/protocols/irc/irc.c:2624
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "筝� %s ��篋�篋坂���綏峨�渇��"
 
-#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2632
+#: src/protocols/irc/irc.c:553 src/protocols/irc/irc.c:2633
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "筝� %s ��篋�篋坂���綏峨産腴�"
 
-#: src/protocols/irc/irc.c:691
+#: src/protocols/irc/irc.c:688
 msgid "No topic is set"
 msgstr "羃≧��莅丞舟莚�蘂�"
 
-#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1762
+#: src/protocols/irc/irc.c:709 src/protocols/irc/irc.c:1766
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s 綏牙�絨�莚�蘂��剛減鐚�%s</B>"
 
-#: src/protocols/irc/irc.c:757
+#: src/protocols/irc/irc.c:754
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr "-:- 罔≦�/%s [%c%c %s] �� %s"
 
-#: src/protocols/irc/irc.c:934 src/protocols/irc/irc.c:947
+#: src/protocols/irc/irc.c:931 src/protocols/irc/irc.c:944
 msgid "User"
 msgstr "���桁��"
 
-#: src/protocols/irc/irc.c:938
+#: src/protocols/irc/irc.c:935
 msgid "Server"
 msgstr "���≦��"
 
-#: src/protocols/irc/irc.c:942 src/protocols/irc/irc.c:1096
-#: src/protocols/irc/irc.c:1654
+#: src/protocols/irc/irc.c:939 src/protocols/irc/irc.c:1094
+#: src/protocols/irc/irc.c:1658
 msgid "IRC Operator"
 msgstr "IRC 膊∞����"
 
-#: src/protocols/irc/irc.c:955
+#: src/protocols/irc/irc.c:952
 msgid "Channels"
 msgstr "蘂���"
 
-#: src/protocols/irc/irc.c:961
+#: src/protocols/irc/irc.c:958
 #, c-format
 msgid "%s is an Identified User"
 msgstr "%s ����莚�������"
 
-#: src/protocols/irc/irc.c:976
+#: src/protocols/irc/irc.c:973
 #, c-format
 msgid "%ld seconds [signon: %s]"
 msgstr "%ld 腱� [�糸�ワ�%s]"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1096
+#: src/protocols/irc/irc.c:1094
 msgid "Rehashing server"
 msgstr "罩e����菴����≦��"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1099
+#: src/protocols/irc/irc.c:1097
 msgid "No such nick/channel"
 msgstr "羃≧��菴��欠���窮О/蘂���"
 
-#: src/protocols/irc/irc.c:1099 src/protocols/irc/irc.c:1102
-#: src/protocols/irc/irc.c:1107 src/protocols/irc/irc.c:1111
-#: src/protocols/irc/irc.c:1469 src/protocols/irc/irc.c:1612
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1105 src/protocols/irc/irc.c:1109
+#: src/protocols/irc/irc.c:1474 src/protocols/irc/irc.c:1616
 msgid "IRC Error"
 msgstr "IRC �咲��"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1102
+#: src/protocols/irc/irc.c:1100
 msgid "No such server"
 msgstr "羃≧��莚ユ���≦��"
 
 #. ERR_NOMOTD
 #. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1107
+#: src/protocols/irc/irc.c:1105
 msgid "No nickname given"
 msgstr "羃≧��膸��堺�窮О"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1110
+#: src/protocols/irc/irc.c:1108
 msgid "You're not an IRC operator!"
 msgstr "����� IRC 膊∞����鐚�"
 
-#: src/protocols/irc/irc.c:1114
+#: src/protocols/irc/irc.c:1112
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "莚ユ�窮О綏牙�茴��銀�篋坂戎�����莚決��ユ�井�窮О"
 
 #. Build OK Button
-#: src/protocols/irc/irc.c:1117 src/protocols/msn/msn.c:171
-#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
-#: src/protocols/msn/msn.c:204 src/protocols/oscar/oscar.c:2432
-#: src/protocols/oscar/oscar.c:2507 src/protocols/oscar/oscar.c:5766
-#: src/protocols/oscar/oscar.c:5814 src/protocols/yahoo/yahoo.c:1204
-#: src/dialogs.c:2194 src/dialogs.c:2326 src/dialogs.c:2608 src/dialogs.c:2754
-#: src/dialogs.c:3891 src/dialogs.c:4370
+#: src/protocols/irc/irc.c:1115 src/protocols/msn/msn.c:167
+#: src/protocols/msn/msn.c:178 src/protocols/msn/msn.c:189
+#: src/protocols/msn/msn.c:200 src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:5809
+#: src/protocols/oscar/oscar.c:5857 src/protocols/yahoo/yahoo.c:1196
+#: src/dialogs.c:2233 src/dialogs.c:2366 src/dialogs.c:2650 src/dialogs.c:2796
+#: src/dialogs.c:3954 src/dialogs.c:4436
 msgid "OK"
 msgstr "隋��"
 
-#: src/protocols/irc/irc.c:1403 src/protocols/irc/irc.c:1409
-#: src/protocols/irc/irc.c:1415 src/protocols/irc/irc.c:1429
+#: src/protocols/irc/irc.c:1401 src/protocols/irc/irc.c:1407
+#: src/protocols/irc/irc.c:1413 src/protocols/irc/irc.c:1427
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 篆≧��"
 
-#: src/protocols/irc/irc.c:1439
+#: src/protocols/irc/irc.c:1437
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s �活�綮榊�篋�篋坂���"
@@ -1182,76 +1177,80 @@
 "computers.  Messages sent will not pass through the IRC server"
 msgstr "菴���荀���犬�域�膊��坂��翫産腴��贋・菴��ャ��������羔������菴� IRC ���≦��"
 
-#: src/protocols/irc/irc.c:1440 src/protocols/oscar/oscar.c:2396
-#: src/protocols/oscar/oscar.c:5563
+#: src/protocols/irc/irc.c:1444 src/protocols/oscar/oscar.c:2401
+#: src/protocols/oscar/oscar.c:5604
 msgid "Connect"
 msgstr "菴���"
 
-#: src/protocols/irc/irc.c:1466
+#: src/protocols/irc/irc.c:1471
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr "�九�遺� %s ���榊��������篁九���莚傑���"
 
-#: src/protocols/irc/irc.c:1547 src/protocols/msn/error.c:133
-#: src/protocols/msn/notification.c:276 src/protocols/msn/notification.c:731
+#: src/protocols/irc/irc.c:1552 src/protocols/msn/error.c:133
+#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:734
 msgid "Unable to write"
 msgstr "��羈�����"
 
-#: src/protocols/irc/irc.c:1610
+#: src/protocols/irc/irc.c:1614
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "��群膸頮�権�坂� %s: %s"
 
-#: src/protocols/irc/irc.c:1615
+#: src/protocols/irc/irc.c:1619
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "茴� %s 荼√�削�%s"
 
-#: src/protocols/irc/irc.c:1671 src/protocols/irc/irc.c:2933
+#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2934
 msgid "CTCP ClientInfo"
 msgstr "CTCP 絎∽�隙拭��"
 
-#: src/protocols/irc/irc.c:1677 src/protocols/irc/irc.c:2939
+#: src/protocols/irc/irc.c:1681 src/protocols/irc/irc.c:2940
 msgid "CTCP UserInfo"
 msgstr "CTCP ���隙拭��"
 
-#: src/protocols/irc/irc.c:1683 src/protocols/irc/irc.c:2945
+#: src/protocols/irc/irc.c:1687 src/protocols/irc/irc.c:2946
 msgid "CTCP Version"
 msgstr "CTCP ����"
 
-#: src/protocols/irc/irc.c:1711 src/protocols/irc/irc.c:2951
+#: src/protocols/irc/irc.c:1715 src/protocols/irc/irc.c:2952
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1964 src/protocols/oscar/oscar.c:695
+#: src/protocols/irc/irc.c:1966 src/protocols/oscar/oscar.c:690
 #: src/protocols/toc/toc.c:255
 #, c-format
 msgid "Signon: %s"
 msgstr "�糸���鐚�%s"
 
-#: src/protocols/irc/irc.c:2220
+#: src/protocols/irc/irc.c:1980
+msgid "Unable to create socket"
+msgstr "��羈���綮阪��ュ�"
+
+#: src/protocols/irc/irc.c:2221
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s ��莚�蘂��� %s"
 
-#: src/protocols/irc/irc.c:2316
+#: src/protocols/irc/irc.c:2317
 #, c-format
 msgid "You have left %s"
 msgstr "��群膸霝糸�篋� %s"
 
-#: src/protocols/irc/irc.c:2317
+#: src/protocols/irc/irc.c:2318
 msgid "IRC Part"
 msgstr "IRC ����"
 
-#: src/protocols/irc/irc.c:2372
+#: src/protocols/irc/irc.c:2373
 msgid "<I>Requesting DCC CHAT</I>"
 msgstr "<I>罩e���羆�篋�篋坂���</I>"
 
-#: src/protocols/irc/irc.c:2389
+#: src/protocols/irc/irc.c:2390
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>膊∞�����巡擦鐚�<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2394
+#: src/protocols/irc/irc.c:2395
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1259,11 +1258,11 @@
 "<B>CTCP �巡擦鐚�<BR>CLIENTINFO <�窮О><BR>USERINFO <�窮О><BR>VERSION <�窮О"
 "><BR>PING <�窮О></B><BR>"
 
-#: src/protocols/irc/irc.c:2402
+#: src/protocols/irc/irc.c:2403
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>篋�篋坂����巡擦鐚�<BR>CHAT <�窮О></B>"
 
-#: src/protocols/irc/irc.c:2407
+#: src/protocols/irc/irc.c:2408
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
@@ -1275,19 +1274,19 @@
 "�� /HELP OPER ���ョ��膊∞�����巡擦<BR>莨��� /HELP CTCP ���ョ�� CTCP �巡擦<BR>莨��� /"
 "HELP DCC ���ョ��篋�篋坂������巡擦"
 
-#: src/protocols/irc/irc.c:2430
+#: src/protocols/irc/irc.c:2431
 msgid "<B>Unknown command</B>"
 msgstr "<B>���ュ�巡擦</B>"
 
-#: src/protocols/irc/irc.c:2490
+#: src/protocols/irc/irc.c:2491
 msgid "Channel:"
 msgstr "蘂���鐚�"
 
-#: src/protocols/irc/irc.c:2495 src/main.c:350 src/multi.c:809
+#: src/protocols/irc/irc.c:2496 src/main.c:357
 msgid "Password:"
 msgstr "絲���鐚�"
 
-#: src/protocols/irc/irc.c:2920
+#: src/protocols/irc/irc.c:2921
 msgid "DCC Chat"
 msgstr "篋�篋坂���"
 
@@ -1301,311 +1300,310 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3026 src/protocols/irc/irc.c:3028
+#: src/protocols/irc/irc.c:3027 src/protocols/irc/irc.c:3029
 msgid "IRC Protocol Plugin"
 msgstr "IRC �顒��篁�"
 
-#: src/protocols/irc/irc.c:3048 src/protocols/jabber/jabber.c:2958
-#: src/protocols/jabber/jabber.c:4425 src/protocols/napster/napster.c:660
+#: src/protocols/irc/irc.c:3049 src/protocols/jabber/jabber.c:2962
+#: src/protocols/jabber/jabber.c:4422 src/protocols/napster/napster.c:660
 msgid "Server:"
 msgstr "���≦���"
 
-#: src/protocols/irc/irc.c:3053 src/protocols/jabber/jabber.c:4436
-#: src/protocols/msn/msn.c:1221 src/protocols/napster/napster.c:666
-#: src/multi.c:1135
+#: src/protocols/irc/irc.c:3054 src/protocols/jabber/jabber.c:4433
+#: src/protocols/msn/msn.c:1220 src/protocols/napster/napster.c:666
 msgid "Port:"
 msgstr "腴���"
 
-#: src/protocols/irc/irc.c:3059
+#: src/protocols/irc/irc.c:3060
 msgid "Encoding:"
 msgstr "膽���鐚�"
 
+#: src/protocols/jabber/jabber.c:989
+msgid "Unable to change password."
+msgstr "��羈��贋�劫�����"
+
 #: src/protocols/jabber/jabber.c:990
-msgid "Unable to change password."
-msgstr "��羈��贋�劫�����"
-
-#: src/protocols/jabber/jabber.c:991
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr "����ョ���у���筝�罩g`������絲�����←�贋�鴻��"
 
-#: src/protocols/jabber/jabber.c:997
+#: src/protocols/jabber/jabber.c:996
 msgid "Unable to change password"
 msgstr "��羈��贋�劫���"
 
-#: src/protocols/jabber/jabber.c:998
+#: src/protocols/jabber/jabber.c:997
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr "����ョ���医���筝���������絲����後��������絲���篁��銀������激��"
 
-#: src/protocols/jabber/jabber.c:1175 src/blist.c:714 src/gtkpounce.c:298
+#: src/protocols/jabber/jabber.c:1174 src/blist.c:721 src/gtkpounce.c:299
 msgid "Unknown"
 msgstr "����"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1184 src/protocols/jabber/jabber.c:3438
-#: src/protocols/jabber/jabber.c:3489
+#: src/protocols/jabber/jabber.c:1183 src/protocols/jabber/jabber.c:3442
+#: src/protocols/jabber/jabber.c:3493
 msgid "Chatty"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:1186 src/protocols/jabber/jabber.c:3440
-#: src/protocols/jabber/jabber.c:3497
+#: src/protocols/jabber/jabber.c:1185 src/protocols/jabber/jabber.c:3444
+#: src/protocols/jabber/jabber.c:3501
 msgid "Extended Away"
 msgstr "菴�菴�胼糸�"
 
-#: src/protocols/jabber/jabber.c:1188 src/protocols/jabber/jabber.c:3441
-#: src/protocols/jabber/jabber.c:3501 src/protocols/oscar/oscar.c:2793
-#: src/protocols/oscar/oscar.c:4487 src/protocols/oscar/oscar.c:5685
+#: src/protocols/jabber/jabber.c:1187 src/protocols/jabber/jabber.c:3445
+#: src/protocols/jabber/jabber.c:3505 src/protocols/oscar/oscar.c:2816
+#: src/protocols/oscar/oscar.c:4513 src/protocols/oscar/oscar.c:5728
 msgid "Do Not Disturb"
 msgstr "莚桁�炊����"
 
-#: src/protocols/jabber/jabber.c:1427
+#: src/protocols/jabber/jabber.c:1426
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber ��莚� %s"
 
-#: src/protocols/jabber/jabber.c:1534
+#: src/protocols/jabber/jabber.c:1533
 #, c-format
 msgid "Error %s: %s"
 msgstr "��莚� %s鐚�%s"
 
-#: src/protocols/jabber/jabber.c:1537
+#: src/protocols/jabber/jabber.c:1536
 msgid "Unknown Error in presence"
 msgstr "�榊ー���ラ��莚�"
 
-#: src/protocols/jabber/jabber.c:1713
+#: src/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "���� %s �活�絨���兄��筝阪ソ����"
 
-#: src/protocols/jabber/jabber.c:1738
+#: src/protocols/jabber/jabber.c:1742
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr "Jabber ���� %s 筝�絖������罩ゆ押��羞糸���井����篋阪����筝㏍��"
 
-#: src/protocols/jabber/jabber.c:1741
+#: src/protocols/jabber/jabber.c:1745
 msgid "No such user."
 msgstr "羃≧��菴��欠�����激��"
 
-#: src/protocols/jabber/jabber.c:1832 src/protocols/msn/notification.c:76
-#: src/protocols/msn/notification.c:77 src/protocols/msn/notification.c:619
-#: src/blist.c:438 src/dialogs.c:901
+#. Should never happen.
+#: src/protocols/jabber/jabber.c:1836 src/protocols/msn/notification.c:87
+#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:620
+#: src/blist.c:439 src/dialogs.c:922
 msgid "Buddies"
 msgstr "絅遵�"
 
-#: src/protocols/jabber/jabber.c:1905
+#: src/protocols/jabber/jabber.c:1909
 msgid "Authenticating"
 msgstr "罩e���莚�"
 
-#: src/protocols/jabber/jabber.c:1939
+#: src/protocols/jabber/jabber.c:1944
 msgid "Unknown login error"
 msgstr "���ョ���糸���莚�"
 
-#: src/protocols/jabber/jabber.c:2289
+#: src/protocols/jabber/jabber.c:2294
 msgid "Password successfully changed."
 msgstr "絲����贋�号������"
 
-#: src/protocols/jabber/jabber.c:2334 src/protocols/jabber/jabber.c:4243
+#: src/protocols/jabber/jabber.c:2339 src/protocols/jabber/jabber.c:4242
 msgid "Connection lost"
 msgstr "菴��ュ群筝√け"
 
-#: src/protocols/jabber/jabber.c:2342
+#: src/protocols/jabber/jabber.c:2346
 msgid "Connected"
 msgstr "綏画���"
 
-#: src/protocols/jabber/jabber.c:2345
+#: src/protocols/jabber/jabber.c:2349
 msgid "Requesting Authentication Method"
 msgstr "罩e���羆�莅よ��号�"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2365 src/protocols/msn/dispatch.c:170
-#: src/protocols/msn/msn.c:436 src/protocols/napster/napster.c:507
-#: src/protocols/yahoo/yahoo.c:988
+#: src/protocols/jabber/jabber.c:2369 src/protocols/msn/dispatch.c:164
+#: src/protocols/msn/msn.c:413 src/protocols/napster/napster.c:507
+#: src/protocols/yahoo/yahoo.c:995
 msgid "Connecting"
 msgstr "罩e�����"
 
-#: src/protocols/jabber/jabber.c:2691
+#: src/protocols/jabber/jabber.c:2695
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr "���� %s �� Jabber ID ����鐚���罩ゆ押��羞糸����"
 
-#: src/protocols/jabber/jabber.c:2693
+#: src/protocols/jabber/jabber.c:2697
 msgid "Unable to add buddy."
 msgstr "��羈�羞糸��絅遵���"
 
-#: src/protocols/jabber/jabber.c:2694
+#: src/protocols/jabber/jabber.c:2698
 msgid "Jabber Error"
 msgstr "Jabber ��莚�"
 
-#: src/protocols/jabber/jabber.c:2953
+#: src/protocols/jabber/jabber.c:2957
 msgid "Room:"
 msgstr "�翠�器�"
 
-#: src/protocols/jabber/jabber.c:2964
+#: src/protocols/jabber/jabber.c:2968
 msgid "Handle:"
 msgstr "������鐚�"
 
-#: src/protocols/jabber/jabber.c:2994
+#: src/protocols/jabber/jabber.c:2998
 msgid "Unable to join chat"
 msgstr "��羈����ヨ��紊�"
 
-#: src/protocols/jabber/jabber.c:3230 src/protocols/jabber/jabber.c:3281
-#: src/protocols/jabber/jabber.c:3706
+#: src/protocols/jabber/jabber.c:3234 src/protocols/jabber/jabber.c:3285
+#: src/protocols/jabber/jabber.c:3710
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: src/protocols/jabber/jabber.c:3231
+#: src/protocols/jabber/jabber.c:3235
 msgid "Error"
 msgstr "�咲��"
 
-#: src/protocols/jabber/jabber.c:3282 src/protocols/jabber/jabber.c:3341
-#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3732
+#: src/protocols/jabber/jabber.c:3286 src/protocols/jabber/jabber.c:3345
+#: src/protocols/jabber/jabber.c:3356 src/protocols/jabber/jabber.c:3736
 msgid "Status"
 msgstr "�倶��"
 
-#: src/protocols/jabber/jabber.c:3352 src/protocols/jabber/jabber.c:3374
-#: src/protocols/oscar/oscar.c:5366
+#: src/protocols/jabber/jabber.c:3356 src/protocols/jabber/jabber.c:3378
+#: src/protocols/oscar/oscar.c:5401
 msgid "Not Authorized"
 msgstr "���莚�"
 
-#: src/protocols/jabber/jabber.c:3387
+#: src/protocols/jabber/jabber.c:3391
 msgid "View Error Msg"
 msgstr "�ョ����莚����"
 
-#: src/protocols/jabber/jabber.c:3399 src/gtkconv.c:794
+#: src/protocols/jabber/jabber.c:3403 src/gtkconv.c:800
 msgid "Get Away Msg"
 msgstr "�桁�胼糸�羔���"
 
-#: src/protocols/jabber/jabber.c:3406
+#: src/protocols/jabber/jabber.c:3410
 msgid "Un-hide From"
 msgstr "��羔���荳�"
 
-#: src/protocols/jabber/jabber.c:3409
+#: src/protocols/jabber/jabber.c:3413
 msgid "Temporarily Hide From"
 msgstr "筝贋�狗��荳�"
 
-#: src/protocols/jabber/jabber.c:3416
+#: src/protocols/jabber/jabber.c:3420
 msgid "Cancel Presence Notification"
 msgstr "��羔�����������"
 
-#: src/protocols/jabber/jabber.c:3424
+#: src/protocols/jabber/jabber.c:3428
 msgid "Re-request authorization"
 msgstr "���域�羆�莅よ�"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3437 src/protocols/jabber/jabber.c:3487
-#: src/protocols/oscar/oscar.c:2805 src/protocols/oscar/oscar.c:4482
-#: src/protocols/oscar/oscar.c:5683 src/protocols/yahoo/yahoo.c:1091
+#: src/protocols/jabber/jabber.c:3441 src/protocols/jabber/jabber.c:3491
+#: src/protocols/oscar/oscar.c:2828 src/protocols/oscar/oscar.c:4508
+#: src/protocols/oscar/oscar.c:5726 src/protocols/yahoo/yahoo.c:1084
 #: src/protocols/zephyr/zephyr.c:865 src/protocols/zephyr/zephyr.c:875
-#: src/multi.c:275
 msgid "Online"
 msgstr "��鎖"
 
-#: src/protocols/jabber/jabber.c:3627
+#: src/protocols/jabber/jabber.c:3631
 msgid "Full Name"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:3628
+#: src/protocols/jabber/jabber.c:3632
 msgid "Family Name"
 msgstr "紮�"
 
-#: src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/jabber.c:3633
 msgid "Given Name"
 msgstr "��"
 
-#: src/protocols/jabber/jabber.c:3630
+#: src/protocols/jabber/jabber.c:3634
 msgid "Nickname"
 msgstr "�窮О"
 
-#: src/protocols/jabber/jabber.c:3631 src/dialogs.c:2879
+#: src/protocols/jabber/jabber.c:3635 src/dialogs.c:2921
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3632
+#: src/protocols/jabber/jabber.c:3636
 msgid "Street Address"
 msgstr "茵����医��"
 
-#: src/protocols/jabber/jabber.c:3633
+#: src/protocols/jabber/jabber.c:3637
 msgid "Extended Address"
 msgstr "蘂�紊��医��"
 
-#: src/protocols/jabber/jabber.c:3634
+#: src/protocols/jabber/jabber.c:3638
 msgid "Locality"
 msgstr "�医��"
 
-#: src/protocols/jabber/jabber.c:3635
+#: src/protocols/jabber/jabber.c:3639
 msgid "Region"
 msgstr "�阪��"
 
-#: src/protocols/jabber/jabber.c:3636
+#: src/protocols/jabber/jabber.c:3640
 msgid "Postal Code"
 msgstr "���睡���"
 
 #. Line 7
-#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2050 src/dialogs.c:2685
+#: src/protocols/jabber/jabber.c:3641 src/dialogs.c:2087 src/dialogs.c:2727
 msgid "Country"
 msgstr "�遵�"
 
-#: src/protocols/jabber/jabber.c:3638
+#: src/protocols/jabber/jabber.c:3642
 msgid "Telephone"
 msgstr "�笈��欠��"
 
-#: src/protocols/jabber/jabber.c:3639 src/dialogs.c:2743
+#: src/protocols/jabber/jabber.c:3643 src/dialogs.c:2785
 msgid "Email"
 msgstr "�球���散"
 
-#: src/protocols/jabber/jabber.c:3640
+#: src/protocols/jabber/jabber.c:3644
 msgid "Organization Name"
 msgstr "膸�膸���腱�"
 
-#: src/protocols/jabber/jabber.c:3641
+#: src/protocols/jabber/jabber.c:3645
 msgid "Organization Unit"
 msgstr "膸�膸�����"
 
-#: src/protocols/jabber/jabber.c:3642
+#: src/protocols/jabber/jabber.c:3646
 msgid "Title"
 msgstr "��蘂�"
 
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/jabber.c:3647
 msgid "Role"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:3644
+#: src/protocols/jabber/jabber.c:3648
 msgid "Birthday"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:3645 src/dialogs.c:2889 src/gtkprefs.c:429
-#: src/gtkprefs.c:1404
+#: src/protocols/jabber/jabber.c:3649 src/dialogs.c:2931 src/gtkprefs.c:658
+#: src/gtkprefs.c:1766
 msgid "Description"
 msgstr "�颷�"
 
-#: src/protocols/jabber/jabber.c:3670
+#: src/protocols/jabber/jabber.c:3674
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "����筝��∝��蕁合���醇���������莚桁Ű��ユ���炊�颴��ョ��篆≧��"
 
-#: src/protocols/jabber/jabber.c:3671
+#: src/protocols/jabber/jabber.c:3675
 msgid "User Identity"
 msgstr "���傑��莚�"
 
-#: src/protocols/jabber/jabber.c:4097
+#: src/protocols/jabber/jabber.c:4101
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 膽�莨� Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4172
+#: src/protocols/jabber/jabber.c:4176
 msgid "Server Registration successful!"
 msgstr "���≦��絵������鐚�"
 
-#: src/protocols/jabber/jabber.c:4199
+#: src/protocols/jabber/jabber.c:4198
 msgid "Unknown registration error"
 msgstr "���ョ��羈�����莚�"
 
-#: src/protocols/jabber/jabber.c:4314 src/protocols/oscar/oscar.c:5876
-#: src/protocols/toc/toc.c:1441 src/dialogs.c:2222
+#: src/protocols/jabber/jabber.c:4311 src/protocols/oscar/oscar.c:5921
+#: src/protocols/toc/toc.c:1441 src/dialogs.c:2261
 msgid "Set User Info"
 msgstr "莅丞舟���隙拭��"
 
@@ -1619,60 +1617,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4403 src/protocols/jabber/jabber.c:4405
+#: src/protocols/jabber/jabber.c:4400 src/protocols/jabber/jabber.c:4402
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber �顒��篁�"
 
-#: src/protocols/jabber/jabber.c:4431
+#: src/protocols/jabber/jabber.c:4428
 msgid "Resource:"
 msgstr "莎�羣�鐚�"
 
-#: src/protocols/jabber/jabber.c:4442
+#: src/protocols/jabber/jabber.c:4439
 msgid "Connect Server:"
 msgstr "菴��ユ���≦���"
 
-#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:217
+#: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:229
 msgid "Protocol not supported"
 msgstr "�顒������"
 
-#: src/protocols/msn/dispatch.c:52
+#: src/protocols/msn/dispatch.c:51
 msgid "Unable to request INF\n"
 msgstr "��羈�莚傑� INF\n"
 
-#: src/protocols/msn/dispatch.c:69 src/protocols/msn/notification.c:241
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:252
 msgid "Unable to login using MD5"
 msgstr "��羈�篏睡�� MD5 �糸��"
 
-#: src/protocols/msn/dispatch.c:78
+#: src/protocols/msn/dispatch.c:77
 msgid "Unable to send USR\n"
 msgstr "��羈����� USR\n"
 
-#: src/protocols/msn/dispatch.c:84 src/protocols/msn/notification.c:256
+#: src/protocols/msn/dispatch.c:82 src/protocols/msn/notification.c:266
 msgid "Requesting to send password"
 msgstr "罩e���羆�����絲���"
 
-#: src/protocols/msn/dispatch.c:100
+#: src/protocols/msn/dispatch.c:99
 msgid "Got invalid XFR\n"
 msgstr "緇��井������ XFR\n"
 
-#: src/protocols/msn/dispatch.c:128
+#: src/protocols/msn/dispatch.c:126
 msgid "Unable to transfer"
 msgstr "��羈�篌���"
 
-#: src/protocols/msn/dispatch.c:150
+#: src/protocols/msn/dispatch.c:147
 msgid "Unable to parse message."
 msgstr "��羈�紊���羔�����"
 
-#: src/protocols/msn/dispatch.c:177 src/protocols/msn/notification.c:390
-#: src/protocols/msn/notification.c:1289
+#: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:405
+#: src/protocols/msn/notification.c:1342
 msgid "Unable to write to server"
 msgstr "��羈����ユ���≦����"
 
-#: src/protocols/msn/dispatch.c:182 src/protocols/msn/notification.c:1296
+#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1349
 msgid "Syncing with server"
 msgstr "罩e������≦����罩�"
 
-#: src/protocols/msn/dispatch.c:195 src/protocols/msn/notification.c:1309
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1363
 msgid "Error reading from server"
 msgstr "篁����≦������九�咲��"
 
@@ -1744,7 +1742,7 @@
 msgid "Required fields missing"
 msgstr "膽阪�綽�蕁糸��"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:194
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:193
 msgid "Not logged in"
 msgstr "���糸��"
 
@@ -1837,164 +1835,149 @@
 msgid "Unknown Error Code %d"
 msgstr "���ョ����莚�撮�� %d"
 
-#: src/protocols/msn/msn.c:60
+#: src/protocols/msn/msn.c:57
 msgid "Your new MSN friendly name is too long."
 msgstr "�亥�� MSN ��絅遵��腱医お�帥��"
 
-#: src/protocols/msn/msn.c:72 src/protocols/msn/msn.c:91
-#: src/protocols/msn/msn.c:149 src/protocols/msn/msn.c:486
-#: src/protocols/msn/msn.c:595 src/protocols/msn/msn.c:611
-#: src/protocols/msn/msn.c:646 src/protocols/msn/msn.c:662
-#: src/protocols/msn/msn.c:694 src/protocols/msn/msn.c:703
-#: src/protocols/msn/msn.c:736 src/protocols/msn/msn.c:745
-#: src/protocols/msn/msn.c:760 src/protocols/msn/msn.c:770
-#: src/protocols/msn/msn.c:785 src/protocols/msn/msn.c:795
-#: src/protocols/msn/msn.c:817 src/protocols/msn/msn.c:868
-#: src/protocols/msn/msn.c:907 src/protocols/msn/msn.c:999
-#: src/protocols/msn/msn.c:1022 src/protocols/msn/msn.c:1037
-#: src/protocols/msn/msn.c:1049 src/protocols/msn/msn.c:1071
-#: src/protocols/msn/msn.c:1081 src/protocols/msn/notification.c:113
-#: src/protocols/msn/notification.c:143 src/protocols/msn/notification.c:900
+#: src/protocols/msn/msn.c:69 src/protocols/msn/msn.c:88
+#: src/protocols/msn/msn.c:146 src/protocols/msn/msn.c:468
+#: src/protocols/msn/msn.c:579 src/protocols/msn/msn.c:595
+#: src/protocols/msn/msn.c:630 src/protocols/msn/msn.c:646
+#: src/protocols/msn/msn.c:678 src/protocols/msn/msn.c:686
+#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:727
+#: src/protocols/msn/msn.c:741 src/protocols/msn/msn.c:750
+#: src/protocols/msn/msn.c:764 src/protocols/msn/msn.c:773
+#: src/protocols/msn/msn.c:795 src/protocols/msn/msn.c:845
+#: src/protocols/msn/msn.c:883 src/protocols/msn/msn.c:976
+#: src/protocols/msn/msn.c:1000 src/protocols/msn/msn.c:1020
+#: src/protocols/msn/msn.c:1031 src/protocols/msn/msn.c:1042
+#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1078
+#: src/protocols/msn/notification.c:127 src/protocols/msn/notification.c:156
+#: src/protocols/msn/notification.c:907 src/protocols/msn/notification.c:927
 msgid "Write error"
 msgstr "����莚�"
 
-#: src/protocols/msn/msn.c:167
+#: src/protocols/msn/msn.c:163
 msgid "Set your friendly name."
 msgstr "莅丞舟������絅遵��腱違��"
 
-#: src/protocols/msn/msn.c:168
+#: src/protocols/msn/msn.c:164
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "菴����銀��� MSN 絅遵����亥����絖���"
 
-#: src/protocols/msn/msn.c:180
+#: src/protocols/msn/msn.c:176
 msgid "Set your home phone number."
 msgstr "莅丞舟����絎九梱�笈��欠����"
 
-#: src/protocols/msn/msn.c:191
+#: src/protocols/msn/msn.c:187
 msgid "Set your work phone number."
 msgstr "莅丞舟����綏ヤ��笈��欠����"
 
-#: src/protocols/msn/msn.c:202
+#: src/protocols/msn/msn.c:198
 msgid "Set your mobile phone number."
 msgstr "莅丞舟����腱糸���笈��欠����"
 
-#: src/protocols/msn/msn.c:214
-msgid "MSN Mobile Support"
-msgstr "MSN 腱糸������"
-
-#: src/protocols/msn/msn.c:215
-msgid "Do you want to enable or disable MSN Mobile device support?"
-msgstr "���活����������� MSN 腱糸���紊�����鐚�"
-
-#: src/protocols/msn/msn.c:218
-msgid "Enable"
-msgstr "����"
-
-#: src/protocols/msn/msn.c:219
-msgid "Disable"
-msgstr "胼���"
-
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:207
 msgid "Allow MSN Mobile pages?"
 msgstr "��莅� MSN 腱糸����弱��鐚�"
 
-#: src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:208
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
-"��������莅娯�筝�鐚�����絅遵���札膸�����腱糸���笈����九�腱糸���紊����� MSN 腱糸����若��"
-"���活���莅梧����罩∵�筝����緒�"
-
-#: src/protocols/msn/msn.c:232
+"��������莅娯�筝�鐚�����絅遵���札膸�����腱糸���笈����九�腱糸���紊����� MSN 腱糸����若����"
+"�活���莅梧����罩∵�筝����緒�"
+
+#: src/protocols/msn/msn.c:212
 msgid "Allow"
 msgstr "��莅�"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:213
 msgid "Disallow"
 msgstr "胼�罩�"
 
-#: src/protocols/msn/msn.c:249
+#: src/protocols/msn/msn.c:230
 msgid "Send a mobile message."
 msgstr "����腱糸�������"
 
-#: src/protocols/msn/msn.c:251
+#: src/protocols/msn/msn.c:232
 msgid "Page"
 msgstr "絲糸��"
 
-#: src/protocols/msn/msn.c:252 src/about.c:169 src/dialogs.c:4185
-#: src/prpl.c:423 src/prpl.c:732 src/server.c:1430
+#: src/protocols/msn/msn.c:233 src/about.c:169 src/dialogs.c:4251
+#: src/prpl.c:515 src/server.c:1462
 msgid "Close"
 msgstr "�渇��"
 
-#: src/protocols/msn/msn.c:315 src/protocols/yahoo/yahoo.c:1142
+#: src/protocols/msn/msn.c:296 src/protocols/yahoo/yahoo.c:1135
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>�倶��鐚�</b> %s"
 
-#: src/protocols/msn/msn.c:328 src/protocols/msn/msn.c:571
+#: src/protocols/msn/msn.c:309 src/protocols/msn/msn.c:555
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "菴�胼紫�笈��"
 
-#: src/protocols/msn/msn.c:329 src/protocols/msn/msn.c:573
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1069
-#: src/protocols/yahoo/yahoo.c:1277 src/protocols/yahoo/yahoo.c:1353
+#: src/protocols/msn/msn.c:310 src/protocols/msn/msn.c:557
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1062
+#: src/protocols/yahoo/yahoo.c:1269 src/protocols/yahoo/yahoo.c:1345
 msgid "Be Right Back"
 msgstr "薊������"
 
-#: src/protocols/msn/msn.c:330 src/protocols/msn/msn.c:575
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1071
-#: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1354
+#: src/protocols/msn/msn.c:311 src/protocols/msn/msn.c:559
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1064
+#: src/protocols/yahoo/yahoo.c:1271 src/protocols/yahoo/yahoo.c:1346
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: src/protocols/msn/msn.c:331 src/protocols/msn/msn.c:577
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1079
-#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1358
+#: src/protocols/msn/msn.c:312 src/protocols/msn/msn.c:561
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1072
+#: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1350
 msgid "On The Phone"
 msgstr "�ュ���笈�"
 
-#: src/protocols/msn/msn.c:332 src/protocols/msn/msn.c:579
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1083
-#: src/protocols/yahoo/yahoo.c:1291 src/protocols/yahoo/yahoo.c:1360
+#: src/protocols/msn/msn.c:313 src/protocols/msn/msn.c:563
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1076
+#: src/protocols/yahoo/yahoo.c:1283 src/protocols/yahoo/yahoo.c:1352
 msgid "Out To Lunch"
 msgstr "紊��阪葦蕕�"
 
-#: src/protocols/msn/msn.c:333 src/protocols/msn/msn.c:581
+#: src/protocols/msn/msn.c:314 src/protocols/msn/msn.c:565
 #: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:877
 msgid "Hidden"
 msgstr "��荳�"
 
-#: src/protocols/msn/msn.c:345
+#: src/protocols/msn/msn.c:326
 msgid "Set Friendly Name"
 msgstr "莅丞舟��絅順����腱�"
 
-#: src/protocols/msn/msn.c:353
+#: src/protocols/msn/msn.c:334
 msgid "Set Home Phone Number"
 msgstr "莅丞舟絎九梱�笈��欠��"
 
-#: src/protocols/msn/msn.c:359
+#: src/protocols/msn/msn.c:340
 msgid "Set Work Phone Number"
 msgstr "莅丞舟綏ヤ��笈��欠��"
 
-#: src/protocols/msn/msn.c:365
+#: src/protocols/msn/msn.c:346
 msgid "Set Mobile Phone Number"
 msgstr "莅丞舟腱糸���笈��欠��"
 
-#: src/protocols/msn/msn.c:374
+#: src/protocols/msn/msn.c:355
 msgid "Enable/Disable Mobile Devices"
 msgstr "����/胼���Щ���紊�"
 
-#: src/protocols/msn/msn.c:381
+#: src/protocols/msn/msn.c:362
 msgid "Allow/Disallow Mobile Pages"
 msgstr "��莅�/胼�罩∝Щ�����"
 
-#: src/protocols/msn/msn.c:403
+#: src/protocols/msn/msn.c:384
 msgid "Send to Mobile"
 msgstr "�����亥Щ���紊�"
 
-#: src/protocols/msn/msn.c:675
+#: src/protocols/msn/msn.c:659
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2003,11 +1986,11 @@
 "MSN ���桁�����弱�綽�蕁紙����user@server.com�������醇��������� %s@hotmail.com������"
 "��莅後��茵����篁私��贋�鴻��"
 
-#: src/protocols/msn/msn.c:679 src/protocols/msn/msn.c:720
+#: src/protocols/msn/msn.c:663 src/protocols/msn/msn.c:703
 msgid "Invalid MSN screenname"
 msgstr "������ MSN ���桁��"
 
-#: src/protocols/msn/msn.c:716
+#: src/protocols/msn/msn.c:699
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2026,61 +2009,61 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1195 src/protocols/msn/msn.c:1197
+#: src/protocols/msn/msn.c:1194 src/protocols/msn/msn.c:1196
 msgid "MSN Protocol Plugin"
 msgstr "MSN �顒��篁�"
 
-#: src/protocols/msn/msn.c:1215
+#: src/protocols/msn/msn.c:1214
 msgid "Login Server:"
 msgstr "�糸����≦���"
 
-#: src/protocols/msn/notification.c:224
+#: src/protocols/msn/notification.c:235
 msgid "Unable to request INF"
 msgstr "��羈�莚傑� INF"
 
-#: src/protocols/msn/notification.c:250
+#: src/protocols/msn/notification.c:261
 msgid "Unable to send USR"
 msgstr "��羈����� USR"
 
-#: src/protocols/msn/notification.c:282
+#: src/protocols/msn/notification.c:297
 msgid "Retrieving buddy list"
 msgstr "罩e��キ��絅遵���茵�"
 
-#: src/protocols/msn/notification.c:306
+#: src/protocols/msn/notification.c:323
 msgid "Unable to send password"
 msgstr "��羈�����絲���"
 
-#: src/protocols/msn/notification.c:312
+#: src/protocols/msn/notification.c:328
 msgid "Password sent"
 msgstr "絲���綏臥����"
 
-#: src/protocols/msn/notification.c:329
+#: src/protocols/msn/notification.c:346
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "��群膸頮��㊤��������������九�篏�臀���④���桁���糸�ヤ���"
 
-#: src/protocols/msn/notification.c:335
+#: src/protocols/msn/notification.c:351
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "��群膸頮��㊤���MSN ���≦������膸贋�や賢��"
 
-#: src/protocols/msn/notification.c:440
+#: src/protocols/msn/notification.c:457
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "���� %s(%s) �活�絨� %s 羞糸��筝阪ソ����"
 
-#: src/protocols/msn/notification.c:713
+#: src/protocols/msn/notification.c:715
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "���� %s(%s) �活�絨���兄��筝阪ソ����"
 
-#: src/protocols/msn/notification.c:1082
+#: src/protocols/msn/notification.c:1126
 msgid "Got invalid XFR"
 msgstr "緇��井������ XFR"
 
-#: src/protocols/msn/notification.c:1125
+#: src/protocols/msn/notification.c:1168
 msgid "Unable to transfer to notification server"
 msgstr "��羈�篌����育���ユ���≦����"
 
-#: src/protocols/msn/notification.c:1251
+#: src/protocols/msn/notification.c:1304
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute(s). You will "
@@ -2095,21 +2078,21 @@
 "\n"
 "膸贋�ゅ����������遵������糸�ャ��"
 
-#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1089
-#: src/gtkpounce.c:570 src/gtkprefs.c:1108
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1082
+#: src/gtkpounce.c:569 src/gtkprefs.c:1461
 msgid "Idle"
 msgstr "����"
 
-#: src/protocols/msn/switchboard.c:121
+#: src/protocols/msn/switchboard.c:122
 msgid "The conversation has become inactive and timed out."
 msgstr "絲壕�綏峨��罩√攻莇��吟��"
 
-#: src/protocols/msn/switchboard.c:125
+#: src/protocols/msn/switchboard.c:126
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 綏牙��渇�℡�絲壕�腦��c��"
 
-#: src/protocols/msn/switchboard.c:225
+#: src/protocols/msn/switchboard.c:230
 msgid "An MSN message may not have been received."
 msgstr "MSN 羔�����醇押���九�違��"
 
@@ -2150,11 +2133,11 @@
 msgid "%s requested a PING"
 msgstr "%s 莚傑� PING"
 
-#: src/protocols/napster/napster.c:551 src/gtkblist.c:1500
+#: src/protocols/napster/napster.c:551 src/gtkblist.c:1512
 msgid "Get Info"
 msgstr "篆≧��"
 
-#: src/protocols/napster/napster.c:565 src/protocols/oscar/oscar.c:5089
+#: src/protocols/napster/napster.c:565 src/protocols/oscar/oscar.c:5124
 #: src/protocols/toc/toc.c:1195
 msgid "Join what group:"
 msgstr "���ョ�鐚�"
@@ -2173,176 +2156,176 @@
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER �顒��篁�"
 
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:189
 msgid "Invalid error"
 msgstr "������莚�"
 
+#: src/protocols/oscar/oscar.c:190
+msgid "Invalid SNAC"
+msgstr "���� SNAC"
+
 #: src/protocols/oscar/oscar.c:191
-msgid "Invalid SNAC"
-msgstr "���� SNAC"
-
-#: src/protocols/oscar/oscar.c:192
 msgid "Rate to host"
 msgstr "筝紙�榊�膾�"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:192
 msgid "Rate to client"
 msgstr "絎∽�欠�膾�"
 
+#: src/protocols/oscar/oscar.c:194
+msgid "Service unavailable"
+msgstr "���>�����"
+
 #: src/protocols/oscar/oscar.c:195
-msgid "Service unavailable"
-msgstr "���>�����"
-
-#: src/protocols/oscar/oscar.c:196
 msgid "Service not defined"
 msgstr "���≧���箙�"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:196
 msgid "Obsolete SNAC"
 msgstr "綺��� SNAC"
 
+#: src/protocols/oscar/oscar.c:197
+msgid "Not supported by host"
+msgstr "筝紙�坂�����"
+
 #: src/protocols/oscar/oscar.c:198
-msgid "Not supported by host"
-msgstr "筝紙�坂�����"
-
-#: src/protocols/oscar/oscar.c:199
 msgid "Not supported by client"
 msgstr "絎∽�隙�����"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:199
 msgid "Refused by client"
 msgstr "絎∽�傑��膸�"
 
+#: src/protocols/oscar/oscar.c:200
+msgid "Reply too big"
+msgstr "��紊�紊�ぇ"
+
 #: src/protocols/oscar/oscar.c:201
-msgid "Reply too big"
-msgstr "��紊�紊�ぇ"
+msgid "Responses lost"
+msgstr "��綺�筝√け"
 
 #: src/protocols/oscar/oscar.c:202
-msgid "Responses lost"
-msgstr "��綺�筝√け"
+msgid "Request denied"
+msgstr "莚傑�茴��罩�"
 
 #: src/protocols/oscar/oscar.c:203
-msgid "Request denied"
-msgstr "莚傑�茴��罩�"
+msgid "Busted SNAC payload"
+msgstr "SNAC ����茣�莉醇�紜�"
 
 #: src/protocols/oscar/oscar.c:204
-msgid "Busted SNAC payload"
-msgstr "SNAC ����茣�莉醇�紜�"
-
-#: src/protocols/oscar/oscar.c:205
 msgid "Insufficient rights"
 msgstr "����筝�紊�"
 
-#: src/protocols/oscar/oscar.c:206
+#: src/protocols/oscar/oscar.c:205
 msgid "In local permit/deny"
 msgstr "���域���/胼�罩�"
 
+#: src/protocols/oscar/oscar.c:206
+msgid "Too evil (sender)"
+msgstr "紊�����(������)"
+
 #: src/protocols/oscar/oscar.c:207
-msgid "Too evil (sender)"
-msgstr "紊�����(������)"
+msgid "Too evil (receiver)"
+msgstr "紊�����(�ユ�区��)"
 
 #: src/protocols/oscar/oscar.c:208
-msgid "Too evil (receiver)"
-msgstr "紊�����(�ユ�区��)"
+msgid "User temporarily unavailable"
+msgstr "���隙鹸�銀�����"
 
 #: src/protocols/oscar/oscar.c:209
-msgid "User temporarily unavailable"
-msgstr "���隙鹸�銀�����"
+msgid "No match"
+msgstr "���拷��"
 
 #: src/protocols/oscar/oscar.c:210
-msgid "No match"
-msgstr "���拷��"
+msgid "List overflow"
+msgstr "��茵�頃��"
 
 #: src/protocols/oscar/oscar.c:211
-msgid "List overflow"
-msgstr "��茵�頃��"
+msgid "Request ambiguous"
+msgstr "莚傑����"
 
 #: src/protocols/oscar/oscar.c:212
-msgid "Request ambiguous"
-msgstr "莚傑����"
-
-#: src/protocols/oscar/oscar.c:213
 msgid "Queue full"
 msgstr "����羯�"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:213
 msgid "Not while on AOL"
 msgstr "筝�篏�篋� AOL 筝�"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:484
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "筝� %s ��篋�篋坂���綏峨�渇��"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:486
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "筝� %s ��篋�篋坂���紊沿乾"
 
-#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:602
+#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:602
 #: src/protocols/toc/toc.c:615 src/protocols/toc/toc.c:678
 msgid "Disconnected."
 msgstr "綏我�㊤�菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:855
+#: src/protocols/oscar/oscar.c:554 src/protocols/toc/toc.c:855
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膸���筝���紊�� %s ��菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:572
+#: src/protocols/oscar/oscar.c:570
 msgid "Chat is currently unavailable"
 msgstr "��紊�����筝�����"
 
-#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:708
+#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:701
 msgid "Couldn't connect to host"
 msgstr "��羈�菴��ュ�遺源��"
 
-#: src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:686
 msgid "Unable to login to AIM"
 msgstr "��羈��糸�� AIM"
 
-#: src/protocols/oscar/oscar.c:801 src/protocols/oscar/oscar.c:1187
+#: src/protocols/oscar/oscar.c:793 src/protocols/oscar/oscar.c:1179
 msgid "Could Not Connect"
 msgstr "��羈�菴���"
 
-#: src/protocols/oscar/oscar.c:808
+#: src/protocols/oscar/oscar.c:800
 msgid "Connection established, cookie sent"
 msgstr "菴��ュ群綮榊�鐚�綏峨��� cookie"
 
-#: src/protocols/oscar/oscar.c:875 src/protocols/oscar/oscar.c:887
-#: src/protocols/oscar/oscar.c:892
+#: src/protocols/oscar/oscar.c:867 src/protocols/oscar/oscar.c:880
+#: src/protocols/oscar/oscar.c:885
 msgid "File Transfer Aborted"
 msgstr "��篁銀���筝㊥②"
 
-#: src/protocols/oscar/oscar.c:876
+#: src/protocols/oscar/oscar.c:868
 msgid "Unable to establish listener socket."
 msgstr "��羈�綮榊�������ュ���"
 
-#: src/protocols/oscar/oscar.c:888
+#: src/protocols/oscar/oscar.c:881
 msgid "Unable to establish file descriptor."
 msgstr "��羈�綮榊���篁倶�菴亥���"
 
-#: src/protocols/oscar/oscar.c:893
+#: src/protocols/oscar/oscar.c:886
 msgid "Unable to create new connection."
 msgstr "��羈���綮堺�域��ャ��"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1077 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1069 src/protocols/toc/toc.c:551
 msgid "Incorrect nickname or password."
 msgstr "�窮О��絲���筝�絲鴻��"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1073
 msgid "Your account is currently suspended."
 msgstr "����茣��決←������"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1085
+#: src/protocols/oscar/oscar.c:1077
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL �恰�狗��莅����≧���銀�������"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1089
+#: src/protocols/oscar/oscar.c:1081
 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."
@@ -2351,21 +2334,21 @@
 "�巡��顔�帥��"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1093
+#: src/protocols/oscar/oscar.c:1085
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "��戎����絎∽�欠����お����莚桁�� %s ��膾�"
 
-#: src/protocols/oscar/oscar.c:1097 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1089 src/protocols/toc/toc.c:633
 msgid "Authentication Failed"
 msgstr "莅よ�紊沿乾"
 
-#: src/protocols/oscar/oscar.c:1125
+#: src/protocols/oscar/oscar.c:1117
 msgid "Internal Error"
 msgstr "������莚�"
 
-#: src/protocols/oscar/oscar.c:1226 src/protocols/oscar/oscar.c:1256
-#: src/protocols/oscar/oscar.c:1344
+#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1336
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2373,24 +2356,24 @@
 msgstr ""
 "���喝�茴��㊤�������醇�活�篏睡�� TOC �翫�域�筝����茴�信罩c��莚傑��� %s 筝����贋�違��"
 
-#: src/protocols/oscar/oscar.c:1229 src/protocols/oscar/oscar.c:1259
+#: src/protocols/oscar/oscar.c:1221 src/protocols/oscar/oscar.c:1251
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim ��羈��桁������� AIM �糸�����"
 
-#: src/protocols/oscar/oscar.c:1347
+#: src/protocols/oscar/oscar.c:1339
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim ��羈��桁��������糸�����"
 
-#: src/protocols/oscar/oscar.c:1901 src/protocols/oscar/oscar.c:5407
+#: src/protocols/oscar/oscar.c:1896 src/protocols/oscar/oscar.c:5442
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "筝� %s ��篋�篋坂���綏峨産腴�"
 
-#: src/protocols/oscar/oscar.c:2228 src/protocols/oscar/oscar.c:2250
+#: src/protocols/oscar/oscar.c:2225 src/protocols/oscar/oscar.c:2247
 msgid "(There was an error receiving this message)"
 msgstr "(�ユ�倶④羔����咲��)"
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2393
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����莚傑��� %s 篋�篋坂���"
@@ -2404,75 +2387,75 @@
 "�医����荀���犬�域�膊��坂��翫産腴��贋・菴��ワ�菴�絲剛��恰�銀����上����荀�����篏����絨���"
 "�我���� IP �医��鐚���篁ュ��初����羹�������腱�蕋�����"
 
-#: src/protocols/oscar/oscar.c:2422
+#: src/protocols/oscar/oscar.c:2428
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "莚桁�����鎞������ュソ����"
 
-#: src/protocols/oscar/oscar.c:2430
+#: src/protocols/oscar/oscar.c:2436
 msgid "Authorization Request Message:"
 msgstr "莅よ�莚傑�羔����"
 
-#: src/protocols/oscar/oscar.c:2431
+#: src/protocols/oscar/oscar.c:2437
 msgid "Please authorize me!"
 msgstr "莚桁�����鎞������ュソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:2459
+#: src/protocols/oscar/oscar.c:2465
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "���� %s ��←��筝堺����絅遵�箙�����荀�莅よ����������活�����莅よ�莚傑�鐚�"
 
-#: src/protocols/oscar/oscar.c:2463
+#: src/protocols/oscar/oscar.c:2470 src/protocols/oscar/oscar.c:2472
 msgid "Request Authorization"
 msgstr "莚傑�莅よ�"
 
-#: src/protocols/oscar/oscar.c:2497 src/protocols/oscar/oscar.c:2499
-#: src/protocols/oscar/oscar.c:2506 src/protocols/oscar/oscar.c:2577
-#: src/protocols/oscar/oscar.c:2591 src/protocols/oscar/oscar.c:2960
-#: src/protocols/oscar/oscar.c:3012 src/protocols/oscar/oscar.c:5014
-#: src/protocols/oscar/oscar.c:5056
+#: src/protocols/oscar/oscar.c:2508 src/protocols/oscar/oscar.c:2510
+#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2588
+#: src/protocols/oscar/oscar.c:2608 src/protocols/oscar/oscar.c:2983
+#: src/protocols/oscar/oscar.c:3035 src/protocols/oscar/oscar.c:5045
+#: src/protocols/oscar/oscar.c:5091
 msgid "No reason given."
 msgstr "羃≧��膸��榊���宴��"
 
-#: src/protocols/oscar/oscar.c:2505
+#: src/protocols/oscar/oscar.c:2516
 msgid "Authorization Denied Message:"
 msgstr "莅よ���膸�羔����"
 
-#: src/protocols/oscar/oscar.c:2577
+#: src/protocols/oscar/oscar.c:2588
 #, c-format
 msgid ""
-"The user %lu wants to add you to their buddy list for the following reason:\n"
+"The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"���� %lu �活�絨�����筝坂�/絅合��絅遵�鐚����怨�筝�鐚�\n"
+"���� %u �活�絨�����筝坂�/絅合��絅遵�鐚����怨�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2584 src/protocols/oscar/oscar.c:5019
+#: src/protocols/oscar/oscar.c:2596 src/protocols/oscar/oscar.c:5051
 msgid "Authorization Request"
 msgstr "莅よ�莚傑�"
 
-#: src/protocols/oscar/oscar.c:2591
+#: src/protocols/oscar/oscar.c:2608
 #, c-format
 msgid ""
-"The user %lu has denied your request to add them to your contact list for "
-"the following reason:\n"
+"The user %u has denied your request to add them to your contact list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"���� %lu ��膸�篋����篁�/絅劫��筝阪ソ����莚傑�鐚�����絋�筝�鐚�\n"
+"���� %u ��膸�篋����篁�/絅劫��筝阪ソ����莚傑�鐚�����絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2592
+#: src/protocols/oscar/oscar.c:2609
 msgid "ICQ authorization denied."
 msgstr "ICQ 莚傑�莅よ�茴���膸���"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2599
-#, c-format
-msgid "The user %lu has granted your request to add them to your contact list."
-msgstr "���� %lu ������篁�/絅劫��筝阪ソ����"
-
-#: src/protocols/oscar/oscar.c:2607
+#: src/protocols/oscar/oscar.c:2616
+#, c-format
+msgid "The user %u has granted your request to add them to your contact list."
+msgstr "���� %u ������篁�/絅劫��筝阪ソ����"
+
+#: src/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2485,7 +2468,7 @@
 "���坂査鐚�%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2615
+#: src/protocols/oscar/oscar.c:2632
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2498,7 +2481,7 @@
 "���坂査鐚�%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2623
+#: src/protocols/oscar/oscar.c:2640
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2511,32 +2494,32 @@
 "��絎号���\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2644
-#, c-format
-msgid "ICQ user %lu has sent you a contact: %s (%s)"
-msgstr "ICQ ���� %lu 膸������篋�筝�筝���膤私査鐚�%s (%s)"
-
-#: src/protocols/oscar/oscar.c:2648
+#: src/protocols/oscar/oscar.c:2661
+#, c-format
+msgid "ICQ user %u has sent you a contact: %s (%s)"
+msgstr "ICQ ���� %u 膸������篋�筝�筝���膤私査鐚�%s (%s)"
+
+#: src/protocols/oscar/oscar.c:2667
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "�������活�絨�罩よ��膤私査��筝阪ソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:2648
+#: src/protocols/oscar/oscar.c:2671
 msgid "Decline"
 msgstr "��膸�"
 
-#: src/protocols/oscar/oscar.c:2730
+#: src/protocols/oscar/oscar.c:2753
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧�����������篋�羔���������"
 
-#: src/protocols/oscar/oscar.c:2739
+#: src/protocols/oscar/oscar.c:2762
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧�����������篋�羔���お紊с��"
 
-#: src/protocols/oscar/oscar.c:2748
+#: src/protocols/oscar/oscar.c:2771
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2544,167 +2527,167 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧����������松�遺�膈�膾ч���吟��"
 
-#: src/protocols/oscar/oscar.c:2757
+#: src/protocols/oscar/oscar.c:2780
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧�����������/絅劫お���銀���"
 
-#: src/protocols/oscar/oscar.c:2766
+#: src/protocols/oscar/oscar.c:2789
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧������������お���銀���"
 
-#: src/protocols/oscar/oscar.c:2775
+#: src/protocols/oscar/oscar.c:2798
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧�����������ャ��"
 
-#: src/protocols/oscar/oscar.c:2791 src/protocols/oscar/oscar.c:4496
-#: src/protocols/oscar/oscar.c:5688
+#: src/protocols/oscar/oscar.c:2814 src/protocols/oscar/oscar.c:4522
+#: src/protocols/oscar/oscar.c:5731
 msgid "Free For Chat"
 msgstr "��篋��画��"
 
-#: src/protocols/oscar/oscar.c:2795 src/protocols/oscar/oscar.c:4490
-#: src/protocols/oscar/oscar.c:5686
+#: src/protocols/oscar/oscar.c:2818 src/protocols/oscar/oscar.c:4516
+#: src/protocols/oscar/oscar.c:5729
 msgid "Not Available"
 msgstr "筝�����"
 
-#: src/protocols/oscar/oscar.c:2797 src/protocols/oscar/oscar.c:4493
-#: src/protocols/oscar/oscar.c:5687
+#: src/protocols/oscar/oscar.c:2820 src/protocols/oscar/oscar.c:4519
+#: src/protocols/oscar/oscar.c:5730
 msgid "Occupied"
 msgstr "��篋�膽�荳�"
 
-#: src/protocols/oscar/oscar.c:2801
+#: src/protocols/oscar/oscar.c:2824
 msgid "Web Aware"
 msgstr "臀�筝�����"
 
-#: src/protocols/oscar/oscar.c:2861
+#: src/protocols/oscar/oscar.c:2884
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN鐚�</B> %s<BR><B>�倶��鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2863
+#: src/protocols/oscar/oscar.c:2886
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>�倶��鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2922
+#: src/protocols/oscar/oscar.c:2945
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ���咲��莚��%s\n"
 
-#: src/protocols/oscar/oscar.c:2923
+#: src/protocols/oscar/oscar.c:2946
 msgid "Unknown error"
 msgstr "���ラ��莚�"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2958
+#: src/protocols/oscar/oscar.c:2981
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "��� %s ��羔��������鐚�"
 
-#: src/protocols/oscar/oscar.c:3010
+#: src/protocols/oscar/oscar.c:3033
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s �����隙拭������"
 
-#: src/protocols/oscar/oscar.c:3044
+#: src/protocols/oscar/oscar.c:3067
 msgid "Buddy Icon"
 msgstr "絅遵��丈��"
 
-#: src/protocols/oscar/oscar.c:3047
+#: src/protocols/oscar/oscar.c:3070
 msgid "Voice"
 msgstr "莚㊨��"
 
-#: src/protocols/oscar/oscar.c:3050 src/protocols/oscar/oscar.c:5712
+#: src/protocols/oscar/oscar.c:3073 src/protocols/oscar/oscar.c:5755
 msgid "Direct IM"
 msgstr "篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:3053 src/gtkblist.c:1509
+#: src/protocols/oscar/oscar.c:3076 src/gtkblist.c:1521
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:3056 src/protocols/oscar/oscar.c:5724
+#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:5767
 msgid "Get File"
 msgstr "�桁���篁�"
 
-#: src/protocols/oscar/oscar.c:3059 src/protocols/oscar/oscar.c:5718
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:5761
 msgid "Send File"
 msgstr "������篁�"
 
-#: src/protocols/oscar/oscar.c:3063
+#: src/protocols/oscar/oscar.c:3086
 msgid "Games"
 msgstr "羝御��"
 
-#: src/protocols/oscar/oscar.c:3066
+#: src/protocols/oscar/oscar.c:3089
 msgid "Add-Ins"
 msgstr "紊���"
 
-#: src/protocols/oscar/oscar.c:3069
+#: src/protocols/oscar/oscar.c:3092
 msgid "Send Buddy List"
 msgstr "����絅遵���茵�"
 
-#: src/protocols/oscar/oscar.c:3072
+#: src/protocols/oscar/oscar.c:3095
 msgid "EveryBuddy Bug"
 msgstr "罸鋇�ソ���� Bug"
 
-#: src/protocols/oscar/oscar.c:3075
+#: src/protocols/oscar/oscar.c:3098
 msgid "AP User"
 msgstr "AP ����"
 
-#: src/protocols/oscar/oscar.c:3078
+#: src/protocols/oscar/oscar.c:3101
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3081
+#: src/protocols/oscar/oscar.c:3104
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3084
+#: src/protocols/oscar/oscar.c:3107
 msgid "ICQ Server Relay"
 msgstr "ICQ ���≦��習��"
 
-#: src/protocols/oscar/oscar.c:3087
+#: src/protocols/oscar/oscar.c:3110
 msgid "ICQ Unknown"
 msgstr "ICQ ����"
 
-#: src/protocols/oscar/oscar.c:3090
+#: src/protocols/oscar/oscar.c:3113
 msgid "Trillian Encryption"
 msgstr "Trillian ��絲�"
 
-#: src/protocols/oscar/oscar.c:3093
+#: src/protocols/oscar/oscar.c:3116
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3156
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<i>��羈��丞ず篆≧����������九���膽������ャ��</i>"
 
-#: src/protocols/oscar/oscar.c:3139
+#: src/protocols/oscar/oscar.c:3163
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "筝�膾炊�狗�器�<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3144
+#: src/protocols/oscar/oscar.c:3168
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "�����狗�器�<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3150
+#: src/protocols/oscar/oscar.c:3174
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "���¥�<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3153
+#: src/protocols/oscar/oscar.c:3177
 msgid "Idle: <b>Active</b>"
 msgstr "���¥�<b>羇肢�</b>"
 
-#: src/protocols/oscar/oscar.c:3155
+#: src/protocols/oscar/oscar.c:3179
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2717,206 +2700,206 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3187
+#: src/protocols/oscar/oscar.c:3211
 msgid "<i>User has no away message</i>"
 msgstr "<i>���傑��胼糸�羔���</i>"
 
-#: src/protocols/oscar/oscar.c:3198
+#: src/protocols/oscar/oscar.c:3222
 msgid "Client Capabilities: "
 msgstr "絎∽�決�遵��鐚�"
 
-#: src/protocols/oscar/oscar.c:3204
+#: src/protocols/oscar/oscar.c:3228
 msgid "<i>No Information Provided</i>"
 msgstr "<i>羃≧����箴�篆≧��</i>"
 
-#: src/protocols/oscar/oscar.c:3228
+#: src/protocols/oscar/oscar.c:3252
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM 菴��ュ��遵群筝√け��"
 
-#: src/protocols/oscar/oscar.c:3589
+#: src/protocols/oscar/oscar.c:3612
 msgid "Rate limiting error."
 msgstr "��綺����狗��莚���"
 
-#: src/protocols/oscar/oscar.c:3590
+#: src/protocols/oscar/oscar.c:3613
 msgid ""
 "The last message was not sent because you are over the rate limit.  Please "
 "wait 10 seconds and try again."
 msgstr ""
 "������≧��������削���������群膸鏅��遺���綺�������莚欠� 10 腱�鐚��九����莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:3650
+#: src/protocols/oscar/oscar.c:3673
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��群膸���篋�菴��ワ������������九�篏�臀���④���桁���糸�ヤ���"
 
-#: src/protocols/oscar/oscar.c:3652
+#: src/protocols/oscar/oscar.c:3675
 msgid "You have been signed off for an unknown reason."
 msgstr "��群膸�嶃�坂�鐚��������ャ��"
 
-#: src/protocols/oscar/oscar.c:3879
+#: src/protocols/oscar/oscar.c:3903
 msgid "UIN:"
 msgstr "UIN鐚�"
 
-#: src/protocols/oscar/oscar.c:3884
+#: src/protocols/oscar/oscar.c:3908
 msgid "First Name:"
 msgstr "��鐚�"
 
-#: src/protocols/oscar/oscar.c:3887
+#: src/protocols/oscar/oscar.c:3911
 msgid "Last Name:"
 msgstr "紮�鐚�"
 
-#: src/protocols/oscar/oscar.c:3890 src/protocols/oscar/oscar.c:3896
+#: src/protocols/oscar/oscar.c:3914 src/protocols/oscar/oscar.c:3920
 msgid "Email Address:"
 msgstr "�球���散�医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3901
+#: src/protocols/oscar/oscar.c:3925
 msgid "Mobile Phone:"
 msgstr "腱糸���笈�鐚�"
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:3928
 msgid "Gender:"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:3928
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:3928
 msgid "Male"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:3913
+#: src/protocols/oscar/oscar.c:3937
 msgid "Birthday:"
 msgstr "���ワ�"
 
-#: src/protocols/oscar/oscar.c:3918
+#: src/protocols/oscar/oscar.c:3942
 msgid "Age:"
 msgstr "綛顔�鐚�"
 
-#: src/protocols/oscar/oscar.c:3921
+#: src/protocols/oscar/oscar.c:3945
 msgid "Personal Web Page:"
 msgstr "筝�査筝脂ゝ鐚�"
 
-#: src/protocols/oscar/oscar.c:3924
+#: src/protocols/oscar/oscar.c:3948
 msgid "Additional Information:"
 msgstr "蘂�紊�篆≧���"
 
-#: src/protocols/oscar/oscar.c:3928
+#: src/protocols/oscar/oscar.c:3952
 msgid "Home Address:"
 msgstr "絎九梱篏����"
 
-#: src/protocols/oscar/oscar.c:3930 src/protocols/oscar/oscar.c:3946
+#: src/protocols/oscar/oscar.c:3954 src/protocols/oscar/oscar.c:3970
 msgid "Address:"
 msgstr "�医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3933 src/protocols/oscar/oscar.c:3949
+#: src/protocols/oscar/oscar.c:3957 src/protocols/oscar/oscar.c:3973
 msgid "City:"
 msgstr "���鐚�"
 
-#: src/protocols/oscar/oscar.c:3936 src/protocols/oscar/oscar.c:3952
+#: src/protocols/oscar/oscar.c:3960 src/protocols/oscar/oscar.c:3976
 msgid "State:"
 msgstr "綏�/��鐚�"
 
-#: src/protocols/oscar/oscar.c:3939 src/protocols/oscar/oscar.c:3955
+#: src/protocols/oscar/oscar.c:3963 src/protocols/oscar/oscar.c:3979
 msgid "Zip Code:"
 msgstr "���睡���鐚�"
 
-#: src/protocols/oscar/oscar.c:3944
+#: src/protocols/oscar/oscar.c:3968
 msgid "Work Address:"
 msgstr "�����医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3960
+#: src/protocols/oscar/oscar.c:3984
 msgid "Work Information:"
 msgstr "綏ヤ�篆≧���"
 
-#: src/protocols/oscar/oscar.c:3962
+#: src/protocols/oscar/oscar.c:3986
 msgid "Company:"
 msgstr "��夵�"
 
-#: src/protocols/oscar/oscar.c:3965
+#: src/protocols/oscar/oscar.c:3989
 msgid "Division:"
 msgstr "�����"
 
-#: src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:3992
 msgid "Position:"
 msgstr "���¥�"
 
-#: src/protocols/oscar/oscar.c:3971
+#: src/protocols/oscar/oscar.c:3995
 msgid "Web Page:"
 msgstr "臀�蕁居�"
 
-#: src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:4063
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s �ユ��筝������桁��鐚�</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4057
+#: src/protocols/oscar/oscar.c:4081
 #, c-format
 msgid "No results found for email address %s"
 msgstr "���上�遺��球���散�医�� %s �拷����膸���"
 
-#: src/protocols/oscar/oscar.c:4078
+#: src/protocols/oscar/oscar.c:4102
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "���綵��九�域���`莅� %s ����散��"
 
-#: src/protocols/oscar/oscar.c:4080
+#: src/protocols/oscar/oscar.c:4104
 msgid "Account Confirmation Requested"
 msgstr "莚傑�篋�茣��欠`莅�"
 
-#: src/protocols/oscar/oscar.c:4108
+#: src/protocols/oscar/oscar.c:4132
 msgid "Error Changing Account Info"
 msgstr "�贋�壕侃�隙拭���咲��"
 
-#: src/protocols/oscar/oscar.c:4111
+#: src/protocols/oscar/oscar.c:4135
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "��莚� 0x%04x鐚���羈��弱������桁��鐚��������羆������桁��筝��紮����桁��筝�膃���"
 
-#: src/protocols/oscar/oscar.c:4114
+#: src/protocols/oscar/oscar.c:4138
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "��莚� 0x%04x鐚���羈��弱������桁��鐚��������羆������桁��篁ョ��主�絨障��"
 
-#: src/protocols/oscar/oscar.c:4117
+#: src/protocols/oscar/oscar.c:4141
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "��莚� 0x%04x鐚���羈��弱������桁��鐚��������羆������桁��紊��帥��"
 
-#: src/protocols/oscar/oscar.c:4120
+#: src/protocols/oscar/oscar.c:4144
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr "��莚� 0x%04x鐚���羈��贋�合�球���散�医��鐚�������④���桁��綏牙���茴�ィ����莚傑���"
 
-#: src/protocols/oscar/oscar.c:4123
+#: src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr "��莚� 0x%04x鐚���羈��贋�合�球���散�医��鐚��������絎����医���活�������桁��紊����"
 
-#: src/protocols/oscar/oscar.c:4126
+#: src/protocols/oscar/oscar.c:4150
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "��莚� 0x%04x鐚���羈��贋�合�球���散�医��鐚��������絎����医��������"
 
-#: src/protocols/oscar/oscar.c:4129
+#: src/protocols/oscar/oscar.c:4153
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��莚� 0x%04x鐚����ラ��莚���"
 
-#: src/protocols/oscar/oscar.c:4139
+#: src/protocols/oscar/oscar.c:4163
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2925,20 +2908,20 @@
 "�������桁���弱������筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4140 src/protocols/oscar/oscar.c:4146
+#: src/protocols/oscar/oscar.c:4164 src/protocols/oscar/oscar.c:4171
 msgid "Account Info"
 msgstr "茣��隙拭��"
 
-#: src/protocols/oscar/oscar.c:4145
+#: src/protocols/oscar/oscar.c:4169
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���球���散�医��筝� %s"
 
-#: src/protocols/oscar/oscar.c:4367
+#: src/protocols/oscar/oscar.c:4393
 msgid "Unable to set AIM profile."
 msgstr "��羈�莅丞舟 AIM ��臀���篁吟��"
 
-#: src/protocols/oscar/oscar.c:4368
+#: src/protocols/oscar/oscar.c:4394
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -2947,22 +2930,22 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上���臀���篁吟��������臀���篁九����絎�鐚�莚桁���������ュ��"
 "��莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4397
+#: src/protocols/oscar/oscar.c:4423
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr "綏牙�莇�菴�篋���臀���篁句����紊ч�水墾 %d 絖�����Gaim 筝堺���������℡���"
 
-#: src/protocols/oscar/oscar.c:4399
+#: src/protocols/oscar/oscar.c:4425
 msgid "Profile too long."
 msgstr "��臀���篁九お�帥��"
 
-#: src/protocols/oscar/oscar.c:4415
+#: src/protocols/oscar/oscar.c:4441
 msgid "Unable to set AIM away message."
 msgstr "��羈�莅丞舟 AIM 胼糸�羔�����"
 
-#: src/protocols/oscar/oscar.c:4416
+#: src/protocols/oscar/oscar.c:4442
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2971,7 +2954,7 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上�胼糸�羔��������絨�紊�篋��������倶��鐚�莚桁���������ュ��"
 "��莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4455
+#: src/protocols/oscar/oscar.c:4481
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
@@ -2980,15 +2963,15 @@
 "綏牙�莇�菴�篋�胼糸�羔�������紊ч�水墾 %d 絖�����Gaim ����減�����℡�羔����綛九����筝榊�"
 "綣���"
 
-#: src/protocols/oscar/oscar.c:4457
+#: src/protocols/oscar/oscar.c:4483
 msgid "Away message too long."
 msgstr "胼糸�羔���お�帥��"
 
-#: src/protocols/oscar/oscar.c:4670
+#: src/protocols/oscar/oscar.c:4696
 msgid "Unable To Retrive Buddy List"
 msgstr "��羈��桁�絅遵���茵�"
 
-#: src/protocols/oscar/oscar.c:4671
+#: src/protocols/oscar/oscar.c:4697
 msgid ""
 "Gaim was temporarily unable to retrive your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -2997,12 +2980,12 @@
 "Gaim ���倶��羈�篁� AIM ���≦��キ������絅遵���茵�������絅遵���茵�押��筝√け鐚����順�膈���"
 "絨�嚭葦�順�����"
 
-#: src/protocols/oscar/oscar.c:4761 src/protocols/oscar/oscar.c:4762
-#: src/protocols/oscar/oscar.c:4767
+#: src/protocols/oscar/oscar.c:4788 src/protocols/oscar/oscar.c:4789
+#: src/protocols/oscar/oscar.c:4794
 msgid "Orphans"
 msgstr "絖ゅ��"
 
-#: src/protocols/oscar/oscar.c:4931
+#: src/protocols/oscar/oscar.c:4958
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -3010,15 +2993,15 @@
 msgstr ""
 "��羈�絨� %s ��筝阪ソ��鐚�����������絅遵�紊����莚桁���ゅ�銀賢筝�筝�ソ��鐚��九����莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4931 src/protocols/oscar/oscar.c:4944
+#: src/protocols/oscar/oscar.c:4958 src/protocols/oscar/oscar.c:4971
 msgid "(no name)"
 msgstr "(����腱�)"
 
-#: src/protocols/oscar/oscar.c:4932 src/protocols/oscar/oscar.c:4945
+#: src/protocols/oscar/oscar.c:4959 src/protocols/oscar/oscar.c:4972
 msgid "Unable To Add"
 msgstr "��羈�羞糸��"
 
-#: src/protocols/oscar/oscar.c:4944
+#: src/protocols/oscar/oscar.c:4971
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3028,18 +3011,18 @@
 "��羈�羞糸��絅遵� %s鐚��������ャ�������順������������絅遵���茵�賢絅遵����亥��群膸颴上�遺���"
 "��莅悟����紊у�若��"
 
-#: src/protocols/oscar/oscar.c:4979
+#: src/protocols/oscar/oscar.c:5006
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "���� %s ��莅御���篁�/絅劫��筝阪ソ�����������活�羞糸��鐚�"
 
-#: src/protocols/oscar/oscar.c:4984
+#: src/protocols/oscar/oscar.c:5012
 msgid "Authorization Given"
 msgstr "膸��榊��莅よ�"
 
-#: src/protocols/oscar/oscar.c:5014
+#: src/protocols/oscar/oscar.c:5045
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3049,17 +3032,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5087
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "���� %s ��莅御���篁�/絅劫���ュソ����"
 
-#: src/protocols/oscar/oscar.c:5053
+#: src/protocols/oscar/oscar.c:5088
 msgid "Authorization Granted"
 msgstr "莅よ�茴����"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5056
+#: src/protocols/oscar/oscar.c:5091
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3069,87 +3052,87 @@
 "���� %s ��膸�篋�����九���ヨ��膤私査��茵���莚傑�鐚�����絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5092
 msgid "Authorization Denied"
 msgstr "莅よ�茴���膸�"
 
-#: src/protocols/oscar/oscar.c:5094 src/protocols/toc/toc.c:1200
+#: src/protocols/oscar/oscar.c:5129 src/protocols/toc/toc.c:1200
 msgid "Exchange:"
 msgstr "篋ゆ���"
 
-#: src/protocols/oscar/oscar.c:5314
+#: src/protocols/oscar/oscar.c:5349
 msgid "<b>Status:</b> "
 msgstr "<b>�倶��鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5323
+#: src/protocols/oscar/oscar.c:5358
 msgid "<b>Logged In:</b> "
 msgstr "<b>�糸�ワ�</b>"
 
-#: src/protocols/oscar/oscar.c:5330
+#: src/protocols/oscar/oscar.c:5365
 msgid "<b>Capabilities:</b> "
 msgstr "<b>�遵��鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5338
+#: src/protocols/oscar/oscar.c:5373
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>�倶��鐚�</b>���莚�"
 
-#: src/protocols/oscar/oscar.c:5342 src/gtkblist.c:861
+#: src/protocols/oscar/oscar.c:5377 src/gtkblist.c:856
 msgid "<b>Status:</b> Offline"
 msgstr "<b>�倶��鐚�</b> 胼紫鎖"
 
-#: src/protocols/oscar/oscar.c:5368
+#: src/protocols/oscar/oscar.c:5403
 msgid "Offline"
 msgstr "胼紫鎖"
 
-#: src/protocols/oscar/oscar.c:5549
+#: src/protocols/oscar/oscar.c:5584
 msgid "Unable to open Direct IM"
 msgstr "��羈�綣�紮�篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:5597
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�������筝� %s 菴�茵�篋�篋坂���菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:5563
+#: src/protocols/oscar/oscar.c:5600
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 "�延�菴��桁��顔�我���� IP �医��鐚���篁ュ��遵研�ユ�������腱�蕋������������活�膸х鮫鐚�"
 
-#: src/protocols/oscar/oscar.c:5702
+#: src/protocols/oscar/oscar.c:5745
 msgid "Get Status Msg"
 msgstr "�桁��倶��羔���"
 
-#: src/protocols/oscar/oscar.c:5736
+#: src/protocols/oscar/oscar.c:5779
 msgid "Re-request Authorization"
 msgstr "���域�羆�莅よ�"
 
-#: src/protocols/oscar/oscar.c:5757
+#: src/protocols/oscar/oscar.c:5800
 msgid "The new formatting is invalid."
 msgstr "�井�弱���������"
 
-#: src/protocols/oscar/oscar.c:5758
+#: src/protocols/oscar/oscar.c:5801
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "���桁���弱������贋�劫ぇ����腥堺�若��"
 
-#: src/protocols/oscar/oscar.c:5764
+#: src/protocols/oscar/oscar.c:5807
 msgid "New screenname formatting:"
 msgstr "�亥�����桁���弱���鐚�"
 
-#: src/protocols/oscar/oscar.c:5813
+#: src/protocols/oscar/oscar.c:5856
 msgid "Change Address To:"
 msgstr "絨��医���贋�剛減鐚�"
 
-#: src/protocols/oscar/oscar.c:5826
+#: src/protocols/oscar/oscar.c:5869
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "��③���緇�筝���絅遵���莅よ�鐚�<BR>"
 
-#: src/protocols/oscar/oscar.c:5851
+#: src/protocols/oscar/oscar.c:5894
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��攻筝������莅よ�</i>"
 
-#: src/protocols/oscar/oscar.c:5856
+#: src/protocols/oscar/oscar.c:5899
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3158,31 +3141,31 @@
 "%s<BR><BR>絋������活���菴�篋�絅遵����域�羆�莅よ�鐚�����������渇�����肢�篋�絅遵�鐚��九��"
 "���獅�����域�羆�莅よ�����"
 
-#: src/protocols/oscar/oscar.c:5889
+#: src/protocols/oscar/oscar.c:5934
 msgid "Change Password (URL)"
 msgstr "�贋�劫���(URL)"
 
-#: src/protocols/oscar/oscar.c:5900
+#: src/protocols/oscar/oscar.c:5945
 msgid "Format Screenname"
 msgstr "�弱������桁��"
 
-#: src/protocols/oscar/oscar.c:5906
+#: src/protocols/oscar/oscar.c:5951
 msgid "Confirm Account"
 msgstr "隋��茣���"
 
-#: src/protocols/oscar/oscar.c:5912
+#: src/protocols/oscar/oscar.c:5957
 msgid "Display Current Registered Address"
 msgstr "�丞ず綵���羈������医��"
 
-#: src/protocols/oscar/oscar.c:5918
+#: src/protocols/oscar/oscar.c:5963
 msgid "Change Current Registered Address"
 msgstr "�贋�劫���羈������医��"
 
-#: src/protocols/oscar/oscar.c:5927
+#: src/protocols/oscar/oscar.c:5972
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�丞ず罩e�����莅よ���絅遵�"
 
-#: src/protocols/oscar/oscar.c:5935
+#: src/protocols/oscar/oscar.c:5980
 msgid "Search for Buddy by Email"
 msgstr "���球���散��膣√ソ��"
 
@@ -3196,15 +3179,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6057
+#: src/protocols/oscar/oscar.c:6100 src/protocols/oscar/oscar.c:6102
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ �顒��篁�"
 
-#: src/protocols/oscar/oscar.c:6075
+#: src/protocols/oscar/oscar.c:6120
 msgid "Auth Host:"
 msgstr "莅よ�筝紙�削�"
 
-#: src/protocols/oscar/oscar.c:6081
+#: src/protocols/oscar/oscar.c:6126
 msgid "Auth Port:"
 msgstr "莅よ�腴���"
 
@@ -3389,7 +3372,7 @@
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "��羈����ユ��篁九ご����篁九�筝�篌�茴������"
 
-#: src/protocols/toc/toc.c:1948 src/gtkft.c:1058
+#: src/protocols/toc/toc.c:1948 src/gtkft.c:1059
 msgid "Gaim - Save As..."
 msgstr "Gaim - ���筝�..."
 
@@ -3404,10 +3387,6 @@
 msgid "%s requests you to send them a file"
 msgstr "%s 莚傑��������篁�"
 
-#: src/protocols/toc/toc.c:1991 src/gtkft.c:1111 src/server.c:1239
-msgid "Accept"
-msgstr "�ュ�"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -3418,60 +3397,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2061 src/protocols/toc/toc.c:2063
+#: src/protocols/toc/toc.c:2064 src/protocols/toc/toc.c:2066
 msgid "TOC Protocol Plugin"
 msgstr "TOC �顒��篁�"
 
-#: src/protocols/toc/toc.c:2081
+#: src/protocols/toc/toc.c:2084
 msgid "TOC Host:"
 msgstr "TOC 筝紙�削�"
 
-#: src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2090
 msgid "TOC Port:"
 msgstr "TOC 腴���"
 
-#: src/protocols/yahoo/yahoo.c:605
+#: src/protocols/yahoo/yahoo.c:602
 msgid "Your Yahoo! message did not get sent."
 msgstr "��������� Yahoo! 羔�����"
 
-#: src/protocols/yahoo/yahoo.c:1073 src/protocols/yahoo/yahoo.c:1281
-#: src/protocols/yahoo/yahoo.c:1355
+#: src/protocols/yahoo/yahoo.c:1066 src/protocols/yahoo/yahoo.c:1273
+#: src/protocols/yahoo/yahoo.c:1347
 msgid "Not At Home"
 msgstr "筝����"
 
-#: src/protocols/yahoo/yahoo.c:1075 src/protocols/yahoo/yahoo.c:1283
-#: src/protocols/yahoo/yahoo.c:1356
+#: src/protocols/yahoo/yahoo.c:1068 src/protocols/yahoo/yahoo.c:1275
+#: src/protocols/yahoo/yahoo.c:1348
 msgid "Not At Desk"
 msgstr "筝������"
 
-#: src/protocols/yahoo/yahoo.c:1077 src/protocols/yahoo/yahoo.c:1285
-#: src/protocols/yahoo/yahoo.c:1357
+#: src/protocols/yahoo/yahoo.c:1070 src/protocols/yahoo/yahoo.c:1277
+#: src/protocols/yahoo/yahoo.c:1349
 msgid "Not In Office"
 msgstr "筝��������"
 
-#: src/protocols/yahoo/yahoo.c:1081 src/protocols/yahoo/yahoo.c:1289
-#: src/protocols/yahoo/yahoo.c:1359
+#: src/protocols/yahoo/yahoo.c:1074 src/protocols/yahoo/yahoo.c:1281
+#: src/protocols/yahoo/yahoo.c:1351
 msgid "On Vacation"
 msgstr "綺���筝�"
 
-#: src/protocols/yahoo/yahoo.c:1085 src/protocols/yahoo/yahoo.c:1293
-#: src/protocols/yahoo/yahoo.c:1361
+#: src/protocols/yahoo/yahoo.c:1078 src/protocols/yahoo/yahoo.c:1285
+#: src/protocols/yahoo/yahoo.c:1353
 msgid "Stepped Out"
 msgstr "��羝�"
 
-#: src/protocols/yahoo/yahoo.c:1202
+#: src/protocols/yahoo/yahoo.c:1194
 msgid "Active which ID?"
 msgstr "羶�羇糸��肩 ID鐚�"
 
-#: src/protocols/yahoo/yahoo.c:1213
+#: src/protocols/yahoo/yahoo.c:1205
 msgid "Activate ID"
 msgstr "羶�羇� ID"
 
-#: src/protocols/yahoo/yahoo.c:1438
+#: src/protocols/yahoo/yahoo.c:1430
 msgid "Pager Host:"
 msgstr "絲糸�寂源�削�"
 
-#: src/protocols/yahoo/yahoo.c:1444
+#: src/protocols/yahoo/yahoo.c:1436
 msgid "Pager Port:"
 msgstr "絲糸�主��o�"
 
@@ -3485,7 +3464,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1530 src/protocols/yahoo/yahoo.c:1532
+#: src/protocols/yahoo/yahoo.c:1522 src/protocols/yahoo/yahoo.c:1524
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo �顒��篁�"
 
@@ -3618,76 +3597,76 @@
 "Spencer (��紮�篏���) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko."
 "net</A>&gt;<BR>  Syd Logan (薨�絎√��筝�絮�薊怨���綺�[lazy bum])<BR><BR>"
 
-#: src/away.c:221
+#: src/away.c:222
 msgid "Gaim - Away!"
 msgstr "Gaim - 胼糸�鐚�"
 
-#: src/away.c:281
+#: src/away.c:282
 msgid "I'm Back!"
 msgstr "�����ヤ�鐚�"
 
-#: src/away.c:383
+#: src/away.c:387
 msgid "New Away Message"
 msgstr "�医産胼糸�羔���"
 
-#: src/away.c:403
+#: src/away.c:407
 msgid "Remove Away Message"
 msgstr "���ょ�綣�羔���"
 
-#: src/away.c:600
+#: src/away.c:602
 msgid "Set All Away"
 msgstr "�����筝榊�綣�"
 
-#: src/blist.c:366 src/gtkprefs.c:1813
+#: src/blist.c:367 src/gtkprefs.c:2192
 msgid "Chats"
 msgstr "��紊�"
 
-#: src/blist.c:678
+#: src/blist.c:679
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies, and the group were not removed.\n"
+"logged in.  These buddies and the group were not removed.\n"
 msgstr ""
 "%2$s 膸�筝㊦�� %1$d 筝�ソ�������わ��������篁���茣��傑���糸�ャ��菴�篋�絅遵���莚ョ�筝�篌�茴���"
 "�ゃ��\n"
 
-#: src/blist.c:683
+#: src/blist.c:684
 msgid "Group not removed"
 msgstr "膸�������"
 
-#: src/blist.c:850
+#: src/blist.c:857
 msgid "Invalid Groupname"
 msgstr "膸�������"
 
-#: src/blist.c:1572
+#: src/blist.c:1579
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "紊�������絅遵���茵��九�咲����絅遵���茵�����ャ��"
 
-#: src/blist.c:1574
+#: src/blist.c:1581
 msgid "Buddy List Error"
 msgstr "絅遵���茵��咲��"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1580
+#: src/blist.c:1587
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
 "located at %s"
 msgstr "Gaim 罩e������х��絅遵���茵�習�≫減�井�弱�鐚�綛九��上�� %s"
 
-#: src/blist.c:1583
+#: src/blist.c:1590
 msgid "Converting Buddy List"
 msgstr "罩e��習�√ソ����茵�"
 
-#: src/browser.c:429 src/browser.c:457
+#: src/browser.c:430 src/browser.c:458
 msgid ""
 "Communication with the browser failed. Please close all windows and try "
 "again."
 msgstr "筝��茹�����莅��榊ー�����莚桁�渇�㊥����腦��o�腮�����莚�筝�罨<��"
 
-#: src/browser.c:591
+#: src/browser.c:592
 msgid ""
 "Unable to launch your browser because the 'Manual' browser command has been "
 "chosen, but no command has been set."
@@ -3698,87 +3677,87 @@
 msgid "There was an error launching your chosen browser: %s"
 msgstr "莪�����������羌頵��� %s �咲��"
 
-#: src/buddy_chat.c:250
+#: src/buddy_chat.c:253 src/dialogs.c:1376
 msgid ""
-"You are not currently signed on wit any protocols that have the ability to "
+"You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "�������糸�ョ���顒�賢羃≧��筝�筝��札��紊�����"
 
-#: src/buddy_chat.c:264
+#: src/buddy_chat.c:267
 msgid "Join Chat"
 msgstr "���ヨ��紊�"
 
-#: src/buddy_chat.c:270
+#: src/buddy_chat.c:273
 msgid "Buddy Chat"
 msgstr "絅遵���紊�"
 
-#: src/buddy_chat.c:280
+#: src/buddy_chat.c:283
 msgid "Join Chat As:"
 msgstr "���ヨ��紊�減鐚�"
 
 #. Join button.
-#: src/buddy_chat.c:303
+#: src/buddy_chat.c:306
 msgid "Join"
 msgstr "����"
 
-#: src/conversation.c:404
+#: src/conversation.c:405
 msgid "Unable to send message. The message is too large."
 msgstr "��羈�����羔�����羔���お紊с��"
 
-#: src/conversation.c:412
+#: src/conversation.c:413
 msgid "Unable to send message."
 msgstr "��羈�����羔�����"
 
-#: src/conversation.c:1973
+#: src/conversation.c:1967
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 菴��ヤ���紊����"
 
-#: src/conversation.c:1976
+#: src/conversation.c:1970
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 菴��ヤ���紊����"
 
-#: src/conversation.c:2025
+#: src/conversation.c:2019
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �医��û�� %s��"
 
-#: src/conversation.c:2068
+#: src/conversation.c:2062
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 胼糸�篋���紊��(%s)��"
 
-#: src/conversation.c:2070
+#: src/conversation.c:2064
 #, c-format
 msgid "%s left the room."
 msgstr "%s 胼糸�篋���紊����"
 
-#: src/conversation.c:2254
+#: src/conversation.c:2250
 msgid "Last created window"
 msgstr "筝�罨≦��綮榊��腦���"
 
-#: src/conversation.c:2256
+#: src/conversation.c:2252
 msgid "New window"
 msgstr "�医産腦���"
 
-#: src/conversation.c:2258
+#: src/conversation.c:2254
 msgid "By group"
 msgstr "��膸�"
 
-#: src/conversation.c:2260
+#: src/conversation.c:2256
 msgid "By account"
 msgstr "��茣���"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:363
 msgid "Warn User"
 msgstr "茘�������"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:363
 msgid "_Warn"
 msgstr "茘���(_W)"
 
-#: src/dialogs.c:380
+#: src/dialogs.c:379
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3790,89 +3769,89 @@
 "\n"
 "菴�絨�紜��� %s ��茘���膾у���篁�/絅剛�絨�茴�辱�球��翫��筝ユ�主����綺����吟��\n"
 
-#: src/dialogs.c:389
+#: src/dialogs.c:388
 msgid "Warn _anonymously?"
 msgstr "�水��茘�����(_A)鐚�"
 
-#: src/dialogs.c:396
+#: src/dialogs.c:395
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�水��茘���莨�筝�絎号��綣�莎傑絵���</b>"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:466
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "���喝�篁�����絅遵���茵�賢���� %s��������荀�菴�箙�����鐚�"
 
-#: src/dialogs.c:468
+#: src/dialogs.c:468 src/dialogs.c:469
 msgid "Remove Buddy"
 msgstr "���ゅソ��"
 
-#: src/dialogs.c:474
+#: src/dialogs.c:477
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "���喝�篁�����絅遵���茵�賢���よ��紊� %s��������荀�菴�箙�����鐚�"
 
-#: src/dialogs.c:475
+#: src/dialogs.c:479 src/dialogs.c:480
 msgid "Remove Chat"
 msgstr "���よ��紊�"
 
-#: src/dialogs.c:481
+#: src/dialogs.c:488
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "���喝�篁�����絅遵���茵�賢���ょ� %s ���倶����������������荀�菴�箙�����鐚�"
 
-#: src/dialogs.c:483
+#: src/dialogs.c:491 src/dialogs.c:492
 msgid "Remove Group"
 msgstr "���ょ�"
 
-#: src/dialogs.c:633
+#: src/dialogs.c:645
 msgid "New Message"
 msgstr "�井���"
 
-#: src/dialogs.c:651
+#: src/dialogs.c:663
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "���活�莊�莪���鐚�莚決��ヤ�/絅合�����桁����\n"
 
-#: src/dialogs.c:667 src/dialogs.c:768 src/dialogs.c:3725
+#: src/dialogs.c:679 src/dialogs.c:785 src/dialogs.c:3788
 msgid "_Screenname:"
 msgstr "���桁��(_S)鐚�"
 
-#: src/dialogs.c:682 src/dialogs.c:784 src/gtkpounce.c:520
+#: src/dialogs.c:694 src/dialogs.c:801 src/gtkpounce.c:519
 msgid "_Account:"
 msgstr "茣���(_A)鐚�"
 
-#: src/dialogs.c:737
+#: src/dialogs.c:754
 msgid "Get User Info"
 msgstr "�桁����隙拭��"
 
-#: src/dialogs.c:756
+#: src/dialogs.c:773
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "���活��ョ��莪���篆≧���莚決��ヤ�/絅合�����桁����\n"
 
-#: src/dialogs.c:935
+#: src/dialogs.c:956
 msgid "Add Group"
 msgstr "羞糸��膸�"
 
-#: src/dialogs.c:952
+#: src/dialogs.c:973
 msgid "Please enter the name of the group to be added.\n"
 msgstr "莚決��ヨ�羞糸����膸���腱違��\n"
 
-#: src/dialogs.c:961 src/dialogs.c:4273
+#: src/dialogs.c:982 src/dialogs.c:4339
 msgid "_Group:"
 msgstr "膸�(_G)鐚�"
 
-#: src/dialogs.c:1043
+#: src/dialogs.c:1069
 msgid "Add Buddy"
 msgstr "羞糸��絅遵�"
 
-#: src/dialogs.c:1062
+#: src/dialogs.c:1088
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -3881,338 +3860,332 @@
 "���活�絨�莪���筝阪ソ��鐚�莚決��ヤ�/絅合�����桁���������減絅遵�莨��ュ�������窮О���������"
 "��莚�鐚�����絨�篌��推撮���桁���丞ず��\n"
 
-#: src/dialogs.c:1081
+#: src/dialogs.c:1107
 msgid "Screen Name"
 msgstr "���桁��"
 
-#: src/dialogs.c:1094
+#: src/dialogs.c:1120
 msgid "Alias"
 msgstr "����"
 
-#: src/dialogs.c:1104
+#: src/dialogs.c:1130
 msgid "Group"
 msgstr "膸�"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1113
+#: src/dialogs.c:1139
 msgid "Add To"
 msgstr "羞糸����"
 
-#: src/dialogs.c:1346
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr "�������糸�ョ���顒�賢羃≧��筝�筝��札��紊�����"
-
-#: src/dialogs.c:1353
+#: src/dialogs.c:1383
 msgid "Add Chat"
 msgstr "羞糸����紊�"
 
-#: src/dialogs.c:1376
+#: src/dialogs.c:1406
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "���活�絨���紊����ユ����絅遵���茵��莚決��ヨ���紊���������絲劫�篆≧����\n"
 
-#: src/dialogs.c:1385
+#: src/dialogs.c:1415
 msgid "Account:"
 msgstr "茣��件�"
 
-#: src/dialogs.c:1404 src/multi.c:821
+#: src/dialogs.c:1434
 msgid "Alias:"
 msgstr "����鐚�"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1445
 msgid "Group:"
 msgstr "膸�鐚�"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1782
 msgid "Privacy"
 msgstr "��腱�"
 
-#: src/dialogs.c:1759
+#: src/dialogs.c:1793
 msgid "Changes to privacy settings take effect immediately."
 msgstr "絲拷��腱�莅丞舟���贋�劫�篌�腴��括������"
 
-#: src/dialogs.c:1768
+#: src/dialogs.c:1802
 msgid "Set privacy for:"
 msgstr "莅丞舟��腱���茣��件�"
 
-#: src/dialogs.c:1785
+#: src/dialogs.c:1819
 msgid "Allow all users to contact me"
 msgstr "��莅御�������決��膤紙��"
 
-#: src/dialogs.c:1789
+#: src/dialogs.c:1823
 msgid "Allow only users on my buddy list"
 msgstr "����莅御����絅遵���膤紙��"
 
-#: src/dialogs.c:1793
+#: src/dialogs.c:1827
 msgid "Allow only the users below"
 msgstr "����莅娯札筝�����"
 
-#: src/dialogs.c:1831
+#: src/dialogs.c:1865
 msgid "Deny all users"
 msgstr "��膸���������"
 
-#: src/dialogs.c:1835
+#: src/dialogs.c:1869
 msgid "Block the users below"
 msgstr "絮�恔札筝�����"
 
-#: src/dialogs.c:1950
+#: src/dialogs.c:1986
 msgid "Set Directory Info"
 msgstr "莅丞舟���篆≧��"
 
-#: src/dialogs.c:1958
+#: src/dialogs.c:1994
 msgid "Directory Info"
 msgstr "���篆≧��"
 
-#: src/dialogs.c:1968
+#: src/dialogs.c:2004
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "莅丞舟 %s �����篆≧���"
 
-#: src/dialogs.c:1980
+#: src/dialogs.c:2017
 msgid "Allow Web Searches To Find Your Info"
 msgstr "��莅御��膣√����ユ�丈����篆≧��"
 
 #. Line 1
-#: src/dialogs.c:1983 src/dialogs.c:2627
+#: src/dialogs.c:2020 src/dialogs.c:2669
 msgid "First Name"
 msgstr "��"
 
 #. Line 2
-#: src/dialogs.c:1994 src/dialogs.c:2637
+#: src/dialogs.c:2031 src/dialogs.c:2679
 msgid "Middle Name"
 msgstr "筝㊤��"
 
 #. Line 3
-#: src/dialogs.c:2006 src/dialogs.c:2647
+#: src/dialogs.c:2043 src/dialogs.c:2689
 msgid "Last Name"
 msgstr "紮�"
 
 #. Line 4
-#: src/dialogs.c:2017 src/dialogs.c:2657
+#: src/dialogs.c:2054 src/dialogs.c:2699
 msgid "Maiden Name"
 msgstr "紲�絎九��"
 
 #. Line 6
-#: src/dialogs.c:2039 src/dialogs.c:2676
+#: src/dialogs.c:2076 src/dialogs.c:2718
 msgid "State"
 msgstr "綏�/��"
 
-#: src/dialogs.c:2081 src/dialogs.c:2254 src/dialogs.c:3394 src/dialogs.c:4194
-#: src/dialogs.c:4944
+#: src/dialogs.c:2118 src/dialogs.c:2294 src/dialogs.c:3457 src/dialogs.c:4260
+#: src/dialogs.c:5010
 msgid "Save"
 msgstr "篆�絖�"
 
-#: src/dialogs.c:2104
+#: src/dialogs.c:2141
 msgid "New passwords do not match."
 msgstr "�医���筝��後����"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2147
 msgid "Fill out all fields completely."
 msgstr "絎���゛�ユ����絖�罧泣��"
 
-#: src/dialogs.c:2153
+#: src/dialogs.c:2192
 #, c-format
 msgid "Changing password for %s:"
 msgstr "�贋�� %s ��絲���鐚�"
 
-#: src/dialogs.c:2161
+#: src/dialogs.c:2200
 msgid "Original Password"
 msgstr "��"
 
-#: src/dialogs.c:2172
+#: src/dialogs.c:2211
 msgid "New Password"
 msgstr "�医���"
 
-#: src/dialogs.c:2183
+#: src/dialogs.c:2222
 msgid "New Password (again)"
 msgstr "��罨∴��ユ�医���"
 
-#: src/dialogs.c:2231
+#: src/dialogs.c:2270
 #, c-format
 msgid "Changing info for %s:"
 msgstr "�贋�� %s ��篆≧���"
 
-#: src/dialogs.c:2312
+#: src/dialogs.c:2352
 msgid "Below are the results of your search: "
 msgstr "筝��∽������膣∝��膸���鐚�"
 
-#: src/dialogs.c:2420
+#: src/dialogs.c:2463
 msgid "Permit"
 msgstr "莅後�"
 
-#: src/dialogs.c:2452
+#: src/dialogs.c:2495
 msgid "Add Permit"
 msgstr "闋糸��莅後�"
 
-#: src/dialogs.c:2454
+#: src/dialogs.c:2497
 msgid "Add Deny"
 msgstr "闋糸����膸�"
 
-#: src/dialogs.c:2522
+#: src/dialogs.c:2564
 msgid "Log Conversation"
 msgstr "絲壕�莅医�"
 
-#: src/dialogs.c:2603 src/dialogs.c:2736
+#: src/dialogs.c:2645 src/dialogs.c:2778
 msgid "Search for Buddy"
 msgstr "��膣√ソ��"
 
-#: src/dialogs.c:2703
+#: src/dialogs.c:2745
 msgid "Find Buddy By Info"
 msgstr "��篆≧���ユ�上ソ��"
 
-#: src/dialogs.c:2730
+#: src/dialogs.c:2772
 msgid "Find Buddy By Email"
 msgstr "���球���散�ユ�上ソ��"
 
-#: src/dialogs.c:2834
+#: src/dialogs.c:2876
 msgid "Insert Link"
 msgstr "���ラ�丈・"
 
-#: src/dialogs.c:2836
+#: src/dialogs.c:2878
 msgid "Insert"
 msgstr "����"
 
-#: src/dialogs.c:2855
+#: src/dialogs.c:2897
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "莚決��ユ���活����ョ�� URL ���丈・�颷違���颷井���������\n"
 
-#: src/dialogs.c:3020 src/dialogs.c:3037
+#: src/dialogs.c:3066 src/dialogs.c:3083
 msgid "Select Text Color"
 msgstr "������絖�蘂���"
 
-#: src/dialogs.c:3068 src/dialogs.c:3085
+#: src/dialogs.c:3118 src/dialogs.c:3135
 msgid "Select Background Color"
 msgstr "�����������"
 
-#: src/dialogs.c:3169 src/dialogs.c:3192
+#: src/dialogs.c:3230 src/dialogs.c:3256
 msgid "Select Font"
 msgstr "�����篏�"
 
-#: src/dialogs.c:3258
+#: src/dialogs.c:3321
 msgid "You cannot save an away message with a blank title"
 msgstr "����巡�絖�腥堺��蘂���胼糸�羔���"
 
-#: src/dialogs.c:3260
+#: src/dialogs.c:3323
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "莚欠�羔�����絎���蘂�鐚�����筝�篆�絖��贋・��篏睡������"
 
-#: src/dialogs.c:3270
+#: src/dialogs.c:3333
 msgid "You cannot create an empty away message"
 msgstr "����遵��綮榊���胼糸�羔���"
 
-#: src/dialogs.c:3335 src/dialogs.c:3343
+#: src/dialogs.c:3398 src/dialogs.c:3406
 msgid "New away message"
 msgstr "�医産胼糸�羔���"
 
-#: src/dialogs.c:3353
+#: src/dialogs.c:3416
 msgid "Away title: "
 msgstr "胼糸���蘂�鐚�"
 
-#: src/dialogs.c:3398
+#: src/dialogs.c:3461
 msgid "Save & Use"
 msgstr "篆�絖�綛銀戎��"
 
-#: src/dialogs.c:3402
+#: src/dialogs.c:3465
 msgid "Use"
 msgstr "篏睡��"
 
 #. show everything
-#: src/dialogs.c:3550
+#: src/dialogs.c:3613
 msgid "Smile!"
 msgstr "膃���"
 
-#: src/dialogs.c:3596 src/dialogs.c:3674
+#: src/dialogs.c:3659 src/dialogs.c:3737
 msgid "Alias Buddy"
 msgstr "絅遵�����"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3625
+#: src/dialogs.c:3688
 msgid "Please enter an aliased name for this chat.\n"
 msgstr "莚決��ユ④��紊���������\n"
 
-#: src/dialogs.c:3637 src/dialogs.c:3739
+#: src/dialogs.c:3700 src/dialogs.c:3802
 msgid "_Alias:"
 msgstr "����(_A)鐚�"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3704
+#: src/dialogs.c:3767
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
 msgstr "莚隙減篁ヤ�絅遵�莨��ュ����鐚�������ソ����茵�賢膸�莚ヨ��膤私査�劫����\n"
 
-#: src/dialogs.c:3793 src/dialogs.c:3800
+#: src/dialogs.c:3856 src/dialogs.c:3863
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "��羈����� %s��"
 
-#: src/dialogs.c:3824
+#: src/dialogs.c:3887
 msgid "Save Log File"
 msgstr "篆�絖��ュ���篁�"
 
-#: src/dialogs.c:3854
+#: src/dialogs.c:3917
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "��羈����ゆ��篁� %s��"
 
-#: src/dialogs.c:3873
+#: src/dialogs.c:3936
 msgid "Clear Log"
 msgstr "羝��ゆ�ュ�"
 
-#: src/dialogs.c:3882
+#: src/dialogs.c:3945
 msgid "Really clear log?"
 msgstr "����荀�羝��ゆ�ュ���鐚�"
 
-#: src/dialogs.c:3927
+#: src/dialogs.c:3990
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "��羈���綣��ュ���篁� %s��"
 
-#: src/dialogs.c:4066
+#: src/dialogs.c:4132
 #, c-format
 msgid "Conversations with %s"
 msgstr "筝� %s ��絲壕�"
 
-#: src/dialogs.c:4068
+#: src/dialogs.c:4134
 msgid "System Log"
 msgstr "膤紫��ュ�"
 
-#: src/dialogs.c:4089
+#: src/dialogs.c:4155
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "��羈���綣��ュ���篁� %s"
 
-#: src/dialogs.c:4110
+#: src/dialogs.c:4176
 msgid "Date"
 msgstr "�ユ��"
 
-#: src/dialogs.c:4167
+#: src/dialogs.c:4233
 msgid "Log"
 msgstr "�ュ�"
 
-#: src/dialogs.c:4189
+#: src/dialogs.c:4255
 msgid "Clear"
 msgstr "羝���"
 
-#: src/dialogs.c:4247
+#: src/dialogs.c:4313
 msgid "Rename Group"
 msgstr "���遵��膸�"
 
-#: src/dialogs.c:4264
+#: src/dialogs.c:4330
 msgid "Please enter a new name for the selected group.\n"
 msgstr "莚決��ラ��筝㊦����医��絖���\n"
 
-#: src/dialogs.c:4340 src/dialogs.c:4349
+#: src/dialogs.c:4406 src/dialogs.c:4415
 msgid "Rename Buddy"
 msgstr "���遵��絅遵�"
 
-#: src/dialogs.c:4356
+#: src/dialogs.c:4422
 msgid "New name:"
 msgstr "�医��絖�鐚�"
 
@@ -4322,169 +4295,159 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "�������������"
 
-#: src/gaimrc.c:294 src/gaimrc.c:327 src/gaimrc.c:1453
+#: src/gaimrc.c:367 src/gaimrc.c:1258
 msgid "boring default"
 msgstr "��Ⅶ��篋�"
 
-#: src/gaimrc.c:1551
+#: src/gaimrc.c:1355
 #, c-format
 msgid "Could not open config file %s."
 msgstr "��羈���綣���臀���篁� %s��"
 
-#: src/gaimrc.c:1609
-msgid "Unable to Save Preferences"
-msgstr "��羈�篆�絖�薤���蕁�"
-
-#: src/gaimrc.c:1610
-msgid ""
-"Gaim was unable to save your preferences. Please verify that you have enough "
-"free space."
-msgstr "Gaim ��羈�篆�絖�����薤���蕁鴻��莚傑��ユ��������莇喝������腥咲�眼��"
-
-#: src/gtkblist.c:398
+#: src/gtkblist.c:403
 msgid "Add a _Buddy"
 msgstr "羞糸��絅遵�(_B)"
 
-#: src/gtkblist.c:399
+#: src/gtkblist.c:404
 msgid "Add a C_hat"
 msgstr "羞糸����紊�(_H)"
 
-#: src/gtkblist.c:400
+#: src/gtkblist.c:405
 msgid "_Delete Group"
 msgstr "���ょ�(_D)"
 
-#: src/gtkblist.c:401
+#: src/gtkblist.c:406
 msgid "_Rename"
 msgstr "���遵��(_R)"
 
-#: src/gtkblist.c:403
+#: src/gtkblist.c:408
 msgid "_Join"
 msgstr "����(_J)"
 
-#: src/gtkblist.c:404 src/gtkblist.c:435
+#: src/gtkblist.c:409 src/gtkblist.c:440
 msgid "_Alias"
 msgstr "����(_A)"
 
-#: src/gtkblist.c:405 src/gtkblist.c:436
+#: src/gtkblist.c:410 src/gtkblist.c:441
 msgid "_Remove"
 msgstr "����(_R)"
 
-#: src/gtkblist.c:414
+#: src/gtkblist.c:419
 msgid "_Get Info"
 msgstr "�桁�篆≧��(_G)"
 
-#: src/gtkblist.c:416
+#: src/gtkblist.c:421
 msgid "_IM"
 msgstr "綣���(_I)"
 
-#: src/gtkblist.c:417
+#: src/gtkblist.c:422
 msgid "Add Buddy _Pounce"
 msgstr "羞糸��絅遵�������(_P)"
 
-#: src/gtkblist.c:418
+#: src/gtkblist.c:423
 msgid "View _Log"
 msgstr "�ョ���ュ�(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:749
+#: src/gtkblist.c:744
 msgid "/_Buddies"
 msgstr "/絅遵�(_B)"
 
-#: src/gtkblist.c:750
+#: src/gtkblist.c:745
 msgid "/Buddies/New _Instant Message..."
 msgstr "/絅遵�(B)/�医�恰�倶���(_I)..."
 
+#: src/gtkblist.c:746
+msgid "/Buddies/Join a _Chat..."
+msgstr "/絅遵�(B)/���ヨ��紊�(_C)..."
+
+#: src/gtkblist.c:747
+msgid "/Buddies/Get _User Info..."
+msgstr "/絅遵�(B)/�桁����隙拭��(_U)..."
+
+#: src/gtkblist.c:749
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(_O)"
+
+#: src/gtkblist.c:750
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/絅遵�(B)/�丞ず腥榊�(_E)"
+
 #: src/gtkblist.c:751
-msgid "/Buddies/Join a _Chat..."
-msgstr "/絅遵�(B)/���ヨ��紊�(_C)..."
+msgid "/Buddies/_Add a Buddy..."
+msgstr "/絅遵�(B)/羞糸��絅遵�(_A)..."
 
 #: src/gtkblist.c:752
-msgid "/Buddies/Get _User Info..."
-msgstr "/絅遵�(B)/�桁����隙拭��(_U)..."
-
-#: src/gtkblist.c:754
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(_O)"
+msgid "/Buddies/Add a C_hat..."
+msgstr "/絅遵�(B)/羞糸����紊�(_H)..."
+
+#: src/gtkblist.c:753
+msgid "/Buddies/Add a _Group..."
+msgstr "/絅遵�(B)/羞糸��膸�(_G)..."
 
 #: src/gtkblist.c:755
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/絅遵�(B)/�丞ず腥榊�(_E)"
+msgid "/Buddies/_Signoff"
+msgstr "/絅遵�(B)/�糸��(_S)"
 
 #: src/gtkblist.c:756
-msgid "/Buddies/_Add a Buddy..."
-msgstr "/絅遵�(B)/羞糸��絅遵�(_A)..."
-
-#: src/gtkblist.c:757
-msgid "/Buddies/Add a C_hat..."
-msgstr "/絅遵�(B)/羞糸����紊�(_H)..."
-
-#: src/gtkblist.c:758
-msgid "/Buddies/Add a _Group..."
-msgstr "/絅遵�(B)/羞糸��膸�(_G)..."
-
-#: src/gtkblist.c:760
-msgid "/Buddies/_Signoff"
-msgstr "/絅遵�(B)/�糸��(_S)"
-
-#: src/gtkblist.c:761
 msgid "/Buddies/_Quit"
 msgstr "/絅遵�(B)/����(_Q)"
 
 #. Tools
-#: src/gtkblist.c:764
+#: src/gtkblist.c:759
 msgid "/_Tools"
 msgstr "/綏ュ��(_T)"
 
-#: src/gtkblist.c:765
+#: src/gtkblist.c:760
 msgid "/Tools/_Away"
 msgstr "/綏ュ��(T)/胼糸�(_A)"
 
-#: src/gtkblist.c:766
+#: src/gtkblist.c:761
 msgid "/Tools/Buddy _Pounce"
 msgstr "/綏ュ��(T)/絅遵�������(_P)"
 
-#: src/gtkblist.c:767
+#: src/gtkblist.c:762
 msgid "/Tools/P_rotocol Actions"
 msgstr "/綏ュ��(T)/�顒���篏�(_R)"
 
+#: src/gtkblist.c:764
+msgid "/Tools/A_ccounts..."
+msgstr "/綏ュ��(T)/茣���(_C)..."
+
+#: src/gtkblist.c:765
+msgid "/Tools/_File Transfers..."
+msgstr "/綏ュ��(T)/��篁銀���(_F)..."
+
+#: src/gtkblist.c:766
+msgid "/Tools/Preferences..."
+msgstr "/綏ュ��(T)/薤���蕁�..."
+
+#: src/gtkblist.c:767
+msgid "/Tools/Pr_ivacy..."
+msgstr "/綏ュ��(T)/��腱�(_I)..."
+
 #: src/gtkblist.c:769
-msgid "/Tools/A_ccounts..."
-msgstr "/綏ュ��(T)/茣���(_C)..."
-
-#: src/gtkblist.c:770
-msgid "/Tools/_File Transfers..."
-msgstr "/綏ュ��(T)/��篁銀���(_F)..."
-
-#: src/gtkblist.c:771
-msgid "/Tools/Preferences..."
-msgstr "/綏ュ��(T)/薤���蕁�..."
-
-#: src/gtkblist.c:772
-msgid "/Tools/Pr_ivacy..."
-msgstr "/綏ュ��(T)/��腱�(_I)..."
-
-#: src/gtkblist.c:774
 msgid "/Tools/View System _Log..."
 msgstr "/綏ュ��(T)/�ョ��膤紫��ュ�(_L)..."
 
 #. Help
-#: src/gtkblist.c:777
+#: src/gtkblist.c:772
 msgid "/_Help"
 msgstr "/絽���(_H)"
 
-#: src/gtkblist.c:778
+#: src/gtkblist.c:773
 msgid "/Help/Online _Help"
 msgstr "/絽���(H)/��鎖絽���(_H)"
 
-#: src/gtkblist.c:779
+#: src/gtkblist.c:774
 msgid "/Help/_Debug Window..."
 msgstr "/絽���(H)/莪�莚�腦���(_D)..."
 
-#: src/gtkblist.c:780
+#: src/gtkblist.c:775
 msgid "/Help/_About..."
 msgstr "/絽���(H)/�割�(_A)..."
 
-#: src/gtkblist.c:814
+#: src/gtkblist.c:809
 #, c-format
 msgid ""
 "\n"
@@ -4493,12 +4456,12 @@
 "\n"
 "<b>茣��件�</b>%s"
 
-#: src/gtkblist.c:873
+#: src/gtkblist.c:868
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:887
+#: src/gtkblist.c:882
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4506,7 +4469,7 @@
 "\n"
 "<b>茣��件�</b>"
 
-#: src/gtkblist.c:888
+#: src/gtkblist.c:883
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4514,7 +4477,7 @@
 "\n"
 "<b>����鐚�</b>"
 
-#: src/gtkblist.c:889
+#: src/gtkblist.c:884
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4522,7 +4485,7 @@
 "\n"
 "<b>�窮О鐚�</b>"
 
-#: src/gtkblist.c:890
+#: src/gtkblist.c:885
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4530,7 +4493,7 @@
 "\n"
 "<b>���¥�</b>"
 
-#: src/gtkblist.c:891
+#: src/gtkblist.c:886
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -4538,7 +4501,7 @@
 "\n"
 "<b>茘���鐚�</b>"
 
-#: src/gtkblist.c:893
+#: src/gtkblist.c:888
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -4546,7 +4509,7 @@
 "\n"
 "<b>�颷逸�</b>�ヨ�"
 
-#: src/gtkblist.c:894
+#: src/gtkblist.c:889
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -4554,6 +4517,14 @@
 "\n"
 "<b>�倶��</b>鐚�����"
 
+#: src/gtkblist.c:890
+msgid ""
+"\n"
+"<b>Status</b>: Rockin'"
+msgstr ""
+"\n"
+"<b>�倶��</b>鐚�羞隙恒"
+
 #: src/gtkblist.c:1186
 #, c-format
 msgid "Idle (%dh%02dm) "
@@ -4569,454 +4540,500 @@
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%) "
 
-#: src/gtkblist.c:1329 src/gtkblist.c:1333 src/gtkprefs.c:604
-#: src/gtkprefs.c:1110
+#: src/gtkblist.c:1195
+msgid "Offline "
+msgstr "胼紫鎖 "
+
+#: src/gtkblist.c:1341 src/gtkblist.c:1345 src/gtkblist.c:2169
+#: src/gtkprefs.c:900 src/gtkprefs.c:1464
 msgid "None"
 msgstr "��"
 
-#: src/gtkblist.c:1330
+#: src/gtkblist.c:1342
 msgid "Alphabetical"
 msgstr "絖�罸�綺�"
 
-#: src/gtkblist.c:1331
+#: src/gtkblist.c:1343
 msgid "By status"
 msgstr "���倶��"
 
-#: src/gtkblist.c:1332
+#: src/gtkblist.c:1344
 msgid "By log size"
 msgstr "���ュ�紊у�"
 
-#: src/gtkblist.c:1358 src/gtkprefs.c:1810
+#: src/gtkblist.c:1370 src/gtkprefs.c:2189
 msgid "Buddy List"
 msgstr "絅遵���茵�"
 
-#: src/gtkblist.c:1382
+#: src/gtkblist.c:1394
 msgid "/Tools/Away"
 msgstr "/綏ュ��(T)/胼糸�(A)"
 
-#: src/gtkblist.c:1385
+#: src/gtkblist.c:1397
 msgid "/Tools/Buddy Pounce"
 msgstr "/綏ュ��(T)/絅遵�������(P)"
 
-#: src/gtkblist.c:1388
+#: src/gtkblist.c:1400
 msgid "/Tools/Protocol Actions"
 msgstr "/綏ュ��(T)/�顒���篏�(R)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1471
+#: src/gtkblist.c:1483
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(O)"
 
-#: src/gtkblist.c:1473
+#: src/gtkblist.c:1485
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�(B)/�丞ず腥榊�(E)"
 
-#: src/gtkblist.c:1491 src/gtkconv.c:766
+#: src/gtkblist.c:1503 src/gtkconv.c:772
 msgid "IM"
 msgstr "綣���"
 
-#: src/gtkblist.c:1497
+#: src/gtkblist.c:1509
 msgid "Send a message to the selected buddy"
 msgstr "����筝㊤ソ������羔���"
 
-#: src/gtkblist.c:1506
+#: src/gtkblist.c:1518
 msgid "Get information on the selected buddy"
 msgstr "�桁���筝㊤ソ����篆≧��"
 
-#: src/gtkblist.c:1514
+#: src/gtkblist.c:1526
 msgid "Join a chat room"
 msgstr "���ヨ��紊��"
 
-#: src/gtkblist.c:1522
+#: src/gtkblist.c:1534
 msgid "Set an away message"
 msgstr "莅丞舟胼糸�羔���"
 
-#: src/gtkconv.c:219
+#: src/gtkconv.c:220
 msgid "Gaim - Insert Image"
 msgstr "Gaim - ���ュ�上��"
 
-#: src/gtkconv.c:774
+#: src/gtkconv.c:780
 msgid "Un-Ignore"
 msgstr "��羔�綽順��"
 
-#: src/gtkconv.c:776 src/gtkprefs.c:542
+#: src/gtkconv.c:782 src/gtkprefs.c:830
 msgid "Ignore"
 msgstr "綽順��"
 
 #. Info button
-#: src/gtkconv.c:785 src/gtkconv.c:2669
+#: src/gtkconv.c:791 src/gtkconv.c:2679
 msgid "Info"
 msgstr "篆≧��"
 
-#: src/gtkconv.c:805 src/gtkconv.c:2652 src/gtkconv.c:3781
+#: src/gtkconv.c:811 src/gtkconv.c:2662 src/gtkconv.c:3789
 msgid "Remove"
 msgstr "����"
 
-#: src/gtkconv.c:879
+#: src/gtkconv.c:885
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - ��莚桁ソ��菴��ヨ��紊��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:907
+#: src/gtkconv.c:913
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "���活���莚決�鐚�莚決��ヤ�/絅合����絖�鐚�篁ュ���������莚傑�����"
 
-#: src/gtkconv.c:928
+#: src/gtkconv.c:934
 msgid "_Buddy:"
 msgstr "絅遵�(_B)鐚�"
 
-#: src/gtkconv.c:948
+#: src/gtkconv.c:954
 msgid "_Message:"
 msgstr "羔���(_M)鐚�"
 
-#: src/gtkconv.c:1977
+#: src/gtkconv.c:1983
 msgid "User is typing..."
 msgstr "���傑③����絖�..."
 
-#: src/gtkconv.c:1985
+#: src/gtkconv.c:1991
 msgid "User has typed something and paused"
 msgstr "���傑��篋���筝��鐚���篋�筝�筝�"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2092
+#: src/gtkconv.c:2098
 msgid "_Send As"
 msgstr "����荳�蚕(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:2542
+#: src/gtkconv.c:2552
 msgid "/_Conversation"
 msgstr "/絲壕�(_C)"
 
-#: src/gtkconv.c:2543
+#: src/gtkconv.c:2553
 msgid "/Conversation/_Save As..."
 msgstr "/絲壕�(C)/���筝�(_S)..."
 
-#: src/gtkconv.c:2545
+#: src/gtkconv.c:2555
 msgid "/Conversation/View _Log..."
 msgstr "/絲壕�(C)/�ョ���ュ�(_L)..."
 
-#: src/gtkconv.c:2547
+#: src/gtkconv.c:2557
 msgid "/Conversation/Insert _URL..."
 msgstr "/絲壕�(C)/���� URL(_U)..."
 
-#: src/gtkconv.c:2549
+#: src/gtkconv.c:2559
 msgid "/Conversation/Insert _Image..."
 msgstr "/絲壕�(C)/���ュ�上��(_I)..."
 
-#: src/gtkconv.c:2552
+#: src/gtkconv.c:2562
 msgid "/Conversation/_Close"
 msgstr "/絲壕�(C)/�渇��(_C)"
 
 #. Options
-#: src/gtkconv.c:2556
+#: src/gtkconv.c:2566
 msgid "/_Options"
 msgstr "/��蕁�(_O)"
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2567
 msgid "/Options/Enable _Logging"
 msgstr "/��蕁�(O)/��莅梧�綵��ュ�(_L)"
 
-#: src/gtkconv.c:2558
+#: src/gtkconv.c:2568
 msgid "/Options/Enable _Sounds"
 msgstr "/��蕁�(O)/��莅後0��(_S)"
 
-#: src/gtkconv.c:2594
+#: src/gtkconv.c:2604
 msgid "/Conversation/View Log..."
 msgstr "/絲壕�(C)/�ョ���ュ�(L)..."
 
-#: src/gtkconv.c:2596
+#: src/gtkconv.c:2606
 msgid "/Conversation/Insert URL..."
 msgstr "/絲壕�(C)/���� URL(U)..."
 
-#: src/gtkconv.c:2598
+#: src/gtkconv.c:2608
 msgid "/Conversation/Insert Image..."
 msgstr "/絲壕�(C)/���ュ�上��(I)..."
 
-#: src/gtkconv.c:2600
+#: src/gtkconv.c:2610
 msgid "/Options/Enable Logging"
 msgstr "/��蕁�(O)/��莅梧�綵�(L)"
 
-#: src/gtkconv.c:2602
+#: src/gtkconv.c:2612
 msgid "/Options/Enable Sounds"
 msgstr "/��蕁�(O)/��莅後0��(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2626 src/gtkconv.c:2628 src/gtkconv.c:2726 src/gtkconv.c:2728
-#: src/gtkconv.c:5025
+#: src/gtkconv.c:2636 src/gtkconv.c:2638 src/gtkconv.c:2736 src/gtkconv.c:2738
+#: src/gtkconv.c:5065
 msgid "Send"
 msgstr "����"
 
-#: src/gtkconv.c:2649 src/gtkconv.c:3793
+#: src/gtkconv.c:2659 src/gtkconv.c:3801
 msgid "Add the user to your buddy list"
 msgstr "絨����桁��筝阪ソ��"
 
-#: src/gtkconv.c:2655 src/gtkconv.c:3784
+#: src/gtkconv.c:2665 src/gtkconv.c:3792
 msgid "Remove the user from your buddy list"
 msgstr "篁�����絅遵���茵�賢���よ�����"
 
 #. Warn button
-#: src/gtkconv.c:2662
+#: src/gtkconv.c:2672
 msgid "Warn"
 msgstr "茘���"
 
-#: src/gtkconv.c:2666
+#: src/gtkconv.c:2676
 msgid "Warn the user"
 msgstr "茘�������"
 
-#: src/gtkconv.c:2673 src/gtkconv.c:3104
+#: src/gtkconv.c:2683 src/gtkconv.c:3116
 msgid "Get the user's information"
 msgstr "�桁����隙拭��"
 
 #. Block button
-#: src/gtkconv.c:2676
+#: src/gtkconv.c:2686
 msgid "Block"
 msgstr "絮��"
 
-#: src/gtkconv.c:2680
+#: src/gtkconv.c:2690
 msgid "Block the user"
 msgstr "鎡�恝����"
 
 #. Invite
-#: src/gtkconv.c:2738 src/gtkconv.c:5028
+#: src/gtkconv.c:2748 src/gtkconv.c:5068
 msgid "Invite"
 msgstr "��莚�"
 
-#: src/gtkconv.c:2741
+#: src/gtkconv.c:2751
 msgid "Invite a user"
 msgstr "��莚欠����"
 
-#: src/gtkconv.c:2780
+#: src/gtkconv.c:2790
 msgid "Bold"
 msgstr "膕�篏�"
 
-#: src/gtkconv.c:2791
+#: src/gtkconv.c:2801
 msgid "Italic"
 msgstr "��篏�"
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2812
 msgid "Underline"
 msgstr "筝���膾�"
 
-#: src/gtkconv.c:2818
+#: src/gtkconv.c:2828
 msgid "Larger font size"
 msgstr "莨�紊у�篏�"
 
-#: src/gtkconv.c:2830
+#: src/gtkconv.c:2840
 msgid "Normal font size"
 msgstr "����絖�篏�"
 
-#: src/gtkconv.c:2842
+#: src/gtkconv.c:2852
 msgid "Smaller font size"
 msgstr "莨�絨鎕�篏�"
 
-#: src/gtkconv.c:2859
+#: src/gtkconv.c:2869
 msgid "Font Face"
 msgstr "絖�篏�"
 
-#: src/gtkconv.c:2871
+#: src/gtkconv.c:2881
 msgid "Foreground font color"
 msgstr "絖�篏�蘂���"
 
-#: src/gtkconv.c:2883
+#: src/gtkconv.c:2893
 msgid "Background color"
 msgstr "�������"
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2908
 msgid "Insert image"
 msgstr "���ュ�上��"
 
-#: src/gtkconv.c:2909
+#: src/gtkconv.c:2919
 msgid "Insert link"
 msgstr "���ラ�丈・"
 
-#: src/gtkconv.c:2920
+#: src/gtkconv.c:2930
 msgid "Insert smiley"
 msgstr "���ョ���"
 
-#: src/gtkconv.c:2977
+#: src/gtkconv.c:2987
 msgid "Topic:"
 msgstr "莚�蘂�鐚�"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3024
+#: src/gtkconv.c:3036
 msgid "0 people in room"
 msgstr "��紊����羃≧��篋�"
 
-#: src/gtkconv.c:3081
-msgid "IM the user"
-msgstr "膸����桁����恰�倶���"
-
 #: src/gtkconv.c:3093
+msgid "IM the user"
+msgstr "膸����桁����恰�倶���"
+
+#: src/gtkconv.c:3105
 msgid "Ignore the user"
 msgstr "綽順�ョ����"
 
-#: src/gtkconv.c:3622
+#: src/gtkconv.c:3636
 msgid "Close conversation"
 msgstr "�渇�㊤�莚�"
 
-#: src/gtkconv.c:4227 src/gtkconv.c:4349
+#: src/gtkconv.c:4269 src/gtkconv.c:4391
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "��紊������ %d 筝�査"
 
-#: src/gtkconv.c:4709
+#: src/gtkconv.c:4751
 msgid "Disable Animation"
 msgstr "胼�������"
 
-#: src/gtkconv.c:4718
+#: src/gtkconv.c:4760
 msgid "Enable Animation"
 msgstr "��������"
 
-#: src/gtkconv.c:4725
+#: src/gtkconv.c:4767
 msgid "Hide Icon"
 msgstr "����憝��"
 
-#: src/gtkconv.c:4731
+#: src/gtkconv.c:4773
 msgid "Save Icon As..."
 msgstr "�丈�����筝�..."
 
-#: src/gtkft.c:104
+#: src/gtkft.c:105
 msgid "Calculating..."
 msgstr "罩e���膊�..."
 
-#: src/gtkft.c:107
+#: src/gtkft.c:108
 msgid "Unknown."
 msgstr "���ャ��"
 
-#: src/gtkft.c:144
+#: src/gtkft.c:145
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/腱�"
 
-#: src/gtkft.c:219
+#: src/gtkft.c:220
 msgid "<b>Receiving From:</b>"
 msgstr "<b>�����刻�</b>"
 
-#: src/gtkft.c:222
+#: src/gtkft.c:223
 msgid "<b>Sending To:</b>"
 msgstr "<b>�ユ�倶�刻�</b>"
 
-#: src/gtkft.c:446
+#: src/gtkft.c:447
 msgid "Progress"
 msgstr "菴�綺�"
 
-#: src/gtkft.c:453
+#: src/gtkft.c:454
 msgid "Filename"
 msgstr "��篁九��"
 
-#: src/gtkft.c:460
+#: src/gtkft.c:461
 msgid "Size"
 msgstr "紊у�"
 
-#: src/gtkft.c:467
+#: src/gtkft.c:468
 msgid "Remaining"
 msgstr "���"
 
-#: src/gtkft.c:497
+#: src/gtkft.c:498
 msgid "Filename:"
 msgstr "��篁九��鐚�"
 
-#: src/gtkft.c:498
+#: src/gtkft.c:499
 msgid "Status:"
 msgstr "�倶��鐚�"
 
-#: src/gtkft.c:499
+#: src/gtkft.c:500
 msgid "Speed:"
 msgstr "��綺��"
 
-#: src/gtkft.c:500
-msgid "Time Elapsed:"
-msgstr "綏画��狗�器�"
-
 #: src/gtkft.c:501
+msgid "Time Elapsed:"
+msgstr "綏画��狗�器�"
+
+#: src/gtkft.c:502
 msgid "Time Remaining:"
 msgstr "����狗�器�"
 
-#: src/gtkft.c:567
+#: src/gtkft.c:568
 msgid "File Transfers"
 msgstr "��篁銀���"
 
-#: src/gtkft.c:596
+#: src/gtkft.c:597
 msgid "_Keep the dialog open"
 msgstr "篆���絲壕�罅���綣�(_K)"
 
-#: src/gtkft.c:606
+#: src/gtkft.c:607
 msgid "_Clear finished transfers"
 msgstr "羝��ゆ�������篌���(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:615
+#: src/gtkft.c:616
 msgid "Show download details"
 msgstr "�丞ず筝�莉順���"
 
-#: src/gtkft.c:616
+#: src/gtkft.c:617
 msgid "Hide download details"
 msgstr "���鋇�莉順���"
 
 #. Pause button
-#: src/gtkft.c:658
+#: src/gtkft.c:659
 msgid "_Pause"
 msgstr "����(_P)"
 
 #. Resume button
-#: src/gtkft.c:668
+#: src/gtkft.c:669
 msgid "_Resume"
 msgstr "膸х鮫(_R)"
 
-#: src/gtkft.c:1011
+#: src/gtkft.c:1012
 msgid "That file does not exist."
 msgstr "��篁銀�絖�����"
 
-#: src/gtkft.c:1018
+#: src/gtkft.c:1019
 msgid "Cannot send a file of 0 bytes."
 msgstr "��羈����� 0 絖�������篁吟��"
 
-#: src/gtkft.c:1030
-msgid "That file already exists. Would you like to overwrite it?"
-msgstr "莚ユ��篁九群絖������������活�荀���鐚�"
-
-#: src/gtkft.c:1056
+#: src/gtkft.c:1032
+msgid "That file already exists."
+msgstr "莚ユ��篁銀�絖�����"
+
+#: src/gtkft.c:1033
+msgid "Would you like to overwrite it?"
+msgstr "�������活�荀���鐚�"
+
+#: src/gtkft.c:1057
 msgid "Gaim - Open..."
 msgstr "Gaim - ��綣�..."
 
-#: src/gtkft.c:1105
+#: src/gtkft.c:1106
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s �活�膸������ %s (%s)"
 
-#: src/gtkimhtml.c:342
+#: src/gtkimhtml.c:346
 msgid "_Copy Link Location"
 msgstr "紊��狗�丈・�医��(_C)"
 
-#: src/gtkimhtml.c:349
+#: src/gtkimhtml.c:353
 msgid "_Open Link in Browser"
 msgstr "���茹���賢��綣��丈・(_O)"
 
-#: src/gtkimhtml.c:1664
+#: src/gtkimhtml.c:1668
 msgid ""
 "Gaim was unable to guess the image type base on the file extension "
 "supplied.  Defaulting to PNG."
 msgstr "Gaim ��羈��号���箴�����篁倶�������羌��上�靏糸������藥�莅ゅ�取�筝� PNG��"
 
-#: src/gtkimhtml.c:1672
+#: src/gtkimhtml.c:1676
 #, c-format
 msgid "Error saving image: %s"
 msgstr "篆�絖��上��尌��鐚�%s"
 
-#: src/gtkimhtml.c:1681
+#: src/gtkimhtml.c:1685
 msgid "Gaim - Save Image"
 msgstr "Gaim - 篆�絖��上��"
 
-#: src/gtkimhtml.c:1703
+#: src/gtkimhtml.c:1707
 msgid "_Save Image..."
 msgstr "篆�絖��上��(_S)..."
 
+#: src/gtknotify.c:190
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s �� %d 絨��育��散��"
+
+#: src/gtknotify.c:198
+#, c-format
+msgid "<span weight=\"bold\">From:</span> %s\n"
+msgstr "<span weight=\"bold\">�ヨ���</span> %s\n"
+
+#: src/gtknotify.c:203
+#, c-format
+msgid "<span weight=\"bold\">Subject:</span> %s\n"
+msgstr "<span weight=\"bold\">筝脂�鐚�</span> %s\n"
+
+#: src/gtknotify.c:207
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s%s%s%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">�����育��散篋�!</span>\n"
+"\n"
+"%s%s%s%s"
+
+#: src/gtknotify.c:222
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">�����育��散篋�!</span>\n"
+"\n"
+"%s"
+
 #: src/gtkpounce.c:122
 msgid "Select a file"
 msgstr "������篁�"
@@ -5025,614 +5042,580 @@
 msgid "Please enter a buddy to pounce."
 msgstr "莚決��ヨ���茹���絅遵���"
 
-#: src/gtkpounce.c:344
+#: src/gtkpounce.c:345
 #, c-format
 msgid "%s has started typing to you"
 msgstr "%s 綣�紮�������絖�"
 
-#: src/gtkpounce.c:345
+#: src/gtkpounce.c:346
 #, c-format
 msgid "%s has signed on"
 msgstr "%s 綏牙�糸��"
 
-#: src/gtkpounce.c:346
+#: src/gtkpounce.c:347
 #, c-format
 msgid "%s has returned from being idle"
 msgstr "%s �♂��篋�"
 
-#: src/gtkpounce.c:347
+#: src/gtkpounce.c:348
 #, c-format
 msgid "%s has returned from being away"
 msgstr "%s ���ヤ�"
 
-#: src/gtkpounce.c:348
+#: src/gtkpounce.c:349
 #, c-format
 msgid "%s has stopped typing to you"
 msgstr "%s ��罩≫�膸�����絖�"
 
-#: src/gtkpounce.c:349
+#: src/gtkpounce.c:350
 #, c-format
 msgid "%s has signed off"
 msgstr "%s 綏牙�糸��"
 
-#: src/gtkpounce.c:350
+#: src/gtkpounce.c:351
 #, c-format
 msgid "%s has become idle"
 msgstr "%s ��莎欠����"
 
-#: src/gtkpounce.c:351
+#: src/gtkpounce.c:352
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 莎遺���"
 
-#: src/gtkpounce.c:352
+#: src/gtkpounce.c:353
 msgid "Unknown pounce event. Please report this!"
 msgstr "���ョ�������若��莚傑�ュ��罩ら��莚��"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:495 src/gtkpounce.c:885
+#: src/gtkpounce.c:494 src/gtkpounce.c:884
 msgid "New Buddy Pounce"
 msgstr "�医産絅遵�������"
 
-#: src/gtkpounce.c:495
+#: src/gtkpounce.c:494
 msgid "Edit Buddy Pounce"
 msgstr "膽�莨�絅遵�������"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:513
+#: src/gtkpounce.c:512
 msgid "Pounce Who"
 msgstr "��茹�絲壕院"
 
-#: src/gtkpounce.c:535
+#: src/gtkpounce.c:534
 msgid "_Buddy Name:"
 msgstr "絅遵�(_B)鐚�"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:553
 msgid "Pounce When"
 msgstr "��茹���篋�篁�"
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:561
 msgid "Sign on"
 msgstr "�糸��"
 
-#: src/gtkpounce.c:564
+#: src/gtkpounce.c:563
 msgid "Sign off"
 msgstr "�糸��"
 
-#: src/gtkpounce.c:568
+#: src/gtkpounce.c:567
 msgid "Return from away"
 msgstr "����"
 
-#: src/gtkpounce.c:572
+#: src/gtkpounce.c:571
 msgid "Return from idle"
 msgstr "�♂��篋�"
 
-#: src/gtkpounce.c:574
+#: src/gtkpounce.c:573
 msgid "Buddy starts typing"
 msgstr "絅遵�綣�紮���絖�"
 
-#: src/gtkpounce.c:576
+#: src/gtkpounce.c:575
 msgid "Buddy stops typing"
 msgstr "絅遵���罩∽��絖�"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:605
+#: src/gtkpounce.c:604
 msgid "Pounce Action"
 msgstr "������篏�"
 
-#: src/gtkpounce.c:612
+#: src/gtkpounce.c:611
 msgid "Open an IM window"
 msgstr "��綣��恰�倶������"
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:612
 msgid "Popup notification"
 msgstr "綣劫�咲����"
 
-#: src/gtkpounce.c:614
+#: src/gtkpounce.c:613
 msgid "Send a message"
 msgstr "����羔���"
 
+#: src/gtkpounce.c:614
+msgid "Execute a command"
+msgstr "�ц��巡擦"
+
 #: src/gtkpounce.c:615
-msgid "Execute a command"
-msgstr "�ц��巡擦"
-
-#: src/gtkpounce.c:616
 msgid "Play a sound"
 msgstr "�㊥�上0��"
 
-#: src/gtkpounce.c:620 src/gtkpounce.c:622 src/multi.c:714
+#: src/gtkpounce.c:619 src/gtkpounce.c:621
 msgid "Browse"
 msgstr "羌頵�"
 
-#: src/gtkpounce.c:623 src/gtkprefs.c:1637
+#: src/gtkpounce.c:622 src/gtkprefs.c:2016
 msgid "Test"
 msgstr "羌�莚�"
 
-#: src/gtkpounce.c:706
+#: src/gtkpounce.c:705
 msgid "_Save this pounce after activation"
 msgstr "羶�羇糸���絖�罩ゅ������(_S)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:892
+#: src/gtkpounce.c:891
 msgid "Remove Buddy Pounce"
 msgstr "���ゅソ��������"
 
-#: src/gtkprefs.c:206
+#: src/gtkprefs.c:435
 msgid "Interface Options"
 msgstr "���∫��蕁�"
 
-#: src/gtkprefs.c:208
+#: src/gtkprefs.c:437
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "絋������臀��������丞ず菴�腮��窮О(_I)"
 
-#: src/gtkprefs.c:389
+#: src/gtkprefs.c:618
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr "莚隙�筝��∫�������篏睡����膃��娯源蘂���絨�筝脂����喝�遺源蘂���茵��喝��茖��遺源蘂���"
 
-#: src/gtkprefs.c:422
+#: src/gtkprefs.c:651
 msgid "Icon"
 msgstr "�丈��"
 
-#: src/gtkprefs.c:456
+#: src/gtkprefs.c:724
 msgid "Style"
 msgstr "�桁�"
 
-#: src/gtkprefs.c:457
+#: src/gtkprefs.c:725
 msgid "_Bold"
 msgstr "膕�篏�(_B)"
 
-#: src/gtkprefs.c:458
+#: src/gtkprefs.c:727
 msgid "_Italics"
 msgstr "��篏�(_I)"
 
-#: src/gtkprefs.c:459
+#: src/gtkprefs.c:729
 msgid "_Underline"
 msgstr "筝���膾�(_U)"
 
-#: src/gtkprefs.c:460
+#: src/gtkprefs.c:731
 msgid "_Strikethrough"
 msgstr "���ょ鎖(_S)"
 
-#: src/gtkprefs.c:462
+#: src/gtkprefs.c:734
 msgid "Face"
 msgstr "絖�篏�"
 
-#: src/gtkprefs.c:465
+#: src/gtkprefs.c:737
 msgid "Use custo_m face"
 msgstr "篏睡�����箙�絖�篏�(_M)"
 
-#: src/gtkprefs.c:479
+#: src/gtkprefs.c:754
 msgid "Use custom si_ze"
 msgstr "篏睡�����箙�紊у�(_Z)"
 
-#: src/gtkprefs.c:487
+#: src/gtkprefs.c:767
 msgid "Color"
 msgstr "蘂���"
 
-#: src/gtkprefs.c:492
+#: src/gtkprefs.c:771
 msgid "_Text color"
 msgstr "��絖�蘂���(_T)"
 
-#: src/gtkprefs.c:509
+#: src/gtkprefs.c:790
 msgid "Bac_kground color"
 msgstr "�������(_K)"
 
-#: src/gtkprefs.c:535 src/gtkprefs.c:696 src/gtkprefs.c:737
+#: src/gtkprefs.c:818 src/gtkprefs.c:1036 src/gtkprefs.c:1089
 msgid "Display"
 msgstr "�丞ず"
 
-#: src/gtkprefs.c:536
+#: src/gtkprefs.c:819
 msgid "Show graphical _smileys"
 msgstr "�丞ず�上就��膃���(_S)"
 
-#: src/gtkprefs.c:537
+#: src/gtkprefs.c:821
 msgid "Show _timestamp on messages"
 msgstr "羔����丞ず�狗�贋��(_T)"
 
-#: src/gtkprefs.c:538
+#: src/gtkprefs.c:823
 msgid "Show _URLs as links"
 msgstr "絨� URLs �丞ず筝咲�丈・(_U)"
 
-#: src/gtkprefs.c:540
+#: src/gtkprefs.c:827
 msgid "_Highlight misspelled words"
 msgstr "腦��堺�丞ず�守������莚�(_H)"
 
-#: src/gtkprefs.c:543
+#: src/gtkprefs.c:831
 msgid "Ignore c_olors"
 msgstr "綽順�ラ���(_O)"
 
-#: src/gtkprefs.c:544
+#: src/gtkprefs.c:833
 msgid "Ignore font _faces"
 msgstr "綽順�ュ�篏���腱�(_F)"
 
-#: src/gtkprefs.c:545
+#: src/gtkprefs.c:835
 msgid "Ignore font si_zes"
 msgstr "綽順�ュ�篏�紊у�(_Z)"
 
-#: src/gtkprefs.c:557
+#: src/gtkprefs.c:848
 msgid "Send Message"
 msgstr "����羔���"
 
-#: src/gtkprefs.c:558
+#: src/gtkprefs.c:849
 msgid "_Enter sends message"
 msgstr "��莉������羔���(_E)"
 
-#: src/gtkprefs.c:559
+#: src/gtkprefs.c:851
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+��莉������羔���(_O)"
 
-#: src/gtkprefs.c:561
+#: src/gtkprefs.c:854
 msgid "Window Closing"
 msgstr "腦��e�渇��"
 
-#: src/gtkprefs.c:562
+#: src/gtkprefs.c:855
 msgid "E_scape closes window"
 msgstr "Esc ���渇�㊦���(_S)"
 
-#: src/gtkprefs.c:563
+#: src/gtkprefs.c:857
 msgid "Control-_W closes window"
 msgstr "Ctrl+W ���渇�㊦���(_W)"
 
-#: src/gtkprefs.c:565
+#: src/gtkprefs.c:860
 msgid "Insertions"
 msgstr "����"
 
-#: src/gtkprefs.c:566
+#: src/gtkprefs.c:861
 msgid "Control-{B/I/U/S} inserts _HTML tags"
 msgstr "Ctrl+{B/I/U/S} ���� HTML ��膈�(_H)"
 
-#: src/gtkprefs.c:567
+#: src/gtkprefs.c:863
 msgid "Control-(number) inserts _smileys"
 msgstr "Ctrl+�医�����ョ���(_S)"
 
-#: src/gtkprefs.c:585
+#: src/gtkprefs.c:880
 msgid "Buddy List Sorting"
 msgstr "絅遵���茵��綺�"
 
-#: src/gtkprefs.c:594
+#: src/gtkprefs.c:889
 msgid "Sorting:"
 msgstr "��綺��"
 
-#: src/gtkprefs.c:599
+#: src/gtkprefs.c:894
 msgid "Buddy List Toolbar"
 msgstr "絅遵���茵�轡�傑��"
 
-#: src/gtkprefs.c:600 src/gtkprefs.c:679 src/gtkprefs.c:722
+#: src/gtkprefs.c:895 src/gtkprefs.c:1006 src/gtkprefs.c:1062
 msgid "Show _buttons as:"
 msgstr "絨������丞ず筝�(_B)鐚�"
 
-#: src/gtkprefs.c:601 src/gtkprefs.c:680 src/gtkprefs.c:723
+#: src/gtkprefs.c:897 src/gtkprefs.c:1008 src/gtkprefs.c:1064
 msgid "Pictures"
 msgstr "�丞��"
 
-#: src/gtkprefs.c:602 src/gtkprefs.c:681 src/gtkprefs.c:724
+#: src/gtkprefs.c:898 src/gtkprefs.c:1009 src/gtkprefs.c:1065
 msgid "Text"
 msgstr "��絖�"
 
-#: src/gtkprefs.c:603 src/gtkprefs.c:682 src/gtkprefs.c:725
+#: src/gtkprefs.c:899 src/gtkprefs.c:1010 src/gtkprefs.c:1066
 msgid "Pictures and text"
 msgstr "�丞������絖�"
 
-#: src/gtkprefs.c:607
+#: src/gtkprefs.c:904
 msgid "_Raise window on events"
 msgstr "����篋�篁倶�倶�羇紫���(_R)"
 
-#: src/gtkprefs.c:609
+#: src/gtkprefs.c:907
 msgid "Group Display"
 msgstr "膸��丞ず"
 
-#. gaim_button(_("Hide _groups with no online buddies"), &blist_options, OPT_BLIST_NO_MT_GRP, vbox);
-#: src/gtkprefs.c:611
+#. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
+#: src/gtkprefs.c:909
 msgid "Show _numbers in groups"
 msgstr "������丞ず�医�(_N)"
 
-#: src/gtkprefs.c:613
+#: src/gtkprefs.c:912
 msgid "Buddy Display"
 msgstr "絅遵��丞ず"
 
-#: src/gtkprefs.c:614
+#: src/gtkprefs.c:913 src/gtkprefs.c:1031
 msgid "Show buddy _icons"
 msgstr "�丞ず絅遵��丈��(_I)"
 
-#: src/gtkprefs.c:615
+#: src/gtkprefs.c:915
 msgid "Show _warning levels"
 msgstr "�丞ず茘���膾у��(_W)"
 
-#: src/gtkprefs.c:620
+#: src/gtkprefs.c:918
 msgid "Show idle _times"
 msgstr "�丞ず���≧�狗��(_T)"
 
-#: src/gtkprefs.c:625
+#: src/gtkprefs.c:932
 msgid "Dim i_dle buddies"
 msgstr "�丞ず�∞����絅遵�(_D)"
 
-#: src/gtkprefs.c:643 src/gtkprefs.c:1811
+#: src/gtkprefs.c:953 src/gtkprefs.c:2190
 msgid "Conversations"
 msgstr "絲壕�"
 
-#: src/gtkprefs.c:651
+#: src/gtkprefs.c:961
 msgid "_Placement:"
 msgstr "篏�臀�(_P)鐚�"
 
-#: src/gtkprefs.c:659
-msgid "Show IMs and chats in _same tabbed window."
-msgstr "����筝���膈丞��e���丞ず�恰�倶�������紊�(_S)��"
-
-#: src/gtkprefs.c:678 src/gtkprefs.c:721
+#: src/gtkprefs.c:970
+msgid "Send _URLs as Links"
+msgstr "絨� URLs ����筝咲�丈・(_U)"
+
+#: src/gtkprefs.c:973
+msgid "Tab Options"
+msgstr "��膈冗��蕁�"
+
+#: src/gtkprefs.c:975
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "����筝���膈丞��e���丞ず�恰�倶�������紊�(_T)"
+
+#: src/gtkprefs.c:978
+msgid "Show _close button on tabs."
+msgstr "����膈鞘��丞ず�渇�㊥����(_C)��"
+
+#: src/gtkprefs.c:1005 src/gtkprefs.c:1061
 msgid "Window"
 msgstr "腦���"
 
-#: src/gtkprefs.c:685 src/gtkprefs.c:728
+#: src/gtkprefs.c:1015 src/gtkprefs.c:1071
 msgid "New window _width:"
 msgstr "�亥��e�綺�(_W)鐚�"
 
-#: src/gtkprefs.c:686 src/gtkprefs.c:729
+#: src/gtkprefs.c:1018 src/gtkprefs.c:1074
 msgid "New window _height:"
 msgstr "�亥��i�綺�(_H)鐚�"
 
-#: src/gtkprefs.c:687 src/gtkprefs.c:730
+#: src/gtkprefs.c:1021 src/gtkprefs.c:1077
 msgid "_Entry field height:"
 msgstr "莨��ユ�蕭�綺�(_E)鐚�"
 
-#: src/gtkprefs.c:688 src/gtkprefs.c:731
+#: src/gtkprefs.c:1024 src/gtkprefs.c:1080
 msgid "_Raise windows on events"
 msgstr "����篋�篁倶�倶�羇紫���(_R)"
 
-#: src/gtkprefs.c:689
+#: src/gtkprefs.c:1026
 msgid "Hide window on _send"
 msgstr "�����狗���霨���(_S)"
 
-#: src/gtkprefs.c:692
+#: src/gtkprefs.c:1030
 msgid "Buddy Icons"
 msgstr "絅遵��丈��"
 
-#: src/gtkprefs.c:693
-msgid "Hide buddy _icons"
-msgstr "���鎁遵��丈��(_I)"
-
-#: src/gtkprefs.c:694
-msgid "Disable buddy icon a_nimation"
-msgstr "胼���ソ���丈������(_N)"
-
-#: src/gtkprefs.c:697
+#: src/gtkprefs.c:1033
+msgid "Enable buddy icon a_nimation"
+msgstr "����ソ���丈������(_N)"
+
+#: src/gtkprefs.c:1037
 msgid "Show _logins in window"
 msgstr "����d賢�丞ず�糸�(_L)"
 
-#: src/gtkprefs.c:698
+#: src/gtkprefs.c:1039
 msgid "Show a_liases in tabs/titles"
 msgstr "����膈�/��蘂�筝㊥�丞ず����(_L)"
 
-#: src/gtkprefs.c:700
+#: src/gtkprefs.c:1042
 msgid "Typing Notification"
 msgstr "��絖���腓�"
 
-#: src/gtkprefs.c:701
+#: src/gtkprefs.c:1043
 msgid "Notify buddies that you are _typing to them"
 msgstr "����絅遵���③����絖�膸�篁�篁�(_T)"
 
-#: src/gtkprefs.c:733
+#: src/gtkprefs.c:1083
 msgid "Tab Completion"
 msgstr "Tab 茵ュ��"
 
-#: src/gtkprefs.c:734
+#: src/gtkprefs.c:1084
 msgid "_Tab-complete nicks"
 msgstr "�� Tab 茵ュ���窮О(_T)"
 
-#: src/gtkprefs.c:735
+#: src/gtkprefs.c:1086
 msgid "_Old-style tab completion"
 msgstr "�ч��主�� Tab 茵ュ��(_O)"
 
-#: src/gtkprefs.c:738
-msgid "_Show people joining/leaving in window"
-msgstr "����d賢�丞ず����/胼糸���篋�(_S)"
-
-#: src/gtkprefs.c:739
+#: src/gtkprefs.c:1090
+msgid "_Show people joining in window"
+msgstr "����d賢�丞ず���ョ��篋�(_S)"
+
+#: src/gtkprefs.c:1092
+msgid "_Show people leaving in window"
+msgstr "����d賢�丞ず胼糸���篋�(_S)"
+
+#: src/gtkprefs.c:1094
 msgid "Co_lorize screennames"
 msgstr "���桁������(_L)"
 
-#: src/gtkprefs.c:756
-msgid "IM Tabs"
-msgstr "�恰�倶�����膈�"
-
-#: src/gtkprefs.c:757 src/gtkprefs.c:767
-msgid "Tab _placement:"
-msgstr "��膈鞘�臀�(_P)鐚�"
-
-#: src/gtkprefs.c:758 src/gtkprefs.c:768
-msgid "Top"
-msgstr "筝�"
-
-#: src/gtkprefs.c:759 src/gtkprefs.c:769
-msgid "Bottom"
-msgstr "筝�"
-
-#: src/gtkprefs.c:760 src/gtkprefs.c:770
-msgid "Left"
-msgstr "綏�"
-
-#: src/gtkprefs.c:761 src/gtkprefs.c:771
-msgid "Right"
-msgstr "��"
-
-#: src/gtkprefs.c:763
-msgid ""
-"Show all _instant messages in one tabbed\n"
-"window"
-msgstr "���筝���膈上�腦��e���丞ず�����恰�倶���(_I)"
-
-#: src/gtkprefs.c:766
-msgid "Chat Tabs"
-msgstr "��紊���膈�"
-
-#: src/gtkprefs.c:773
-msgid "Show all c_hats in one tabbed window"
-msgstr "���筝���膈丞��e���丞ず������紊�(_H)"
-
-#: src/gtkprefs.c:776
-msgid "Tab Options"
-msgstr "��膈冗��蕁�"
-
-#: src/gtkprefs.c:777
-msgid "Show _close button on tabs."
-msgstr "����膈鞘��丞ず�渇�㊥����(_C)��"
-
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:1112
 msgid "Proxy Type"
 msgstr "篁g��膠糸��"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:1113
 msgid "Proxy _type:"
 msgstr "篁g��膠糸��(_T)鐚�"
 
-#: src/gtkprefs.c:799
+#: src/gtkprefs.c:1115
 msgid "No proxy"
 msgstr "��篁g��"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:1121
 msgid "Proxy Server"
 msgstr "篁g�����≦��"
 
-#: src/gtkprefs.c:817
+#: src/gtkprefs.c:1134
 msgid "_Host"
 msgstr "筝紙��(_H)"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:1148
 msgid "Port"
 msgstr "腴��"
 
-#: src/gtkprefs.c:847
+#: src/gtkprefs.c:1164
 msgid "_User"
 msgstr "���桁��(_U)"
 
-#: src/gtkprefs.c:861
+#: src/gtkprefs.c:1178
 msgid "Pa_ssword"
 msgstr "絲���(_S)"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:1199
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr "莨��ョ�������茹�����%s��������莇�膾ч�丈・��羈�綏ヤ���"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:1220
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:904
+#: src/gtkprefs.c:1221
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:905
+#: src/gtkprefs.c:1222
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:906
+#: src/gtkprefs.c:1223
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:907
+#: src/gtkprefs.c:1224
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:1232
 msgid "Manual"
 msgstr "����"
 
-#: src/gtkprefs.c:939
+#: src/gtkprefs.c:1267
 msgid "Browser Selection"
 msgstr "羌頵�������"
 
-#: src/gtkprefs.c:943
+#: src/gtkprefs.c:1271
 msgid "_Browser"
 msgstr "羌頵���(_B)"
 
-#: src/gtkprefs.c:951
+#: src/gtkprefs.c:1281
 msgid "_Manual: "
 msgstr "����(_M)鐚�"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:1303
 msgid "Browser Options"
 msgstr "羌頵�����蕁�"
 
-#: src/gtkprefs.c:967
+#: src/gtkprefs.c:1304
 msgid "Open new _window by default"
 msgstr "藥�莅ゆ��綣��亥���(_W)"
 
-#: src/gtkprefs.c:981
+#: src/gtkprefs.c:1319
 msgid "Message Logs"
 msgstr "羔����ュ�"
 
-#: src/gtkprefs.c:982
+#: src/gtkprefs.c:1320
 msgid "_Log all instant messages"
 msgstr "莅医������恰�倶���(_L)"
 
-#: src/gtkprefs.c:983
+#: src/gtkprefs.c:1322
 msgid "Log all c_hats"
 msgstr "莅医�������紊�(_H)"
 
-#: src/gtkprefs.c:984
+#: src/gtkprefs.c:1324
 msgid "Strip _HTML from logs"
 msgstr "篁��ュ�筝㊤サ�� HTML(_H)"
 
-#: src/gtkprefs.c:986
+#: src/gtkprefs.c:1327
 msgid "System Logs"
 msgstr "膤紫��ュ�"
 
-#: src/gtkprefs.c:987
+#: src/gtkprefs.c:1328
 msgid "Log when buddies _sign on/sign off"
 msgstr "莅医�絅遵����糸��/�糸��(_S)"
 
-#: src/gtkprefs.c:989
+#: src/gtkprefs.c:1330
 msgid "Log when buddies become _idle/un-idle"
 msgstr "莅医�絅遵�������(_I)"
 
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:1332
 msgid "Log when buddies go away/come _back"
 msgstr "莅医�絅遵���胼糸�/����(_B)"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:1334
 msgid "Log your _own signons/idleness/awayness"
 msgstr "莅医�����訓���糸��/����/胼糸�(_O)"
 
-#: src/gtkprefs.c:994
+#: src/gtkprefs.c:1336
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "筝堺�筝�ソ���糸�ュ��綮阪�������ュ���篁�(_N)"
 
-#: src/gtkprefs.c:1027
+#: src/gtkprefs.c:1369
 msgid "Sound Options"
 msgstr "紕育�渇��蕁�"
 
-#: src/gtkprefs.c:1028
+#: src/gtkprefs.c:1370
 msgid "_No sounds when you log in"
 msgstr "���糸�ユ�倶��紕�(_N)"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1372
 msgid "_Sounds while away"
 msgstr "胼糸��九�紕�(_S)"
 
-#: src/gtkprefs.c:1032
+#: src/gtkprefs.c:1376
 msgid "Sound Method"
 msgstr "紕育�恰�劫�"
 
-#: src/gtkprefs.c:1033
+#: src/gtkprefs.c:1377
 msgid "_Method"
 msgstr "�劫�(_M)"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1379
 msgid "Console beep"
 msgstr "�у�九伾����"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1381
 msgid "Automatic"
 msgstr "����"
 
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:1388
 msgid "Command"
 msgstr "�巡擦"
 
-#: src/gtkprefs.c:1054
+#: src/gtkprefs.c:1398
 #, c-format
 msgid ""
 "Sound c_ommand\n"
@@ -5641,67 +5624,67 @@
 "紕育�喝�巡擦(_O)\n"
 "(%s 篁h;��篁九��)"
 
-#: src/gtkprefs.c:1093
+#: src/gtkprefs.c:1440
 msgid "_Sending messages removes away status"
 msgstr "����羔���葦��羔�胼糸����倶��(_S)"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1442
 msgid "_Queue new messages when away"
 msgstr "胼糸��倶���井�����ラ����(_Q)"
 
-#: src/gtkprefs.c:1096
+#: src/gtkprefs.c:1445
 msgid "Auto-response"
 msgstr "������紊�"
 
-#: src/gtkprefs.c:1099
+#: src/gtkprefs.c:1448
 msgid "Seconds before _resending:"
 msgstr "������膈���腱���(_R)鐚�"
 
-#: src/gtkprefs.c:1101
-msgid "_Don't send auto-response"
-msgstr "筝�����������紊�(_D)"
-
-#: src/gtkprefs.c:1102
+#: src/gtkprefs.c:1451
+msgid "_Send auto-response"
+msgstr "����������紊�(_S)"
+
+#: src/gtkprefs.c:1453
 msgid "_Only send auto-response when idle"
 msgstr "篁��������≧�九���������紊�(_O)"
 
-#: src/gtkprefs.c:1103
-msgid "Do_n't send auto-response in active conversations"
-msgstr "筝������絲壕�筝㊤���������紊�(_N)"
-
-#: src/gtkprefs.c:1109
+#: src/gtkprefs.c:1455
+msgid "Send auto-response in active conversations"
+msgstr "�����絲壕�筝㊤���������紊�"
+
+#: src/gtkprefs.c:1462
 msgid "Idle _time reporting:"
 msgstr "���≧�狗�贋�ュ��(_T)鐚�"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1465
 msgid "Gaim usage"
 msgstr "Gaim 篏睡��"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1468
 msgid "X usage"
 msgstr "X 篏睡��"
 
-#: src/gtkprefs.c:1116
+#: src/gtkprefs.c:1470
 msgid "Windows usage"
 msgstr "腦��d戎��"
 
-#: src/gtkprefs.c:1123
+#: src/gtkprefs.c:1478
 msgid "Auto-away"
 msgstr "�����綣�"
 
-#: src/gtkprefs.c:1124
+#: src/gtkprefs.c:1479
 msgid "Set away _when idle"
 msgstr "���≦���活�臀��綣�(_W)"
 
-#: src/gtkprefs.c:1125
+#: src/gtkprefs.c:1481
 msgid "_Minutes before setting away:"
 msgstr "莅丞舟胼糸���膈�������(_M)鐚�"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1488
 msgid "Away m_essage:"
 msgstr "胼糸�羔���(_E)鐚�"
 
-#: src/gtkprefs.c:1188
+#: src/gtkprefs.c:1550
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5716,7 +5699,7 @@
 "<span weight=\"bold\">臀�腴�鐚�</span>\t\t%s\n"
 "<span weight=\"bold\">��篁九��鐚�</span>\t%s"
 
-#: src/gtkprefs.c:1193
+#: src/gtkprefs.c:1555
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5731,426 +5714,279 @@
 "<span weight=\"bold\">URL鐚�</span>  %s\n"
 "<span weight=\"bold\">��篁九��鐚�</span>  %s"
 
-#: src/gtkprefs.c:1368
+#: src/gtkprefs.c:1730
 msgid "Load"
 msgstr "茖���"
 
-#: src/gtkprefs.c:1375
+#: src/gtkprefs.c:1737
 msgid "Name"
 msgstr "��腱�"
 
-#: src/gtkprefs.c:1422
+#: src/gtkprefs.c:1784
 msgid "Details"
 msgstr "膸���"
 
-#: src/gtkprefs.c:1521
+#: src/gtkprefs.c:1899
 msgid "Sound Selection"
 msgstr "紕育�渇����"
 
-#: src/gtkprefs.c:1614
+#: src/gtkprefs.c:1993
 msgid "Play"
 msgstr "�㊥��"
 
-#: src/gtkprefs.c:1621
+#: src/gtkprefs.c:2000
 msgid "Event"
 msgstr "篋�篁�"
 
-#: src/gtkprefs.c:1641 src/multi.c:720
+#: src/gtkprefs.c:2020
 msgid "Reset"
 msgstr "��臀�"
 
-#: src/gtkprefs.c:1645
+#: src/gtkprefs.c:2024
 msgid "Choose..."
 msgstr "����..."
 
-#: src/gtkprefs.c:1769
+#: src/gtkprefs.c:2148
 msgid "_Edit"
 msgstr "膽�莨�(_E)"
 
-#: src/gtkprefs.c:1805
+#: src/gtkprefs.c:2184
 msgid "Interface"
 msgstr "����"
 
-#: src/gtkprefs.c:1806
+#: src/gtkprefs.c:2185
 msgid "Smiley Themes"
 msgstr "膃��娯源蘂�"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:2186
 msgid "Fonts"
 msgstr "絖�篏�"
 
-#: src/gtkprefs.c:1808
+#: src/gtkprefs.c:2187
 msgid "Message Text"
 msgstr "羔�������"
 
-#: src/gtkprefs.c:1809
+#: src/gtkprefs.c:2188
 msgid "Shortcuts"
 msgstr "綽��潔��"
 
-#: src/gtkprefs.c:1812
+#: src/gtkprefs.c:2191
 msgid "IMs"
 msgstr "�恰�倶���"
 
-#: src/gtkprefs.c:1814
-msgid "Tabs"
-msgstr "��膈�"
-
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:2193
 msgid "Proxy"
 msgstr "篁g��"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:1818
+#: src/gtkprefs.c:2196
 msgid "Browser"
 msgstr "羌頵���"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:2198
 msgid "Logging"
 msgstr "�ュ�"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:2199
 msgid "Sounds"
 msgstr "紕育��"
 
-#: src/gtkprefs.c:1822
+#: src/gtkprefs.c:2200
 msgid "Sound Events"
 msgstr "紕育�割�篁�"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:2201
 msgid "Away / Idle"
 msgstr "胼糸�/����"
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:2202
 msgid "Away Messages"
 msgstr "胼糸�羔���"
 
-#: src/gtkprefs.c:1827
+#: src/gtkprefs.c:2205
 msgid "Plugins"
 msgstr "��篁�"
 
-#: src/gtkprefs.c:1877 src/main.c:376 src/win32/systray.c:355
+#: src/gtkprefs.c:2255 src/main.c:383 src/win32/systray.c:355
 msgid "Preferences"
 msgstr "薤���蕁�"
 
-#: src/gtkutils.c:284
+#: src/gtkutils.c:285
 msgid "Can't save icon file to disk."
 msgstr "��羈�篆�絖� 0 絖������丈����篁吟��"
 
-#: src/gtkutils.c:319
+#: src/gtkutils.c:320
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 篆�絖��丈��"
 
-#: src/html.c:326
+#: src/html.c:322
 msgid "g003: Error opening connection.\n"
 msgstr "g003鐚���綣�菴��ュ�咲����\n"
 
-#: src/log.c:119
+#: src/log.c:35
+msgid "Error in specifying buddy conversation."
+msgstr "��絎�絅遵�絲壕��咲����"
+
+#: src/log.c:41
+msgid "Unable to find conversation log"
+msgstr "�鞘��医�莚��ュ�"
+
+#: src/log.c:128
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 篆�絖�絲壕�"
 
-#: src/log.c:160 src/log.c:181 src/log.c:194
+#: src/log.c:169 src/log.c:190 src/log.c:203
 #, c-format
 msgid "Unable to make directory %s for logging"
 msgstr "��羈�綮榊��ュ���� %s"
 
-#: src/log.c:248 src/log.c:264
+#: src/log.c:257 src/log.c:273
 #, c-format
 msgid "IM Sessions with %s\n"
 msgstr "筝� %s ���恰�倶����莚�\n"
 
-#: src/log.c:251 src/log.c:267
+#: src/log.c:260 src/log.c:276
 #, c-format
 msgid "IM Sessions with %s"
 msgstr "筝� %s ���恰�倶����莚�"
 
-#: src/log.c:298
+#: src/log.c:313
 #, c-format
 msgid "+++ %s (%s) signed on @ %s"
 msgstr "+++ %s (%s) �糸�ヤ� @ %s"
 
-#: src/log.c:303
+#: src/log.c:318
 #, c-format
 msgid "+++ %s (%s) signed off @ %s"
 msgstr "+++ %s (%s) �糸�坂� @ %s"
 
-#: src/log.c:308
+#: src/log.c:323
 #, c-format
 msgid "+++ %s (%s) changed away state @ %s"
 msgstr "+++ %s (%s) �贋�剛�胼糸��倶�� @ %s"
 
-#: src/log.c:313
+#: src/log.c:328
 #, c-format
 msgid "+++ %s (%s) came back @ %s"
 msgstr "+++ %s (%s) ���ヤ� @ %s"
 
-#: src/log.c:318
+#: src/log.c:333
 #, c-format
 msgid "+++ %s (%s) became idle @ %s"
 msgstr "+++ %s (%s) �∞��篋� @ %s"
 
-#: src/log.c:323
+#: src/log.c:338
 #, c-format
 msgid "+++ %s (%s) returned from idle @ %s"
 msgstr "+++ %s (%s) �♂��篋� @ %s"
 
-#: src/log.c:328
+#: src/log.c:343
 #, c-format
 msgid "+++ Program exit @ %s"
 msgstr "+++ 腮�綺���� @ %s"
 
-#: src/log.c:335
+#: src/log.c:350
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed on @ %s"
 msgstr "%s (%s) ���� %s (%s) �糸�ヤ� @ %s"
 
-#: src/log.c:340
+#: src/log.c:355
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed off @ %s"
 msgstr "%s (%s) �ュ�� %s (%s) �糸�坂� @ %s"
 
-#: src/log.c:345
+#: src/log.c:360
 #, c-format
 msgid "%s (%s) reported that %s (%s) went away @ %s"
 msgstr "%s (%s) �ュ�� %s (%s) 胼糸�篋� @ %s"
 
-#: src/log.c:350
+#: src/log.c:365
 #, c-format
 msgid "%s (%s) reported that %s (%s) came back @ %s"
 msgstr "%s (%s) �ュ�� %s (%s) ���ヤ� @ %s"
 
-#: src/log.c:355
+#: src/log.c:370
 #, c-format
 msgid "%s (%s) reported that %s (%s) became idle @ %s"
 msgstr "%s (%s) �ュ�� %s (%s) �∞��篋� @ %s"
 
-#: src/log.c:361
+#: src/log.c:376
 #, c-format
 msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
 msgstr "%s (%s) �ュ�� %s (%s) �♂��篋� @ %s"
 
-#: src/log.c:373
+#: src/log.c:388
 #, c-format
 msgid "%s (%s) reported that %s signed on @ %s"
 msgstr "%s (%s) �ュ�� %s �糸�ヤ� @ %s"
 
-#: src/log.c:378
+#: src/log.c:393
 #, c-format
 msgid "%s (%s) reported that %s signed off @ %s"
 msgstr "%s (%s) �ュ�� %s �糸�坂� @ %s"
 
-#: src/log.c:383
+#: src/log.c:398
 #, c-format
 msgid "%s (%s) reported that %s went away @ %s"
 msgstr "%s (%s) �ュ�� %s 胼糸�篋� @ %s"
 
-#: src/log.c:388
+#: src/log.c:403
 #, c-format
 msgid "%s (%s) reported that %s came back @ %s"
 msgstr "%s (%s) �ュ�� %s ���ヤ� @ %s"
 
-#: src/log.c:393
+#: src/log.c:408
 #, c-format
 msgid "%s (%s) reported that %s became idle @ %s"
 msgstr "%s (%s) �ュ�� %s �∞��篋� @ %s"
 
-#: src/log.c:399
+#: src/log.c:414
 #, c-format
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) �ュ�� %s �♂��篋� @ %s"
 
-#: src/main.c:185
+#: src/main.c:189
 msgid "Please enter your login."
 msgstr "莚決��ユ�����糸�����"
 
-#: src/main.c:274
+#: src/main.c:281
 msgid "<New User>"
 msgstr "<�亥����>"
 
-#: src/main.c:316
+#: src/main.c:323
 msgid "Login"
 msgstr "�糸��"
 
-#: src/main.c:332
+#: src/main.c:339
 msgid "Screen Name:"
 msgstr "���桁��鐚�"
 
 #. And now for the buttons
-#: src/main.c:366
+#: src/main.c:373
 msgid "Accounts"
 msgstr "茣���"
 
-#: src/main.c:382 src/win32/systray.c:191
+#: src/main.c:389 src/win32/systray.c:191
 msgid "Sign On"
 msgstr "�糸��"
 
-#: src/multi.c:265
-msgid "Screenname"
-msgstr "���桁��"
-
-#: src/multi.c:293
-msgid "Protocol"
-msgstr "�顒�"
-
-#: src/multi.c:657
-msgid "Load Buddy Icon"
-msgstr "茖��ュソ���丈��"
-
-#: src/multi.c:701
-msgid "Buddy Icon File:"
-msgstr "絅遵��丈����篁駈�"
-
-#: src/multi.c:747
-msgid "Login Options"
-msgstr "�糸�ラ��蕁�"
-
-#: src/multi.c:759
-msgid "Protocol:"
-msgstr "�顒��"
-
-#: src/multi.c:774
-msgid "Screenname:"
-msgstr "���桁��鐚�"
-
-#: src/multi.c:829
-msgid "Remember Password"
-msgstr "莅遺�絲���"
-
-#: src/multi.c:830
-msgid "Auto-Login"
-msgstr "�����糸��"
-
-#: src/multi.c:887
-msgid "User Options"
-msgstr "���潔��蕁�"
-
-#: src/multi.c:897
-msgid "New Mail Notifications"
-msgstr "�育��散����"
-
-#: src/multi.c:958
-#, c-format
-msgid "%s Options"
-msgstr "%s ��蕁�"
-
-#: src/multi.c:1002
-msgid "Register with server"
-msgstr "羈������≦��"
-
-#: src/multi.c:1035
-msgid "Proxy Options"
-msgstr "篁g����蕁�"
-
-#: src/multi.c:1049
-msgid "Proxy _Type"
-msgstr "篁g��膠糸��(_T)"
-
-#: src/multi.c:1058
-msgid "Use Global Proxy Settings"
-msgstr "篏睡�����篁g��莅丞舟"
-
-#: src/multi.c:1067
-msgid "No Proxy"
-msgstr "��篁g��"
-
-#: src/multi.c:1119
-msgid "_Host:"
-msgstr "筝紙��(_H)鐚�"
-
-#: src/multi.c:1155
-msgid "_User:"
-msgstr "���桁��(_U)鐚�"
-
-#: src/multi.c:1171
-msgid "Pa_ssword:"
-msgstr "絲���(_S)鐚�"
-
-#: src/multi.c:1245
-msgid "Modify Account"
-msgstr "篆��壕侃��"
-
-#: src/multi.c:1264
-msgid "Show more options"
-msgstr "�丞ず������蕁�"
-
-#: src/multi.c:1264
-msgid "Show fewer options"
-msgstr "�丞ず筝肢���蕁�"
-
-#: src/multi.c:1375
-msgid "_Login"
-msgstr "�糸��(_L)"
-
-#: src/multi.c:1393
-#, c-format
-msgid ""
-"Please enter your password for %s.\n"
-"\n"
-msgstr ""
-"莚決��ユ���筝� %s ��絲�����\n"
-"\n"
-
-#: src/multi.c:1404
-msgid "_Password"
-msgstr "絲���(_P)"
-
-#: src/multi.c:1456
-msgid "TOC not found."
-msgstr "TOC ���上�違��"
-
-#: src/multi.c:1457
-msgid ""
-"You have attempted to login an IM account using the TOC protocol.  Because "
-"this protocol is inferior to OSCAR, it is now compiled as a plugin by "
-"default. To login, edit this account to use OSCAR or load the TOC plugin."
-msgstr ""
-"����鞘戎�� TOC �顒��糸�ュ�恰�狗��莅�侃�激���延�罩ゅ�顒����篋� OSCAR鐚���篁ヨ��顒�ー���"
-"莅よ←膽�莚�筝堺�篁吟��絋���荀��糸�ョ��莚�鐚�莚欠�莨�罩よ侃�隙戎�� OSCAR ����茖��� TOC ��篁吟��"
-
-#: src/multi.c:1465
-msgid "Protocol not found."
-msgstr "�顒����上�違��"
-
-#: src/multi.c:1466
-msgid ""
-"You cannot log this account in; you do not have the protocol it uses loaded, "
-"or the protocol does not have a login function."
-msgstr ""
-"����羈��糸�ユ④茣��件���押��茖��ヨ�茣��傑��篏睡�����顒������莚ュ�顒����箴��糸����純��"
-
-#: src/multi.c:1546
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "�������活����� %s ��鐚�"
-
-#: src/multi.c:1547
-msgid "Delete"
-msgstr "����"
-
-#: src/multi.c:1576
-msgid "Account Editor"
-msgstr "茣��欠�莨���"
-
-#: src/multi.c:1615
-msgid "_Modify"
-msgstr "篆���(_M)"
-
-#: src/multi.c:1665
+#: src/multi.c:91
 msgid "Done."
 msgstr "絎�����"
 
-#: src/multi.c:1901
+#: src/multi.c:167
 msgid "Signon: "
 msgstr "�糸�ワ�"
 
-#: src/multi.c:1960
+#: src/multi.c:225
 msgid "Signon"
 msgstr "�糸��"
 
-#: src/multi.c:1972
+#: src/multi.c:237
 msgid "Cancel All"
 msgstr "�����羔�"
 
-#: src/multi.c:2027
+#: src/multi.c:292
 #, c-format
 msgid ""
 "%s\n"
@@ -6159,66 +5995,38 @@
 "%s\n"
 "%s鐚�%s"
 
-#: src/multi.c:2048
+#: src/multi.c:314
 #, c-format
 msgid "%s was unable to sign on"
 msgstr "%s ��羈��糸��"
 
-#: src/multi.c:2049
+#: src/multi.c:316
 msgid "Signon Error"
 msgstr "�糸�ュ�咲��"
 
-#: src/multi.c:2060
+#: src/multi.c:329
 msgid "Notice"
 msgstr "羈���"
 
-#: src/multi.c:2072
+#: src/multi.c:343
 #, c-format
 msgid "%s has been signed off"
 msgstr "%s 綏牙��糸��"
 
-#: src/multi.c:2073
+#: src/multi.c:345
 msgid "Connection Error"
 msgstr "菴��ラ��莚�"
 
-#: src/prpl.c:225
+#: src/prpl.c:108
 msgid "No actions available"
 msgstr "羃≧����������篏�"
 
-#: src/prpl.c:375
-#, c-format
-msgid "%s has mail from %s: %s"
-msgstr "%s �九�遺� %s ���榊����散鐚�%s"
-
-#: src/prpl.c:375
-msgid "No Subject"
-msgstr "��筝脂�"
-
-#: src/prpl.c:377
-#, c-format
-msgid "%s has new mail."
-msgstr "%s ���育��散��"
-
-#: src/prpl.c:380
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s �� %d 絨��育��散��"
-
-#: src/prpl.c:396
-msgid "Gaim - New Mail"
-msgstr "Gaim - �育��散"
-
-#: src/prpl.c:415
-msgid "Open Mail"
-msgstr "��綣���散"
-
-#: src/prpl.c:617
+#: src/prpl.c:394
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 綏牙�絨� %s ��筝阪ソ��%s%s%s"
 
-#: src/prpl.c:625
+#: src/prpl.c:406
 msgid ""
 "\n"
 "\n"
@@ -6228,56 +6036,56 @@
 "\n"
 "�������活�絨�篁�/絅号兄��筝堺����絅遵�鐚�"
 
-#: src/prpl.c:628
+#: src/prpl.c:409
 msgid "Gaim - Information"
 msgstr "Gaim - 篆≧��"
 
-#: src/prpl.c:631
-msgid "Gaim - Confirm"
-msgstr "Gaim - 隋��"
-
-#: src/prpl.c:673
+#: src/prpl.c:412
+msgid "Add buddy to your list?"
+msgstr "絨����桁��筝阪ソ����鐚�"
+
+#: src/prpl.c:456
 msgid ""
 "You do not currently have any protocols available that are able to register "
 "new accounts."
 msgstr "������羃≧����札羈����域侃�欠���顒���"
 
-#: src/prpl.c:710
+#: src/prpl.c:493
 msgid "Gaim - Registration"
 msgstr "Gaim - 羈���"
 
-#: src/prpl.c:723
+#: src/prpl.c:506
 msgid "Registration Information"
 msgstr "羈���篆≧��"
 
-#: src/prpl.c:737
+#: src/prpl.c:520
 msgid "Register"
 msgstr "羈���"
 
-#: src/server.c:56
+#: src/server.c:57
 msgid "Please enter your password"
 msgstr "莚決��ユ����絲���"
 
-#: src/server.c:882
+#: src/server.c:884
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d �≧���)"
 
-#: src/server.c:894
+#: src/server.c:896
 msgid "(1 message)"
 msgstr "(1 �≧���)"
 
-#: src/server.c:1074 src/server.c:1081
+#: src/server.c:1094 src/server.c:1104
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ヤ���"
 
-#: src/server.c:1097 src/server.c:1104
+#: src/server.c:1122 src/server.c:1130
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�坂���"
 
-#: src/server.c:1138
+#: src/server.c:1164
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6286,11 +6094,11 @@
 "%s ����茴� %s 茘�����\n"
 "���亥��茘���膾у���� %d%%"
 
-#: src/server.c:1141
+#: src/server.c:1167
 msgid "an anonymous person"
 msgstr "����羂�"
 
-#: src/server.c:1229
+#: src/server.c:1257
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6299,98 +6107,106 @@
 "���撃��%s����莚� %s ���ュソ����紊��鐚���%s��\n"
 "%s"
 
-#: src/server.c:1233
+#: src/server.c:1261
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "���撃��%s����莚� %s ���ュソ����紊��鐚���%s��\n"
 
-#: src/server.c:1239
-msgid "Buddy Chat Invite"
-msgstr "絅遵���紊���莚�"
-
-#: src/server.c:1408
+#: src/server.c:1267
+msgid "Accept chat invitation?"
+msgstr "�ュ���紊���莚桁��鐚�"
+
+#: src/server.c:1440
 msgid "Gaim - Popup"
 msgstr "Gaim - 綣劫�榊���"
 
-#: src/server.c:1435
+#: src/server.c:1467
 msgid "More Info"
 msgstr "�翫�篆≧��"
 
-#: src/sound.c:79
+#: src/sound.c:80
 msgid "Buddy logs in"
 msgstr "絅遵��糸��"
 
-#: src/sound.c:80
+#: src/sound.c:81
 msgid "Buddy logs out"
 msgstr "絅遵��糸��"
 
-#: src/sound.c:81
+#: src/sound.c:82
 msgid "Message received"
 msgstr "羔���群�九��"
 
-#: src/sound.c:82
+#: src/sound.c:83
 msgid "Message received begins conversation"
 msgstr "�九�亥��羔����紮�絲壕�"
 
-#: src/sound.c:83
+#: src/sound.c:84
 msgid "Message sent"
 msgstr "羔���群����"
 
-#: src/sound.c:84
+#: src/sound.c:85
 msgid "Person enters chat"
 msgstr "��篋肴��ヨ��紊�"
 
-#: src/sound.c:85
-msgid "Person leaves chat"
-msgstr "��篋榊�綣���紊�"
-
 #: src/sound.c:86
+msgid "Person leaves chat"
+msgstr "��篋榊�綣���紊�"
+
+#: src/sound.c:87
 msgid "You talk in chat"
 msgstr "������紊�賢��荐�"
 
-#: src/sound.c:87
+#: src/sound.c:88
 msgid "Others talk in chat"
 msgstr "��査����紊�賢��荐�"
 
-#: src/sound.c:90
+#: src/sound.c:91
 msgid "Someone says your name in chat"
 msgstr "��査����紊�賢���井������絖�"
 
-#: src/sound.c:184
+#: src/sound.c:188
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "��羈��㊥�上0�鰹���������������篁�(%s)筝�絖�����"
 
-#: src/sound.c:197
+#: src/sound.c:204
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "��羈��㊥�上0�鰹���������������巡擦��紕育�恰�号�鐚�篏�羃≧��莅丞舟�巡擦��"
 
-#: src/sound.c:206
+#: src/sound.c:213
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr "��羈��㊥�上0�鰹���������臀���羈�莪�����臀���紕育�喝�巡擦鐚�%s"
 
-#: src/util.c:109 src/util.c:114 src/util.c:119 src/util.c:122
+#: src/stock.c:88
+msgid "_Modify"
+msgstr "篆���(_M)"
+
+#: src/stock.c:89
+msgid "_Open Mail"
+msgstr "��綣���散(_O)"
+
+#: src/util.c:110 src/util.c:115 src/util.c:120 src/util.c:123
 msgid "day"
 msgid_plural "days"
 msgstr[0] "紊�"
 
-#: src/util.c:110 src/util.c:114 src/util.c:128 src/util.c:130
+#: src/util.c:111 src/util.c:115 src/util.c:129 src/util.c:131
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "絨��"
 
-#: src/util.c:110 src/util.c:119 src/util.c:128 src/util.c:133
+#: src/util.c:111 src/util.c:120 src/util.c:129 src/util.c:134
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "��"
 
 #. full help text
-#: src/util.c:710
+#: src/util.c:726
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6422,24 +6238,24 @@
 "  -h, --help          �憟ず絽���攻����\n"
 
 #. short message
-#: src/util.c:725
+#: src/util.c:741
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s��莚�莚���%s -h���ョ��絽�����\n"
 
-#: src/util.c:1013
+#: src/util.c:1037
 msgid "Not connected to AIM"
 msgstr "����ュ�� AIM"
 
-#: src/util.c:1022 src/util.c:1061
+#: src/util.c:1046 src/util.c:1085
 msgid "No screenname given."
 msgstr "羃≧��膸��榊���桁����"
 
-#: src/util.c:1098
+#: src/util.c:1122
 msgid "No roomname given."
 msgstr "羃≧��膸��肴��紊������"
 
-#: src/util.c:1117
+#: src/util.c:1141
 msgid "Invalid AIM URI"
 msgstr "������ AIM URI"
 
@@ -6474,12 +6290,12 @@
 msgid "Exit"
 msgstr "����"
 
-#: src/plugin.c:231
+#: src/plugin.c:232
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
 msgstr "��篁� %s �����篁私���������篁銀拭��"
 
-#: src/plugin.c:236
+#: src/plugin.c:237
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ��羈�茖��ユ������篁吟��"
 
@@ -6488,14 +6304,170 @@
 msgid "Custom"
 msgstr "���箙�"
 
-#: src/gtkdebug.c:94
+#: src/gtkdebug.c:111
 msgid "Debug Window"
 msgstr "莪�莚�腦���"
 
-#: src/gtkdebug.c:130
+#: src/gtkdebug.c:150
 msgid "Pause"
 msgstr "����"
 
-#: src/gtkdebug.c:136
+#: src/gtkdebug.c:156
 msgid "Timestamps"
 msgstr "�狗�贋��"
+
+#~ msgid "Unable to Save Preferences"
+#~ msgstr "��羈�篆�絖�薤���蕁�"
+
+#~ msgid ""
+#~ "Gaim was unable to save your preferences. Please verify that you have "
+#~ "enough free space."
+#~ msgstr "Gaim ��羈�篆�絖�����薤���蕁鴻��莚傑��ユ��������莇喝������腥咲�眼��"
+
+#~ msgid "Hide buddy _icons"
+#~ msgstr "���鎁遵��丈��(_I)"
+
+#~ msgid "IM Tabs"
+#~ msgstr "�恰�倶�����膈�"
+
+#~ msgid "Tab _placement:"
+#~ msgstr "��膈鞘�臀�(_P)鐚�"
+
+#~ msgid "Top"
+#~ msgstr "筝�"
+
+#~ msgid "Bottom"
+#~ msgstr "筝�"
+
+#~ msgid "Left"
+#~ msgstr "綏�"
+
+#~ msgid "Right"
+#~ msgstr "��"
+
+#~ msgid ""
+#~ "Show all _instant messages in one tabbed\n"
+#~ "window"
+#~ msgstr "���筝���膈上�腦��e���丞ず�����恰�倶���(_I)"
+
+#~ msgid "Chat Tabs"
+#~ msgstr "��紊���膈�"
+
+#~ msgid "Show all c_hats in one tabbed window"
+#~ msgstr "���筝���膈丞��e���丞ず������紊�(_H)"
+
+#~ msgid "Tabs"
+#~ msgstr "��膈�"
+
+#~ msgid "Screenname"
+#~ msgstr "���桁��"
+
+#~ msgid "Protocol"
+#~ msgstr "�顒�"
+
+#~ msgid "Load Buddy Icon"
+#~ msgstr "茖��ュソ���丈��"
+
+#~ msgid "Buddy Icon File:"
+#~ msgstr "絅遵��丈����篁駈�"
+
+#~ msgid "Login Options"
+#~ msgstr "�糸�ラ��蕁�"
+
+#~ msgid "Protocol:"
+#~ msgstr "�顒��"
+
+#~ msgid "Screenname:"
+#~ msgstr "���桁��鐚�"
+
+#~ msgid "Remember Password"
+#~ msgstr "莅遺�絲���"
+
+#~ msgid "Auto-Login"
+#~ msgstr "�����糸��"
+
+#~ msgid "User Options"
+#~ msgstr "���潔��蕁�"
+
+#~ msgid "New Mail Notifications"
+#~ msgstr "�育��散����"
+
+#~ msgid "%s Options"
+#~ msgstr "%s ��蕁�"
+
+#~ msgid "Register with server"
+#~ msgstr "羈������≦��"
+
+#~ msgid "Proxy Options"
+#~ msgstr "篁g����蕁�"
+
+#~ msgid "Proxy _Type"
+#~ msgstr "篁g��膠糸��(_T)"
+
+#~ msgid "Use Global Proxy Settings"
+#~ msgstr "篏睡�����篁g��莅丞舟"
+
+#~ msgid "No Proxy"
+#~ msgstr "��篁g��"
+
+#~ msgid "_Host:"
+#~ msgstr "筝紙��(_H)鐚�"
+
+#~ msgid "_User:"
+#~ msgstr "���桁��(_U)鐚�"
+
+#~ msgid "Pa_ssword:"
+#~ msgstr "絲���(_S)鐚�"
+
+#~ msgid "Modify Account"
+#~ msgstr "篆��壕侃��"
+
+#~ msgid "Show more options"
+#~ msgstr "�丞ず������蕁�"
+
+#~ msgid "Show fewer options"
+#~ msgstr "�丞ず筝肢���蕁�"
+
+#~ msgid "_Login"
+#~ msgstr "�糸��(_L)"
+
+#~ msgid ""
+#~ "Please enter your password for %s.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "莚決��ユ���筝� %s ��絲�����\n"
+#~ "\n"
+
+#~ msgid "_Password"
+#~ msgstr "絲���(_P)"
+
+#~ msgid "TOC not found."
+#~ msgstr "TOC ���上�違��"
+
+#~ msgid ""
+#~ "You have attempted to login an IM account using the TOC protocol.  "
+#~ "Because this protocol is inferior to OSCAR, it is now compiled as a "
+#~ "plugin by default. To login, edit this account to use OSCAR or load the "
+#~ "TOC plugin."
+#~ msgstr ""
+#~ "����鞘戎�� TOC �顒��糸�ュ�恰�狗��莅�侃�激���延�罩ゅ�顒����篋� OSCAR鐚���篁ヨ��顒�ー"
+#~ "���莅よ←膽�莚�筝堺�篁吟��絋���荀��糸�ョ��莚�鐚�莚欠�莨�罩よ侃�隙戎�� OSCAR ����茖��� TOC ��"
+#~ "篁吟��"
+
+#~ msgid "Protocol not found."
+#~ msgstr "�顒����上�違��"
+
+#~ msgid ""
+#~ "You cannot log this account in; you do not have the protocol it uses "
+#~ "loaded, or the protocol does not have a login function."
+#~ msgstr ""
+#~ "����羈��糸�ユ④茣��件���押��茖��ヨ�茣��傑��篏睡�����顒������莚ュ�顒����箴��糸����純��"
+
+#~ msgid "Are you sure you want to delete %s?"
+#~ msgstr "�������活����� %s ��鐚�"
+
+#~ msgid "Delete"
+#~ msgstr "����"
+
+#~ msgid "Account Editor"
+#~ msgstr "茣��欠�莨���"