changeset 6345:f637c4271a53

[gaim-migrate @ 6844] updated .po files committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 31 Jul 2003 14:35:01 +0000 (2003-07-31)
parents f63da9023c99
children bcd205870559
files po/zh_CN.po po/zh_TW.po
diffstat 2 files changed, 2497 insertions(+), 2424 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_CN.po	Thu Jul 31 01:57:19 2003 +0000
+++ b/po/zh_CN.po	Thu Jul 31 14:35:01 2003 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-07-17 18:51-0400\n"
-"PO-Revision-Date: 2003-07-04 14:37+0800\n"
+"POT-Creation-Date: 2003-07-31 12:18+0800\n"
+"PO-Revision-Date: 2003-07-31 12:24+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -15,65 +15,65 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/docklet/docklet.c:111 src/gtkaccount.c:440 src/gtkaccount.c:1588
+#: plugins/docklet/docklet.c:112 src/gtkaccount.c:441 src/gtkaccount.c:1589
 msgid "Auto-login"
 msgstr "�����糸�"
 
-#: plugins/docklet/docklet.c:114
+#: plugins/docklet/docklet.c:115
 msgid "New Message.."
 msgstr "�井���..."
 
-#: plugins/docklet/docklet.c:115
+#: plugins/docklet/docklet.c:116
 msgid "Join A Chat..."
 msgstr "���ヨ��紊�..."
 
-#: plugins/docklet/docklet.c:146
+#: plugins/docklet/docklet.c:147
 msgid "New..."
 msgstr "�医産..."
 
-#: plugins/docklet/docklet.c:150 src/gtkblist.c:1590 src/gtkpounce.c:460
-#: src/gtkprefs.c:1504 src/protocols/gg/gg.c:54 src/protocols/irc/irc.c:1021
+#: plugins/docklet/docklet.c:151 src/protocols/gg/gg.c:54
 #: src/protocols/jabber/jabber.c:1176 src/protocols/jabber/jabber.c:3437
-#: src/protocols/jabber/jabber.c:3491 src/protocols/oscar/oscar.c:2825
-#: src/protocols/oscar/oscar.c:4548 src/protocols/oscar/oscar.c:5449
-#: src/protocols/oscar/oscar.c:5843
+#: src/protocols/jabber/jabber.c:3491 src/protocols/oscar/oscar.c:2836
+#: src/protocols/oscar/oscar.c:4578 src/protocols/oscar/oscar.c:5481
+#: src/protocols/oscar/oscar.c:5875 src/gtkblist.c:1591 src/gtkpounce.c:460
+#: src/gtkprefs.c:1504
 msgid "Away"
 msgstr "胼糸�"
 
-#: plugins/docklet/docklet.c:156 src/away.c:531
+#: plugins/docklet/docklet.c:157 src/away.c:524
 msgid "Back"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:164
+#: plugins/docklet/docklet.c:165
 msgid "Mute Sounds"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:169 src/gtkft.c:557
+#: plugins/docklet/docklet.c:170 src/gtkft.c:559
 msgid "File Transfers"
 msgstr "��篁銀���"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:170 src/gtkaccount.c:1739 src/main.c:325
+#: plugins/docklet/docklet.c:171 src/gtkaccount.c:1740 src/main.c:320
 msgid "Accounts"
 msgstr "茣���"
 
-#: plugins/docklet/docklet.c:171 src/gtkprefs.c:2356 src/main.c:335
+#: plugins/docklet/docklet.c:172 src/gtkprefs.c:2356 src/main.c:330
 msgid "Preferences"
 msgstr "薤���蕁�"
 
-#: plugins/docklet/docklet.c:180
+#: plugins/docklet/docklet.c:181
 msgid "Signoff"
 msgstr "�糸��"
 
-#: plugins/docklet/docklet.c:184
+#: plugins/docklet/docklet.c:185
 msgid "Quit"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:413
+#: plugins/docklet/docklet.c:466
 msgid "Tray Icon Configuration"
 msgstr "�����丈����臀�"
 
-#: plugins/docklet/docklet.c:417
+#: plugins/docklet/docklet.c:470
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "�翫�亥�劫�紙�����丈�����丞ず�井���(_H)"
 
@@ -84,30 +84,43 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:441
+#: plugins/docklet/docklet.c:494
 msgid "System Tray Icon"
 msgstr "膤紫������丈��"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:444
+#: plugins/docklet/docklet.c:497
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "��鎧膸�����筝㊥�丞ず Gaim ���丈����"
 
 #. *  description
-#: plugins/docklet/docklet.c:446
-#, fuzzy
+#: plugins/docklet/docklet.c:499
 msgid ""
-"Interacts with a Notification Area applet (in GNOME, KDE or Windows for "
-"example) to display the current status of Gaim, allow fast access to "
-"commonly used functions, and to toggle display of the buddy list or login "
-"window. Also allows messages to be queued until the icon is clicked, similar "
-"to ICQ."
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
 msgstr ""
-"筝����ュ�榊�綺�(箴�絋� GNOME �� KDE)篋や���札�丞ず Gaim ��綵����倶��鐚�綽���莅翠��幻������"
-"�緒�篁ュ����√ソ����茵����糸�腦��g���丞ず�����駈�筝� ICQ 膠私室鐚�菴���札絨�羔�����ラ��"
-"����"
+"��鎧膸���������(絋� GNOME鐚�KDE �� Windows)�丞ず筝�筝��丈��鐚�茵�ず Gaim ��綵����倶��鐚�"
+"綛九��莅後辱��莅翠��幻�������緒�篁ュ����√ソ����茵����糸�腦��g���丞ず�����駈�筝� ICQ 膠�"
+"篌種�菴���札絨�羔�����ラ������"
+
+#.
+#. *  DEFINES, MACROS & DATA TYPES
+#.
+#: plugins/docklet/docklet-win32.c:44
+msgid "Gaim"
+msgstr "Gaim"
+
+#: plugins/docklet/docklet-win32.c:45
+msgid "Gaim - Signed off"
+msgstr "Gaim - 綏牙�糸��"
+
+#: plugins/docklet/docklet-win32.c:46
+msgid "Gaim - Away"
+msgstr "Gaim - 胼糸�"
 
 #. *< api_version
 #. *< type
@@ -127,20 +140,20 @@
 msgid "When you are kicked offline, this reconnects you."
 msgstr "絋�����←荼√�堺�ヤ�鐚�腮�綺鎞�篌��������域��ャ��"
 
-#: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
+#: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
 msgid "Mail Server"
 msgstr "��散���≦��"
 
-#: plugins/chkmail.c:131
+#: plugins/chkmail.c:132
 #, c-format
 msgid "%s (%d new/%d total)"
 msgstr "%s (%d 絨��育��散/�� %d 絨�)"
 
-#: plugins/chkmail.c:203
+#: plugins/chkmail.c:195
 msgid "Check Mail"
 msgstr "罍��ラ��散"
 
-#: plugins/chkmail.c:207
+#: plugins/chkmail.c:199
 msgid "Check email every X seconds.\n"
 msgstr "罸�� X 霡�罍��ラ��散��\n"
 
@@ -272,7 +285,7 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "���綣����絅遵���茵���絲壕��遵�筝阪�丈����"
 
-#: plugins/idle.c:70 src/protocols/irc/irc.c:936
+#: plugins/idle.c:70
 msgid "Idle Time"
 msgstr "���≧�狗��"
 
@@ -300,90 +313,69 @@
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "��莅御��������臀����>�紊��炊�狗��"
 
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/mailchk.c:149
+#: plugins/mailchk.c:152
 msgid "Mail Checker"
 msgstr "��散罍��ュ��"
 
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/mailchk.c:152 plugins/mailchk.c:154
+#: plugins/mailchk.c:154 plugins/mailchk.c:155
 msgid "Checks for new local mail."
 msgstr "罍��ユ�亥�����育��散��"
 
-#: plugins/notify.c:442
-msgid "Unable to write to config file"
-msgstr "��羈����ラ��臀���篁�"
-
-#: plugins/notify.c:443
-msgid "Notify plugin"
-msgstr "���ユ�篁�"
-
-#: plugins/notify.c:573
+#. ---------- "Notify For" ----------
+#: plugins/notify.c:701
 msgid "Notify For"
 msgstr "����"
 
-#: plugins/notify.c:574
+#: plugins/notify.c:705
 msgid "_IM windows"
 msgstr "�恰�倶������(_I)"
 
-#: plugins/notify.c:579
+#: plugins/notify.c:710
 msgid "_Chat windows"
 msgstr "��紊����(_C)"
 
-#. --------------
-#: plugins/notify.c:585
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:716
 msgid "Notification Methods"
 msgstr "���ユ�劫�"
 
-#: plugins/notify.c:588
-msgid "Prepend _string into window title (hit enter to save):"
-msgstr "����f��蘂���菴遵��絖�膃�顕(����莉��絖�)(_S)鐚�"
-
-#: plugins/notify.c:599
+#: plugins/notify.c:722
+msgid "Prepend _string into window title:"
+msgstr "����f��蘂���菴遵��絖�膃�顕(_S)鐚�"
+
+#: plugins/notify.c:733
 msgid "_Quote window title"
 msgstr "綣�����f��蘂�(_Q)"
 
-#: plugins/notify.c:604
+#: plugins/notify.c:738
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "莅丞舟腦��g�������膣ф�モ����腓�(_U)"
 
-#: plugins/notify.c:609
+#: plugins/notify.c:743
 msgid "Insert c_ount of new messages into window title"
 msgstr "����f��蘂�筝㊥��ユ�井�����(_O)"
 
-#: plugins/notify.c:614
+#: plugins/notify.c:748
 msgid "_Notify even if conversation is in focus"
 msgstr "�割戎罩e�篋��莚�筝℡�����(_N)"
 
-#. --------------
-#: plugins/notify.c:620
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:754
 msgid "Notification Removal"
 msgstr "���ュ����"
 
-#: plugins/notify.c:621
+#: plugins/notify.c:758
 msgid "Remove when conversation window gains _focus"
 msgstr "絲壕�腦��hキ緇����劫���喝����(_F)"
 
-#: plugins/notify.c:626
+#: plugins/notify.c:763
 msgid "Remove when conversation window _receives click"
 msgstr "���糸�莚�腦��e���喝����(_R)"
 
-#: plugins/notify.c:631
+#: plugins/notify.c:768
 msgid "Remove when _typing in conversation window"
 msgstr "���莚�腦��d賢��絖����喝����(_T)"
 
-#: plugins/notify.c:636
-msgid "Appl_y"
-msgstr "綺���(_Y)"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -391,14 +383,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:699
+#: plugins/notify.c:845
 msgid "Message Notification"
 msgstr "��散����"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:702 plugins/notify.c:704
+#: plugins/notify.c:848 plugins/notify.c:850
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "��箴���腱��号����ユ���������散��"
 
@@ -684,7 +676,7 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim �劫�����蕁鴻��"
 
-#: plugins/perl/perl.c:405
+#: plugins/perl/perl.c:410
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr "GAIM::register 莪�����遺�絲鴻��莚桁��� PERL-HOWTO��"
 
@@ -695,13 +687,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1392
+#: plugins/perl/perl.c:1397
 msgid "Perl Plugin Loader"
 msgstr "Perl ��篁区��ュ��"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1394 plugins/perl/perl.c:1395
+#: plugins/perl/perl.c:1399 plugins/perl/perl.c:1400
 msgid "Provides support for loading perl plugins."
 msgstr "��箴�茖��� Perl ��篁句��������"
 
@@ -726,7 +718,7 @@
 msgstr "絅遵�胼糸�/菴���������/�♂���九���莚�腦��g��咲���ャ��"
 
 #: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1184
-#: src/protocols/msn/msn.c:336 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:337 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:1257
 #: src/protocols/yahoo/yahoo.c:1336
@@ -742,9 +734,9 @@
 msgstr "���絅遵�胼糸�"
 
 #: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3440
-#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2829
-#: src/protocols/oscar/oscar.c:4536 src/protocols/oscar/oscar.c:4563
-#: src/protocols/oscar/oscar.c:5848 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2840
+#: src/protocols/oscar/oscar.c:4566 src/protocols/oscar/oscar.c:4593
+#: src/protocols/oscar/oscar.c:5880 src/protocols/yahoo/yahoo.c:1071
 #: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1346
 msgid "Invisible"
 msgstr "��荳�"
@@ -798,7 +790,8 @@
 msgid "Unable to read socket"
 msgstr "��羈�莚糸�絅��ュ�"
 
-#: src/protocols/gg/gg.c:402
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: src/protocols/gg/gg.c:402 src/protocols/toc/toc.c:207
 msgid "Unable to connect."
 msgstr "��羈�菴��ャ��"
 
@@ -823,6 +816,7 @@
 msgstr "GG 綺����渇����莚�\n"
 
 #: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/toc/toc.c:183
 #, c-format
 msgid "Connect to %s failed"
 msgstr "菴��ュ�� %s 紊沿乾"
@@ -862,11 +856,11 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:168 src/protocols/gg/gg.c:664 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:186 src/request.h:804
 msgid "Yes"
 msgstr "��"
 
-#: src/gtkrequest.c:169 src/protocols/gg/gg.c:664 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:187 src/request.h:804
 msgid "No"
 msgstr "��"
 
@@ -896,8 +890,8 @@
 msgstr "�у��"
 
 #. City
-#: src/dialogs.c:2035 src/dialogs.c:2684 src/protocols/gg/gg.c:705
-#: src/protocols/trepia/trepia.c:364
+#: src/protocols/gg/gg.c:705 src/protocols/trepia/trepia.c:364
+#: src/dialogs.c:1976 src/dialogs.c:2602
 msgid "City"
 msgstr "���"
 
@@ -993,9 +987,9 @@
 msgid "Directory Search"
 msgstr "�����膣�"
 
-#: src/dialogs.c:2146 src/dialogs.c:2155 src/protocols/gg/gg.c:1195
-#: src/protocols/jabber/jabber.c:4322 src/protocols/oscar/oscar.c:6112
-#: src/protocols/toc/toc.c:1474
+#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4344
+#: src/protocols/oscar/oscar.c:6144 src/protocols/toc/toc.c:1488
+#: src/dialogs.c:2087 src/dialogs.c:2096
 msgid "Change Password"
 msgstr "�贋�劫���"
 
@@ -1040,28 +1034,28 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim 筝� ICQ ���≦����莅���莚���"
 
-#: src/dialogs.c:2452 src/gtkconv.c:1112 src/gtkconv.c:2963 src/gtkconv.c:4123
-#: src/gtkrequest.c:175 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2673 src/prpl.c:312
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2684
+#: src/dialogs.c:866 src/gtkconv.c:1114 src/gtkconv.c:2965 src/gtkconv.c:4126
+#: src/gtkrequest.c:193 src/prpl.c:312
 msgid "Add"
 msgstr "羞糸��"
 
 #. Cancel button.
-#: src/buddy_chat.c:375 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
-#: src/dialogs.c:2092 src/dialogs.c:2207 src/dialogs.c:2273 src/dialogs.c:2441
-#: src/dialogs.c:2626 src/dialogs.c:2775 src/dialogs.c:3447 src/dialogs.c:3941
-#: src/dialogs.c:4883 src/gtkaccount.c:1477 src/gtkconn.c:146
-#: src/gtkrequest.c:171 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/irc/irc.c:1105 src/protocols/irc/irc.c:1434
-#: 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/msn/msn.c:217 src/protocols/oscar/oscar.c:2404
-#: src/protocols/oscar/oscar.c:2441 src/protocols/oscar/oscar.c:2476
-#: src/protocols/oscar/oscar.c:2521 src/protocols/oscar/oscar.c:5721
-#: src/protocols/oscar/oscar.c:5936 src/protocols/oscar/oscar.c:5985
-#: src/protocols/oscar/oscar.c:6045 src/protocols/trepia/trepia.c:380
-#: src/protocols/yahoo/yahoo.c:1188 src/prpl.c:313 src/request.h:813
-#: src/request.h:823
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4126
+#: 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/msn/msn.c:218 src/protocols/oscar/oscar.c:2415
+#: src/protocols/oscar/oscar.c:2452 src/protocols/oscar/oscar.c:2487
+#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:5753
+#: src/protocols/oscar/oscar.c:5968 src/protocols/oscar/oscar.c:6017
+#: src/protocols/oscar/oscar.c:6077 src/protocols/trepia/trepia.c:380
+#: src/protocols/yahoo/yahoo.c:1188 src/buddy_chat.c:375 src/connection.c:141
+#: src/dialogs.c:453 src/dialogs.c:465 src/dialogs.c:478 src/dialogs.c:867
+#: src/dialogs.c:2033 src/dialogs.c:2148 src/dialogs.c:2214 src/dialogs.c:2378
+#: src/dialogs.c:2391 src/dialogs.c:2544 src/dialogs.c:2693 src/dialogs.c:3365
+#: src/dialogs.c:3532 src/dialogs.c:3574 src/dialogs.c:3711 src/dialogs.c:4048
+#: src/gtkaccount.c:1478 src/gtkconn.c:147 src/gtkrequest.c:189 src/prpl.c:313
+#: src/request.h:813 src/request.h:823
 msgid "Cancel"
 msgstr "��羔�"
 
@@ -1072,14 +1066,13 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1716
 #: src/protocols/msn/notification.c:466 src/protocols/msn/notification.c:747
-#: src/protocols/oscar/oscar.c:2601 src/protocols/oscar/oscar.c:5097
+#: src/protocols/oscar/oscar.c:2612 src/protocols/oscar/oscar.c:5127
 msgid "Authorize"
 msgstr "����"
 
-#: src/dialogs.c:2440 src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/jabber.c:1717 src/protocols/msn/notification.c:467
-#: src/protocols/msn/notification.c:749 src/protocols/oscar/oscar.c:2603
-#: src/protocols/oscar/oscar.c:5098
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1717
+#: src/protocols/msn/notification.c:467 src/protocols/msn/notification.c:749
+#: src/protocols/oscar/oscar.c:2614 src/protocols/oscar/oscar.c:5128
 msgid "Deny"
 msgstr "��膸�"
 
@@ -1088,10 +1081,11 @@
 msgstr "��菴����≦��賢莉����"
 
 #: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2335
-#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4238
-#: src/protocols/jabber/jabber.c:4287 src/protocols/msn/dispatch.c:160
-#: src/protocols/msn/msn.c:459 src/protocols/msn/notification.c:1376
-#: src/protocols/napster/napster.c:496
+#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4260
+#: src/protocols/jabber/jabber.c:4309 src/protocols/msn/dispatch.c:160
+#: src/protocols/msn/msn.c:460 src/protocols/msn/notification.c:1383
+#: src/protocols/napster/napster.c:465 src/protocols/napster/napster.c:496
+#: src/protocols/yahoo/yahoo.c:965
 msgid "Unable to connect"
 msgstr "��羈�菴���"
 
@@ -1099,7 +1093,7 @@
 msgid "Connecting..."
 msgstr "罩e�����..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3936
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3950
 msgid "Nick:"
 msgstr "�窮О鐚�"
 
@@ -1107,243 +1101,24 @@
 msgid "Gaim User"
 msgstr "Gaim ����"
 
-#: src/protocols/irc/irc.c:187
-msgid ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
-msgstr "(莉��∽④羔����咲����莚傑��ヨ侃�欠�莨���賢����膽�������蕁�)"
-
-#: src/protocols/irc/irc.c:488 src/protocols/irc/irc.c:2608
-#, c-format
-msgid "DCC Chat with %s closed"
-msgstr "筝� %s ��篋�篋坂���綏峨�渇��"
-
-#: src/protocols/irc/irc.c:541 src/protocols/irc/irc.c:2617
-#, c-format
-msgid "DCC Chat with %s established"
-msgstr "筝� %s ��篋�篋坂���綏峨産腴�"
-
-#: src/protocols/irc/irc.c:676
-msgid "No topic is set"
-msgstr "羃≧��莅丞舟莚�蘂�"
-
-#: src/protocols/irc/irc.c:697 src/protocols/irc/irc.c:1755
-#, c-format
-msgid "<B>%s has changed the topic to: %s</B>"
-msgstr "<B>%s 綏牙�絨�莚�蘂��剛減鐚�%s</B>"
-
-#: src/protocols/irc/irc.c:742
-#, c-format
-msgid "-:- mode/%s [%c%c %s] by %s"
-msgstr "-:- 罔≦�/%s [%c%c %s] �� %s"
-
-#: src/protocols/irc/irc.c:919 src/protocols/irc/irc.c:932
-msgid "User"
-msgstr "���桁��"
-
-#. Splits
-#: src/protocols/irc/irc.c:923 src/protocols/irc/irc.c:3031
-#: src/protocols/jabber/jabber.c:4418 src/protocols/napster/napster.c:639
-msgid "Server"
-msgstr "���≦��"
-
-#: src/protocols/irc/irc.c:927 src/protocols/irc/irc.c:1082
-#: src/protocols/irc/irc.c:1647
-msgid "IRC Operator"
-msgstr "IRC 膊∞����"
-
-#: src/protocols/irc/irc.c:940
-msgid "Channels"
-msgstr "蘂���"
-
-#: src/protocols/irc/irc.c:946
-#, c-format
-msgid "%s is an Identified User"
-msgstr "%s ����莚�������"
-
-#: src/protocols/irc/irc.c:961
-#, c-format
-msgid "%ld seconds [signon: %s]"
-msgstr "%ld 腱� [�糸�ワ�%s]"
-
-#. RPL_REHASHING
-#: src/protocols/irc/irc.c:1082
-msgid "Rehashing server"
-msgstr "罩e����菴����≦��"
-
-#. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1085
-msgid "No such nick/channel"
-msgstr "羃≧��菴��欠���窮О/蘂���"
-
-#: src/protocols/irc/irc.c:1085 src/protocols/irc/irc.c:1088
-#: src/protocols/irc/irc.c:1093 src/protocols/irc/irc.c:1097
-#: src/protocols/irc/irc.c:1463 src/protocols/irc/irc.c:1605
-msgid "IRC Error"
-msgstr "IRC �咲��"
-
-#. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1088
-msgid "No such server"
-msgstr "羃≧��莚ユ���≦��"
-
-#. ERR_NOMOTD
-#. drop it - bringing up dialog for NOMOTD is annoying
-#. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1093
-msgid "No nickname given"
-msgstr "羃≧��膸��堺�窮О"
-
-#. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1096
-msgid "You're not an IRC operator!"
-msgstr "����� IRC 膊∞����鐚�"
-
-#: src/protocols/irc/irc.c:1100
-msgid "That nick is already in use.  Please enter a new nick"
-msgstr "莚ユ�窮О綏牙�茴��銀�篋坂戎�����莚決��ユ�井�窮О"
-
-#. Build OK Button
-#: src/dialogs.c:2203 src/dialogs.c:2341 src/dialogs.c:2625 src/dialogs.c:2771
-#: src/dialogs.c:3934 src/gtkrequest.c:170 src/protocols/irc/irc.c:1104
-#: src/protocols/msn/msn.c:170 src/protocols/msn/msn.c:181
-#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
-#: src/protocols/oscar/oscar.c:2440 src/protocols/oscar/oscar.c:2520
-#: src/protocols/oscar/oscar.c:5935 src/protocols/oscar/oscar.c:5984
-#: src/protocols/oscar/oscar.c:6044 src/protocols/yahoo/yahoo.c:1187
-#: src/request.h:813
-msgid "OK"
-msgstr "隋��"
-
-#: src/protocols/irc/irc.c:1390 src/protocols/irc/irc.c:1396
-#: src/protocols/irc/irc.c:1402 src/protocols/irc/irc.c:1416
-msgid "IRC CTCP info"
-msgstr "IRC CTCP 篆≧��"
-
-#: src/protocols/irc/irc.c:1426
-#, c-format
-msgid "%s would like to establish a DCC chat"
-msgstr "%s �活�綮榊�篋�篋坂���"
-
-#: src/protocols/irc/irc.c:1429
-msgid ""
-"This requires a direct connection to be established between the two "
-"computers.  Messages sent will not pass through the IRC server"
-msgstr "菴���荀���犬�域�膊��坂��翫産腴��贋・菴��ャ��������羔������菴� IRC ���≦��"
-
-#: src/protocols/irc/irc.c:1433 src/protocols/oscar/oscar.c:2403
-#: src/protocols/oscar/oscar.c:5720
-msgid "Connect"
-msgstr "菴���"
-
-#: src/protocols/irc/irc.c:1460
-#, c-format
-msgid "Received an invalid file send request from %s."
-msgstr "�九�遺� %s ���榊��������篁九���莚傑���"
-
-#: src/protocols/irc/irc.c:1541 src/protocols/msn/error.c:133
-#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:760
-msgid "Unable to write"
-msgstr "��羈�����"
-
-#: src/protocols/irc/irc.c:1603
-#, c-format
-msgid "You have been kicked from %s: %s"
-msgstr "��群膸頮�権�坂� %s: %s"
-
-#: src/protocols/irc/irc.c:1608
-#, c-format
-msgid "Kicked by %s: %s"
-msgstr "茴� %s 荼√�削�%s"
-
-#: src/protocols/irc/irc.c:1664 src/protocols/irc/irc.c:2918
-msgid "CTCP ClientInfo"
-msgstr "CTCP 絎∽�隙拭��"
-
-#: src/protocols/irc/irc.c:1670 src/protocols/irc/irc.c:2924
-msgid "CTCP UserInfo"
-msgstr "CTCP ���隙拭��"
-
-#: src/protocols/irc/irc.c:1676 src/protocols/irc/irc.c:2930
-msgid "CTCP Version"
-msgstr "CTCP ����"
-
-#: src/protocols/irc/irc.c:1704 src/protocols/irc/irc.c:2936
-msgid "CTCP Ping"
-msgstr "CTCP Ping"
-
-#: src/protocols/irc/irc.c:1949 src/protocols/oscar/oscar.c:678
+#: src/protocols/irc/irc.c:123
+msgid "Channel:"
+msgstr "蘂���鐚�"
+
+#: src/protocols/irc/irc.c:128 src/gtkaccount.c:423 src/main.c:304
+msgid "Password:"
+msgstr "絲���鐚�"
+
+#: src/protocols/irc/irc.c:162 src/protocols/oscar/oscar.c:683
 #: src/protocols/toc/toc.c:234
 #, c-format
 msgid "Signon: %s"
 msgstr "�糸���鐚�%s"
 
-#: src/protocols/irc/irc.c:1963 src/protocols/trepia/trepia.c:1148
-msgid "Unable to create socket"
+#: src/protocols/irc/irc.c:171
+msgid "Couldn't create socket"
 msgstr "��羈���綮阪��ュ�"
 
-#: src/protocols/irc/irc.c:2204
-#, c-format
-msgid "Topic for %s is %s"
-msgstr "%s ��莚�蘂��� %s"
-
-#: src/protocols/irc/irc.c:2300
-#, c-format
-msgid "You have left %s"
-msgstr "��群膸霝糸�篋� %s"
-
-#: src/protocols/irc/irc.c:2301
-msgid "IRC Part"
-msgstr "IRC ����"
-
-#: src/protocols/irc/irc.c:2356
-msgid "<I>Requesting DCC CHAT</I>"
-msgstr "<I>罩e���羆�篋�篋坂���</I>"
-
-#: src/protocols/irc/irc.c:2373
-msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
-msgstr "<B>膊∞�����巡擦鐚�<BR>REHASH RESTART</B>"
-
-#: src/protocols/irc/irc.c:2378
-msgid ""
-"<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
-"<nick><BR>PING <nick></B><BR>"
-msgstr ""
-"<B>CTCP �巡擦鐚�<BR>CLIENTINFO <�窮О><BR>USERINFO <�窮О><BR>VERSION <�窮О"
-"><BR>PING <�窮О></B><BR>"
-
-#: src/protocols/irc/irc.c:2386
-msgid "<B>DCC commands:<BR>CHAT <nick></B>"
-msgstr "<B>篋�篋坂����巡擦鐚�<BR>CHAT <�窮О></B>"
-
-#: src/protocols/irc/irc.c:2391
-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 "
-"W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for "
-"CTCP commands<BR>Type /HELP DCC for DCC commands"
-msgstr ""
-"<B>�����������巡擦鐚�<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC KICK<BR>OP "
-"DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W WHOWAS<BR>莨�"
-"�� /HELP OPER ���ョ��膊∞�����巡擦<BR>莨��� /HELP CTCP ���ョ�� CTCP �巡擦<BR>莨��� /"
-"HELP DCC ���ョ��篋�篋坂������巡擦"
-
-#: src/protocols/irc/irc.c:2414
-msgid "<B>Unknown command</B>"
-msgstr "<B>���ュ�巡擦</B>"
-
-#: src/protocols/irc/irc.c:2474
-msgid "Channel:"
-msgstr "蘂���鐚�"
-
-#: src/gtkaccount.c:422 src/main.c:309 src/protocols/irc/irc.c:2479
-msgid "Password:"
-msgstr "絲���鐚�"
-
-#: src/protocols/irc/irc.c:2905
-msgid "DCC Chat"
-msgstr "篋�篋坂���"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1353,19 +1128,26 @@
 #. *< id
 #. *< name
 #. *< version
-#. *  summary
-#: src/protocols/irc/irc.c:3011 src/protocols/irc/irc.c:3013
+#: src/protocols/irc/irc.c:486
 msgid "IRC Protocol Plugin"
 msgstr "IRC �顒��篁�"
 
-#. Account Options
-#: src/gtkprefs.c:1145 src/protocols/irc/irc.c:3035
-#: src/protocols/jabber/jabber.c:4425 src/protocols/msn/msn.c:1259
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1377
-msgid "Port"
-msgstr "腴��"
-
-#: src/protocols/irc/irc.c:3039
+#. *  summary
+#: src/protocols/irc/irc.c:487
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "��顓��翫��� IRC �顒��篁�"
+
+#. Splits
+#: src/protocols/irc/irc.c:504 src/protocols/jabber/jabber.c:4440
+#: src/protocols/napster/napster.c:639
+msgid "Server"
+msgstr "���≦��"
+
+#: src/protocols/irc/irc.c:507
+msgid "Port:"
+msgstr "腴���"
+
+#: src/protocols/irc/irc.c:510
 msgid "Encoding"
 msgstr "膽���"
 
@@ -1373,19 +1155,19 @@
 #: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
 #: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
 #: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
-#: src/protocols/msn/msn.c:91 src/protocols/msn/msn.c:149
-#: src/protocols/msn/msn.c:249 src/protocols/msn/msn.c:505
-#: src/protocols/msn/msn.c:616 src/protocols/msn/msn.c:632
-#: src/protocols/msn/msn.c:667 src/protocols/msn/msn.c:683
-#: src/protocols/msn/msn.c:715 src/protocols/msn/msn.c:723
-#: src/protocols/msn/msn.c:756 src/protocols/msn/msn.c:764
-#: src/protocols/msn/msn.c:778 src/protocols/msn/msn.c:787
-#: src/protocols/msn/msn.c:801 src/protocols/msn/msn.c:810
-#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:882
-#: src/protocols/msn/msn.c:920 src/protocols/msn/msn.c:1017
-#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1061
-#: src/protocols/msn/msn.c:1072 src/protocols/msn/msn.c:1083
-#: src/protocols/msn/msn.c:1107 src/protocols/msn/msn.c:1119
+#: src/protocols/msn/msn.c:92 src/protocols/msn/msn.c:150
+#: src/protocols/msn/msn.c:250 src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:617 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:668 src/protocols/msn/msn.c:684
+#: src/protocols/msn/msn.c:716 src/protocols/msn/msn.c:724
+#: src/protocols/msn/msn.c:757 src/protocols/msn/msn.c:765
+#: src/protocols/msn/msn.c:779 src/protocols/msn/msn.c:788
+#: src/protocols/msn/msn.c:802 src/protocols/msn/msn.c:811
+#: src/protocols/msn/msn.c:833 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:921 src/protocols/msn/msn.c:1018
+#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1062
+#: src/protocols/msn/msn.c:1073 src/protocols/msn/msn.c:1084
+#: src/protocols/msn/msn.c:1108 src/protocols/msn/msn.c:1120
 #: src/protocols/msn/notification.c:127 src/protocols/msn/notification.c:156
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:969
 #: src/protocols/trepia/trepia.c:281 src/protocols/trepia/trepia.c:782
@@ -1414,8 +1196,8 @@
 "password remains the same."
 msgstr "����ョ���医���筝���������絲����後��������絲���篁��銀������激��"
 
-#: src/blist.c:794 src/gtkaccount.c:139 src/gtkpounce.c:307
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1169 src/blist.c:798 src/gtkaccount.c:140
+#: src/gtkpounce.c:307 src/gtkutils.c:781
 msgid "Unknown"
 msgstr "����"
 
@@ -1431,8 +1213,8 @@
 msgstr "菴�菴�胼糸�"
 
 #: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3439
-#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2819
-#: src/protocols/oscar/oscar.c:4551 src/protocols/oscar/oscar.c:5844
+#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2830
+#: src/protocols/oscar/oscar.c:4581 src/protocols/oscar/oscar.c:5876
 msgid "Do Not Disturb"
 msgstr "莚桁�炊����"
 
@@ -1466,9 +1248,9 @@
 msgstr "羃≧��菴��欠�����激��"
 
 #. Should never happen.
-#: src/blist.c:502 src/dialogs.c:855 src/protocols/jabber/jabber.c:1831
-#: src/protocols/msn/notification.c:87 src/protocols/msn/notification.c:88
-#: src/protocols/msn/notification.c:644
+#: src/protocols/jabber/jabber.c:1831 src/protocols/msn/notification.c:87
+#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
+#: src/blist.c:502 src/dialogs.c:829
 msgid "Buddies"
 msgstr "絅遵�"
 
@@ -1484,7 +1266,7 @@
 msgid "Password successfully changed."
 msgstr "絲����贋�号������"
 
-#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4236
+#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4258
 msgid "Connection lost"
 msgstr "菴��ュ群筝√け"
 
@@ -1498,7 +1280,7 @@
 
 #. we have no chats yet
 #: src/protocols/jabber/jabber.c:2363 src/protocols/msn/dispatch.c:164
-#: src/protocols/msn/msn.c:450 src/protocols/napster/napster.c:489
+#: src/protocols/msn/msn.c:451 src/protocols/napster/napster.c:489
 #: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:986
 msgid "Connecting"
 msgstr "罩e�����"
@@ -1533,7 +1315,7 @@
 msgstr "��羈����ヨ��紊�"
 
 #: src/protocols/jabber/jabber.c:3228 src/protocols/jabber/jabber.c:3279
-#: src/protocols/jabber/jabber.c:3704
+#: src/protocols/jabber/jabber.c:3697
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
@@ -1542,12 +1324,12 @@
 msgstr "�咲��"
 
 #: src/protocols/jabber/jabber.c:3280 src/protocols/jabber/jabber.c:3339
-#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3730
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3723
 msgid "Status"
 msgstr "�倶��"
 
 #: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3372
-#: src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:5489
 msgid "Not Authorized"
 msgstr "���莚�"
 
@@ -1555,7 +1337,7 @@
 msgid "View Error Msg"
 msgstr "�ョ����莚����"
 
-#: src/gtkconv.c:1099 src/protocols/jabber/jabber.c:3397
+#: src/protocols/jabber/jabber.c:3397 src/gtkconv.c:1101
 msgid "Get Away Msg"
 msgstr "�桁�胼糸�羔���"
 
@@ -1576,11 +1358,11 @@
 msgstr "���域�羆�莅よ�"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1577 src/protocols/jabber/jabber.c:3435
-#: src/protocols/jabber/jabber.c:3485 src/protocols/oscar/oscar.c:2831
-#: src/protocols/oscar/oscar.c:4546 src/protocols/oscar/oscar.c:5842
-#: src/protocols/yahoo/yahoo.c:1075 src/protocols/zephyr/zephyr.c:866
-#: src/protocols/zephyr/zephyr.c:876
+#: src/protocols/jabber/jabber.c:3435 src/protocols/jabber/jabber.c:3485
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4576
+#: src/protocols/oscar/oscar.c:5874 src/protocols/yahoo/yahoo.c:1075
+#: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
+#: src/gtkaccount.c:1578
 msgid "Online"
 msgstr "��鎖"
 
@@ -1600,7 +1382,7 @@
 msgid "Nickname"
 msgstr "�窮О"
 
-#: src/dialogs.c:2896 src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/jabber.c:3629 src/dialogs.c:2814
 msgid "URL"
 msgstr "URL"
 
@@ -1625,8 +1407,8 @@
 msgstr "���睡���"
 
 #. Country
-#: src/dialogs.c:2057 src/dialogs.c:2702 src/protocols/jabber/jabber.c:3635
-#: src/protocols/trepia/trepia.c:372
+#: src/protocols/jabber/jabber.c:3635 src/protocols/trepia/trepia.c:372
+#: src/dialogs.c:1998 src/dialogs.c:2620
 msgid "Country"
 msgstr "�遵�"
 
@@ -1634,7 +1416,7 @@
 msgid "Telephone"
 msgstr "�笈��欠��"
 
-#: src/dialogs.c:2760 src/protocols/jabber/jabber.c:3637
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2678
 msgid "Email"
 msgstr "�球���散"
 
@@ -1658,35 +1440,42 @@
 msgid "Birthday"
 msgstr "����"
 
-#: src/dialogs.c:2906 src/gtkprefs.c:604 src/gtkprefs.c:1840
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/jabber.c:3643 src/dialogs.c:2824 src/gtkprefs.c:604
+#: src/gtkprefs.c:1840
 msgid "Description"
 msgstr "�颷�"
 
-#: src/protocols/jabber/jabber.c:3668
+#: src/protocols/jabber/jabber.c:4120 src/protocols/jabber/jabber.c:4121
+msgid "Edit Jabber vCard"
+msgstr "膽�莨� Jabber vCard"
+
+#: src/protocols/jabber/jabber.c:4122
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
-"comfortable"
-msgstr "����筝��∝��蕁合���醇���������莚桁Ű��ユ���炊�颴��ョ��篆≧��"
-
-#: src/protocols/jabber/jabber.c:3669
-msgid "User Identity"
-msgstr "���傑��莚�"
-
-#: src/protocols/jabber/jabber.c:4098
-msgid "Gaim - Edit Jabber vCard"
-msgstr "Gaim - 膽�莨� Jabber vCard"
-
-#: src/protocols/jabber/jabber.c:4173
+"comfortable."
+msgstr "����筝��∝��蕁合���醇���������莚桁Ű��ユ���炊�颴��ョ��篆≧����"
+
+#: src/protocols/jabber/jabber.c:4125 src/protocols/trepia/trepia.c:379
+#: src/dialogs.c:2029 src/dialogs.c:2210 src/dialogs.c:3353 src/dialogs.c:4010
+#: src/gtkrequest.c:195
+msgid "Save"
+msgstr "篆�絖�"
+
+#: src/protocols/jabber/jabber.c:4195
 msgid "Server Registration successful!"
 msgstr "���≦��絵������鐚�"
 
-#: src/protocols/jabber/jabber.c:4194
+#: src/protocols/jabber/jabber.c:4211
+#, c-format
+msgid "Error %d: %s"
+msgstr "��莚� %d鐚�%s"
+
+#: src/protocols/jabber/jabber.c:4216
 msgid "Unknown registration error"
 msgstr "���ョ��羈�����莚�"
 
-#: src/dialogs.c:2232 src/protocols/jabber/jabber.c:4308
-#: src/protocols/oscar/oscar.c:6098 src/protocols/toc/toc.c:1462
+#: src/protocols/jabber/jabber.c:4330 src/protocols/oscar/oscar.c:6130
+#: src/protocols/toc/toc.c:1476 src/dialogs.c:2173
 msgid "Set User Info"
 msgstr "莅丞舟���隙拭��"
 
@@ -1700,15 +1489,22 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4397 src/protocols/jabber/jabber.c:4399
+#: src/protocols/jabber/jabber.c:4419 src/protocols/jabber/jabber.c:4421
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber �顒��篁�"
 
-#: src/protocols/jabber/jabber.c:4421
+#: src/protocols/jabber/jabber.c:4443
 msgid "Resource"
 msgstr "莎�羣�"
 
-#: src/protocols/jabber/jabber.c:4429
+#. Account Options
+#: src/protocols/jabber/jabber.c:4447 src/protocols/msn/msn.c:1260
+#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1377
+#: src/gtkprefs.c:1145
+msgid "Port"
+msgstr "腴��"
+
+#: src/protocols/jabber/jabber.c:4451
 msgid "Connect server"
 msgstr "颷��ユ���≦��"
 
@@ -1745,15 +1541,15 @@
 msgstr "��羈�紊���羔�����"
 
 #: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:407
-#: src/protocols/msn/notification.c:1385
+#: src/protocols/msn/notification.c:1392
 msgid "Unable to write to server"
 msgstr "��羈����ユ���≦����"
 
-#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1392
+#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1399
 msgid "Syncing with server"
 msgstr "罩e������≦����罩�"
 
-#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1406
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1413
 msgid "Error reading from server"
 msgstr "篁����≦������九�咲��"
 
@@ -1825,7 +1621,7 @@
 msgid "Required fields missing"
 msgstr "膽阪�綽�蕁糸��"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:178
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:183
 msgid "Not logged in"
 msgstr "���糸��"
 
@@ -1877,6 +1673,11 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR ���井���ユ��筝���莅�"
 
+#: src/protocols/msn/error.c:133 src/protocols/msn/notification.c:292
+#: src/protocols/msn/notification.c:760
+msgid "Unable to write"
+msgstr "��羈�����"
+
 #: src/protocols/msn/error.c:136
 msgid "Session overload"
 msgstr "篌�莚�菴�莉�"
@@ -1922,31 +1723,44 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "�亥�� MSN ��絅遵��腱医お�帥��"
 
-#: src/protocols/msn/msn.c:166
+#: src/protocols/msn/msn.c:167
 msgid "Set your friendly name."
 msgstr "莅丞舟������絅遵��腱違��"
 
-#: src/protocols/msn/msn.c:167
+#: src/protocols/msn/msn.c:168
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "菴����銀��� MSN 絅遵����亥����絖���"
 
-#: src/protocols/msn/msn.c:179
+#. Build OK Button
+#: 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:2451 src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:5967 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6076 src/protocols/yahoo/yahoo.c:1187
+#: src/connection.c:140 src/dialogs.c:2144 src/dialogs.c:2282
+#: src/dialogs.c:2543 src/dialogs.c:2689 src/dialogs.c:3531 src/dialogs.c:3573
+#: src/dialogs.c:3704 src/dialogs.c:4047 src/gtkrequest.c:188
+#: src/request.h:813
+msgid "OK"
+msgstr "隋��"
+
+#: src/protocols/msn/msn.c:180
 msgid "Set your home phone number."
 msgstr "莅丞舟����絎九梱�笈��欠����"
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:191
 msgid "Set your work phone number."
 msgstr "莅丞舟����綏ヤ��笈��欠����"
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:202
 msgid "Set your mobile phone number."
 msgstr "莅丞舟����腱糸���笈��欠����"
 
-#: src/protocols/msn/msn.c:210
+#: src/protocols/msn/msn.c:211
 msgid "Allow MSN Mobile pages?"
 msgstr "��莅� MSN 腱糸����弱��鐚�"
 
-#: src/protocols/msn/msn.c:211
+#: src/protocols/msn/msn.c:212
 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?"
@@ -1954,100 +1768,99 @@
 "��������莅娯�筝�鐚�����絅遵���札膸�����腱糸���笈����九�腱糸���紊����� MSN 腱糸����若����"
 "�活���莅梧����罩∵�筝����緒�"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:216
 msgid "Allow"
 msgstr "��莅�"
 
-#: src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:217
 msgid "Disallow"
 msgstr "胼�罩�"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:234
 msgid "Send a mobile message."
 msgstr "����腱糸�������"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:236
 msgid "Page"
 msgstr "絲糸��"
 
-#: src/about.c:151 src/dialogs.c:4231 src/gtkrequest.c:173
-#: src/protocols/msn/msn.c:236 src/server.c:1458
+#: src/protocols/msn/msn.c:237 src/about.c:151 src/dialogs.c:4001
+#: src/gtkrequest.c:191 src/server.c:1459
 msgid "Close"
 msgstr "�渇��"
 
-#: src/protocols/msn/msn.c:324 src/protocols/yahoo/yahoo.c:1126
+#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1126
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>�倶��鐚�</b> %s"
 
-#: src/protocols/msn/msn.c:337 src/protocols/msn/msn.c:592
+#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:593
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "菴�胼紫�笈��"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:595
 #: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1053
 #: src/protocols/yahoo/yahoo.c:1261 src/protocols/yahoo/yahoo.c:1337
 msgid "Be Right Back"
 msgstr "薊������"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:597
 #: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1055
 #: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1338
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:599
 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1063
 #: src/protocols/yahoo/yahoo.c:1271 src/protocols/yahoo/yahoo.c:1342
 msgid "On The Phone"
 msgstr "�ュ���笈�"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:600
+#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:601
 #: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1067
 #: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1344
 msgid "Out To Lunch"
 msgstr "紊��阪葦蕕�"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:602
+#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:603
 #: src/protocols/zephyr/zephyr.c:863 src/protocols/zephyr/zephyr.c:878
 msgid "Hidden"
 msgstr "��荳�"
 
-#: src/protocols/msn/msn.c:354
+#: src/protocols/msn/msn.c:355
 msgid "Set Friendly Name"
 msgstr "莅丞舟��絅順����腱�"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:363
 msgid "Set Home Phone Number"
 msgstr "莅丞舟絎九梱�笈��欠��"
 
-#: src/protocols/msn/msn.c:368
+#: src/protocols/msn/msn.c:369
 msgid "Set Work Phone Number"
 msgstr "莅丞舟綏ヤ��笈��欠��"
 
-#: src/protocols/msn/msn.c:374
+#: src/protocols/msn/msn.c:375
 msgid "Set Mobile Phone Number"
 msgstr "莅丞舟腱糸���笈��欠��"
 
-#: src/protocols/msn/msn.c:383
+#: src/protocols/msn/msn.c:384
 msgid "Enable/Disable Mobile Devices"
 msgstr "����/胼���Щ���紊�"
 
-#: src/protocols/msn/msn.c:390
+#: src/protocols/msn/msn.c:391
 msgid "Allow/Disallow Mobile Pages"
 msgstr "��莅�/胼�罩∝Щ�����"
 
-#: src/protocols/msn/msn.c:413
+#: src/protocols/msn/msn.c:414
 msgid "Send to Mobile"
 msgstr "�����亥Щ���紊�"
 
-#: src/protocols/msn/msn.c:422
-#, fuzzy
+#: src/protocols/msn/msn.c:423
 msgid "Initiate Chat"
-msgstr "膸���紊�儀��"
-
-#: src/protocols/msn/msn.c:696
+msgstr "菴��ヨ��紊��"
+
+#: src/protocols/msn/msn.c:697
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2056,11 +1869,11 @@
 "MSN ���桁�����弱�綽�蕁紙����user@server.com�������醇��������� %s@hotmail.com������"
 "��莅後��茵����篁私��贋�鴻��"
 
-#: src/protocols/msn/msn.c:700 src/protocols/msn/msn.c:740
+#: src/protocols/msn/msn.c:701 src/protocols/msn/msn.c:741
 msgid "Invalid MSN screenname"
 msgstr "������ MSN ���桁��"
 
-#: src/protocols/msn/msn.c:736
+#: src/protocols/msn/msn.c:737
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2079,14 +1892,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1235 src/protocols/msn/msn.c:1237
+#: src/protocols/msn/msn.c:1236 src/protocols/msn/msn.c:1238
 msgid "MSN Protocol Plugin"
 msgstr "MSN �顒��篁�"
 
-#: src/protocols/msn/msn.c:1254 src/protocols/trepia/trepia.c:1372
+#: src/protocols/msn/msn.c:1255 src/protocols/trepia/trepia.c:1372
 msgid "Login server"
 msgstr "�糸����≦��"
 
+#: src/protocols/msn/notification.c:197
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN ��莚��%s\n"
+
 #: src/protocols/msn/notification.c:235
 msgid "Unable to request INF"
 msgstr "��羈�莚傑� INF"
@@ -2133,23 +1951,30 @@
 msgid "Unable to transfer to notification server"
 msgstr "��羈�篌����育���ユ���≦����"
 
-#: src/protocols/msn/notification.c:1346
+#: src/protocols/msn/notification.c:1348
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute(s). You will "
-"automatically be signed out at that time. Please finish any conversations in "
-"progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr ""
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
 "MSN ���≦���喝�篋� %d �������渇�㊧�茵�膸贋�ゃ���育�f�駈����篌�茴������糸�冴��莚桁綾綽��渇��"
 "�医���茵�筝㊦��絲壕���\n"
 "\n"
 "膸贋�ゅ����������遵������糸�ャ��"
 
-#: src/gtkpounce.c:464 src/gtkprefs.c:1532 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1073
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1073
+#: src/gtkpounce.c:464 src/gtkprefs.c:1532
 msgid "Idle"
 msgstr "����"
 
@@ -2170,6 +1995,11 @@
 msgid "Unable to read header from server"
 msgstr "��羈�篁����≦�����紊�"
 
+#: src/protocols/napster/napster.c:246
+#, c-format
+msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
+msgstr "��羈�篁����≦�����篆≧�����巡擦筝� %hd鐚��水墾筝� %hd��"
+
 #: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
@@ -2203,12 +2033,12 @@
 msgid "%s requested a PING"
 msgstr "%s 莚傑� PING"
 
-#: src/gtkblist.c:1573 src/protocols/napster/napster.c:531
+#: src/protocols/napster/napster.c:531 src/gtkblist.c:1574
 msgid "Get Info"
 msgstr "篆≧��"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5168
-#: src/protocols/toc/toc.c:1201
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5198
+#: src/protocols/toc/toc.c:1215
 msgid "Join what group:"
 msgstr "���ョ�鐚�"
 
@@ -2226,176 +2056,177 @@
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER �顒��篁�"
 
-#: src/protocols/oscar/oscar.c:174
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid error"
 msgstr "������莚�"
 
-#: src/protocols/oscar/oscar.c:175
+#: src/protocols/oscar/oscar.c:180
 msgid "Invalid SNAC"
 msgstr "���� SNAC"
 
-#: src/protocols/oscar/oscar.c:176
+#: src/protocols/oscar/oscar.c:181
 msgid "Rate to host"
 msgstr "筝紙�榊�膾�"
 
-#: src/protocols/oscar/oscar.c:177
+#: src/protocols/oscar/oscar.c:182
 msgid "Rate to client"
 msgstr "絎∽�欠�膾�"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:184
 msgid "Service unavailable"
 msgstr "���>�����"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:185
 msgid "Service not defined"
 msgstr "���≧���箙�"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:186
 msgid "Obsolete SNAC"
 msgstr "綺��� SNAC"
 
-#: src/protocols/oscar/oscar.c:182
-msgid "Not supported by host"
-msgstr "筝紙�坂�����"
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Not supported by client"
-msgstr "絎∽�隙�����"
-
-#: src/protocols/oscar/oscar.c:184
-msgid "Refused by client"
-msgstr "絎∽�傑��膸�"
-
-#: src/protocols/oscar/oscar.c:185
-msgid "Reply too big"
-msgstr "��紊�紊�ぇ"
-
-#: src/protocols/oscar/oscar.c:186
-msgid "Responses lost"
-msgstr "��綺�筝√け"
-
 #: src/protocols/oscar/oscar.c:187
-msgid "Request denied"
-msgstr "莚傑�茴��罩�"
+msgid "Not supported by host"
+msgstr "筝紙�坂�����"
 
 #: src/protocols/oscar/oscar.c:188
-msgid "Busted SNAC payload"
-msgstr "SNAC ����茣�莉醇�紜�"
+msgid "Not supported by client"
+msgstr "絎∽�隙�����"
 
 #: src/protocols/oscar/oscar.c:189
-msgid "Insufficient rights"
-msgstr "����筝�紊�"
+msgid "Refused by client"
+msgstr "絎∽�傑��膸�"
 
 #: src/protocols/oscar/oscar.c:190
-msgid "In local permit/deny"
-msgstr "���域���/胼�罩�"
+msgid "Reply too big"
+msgstr "��紊�紊�ぇ"
 
 #: src/protocols/oscar/oscar.c:191
-msgid "Too evil (sender)"
-msgstr "紊�����(������)"
+msgid "Responses lost"
+msgstr "��綺�筝√け"
 
 #: src/protocols/oscar/oscar.c:192
-msgid "Too evil (receiver)"
-msgstr "紊�����(�ユ�区��)"
+msgid "Request denied"
+msgstr "莚傑�茴��罩�"
 
 #: src/protocols/oscar/oscar.c:193
-msgid "User temporarily unavailable"
-msgstr "���隙鹸�銀�����"
+msgid "Busted SNAC payload"
+msgstr "SNAC ����茣�莉醇�紜�"
 
 #: src/protocols/oscar/oscar.c:194
-msgid "No match"
-msgstr "���拷��"
+msgid "Insufficient rights"
+msgstr "����筝�紊�"
 
 #: src/protocols/oscar/oscar.c:195
-msgid "List overflow"
-msgstr "��茵�頃��"
+msgid "In local permit/deny"
+msgstr "���域���/胼�罩�"
 
 #: src/protocols/oscar/oscar.c:196
+msgid "Too evil (sender)"
+msgstr "紊�����(������)"
+
+#: src/protocols/oscar/oscar.c:197
+msgid "Too evil (receiver)"
+msgstr "紊�����(�ユ�区��)"
+
+#: src/protocols/oscar/oscar.c:198
+msgid "User temporarily unavailable"
+msgstr "���隙鹸�銀�����"
+
+#: src/protocols/oscar/oscar.c:199
+msgid "No match"
+msgstr "���拷��"
+
+#: src/protocols/oscar/oscar.c:200
+msgid "List overflow"
+msgstr "��茵�頃��"
+
+#: src/protocols/oscar/oscar.c:201
 msgid "Request ambiguous"
 msgstr "莚傑����"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:202
 msgid "Queue full"
 msgstr "����羯�"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:203
 msgid "Not while on AOL"
 msgstr "筝�篏�篋� AOL 筝�"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "筝� %s ��篋�篋坂���綏峨�渇��"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:477
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "筝� %s ��篋�篋坂���紊沿乾"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/toc/toc.c:608
-#: src/protocols/toc/toc.c:623 src/protocols/toc/toc.c:686
+#: src/protocols/oscar/oscar.c:535 src/protocols/toc/toc.c:224
+#: src/protocols/toc/toc.c:622 src/protocols/toc/toc.c:637
+#: src/protocols/toc/toc.c:700
 msgid "Disconnected."
 msgstr "綏我�㊤�菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:862
+#: src/protocols/oscar/oscar.c:547 src/protocols/toc/toc.c:876
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膸���筝���紊�� %s ��菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:558
+#: src/protocols/oscar/oscar.c:563
 msgid "Chat is currently unavailable"
 msgstr "��紊�����筝�����"
 
-#: src/protocols/oscar/oscar.c:632 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:637 src/protocols/oscar/oscar.c:694
 msgid "Couldn't connect to host"
 msgstr "��羈�菴��ュ�遺源��"
 
-#: src/protocols/oscar/oscar.c:674
+#: src/protocols/oscar/oscar.c:679
 msgid "Unable to login to AIM"
 msgstr "��羈��糸�� AIM"
 
-#: src/protocols/oscar/oscar.c:783 src/protocols/oscar/oscar.c:1169
+#: src/protocols/oscar/oscar.c:788 src/protocols/oscar/oscar.c:1171
 msgid "Could Not Connect"
 msgstr "��羈�菴���"
 
-#: src/protocols/oscar/oscar.c:790
+#: src/protocols/oscar/oscar.c:795
 msgid "Connection established, cookie sent"
 msgstr "菴��ュ群綮榊�鐚�綏峨��� cookie"
 
-#: src/protocols/oscar/oscar.c:857 src/protocols/oscar/oscar.c:870
-#: src/protocols/oscar/oscar.c:875
+#: src/protocols/oscar/oscar.c:862 src/protocols/oscar/oscar.c:875
+#: src/protocols/oscar/oscar.c:880
 msgid "File Transfer Aborted"
 msgstr "��篁銀���筝㊥②"
 
-#: src/protocols/oscar/oscar.c:858
+#: src/protocols/oscar/oscar.c:863
 msgid "Unable to establish listener socket."
 msgstr "��羈�綮榊�������ュ���"
 
-#: src/protocols/oscar/oscar.c:871
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to establish file descriptor."
 msgstr "��羈�綮榊���篁倶�菴亥���"
 
-#: src/protocols/oscar/oscar.c:876
+#: src/protocols/oscar/oscar.c:881
 msgid "Unable to create new connection."
 msgstr "��羈���綮堺�域��ャ��"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1058 src/protocols/toc/toc.c:555
+#: src/protocols/oscar/oscar.c:1060 src/protocols/toc/toc.c:569
 msgid "Incorrect nickname or password."
 msgstr "�窮О��絲���筝�絲鴻��"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1062
+#: src/protocols/oscar/oscar.c:1064
 msgid "Your account is currently suspended."
 msgstr "����茣��決←������"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1068
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL �恰�狗��莅����≧���銀�������"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1070
+#: src/protocols/oscar/oscar.c:1072
 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."
@@ -2404,21 +2235,21 @@
 "�巡��顔�帥��"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1074
+#: src/protocols/oscar/oscar.c:1076
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "��戎����絎∽�欠����お����莚桁�� %s ��膾�"
 
-#: src/protocols/oscar/oscar.c:1078 src/protocols/toc/toc.c:640
+#: src/protocols/oscar/oscar.c:1080 src/protocols/toc/toc.c:654
 msgid "Authentication Failed"
 msgstr "莅よ�紊沿乾"
 
-#: src/protocols/oscar/oscar.c:1106
+#: src/protocols/oscar/oscar.c:1108
 msgid "Internal Error"
 msgstr "������莚�"
 
-#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
-#: src/protocols/oscar/oscar.c:1326
+#: src/protocols/oscar/oscar.c:1210 src/protocols/oscar/oscar.c:1240
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2426,29 +2257,29 @@
 msgstr ""
 "���喝�茴��㊤�������醇�活�篏睡�� TOC �翫�域�筝����茴�信罩c��莚傑��� %s 筝����贋�違��"
 
-#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+#: src/protocols/oscar/oscar.c:1213 src/protocols/oscar/oscar.c:1243
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim ��羈��桁������� AIM �糸�����"
 
-#: src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1331
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim ��羈��桁��������糸�����"
 
-#: src/protocols/oscar/oscar.c:1898 src/protocols/oscar/oscar.c:5558
+#: src/protocols/oscar/oscar.c:1909 src/protocols/oscar/oscar.c:5590
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "筝� %s ��篋�篋坂���綏峨産腴�"
 
-#: src/protocols/oscar/oscar.c:2227 src/protocols/oscar/oscar.c:2249
+#: src/protocols/oscar/oscar.c:2238 src/protocols/oscar/oscar.c:2260
 msgid "(There was an error receiving this message)"
 msgstr "(�ユ�倶④羔����咲��)"
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2406
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����莚傑��� %s 篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:2398
+#: src/protocols/oscar/oscar.c:2409
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -2457,42 +2288,46 @@
 "�医����荀���犬�域�膊��坂��翫産腴��贋・菴��ワ�菴�絲剛��恰�銀����上����荀�����篏����絨���"
 "�我���� IP �医��鐚���篁ュ��初����羹�������腱�蕋�����"
 
-#: src/protocols/oscar/oscar.c:2430
+#: src/protocols/oscar/oscar.c:2414 src/protocols/oscar/oscar.c:5752
+msgid "Connect"
+msgstr "菴���"
+
+#: src/protocols/oscar/oscar.c:2441
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "莚桁�����鎞������ュソ����"
 
-#: src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2449
 msgid "Authorization Request Message:"
 msgstr "莅よ�莚傑�羔����"
 
-#: src/protocols/oscar/oscar.c:2439
+#: src/protocols/oscar/oscar.c:2450
 msgid "Please authorize me!"
 msgstr "莚桁�����鎞������ュソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:2467
+#: src/protocols/oscar/oscar.c:2478
 #, 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:2472 src/protocols/oscar/oscar.c:2474
+#: src/protocols/oscar/oscar.c:2483 src/protocols/oscar/oscar.c:2485
 msgid "Request Authorization"
 msgstr "莚傑�莅よ�"
 
-#: src/protocols/oscar/oscar.c:2510 src/protocols/oscar/oscar.c:2512
-#: src/protocols/oscar/oscar.c:2519 src/protocols/oscar/oscar.c:2591
-#: src/protocols/oscar/oscar.c:2611 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5089
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:2521 src/protocols/oscar/oscar.c:2523
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2602
+#: src/protocols/oscar/oscar.c:2622 src/protocols/oscar/oscar.c:2997
+#: src/protocols/oscar/oscar.c:3049 src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5165
 msgid "No reason given."
 msgstr "羃≧��膸��榊���宴��"
 
-#: src/protocols/oscar/oscar.c:2518
+#: src/protocols/oscar/oscar.c:2529
 msgid "Authorization Denied Message:"
 msgstr "莅よ���膸�羔����"
 
-#: src/protocols/oscar/oscar.c:2591
+#: src/protocols/oscar/oscar.c:2602
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -2501,11 +2336,11 @@
 "���� %u �活�絨�����筝坂�/絅合��絅遵�鐚����怨�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5095
+#: src/protocols/oscar/oscar.c:2610 src/protocols/oscar/oscar.c:5125
 msgid "Authorization Request"
 msgstr "莅よ�莚傑�"
 
-#: src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2622
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -2515,17 +2350,17 @@
 "���� %u ��膸�篋����篁�/絅劫��筝阪ソ����莚傑�鐚�����絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2612
+#: src/protocols/oscar/oscar.c:2623
 msgid "ICQ authorization denied."
 msgstr "ICQ 莚傑�莅よ�茴���膸���"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2619
+#: src/protocols/oscar/oscar.c:2630
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "���� %u ������篁�/絅劫��筝阪ソ����"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2638
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2538,7 +2373,7 @@
 "���坂査鐚�%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2635
+#: src/protocols/oscar/oscar.c:2646
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2551,7 +2386,7 @@
 "���坂査鐚�%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2643
+#: src/protocols/oscar/oscar.c:2654
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2564,32 +2399,32 @@
 "��絎号���\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2664
+#: src/protocols/oscar/oscar.c:2675
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr "ICQ ���� %u 膸������篋�筝�筝���膤私査鐚�%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2670
+#: src/protocols/oscar/oscar.c:2681
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "�������活�絨�罩よ��膤私査��筝阪ソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:2674
+#: src/protocols/oscar/oscar.c:2685
 msgid "Decline"
 msgstr "��膸�"
 
-#: src/protocols/oscar/oscar.c:2756
+#: src/protocols/oscar/oscar.c:2767
 #, 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:2765
+#: src/protocols/oscar/oscar.c:2776
 #, 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:2774
+#: src/protocols/oscar/oscar.c:2785
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2597,167 +2432,171 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧����������松�遺�膈�膾ч���吟��"
 
-#: src/protocols/oscar/oscar.c:2783
+#: src/protocols/oscar/oscar.c:2794
 #, 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:2792
+#: src/protocols/oscar/oscar.c:2803
 #, 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:2801
+#: src/protocols/oscar/oscar.c:2812
 #, 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:2817 src/protocols/oscar/oscar.c:4560
-#: src/protocols/oscar/oscar.c:5847
+#: src/protocols/oscar/oscar.c:2828 src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:5879
 msgid "Free For Chat"
 msgstr "��篋��画��"
 
-#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4554
-#: src/protocols/oscar/oscar.c:5845
+#: src/protocols/oscar/oscar.c:2832 src/protocols/oscar/oscar.c:4584
+#: src/protocols/oscar/oscar.c:5877
 msgid "Not Available"
 msgstr "筝�����"
 
-#: src/protocols/oscar/oscar.c:2823 src/protocols/oscar/oscar.c:4557
-#: src/protocols/oscar/oscar.c:5846
+#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4587
+#: src/protocols/oscar/oscar.c:5878
 msgid "Occupied"
 msgstr "��篋�膽�荳�"
 
-#: src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:2838
 msgid "Web Aware"
 msgstr "臀�筝�����"
 
-#: src/protocols/oscar/oscar.c:2887
+#: src/protocols/oscar/oscar.c:2898
 #, 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:2889
+#: src/protocols/oscar/oscar.c:2900
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>�倶��鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2948
+#: src/protocols/oscar/oscar.c:2959
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ���咲��莚��%s\n"
 
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:2960
 msgid "Unknown error"
 msgstr "���ラ��莚�"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2995
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "��� %s ��羔��������鐚�"
 
-#: src/protocols/oscar/oscar.c:3036
+#: src/protocols/oscar/oscar.c:3047
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s �����隙拭������"
 
-#: src/gtkaccount.c:277 src/protocols/oscar/oscar.c:3070
+#: src/protocols/oscar/oscar.c:3081 src/gtkaccount.c:278
 msgid "Buddy Icon"
 msgstr "絅遵��丈��"
 
-#: src/protocols/oscar/oscar.c:3073
+#: src/protocols/oscar/oscar.c:3084
 msgid "Voice"
 msgstr "莚㊨��"
 
-#: src/protocols/oscar/oscar.c:3076 src/protocols/oscar/oscar.c:5876
+#: src/protocols/oscar/oscar.c:3087 src/protocols/oscar/oscar.c:5908
 msgid "Direct IM"
 msgstr "篋�篋坂���"
 
-#: src/gtkblist.c:1582 src/protocols/oscar/oscar.c:3079
+#: src/protocols/oscar/oscar.c:3090 src/gtkblist.c:1583
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:5892
+#: src/protocols/oscar/oscar.c:3093 src/protocols/oscar/oscar.c:5924
 msgid "Get File"
 msgstr "�桁���篁�"
 
-#: src/protocols/oscar/oscar.c:3085 src/protocols/oscar/oscar.c:5884
+#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:5916
 msgid "Send File"
 msgstr "������篁�"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3100
 msgid "Games"
 msgstr "羝御��"
 
-#: src/protocols/oscar/oscar.c:3092
+#: src/protocols/oscar/oscar.c:3103
 msgid "Add-Ins"
 msgstr "紊���"
 
-#: src/protocols/oscar/oscar.c:3095
+#: src/protocols/oscar/oscar.c:3106
 msgid "Send Buddy List"
 msgstr "����絅遵���茵�"
 
-#: src/protocols/oscar/oscar.c:3098
+#: src/protocols/oscar/oscar.c:3109
 msgid "EveryBuddy Bug"
 msgstr "罸鋇�ソ���� Bug"
 
-#: src/protocols/oscar/oscar.c:3101
+#: src/protocols/oscar/oscar.c:3112
 msgid "AP User"
 msgstr "AP ����"
 
-#: src/protocols/oscar/oscar.c:3104
+#: src/protocols/oscar/oscar.c:3115
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3107
+#: src/protocols/oscar/oscar.c:3118
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3110
+#: src/protocols/oscar/oscar.c:3121
 msgid "ICQ Server Relay"
 msgstr "ICQ ���≦��習��"
 
-#: src/protocols/oscar/oscar.c:3113
+#: src/protocols/oscar/oscar.c:3124
 msgid "ICQ Unknown"
 msgstr "ICQ ����"
 
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3127
 msgid "Trillian Encryption"
 msgstr "Trillian ��絲�"
 
-#: src/protocols/oscar/oscar.c:3119
+#: src/protocols/oscar/oscar.c:3130
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3159
+#: src/protocols/oscar/oscar.c:3133
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:3173
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<i>��羈��丞ず篆≧����������九���膽������ャ��</i>"
 
-#: src/protocols/oscar/oscar.c:3166
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "筝�膾炊�狗�器�<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3185
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "�����狗�器�<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3191
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "���¥�<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3194
 msgid "Idle: <b>Active</b>"
 msgstr "���¥�<b>羇肢�</b>"
 
-#: src/protocols/oscar/oscar.c:3182
+#: src/protocols/oscar/oscar.c:3196
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2770,207 +2609,207 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3214
+#: src/protocols/oscar/oscar.c:3228
 msgid "<i>User has no away message</i>"
 msgstr "<i>���傑��胼糸�羔���</i>"
 
-#: src/protocols/oscar/oscar.c:3225
+#: src/protocols/oscar/oscar.c:3239
 msgid "Client Capabilities: "
 msgstr "絎∽�決�遵��鐚�"
 
-#: src/protocols/oscar/oscar.c:3231
+#: src/protocols/oscar/oscar.c:3245
 msgid "<i>No Information Provided</i>"
 msgstr "<i>羃≧����箴�篆≧��</i>"
 
-#: src/protocols/oscar/oscar.c:3255
+#: src/protocols/oscar/oscar.c:3269
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM 菴��ュ��遵群筝√け��"
 
-#: src/protocols/oscar/oscar.c:3642
+#: src/protocols/oscar/oscar.c:3656
 msgid "Rate limiting error."
 msgstr "��綺����狗��莚���"
 
-#: src/protocols/oscar/oscar.c:3643
-#, fuzzy
+#: src/protocols/oscar/oscar.c:3657
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-"������≧��������削���������群膸鏅��遺���綺�������莚欠� 10 腱�鐚��九����莚�筝�罨<��"
-
-#: src/protocols/oscar/oscar.c:3704
+"����丞�������罨≧��篏����ц�鐚���������群膸鏅��遺���綺�������莚欠� 10 腱�鐚��九����莚�"
+"筝�罨<��"
+
+#: src/protocols/oscar/oscar.c:3718
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��群膸���篋�菴��ワ������������九�篏�臀���④���桁���糸�ヤ���"
 
-#: src/protocols/oscar/oscar.c:3706
+#: src/protocols/oscar/oscar.c:3720
 msgid "You have been signed off for an unknown reason."
 msgstr "��群膸�嶃�坂�鐚��������ャ��"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3948
 msgid "UIN:"
 msgstr "UIN鐚�"
 
-#: src/protocols/oscar/oscar.c:3939
+#: src/protocols/oscar/oscar.c:3953
 msgid "First Name:"
 msgstr "��鐚�"
 
-#: src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3956
 msgid "Last Name:"
 msgstr "紮�鐚�"
 
-#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3951
+#: src/protocols/oscar/oscar.c:3959 src/protocols/oscar/oscar.c:3965
 msgid "Email Address:"
 msgstr "�球���散�医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:3970
 msgid "Mobile Phone:"
 msgstr "腱糸���笈�鐚�"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3973
 msgid "Gender:"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:314
+#: src/protocols/oscar/oscar.c:3973 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:313
+#: src/protocols/oscar/oscar.c:3973 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:3982
 msgid "Birthday:"
 msgstr "���ワ�"
 
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:3987
 msgid "Age:"
 msgstr "綛顔�鐚�"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3990
 msgid "Personal Web Page:"
 msgstr "筝�査筝脂ゝ鐚�"
 
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:3993
 msgid "Additional Information:"
 msgstr "蘂�紊�篆≧���"
 
-#: src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:3997
 msgid "Home Address:"
 msgstr "絎九梱篏����"
 
-#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:3999 src/protocols/oscar/oscar.c:4015
 msgid "Address:"
 msgstr "�医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4002 src/protocols/oscar/oscar.c:4018
 msgid "City:"
 msgstr "���鐚�"
 
-#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4005 src/protocols/oscar/oscar.c:4021
 msgid "State:"
 msgstr "綏�/��鐚�"
 
-#: src/protocols/oscar/oscar.c:3994 src/protocols/oscar/oscar.c:4010
+#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
 msgid "Zip Code:"
 msgstr "���睡���鐚�"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4013
 msgid "Work Address:"
 msgstr "�����医��鐚�"
 
-#: src/protocols/oscar/oscar.c:4015
+#: src/protocols/oscar/oscar.c:4029
 msgid "Work Information:"
 msgstr "綏ヤ�篆≧���"
 
-#: src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:4031
 msgid "Company:"
 msgstr "��夵�"
 
-#: src/protocols/oscar/oscar.c:4020
+#: src/protocols/oscar/oscar.c:4034
 msgid "Division:"
 msgstr "�����"
 
-#: src/protocols/oscar/oscar.c:4023
+#: src/protocols/oscar/oscar.c:4037
 msgid "Position:"
 msgstr "���¥�"
 
-#: src/protocols/oscar/oscar.c:4026
+#: src/protocols/oscar/oscar.c:4040
 msgid "Web Page:"
 msgstr "臀�蕁居�"
 
-#: src/protocols/oscar/oscar.c:4094
+#: src/protocols/oscar/oscar.c:4108
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s �ユ��筝������桁��鐚�</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4112
+#: src/protocols/oscar/oscar.c:4126
 #, c-format
 msgid "No results found for email address %s"
 msgstr "���上�遺��球���散�医�� %s �拷����膸���"
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "���綵��九�域���`莅� %s ����散��"
 
-#: src/protocols/oscar/oscar.c:4135
+#: src/protocols/oscar/oscar.c:4149
 msgid "Account Confirmation Requested"
 msgstr "莚傑�篋�茣��欠`莅�"
 
-#: src/protocols/oscar/oscar.c:4163
+#: src/protocols/oscar/oscar.c:4177
 msgid "Error Changing Account Info"
 msgstr "�贋�壕侃�隙拭���咲��"
 
-#: src/protocols/oscar/oscar.c:4166
+#: src/protocols/oscar/oscar.c:4180
 #, 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:4169
+#: src/protocols/oscar/oscar.c:4183
 #, 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:4172
+#: src/protocols/oscar/oscar.c:4186
 #, 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:4175
+#: src/protocols/oscar/oscar.c:4189
 #, 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:4178
+#: src/protocols/oscar/oscar.c:4192
 #, 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:4181
+#: src/protocols/oscar/oscar.c:4195
 #, 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:4184
+#: src/protocols/oscar/oscar.c:4198
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��莚� 0x%04x鐚����ラ��莚���"
 
-#: src/protocols/oscar/oscar.c:4194
+#: src/protocols/oscar/oscar.c:4208
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2979,20 +2818,20 @@
 "�������桁���弱������筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4195 src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4209 src/protocols/oscar/oscar.c:4216
 msgid "Account Info"
 msgstr "茣��隙拭��"
 
-#: src/protocols/oscar/oscar.c:4200
+#: src/protocols/oscar/oscar.c:4214
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���球���散�医��筝� %s"
 
-#: src/protocols/oscar/oscar.c:4425
+#: src/protocols/oscar/oscar.c:4449
 msgid "Unable to set AIM profile."
 msgstr "��羈�莅丞舟 AIM ��臀���篁吟��"
 
-#: src/protocols/oscar/oscar.c:4426
+#: src/protocols/oscar/oscar.c:4450
 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 "
@@ -3001,22 +2840,25 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上���臀���篁吟��������臀���篁九����絎�鐚�莚桁���������ュ��"
 "��莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:4480
 #, c-format
 msgid ""
+"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
+"it for you."
+msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr "綏牙�莇�菴�篋���臀���篁句����紊ч�水墾 %d 絖�����Gaim 筝堺���������℡���"
-
-#: src/protocols/oscar/oscar.c:4458
+msgstr[0] "綏牙�莇�菴�篋���臀���篁句����紊ч�水墾 %d 絖�����Gaim 筝堺���������℡���"
+
+#: src/protocols/oscar/oscar.c:4485
 msgid "Profile too long."
 msgstr "��臀���篁九お�帥��"
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM away message."
 msgstr "��羈�莅丞舟 AIM 胼糸�羔�����"
 
-#: src/protocols/oscar/oscar.c:4478
+#: src/protocols/oscar/oscar.c:4505
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -3025,24 +2867,27 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上�胼糸�羔��������絨�紊�篋��������倶��鐚�莚桁���������ュ��"
 "��莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4518
+#: src/protocols/oscar/oscar.c:4545
 #, c-format
 msgid ""
+"The maximum away message length of %d byte has been exceeded.  Gaim has "
+"truncated it for you."
+msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it and set you away."
-msgstr ""
+"truncated it for you."
+msgstr[0] ""
 "綏牙�莇�菴�篋�胼糸�羔�������紊ч�水墾 %d 絖�����Gaim ����減�����℡�羔����綛九����筝榊�"
 "綣���"
 
-#: src/protocols/oscar/oscar.c:4520
+#: src/protocols/oscar/oscar.c:4550
 msgid "Away message too long."
 msgstr "胼糸�羔���お�帥��"
 
-#: src/protocols/oscar/oscar.c:4740
+#: src/protocols/oscar/oscar.c:4770
 msgid "Unable To Retrieve Buddy List"
 msgstr "��羈��桁�絅遵���茵�"
 
-#: src/protocols/oscar/oscar.c:4741
+#: src/protocols/oscar/oscar.c:4771
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -3051,12 +2896,12 @@
 "Gaim ���倶��羈�篁� AIM ���≦��キ������絅遵���茵�������絅遵���茵�押��筝√け鐚����順�膈���"
 "絨�嚭葦�順�����"
 
-#: src/protocols/oscar/oscar.c:4832 src/protocols/oscar/oscar.c:4833
-#: src/protocols/oscar/oscar.c:4838
+#: src/protocols/oscar/oscar.c:4862 src/protocols/oscar/oscar.c:4863
+#: src/protocols/oscar/oscar.c:4868
 msgid "Orphans"
 msgstr "絖ゅ��"
 
-#: src/protocols/oscar/oscar.c:5002
+#: src/protocols/oscar/oscar.c:5032
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -3064,15 +2909,15 @@
 msgstr ""
 "��羈�絨� %s ��筝阪ソ��鐚�����������絅遵�紊����莚桁���ゅ�銀賢筝�筝�ソ��鐚��九����莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:5002 src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5032 src/protocols/oscar/oscar.c:5045
 msgid "(no name)"
 msgstr "(����腱�)"
 
-#: src/protocols/oscar/oscar.c:5003 src/protocols/oscar/oscar.c:5016
+#: src/protocols/oscar/oscar.c:5033 src/protocols/oscar/oscar.c:5046
 msgid "Unable To Add"
 msgstr "��羈�羞糸��"
 
-#: src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5045
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3082,18 +2927,18 @@
 "��羈�羞糸��絅遵� %s鐚��������ャ�������順������������絅遵���茵�賢絅遵����亥��群膸颴上�遺���"
 "��莅悟����紊у�若��"
 
-#: src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5080
 #, 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:5056
+#: src/protocols/oscar/oscar.c:5086
 msgid "Authorization Given"
 msgstr "膸��榊��莅よ�"
 
-#: src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5119
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3103,17 +2948,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5131
+#: src/protocols/oscar/oscar.c:5161
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "���� %s ��莅御���篁�/絅劫���ュソ����"
 
-#: src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5162
 msgid "Authorization Granted"
 msgstr "莅よ�茴����"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:5165
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3123,91 +2968,91 @@
 "���� %s ��膸�篋�����九���ヨ��膤私査��茵���莚傑�鐚�����絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5136
+#: src/protocols/oscar/oscar.c:5166
 msgid "Authorization Denied"
 msgstr "莅よ�茴���膸�"
 
-#: src/protocols/oscar/oscar.c:5173 src/protocols/toc/toc.c:1206
+#: src/protocols/oscar/oscar.c:5203 src/protocols/toc/toc.c:1220
 msgid "Exchange:"
 msgstr "篋ゆ���"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5425
 msgid "<b>Status:</b> "
 msgstr "<b>�倶��鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5402
+#: src/protocols/oscar/oscar.c:5434
 msgid "<b>Logged In:</b> "
 msgstr "<b>�糸�ワ�</b>"
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5441
 msgid "<b>Capabilities:</b> "
 msgstr "<b>�遵��鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5416
+#: src/protocols/oscar/oscar.c:5448
 msgid "<b>Available:</b> "
 msgstr "<b>�����</b>"
 
-#: src/protocols/oscar/oscar.c:5425
+#: src/protocols/oscar/oscar.c:5457
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>�倶��鐚�</b>���莚�"
 
-#: src/gtkblist.c:896 src/protocols/oscar/oscar.c:5429
+#: src/protocols/oscar/oscar.c:5461 src/gtkblist.c:896
 msgid "<b>Status:</b> Offline"
 msgstr "<b>�倶��鐚�</b> 胼紫鎖"
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5491
 msgid "Offline"
 msgstr "胼紫鎖"
 
-#: src/protocols/oscar/oscar.c:5700
+#: src/protocols/oscar/oscar.c:5732
 msgid "Unable to open Direct IM"
 msgstr "��羈�綣�紮�篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:5713
+#: src/protocols/oscar/oscar.c:5745
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�������筝� %s 菴�茵�篋�篋坂���菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:5716
+#: src/protocols/oscar/oscar.c:5748
 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:5861
+#: src/protocols/oscar/oscar.c:5893
 msgid "Get Status Msg"
 msgstr "�桁��倶��羔���"
 
-#: src/protocols/oscar/oscar.c:5905
+#: src/protocols/oscar/oscar.c:5937
 msgid "Re-request Authorization"
 msgstr "���域�羆�莅よ�"
 
-#: src/protocols/oscar/oscar.c:5926
+#: src/protocols/oscar/oscar.c:5958
 msgid "The new formatting is invalid."
 msgstr "�井�弱���������"
 
-#: src/protocols/oscar/oscar.c:5927
+#: src/protocols/oscar/oscar.c:5959
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "���桁���弱������贋�劫ぇ����腥堺�若��"
 
-#: src/protocols/oscar/oscar.c:5933
+#: src/protocols/oscar/oscar.c:5965
 msgid "New screenname formatting:"
 msgstr "�亥�����桁���弱���鐚�"
 
-#: src/protocols/oscar/oscar.c:5982
+#: src/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "絨��医���贋�剛減鐚�"
 
-#: src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:6028
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "��③���緇�筝���絅遵���莅よ�鐚�<BR>"
 
-#: src/protocols/oscar/oscar.c:6021
+#: src/protocols/oscar/oscar.c:6053
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��攻筝������莅よ�</i>"
 
-#: src/protocols/oscar/oscar.c:6026
+#: src/protocols/oscar/oscar.c:6058
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3216,43 +3061,43 @@
 "%s<BR><BR>絋������活���菴�篋�絅遵����域�羆�莅よ�鐚�����������渇�����肢�篋�絅遵�鐚��九��"
 "���獅�����域�羆�莅よ�����"
 
-#: src/protocols/oscar/oscar.c:6042
+#: src/protocols/oscar/oscar.c:6074
 msgid "Available Message:"
 msgstr "��������"
 
-#: src/protocols/oscar/oscar.c:6043
+#: src/protocols/oscar/oscar.c:6075
 msgid "Please talk to me, I'm lonely! (and single)"
 msgstr "絖ょ����篋堺����紫��鐚�莊��������э�"
 
-#: src/protocols/oscar/oscar.c:6105
+#: src/protocols/oscar/oscar.c:6137
 msgid "Set Available Message"
 msgstr "莅丞舟�������"
 
-#: src/protocols/oscar/oscar.c:6119
+#: src/protocols/oscar/oscar.c:6151
 msgid "Change Password (URL)"
 msgstr "�贋�劫���(URL)"
 
-#: src/protocols/oscar/oscar.c:6130
+#: src/protocols/oscar/oscar.c:6162
 msgid "Format Screenname"
 msgstr "�弱������桁��"
 
-#: src/protocols/oscar/oscar.c:6136
+#: src/protocols/oscar/oscar.c:6168
 msgid "Confirm Account"
 msgstr "隋��茣���"
 
-#: src/protocols/oscar/oscar.c:6142
+#: src/protocols/oscar/oscar.c:6174
 msgid "Display Current Registered Address"
 msgstr "�丞ず綵���羈������医��"
 
-#: src/protocols/oscar/oscar.c:6148
+#: src/protocols/oscar/oscar.c:6180
 msgid "Change Current Registered Address"
 msgstr "�贋�劫���羈������医��"
 
-#: src/protocols/oscar/oscar.c:6157
+#: src/protocols/oscar/oscar.c:6189
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�丞ず罩e�����莅よ���絅遵�"
 
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:6197
 msgid "Search for Buddy by Email"
 msgstr "���球���散��膣√ソ��"
 
@@ -3266,15 +3111,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6286 src/protocols/oscar/oscar.c:6288
+#: src/protocols/oscar/oscar.c:6318 src/protocols/oscar/oscar.c:6320
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ �顒��篁�"
 
-#: src/protocols/oscar/oscar.c:6305
+#: src/protocols/oscar/oscar.c:6337
 msgid "Auth host"
 msgstr "莅よ�筝紙��"
 
-#: src/protocols/oscar/oscar.c:6310
+#: src/protocols/oscar/oscar.c:6342
 msgid "Auth port"
 msgstr "莅よ�腴��"
 
@@ -3283,105 +3128,105 @@
 msgid "Looking up %s"
 msgstr "���� %s"
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:508
 #, c-format
 msgid "Unable to write file %s."
 msgstr "��羈����ユ��篁� %s��"
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:511
 #, c-format
 msgid "Unable to read file %s."
 msgstr "��羈�莚糸���篁� %s��"
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:514
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "羔���お�随����� %s 絖���茴����㏍��"
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:517
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s �������糸�ャ��"
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:520
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "筝���莅後� %s ���肴⑥����"
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:523
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "筝√け篋�筝��≧�������菴�篋����≦����綺����吟��"
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:526
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "�� %s 筝㊥��羈���紊���"
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:529
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "��� %s ����羔�������綺�お綽���"
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:532
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "����菴�篋��ヨ�� %s ��羔�����������羔���お紊с��"
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:535
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "����菴�篋��ヨ�� %s ��羔�������������紊�辱��"
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:538
 msgid "Failure."
 msgstr "紊沿乾��"
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:541
 msgid "Too many matches."
 msgstr "�拷��紊����"
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:544
 msgid "Need more qualifiers."
 msgstr "��荀��翫��>散��"
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:547
 msgid "Dir service temporarily unavailable."
 msgstr "������≧���銀�������"
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:550
 msgid "Email lookup restricted."
 msgstr "�球���散�ラ��茴����吟��"
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:553
 msgid "Keyword ignored."
 msgstr "�渇���茴�申�ャ��"
 
-#: src/protocols/toc/toc.c:542
+#: src/protocols/toc/toc.c:556
 msgid "No keywords."
 msgstr "���渇�����"
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:559
 msgid "User has no directory information."
 msgstr "���傑押�����篆≧����"
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:563
 msgid "Country not supported."
 msgstr "�遵�筝�茴�������"
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:566
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "���ュけ茣ワ�%s��"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:572
 msgid "The service is temporarily unavailable."
 msgstr "���≧���銀�������"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:575
 msgid "Your warning level is currently too high to log in."
 msgstr "����茘���膾у��お蕭�鐚���羈��糸�ャ��"
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:578
 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."
@@ -3389,37 +3234,37 @@
 "����ュ���㊤�緇�紊��膵���莚欠�������鐚��九����莚�筝�罨<��絋�����薩膸㊨��莚�鐚�������狗�翫�"
 "�恔��顔�帥��"
 
-#: src/protocols/toc/toc.c:566
+#: src/protocols/toc/toc.c:580
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "����篋����ョ�糸�ラ��莚��%s��"
 
-#: src/protocols/toc/toc.c:569
+#: src/protocols/toc/toc.c:583
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "����篋����ラ��莚� %d��篆≧���%s"
 
-#: src/protocols/toc/toc.c:589
+#: src/protocols/toc/toc.c:603
 msgid "Connection Closed"
 msgstr "菴��ュ群�渇��"
 
-#: src/protocols/toc/toc.c:627
+#: src/protocols/toc/toc.c:641
 msgid "Waiting for reply..."
 msgstr "罩e�������紊�..."
 
-#: src/protocols/toc/toc.c:692
+#: src/protocols/toc/toc.c:706
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 篁�����筝㊥�√�����ー���札��罨≦���羔������"
 
-#: src/protocols/toc/toc.c:880
+#: src/protocols/toc/toc.c:894
 msgid "Password Change Successful"
 msgstr "絲����贋�号����"
 
-#: src/protocols/toc/toc.c:884
+#: src/protocols/toc/toc.c:898
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ����篋� PAUSE �巡擦��"
 
-#: src/protocols/toc/toc.c:885
+#: src/protocols/toc/toc.c:899
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -3429,47 +3274,47 @@
 "絨���権�阪サ��Gaim 絨�篌������������榊��篁私���絎鴻��菴�篁�篁���鹸�句��鐚���篁ヨ���綽�腮�膈���"
 "�祉��"
 
-#: src/protocols/toc/toc.c:1344
+#: src/protocols/toc/toc.c:1358
 msgid "Get Dir Info"
 msgstr "�桁����篆≧��"
 
-#: src/protocols/toc/toc.c:1468
+#: src/protocols/toc/toc.c:1482
 msgid "Set Dir Info"
 msgstr "莅丞舟���篆≧��"
 
-#: src/protocols/toc/toc.c:1591
+#: src/protocols/toc/toc.c:1605
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "��羈���綣� %s ���ワ�"
 
-#: src/protocols/toc/toc.c:1627
+#: src/protocols/toc/toc.c:1641
 msgid "File transfer failed; other side probably canceled."
 msgstr "��篁銀���紊沿乾鐚����遵�銀賢筝�腴��羔�篋�篌�����"
 
-#: src/protocols/toc/toc.c:1672 src/protocols/toc/toc.c:1712
-#: src/protocols/toc/toc.c:1924
+#: src/protocols/toc/toc.c:1686 src/protocols/toc/toc.c:1726
+#: src/protocols/toc/toc.c:1938
 msgid "Could not connect for transfer."
 msgstr "��羈�菴��ヨ�茵�篌�����"
 
-#: src/protocols/toc/toc.c:1836
+#: src/protocols/toc/toc.c:1850
 msgid "Could not connect for transfer!"
 msgstr "��羈�菴��ヨ�茵�篌���鐚�"
 
-#: src/protocols/toc/toc.c:1869
+#: src/protocols/toc/toc.c:1883
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "��羈����ユ��篁九ご����篁九�筝�篌�茴������"
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:1969
+#: src/protocols/toc/toc.c:1983 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr "Gaim - ���筝�..."
 
-#: src/protocols/toc/toc.c:2003
+#: src/protocols/toc/toc.c:2017
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 莚傑� %s �ュ� %d 筝���篁駈�%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2010
+#: src/protocols/toc/toc.c:2024
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 莚傑��������篁�"
@@ -3484,15 +3329,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2085 src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2099 src/protocols/toc/toc.c:2101
 msgid "TOC Protocol Plugin"
 msgstr "TOC �顒��篁�"
 
-#: src/protocols/toc/toc.c:2104
+#: src/protocols/toc/toc.c:2118
 msgid "TOC host"
 msgstr "TOC 筝紙��"
 
-#: src/protocols/toc/toc.c:2108
+#: src/protocols/toc/toc.c:2122
 msgid "TOC port"
 msgstr "TOC 腴��"
 
@@ -3502,12 +3347,12 @@
 msgstr "�寱��拭��"
 
 #. First Name
-#: src/dialogs.c:1990 src/dialogs.c:2644 src/protocols/trepia/trepia.c:300
+#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1931 src/dialogs.c:2562
 msgid "First Name"
 msgstr "��"
 
 #. Last Name
-#: src/dialogs.c:2013 src/dialogs.c:2664 src/protocols/trepia/trepia.c:307
+#: src/protocols/trepia/trepia.c:307 src/dialogs.c:1954 src/dialogs.c:2582
 msgid "Last Name"
 msgstr "紮�"
 
@@ -3566,7 +3411,7 @@
 msgstr "�ヨ��"
 
 #. State
-#: src/dialogs.c:2046 src/dialogs.c:2693 src/protocols/trepia/trepia.c:368
+#: src/protocols/trepia/trepia.c:368 src/dialogs.c:1987 src/dialogs.c:2611
 msgid "State"
 msgstr "綏�/��"
 
@@ -3575,11 +3420,6 @@
 msgid "Set your Trepia profile data."
 msgstr "莅丞舟���� Trepia 莎�����"
 
-#: src/dialogs.c:2088 src/dialogs.c:2269 src/dialogs.c:3435 src/dialogs.c:4240
-#: src/dialogs.c:4878 src/gtkrequest.c:177 src/protocols/trepia/trepia.c:379
-msgid "Save"
-msgstr "篆�絖�"
-
 #: src/protocols/trepia/trepia.c:523
 msgid "Set Profile"
 msgstr "莅丞舟莎���"
@@ -3600,6 +3440,10 @@
 msgid "Logging in"
 msgstr "�糸��"
 
+#: src/protocols/trepia/trepia.c:1148
+msgid "Unable to create socket"
+msgstr "��羈���綮阪��ュ�"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -3618,6 +3462,14 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "��������� Yahoo! 羔�����"
 
+#: src/protocols/yahoo/yahoo.c:897
+msgid "Unable to read"
+msgstr "��羈�莚糸�"
+
+#: src/protocols/yahoo/yahoo.c:995
+msgid "Connection problem"
+msgstr "菴��ラ���"
+
 #: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1265
 #: src/protocols/yahoo/yahoo.c:1339
 msgid "Not At Home"
@@ -3802,23 +3654,23 @@
 "Spencer (��紮�篏���) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko."
 "net</A>&gt;<BR>  Syd Logan (薨�絎√��筝�絮�薊怨���綺�[lazy bum])<BR><BR>"
 
-#: src/away.c:222
+#: src/away.c:211
 msgid "Gaim - Away!"
 msgstr "Gaim - 胼糸�鐚�"
 
-#: src/away.c:282
+#: src/away.c:272
 msgid "I'm Back!"
 msgstr "�����ヤ�鐚�"
 
-#: src/away.c:384
+#: src/away.c:377
 msgid "New Away Message"
 msgstr "�医産胼糸�羔���"
 
-#: src/away.c:404
+#: src/away.c:397
 msgid "Remove Away Message"
 msgstr "���ょ�綣�羔���"
 
-#: src/away.c:599
+#: src/away.c:592
 msgid "Set All Away"
 msgstr "�����筝榊�綣�"
 
@@ -3829,39 +3681,42 @@
 #: src/blist.c:751
 #, c-format
 msgid ""
+"%d buddy from group %s was not removed because its account was not logged "
+"in.  This buddy and the group were not removed.\n"
+msgid_plural ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
-msgstr ""
-"%2$s 膸�筝㊦�� %1$d 筝�ソ�������わ��������篁���茣��傑���糸�ャ��菴�篋�絅遵���莚ョ�筝�篌�茴���"
+msgstr[0] ""
+"%2$s 膸�筝㊦�� %1$d 筝�ソ�������わ��������区侃�傑���糸�ャ��菴�篋�絅遵���莚ョ�筝�篌�茴���"
 "�ゃ��\n"
 
-#: src/blist.c:756
+#: src/blist.c:760
 msgid "Group not removed"
 msgstr "膸�������"
 
-#: src/blist.c:947
+#: src/blist.c:973
 msgid "Invalid Groupname"
 msgstr "膸�������"
 
-#: src/blist.c:1703
+#: src/blist.c:1729
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "紊�������絅遵���茵��九�咲����絅遵���茵�����ャ��"
 
-#: src/blist.c:1705
+#: src/blist.c:1731
 msgid "Buddy List Error"
 msgstr "絅遵���茵��咲��"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1713
+#: src/blist.c:1739
 #, 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:1716
+#: src/blist.c:1742
 msgid "Converting Buddy List"
 msgstr "罩e��習�√ソ����茵�"
 
@@ -3882,7 +3737,7 @@
 msgid "There was an error launching your chosen browser: %s"
 msgstr "莪�����������羌頵��� %s �咲��"
 
-#: src/buddy_chat.c:316 src/dialogs.c:1333
+#: src/buddy_chat.c:316 src/dialogs.c:1274
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -3905,6 +3760,29 @@
 msgid "Join"
 msgstr "����"
 
+#: src/connection.c:113
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "膽阪� %s ���顒��篁�"
+
+#: src/connection.c:118 src/connection.c:408
+msgid "Connection Error"
+msgstr "菴��ラ��莚�"
+
+#: src/connection.c:138
+#, c-format
+msgid "Enter password for %s"
+msgstr "莨��� %s ��絲���"
+
+#: src/connection.c:404
+#, c-format
+msgid "%s has been disconnected"
+msgstr "%s 綏牙��㊤�菴���"
+
+#: src/connection.c:407
+msgid "Reason Unknown."
+msgstr "�������ャ��"
+
 #: src/conversation.c:405
 msgid "Unable to send message. The message is too large."
 msgstr "��羈�����羔�����羔���お紊с��"
@@ -3913,56 +3791,56 @@
 msgid "Unable to send message."
 msgstr "��羈�����羔�����"
 
-#: src/conversation.c:1926
+#: src/conversation.c:1924
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 菴��ヤ���紊����"
 
-#: src/conversation.c:1929
+#: src/conversation.c:1927
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 菴��ヤ���紊����"
 
-#: src/conversation.c:1979
+#: src/conversation.c:1977
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �医��û�� %s��"
 
-#: src/conversation.c:2021
+#: src/conversation.c:2019
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 胼糸�篋���紊��(%s)��"
 
-#: src/conversation.c:2023
+#: src/conversation.c:2021
 #, c-format
 msgid "%s left the room."
 msgstr "%s 胼糸�篋���紊����"
 
-#: src/conversation.c:2224
+#: src/conversation.c:2222
 msgid "Last created window"
 msgstr "筝�罨≦��綮榊��腦���"
 
+#: src/conversation.c:2224
+msgid "New window"
+msgstr "�医産腦���"
+
 #: src/conversation.c:2226
-msgid "New window"
-msgstr "�医産腦���"
-
-#: src/conversation.c:2228
 msgid "By group"
 msgstr "��膸�"
 
-#: src/conversation.c:2230
+#: src/conversation.c:2228
 msgid "By account"
 msgstr "��茣���"
 
-#: src/dialogs.c:345
+#: src/dialogs.c:337
 msgid "Warn User"
 msgstr "茘�������"
 
-#: src/dialogs.c:348
+#: src/dialogs.c:340
 msgid "_Warn"
 msgstr "茘���(_W)"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:356
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3974,89 +3852,89 @@
 "\n"
 "菴�絨�紜��� %s ��茘���膾у���篁�/絅剛�絨�茴�辱�球��翫��筝ユ�主����綺����吟��\n"
 
-#: src/dialogs.c:373
+#: src/dialogs.c:365
 msgid "Warn _anonymously?"
 msgstr "�水��茘�����(_A)鐚�"
 
-#: src/dialogs.c:380
+#: src/dialogs.c:372
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�水��茘���莨�筝�絎号��綣�莎傑絵���</b>"
 
-#: src/dialogs.c:455
+#: src/dialogs.c:449
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "���喝�篁�����絅遵���茵�賢���� %s��������荀�菴�箙�����鐚�"
 
-#: src/dialogs.c:457 src/dialogs.c:458
+#: src/dialogs.c:451 src/dialogs.c:452
 msgid "Remove Buddy"
 msgstr "���ゅソ��"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:461
 #, 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:469 src/dialogs.c:470
+#: src/dialogs.c:463 src/dialogs.c:464
 msgid "Remove Chat"
 msgstr "���よ��紊�"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:473
 #, 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:482 src/dialogs.c:483
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Group"
 msgstr "���ょ�"
 
-#: src/dialogs.c:632
+#: src/dialogs.c:626
 msgid "New Message"
 msgstr "�井���"
 
-#: src/dialogs.c:650
+#: src/dialogs.c:644
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "���活�莊�莪���鐚�莚決��ヤ�/絅合�����桁����\n"
 
-#: src/dialogs.c:666 src/dialogs.c:743 src/dialogs.c:3767
+#: src/dialogs.c:660 src/dialogs.c:737
 msgid "_Screenname:"
 msgstr "���桁��(_S)鐚�"
 
-#: src/dialogs.c:681 src/dialogs.c:759 src/gtkpounce.c:408
+#: src/dialogs.c:675 src/dialogs.c:753 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "茣���(_A)鐚�"
 
-#: src/dialogs.c:712
+#: src/dialogs.c:706
 msgid "Get User Info"
 msgstr "�桁����隙拭��"
 
-#: src/dialogs.c:731
+#: src/dialogs.c:725
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "���活��ョ��莪���篆≧���莚決��ヤ�/絅合�����桁����\n"
 
-#: src/dialogs.c:889
+#: src/dialogs.c:863
 msgid "Add Group"
 msgstr "羞糸��膸�"
 
-#: src/dialogs.c:906
-msgid "Please enter the name of the group to be added.\n"
-msgstr "莚決��ヨ�羞糸����膸���腱違��\n"
-
-#: src/dialogs.c:915 src/dialogs.c:4319
-msgid "_Group:"
-msgstr "膸�(_G)鐚�"
-
-#: src/dialogs.c:951
+#: src/dialogs.c:863
+msgid "Add a new group"
+msgstr "羞糸���亥�"
+
+#: src/dialogs.c:864
+msgid "Please enter the name of the group to be added."
+msgstr "莚決��ヨ�羞糸����膸���腱違��"
+
+#: src/dialogs.c:892
 msgid "Add Buddy"
 msgstr "羞糸��絅遵�"
 
-#: src/dialogs.c:970
+#: src/dialogs.c:911
 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. "
@@ -4065,327 +3943,366 @@
 "���活�絨�莪���筝阪ソ��鐚�莚決��ヤ�/絅合�����桁���������減絅遵�莨��ュ�������窮О���������"
 "��莚�鐚�����絨�篌��推撮���桁���丞ず��\n"
 
-#: src/dialogs.c:989
+#: src/dialogs.c:930
 msgid "Screen Name"
 msgstr "���桁��"
 
-#: src/dialogs.c:1002
+#: src/dialogs.c:943
 msgid "Alias"
 msgstr "����"
 
-#: src/dialogs.c:1012
+#: src/dialogs.c:953
 msgid "Group"
 msgstr "膸�"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1021
+#: src/dialogs.c:962
 msgid "Add To"
 msgstr "羞糸����"
 
-#: src/dialogs.c:1340
+#: src/dialogs.c:1281
 msgid "Add Chat"
 msgstr "羞糸����紊�"
 
-#: src/dialogs.c:1363
+#: src/dialogs.c:1304
 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:1372
+#: src/dialogs.c:1313
 msgid "Account:"
 msgstr "茣��件�"
 
-#: src/dialogs.c:1391 src/gtkaccount.c:427
+#: src/dialogs.c:1332 src/gtkaccount.c:428
 msgid "Alias:"
 msgstr "����鐚�"
 
-#: src/dialogs.c:1402
+#: src/dialogs.c:1343
 msgid "Group:"
 msgstr "膸�鐚�"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1689
 msgid "Privacy"
 msgstr "��腱�"
 
-#: src/dialogs.c:1764
+#: src/dialogs.c:1705
 msgid "Changes to privacy settings take effect immediately."
 msgstr "絲拷��腱�莅丞舟���贋�劫�篌�腴��括������"
 
-#: src/dialogs.c:1773
+#: src/dialogs.c:1714
 msgid "Set privacy for:"
 msgstr "莅丞舟��腱���茣��件�"
 
-#: src/dialogs.c:1790
+#: src/dialogs.c:1731
 msgid "Allow all users to contact me"
 msgstr "��莅御�������決��膤紙��"
 
-#: src/dialogs.c:1794
+#: src/dialogs.c:1735
 msgid "Allow only users on my buddy list"
 msgstr "����莅御����絅遵���膤紙��"
 
-#: src/dialogs.c:1798
+#: src/dialogs.c:1739
 msgid "Allow only the users below"
 msgstr "����莅娯札筝�����"
 
-#: src/dialogs.c:1836
+#: src/dialogs.c:1777
 msgid "Deny all users"
 msgstr "��膸���������"
 
-#: src/dialogs.c:1840
+#: src/dialogs.c:1781
 msgid "Block the users below"
 msgstr "絮�恔札筝�����"
 
-#: src/dialogs.c:1956
+#: src/dialogs.c:1897
 msgid "Set Directory Info"
 msgstr "莅丞舟���篆≧��"
 
-#: src/dialogs.c:1964
+#: src/dialogs.c:1905
 msgid "Directory Info"
 msgstr "���篆≧��"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:1915
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "莅丞舟 %s �����篆≧���"
 
-#: src/dialogs.c:1987
+#: src/dialogs.c:1928
 msgid "Allow Web Searches To Find Your Info"
 msgstr "��莅御��膣√����ユ�丈����篆≧��"
 
 #. Line 2
-#: src/dialogs.c:2001 src/dialogs.c:2654
+#: src/dialogs.c:1942 src/dialogs.c:2572
 msgid "Middle Name"
 msgstr "筝㊤��"
 
 #. Line 4
-#: src/dialogs.c:2024 src/dialogs.c:2674
+#: src/dialogs.c:1965 src/dialogs.c:2592
 msgid "Maiden Name"
 msgstr "紲�絎九��"
 
-#: src/dialogs.c:2111
+#: src/dialogs.c:2052
 msgid "New passwords do not match."
 msgstr "�医���筝��後����"
 
-#: src/dialogs.c:2117
+#: src/dialogs.c:2058
 msgid "Fill out all fields completely."
 msgstr "絎���゛�ユ����絖�罧泣��"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2103
 #, c-format
 msgid "Changing password for %s:"
 msgstr "�贋�� %s ��絲���鐚�"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2111
 msgid "Original Password"
 msgstr "��"
 
-#: src/dialogs.c:2181
+#: src/dialogs.c:2122
 msgid "New Password"
 msgstr "�医���"
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2133
 msgid "New Password (again)"
 msgstr "��罨∴��ユ�医���"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2182
 #, c-format
 msgid "Changing info for %s:"
 msgstr "�贋�� %s ��篆≧���"
 
-#: src/dialogs.c:2327
+#: src/dialogs.c:2268
 msgid "Below are the results of your search: "
 msgstr "筝��∽������膣∝��膸���鐚�"
 
-#: src/dialogs.c:2438
-msgid "Permit"
-msgstr "莅後�"
-
-#: src/dialogs.c:2470
-msgid "Add Permit"
-msgstr "闋糸��莅後�"
-
-#: src/dialogs.c:2472
-msgid "Add Deny"
-msgstr "闋糸����膸�"
-
-#: src/dialogs.c:2539
+#: src/dialogs.c:2369
+#, c-format
+msgid "Unblock %s?"
+msgstr "��羔�絲� %s ��絮�恖��鐚�"
+
+#: src/dialogs.c:2371
+#, c-format
+msgid ""
+"You are about to unblock %s. This will allow %s to speak to you again. Do "
+"you want to continue?"
+msgstr "���喝���羔�絲� %s ��絮�恑��菴�絨���莅� %s ���遺���困莪������活�膸х鮫��鐚�"
+
+#: src/dialogs.c:2375 src/dialogs.c:2388
+msgid "Unblock User"
+msgstr "��羔�絲合���欠��絮��"
+
+#: src/dialogs.c:2377 src/gtkrequest.c:197
+msgid "Unblock"
+msgstr "��闉�絮��"
+
+#: src/dialogs.c:2382
+#, c-format
+msgid "Block %s?"
+msgstr "鎡�� %s ����"
+
+#: src/dialogs.c:2384
+#, c-format
+msgid ""
+"You are about to block %s. This will prevent %s from speaking to you again. "
+"Do you want to continue?"
+msgstr "���喝�絮�� %s��颷�絨�胼�罩� %s 筝���困莪������活�膸х鮫��鐚�"
+
+#. Block button
+#: src/dialogs.c:2390 src/gtkconv.c:2995 src/gtkrequest.c:196
+msgid "Block"
+msgstr "絮��"
+
+#: src/dialogs.c:2457
 msgid "Log Conversation"
 msgstr "鎛壕�莅医�"
 
-#: src/dialogs.c:2620 src/dialogs.c:2753
+#: src/dialogs.c:2538 src/dialogs.c:2671
 msgid "Search for Buddy"
 msgstr "��膣√ソ��"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2638
 msgid "Find Buddy By Info"
 msgstr "��篆≧���ユ�上ソ��"
 
-#: src/dialogs.c:2747
+#: src/dialogs.c:2665
 msgid "Find Buddy By Email"
 msgstr "���球���散�ユ�上ソ��"
 
-#: src/dialogs.c:2851
+#: src/dialogs.c:2769
 msgid "Insert Link"
 msgstr "���ラ�丈・"
 
-#: src/dialogs.c:2853
+#: src/dialogs.c:2771
 msgid "Insert"
 msgstr "����"
 
-#: src/dialogs.c:2872
+#: src/dialogs.c:2790
 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:3041 src/dialogs.c:3058
+#: src/dialogs.c:2959 src/dialogs.c:2976
 msgid "Select Text Color"
 msgstr "������絖�蘂���"
 
-#: src/dialogs.c:3093 src/dialogs.c:3110
+#: src/dialogs.c:3011 src/dialogs.c:3028
 msgid "Select Background Color"
 msgstr "�����������"
 
-#: src/dialogs.c:3207 src/dialogs.c:3233
+#: src/dialogs.c:3125 src/dialogs.c:3151
 msgid "Select Font"
 msgstr "�����篏�"
 
-#: src/dialogs.c:3299
+#: src/dialogs.c:3217
 msgid "You cannot save an away message with a blank title"
 msgstr "����巡�絖�腥堺��蘂���胼糸�羔���"
 
-#: src/dialogs.c:3301
+#: src/dialogs.c:3219
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "莚欠�羔�����絎���蘂�鐚�����筝�篆�絖��贋・��篏睡������"
 
-#: src/dialogs.c:3311
+#: src/dialogs.c:3229
 msgid "You cannot create an empty away message"
 msgstr "����遵��綮榊���胼糸�羔���"
 
-#: src/dialogs.c:3376 src/dialogs.c:3384
+#: src/dialogs.c:3294 src/dialogs.c:3302
 msgid "New away message"
 msgstr "�医産胼糸�羔���"
 
-#: src/dialogs.c:3394
+#: src/dialogs.c:3312
 msgid "Away title: "
 msgstr "胼糸���蘂�鐚�"
 
-#: src/dialogs.c:3439
+#: src/dialogs.c:3357
 msgid "Save & Use"
 msgstr "篆�絖�綛銀戎��"
 
-#: src/dialogs.c:3443
+#: src/dialogs.c:3361
 msgid "Use"
 msgstr "篏睡��"
 
 #. show everything
-#: src/dialogs.c:3592
+#: src/dialogs.c:3510
 msgid "Smile!"
 msgstr "膃���"
 
-#: src/dialogs.c:3638
+#: src/dialogs.c:3528
 msgid "Alias Chat"
 msgstr "膸���紊�儀��"
 
-#. Setup the label containing the description.
-#: src/dialogs.c:3667
-msgid "Please enter an aliased name for this chat.\n"
-msgstr "莚決��ユ④��紊���������\n"
-
-#: src/dialogs.c:3679 src/dialogs.c:3782
-msgid "_Alias:"
-msgstr "����(_A)鐚�"
-
-#: src/dialogs.c:3716
+#: src/dialogs.c:3528
+msgid "Alias chat"
+msgstr "膸���紊�儀��"
+
+#: src/dialogs.c:3529
+msgid "Please enter an aliased name for this chat."
+msgstr "莚決��ユ④��紊���������"
+
+#: src/dialogs.c:3560
+msgid "_Screenname"
+msgstr "���桁��(_S)"
+
+#: src/dialogs.c:3564 src/gtkblist.c:429 src/gtkblist.c:475
+msgid "_Alias"
+msgstr "����(_A)"
+
+#: src/dialogs.c:3568
 msgid "Alias Buddy"
 msgstr "絅遵�����"
 
-#. Setup the label containing the description.
-#: src/dialogs.c:3746
+#: src/dialogs.c:3569
+msgid "Alias buddy"
+msgstr "絅遵�����"
+
+#: src/dialogs.c:3570
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list.\n"
-msgstr "莚隙減篁ヤ�絅遵�莨��ュ����鐚�������ソ����茵�賢膸�莚ヨ��膤私査�劫����\n"
-
-#: src/dialogs.c:3836 src/dialogs.c:3843
+"your buddy list."
+msgstr "莚隙減篁ヤ�絅遵�莨��ュ����鐚�������ソ����茵�賢膸�莚ヨ��膤私査�劫����"
+
+#: src/dialogs.c:3606 src/dialogs.c:3613
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "��羈����� %s��"
 
-#: src/dialogs.c:3867
+#: src/dialogs.c:3637
 msgid "Save Log File"
 msgstr "篆�絖��ュ���篁�"
 
-#: src/dialogs.c:3897
+#: src/dialogs.c:3667
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "��羈����ゆ��篁� %s��"
 
-#: src/dialogs.c:3916
+#: src/dialogs.c:3686
 msgid "Clear Log"
 msgstr "羝��ゆ�ュ�"
 
-#: src/dialogs.c:3925
+#: src/dialogs.c:3695
 msgid "Really clear log?"
 msgstr "����荀�羝��ゆ�ュ���鐚�"
 
-#: src/dialogs.c:3970
+#: src/dialogs.c:3740
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "��羈���綣��ュ���篁� %s��"
 
-#: src/dialogs.c:4112
+#: src/dialogs.c:3882
 #, c-format
 msgid "Conversations with %s"
 msgstr "筝� %s ��絲壕�"
 
-#: src/dialogs.c:4114
+#: src/dialogs.c:3884
 msgid "System Log"
 msgstr "膤紫��ュ�"
 
-#: src/dialogs.c:4135
+#: src/dialogs.c:3905
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "��羈���綣��ュ���篁� %s"
 
-#: src/dialogs.c:4156
+#: src/dialogs.c:3926
 msgid "Date"
 msgstr "�ユ��"
 
-#: src/dialogs.c:4213
+#: src/dialogs.c:3983
 msgid "Log"
 msgstr "�ュ�"
 
-#: src/dialogs.c:4235
+#: src/dialogs.c:4005
 msgid "Clear"
 msgstr "羝���"
 
-#: src/dialogs.c:4293
+#: src/dialogs.c:4044
 msgid "Rename Group"
 msgstr "���遵��膸�"
 
-#: src/dialogs.c:4310
-msgid "Please enter a new name for the selected group.\n"
-msgstr "莚決��ラ��筝㊦����医��絖���\n"
-
-#: src/ft.c:121
+#: src/dialogs.c:4044
+msgid "New group name"
+msgstr "�亥���腱�"
+
+#: src/dialogs.c:4045
+msgid "Please enter a new name for the selected group."
+msgstr "莚決��ラ��筝㊦����医��絖���"
+
+#: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 筝�����羈�����篁九����\n"
 
-#: src/ft.c:135
+#: src/ft.c:137
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s ���上�違��\n"
 
-#: src/ft.c:727
+#: src/ft.c:693
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "��賢罩≫�膸� %s ����篁銀�����\n"
 
-#: src/ft.c:729
+#: src/ft.c:695
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "%s 筝㊥②篋�膸�������篁銀�����\n"
@@ -4476,28 +4393,28 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "�������������"
 
-#: src/gaimrc.c:364 src/gaimrc.c:1596
+#: src/gaimrc.c:368 src/gaimrc.c:1600
 msgid "boring default"
 msgstr "��Ⅶ��篋�"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:1393
+#: src/gaimrc.c:1264 src/gtkblist.c:1394
 msgid "Alphabetical"
 msgstr "絖�罸�綺�"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:1394
+#: src/gaimrc.c:1266 src/gtkblist.c:1395
 msgid "By status"
 msgstr "���倶��"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:1395
+#: src/gaimrc.c:1268 src/gtkblist.c:1396
 msgid "By log size"
 msgstr "���ュ�紊у�"
 
-#: src/gaimrc.c:1694
+#: src/gaimrc.c:1698
 #, c-format
 msgid "Could not open config file %s."
 msgstr "��羈���綣���臀���篁� %s��"
 
-#: src/gtkaccount.c:252
+#: src/gtkaccount.c:253
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4509,142 +4426,142 @@
 "<b>�上�鎀у�鐚�</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:327
+#: src/gtkaccount.c:328
 msgid "Login Options"
 msgstr "�糸�ラ��蕁�"
 
-#: src/gtkaccount.c:344
+#: src/gtkaccount.c:345
 msgid "Protocol:"
 msgstr "�顒��"
 
-#: src/gtkaccount.c:349
+#: src/gtkaccount.c:350
 msgid "Screenname:"
 msgstr "���桁��鐚�"
 
-#: src/gtkaccount.c:431
+#: src/gtkaccount.c:432
 msgid "Remember password"
 msgstr "莅遺�絲���"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:485
+#: src/gtkaccount.c:486
 msgid "User Options"
 msgstr "���潔��蕁�"
 
-#: src/gtkaccount.c:498
+#: src/gtkaccount.c:499
 msgid "New mail notifications"
 msgstr "�育��散����"
 
-#: src/gtkaccount.c:507
+#: src/gtkaccount.c:508
 msgid "Buddy icon file:"
 msgstr "絅遵��丈����篁駈�"
 
-#: src/gtkaccount.c:516
+#: src/gtkaccount.c:517
 msgid "_Browse"
 msgstr "羌頵�(_B)"
 
-#: src/gtkaccount.c:522
+#: src/gtkaccount.c:523
 msgid "_Reset"
 msgstr "��臀�(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:583
+#: src/gtkaccount.c:584
 #, c-format
 msgid "%s Options"
 msgstr "%s ��蕁�"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:704
+#: src/gtkaccount.c:705
 msgid "Use Global Proxy Settings"
 msgstr "篏睡�����篁g��莅丞舟"
 
 #. No Proxy
-#: src/gtkaccount.c:711
+#: src/gtkaccount.c:712
 msgid "No Proxy"
 msgstr "��篁g��"
 
 #. HTTP
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:719
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:725
+#: src/gtkaccount.c:726
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:732
+#: src/gtkaccount.c:733
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/gtkaccount.c:764
+#: src/gtkaccount.c:765
 msgid "you can see the butterflies mating"
 msgstr ""
 
-#: src/gtkaccount.c:768
+#: src/gtkaccount.c:769
 msgid "If you look real closely"
 msgstr ""
 
-#: src/gtkaccount.c:784
+#: src/gtkaccount.c:785
 msgid "Proxy Options"
 msgstr "篁g����蕁�"
 
-#: src/gtkaccount.c:800 src/gtkprefs.c:1100
+#: src/gtkaccount.c:801 src/gtkprefs.c:1100
 msgid "Proxy _type:"
 msgstr "篁g��膠糸��(_T)鐚�"
 
-#: src/gtkaccount.c:809
+#: src/gtkaccount.c:810
 msgid "_Host:"
 msgstr "筝紙��(_H)鐚�"
 
-#: src/gtkaccount.c:813
+#: src/gtkaccount.c:814
 msgid "_Port:"
 msgstr "腴��(_P)��"
 
-#: src/gtkaccount.c:821
+#: src/gtkaccount.c:822
 msgid "_Username:"
 msgstr "���桁��(_U)鐚�"
 
-#: src/gtkaccount.c:826
+#: src/gtkaccount.c:827
 msgid "Pa_ssword:"
 msgstr "絲���(_S)鐚�"
 
-#: src/gtkaccount.c:1139
+#: src/gtkaccount.c:1140
 msgid "Add Account"
 msgstr "羞糸��茣���"
 
-#: src/gtkaccount.c:1141
+#: src/gtkaccount.c:1142
 msgid "Modify Account"
 msgstr "篆��壕侃��"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1165
+#: src/gtkaccount.c:1166
 msgid "Show more options"
 msgstr "�丞ず������蕁�"
 
-#: src/gtkaccount.c:1166
+#: src/gtkaccount.c:1167
 msgid "Show fewer options"
 msgstr "�丞ず筝肢���蕁�"
 
 #. Register button
-#: src/gtkaccount.c:1193
+#: src/gtkaccount.c:1194
 msgid "Register"
 msgstr "羈���"
 
-#: src/gtkaccount.c:1472
+#: src/gtkaccount.c:1473
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�������活����� %s ��鐚�"
 
-#: src/gtkaccount.c:1476 src/gtkrequest.c:174
+#: src/gtkaccount.c:1477 src/gtkrequest.c:192
 msgid "Delete"
 msgstr "����"
 
-#: src/gtkaccount.c:1554
+#: src/gtkaccount.c:1555
 msgid "Screenname"
 msgstr "���桁��"
 
-#: src/gtkaccount.c:1595
+#: src/gtkaccount.c:1596
 msgid "Protocol"
 msgstr "�顒�"
 
@@ -4672,10 +4589,6 @@
 msgid "Auto-Join"
 msgstr "��������"
 
-#: src/gtkblist.c:429 src/gtkblist.c:475
-msgid "_Alias"
-msgstr "����(_A)"
-
 #: src/gtkblist.c:431 src/gtkblist.c:477
 msgid "_Remove"
 msgstr "����(_R)"
@@ -4873,73 +4786,73 @@
 "\n"
 "<b>�倶��</b>鐚�羞隙恒"
 
-#: src/gtkblist.c:1227
+#: src/gtkblist.c:1228
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "���>賢 (%d絨��%02d��) "
 
-#: src/gtkblist.c:1229
+#: src/gtkblist.c:1230
 #, c-format
 msgid "Idle (%dm) "
 msgstr "����賢 (%d��) "
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1234
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%) "
 
-#: src/gtkblist.c:1236
+#: src/gtkblist.c:1237
 msgid "Offline "
 msgstr "胼紫鎖 "
 
-#: src/gtkblist.c:1392 src/gtkprefs.c:845 src/gtkprefs.c:1535
+#: src/gtkblist.c:1393 src/gtkprefs.c:845 src/gtkprefs.c:1535
 msgid "None"
 msgstr "��"
 
-#: src/gtkblist.c:1431 src/gtkprefs.c:2289
+#: src/gtkblist.c:1432 src/gtkprefs.c:2289
 msgid "Buddy List"
 msgstr "絅遵���茵�"
 
-#: src/gtkblist.c:1455
+#: src/gtkblist.c:1456
 msgid "/Tools/Away"
 msgstr "/綏ュ��(T)/胼糸�(A)"
 
-#: src/gtkblist.c:1458
+#: src/gtkblist.c:1459
 msgid "/Tools/Buddy Pounce"
 msgstr "/綏ュ��(T)/絅遵�������(P)"
 
-#: src/gtkblist.c:1461
+#: src/gtkblist.c:1462
 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:1544
+#: src/gtkblist.c:1545
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(O)"
 
-#: src/gtkblist.c:1546
+#: src/gtkblist.c:1547
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�(B)/�丞ず腥榊�(E)"
 
-#: src/gtkblist.c:1564 src/gtkconv.c:1071
+#: src/gtkblist.c:1565 src/gtkconv.c:1073
 msgid "IM"
 msgstr "綣���"
 
-#: src/gtkblist.c:1570
+#: src/gtkblist.c:1571
 msgid "Send a message to the selected buddy"
 msgstr "����筝㊤ソ������羔���"
 
-#: src/gtkblist.c:1579
+#: src/gtkblist.c:1580
 msgid "Get information on the selected buddy"
 msgstr "�桁���筝㊤ソ����篆≧��"
 
-#: src/gtkblist.c:1587
+#: src/gtkblist.c:1588
 msgid "Join a chat room"
 msgstr "���ヨ��紊��"
 
-#: src/gtkblist.c:1595
+#: src/gtkblist.c:1596
 msgid "Set an away message"
 msgstr "莅丞舟胼糸�羔���"
 
@@ -4947,355 +4860,349 @@
 msgid "No actions available"
 msgstr "羃≧����������篏�"
 
-#: src/gtkconn.c:56 src/gtkconn.c:241 src/gtkconn.c:254
+#: src/gtkconn.c:57 src/gtkconn.c:242 src/gtkconn.c:255
 msgid "Done."
 msgstr "絎�����"
 
-#: src/gtkconn.c:135
+#: src/gtkconn.c:136
 msgid "Signon: "
 msgstr "�糸�ワ�"
 
-#: src/gtkconn.c:193
+#: src/gtkconn.c:194
 msgid "Signon"
 msgstr "�糸��"
 
-#: src/gtkconn.c:206
+#: src/gtkconn.c:207
 msgid "Cancel All"
 msgstr "�����羔�"
 
-#: src/gtkconv.c:180
-#, fuzzy
+#: src/gtkconv.c:182
 msgid "That file already exists"
-msgstr "莚ユ��篁銀�絖�����"
-
-#: src/gtkconv.c:181 src/gtkft.c:1034
+msgstr "莚ユ��篁銀�絖���"
+
+#: src/gtkconv.c:183 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "�������活�荀���鐚�"
 
-#: src/gtkconv.c:276
+#: src/gtkconv.c:278
 msgid "Gaim - Insert Image"
 msgstr "Gaim - ���ュ�上��"
 
-#: src/gtkconv.c:580
+#: src/gtkconv.c:582
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - ��莚桁ソ��菴��ヨ��紊��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:608
+#: src/gtkconv.c:610
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "���活���莚決�鐚�莚決��ヤ�/絅合����絖�鐚�篁ュ���������莚傑�����"
 
-#: src/gtkconv.c:629
+#: src/gtkconv.c:631
 msgid "_Buddy:"
 msgstr "絅遵�(_B)鐚�"
 
-#: src/gtkconv.c:649
+#: src/gtkconv.c:651
 msgid "_Message:"
 msgstr "羔���(_M)鐚�"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1081
 msgid "Un-Ignore"
 msgstr "��羔�綽順��"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:777
+#: src/gtkconv.c:1083 src/gtkprefs.c:777
 msgid "Ignore"
 msgstr "綽順��"
 
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:2986
+#: src/gtkconv.c:1092 src/gtkconv.c:2988
 msgid "Info"
 msgstr "篆≧��"
 
-#: src/gtkconv.c:1110 src/gtkconv.c:2969 src/gtkconv.c:4108
-#: src/gtkrequest.c:176
+#: src/gtkconv.c:1112 src/gtkconv.c:2971 src/gtkconv.c:4111
+#: src/gtkrequest.c:194
 msgid "Remove"
 msgstr "����"
 
-#: src/gtkconv.c:2199
+#: src/gtkconv.c:2201
 msgid "User is typing..."
 msgstr "���傑③����絖�..."
 
-#: src/gtkconv.c:2207
+#: src/gtkconv.c:2209
 msgid "User has typed something and paused"
 msgstr "���傑��篋���筝��鐚���篋�筝�筝�"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2309
+#: src/gtkconv.c:2311
 msgid "_Send As"
 msgstr "����荳�蚕(_S)"
 
-#: src/gtkconv.c:2765
+#: src/gtkconv.c:2767
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - 篆�絖�絲壕�"
 
 #. Conversation menu
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2784
 msgid "/_Conversation"
 msgstr "/絲壕�(_C)"
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2786
 msgid "/Conversation/_Save As..."
 msgstr "/絲壕�(C)/���筝�(_S)..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2788
 msgid "/Conversation/View _Log..."
 msgstr "/絲壕�(C)/�ョ���ュ�(_L)..."
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:2792
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/絲壕�(C)/羞糸��絅遵�������(_P)..."
 
-#: src/gtkconv.c:2792
+#: src/gtkconv.c:2794
 msgid "/Conversation/A_lias..."
 msgstr "/絲壕�(C)/����(_L)..."
 
-#: src/gtkconv.c:2794
+#: src/gtkconv.c:2796
 msgid "/Conversation/_Get Info..."
 msgstr "/絲壕�(C)/�桁�篆≧��(_G)..."
 
-#: src/gtkconv.c:2796
+#: src/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/絲壕�(C)/��莚�(_V)..."
 
-#: src/gtkconv.c:2801
+#: src/gtkconv.c:2803
 msgid "/Conversation/Insert _URL..."
 msgstr "/絲壕�(C)/���� URL(_U)..."
 
-#: src/gtkconv.c:2803
+#: src/gtkconv.c:2805
 msgid "/Conversation/Insert _Image..."
 msgstr "/絲壕�(C)/���ュ�上��(_I)..."
 
-#: src/gtkconv.c:2808
-msgid "/Conversation/_Warn..."
-msgstr "/絲壕�(C)/茘���(_W)..."
-
 #: src/gtkconv.c:2810
+msgid "/Conversation/_Warn..."
+msgstr "/絲壕�(C)/茘���(_W)..."
+
+#: src/gtkconv.c:2812
 msgid "/Conversation/_Block..."
 msgstr "/絲壕�(C)/絮��(_B)..."
 
-#: src/gtkconv.c:2812
+#: src/gtkconv.c:2814
 msgid "/Conversation/_Add..."
 msgstr "/鎛壕�(C)/羞糸��(_A)..."
 
-#: src/gtkconv.c:2814
+#: src/gtkconv.c:2816
 msgid "/Conversation/_Remove..."
 msgstr "/絲壕�(C)/����(_R)..."
 
-#: src/gtkconv.c:2819
+#: src/gtkconv.c:2821
 msgid "/Conversation/_Close"
 msgstr "/絲壕�(C)/�渇��(_C)"
 
 #. Options
-#: src/gtkconv.c:2823
+#: src/gtkconv.c:2825
 msgid "/_Options"
 msgstr "/��蕁�(_O)"
 
-#: src/gtkconv.c:2824
+#: src/gtkconv.c:2826
 msgid "/Options/Enable _Logging"
 msgstr "/��蕁�(O)/��莅梧�綵��ュ�(_L)"
 
-#: src/gtkconv.c:2825
+#: src/gtkconv.c:2827
 msgid "/Options/Enable _Sounds"
 msgstr "/��蕁�(O)/��莅後0��(_S)"
 
-#: src/gtkconv.c:2865
+#: src/gtkconv.c:2867
 msgid "/Conversation/View Log..."
 msgstr "/絲壕�(C)/�ョ���ュ�(L)..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2872
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/絲壕�(C)/羞糸��絅遵�������(P)..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2876
 msgid "/Conversation/Alias..."
 msgstr "/絲壕�(C)/����(L)..."
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:2880
 msgid "/Conversation/Get Info..."
 msgstr "/絲壕�(C)/�桁�篆≧��(G)..."
 
-#: src/gtkconv.c:2882
+#: src/gtkconv.c:2884
 msgid "/Conversation/Invite..."
 msgstr "/絲壕�(C)/��莚�(V)..."
 
-#: src/gtkconv.c:2888
+#: src/gtkconv.c:2890
 msgid "/Conversation/Insert URL..."
 msgstr "/絲壕�(C)/���� URL(U)..."
 
-#: src/gtkconv.c:2892
+#: src/gtkconv.c:2894
 msgid "/Conversation/Insert Image..."
 msgstr "/絲壕�(C)/���ュ�上��(I)..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2900
 msgid "/Conversation/Warn..."
 msgstr "/絲壕�(C)/茘���(W)..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2904
 msgid "/Conversation/Block..."
 msgstr "/絲壕�(C)/絮��(B)..."
 
-#: src/gtkconv.c:2906
+#: src/gtkconv.c:2908
 msgid "/Conversation/Add..."
 msgstr "/鎛壕�(C)/羞糸��(A)..."
 
-#: src/gtkconv.c:2910
+#: src/gtkconv.c:2912
 msgid "/Conversation/Remove..."
 msgstr "/絲壕�(C)/����(R)..."
 
-#: src/gtkconv.c:2916
+#: src/gtkconv.c:2918
 msgid "/Options/Enable Logging"
 msgstr "/��蕁�(O)/��莅梧�綵�(L)"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2921
 msgid "/Options/Enable Sounds"
 msgstr "/��蕁�(O)/��莅後0��(S)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2943 src/gtkconv.c:2945 src/gtkconv.c:3043 src/gtkconv.c:3045
-#: src/gtkconv.c:5684
+#: src/gtkconv.c:2945 src/gtkconv.c:2947 src/gtkconv.c:3045 src/gtkconv.c:3047
+#: src/gtkconv.c:5687
 msgid "Send"
 msgstr "����"
 
-#: src/gtkconv.c:2966 src/gtkconv.c:4126
+#: src/gtkconv.c:2968 src/gtkconv.c:4129
 msgid "Add the user to your buddy list"
 msgstr "絨����桁��筝阪ソ��"
 
-#: src/gtkconv.c:2972 src/gtkconv.c:4111
+#: src/gtkconv.c:2974 src/gtkconv.c:4114
 msgid "Remove the user from your buddy list"
 msgstr "篁�����絅遵���茵�賢���よ�����"
 
 #. Warn button
-#: src/gtkconv.c:2979
+#: src/gtkconv.c:2981
 msgid "Warn"
 msgstr "茘���"
 
-#: src/gtkconv.c:2983
+#: src/gtkconv.c:2985
 msgid "Warn the user"
 msgstr "茘�������"
 
-#: src/gtkconv.c:2990 src/gtkconv.c:3425
+#: src/gtkconv.c:2992 src/gtkconv.c:3427
 msgid "Get the user's information"
 msgstr "�桁����隙拭��"
 
-#. Block button
-#: src/gtkconv.c:2993
-msgid "Block"
-msgstr "絮��"
-
-#: src/gtkconv.c:2997
+#: src/gtkconv.c:2999
 msgid "Block the user"
 msgstr "鎡�恝����"
 
 #. Invite
-#: src/gtkconv.c:3055 src/gtkconv.c:5687
+#: src/gtkconv.c:3057 src/gtkconv.c:5690
 msgid "Invite"
 msgstr "��莚�"
 
-#: src/gtkconv.c:3058
+#: src/gtkconv.c:3060
 msgid "Invite a user"
 msgstr "��莚欠����"
 
-#: src/gtkconv.c:3097
+#: src/gtkconv.c:3099
 msgid "Bold"
 msgstr "膕�篏�"
 
-#: src/gtkconv.c:3108
+#: src/gtkconv.c:3110
 msgid "Italic"
 msgstr "��篏�"
 
-#: src/gtkconv.c:3119
+#: src/gtkconv.c:3121
 msgid "Underline"
 msgstr "筝���膾�"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3137
 msgid "Larger font size"
 msgstr "莨�紊у�篏�"
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3149
 msgid "Normal font size"
 msgstr "����絖�篏�"
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3161
 msgid "Smaller font size"
 msgstr "莨�絨鎕�篏�"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3178
 msgid "Font Face"
 msgstr "絖�篏�"
 
-#: src/gtkconv.c:3188
+#: src/gtkconv.c:3190
 msgid "Foreground font color"
 msgstr "絖�篏�蘂���"
 
-#: src/gtkconv.c:3200
+#: src/gtkconv.c:3202
 msgid "Background color"
 msgstr "�������"
 
-#: src/gtkconv.c:3215
+#: src/gtkconv.c:3217
 msgid "Insert image"
 msgstr "���ュ�上��"
 
-#: src/gtkconv.c:3226
+#: src/gtkconv.c:3228
 msgid "Insert link"
 msgstr "���ラ�丈・"
 
-#: src/gtkconv.c:3237
+#: src/gtkconv.c:3239
 msgid "Insert smiley"
 msgstr "���ョ���"
 
-#: src/gtkconv.c:3294
+#: src/gtkconv.c:3296
 msgid "Topic:"
 msgstr "莚�蘂�鐚�"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3345
+#: src/gtkconv.c:3347
 msgid "0 people in room"
 msgstr "��紊����羃≧��篋�"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3404
 msgid "IM the user"
 msgstr "膸����桁����恰�倶���"
 
-#: src/gtkconv.c:3414
+#: src/gtkconv.c:3416
 msgid "Ignore the user"
 msgstr "綽順�ョ����"
 
-#: src/gtkconv.c:3910 src/server.c:1298
+#: src/gtkconv.c:3913 src/server.c:1299
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
-msgstr ""
-
-#: src/gtkconv.c:3914 src/server.c:1301
-#, fuzzy, c-format
+msgstr "<HR><BR><H3 Align=Center> ---- �医�莚� @ %s ----</H3><BR>\n"
+
+#: src/gtkconv.c:3917 src/server.c:1302
+#, c-format
 msgid "---- New Conversation @ %s ----\n"
-msgstr "筝� %s ��絲壕�"
-
-#: src/gtkconv.c:3946
+msgstr "---- �医�莚� @ %s ----\n"
+
+#: src/gtkconv.c:3949
 msgid "Close conversation"
 msgstr "�渇�㊤�莚�"
 
-#: src/gtkconv.c:4604 src/gtkconv.c:4726
+#: src/gtkconv.c:4607 src/gtkconv.c:4729
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "��紊������ %d 筝�査"
 
-#: src/gtkconv.c:5000
+#: src/gtkconv.c:5003
 msgid "Disable Animation"
 msgstr "胼�������"
 
-#: src/gtkconv.c:5009
+#: src/gtkconv.c:5012
 msgid "Enable Animation"
 msgstr "��������"
 
-#: src/gtkconv.c:5016
+#: src/gtkconv.c:5019
 msgid "Hide Icon"
 msgstr "����憝��"
 
-#: src/gtkconv.c:5022
+#: src/gtkconv.c:5025
 msgid "Save Icon As..."
 msgstr "�丈�����筝�..."
 
@@ -5304,11 +5211,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/腱�"
 
-#: src/gtkft.c:201
+#: src/gtkft.c:200
 msgid "<b>Receiving From:</b>"
 msgstr "<b>�����刻�</b>"
 
-#: src/gtkft.c:204
+#: src/gtkft.c:203
 msgid "<b>Sending To:</b>"
 msgstr "<b>�ユ�倶�刻�</b>"
 
@@ -5348,34 +5255,34 @@
 msgid "Time Remaining:"
 msgstr "����狗�器�"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:588
 msgid "_Keep the dialog open"
 msgstr "篆���絲壕�罅���綣�(_K)"
 
-#: src/gtkft.c:596
+#: src/gtkft.c:598
 msgid "_Clear finished transfers"
 msgstr "羝��ゆ�������篌���(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:605
+#: src/gtkft.c:607
 msgid "Show download details"
 msgstr "�丞ず筝�莉順���"
 
-#: src/gtkft.c:606
+#: src/gtkft.c:608
 msgid "Hide download details"
 msgstr "���鋇�莉順���"
 
 #. Pause button
-#: src/gtkft.c:648 src/stock.c:86
+#: src/gtkft.c:650 src/stock.c:86
 msgid "_Pause"
 msgstr "����(_P)"
 
 #. Resume button
-#: src/gtkft.c:658
+#: src/gtkft.c:660
 msgid "_Resume"
 msgstr "膸х鮫(_R)"
 
-#: src/gtkft.c:1013
+#: src/gtkft.c:1011
 msgid "That file does not exist."
 msgstr "��篁銀�絖�����"
 
@@ -5721,9 +5628,8 @@
 msgstr "����"
 
 #: src/gtkprefs.c:806
-#, fuzzy
 msgid "Control-{B/I/U} inserts _HTML tags"
-msgstr "Ctrl+{B/I/U/S} ���� HTML ��膈�(_H)"
+msgstr "Ctrl+{B/I/U} ���� HTML ��膈�(_H)"
 
 #: src/gtkprefs.c:808
 msgid "Control-(number) _inserts smileys"
@@ -5973,6 +5879,8 @@
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
+"����(_M)鐚�\n"
+"(%s 篁h; URL)"
 
 #: src/gtkprefs.c:1345
 msgid "Browser Options"
@@ -6039,9 +5947,8 @@
 msgstr "紕育�恰�劫�"
 
 #: src/gtkprefs.c:1429
-#, fuzzy
 msgid "_Method:"
-msgstr "�劫�(_M)"
+msgstr "�劫�(_M)鐚�"
 
 #: src/gtkprefs.c:1431
 msgid "Console beep"
@@ -6056,12 +5963,12 @@
 msgstr "�巡擦"
 
 #: src/gtkprefs.c:1450
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"紕育�喝�巡擦(_O)\n"
+"紕育�喝�巡擦(_O)鐚�\n"
 "(%s 篁h;��篁九��)"
 
 #: src/gtkprefs.c:1505
@@ -6247,62 +6154,62 @@
 msgid "Plugins"
 msgstr "��篁�"
 
-#: src/gtkrequest.c:172
+#: src/gtkrequest.c:190
 msgid "Apply"
 msgstr "綺���"
 
-#: src/gtksound.c:60
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "絅遵��糸��"
 
-#: src/gtksound.c:61
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "絅遵��糸��"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Message received"
 msgstr "羔���群�九��"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "�九�亥��羔����紮�絲壕�"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message sent"
 msgstr "羔���群����"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "��篋肴��ヨ��紊�"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "��篋榊�綣���紊�"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "������紊�賢��荐�"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "��査����紊�賢��荐�"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "��査����紊�賢���井������絖�"
 
-#: src/gtksound.c:150
+#: src/gtksound.c:154
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "��羈��㊥�上0�鰹���������������篁�(%s)筝�絖�����"
 
-#: src/gtksound.c:166
+#: src/gtksound.c:170
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "��羈��㊥�上0�鰹���������������巡擦��紕育�恰�号�鐚�篏�羃≧��莅丞舟�巡擦��"
 
-#: src/gtksound.c:175
+#: src/gtksound.c:179
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -6318,7 +6225,7 @@
 msgstr "Gaim - 篆�絖��丈��"
 
 #. full help text
-#: src/gtkutils.c:908
+#: src/gtkutils.c:909
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6350,7 +6257,7 @@
 "  -h, --help          �丞ず絽���攻����\n"
 
 #. short message
-#: src/gtkutils.c:923
+#: src/gtkutils.c:924
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s��莚�莚���%s -h���ョ��絽�����\n"
@@ -6481,22 +6388,26 @@
 msgid "Please enter your login."
 msgstr "莚決��ユ�����糸�����"
 
-#: src/main.c:233
+#: src/main.c:228
 msgid "<New User>"
 msgstr "<�亥����>"
 
-#: src/main.c:275
+#: src/main.c:270
 msgid "Login"
 msgstr "�糸��"
 
-#: src/main.c:291
+#: src/main.c:286
 msgid "Screen Name:"
 msgstr "���桁��鐚�"
 
-#: src/main.c:341
+#: src/main.c:336
 msgid "Sign On"
 msgstr "�糸��"
 
+#: src/prefs.c:113 src/status.c:266
+msgid "Slightly less boring default"
+msgstr "��Ⅶ��篋�"
+
 #: src/prpl.c:292
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
@@ -6533,24 +6444,25 @@
 
 #: src/server.c:874
 #, c-format
-msgid "(%d messages)"
-msgstr "(%d �≧���)"
-
-#: src/server.c:886
+msgid "(%d message)"
+msgid_plural "(%d messages)"
+msgstr[0] "(%d �≧���)"
+
+#: src/server.c:887
 msgid "(1 message)"
 msgstr "(1 �≧���)"
 
-#: src/server.c:1084 src/server.c:1094
+#: src/server.c:1085 src/server.c:1095
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ヤ���"
 
-#: src/server.c:1112 src/server.c:1120
+#: src/server.c:1113 src/server.c:1121
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�坂���"
 
-#: src/server.c:1161
+#: src/server.c:1162
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6559,11 +6471,11 @@
 "%s ����茴� %s 茘�����\n"
 "���亥��茘���膾у���� %d%%"
 
-#: src/server.c:1164
+#: src/server.c:1165
 msgid "an anonymous person"
 msgstr "����羂�"
 
-#: src/server.c:1254
+#: src/server.c:1255
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6572,23 +6484,30 @@
 "���撃��%s����莚� %s ���ュソ����紊��鐚���%s��\n"
 "%s"
 
-#: src/server.c:1258
+#: src/server.c:1259
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "���撃��%s����莚� %s ���ュソ����紊��鐚���%s��\n"
 
-#: src/server.c:1264
+#: src/server.c:1265
 msgid "Accept chat invitation?"
 msgstr "�ュ���紊���莚桁��鐚�"
 
-#: src/server.c:1436
+#: src/server.c:1437
 msgid "Gaim - Popup"
 msgstr "Gaim - 綣劫�榊���"
 
-#: src/server.c:1463
+#: src/server.c:1464
 msgid "More Info"
 msgstr "�翫�篆≧��"
 
+#. for people like myself who are too lazy to add an away msg :)
+#. I don't know who "myself" is in this context.  The exclamation point
+#. * makes it slightly less boring ;)
+#: src/status.c:31
+msgid "Sorry, I ran out for a bit!"
+msgstr "�������������"
+
 #: src/stock.c:84
 msgid "_Modify"
 msgstr "篆���(_M)"
@@ -6634,76 +6553,15 @@
 msgid "Custom"
 msgstr "���箙�"
 
-#: src/gtkdebug.c:142
+#: src/gtkdebug.c:133
 msgid "Debug Window"
 msgstr "莪�莚�腦���"
 
-#: src/gtkdebug.c:182
-#, fuzzy
+#: src/gtkdebug.c:173
 msgid "Pause"
-msgstr "����(_P)"
-
-#: src/gtkdebug.c:188
+msgstr "����"
+
+#: src/gtkdebug.c:179
 msgid "Timestamps"
 msgstr "�狗�贋��"
 
-#~ msgid "Pager Host:"
-#~ msgstr "絲糸�寂源�削�"
-
-#~ msgid "Pager Port:"
-#~ msgstr "絲糸�主��o�"
-
-#~ msgid "Rename Buddy"
-#~ msgstr "���遵��絅遵�"
-
-#~ msgid "New name:"
-#~ msgstr "�医��絖�鐚�"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "%s: %s"
-#~ msgstr ""
-#~ "%s\n"
-#~ "%s鐚�%s"
-
-#~ msgid "%s was unable to sign on"
-#~ msgstr "%s ��羈��糸��"
-
-#~ msgid "Signon Error"
-#~ msgstr "�糸�ュ�咲��"
-
-#~ msgid "Notice"
-#~ msgstr "羈���"
-
-#~ msgid "%s has been signed off"
-#~ msgstr "%s 綏牙��糸��"
-
-#~ msgid "Connection Error"
-#~ msgstr "菴��ラ��莚�"
-
-#~ msgid "Control-_W closes window"
-#~ msgstr "Ctrl+W ���渇�㊦���(_W)"
-
-#~ msgid "_Manual: "
-#~ msgstr "����(_M)鐚�"
-
-#~ msgid "Gaim Instant Messenger"
-#~ msgstr "Gaim �恰�狗��莅��綺�"
-
-#~ msgid "Gaim Instant Messenger - Signed off"
-#~ msgstr "Gaim �恰�狗��莅��綺� - 綏牙�糸��"
-
-#~ msgid "Gaim Instant Messenger - Away"
-#~ msgstr "Gaim �恰�狗��莅��綺� - 胼糸�"
-
-#~ msgid "New"
-#~ msgstr "�医産"
-
-#~ msgid "Set Away Message"
-#~ msgstr "莅丞舟胼糸�羔���"
-
-#~ msgid "I'm Back"
-#~ msgstr "�����ヤ�"
-
-#~ msgid "Exit"
-#~ msgstr "����"
--- a/po/zh_TW.po	Thu Jul 31 01:57:19 2003 +0000
+++ b/po/zh_TW.po	Thu Jul 31 14:35:01 2003 +0000
@@ -1,8 +1,8 @@
 # Traditional Chinese translation for Gaim.
 # Copyright (C) 2001-2003 Free Software Foundation, Inc.
 #
-# Ambrose C. Li <acli@ada.dhs.org>, May 2003
-# Paladin R. Liu <paladin@ms1.hinet.net>, May 2003
+# Ambrose C. Li <acli@ada.dhs.org>, May-July 2003
+# Paladin R. Liu <paladin@ms1.hinet.net>, 2002-2003
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -22,10 +22,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.64cvs\n"
-"POT-Creation-Date: 2003-07-17 10:46+0800\n"
+"Project-Id-Version: Gaim 0.67\n"
+"POT-Creation-Date: 2003-07-31 00:17-0400\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
-"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
+"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -33,65 +33,65 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
 
-#: plugins/docklet/docklet.c:110 src/gtkaccount.c:443 src/gtkaccount.c:1591
+#: plugins/docklet/docklet.c:112 src/gtkaccount.c:441 src/gtkaccount.c:1589
 msgid "Auto-login"
 msgstr "�����糸��"
 
-#: plugins/docklet/docklet.c:113
+#: plugins/docklet/docklet.c:115
 msgid "New Message.."
 msgstr "�域���"
 
-#: plugins/docklet/docklet.c:114
+#: plugins/docklet/docklet.c:116
 msgid "Join A Chat..."
 msgstr "���ヨ��紊��"
 
-#: plugins/docklet/docklet.c:145
+#: plugins/docklet/docklet.c:147
 msgid "New..."
-msgstr "�医�"
-
-#: plugins/docklet/docklet.c:149 src/gtkblist.c:1589 src/gtkpounce.c:460
-#: src/gtkprefs.c:1504 src/protocols/gg/gg.c:54 src/protocols/irc/irc.c:1020
-#: src/protocols/jabber/jabber.c:1176 src/protocols/jabber/jabber.c:3437
-#: src/protocols/jabber/jabber.c:3491 src/protocols/oscar/oscar.c:2825
-#: src/protocols/oscar/oscar.c:4548 src/protocols/oscar/oscar.c:5447
-#: src/protocols/oscar/oscar.c:5841
+msgstr "�医�..."
+
+#: plugins/docklet/docklet.c:151 src/protocols/gg/gg.c:54
+#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:3437 src/protocols/jabber/jabber.c:3491
+#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4578
+#: src/protocols/oscar/oscar.c:5481 src/protocols/oscar/oscar.c:5875
+#: src/gtkblist.c:1591 src/gtkpounce.c:460 src/gtkprefs.c:1504
 msgid "Away"
 msgstr "�∫��"
 
-#: plugins/docklet/docklet.c:155 src/away.c:531
+#: plugins/docklet/docklet.c:157 src/away.c:524
 msgid "Back"
 msgstr "菴���"
 
-#: plugins/docklet/docklet.c:163
+#: plugins/docklet/docklet.c:165
 msgid "Mute Sounds"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:168 src/gtkft.c:557
+#: plugins/docklet/docklet.c:170 src/gtkft.c:559
 msgid "File Transfers"
 msgstr "罟�罅��活叱"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:169 src/gtkaccount.c:1742 src/main.c:415
+#: plugins/docklet/docklet.c:171 src/gtkaccount.c:1740 src/main.c:320
 msgid "Accounts"
 msgstr "絽活��羝���"
 
-#: plugins/docklet/docklet.c:170 src/gtkprefs.c:2356 src/main.c:425
+#: plugins/docklet/docklet.c:172 src/gtkprefs.c:2356 src/main.c:330
 msgid "Preferences"
 msgstr "�鎁処┃絎�"
 
-#: plugins/docklet/docklet.c:179
+#: plugins/docklet/docklet.c:181
 msgid "Signoff"
 msgstr "�糸��"
 
-#: plugins/docklet/docklet.c:183
+#: plugins/docklet/docklet.c:185
 msgid "Quit"
 msgstr "腟���腮�綣�"
 
-#: plugins/docklet/docklet.c:412
+#: plugins/docklet/docklet.c:466
 msgid "Tray Icon Configuration"
 msgstr "綏ヤ��e��腓肴┃絎�"
 
-#: plugins/docklet/docklet.c:416
+#: plugins/docklet/docklet.c:470
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "�沿��佈����翫�医轡篏��e��腓肴←藥���(_H)"
 
@@ -102,30 +102,44 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:440
+#: plugins/docklet/docklet.c:494
 msgid "System Tray Icon"
 msgstr "膤紫輝綏ヤ��e��腓�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:443
+#: plugins/docklet/docklet.c:497
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "��鎧腟怨轡篏��d賢蕁�ず Gaim ����腓冴��"
 
+# NOTE queuing semantics clarified by marv on #gaim
 #. *  description
-#: plugins/docklet/docklet.c:445
+#: plugins/docklet/docklet.c:499
 msgid ""
-"Interacts with a Notification Area applet (in GNOME, KDE or Windows for "
-"example) to display the current status of Gaim, allow fast access to "
-"commonly used functions, and to toggle display of the buddy list or login "
-"window. Also allows messages to be queued until the icon is clicked, similar "
-"to ICQ."
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
 msgstr ""
-"��轡篏��d�鐚�箴�絋� GNOME �� KDE 膈���綏ヤ��o�蕁�ず Gaim ����������鐚�"
-"������札綽�������篏� Gaim ����箴������緒�箴�絋����������� Gaim ���糸��"
-"荀�腦���絅遵�羝������������札絨�荐�����遺���筝㍼��翫�医轡篏��e��腓肴←藥�"
-"��鐚�絨怨���篏睡�� ICQ 筝�罔c��"
+"��轡篏��d�鐚�箴�絋� GNOME��KDE ��緇��荀�腦�膈���綏ヤ��o�蕁�ず Gaim ����������鐚�莅���"
+"綽�������篏� Gaim ��綛冗��絽悟�����緒���������������絅遵�羝������糸�ヨ�腦�鐚�鐚�筝�����"
+"鋌ラ�御��絨��九�亥��荐�����遺���筝㍼��翫�医轡篏��e��腓肴←藥���鐚�絋���篏睡�� ICQ 筝�罔c��"
+
+#.
+#. *  DEFINES, MACROS & DATA TYPES
+#.
+#: plugins/docklet/docklet-win32.c:44
+msgid "Gaim"
+msgstr "Gaim"
+
+#: plugins/docklet/docklet-win32.c:45
+msgid "Gaim - Signed off"
+msgstr "Gaim - 綏牙�糸��"
+
+#: plugins/docklet/docklet-win32.c:46
+msgid "Gaim - Away"
+msgstr "Gaim - �∫��"
 
 #. *< api_version
 #. *< type
@@ -145,20 +159,20 @@
 msgid "When you are kicked offline, this reconnects you."
 msgstr "�銀��欠���鐚�膤紫輝������綛�����育�g���"
 
-#: plugins/chkmail.c:89 plugins/chkmail.c:112 plugins/chkmail.c:121
+#: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
 msgid "Mail Server"
 msgstr "�灸散篌堺����"
 
-#: plugins/chkmail.c:131
+#: plugins/chkmail.c:132
 #, c-format
 msgid "%s (%d new/%d total)"
 msgstr "%s鐚�%d 絨��育�灸散 / �� %d 絨��灸散鐚�"
 
-#: plugins/chkmail.c:203
+#: plugins/chkmail.c:195
 msgid "Check Mail"
 msgstr "罟∽�ヤ拭膊�"
 
-#: plugins/chkmail.c:207
+#: plugins/chkmail.c:199
 msgid "Check email every X seconds.\n"
 msgstr "罸�� X 霡�罟∽�ヤ�罨>拭膊宴��\n"
 
@@ -187,14 +201,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:203
+#: plugins/filectl.c:201
 msgid "Gaim File Control"
 msgstr "Gaim 罟�罅��у��"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:206 plugins/filectl.c:208
+#: plugins/filectl.c:204 plugins/filectl.c:206
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "��荐掩�����罅�筝㊧叱�ユ��篁や札�у�� Gaim��"
 
@@ -291,7 +305,7 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "�����∫����鐚���絨��鎁遵�羝������篋よ�荀�腦���"
 
-#: plugins/idle.c:70 src/protocols/irc/irc.c:935
+#: plugins/idle.c:70
 msgid "Idle Time"
 msgstr "��臀�����"
 
@@ -319,90 +333,69 @@
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "��荐掩�������峨�ラ��臀�����鐚�筝�┃絎���臀��箙�����"
 
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: plugins/mailchk.c:149
+#: plugins/mailchk.c:152
 msgid "Mail Checker"
 msgstr "�灸散罟∽��"
 
-#. *< name
-#. *< version
-#. *  summary
-#: plugins/mailchk.c:152 plugins/mailchk.c:154
+#: plugins/mailchk.c:154 plugins/mailchk.c:155
 msgid "Checks for new local mail."
 msgstr "罟∽�ユ���亥����育�灸散��"
 
-#: plugins/notify.c:442
-msgid "Unable to write to config file"
-msgstr "�≧�絲��ヨ┃絎�罟�"
-
-#: plugins/notify.c:443
-msgid "Notify plugin"
-msgstr "���ユ─腟�"
-
-#: plugins/notify.c:573
+#. ---------- "Notify For" ----------
+#: plugins/notify.c:701
 msgid "Notify For"
 msgstr "���ョ┏蕁�"
 
-#: plugins/notify.c:574
+#: plugins/notify.c:705
 msgid "_IM windows"
 msgstr "�恰��荐����腦�(_I)"
 
-#: plugins/notify.c:579
+#: plugins/notify.c:710
 msgid "_Chat windows"
 msgstr "��紊��腦�(_C)"
 
-#. --------------
-#: plugins/notify.c:585
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:716
 msgid "Notification Methods"
 msgstr "���ユ�劫�"
 
-#: plugins/notify.c:588
-msgid "Prepend _string into window title (hit enter to save):"
-msgstr "���ュ�筝峨�域�腦�罔�蕁�箙���鐚��� Enter �峨�鐚�鐚�"
-
-#: plugins/notify.c:599
+#: plugins/notify.c:722
+msgid "Prepend _string into window title:"
+msgstr "���ュ�筝峨�域�腦�罔�蕁�箙���(_S)鐚�"
+
+#: plugins/notify.c:733
 msgid "_Quote window title"
 msgstr "荀�腦�罔�蕁���緇���筝�綣���(_Q)"
 
-#: plugins/notify.c:604
+#: plugins/notify.c:738
 msgid "Set Window Manager \"_URGENT\" Hint"
 msgstr "綣決辱荀�腦�膊∞���♂¨腓堺�腓�(_U)"
 
-#: plugins/notify.c:609
+#: plugins/notify.c:743
 msgid "Insert c_ount of new messages into window title"
 msgstr "���ユ�域����悟���域�腦�罔�蕁�筝�(_O)"
 
-#: plugins/notify.c:614
+#: plugins/notify.c:748
 msgid "_Notify even if conversation is in focus"
 msgstr "�狗����篋よ���緇�莠後�ョ�����鐚�箴��九�決����ョ����篏�(_N)"
 
-#. --------------
-#: plugins/notify.c:620
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:754
 msgid "Notification Removal"
 msgstr "���ョЩ��"
 
-#: plugins/notify.c:621
+#: plugins/notify.c:758
 msgid "Remove when conversation window gains _focus"
 msgstr "�銀困茫���緇�莠後�ョ�����腱脂�ら����(_F)"
 
-#: plugins/notify.c:626
+#: plugins/notify.c:763
 msgid "Remove when conversation window _receives click"
 msgstr "�銀困茫�荀�腦�茴���御��腱脂�ら����(_R)"
 
-#: plugins/notify.c:631
+#: plugins/notify.c:768
 msgid "Remove when _typing in conversation window"
 msgstr "�九��困茫�荀�腦�筝㊧叱�ユ��腱脂�ら����(_T)"
 
-#: plugins/notify.c:636
-msgid "Appl_y"
-msgstr "絅���(_Y)"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -410,22 +403,23 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:699
+#: plugins/notify.c:845
 msgid "Message Notification"
 msgstr "荐�������"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:702 plugins/notify.c:704
+#: plugins/notify.c:848 plugins/notify.c:850
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "��箴�紊�腮��劫�箴����ユ�����������荐�����"
 
+# TODO: Untranslated
 #: plugins/raw.c:152
 msgid "Raw"
 msgstr ""
 
-#NOTE: ����茘���筝�羝�罐�鐚���筝��梧儀箴���������
+# NOTE: ����茘���筝�羝�罐�鐚���筝��梧儀箴���������
 #: plugins/raw.c:154
 msgid "Lets you send raw input to text-based protocols."
 msgstr "莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎��画���篏���"
@@ -435,9 +429,8 @@
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� Jabber��MSN��IRC ��"
-" TOC鐚��画���篏�����叱�ユ�篏�莠後�ユ��篁わ��� Enter 緇��級���削��檎��莖�荐���"
-"���ら���腦�蕁�ず��"
+"莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� Jabber��MSN��IRC �� TOC鐚��画�"
+"��篏�����叱�ユ�篏�莠後�ユ��篁わ��� Enter 緇��級���削��檎��莖�荐������ら���腦�蕁�ず��"
 
 #. *< api_version
 #. *< type
@@ -519,19 +512,19 @@
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "罸�� N �������� iChat 馺��主�������活��遺困茫�筝㏍��"
 
-#: plugins/gaim-remote/remote.c:86
+#: plugins/gaim-remote/remote.c:87
 msgid "Not connected to AIM"
 msgstr "羃����e�� AIM"
 
-#: plugins/gaim-remote/remote.c:95 plugins/gaim-remote/remote.c:134
+#: plugins/gaim-remote/remote.c:96 plugins/gaim-remote/remote.c:135
 msgid "No screenname given."
 msgstr "羃���腟��絽活����"
 
-#: plugins/gaim-remote/remote.c:171
+#: plugins/gaim-remote/remote.c:172
 msgid "No roomname given."
 msgstr "羃���腟����紊����腮宴��"
 
-#: plugins/gaim-remote/remote.c:190
+#: plugins/gaim-remote/remote.c:191
 msgid "Invalid AIM URI"
 msgstr "�≧���� AIM URI"
 
@@ -542,19 +535,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:735
+#: plugins/gaim-remote/remote.c:713
 msgid "Remote Control"
 msgstr "��腴�ァ��"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:738
+#: plugins/gaim-remote/remote.c:716
 msgid "Provides remote control for gaim applications."
 msgstr "��箴�絨� Gaim �����綣�兓���腴�ァ�吟��"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:740
+#: plugins/gaim-remote/remote.c:718
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -706,7 +699,7 @@
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim ���檎���檎����"
 
-#: plugins/perl/perl.c:405
+#: plugins/perl/perl.c:410
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr "GAIM::register �弱ŭ��筝������箴����句�����吾��茫����� PERL-HOWTO��"
 
@@ -717,13 +710,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1392
+#: plugins/perl/perl.c:1397
 msgid "Perl Plugin Loader"
 msgstr "Perl 罔∞�莠��ュ��"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1394 plugins/perl/perl.c:1395
+#: plugins/perl/perl.c:1399 plugins/perl/perl.c:1400
 msgid "Provides support for loading perl plugins."
 msgstr "��箴�莅��� Perl 罔∞�����叵��"
 
@@ -748,7 +741,7 @@
 msgstr "��困茫�荀�腦�筝㊨¨腓阪ソ���∫�������演�∫��鐚���臀��菴��������ヨ�����"
 
 #: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1184
-#: src/protocols/msn/msn.c:336 src/protocols/msn/state.c:27
+#: src/protocols/msn/msn.c:337 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:1257
 #: src/protocols/yahoo/yahoo.c:1336
@@ -764,9 +757,9 @@
 msgstr "�∫��鐚�����絅遵���札���井��鐚�"
 
 #: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3440
-#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2829
-#: src/protocols/oscar/oscar.c:4536 src/protocols/oscar/oscar.c:4563
-#: src/protocols/oscar/oscar.c:5846 src/protocols/yahoo/yahoo.c:1071
+#: src/protocols/jabber/jabber.c:3503 src/protocols/oscar/oscar.c:2840
+#: src/protocols/oscar/oscar.c:4566 src/protocols/oscar/oscar.c:4593
+#: src/protocols/oscar/oscar.c:5880 src/protocols/yahoo/yahoo.c:1071
 #: src/protocols/yahoo/yahoo.c:1279 src/protocols/yahoo/yahoo.c:1346
 msgid "Invisible"
 msgstr "�沿昆"
@@ -821,7 +814,8 @@
 msgid "Unable to read socket"
 msgstr "�≧�莅��� Socket"
 
-#: src/protocols/gg/gg.c:402
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: src/protocols/gg/gg.c:402 src/protocols/toc/toc.c:207
 msgid "Unable to connect."
 msgstr "�≧��g���"
 
@@ -846,6 +840,7 @@
 msgstr "�� GG Library 筝㊦����紊ч���\n"
 
 #: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/toc/toc.c:183
 #, c-format
 msgid "Connect to %s failed"
 msgstr "�g��� %s 紊掩��"
@@ -886,11 +881,11 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:168 src/protocols/gg/gg.c:664 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:186 src/request.h:804
 msgid "Yes"
 msgstr "��"
 
-#: src/gtkrequest.c:169 src/protocols/gg/gg.c:664 src/request.h:804
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:187 src/request.h:804
 msgid "No"
 msgstr "��"
 
@@ -902,11 +897,13 @@
 msgid "First name"
 msgstr "��"
 
+# TODO: Untranslated
 #: src/protocols/gg/gg.c:677
 msgid "Second Name"
 msgstr ""
 
 #: src/protocols/gg/gg.c:681 src/protocols/gg/gg.c:1380
+#: src/protocols/irc/msgs.c:185
 msgid "Nick"
 msgstr "�援┗"
 
@@ -920,8 +917,8 @@
 msgstr "�у��"
 
 #. City
-#: src/dialogs.c:2035 src/dialogs.c:2684 src/protocols/gg/gg.c:705
-#: src/protocols/trepia/trepia.c:364
+#: src/protocols/gg/gg.c:705 src/protocols/trepia/trepia.c:364
+#: src/dialogs.c:1976 src/dialogs.c:2602
 msgid "City"
 msgstr "���"
 
@@ -1020,9 +1017,9 @@
 msgid "Directory Search"
 msgstr "������絨�"
 
-#: src/dialogs.c:2146 src/dialogs.c:2155 src/protocols/gg/gg.c:1195
-#: src/protocols/jabber/jabber.c:4322 src/protocols/oscar/oscar.c:6110
-#: src/protocols/toc/toc.c:1474
+#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4344
+#: src/protocols/oscar/oscar.c:6144 src/protocols/toc/toc.c:1488
+#: src/dialogs.c:2087 src/dialogs.c:2096
 msgid "Change Password"
 msgstr "篆��劫�腆�"
 
@@ -1068,28 +1065,28 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim ���g� ICQ 篌堺�������主�������"
 
-#: src/dialogs.c:2452 src/gtkconv.c:1112 src/gtkconv.c:2963 src/gtkconv.c:4123
-#: src/gtkrequest.c:175 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2673 src/prpl.c:312
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2684
+#: src/dialogs.c:866 src/gtkconv.c:1114 src/gtkconv.c:2965 src/gtkconv.c:4126
+#: src/gtkrequest.c:193 src/prpl.c:312
 msgid "Add"
 msgstr "����"
 
 #. Cancel button.
-#: src/buddy_chat.c:375 src/dialogs.c:459 src/dialogs.c:471 src/dialogs.c:484
-#: src/dialogs.c:2092 src/dialogs.c:2207 src/dialogs.c:2273 src/dialogs.c:2441
-#: src/dialogs.c:2626 src/dialogs.c:2775 src/dialogs.c:3447 src/dialogs.c:3941
-#: src/dialogs.c:4883 src/gtkaccount.c:1480 src/gtkconn.c:146
-#: src/gtkrequest.c:171 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/irc/irc.c:1104 src/protocols/irc/irc.c:1433
-#: 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/msn/msn.c:217 src/protocols/oscar/oscar.c:2404
-#: src/protocols/oscar/oscar.c:2441 src/protocols/oscar/oscar.c:2476
-#: src/protocols/oscar/oscar.c:2521 src/protocols/oscar/oscar.c:5719
-#: src/protocols/oscar/oscar.c:5934 src/protocols/oscar/oscar.c:5983
-#: src/protocols/oscar/oscar.c:6043 src/protocols/trepia/trepia.c:380
-#: src/protocols/yahoo/yahoo.c:1188 src/prpl.c:313 src/request.h:813
-#: src/request.h:823
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4126
+#: 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/msn/msn.c:218 src/protocols/oscar/oscar.c:2415
+#: src/protocols/oscar/oscar.c:2452 src/protocols/oscar/oscar.c:2487
+#: src/protocols/oscar/oscar.c:2532 src/protocols/oscar/oscar.c:5753
+#: src/protocols/oscar/oscar.c:5968 src/protocols/oscar/oscar.c:6017
+#: src/protocols/oscar/oscar.c:6077 src/protocols/trepia/trepia.c:380
+#: src/protocols/yahoo/yahoo.c:1188 src/buddy_chat.c:375 src/connection.c:141
+#: src/dialogs.c:453 src/dialogs.c:465 src/dialogs.c:478 src/dialogs.c:867
+#: src/dialogs.c:2033 src/dialogs.c:2148 src/dialogs.c:2214 src/dialogs.c:2378
+#: src/dialogs.c:2391 src/dialogs.c:2544 src/dialogs.c:2693 src/dialogs.c:3365
+#: src/dialogs.c:3532 src/dialogs.c:3574 src/dialogs.c:3711 src/dialogs.c:4048
+#: src/gtkaccount.c:1478 src/gtkconn.c:147 src/gtkrequest.c:189 src/prpl.c:313
+#: src/request.h:813 src/request.h:823
 msgid "Cancel"
 msgstr "��羔�"
 
@@ -1100,14 +1097,13 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1716
 #: src/protocols/msn/notification.c:466 src/protocols/msn/notification.c:747
-#: src/protocols/oscar/oscar.c:2601 src/protocols/oscar/oscar.c:5097
+#: src/protocols/oscar/oscar.c:2612 src/protocols/oscar/oscar.c:5127
 msgid "Authorize"
 msgstr "腟��茯�茘�"
 
-#: src/dialogs.c:2440 src/protocols/icq/gaim_icq.c:297
-#: src/protocols/jabber/jabber.c:1717 src/protocols/msn/notification.c:467
-#: src/protocols/msn/notification.c:749 src/protocols/oscar/oscar.c:2603
-#: src/protocols/oscar/oscar.c:5098
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1717
+#: src/protocols/msn/notification.c:467 src/protocols/msn/notification.c:749
+#: src/protocols/oscar/oscar.c:2614 src/protocols/oscar/oscar.c:5128
 msgid "Deny"
 msgstr "��腟�"
 
@@ -1116,10 +1112,11 @@
 msgstr "���幞�����渇��荐���"
 
 #: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2335
-#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4238
-#: src/protocols/jabber/jabber.c:4287 src/protocols/msn/dispatch.c:160
-#: src/protocols/msn/msn.c:459 src/protocols/msn/notification.c:1376
-#: src/protocols/napster/napster.c:496
+#: src/protocols/jabber/jabber.c:2369 src/protocols/jabber/jabber.c:4260
+#: src/protocols/jabber/jabber.c:4309 src/protocols/msn/dispatch.c:160
+#: src/protocols/msn/msn.c:460 src/protocols/msn/notification.c:1383
+#: src/protocols/napster/napster.c:465 src/protocols/napster/napster.c:496
+#: src/protocols/yahoo/yahoo.c:965
 msgid "Unable to connect"
 msgstr "�≧��g�"
 
@@ -1127,7 +1124,7 @@
 msgid "Connecting..."
 msgstr "�g�筝�..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3936
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3950
 msgid "Nick:"
 msgstr "�援┗鐚�"
 
@@ -1135,245 +1132,33 @@
 msgid "Gaim User"
 msgstr "Gaim 篏睡����"
 
-#: src/protocols/irc/irc.c:186
-msgid ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
-msgstr "鐚��咲����荐������膩�⊆���主��篋������茫�罟∽�ュ験��羝���賢����膩�⊆���檎��鐚�"
-
-#: src/protocols/irc/irc.c:487 src/protocols/irc/irc.c:2607
-#, c-format
-msgid "DCC Chat with %s closed"
-msgstr "�� %s �� DCC ��紊�群����"
-
-#: src/protocols/irc/irc.c:540 src/protocols/irc/irc.c:2616
-#, c-format
-msgid "DCC Chat with %s established"
-msgstr "�� %s �� DCC ��紊�群膓�茴�産腴�"
-
-#: src/protocols/irc/irc.c:675
+#: src/protocols/irc/cmds.c:41
+#, c-format
+msgid "Unknown command: %s"
+msgstr "���ョ����篁わ�%s"
+
+#: src/protocols/irc/cmds.c:430
 msgid "No topic is set"
 msgstr "羃���荐㊤�筝脂�"
 
-# NOTE ���峨�ヨ��紊������蕁�ず����鐚�絋�����changed���頑⑮��篆��鴻����緇�絅���
-#: src/protocols/irc/irc.c:696 src/protocols/irc/irc.c:1754
-#, c-format
-msgid "<B>%s has changed the topic to: %s</B>"
-msgstr "<B>%s ����紊�源蕁�荐㊤��削�%s</B>"
-
-#: src/protocols/irc/irc.c:741
-#, c-format
-msgid "-:- mode/%s [%c%c %s] by %s"
-msgstr "-:- 罔≦�/%s [%c%c %s] 茴� %s 荐㊤�"
-
-#: src/protocols/irc/irc.c:918 src/protocols/irc/irc.c:931
-msgid "User"
-msgstr "篏睡����"
-
-#. Splits
-#: src/protocols/irc/irc.c:922 src/protocols/irc/irc.c:3030
-#: src/protocols/jabber/jabber.c:4418 src/protocols/napster/napster.c:639
-msgid "Server"
-msgstr "篌堺����"
-
-#: src/protocols/irc/irc.c:926 src/protocols/irc/irc.c:1081
-#: src/protocols/irc/irc.c:1646
-msgid "IRC Operator"
-msgstr "IRC ��篏���"
-
-#: src/protocols/irc/irc.c:939
-msgid "Channels"
-msgstr "�脂��"
-
-#: src/protocols/irc/irc.c:945
-#, c-format
-msgid "%s is an Identified User"
-msgstr "%s �����綏臥�茘���篏睡����"
-
-#: src/protocols/irc/irc.c:960
-#, c-format
-msgid "%ld seconds [signon: %s]"
-msgstr "%ld 腱� [�糸�ワ�%s]"
-
-#. RPL_REHASHING
-#: src/protocols/irc/irc.c:1081
-msgid "Rehashing server"
-msgstr "���域┃絎�篌堺����賢"
-
-#. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1084
-msgid "No such nick/channel"
-msgstr "羃����e���援┗���脂��"
-
-#: src/protocols/irc/irc.c:1084 src/protocols/irc/irc.c:1087
-#: src/protocols/irc/irc.c:1092 src/protocols/irc/irc.c:1096
-#: src/protocols/irc/irc.c:1462 src/protocols/irc/irc.c:1604
-msgid "IRC Error"
-msgstr "IRC ���"
-
-#. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1087
-msgid "No such server"
-msgstr "羃����i��失����"
-
-#. ERR_NOMOTD
-#. drop it - bringing up dialog for NOMOTD is annoying
-#. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1092
-msgid "No nickname given"
-msgstr "羃���腟���援┗"
-
-#. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1095
-msgid "You're not an IRC operator!"
-msgstr "�������� IRC ��篏���鐚�"
-
-#: src/protocols/irc/irc.c:1099
-msgid "That nick is already in use.  Please enter a new nick"
-msgstr "�����援┗綏牙���戎��賢��茫�莠後�ヤ����亥���援┗"
-
-#. Build OK Button
-#: src/dialogs.c:2203 src/dialogs.c:2341 src/dialogs.c:2625 src/dialogs.c:2771
-#: src/dialogs.c:3934 src/gtkrequest.c:170 src/protocols/irc/irc.c:1103
-#: src/protocols/msn/msn.c:170 src/protocols/msn/msn.c:181
-#: src/protocols/msn/msn.c:192 src/protocols/msn/msn.c:203
-#: src/protocols/oscar/oscar.c:2440 src/protocols/oscar/oscar.c:2520
-#: src/protocols/oscar/oscar.c:5933 src/protocols/oscar/oscar.c:5982
-#: src/protocols/oscar/oscar.c:6042 src/protocols/yahoo/yahoo.c:1187
-#: src/request.h:813
-msgid "OK"
-msgstr "腆阪�"
-
-#: src/protocols/irc/irc.c:1389 src/protocols/irc/irc.c:1395
-#: src/protocols/irc/irc.c:1401 src/protocols/irc/irc.c:1415
-msgid "IRC CTCP info"
-msgstr "IRC CTCP 莖�荐�"
-
-#: src/protocols/irc/irc.c:1425
-#, c-format
-msgid "%s would like to establish a DCC chat"
-msgstr "%s �活�綮榊�筝��� DCC ��紊�"
-
-#: src/protocols/irc/irc.c:1428
-msgid ""
-"This requires a direct connection to be established between the two "
-"computers.  Messages sent will not pass through the IRC server"
-msgstr ""
-"����荀�羆�絨���綮榊�莎桁�����肢�������g�鐚���荐����筝������ IRC 鋍堺������画��渇��"
-
-#: src/protocols/irc/irc.c:1432 src/protocols/oscar/oscar.c:2403
-#: src/protocols/oscar/oscar.c:5718
-msgid "Connect"
-msgstr "�g�"
-
-#: src/protocols/irc/irc.c:1459
-#, c-format
-msgid "Received an invalid file send request from %s."
-msgstr "�九�遺���箴����� %s �≧����罟�罅����咲��羆���"
-
-#: src/protocols/irc/irc.c:1540 src/protocols/msn/error.c:133
-#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:760
-msgid "Unable to write"
-msgstr "�≧�絲���"
-
-#: src/protocols/irc/irc.c:1602
-#, c-format
-msgid "You have been kicked from %s: %s"
-msgstr "��←荼√�� %s: %s"
-
-#: src/protocols/irc/irc.c:1607
-#, c-format
-msgid "Kicked by %s: %s"
-msgstr "茴� %s 荼√�削�%s"
-
-#: src/protocols/irc/irc.c:1663 src/protocols/irc/irc.c:2917
-msgid "CTCP ClientInfo"
-msgstr "CTCP 絎∽�句�莖�荐�"
-
-#: src/protocols/irc/irc.c:1669 src/protocols/irc/irc.c:2923
-msgid "CTCP UserInfo"
-msgstr "CTCP 篏睡����莖�荐�"
-
-#: src/protocols/irc/irc.c:1675 src/protocols/irc/irc.c:2929
-msgid "CTCP Version"
-msgstr "CTCP ����"
-
-#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2935
-msgid "CTCP Ping"
-msgstr "CTCP Ping"
-
-#: src/protocols/irc/irc.c:1948 src/protocols/oscar/oscar.c:678
+#: src/protocols/irc/irc.c:123
+msgid "Channel:"
+msgstr "�脂��鐚�"
+
+#: src/protocols/irc/irc.c:128 src/gtkaccount.c:423 src/main.c:304
+msgid "Password:"
+msgstr "絲�腆種�"
+
+#: src/protocols/irc/irc.c:162 src/protocols/oscar/oscar.c:683
 #: src/protocols/toc/toc.c:234
 #, c-format
 msgid "Signon: %s"
 msgstr "�糸�ワ�%s"
 
-#: src/protocols/irc/irc.c:1962 src/protocols/trepia/trepia.c:1148
-msgid "Unable to create socket"
+#: src/protocols/irc/irc.c:171
+msgid "Couldn't create socket"
 msgstr "�≧�綮榊� Socket"
 
-#: src/protocols/irc/irc.c:2203
-#, c-format
-msgid "Topic for %s is %s"
-msgstr "%s ��筝脂��� %s"
-
-#: src/protocols/irc/irc.c:2299
-#, c-format
-msgid "You have left %s"
-msgstr "���∫��篋� %s"
-
-#: src/protocols/irc/irc.c:2300
-msgid "IRC Part"
-msgstr "IRC �∫��"
-
-#: src/protocols/irc/irc.c:2355
-msgid "<I>Requesting DCC CHAT</I>"
-msgstr "<I>荀�羆� DCC ��紊�賢</I>"
-
-#: src/protocols/irc/irc.c:2372
-msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
-msgstr "<B>IRC ��篏�����篁わ�<BR>REHASH RESTART</B>"
-
-#: src/protocols/irc/irc.c:2377
-msgid ""
-"<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
-"<nick><BR>PING <nick></B><BR>"
-msgstr ""
-"<B>CTCP ��篁わ�<BR>CLIENTINFO <�援┗><BR>USERINFO <�援┗><BR>VERSION <�援┗"
-"><BR>PING <�援┗></B><BR>"
-
-#: src/protocols/irc/irc.c:2385
-msgid "<B>DCC commands:<BR>CHAT <nick></B>"
-msgstr "<B>DCC ��篁わ�<BR>CHAT <�援┗></B>"
-
-#: src/protocols/irc/irc.c:2390
-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 "
-"W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP CTCP for "
-"CTCP commands<BR>Type /HELP DCC for DCC commands"
-msgstr ""
-"<B>������吡����篁わ�<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC KICK<BR>OP "
-"DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W WHOWAS<BR>莠�"
-"�� /HELP OPER 蕁�ず��篏�����篁�<BR>莠後�� /HELP CTCP 蕁�ず CTCP ��篁�<BR>莠後�� /HELP "
-"DCC 蕁�ず DCC ��篁�"
-
-#: src/protocols/irc/irc.c:2413
-msgid "<B>Unknown command</B>"
-msgstr "<B>���ョ����篁�</B>"
-
-#: src/protocols/irc/irc.c:2473
-msgid "Channel:"
-msgstr "�脂��:"
-
-#: src/gtkaccount.c:425 src/main.c:399 src/protocols/irc/irc.c:2478
-msgid "Password:"
-msgstr "絲�腆種�"
-
-#: src/protocols/irc/irc.c:2904
-msgid "DCC Chat"
-msgstr "DCC ��紊�"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1383,39 +1168,200 @@
 #. *< id
 #. *< name
 #. *< version
-#. *  summary
-#: src/protocols/irc/irc.c:3010 src/protocols/irc/irc.c:3012
+#: src/protocols/irc/irc.c:486
 msgid "IRC Protocol Plugin"
 msgstr "IRC ��絎�罔∞�"
 
-#. Account Options
-#: src/gtkprefs.c:1145 src/protocols/irc/irc.c:3034
-#: src/protocols/jabber/jabber.c:4425 src/protocols/msn/msn.c:1259
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1377
-msgid "Port"
-msgstr "��荐���"
-
-#: src/protocols/irc/irc.c:3038
+#. *  summary
+#: src/protocols/irc/irc.c:487
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "莠�絅順�� IRC ��絎�罔∞�"
+
+#. Splits
+#: src/protocols/irc/irc.c:504 src/protocols/irc/msgs.c:199
+#: src/protocols/jabber/jabber.c:4440 src/protocols/napster/napster.c:639
+msgid "Server"
+msgstr "篌堺����"
+
+#: src/protocols/irc/irc.c:507
+msgid "Port:"
+msgstr "��荐���鐚�"
+
+#: src/protocols/irc/irc.c:510
 msgid "Encoding"
 msgstr "膩�⊆"
 
+#: src/protocols/irc/msgs.c:101
+msgid "Bad mode"
+msgstr "罔≦��≧��"
+
+# FIXME ������⑮
+#: src/protocols/irc/msgs.c:112
+#, c-format
+msgid "You are banned from %s."
+msgstr "��←胼��� %s 篋���"
+
+# FIXME ������⑮
+#: src/protocols/irc/msgs.c:113
+msgid "Banned"
+msgstr "茴��"
+
+#: src/protocols/irc/msgs.c:186
+msgid " <i>(ircop)</i>"
+msgstr " <i>(IRC ��篏���)</i>"
+
+#: src/protocols/irc/msgs.c:187
+msgid " <i>(identified)</i>"
+msgstr " <i>(綏臥�茘�)</i>"
+
+#: src/protocols/irc/msgs.c:193
+msgid "Username"
+msgstr "篏睡����"
+
+#: src/protocols/irc/msgs.c:194
+msgid "Realname"
+msgstr "紮���"
+
+#: src/protocols/irc/msgs.c:204
+msgid "Currently on"
+msgstr "�����脂��"
+
+#: src/protocols/irc/msgs.c:208
+#, c-format
+msgid "<b>Idle for:</b> %d days, %02d:%02d:%02d<br>"
+msgstr "<b>��臀��鐚�</b>%d�� %d絨�� %d�� %d霡�<br>"
+
+#: src/protocols/irc/msgs.c:211
+msgid "Online since"
+msgstr "筝�膩���"
+
+#: src/protocols/irc/msgs.c:214
+msgid "<br><b>Defining adjective:</b> Glorious<br>"
+msgstr "<br><b>�颷逸�</b>��絎���腑�<br>"
+
+# NOTE �亥����IRC prpl莎桁����筝�蕁�ず����鐚��頑⑮��篆��鴻��羃����馹�
+#: src/protocols/irc/msgs.c:245
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s ����紊�源蕁�篆��合�削�%s"
+
+#: src/protocols/irc/msgs.c:250
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%s ��筝脂��削�%s"
+
+#: src/protocols/irc/msgs.c:264
+msgid "Unknown message '%s'"
+msgstr "筝�����荐�����%s��"
+
+#: src/protocols/irc/msgs.c:265
+msgid "Unknown message"
+msgstr "筝�����荐���"
+
+#: src/protocols/irc/msgs.c:265
+msgid "Gaim has sent a message the IRC server did not understand."
+msgstr "Gaim �渇��篋�筝��� IRC 篌堺��������順��荐�����"
+
+#. does this happen?
+#: src/protocols/irc/msgs.c:357
+msgid "no such channel"
+msgstr "羃����e���脂��"
+
+#: src/protocols/irc/msgs.c:360
+msgid "User is not logged in"
+msgstr "篏睡����羃����糸��"
+
+#: src/protocols/irc/msgs.c:365
+msgid "No such nick or channel"
+msgstr "羃����e���援┗���脂��"
+
+#: src/protocols/irc/msgs.c:385
+msgid "Could not send"
+msgstr "�≧�����"
+
+#: src/protocols/irc/msgs.c:441
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr "����茴���茫����������� %s��"
+
+#: src/protocols/irc/msgs.c:442
+msgid "Invitation only"
+msgstr "����茴���茫���"
+
+#: src/protocols/irc/msgs.c:536
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "��← %s 荼√�削�(%s)"
+
+#: src/protocols/irc/msgs.c:544
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "茴� %s 荼√�� (%s)"
+
+#: src/protocols/irc/msgs.c:565
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "罔≦� (%s %s) 茴� %s 荐㊤�"
+
+#: src/protocols/irc/msgs.c:653
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr "���∫��篋��脂��%s%s"
+
+#: src/protocols/irc/msgs.c:691
+msgid "Error: invalid PONG from server"
+msgstr "���鐚�箴���失������ PONG �≧��"
+
+#: src/protocols/irc/msgs.c:693
+#, c-format
+msgid "PING reply -- Lag: %d seconds"
+msgstr "PING ��膈�����綮狗�駕�%d腱�"
+
+#: src/protocols/irc/msgs.c:781
+#, c-format
+msgid "Wallops from %s"
+msgstr "箴��� %s �� Wallops"
+
+#: src/protocols/irc/parse.c:157
+msgid ""
+"(There was an error converting this message.  Check the 'Encoding' option in "
+"the Account Editor)"
+msgstr "鐚��咲����荐������膩�⊆���主��篋������茫�罟∽�ュ験��羝���賢����膩�⊆���檎��鐚�"
+
+#: src/protocols/irc/parse.c:272
+#, c-format
+msgid "Reply time from %s: %d seconds"
+msgstr "%s ��膈�����鐚�%d 腱�"
+
+#: src/protocols/irc/parse.c:273
+msgid "PONG"
+msgstr "PONG"
+
+#: src/protocols/irc/parse.c:273
+msgid "CTCP PING reply"
+msgstr "CTCP PING ��膈�"
+
+#: src/protocols/irc/parse.c:372
+msgid "Disconnected"
+msgstr "綏峨��罩∫�g�"
+
 #: src/protocols/jabber/jabber.c:561 src/protocols/jabber/jabber.c:580
 #: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
 #: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
 #: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
-#: src/protocols/msn/msn.c:91 src/protocols/msn/msn.c:149
-#: src/protocols/msn/msn.c:249 src/protocols/msn/msn.c:505
-#: src/protocols/msn/msn.c:616 src/protocols/msn/msn.c:632
-#: src/protocols/msn/msn.c:667 src/protocols/msn/msn.c:683
-#: src/protocols/msn/msn.c:715 src/protocols/msn/msn.c:723
-#: src/protocols/msn/msn.c:756 src/protocols/msn/msn.c:764
-#: src/protocols/msn/msn.c:778 src/protocols/msn/msn.c:787
-#: src/protocols/msn/msn.c:801 src/protocols/msn/msn.c:810
-#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:882
-#: src/protocols/msn/msn.c:920 src/protocols/msn/msn.c:1017
-#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1061
-#: src/protocols/msn/msn.c:1072 src/protocols/msn/msn.c:1083
-#: src/protocols/msn/msn.c:1107 src/protocols/msn/msn.c:1119
+#: src/protocols/msn/msn.c:92 src/protocols/msn/msn.c:150
+#: src/protocols/msn/msn.c:250 src/protocols/msn/msn.c:506
+#: src/protocols/msn/msn.c:617 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:668 src/protocols/msn/msn.c:684
+#: src/protocols/msn/msn.c:716 src/protocols/msn/msn.c:724
+#: src/protocols/msn/msn.c:757 src/protocols/msn/msn.c:765
+#: src/protocols/msn/msn.c:779 src/protocols/msn/msn.c:788
+#: src/protocols/msn/msn.c:802 src/protocols/msn/msn.c:811
+#: src/protocols/msn/msn.c:833 src/protocols/msn/msn.c:883
+#: src/protocols/msn/msn.c:921 src/protocols/msn/msn.c:1018
+#: src/protocols/msn/msn.c:1042 src/protocols/msn/msn.c:1062
+#: src/protocols/msn/msn.c:1073 src/protocols/msn/msn.c:1084
+#: src/protocols/msn/msn.c:1108 src/protocols/msn/msn.c:1120
 #: src/protocols/msn/notification.c:127 src/protocols/msn/notification.c:156
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:969
 #: src/protocols/trepia/trepia.c:281 src/protocols/trepia/trepia.c:782
@@ -1444,8 +1390,8 @@
 "password remains the same."
 msgstr "����莠後�ョ���医�腆弱����絲�腆惹���罔g������篁ュ�腆惹���茴��壕���"
 
-#: src/blist.c:794 src/gtkaccount.c:142 src/gtkpounce.c:307
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1169 src/blist.c:798 src/gtkaccount.c:140
+#: src/gtkpounce.c:307 src/gtkutils.c:781
 msgid "Unknown"
 msgstr "����"
 
@@ -1461,8 +1407,8 @@
 msgstr "�傑�����∫��"
 
 #: src/protocols/jabber/jabber.c:1182 src/protocols/jabber/jabber.c:3439
-#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2819
-#: src/protocols/oscar/oscar.c:4551 src/protocols/oscar/oscar.c:5842
+#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2830
+#: src/protocols/oscar/oscar.c:4581 src/protocols/oscar/oscar.c:5876
 msgid "Do Not Disturb"
 msgstr "茫��炊����"
 
@@ -1497,9 +1443,9 @@
 msgstr "羃�������篏睡������"
 
 #. Should never happen.
-#: src/blist.c:502 src/dialogs.c:855 src/protocols/jabber/jabber.c:1831
-#: src/protocols/msn/notification.c:87 src/protocols/msn/notification.c:88
-#: src/protocols/msn/notification.c:644
+#: src/protocols/jabber/jabber.c:1831 src/protocols/msn/notification.c:87
+#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
+#: src/blist.c:502 src/dialogs.c:829
 msgid "Buddies"
 msgstr "絅遵�"
 
@@ -1515,7 +1461,7 @@
 msgid "Password successfully changed."
 msgstr "絲�腆寂信�号������"
 
-#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4236
+#: src/protocols/jabber/jabber.c:2333 src/protocols/jabber/jabber.c:4258
 msgid "Connection lost"
 msgstr "紊怨サ�g�"
 
@@ -1529,7 +1475,7 @@
 
 #. we have no chats yet
 #: src/protocols/jabber/jabber.c:2363 src/protocols/msn/dispatch.c:164
-#: src/protocols/msn/msn.c:450 src/protocols/napster/napster.c:489
+#: src/protocols/msn/msn.c:451 src/protocols/napster/napster.c:489
 #: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:986
 msgid "Connecting"
 msgstr "�g�筝�"
@@ -1564,7 +1510,7 @@
 msgstr "�≧����ヨ��紊��"
 
 #: src/protocols/jabber/jabber.c:3228 src/protocols/jabber/jabber.c:3279
-#: src/protocols/jabber/jabber.c:3704
+#: src/protocols/jabber/jabber.c:3697
 msgid "Jabber ID"
 msgstr "Jabber 絽活��"
 
@@ -1573,12 +1519,12 @@
 msgstr "���"
 
 #: src/protocols/jabber/jabber.c:3280 src/protocols/jabber/jabber.c:3339
-#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3730
+#: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3723
 msgid "Status"
 msgstr "����"
 
 #: src/protocols/jabber/jabber.c:3350 src/protocols/jabber/jabber.c:3372
-#: src/protocols/oscar/oscar.c:5455
+#: src/protocols/oscar/oscar.c:5489
 msgid "Not Authorized"
 msgstr "���茘�"
 
@@ -1586,7 +1532,7 @@
 msgid "View Error Msg"
 msgstr "茹������荐���"
 
-#: src/gtkconv.c:1099 src/protocols/jabber/jabber.c:3397
+#: src/protocols/jabber/jabber.c:3397 src/gtkconv.c:1101
 msgid "Get Away Msg"
 msgstr "��緇��∝�荐���"
 
@@ -1607,11 +1553,11 @@
 msgstr "���域�羆�茯�茘�"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1580 src/protocols/jabber/jabber.c:3435
-#: src/protocols/jabber/jabber.c:3485 src/protocols/oscar/oscar.c:2831
-#: src/protocols/oscar/oscar.c:4546 src/protocols/oscar/oscar.c:5840
-#: src/protocols/yahoo/yahoo.c:1075 src/protocols/zephyr/zephyr.c:866
-#: src/protocols/zephyr/zephyr.c:876
+#: src/protocols/jabber/jabber.c:3435 src/protocols/jabber/jabber.c:3485
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4576
+#: src/protocols/oscar/oscar.c:5874 src/protocols/yahoo/yahoo.c:1075
+#: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
+#: src/gtkaccount.c:1578
 msgid "Online"
 msgstr "筝�膩�"
 
@@ -1631,7 +1577,7 @@
 msgid "Nickname"
 msgstr "�援┗"
 
-#: src/dialogs.c:2896 src/protocols/jabber/jabber.c:3629
+#: src/protocols/jabber/jabber.c:3629 src/dialogs.c:2814
 msgid "URL"
 msgstr "URL"
 
@@ -1656,8 +1602,8 @@
 msgstr "�級������"
 
 #. Country
-#: src/dialogs.c:2057 src/dialogs.c:2702 src/protocols/jabber/jabber.c:3635
-#: src/protocols/trepia/trepia.c:372
+#: src/protocols/jabber/jabber.c:3635 src/protocols/trepia/trepia.c:372
+#: src/dialogs.c:1998 src/dialogs.c:2620
 msgid "Country"
 msgstr "��絎�"
 
@@ -1665,7 +1611,7 @@
 msgid "Telephone"
 msgstr "�肢�"
 
-#: src/dialogs.c:2760 src/protocols/jabber/jabber.c:3637
+#: src/protocols/jabber/jabber.c:3637 src/dialogs.c:2678
 msgid "Email"
 msgstr "�糸��灸散"
 
@@ -1689,35 +1635,42 @@
 msgid "Birthday"
 msgstr "����"
 
-#: src/dialogs.c:2906 src/gtkprefs.c:604 src/gtkprefs.c:1840
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/jabber.c:3643 src/dialogs.c:2824 src/gtkprefs.c:604
+#: src/gtkprefs.c:1840
 msgid "Description"
 msgstr "�颷�"
 
-#: src/protocols/jabber/jabber.c:3668
+#: src/protocols/jabber/jabber.c:4120 src/protocols/jabber/jabber.c:4121
+msgid "Edit Jabber vCard"
+msgstr "膩�鹿 Jabber vCard"
+
+#: src/protocols/jabber/jabber.c:4122
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
-"comfortable"
-msgstr "篁ヤ�������罨�篏��醇���御���х������Ű�莠後�ユ���活叱�ユ���喝゛�ョ��荐����喝�"
-
-#: src/protocols/jabber/jabber.c:3669
-msgid "User Identity"
-msgstr "鋎睡����茘���"
-
-#: src/protocols/jabber/jabber.c:4098
-msgid "Gaim - Edit Jabber vCard"
-msgstr "Gaim - 膩�鹿 Jabber vCard"
-
-#: src/protocols/jabber/jabber.c:4173
+"comfortable."
+msgstr "篁ヤ�������罨�篏��醇���御���х������Ű�莠後�ユ���活叱�ユ���喝゛�ョ��荐����喝���"
+
+#: src/protocols/jabber/jabber.c:4125 src/protocols/trepia/trepia.c:379
+#: src/dialogs.c:2029 src/dialogs.c:2210 src/dialogs.c:3353 src/dialogs.c:4010
+#: src/gtkrequest.c:195
+msgid "Save"
+msgstr "�峨�"
+
+#: src/protocols/jabber/jabber.c:4195
 msgid "Server Registration successful!"
 msgstr "篌堺����┿������鐚�"
 
-#: src/protocols/jabber/jabber.c:4194
+#: src/protocols/jabber/jabber.c:4211
+#, c-format
+msgid "Error %d: %s"
+msgstr "��� %d鐚�%s"
+
+#: src/protocols/jabber/jabber.c:4216
 msgid "Unknown registration error"
 msgstr "���ョ��荐糸�����"
 
-#: src/dialogs.c:2232 src/protocols/jabber/jabber.c:4308
-#: src/protocols/oscar/oscar.c:6096 src/protocols/toc/toc.c:1462
+#: src/protocols/jabber/jabber.c:4330 src/protocols/oscar/oscar.c:6130
+#: src/protocols/toc/toc.c:1476 src/dialogs.c:2173
 msgid "Set User Info"
 msgstr "荐㊤�篏睡����莖�荐�"
 
@@ -1731,16 +1684,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4397 src/protocols/jabber/jabber.c:4399
+#: src/protocols/jabber/jabber.c:4419 src/protocols/jabber/jabber.c:4421
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber ��絎�罔∞�"
 
 # XXX
-#: src/protocols/jabber/jabber.c:4421
+#: src/protocols/jabber/jabber.c:4443
 msgid "Resource"
 msgstr "莖�羣�"
 
-#: src/protocols/jabber/jabber.c:4429
+#. Account Options
+#: src/protocols/jabber/jabber.c:4447 src/protocols/msn/msn.c:1260
+#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1377
+#: src/gtkprefs.c:1145
+msgid "Port"
+msgstr "��荐���"
+
+#: src/protocols/jabber/jabber.c:4451
 msgid "Connect server"
 msgstr "�g�篌堺����"
 
@@ -1777,15 +1737,15 @@
 msgstr "�≧�茹f��荐�����"
 
 #: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:407
-#: src/protocols/msn/notification.c:1385
+#: src/protocols/msn/notification.c:1392
 msgid "Unable to write to server"
 msgstr "�≧�絲��ュ�遺失����"
 
-#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1392
+#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1399
 msgid "Syncing with server"
-msgstr "罩e����篌堺������罩ヤ賢"
-
-#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1406
+msgstr "��篌堺������罩ヤ賢"
+
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1413
 msgid "Error reading from server"
 msgstr "�延失����������主�����"
 
@@ -1860,7 +1820,7 @@
 msgid "Required fields missing"
 msgstr "�鞘��井����荀���罨�篏�"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:178
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:183
 msgid "Not logged in"
 msgstr "絨����糸��"
 
@@ -1915,6 +1875,11 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR ���御�����ユ�������荐援��"
 
+#: src/protocols/msn/error.c:133 src/protocols/msn/notification.c:292
+#: src/protocols/msn/notification.c:760
+msgid "Unable to write"
+msgstr "�≧�絲���"
+
 #: src/protocols/msn/error.c:136
 msgid "Session overload"
 msgstr "綏ヤ����莇�莠�"
@@ -1961,34 +1926,47 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "������ MSN �援┗紊��激��"
 
-#: src/protocols/msn/msn.c:166
+#: src/protocols/msn/msn.c:167
 msgid "Set your friendly name."
 msgstr "荐㊤������援┗��"
 
 # NOTE MSN���援┗筝���Yahoo鐚�篏睡������札莠後�ヤ算篏����井�援┗鐚�
 # NOTE �割戎��篏睡������絽活��罸��♂��篆�鐚�篌寂�箙���������
 # XXX ����箴��������菴医��篋�絲�����篏睡�����弱�榊��茫�羆��怨�馹�
-#: src/protocols/msn/msn.c:167
+#: src/protocols/msn/msn.c:168
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�ヤ査�� MSN �ラ�掩������篋肴�����蕁�ず�����援┗��"
 
-#: src/protocols/msn/msn.c:179
+#. Build OK Button
+#: 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:2451 src/protocols/oscar/oscar.c:2531
+#: src/protocols/oscar/oscar.c:5967 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6076 src/protocols/yahoo/yahoo.c:1187
+#: src/connection.c:140 src/dialogs.c:2144 src/dialogs.c:2282
+#: src/dialogs.c:2543 src/dialogs.c:2689 src/dialogs.c:3531 src/dialogs.c:3573
+#: src/dialogs.c:3704 src/dialogs.c:4047 src/gtkrequest.c:188
+#: src/request.h:813
+msgid "OK"
+msgstr "腆阪�"
+
+#: src/protocols/msn/msn.c:180
 msgid "Set your home phone number."
 msgstr "荐㊤�����篏鎘狗�肢���腆若��"
 
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:191
 msgid "Set your work phone number."
 msgstr "荐㊤�����莨�����肢���腆若��"
 
-#: src/protocols/msn/msn.c:201
+#: src/protocols/msn/msn.c:202
 msgid "Set your mobile phone number."
 msgstr "荐㊤�����茵����肢���腆若��"
 
-#: src/protocols/msn/msn.c:210
+#: src/protocols/msn/msn.c:211
 msgid "Allow MSN Mobile pages?"
 msgstr "��荐� MSN �喝�種�"
 
-#: src/protocols/msn/msn.c:211
+#: src/protocols/msn/msn.c:212
 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?"
@@ -1996,100 +1974,100 @@
 "��������荐怨����ソ��羝���賢��絅遵��渇�� Mobile Page �井����茵����肢�鐚������銀���茵���"
 "茖�臀�����"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:216
 msgid "Allow"
 msgstr "��荐�"
 
-#: src/protocols/msn/msn.c:216
+#: src/protocols/msn/msn.c:217
 msgid "Disallow"
 msgstr "筝���荐�"
 
-#: src/protocols/msn/msn.c:233
+#: src/protocols/msn/msn.c:234
 msgid "Send a mobile message."
 msgstr "���肴���荐�����"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:236
 msgid "Page"
 msgstr "�喝��"
 
-#: src/about.c:151 src/dialogs.c:4231 src/gtkrequest.c:173
-#: src/protocols/msn/msn.c:236 src/server.c:1458
+#: src/protocols/msn/msn.c:237 src/about.c:151 src/dialogs.c:4001
+#: src/gtkrequest.c:191 src/server.c:1459
 msgid "Close"
 msgstr "����"
 
-#: src/protocols/msn/msn.c:324 src/protocols/yahoo/yahoo.c:1126
+#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1126
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>����鐚�</b>%s"
 
-#: src/protocols/msn/msn.c:337 src/protocols/msn/msn.c:592
+#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:593
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "筝����肢����"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:594
+#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:595
 #: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1053
 #: src/protocols/yahoo/yahoo.c:1261 src/protocols/yahoo/yahoo.c:1337
 msgid "Be Right Back"
 msgstr "薤����箴�"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:597
 #: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1055
 #: src/protocols/yahoo/yahoo.c:1263 src/protocols/yahoo/yahoo.c:1338
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:598
+#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:599
 #: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1063
 #: src/protocols/yahoo/yahoo.c:1271 src/protocols/yahoo/yahoo.c:1342
 msgid "On The Phone"
 msgstr "�肢�筝�"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:600
+#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:601
 #: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1067
 #: src/protocols/yahoo/yahoo.c:1275 src/protocols/yahoo/yahoo.c:1344
 msgid "Out To Lunch"
 msgstr "紊��榊���"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:602
+#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:603
 #: src/protocols/zephyr/zephyr.c:863 src/protocols/zephyr/zephyr.c:878
 msgid "Hidden"
 msgstr "�沿��"
 
-#: src/protocols/msn/msn.c:354
+#: src/protocols/msn/msn.c:355
 msgid "Set Friendly Name"
 msgstr "荐㊤��援┗"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:363
 msgid "Set Home Phone Number"
 msgstr "荐㊤�篏鎘狗�肢���腆�"
 
-#: src/protocols/msn/msn.c:368
+#: src/protocols/msn/msn.c:369
 msgid "Set Work Phone Number"
 msgstr "荐㊤�綏ヤ��肢���腆�"
 
-#: src/protocols/msn/msn.c:374
+#: src/protocols/msn/msn.c:375
 msgid "Set Mobile Phone Number"
 msgstr "荐㊤�茵����肢���腆�"
 
-#: src/protocols/msn/msn.c:383
+#: src/protocols/msn/msn.c:384
 msgid "Enable/Disable Mobile Devices"
 msgstr "���� / ����茵���茖�臀�"
 
-#: src/protocols/msn/msn.c:390
+#: src/protocols/msn/msn.c:391
 msgid "Allow/Disallow Mobile Pages"
 msgstr "��荐� / 筝���荐� Mobile Page"
 
-#: src/protocols/msn/msn.c:413
+#: src/protocols/msn/msn.c:414
 msgid "Send to Mobile"
 msgstr "�渇���活����肢�"
 
-#NOTE: ��茘�����茯�
-#: src/protocols/msn/msn.c:422
+# NOTE: ��茘�����茯�
+#: src/protocols/msn/msn.c:423
 msgid "Initiate Chat"
 msgstr "������紊��"
 
-#: src/protocols/msn/msn.c:696
+#: src/protocols/msn/msn.c:697
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2098,11 +2076,11 @@
 "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com����"
 "��絨�筝���莅��贋������荐掩�����"
 
-#: src/protocols/msn/msn.c:700 src/protocols/msn/msn.c:740
+#: src/protocols/msn/msn.c:701 src/protocols/msn/msn.c:741
 msgid "Invalid MSN screenname"
 msgstr "�≧���� MSN 篏睡����絽活��"
 
-#: src/protocols/msn/msn.c:736
+#: src/protocols/msn/msn.c:737
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2121,14 +2099,19 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1235 src/protocols/msn/msn.c:1237
+#: src/protocols/msn/msn.c:1236 src/protocols/msn/msn.c:1238
 msgid "MSN Protocol Plugin"
 msgstr "MSN ��絎�罔∞�"
 
-#: src/protocols/msn/msn.c:1254 src/protocols/trepia/trepia.c:1372
+#: src/protocols/msn/msn.c:1255 src/protocols/trepia/trepia.c:1372
 msgid "Login server"
 msgstr "�糸�ヤ失����"
 
+#: src/protocols/msn/notification.c:197
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN ���鐚�%s\n"
+
 #: src/protocols/msn/notification.c:235
 msgid "Unable to request INF"
 msgstr "�≧���緇� INF"
@@ -2175,23 +2158,30 @@
 msgid "Unable to transfer to notification server"
 msgstr "�≧��渇���渇���ヤ失����"
 
-#: src/protocols/msn/notification.c:1346
+#: src/protocols/msn/notification.c:1348
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute(s). You will "
-"automatically be signed out at that time. Please finish any conversations in "
-"progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr ""
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
 "MSN 篌堺�����荀����� %d ����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���綽��"
 "����������篋よ���\n"
 "\n"
-"�句境茘桁轡篏�腟���鐚������札��綺��糸�ヤ失������"
-
-#: src/gtkpounce.c:464 src/gtkprefs.c:1532 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1073
+"�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
+
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1073
+#: src/gtkpounce.c:464 src/gtkprefs.c:1532
 msgid "Idle"
 msgstr "��臀�"
 
@@ -2212,6 +2202,11 @@
 msgid "Unable to read header from server"
 msgstr "�≧��延失�������罔��㊧�荐�"
 
+#: src/protocols/napster/napster.c:246
+#, c-format
+msgid "Unable to read mesage from server.  Command is %hd, length is %hd."
+msgstr "�≧��延失�������莖�荐�鐚���篁ょ�� %hd鐚��桁墾�� %hd鐚���"
+
 #: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
@@ -2245,12 +2240,12 @@
 msgid "%s requested a PING"
 msgstr "%s 荀�羆�筝��� PING"
 
-#: src/gtkblist.c:1572 src/protocols/napster/napster.c:531
+#: src/protocols/napster/napster.c:531 src/gtkblist.c:1574
 msgid "Get Info"
 msgstr "��緇�莖�荐�"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5168
-#: src/protocols/toc/toc.c:1201
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5198
+#: src/protocols/toc/toc.c:1215
 msgid "Join what group:"
 msgstr "���ュ����臂ょ�鐚�"
 
@@ -2269,181 +2264,180 @@
 msgstr "NAPSTER ��絎�罔∞�"
 
 # NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
-#: src/protocols/oscar/oscar.c:174
+#: src/protocols/oscar/oscar.c:179
 msgid "Invalid error"
 msgstr "�≧�����"
 
-#: src/protocols/oscar/oscar.c:175
+#: src/protocols/oscar/oscar.c:180
 msgid "Invalid SNAC"
 msgstr "�≧���� SNAC"
 
-#: src/protocols/oscar/oscar.c:176
-msgid "Rate to host"
-msgstr "�遺失��������"
-
-#: src/protocols/oscar/oscar.c:177
-msgid "Rate to client"
-msgstr "�医��句�����"
-
-#: src/protocols/oscar/oscar.c:179
-msgid "Service unavailable"
-msgstr "篌堺�����絖���"
-
-#: src/protocols/oscar/oscar.c:180
-msgid "Service not defined"
-msgstr "羃�����絎�����"
-
 #: src/protocols/oscar/oscar.c:181
-msgid "Obsolete SNAC"
-msgstr "������ SNAC"
+msgid "Rate to host"
+msgstr "�遺失��������"
 
 #: src/protocols/oscar/oscar.c:182
-msgid "Not supported by host"
-msgstr "篌堺��������"
-
-#: src/protocols/oscar/oscar.c:183
-msgid "Not supported by client"
-msgstr "鎘∽�句�筝����"
+msgid "Rate to client"
+msgstr "�伾��句�����"
 
 #: src/protocols/oscar/oscar.c:184
+msgid "Service unavailable"
+msgstr "篌堺�����絖���"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Service not defined"
+msgstr "羃�����絎�����"
+
+#: src/protocols/oscar/oscar.c:186
+msgid "Obsolete SNAC"
+msgstr "������ SNAC"
+
+#: src/protocols/oscar/oscar.c:187
+msgid "Not supported by host"
+msgstr "篌堺��������"
+
+#: src/protocols/oscar/oscar.c:188
+msgid "Not supported by client"
+msgstr "鎘∽�句�筝����"
+
+#: src/protocols/oscar/oscar.c:189
 msgid "Refused by client"
 msgstr "頮���句���腟�"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:190
 msgid "Reply too big"
 msgstr "��荀�紊�ぇ篋�"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:191
 msgid "Responses lost"
 msgstr "�阪け����"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:192
 msgid "Request denied"
 msgstr "荀�羆�茴���"
 
 # NOTE��Busted������SNAC payload����茯�����Luke Schierer��#gaim��箴�
 # NOTE �翫�������嚭�篆������罨♂���渇��紊��莖�荐�篋���
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:193
 msgid "Busted SNAC payload"
 msgstr "SNAC莢�莠���ぇ"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:194
 msgid "Insufficient rights"
 msgstr "罨���筝�紊�"
 
 # NOTE Debian 茘���local���冴�����亥���
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:195
 msgid "In local permit/deny"
 msgstr "���亥�����荐奄�掩��腟�羝���"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:196
 msgid "Too evil (sender)"
 msgstr "紊����>�鐚�絲�篁銀査鐚�"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:197
 msgid "Too evil (receiver)"
 msgstr "紊����>�鐚��銀散篋削�"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:198
 msgid "User temporarily unavailable"
 msgstr "篏睡��������筝���"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:199
 msgid "No match"
 msgstr "羃����悟�����"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:200
 msgid "List overflow"
 msgstr "羝���頃��"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:201
 msgid "Request ambiguous"
 msgstr "荀�羆�筝���∈"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:202
 msgid "Queue full"
 msgstr "篏���羯推�"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:203
 msgid "Not while on AOL"
 msgstr "�� AOL ��筝���荐�"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:475
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "�� %s ���恰��荐�������"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:477
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "�� %s ���恰��荐���け��"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/toc/toc.c:608
-#: src/protocols/toc/toc.c:623 src/protocols/toc/toc.c:686
+#: src/protocols/oscar/oscar.c:535 src/protocols/toc/toc.c:224
+#: src/protocols/toc/toc.c:622 src/protocols/toc/toc.c:637
+#: src/protocols/toc/toc.c:700
 msgid "Disconnected."
 msgstr "��罩∫�g���"
 
-#: src/protocols/oscar/oscar.c:542 src/protocols/toc/toc.c:862
+#: src/protocols/oscar/oscar.c:547 src/protocols/toc/toc.c:876
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
 
-# XXX TODO �у��∝���域⑮羈�罸�莠������緒�篏�Paladin������茘��篋���羃����順��鐚���絅処�醇�ヨ�筝�筝�
-# ANS ��罧笈⑮�����醇�莠�罩g∈鐚���荅���戎�� ICQ ���ヨ��紊��鐚����榊憥��罧笈�����
-#: src/protocols/oscar/oscar.c:558
+#: src/protocols/oscar/oscar.c:563
 msgid "Chat is currently unavailable"
 msgstr "�����≧�篏睡����紊��"
 
-#: src/protocols/oscar/oscar.c:632 src/protocols/oscar/oscar.c:689
+#: src/protocols/oscar/oscar.c:637 src/protocols/oscar/oscar.c:694
 msgid "Couldn't connect to host"
 msgstr "�≧��e�遺失����"
 
-#: src/protocols/oscar/oscar.c:674
+#: src/protocols/oscar/oscar.c:679
 msgid "Unable to login to AIM"
 msgstr "�≧��糸�ュ�� AIM"
 
-#: src/protocols/oscar/oscar.c:783 src/protocols/oscar/oscar.c:1169
+#: src/protocols/oscar/oscar.c:788 src/protocols/oscar/oscar.c:1171
 msgid "Could Not Connect"
 msgstr "�≧��g�"
 
-#: src/protocols/oscar/oscar.c:790
+#: src/protocols/oscar/oscar.c:795
 msgid "Connection established, cookie sent"
 msgstr "�g�綏峨産腴�鐚�筝�群���� Cookie"
 
-#: src/protocols/oscar/oscar.c:857 src/protocols/oscar/oscar.c:870
-#: src/protocols/oscar/oscar.c:875
+#: src/protocols/oscar/oscar.c:862 src/protocols/oscar/oscar.c:875
+#: src/protocols/oscar/oscar.c:880
 msgid "File Transfer Aborted"
 msgstr "��羔�罟�罅��活叱"
 
-#: src/protocols/oscar/oscar.c:858
+#: src/protocols/oscar/oscar.c:863
 msgid "Unable to establish listener socket."
 msgstr "�≧�綮榊��h�遵�� Socket��"
 
-#: src/protocols/oscar/oscar.c:871
+#: src/protocols/oscar/oscar.c:876
 msgid "Unable to establish file descriptor."
 msgstr "�≧�綮榊�罟�罅�篁�膣鴻��"
 
-#: src/protocols/oscar/oscar.c:876
+#: src/protocols/oscar/oscar.c:881
 msgid "Unable to create new connection."
 msgstr "�≧������育�g���"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1058 src/protocols/toc/toc.c:555
+#: src/protocols/oscar/oscar.c:1060 src/protocols/toc/toc.c:569
 msgid "Incorrect nickname or password."
 msgstr "������援┗��絲�腆�"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1062
+#: src/protocols/oscar/oscar.c:1064
 msgid "Your account is currently suspended."
 msgstr "����絽活����������賢��"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1066
+#: src/protocols/oscar/oscar.c:1068
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL �恰��荐�����������筝�絖�����"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1070
+#: src/protocols/oscar/oscar.c:1072
 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."
@@ -2452,21 +2446,21 @@
 "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1074
+#: src/protocols/oscar/oscar.c:1076
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "����篏睡����絎∽�句�腮�綣鎀���������茫��� %s �贋��"
 
-#: src/protocols/oscar/oscar.c:1078 src/protocols/toc/toc.c:640
+#: src/protocols/oscar/oscar.c:1080 src/protocols/toc/toc.c:654
 msgid "Authentication Failed"
 msgstr "茯�茘�紊掩��"
 
-#: src/protocols/oscar/oscar.c:1106
+#: src/protocols/oscar/oscar.c:1108
 msgid "Internal Error"
 msgstr "�ч�����"
 
-#: src/protocols/oscar/oscar.c:1208 src/protocols/oscar/oscar.c:1238
-#: src/protocols/oscar/oscar.c:1326
+#: src/protocols/oscar/oscar.c:1210 src/protocols/oscar/oscar.c:1240
+#: src/protocols/oscar/oscar.c:1328
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2475,29 +2469,29 @@
 "����醇���㊥����筝㊥�潔�g�������醇���喝�������馹�茴�信罩e�篏睡�� TOC��茫��� %s ������"
 "羃����贋�違��"
 
-#: src/protocols/oscar/oscar.c:1211 src/protocols/oscar/oscar.c:1241
+#: src/protocols/oscar/oscar.c:1213 src/protocols/oscar/oscar.c:1243
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim �≧���緇������� AIM �糸�ョ⊆��"
 
-#: src/protocols/oscar/oscar.c:1329
+#: src/protocols/oscar/oscar.c:1331
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim �≧���緇��������糸�ユ�罨�腆若��"
 
-#: src/protocols/oscar/oscar.c:1898 src/protocols/oscar/oscar.c:5556
+#: src/protocols/oscar/oscar.c:1909 src/protocols/oscar/oscar.c:5590
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "�� %s ���恰��荐���群膓�茴�産腴�"
 
-#: src/protocols/oscar/oscar.c:2227 src/protocols/oscar/oscar.c:2249
+#: src/protocols/oscar/oscar.c:2238 src/protocols/oscar/oscar.c:2260
 msgid "(There was an error receiving this message)"
 msgstr "鐚��九�����荐������主�����鐚�"
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2406
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����荀�羆��贋・�g��� %s"
 
-#: src/protocols/oscar/oscar.c:2398
+#: src/protocols/oscar/oscar.c:2409
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -2506,42 +2500,46 @@
 "����荀�羆�絨����������肢����綮榊�莎欠�贋・�g�鐚����������渇���恰��荐���襲�����鏆�������"
 "��罔e������我���� IP 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
 
-#: src/protocols/oscar/oscar.c:2430
+#: src/protocols/oscar/oscar.c:2414 src/protocols/oscar/oscar.c:5752
+msgid "Connect"
+msgstr "�g�"
+
+#: src/protocols/oscar/oscar.c:2441
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨������ユ����絅遵�羝���賢��"
 
-#: src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2449
 msgid "Authorization Request Message:"
 msgstr "茯�茘�荀�羆�荐����"
 
-#: src/protocols/oscar/oscar.c:2439
+#: src/protocols/oscar/oscar.c:2450
 msgid "Please authorize me!"
 msgstr "茫���������茯�茘�鐚�"
 
-#: src/protocols/oscar/oscar.c:2467
+#: src/protocols/oscar/oscar.c:2478
 #, 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:2472 src/protocols/oscar/oscar.c:2474
+#: src/protocols/oscar/oscar.c:2483 src/protocols/oscar/oscar.c:2485
 msgid "Request Authorization"
 msgstr "荀�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:2510 src/protocols/oscar/oscar.c:2512
-#: src/protocols/oscar/oscar.c:2519 src/protocols/oscar/oscar.c:2591
-#: src/protocols/oscar/oscar.c:2611 src/protocols/oscar/oscar.c:2986
-#: src/protocols/oscar/oscar.c:3038 src/protocols/oscar/oscar.c:5089
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:2521 src/protocols/oscar/oscar.c:2523
+#: src/protocols/oscar/oscar.c:2530 src/protocols/oscar/oscar.c:2602
+#: src/protocols/oscar/oscar.c:2622 src/protocols/oscar/oscar.c:2997
+#: src/protocols/oscar/oscar.c:3049 src/protocols/oscar/oscar.c:5119
+#: src/protocols/oscar/oscar.c:5165
 msgid "No reason given."
 msgstr "羃���腟��������"
 
-#: src/protocols/oscar/oscar.c:2518
+#: src/protocols/oscar/oscar.c:2529
 msgid "Authorization Denied Message:"
 msgstr "��腟�茯�茘�荐����"
 
-#: src/protocols/oscar/oscar.c:2591
+#: src/protocols/oscar/oscar.c:2602
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -2550,11 +2548,11 @@
 "篏睡���� %u ���坂�������鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���賢鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5095
+#: src/protocols/oscar/oscar.c:2610 src/protocols/oscar/oscar.c:5125
 msgid "Authorization Request"
 msgstr "茯�茘�荀�羆�"
 
-#: src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2622
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -2564,17 +2562,17 @@
 "篏睡���� %u ���坂�������鐚���腟�篋�����九���ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2612
+#: src/protocols/oscar/oscar.c:2623
 msgid "ICQ authorization denied."
 msgstr "ICQ 茯�茘���腟���"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2619
+#: src/protocols/oscar/oscar.c:2630
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "篏睡���� %u ���鋋�����九���ュソ��羝�����荀�羆���"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2638
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2587,7 +2585,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2635
+#: src/protocols/oscar/oscar.c:2646
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2600,7 +2598,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2643
+#: src/protocols/oscar/oscar.c:2654
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2614,34 +2612,34 @@
 "%s"
 
 # XXX ��荅我�� contact 箙�腟延�茘��冴��絅遵������
-#: src/protocols/oscar/oscar.c:2664
+#: src/protocols/oscar/oscar.c:2675
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr "ICQ 篏睡���� %u ��箴�筝�����機篋削�%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2670
+#: src/protocols/oscar/oscar.c:2681
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
 
-#: src/protocols/oscar/oscar.c:2674
+#: src/protocols/oscar/oscar.c:2685
 msgid "Decline"
 msgstr "紿���"
 
-#: src/protocols/oscar/oscar.c:2756
+#: src/protocols/oscar/oscar.c:2767
 #, 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] "���阪け篋� %hu ���� %s ��箴���荐�������阪����≧������"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����醇���≧������"
 
-#: src/protocols/oscar/oscar.c:2765
+#: src/protocols/oscar/oscar.c:2776
 #, 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] "���阪け篋� %hu ���� %s ��箴���荐�������阪�紊�ぇ篋���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����遵お紊т���"
 
-#: src/protocols/oscar/oscar.c:2774
+#: src/protocols/oscar/oscar.c:2785
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2649,172 +2647,183 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪��渇������綺�お綽���"
 
-#: src/protocols/oscar/oscar.c:2783
+#: src/protocols/oscar/oscar.c:2794
 #, 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] "���阪け篋� %hu ���� %s ��箴���荐�������坂� / 絅劫お���>���"
 
-#: src/protocols/oscar/oscar.c:2792
+#: src/protocols/oscar/oscar.c:2803
 #, 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] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���>���"
 
-#: src/protocols/oscar/oscar.c:2801
+#: src/protocols/oscar/oscar.c:2812
 #, 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] "�����坂���������阪け篋� %hu ���� %s ��箴���荐�����"
 
-#: src/protocols/oscar/oscar.c:2817 src/protocols/oscar/oscar.c:4560
-#: src/protocols/oscar/oscar.c:5845
+#: src/protocols/oscar/oscar.c:2828 src/protocols/oscar/oscar.c:4590
+#: src/protocols/oscar/oscar.c:5879
 msgid "Free For Chat"
 msgstr "����腥肴��紊�"
 
-#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4554
-#: src/protocols/oscar/oscar.c:5843
+#: src/protocols/oscar/oscar.c:2832 src/protocols/oscar/oscar.c:4584
+#: src/protocols/oscar/oscar.c:5877
 msgid "Not Available"
 msgstr "�傑�����∫��"
 
-#: src/protocols/oscar/oscar.c:2823 src/protocols/oscar/oscar.c:4557
-#: src/protocols/oscar/oscar.c:5844
+#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:4587
+#: src/protocols/oscar/oscar.c:5878
 msgid "Occupied"
 msgstr "綽�腆�"
 
-# TODO ���� http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2827
-#, fuzzy
+# NOTE ���� http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#: src/protocols/oscar/oscar.c:2838
 msgid "Web Aware"
-msgstr "絎壕┗篁�篋阪��恐筝��ョ����������"
-
-#: src/protocols/oscar/oscar.c:2887
+msgstr "��荐怨�銀�篏睡������恐莊���ョ��������������"
+
+#: src/protocols/oscar/oscar.c:2898
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>絽活��鐚�</B> %s<BR><B>����鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2889
+#: src/protocols/oscar/oscar.c:2900
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>����鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2948
+#: src/protocols/oscar/oscar.c:2959
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 筝��咲���鐚�%s\n"
 
-#: src/protocols/oscar/oscar.c:2949
+#: src/protocols/oscar/oscar.c:2960
 msgid "Unknown error"
 msgstr "���ラ���"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:2995
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "�����腟� %s ��荐����≧����削�"
 
-#: src/protocols/oscar/oscar.c:3036
+#: src/protocols/oscar/oscar.c:3047
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "篏睡���� %s ����篋肴�荐�筝��絖����"
 
-#: src/gtkaccount.c:280 src/protocols/oscar/oscar.c:3070
+#: src/protocols/oscar/oscar.c:3081 src/gtkaccount.c:278
 msgid "Buddy Icon"
 msgstr "絅遵���腓�"
 
-#: src/protocols/oscar/oscar.c:3073
+#: src/protocols/oscar/oscar.c:3084
 msgid "Voice"
 msgstr "�臥��"
 
 # NOTE 絨����贋・羔������壕⑮�冴���恰��荐�����
-#: src/protocols/oscar/oscar.c:3076 src/protocols/oscar/oscar.c:5874
+#: src/protocols/oscar/oscar.c:3087 src/protocols/oscar/oscar.c:5908
 msgid "Direct IM"
 msgstr "�恰��荐���"
 
-#: src/gtkblist.c:1581 src/protocols/oscar/oscar.c:3079
+#: src/protocols/oscar/oscar.c:3090 src/gtkblist.c:1583
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:5890
+#: src/protocols/oscar/oscar.c:3093 src/protocols/oscar/oscar.c:5924
 msgid "Get File"
 msgstr "�ユ�倶�罅�"
 
-#: src/protocols/oscar/oscar.c:3085 src/protocols/oscar/oscar.c:5882
+#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:5916
 msgid "Send File"
 msgstr "�渇��罟�罅�"
 
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3100
 msgid "Games"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:3092
+#: src/protocols/oscar/oscar.c:3103
 msgid "Add-Ins"
 msgstr "罔∞�"
 
-#: src/protocols/oscar/oscar.c:3095
+#: src/protocols/oscar/oscar.c:3106
 msgid "Send Buddy List"
 msgstr "���阪ソ��羝���"
 
-#: src/protocols/oscar/oscar.c:3098
+#: src/protocols/oscar/oscar.c:3109
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy ���"
 
 # XXX 緇�紊�PO�醇���茘�AP筝�荅�鐚���膺紫���醇����筝�����茯���鐚�筝��ユ��羃���茘���
 # ANS ��荐�緇��� ICQ 筝㍼�����筝�腮�戎����鐚���AP User���阪�銀賢筝�腮���
-#: src/protocols/oscar/oscar.c:3101
+#: src/protocols/oscar/oscar.c:3112
 msgid "AP User"
 msgstr "�����綣鋎睡����"
 
-#: src/protocols/oscar/oscar.c:3104
+#: src/protocols/oscar/oscar.c:3115
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3107
+# NOTE��Nihilist�����藝弱����i���取���巡��ラ��
+# NOTE (18:06:07) KingAnt: "nihilist" is actually the capability of all 0s--not no capabilities
+# NOTE (18:07:23) KingAnt: Yeah, what he said
+# NOTE (18:17:08) wing: capability of all 0s?
+# NOTE (18:17:29) KingAnt: Right...
+# NOTE (18:17:36) wing: what does that mean though?
+# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
+#: src/protocols/oscar/oscar.c:3118
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3110
+#: src/protocols/oscar/oscar.c:3121
 msgid "ICQ Server Relay"
 msgstr "ICQ 篌堺�������"
 
-#: src/protocols/oscar/oscar.c:3113
+#: src/protocols/oscar/oscar.c:3124
 msgid "ICQ Unknown"
 msgstr "ICQ ����"
 
-#: src/protocols/oscar/oscar.c:3116
+#: src/protocols/oscar/oscar.c:3127
 msgid "Trillian Encryption"
 msgstr "Trillian ��絲�"
 
-#: src/protocols/oscar/oscar.c:3119
+#: src/protocols/oscar/oscar.c:3130
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3159
+# FIXME �����藝�
+#: src/protocols/oscar/oscar.c:3133
+msgid "Hiptop"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:3173
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<I>���坂戎������ョ��膩�⊆鐚���篁ョ�≧�蕁�ず荐�����</i>"
 
-#: src/protocols/oscar/oscar.c:3166
+#: src/protocols/oscar/oscar.c:3180
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "筝�膩�����鐚�<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3171
+#: src/protocols/oscar/oscar.c:3185
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "���堺���∞������鐚�<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3191
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "��臀��<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3180
+#: src/protocols/oscar/oscar.c:3194
 msgid "Idle: <b>Active</b>"
 msgstr "��臀��<b>羃���臀�</b>"
 
-#: src/protocols/oscar/oscar.c:3182
+#: src/protocols/oscar/oscar.c:3196
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -2827,27 +2836,27 @@
 "%s%s%s<BR>\n"
 "<HR>\n"
 
-#: src/protocols/oscar/oscar.c:3214
+#: src/protocols/oscar/oscar.c:3228
 msgid "<i>User has no away message</i>"
 msgstr "<i>篏睡����羃����∫��荐���</i>"
 
-#: src/protocols/oscar/oscar.c:3225
+#: src/protocols/oscar/oscar.c:3239
 msgid "Client Capabilities: "
 msgstr "絎∽�句��後��э�"
 
-#: src/protocols/oscar/oscar.c:3231
+#: src/protocols/oscar/oscar.c:3245
 msgid "<i>No Information Provided</i>"
 msgstr "<i>���箴�篁私�篆≧��</i>"
 
-#: src/protocols/oscar/oscar.c:3255
+#: src/protocols/oscar/oscar.c:3269
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM ���醇�欠�篋���"
 
-#: src/protocols/oscar/oscar.c:3642
+#: src/protocols/oscar/oscar.c:3656
 msgid "Rate limiting error."
 msgstr "�������狗�����"
 
-#: src/protocols/oscar/oscar.c:3643
+#: src/protocols/oscar/oscar.c:3657
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -2855,154 +2864,154 @@
 "����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���"
 "荅��罨<��"
 
-#: src/protocols/oscar/oscar.c:3704
+#: src/protocols/oscar/oscar.c:3718
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ラ����絽活����"
 
-#: src/protocols/oscar/oscar.c:3706
+#: src/protocols/oscar/oscar.c:3720
 msgid "You have been signed off for an unknown reason."
 msgstr "�����坂���������糸�冴��"
 
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3948
 msgid "UIN:"
 msgstr "篏睡����絽活��鐚�"
 
-#: src/protocols/oscar/oscar.c:3939
+#: src/protocols/oscar/oscar.c:3953
 msgid "First Name:"
 msgstr "��鐚�"
 
-#: src/protocols/oscar/oscar.c:3942
+#: src/protocols/oscar/oscar.c:3956
 msgid "Last Name:"
 msgstr "紮�鐚�"
 
-#: src/protocols/oscar/oscar.c:3945 src/protocols/oscar/oscar.c:3951
+#: src/protocols/oscar/oscar.c:3959 src/protocols/oscar/oscar.c:3965
 msgid "Email Address:"
 msgstr "�糸��灸散鐚�"
 
-#: src/protocols/oscar/oscar.c:3956
+#: src/protocols/oscar/oscar.c:3970
 msgid "Mobile Phone:"
 msgstr "茵����肢�鐚�"
 
-#: src/protocols/oscar/oscar.c:3959
+#: src/protocols/oscar/oscar.c:3973
 msgid "Gender:"
 msgstr "�у�ワ�"
 
-#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:314
+#: src/protocols/oscar/oscar.c:3973 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:3959 src/protocols/trepia/trepia.c:313
+#: src/protocols/oscar/oscar.c:3973 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:3968
+#: src/protocols/oscar/oscar.c:3982
 msgid "Birthday:"
 msgstr "���ワ�"
 
-#: src/protocols/oscar/oscar.c:3973
+#: src/protocols/oscar/oscar.c:3987
 msgid "Age:"
 msgstr "綛顔宗鐚�"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3990
 msgid "Personal Web Page:"
 msgstr "��篋榊恐��鐚�"
 
-#: src/protocols/oscar/oscar.c:3979
+#: src/protocols/oscar/oscar.c:3993
 msgid "Additional Information:"
 msgstr "�銀�莖�荐�鐚�"
 
-#: src/protocols/oscar/oscar.c:3983
+#: src/protocols/oscar/oscar.c:3997
 msgid "Home Address:"
 msgstr "篏鎘九�医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:3999 src/protocols/oscar/oscar.c:4015
 msgid "Address:"
 msgstr "�医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
+#: src/protocols/oscar/oscar.c:4002 src/protocols/oscar/oscar.c:4018
 msgid "City:"
 msgstr "���鐚�"
 
 # NOTE 筝��順浸����綏�篁純��鐚��紙��������筝����銀���筝���
-#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
+#: src/protocols/oscar/oscar.c:4005 src/protocols/oscar/oscar.c:4021
 msgid "State:"
 msgstr "���怨�鐚�"
 
-#: src/protocols/oscar/oscar.c:3994 src/protocols/oscar/oscar.c:4010
+#: src/protocols/oscar/oscar.c:4008 src/protocols/oscar/oscar.c:4024
 msgid "Zip Code:"
 msgstr "�級������鐚�"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:4013
 msgid "Work Address:"
 msgstr "綏ヤ��医��鐚�"
 
-#: src/protocols/oscar/oscar.c:4015
+#: src/protocols/oscar/oscar.c:4029
 msgid "Work Information:"
 msgstr "綏ヤ�莖�荐�鐚�"
 
-#: src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:4031
 msgid "Company:"
 msgstr "��夔��腮縁�"
 
-#: src/protocols/oscar/oscar.c:4020
+#: src/protocols/oscar/oscar.c:4034
 msgid "Division:"
 msgstr "����鐚�"
 
-#: src/protocols/oscar/oscar.c:4023
+#: src/protocols/oscar/oscar.c:4037
 msgid "Position:"
 msgstr "�隙�鐚�"
 
-#: src/protocols/oscar/oscar.c:4026
+#: src/protocols/oscar/oscar.c:4040
 msgid "Web Page:"
 msgstr "膓臥��鐚�"
 
-#: src/protocols/oscar/oscar.c:4094
+#: src/protocols/oscar/oscar.c:4108
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s ����筝�����絽活��鐚�</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4112
+#: src/protocols/oscar/oscar.c:4126
 #, c-format
 msgid "No results found for email address %s"
 msgstr "�鞘��医���糸��灸散 %s �檎����腟���"
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4147
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "����荅我���九�遺�絨�荀�羆�絨� %s �画�茯�茘����糸��灸散��"
 
-#: src/protocols/oscar/oscar.c:4135
+#: src/protocols/oscar/oscar.c:4149
 msgid "Account Confirmation Requested"
 msgstr "絽活��腆肴�"
 
-#: src/protocols/oscar/oscar.c:4163
+#: src/protocols/oscar/oscar.c:4177
 msgid "Error Changing Account Info"
 msgstr "�贋�劫験��莖�荐����"
 
-#: src/protocols/oscar/oscar.c:4166
+#: src/protocols/oscar/oscar.c:4180
 #, 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:4169
+#: src/protocols/oscar/oscar.c:4183
 #, 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:4172
+#: src/protocols/oscar/oscar.c:4186
 #, 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:4175
+#: src/protocols/oscar/oscar.c:4189
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -3010,7 +3019,7 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����堺��群膓����榊���銀�荀�羆���������絅純��"
 
-#: src/protocols/oscar/oscar.c:4178
+#: src/protocols/oscar/oscar.c:4192
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -3018,19 +3027,19 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
 
-#: src/protocols/oscar/oscar.c:4181
+#: src/protocols/oscar/oscar.c:4195
 #, 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:4184
+#: src/protocols/oscar/oscar.c:4198
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��� 0x%04x鐚����ラ�����"
 
-#: src/protocols/oscar/oscar.c:4194
+#: src/protocols/oscar/oscar.c:4208
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -3039,20 +3048,20 @@
 "����絽活������茴��弱���絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4195 src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4209 src/protocols/oscar/oscar.c:4216
 msgid "Account Info"
 msgstr "絽活��莖�荐�"
 
-#: src/protocols/oscar/oscar.c:4200
+#: src/protocols/oscar/oscar.c:4214
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���糸��灸散�� %s"
 
-#: src/protocols/oscar/oscar.c:4425
+#: src/protocols/oscar/oscar.c:4449
 msgid "Unable to set AIM profile."
 msgstr "�≧�荐㊤� AIM ��篋肴�����"
 
-#: src/protocols/oscar/oscar.c:4426
+#: src/protocols/oscar/oscar.c:4450
 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 "
@@ -3061,22 +3070,25 @@
 "�������糸�ュ�����荀�羆�篆��号������篋肴�荐�鐚���篁ラ��篋�莖�荐�筝���←篆��鴻��茫�������糸�ュ�"
 "�����育�画�荐㊤���"
 
-#: src/protocols/oscar/oscar.c:4456
+#: src/protocols/oscar/oscar.c:4480
 #, c-format
 msgid ""
+"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
+"it for you."
+msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr "莇��阪��篋肴�荐����桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
-
-#: src/protocols/oscar/oscar.c:4458
+msgstr[0] "莇��阪��篋肴�荐����桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
+
+#: src/protocols/oscar/oscar.c:4485
 msgid "Profile too long."
 msgstr "��篋肴�荐����激��"
 
-#: src/protocols/oscar/oscar.c:4477
+#: src/protocols/oscar/oscar.c:4504
 msgid "Unable to set AIM away message."
 msgstr "�≧�荐㊤� AIM �∫��荐�����"
 
-#: src/protocols/oscar/oscar.c:4478
+#: src/protocols/oscar/oscar.c:4505
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -3085,22 +3097,25 @@
 "��������糸�ョ�綺鎘�����篆��号�����∫��荐������������絨�膓㊥��������荐㊤���������茫���"
 "絎����糸�ュ���荐㊤�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4518
+#: src/protocols/oscar/oscar.c:4545
 #, c-format
 msgid ""
+"The maximum away message length of %d byte has been exceeded.  Gaim has "
+"truncated it for you."
+msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it and set you away."
-msgstr "莇��咲�∫��荐������桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
-
-#: src/protocols/oscar/oscar.c:4520
+"truncated it for you."
+msgstr[0] "莇��咲�∫��荐������桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
+
+#: src/protocols/oscar/oscar.c:4550
 msgid "Away message too long."
 msgstr "�∫��荐������激��"
 
-#: src/protocols/oscar/oscar.c:4740
+#: src/protocols/oscar/oscar.c:4770
 msgid "Unable To Retrieve Buddy List"
 msgstr "�≧�莅���絅遵�羝���"
 
-#: src/protocols/oscar/oscar.c:4741
+#: src/protocols/oscar/oscar.c:4771
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -3109,12 +3124,12 @@
 "Gaim ����羃���莨���� AIM 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃�����"
 "紊縁����遵�札��江��絨��鏅���緇���"
 
-#: src/protocols/oscar/oscar.c:4832 src/protocols/oscar/oscar.c:4833
-#: src/protocols/oscar/oscar.c:4838
+#: src/protocols/oscar/oscar.c:4862 src/protocols/oscar/oscar.c:4863
+#: src/protocols/oscar/oscar.c:4868
 msgid "Orphans"
 msgstr "絖ゅ����"
 
-#: src/protocols/oscar/oscar.c:5002
+#: src/protocols/oscar/oscar.c:5032
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -3123,15 +3138,15 @@
 "���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���"
 "荅���"
 
-#: src/protocols/oscar/oscar.c:5002 src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5032 src/protocols/oscar/oscar.c:5045
 msgid "(no name)"
 msgstr "(羃�����絖�)"
 
-#: src/protocols/oscar/oscar.c:5003 src/protocols/oscar/oscar.c:5016
+#: src/protocols/oscar/oscar.c:5033 src/protocols/oscar/oscar.c:5046
 msgid "Unable To Add"
 msgstr "�≧�����"
 
-#: src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5045
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3141,18 +3156,20 @@
 "���坂���������≧�絨�絅遵� %s ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟���"
 "����膤紫輝��荐援��筝�����"
 
-#: src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5080
 #, 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:5056
+msgstr ""
+"篏睡���� %s 綏牙���荐掩�����ュ�遺�鐚�絅刻���絅遵�羝���賢����������荀�絨�篁�鐚�絅刻�����"
+"���"
+
+#: src/protocols/oscar/oscar.c:5086
 msgid "Authorization Given"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5119
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3162,17 +3179,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5131
+#: src/protocols/oscar/oscar.c:5161
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "篏睡���� %s ��荐延����篁�鐚�絅刻����ュソ��羝�����荀�羆���"
 
-#: src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5162
 msgid "Authorization Granted"
 msgstr "腟��茯�茘�"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/oscar/oscar.c:5165
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3182,91 +3199,91 @@
 "篏睡���� %s ���坂�������鐚���腟�篋����篁�鐚�絅刻����ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5136
+#: src/protocols/oscar/oscar.c:5166
 msgid "Authorization Denied"
 msgstr "茯�茘���腟�"
 
 # NOTE: ��茖∞��絖�臂���� #gaim �� MrHappy �� deryni ��箴���
-#: src/protocols/oscar/oscar.c:5173 src/protocols/toc/toc.c:1206
+#: src/protocols/oscar/oscar.c:5203 src/protocols/toc/toc.c:1220
 msgid "Exchange:"
 msgstr "��紊����腆種�"
 
-#: src/protocols/oscar/oscar.c:5393
+#: src/protocols/oscar/oscar.c:5425
 msgid "<b>Status:</b> "
 msgstr "<b>����鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5402
+#: src/protocols/oscar/oscar.c:5434
 msgid "<b>Logged In:</b> "
 msgstr "<b>�糸�ユ����鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5441
 msgid "<b>Capabilities:</b> "
 msgstr "<b>�後��э�</b>"
 
-#: src/protocols/oscar/oscar.c:5415
+#: src/protocols/oscar/oscar.c:5448
 msgid "<b>Available:</b> "
 msgstr "<b>筝�膩�鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5423
+#: src/protocols/oscar/oscar.c:5457
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>����鐚�</b>���茘�"
 
-#: src/gtkblist.c:895 src/protocols/oscar/oscar.c:5427
+#: src/protocols/oscar/oscar.c:5461 src/gtkblist.c:896
 msgid "<b>Status:</b> Offline"
 msgstr "<b>����鐚�</b>�∝�"
 
-#: src/protocols/oscar/oscar.c:5457
+#: src/protocols/oscar/oscar.c:5491
 msgid "Offline"
 msgstr "�∝�"
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5732
 msgid "Unable to open Direct IM"
 msgstr "�≧������贋・���恰��荐���"
 
-#: src/protocols/oscar/oscar.c:5711
+#: src/protocols/oscar/oscar.c:5745
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "���御��篋��� %s ����筝����贋・�恰��荐�����"
 
-#: src/protocols/oscar/oscar.c:5714
+#: src/protocols/oscar/oscar.c:5748
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr "��罔e������峨�堺���� IP 篏���鐚���罩ゅ��醇�����援�筝���蘂��������活�膵主����"
 
-#: src/protocols/oscar/oscar.c:5859
+#: src/protocols/oscar/oscar.c:5893
 msgid "Get Status Msg"
 msgstr "��緇�����荐���"
 
-#: src/protocols/oscar/oscar.c:5903
+#: src/protocols/oscar/oscar.c:5937
 msgid "Re-request Authorization"
 msgstr "���域�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:5924
+#: src/protocols/oscar/oscar.c:5958
 msgid "The new formatting is invalid."
 msgstr "�亥���弱����≧������"
 
-#: src/protocols/oscar/oscar.c:5925
+#: src/protocols/oscar/oscar.c:5959
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "絽活���弱������醇�壕�紊у�篁ュ�腥榊�純��"
 
-#: src/protocols/oscar/oscar.c:5931
+#: src/protocols/oscar/oscar.c:5965
 msgid "New screenname formatting:"
 msgstr "�亥��絽活���弱�鐚�"
 
-#: src/protocols/oscar/oscar.c:5980
+#: src/protocols/oscar/oscar.c:6014
 msgid "Change Address To:"
 msgstr "莅��翫�医���削�"
 
-#: src/protocols/oscar/oscar.c:5994
+#: src/protocols/oscar/oscar.c:6028
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "������罩e���緇�筝���絅遵���茯�茘�鐚�<BR>"
 
-#: src/protocols/oscar/oscar.c:6019
+#: src/protocols/oscar/oscar.c:6053
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��研羃������緇�薊�茘�</i>"
 
-#: src/protocols/oscar/oscar.c:6024
+#: src/protocols/oscar/oscar.c:6058
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3275,43 +3292,43 @@
 "%s<BR><BR>���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚�"
 "�九��御����荀�羆����域�茘�����"
 
-#: src/protocols/oscar/oscar.c:6040
+#: src/protocols/oscar/oscar.c:6074
 msgid "Available Message:"
 msgstr "筝�膩�荐����"
 
-#: src/protocols/oscar/oscar.c:6041
+#: src/protocols/oscar/oscar.c:6075
 msgid "Please talk to me, I'm lonely! (and single)"
 msgstr "茫����������э���荀阪�絅遵�絲�鐚�"
 
-#: src/protocols/oscar/oscar.c:6103
+#: src/protocols/oscar/oscar.c:6137
 msgid "Set Available Message"
 msgstr "荐㊤�筝�膩�荐���"
 
-#: src/protocols/oscar/oscar.c:6117
+#: src/protocols/oscar/oscar.c:6151
 msgid "Change Password (URL)"
 msgstr "篆��劫�腆�(URL)"
 
-#: src/protocols/oscar/oscar.c:6128
+#: src/protocols/oscar/oscar.c:6162
 msgid "Format Screenname"
 msgstr "�弱���絽活��"
 
-#: src/protocols/oscar/oscar.c:6134
+#: src/protocols/oscar/oscar.c:6168
 msgid "Confirm Account"
 msgstr "腆肴�絽活��"
 
-#: src/protocols/oscar/oscar.c:6140
+#: src/protocols/oscar/oscar.c:6174
 msgid "Display Current Registered Address"
 msgstr "蕁�ず������荐糸�����医��"
 
-#: src/protocols/oscar/oscar.c:6146
+#: src/protocols/oscar/oscar.c:6180
 msgid "Change Current Registered Address"
 msgstr "篆��合������荐糸�����医��"
 
-#: src/protocols/oscar/oscar.c:6155
+#: src/protocols/oscar/oscar.c:6189
 msgid "Show Buddies Awaiting Authorization"
 msgstr "蕁�ず膈�緇�茯�茘���絅遵�"
 
-#: src/protocols/oscar/oscar.c:6163
+#: src/protocols/oscar/oscar.c:6197
 msgid "Search for Buddy by Email"
 msgstr "篏睡���糸��灸散��絨�絅遵�"
 
@@ -3325,15 +3342,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6284 src/protocols/oscar/oscar.c:6286
+#: src/protocols/oscar/oscar.c:6318 src/protocols/oscar/oscar.c:6320
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ ��絎�罔∞�"
 
-#: src/protocols/oscar/oscar.c:6303
+#: src/protocols/oscar/oscar.c:6337
 msgid "Auth host"
 msgstr "茯�茘�篌堺����"
 
-#: src/protocols/oscar/oscar.c:6308
+#: src/protocols/oscar/oscar.c:6342
 msgid "Auth port"
 msgstr "茯�茘���荐���"
 
@@ -3342,105 +3359,105 @@
 msgid "Looking up %s"
 msgstr "�上� %s 筝�"
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:508
 #, c-format
 msgid "Unable to write file %s."
 msgstr "�≧�絲��ユ�罅� %s��"
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:511
 #, c-format
 msgid "Unable to read file %s."
 msgstr "�≧�莅���罟�罅� %s��"
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:514
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "荐���お�件���緇��� %s 篏���腟�茴���サ��"
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:517
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ����筝����糸�ャ��"
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:520
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "茘���鐚�%s ���茴���荐援����"
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:523
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "荐���←筝�罍�鐚����堺�����遺�篌堺���������句���守����綺���"
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:526
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "�� %s 筝���札��紊���"
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:529
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "����荐���畿 %s ����綺�お綽����"
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:532
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "���阪け篋�筝����� %s ��箴���荐�������阪�紊�ぇ篋���"
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:535
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "���阪け篋�筝����� %s ��箴���荐�������阪��渇������綺�お綽���"
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:538
 msgid "Failure."
 msgstr "紊掩����"
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:541
 msgid "Too many matches."
 msgstr "�拷��紊����"
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:544
 msgid "Need more qualifiers."
 msgstr "��莠後�ユ�翫�罟∝刈罌�篁吟��"
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:547
 msgid "Dir service temporarily unavailable."
 msgstr "������������筝�絖�����"
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:550
 msgid "Email lookup restricted."
 msgstr "胼�罩� eMail 罟∽�ャ��"
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:553
 msgid "Keyword ignored."
 msgstr "���球�綏画←綽順�ャ��"
 
-#: src/protocols/toc/toc.c:542
+#: src/protocols/toc/toc.c:556
 msgid "No keywords."
 msgstr "羃������球���"
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:559
 msgid "User has no directory information."
 msgstr "����篏睡����羃���篁����檎��莖�荐���"
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:563
 msgid "Country not supported."
 msgstr "������絎銀�茴���叵��"
 
-#: src/protocols/toc/toc.c:552
+#: src/protocols/toc/toc.c:566
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "���ョ��紊掩������鐚�%s��"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:572
 msgid "The service is temporarily unavailable."
 msgstr "��������筝�絖�����"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:575
 msgid "Your warning level is currently too high to log in."
 msgstr "�������糸�ョ鎧腟援��茘���膈�膣�紊��鐚�篁ヨ�雁�≧��糸�ャ��"
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:578
 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."
@@ -3448,37 +3465,37 @@
 "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
 "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
-#: src/protocols/toc/toc.c:566
+#: src/protocols/toc/toc.c:580
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "�主��篋�筝������ョ���糸�ラ���鐚�%s��"
 
-#: src/protocols/toc/toc.c:569
+#: src/protocols/toc/toc.c:583
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "筝������ョ����� %d �主����莖�荐�鐚�%s"
 
-#: src/protocols/toc/toc.c:589
+#: src/protocols/toc/toc.c:603
 msgid "Connection Closed"
 msgstr "�g�����"
 
-#: src/protocols/toc/toc.c:627
+#: src/protocols/toc/toc.c:641
 msgid "Waiting for reply..."
 msgstr "膈�緇���荀�筝�..."
 
-#: src/protocols/toc/toc.c:692
+#: src/protocols/toc/toc.c:706
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 腟���篋�������������憜���札膵主����渇������荐�����"
 
-#: src/protocols/toc/toc.c:880
+#: src/protocols/toc/toc.c:894
 msgid "Password Change Successful"
 msgstr "絲�腆寂信�号����"
 
-#: src/protocols/toc/toc.c:884
+#: src/protocols/toc/toc.c:898
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ���坂�筝������� (PAUSE) ��篁ゃ��"
 
-#: src/protocols/toc/toc.c:885
+#: src/protocols/toc/toc.c:899
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -3487,47 +3504,47 @@
 "�狗�����主����鐚�TOC ��綽順�ユ������箴���荐�����������遵�������肴�����鐚�絨���権�榊鎧"
 "腟宴��Gaim 絨��水���主����罔g��篋�����������������х������鐚�茫����茫���"
 
-#: src/protocols/toc/toc.c:1344
+#: src/protocols/toc/toc.c:1358
 msgid "Get Dir Info"
 msgstr "��緇�篏睡������篋肴�荐�"
 
-#: src/protocols/toc/toc.c:1468
+#: src/protocols/toc/toc.c:1482
 msgid "Set Dir Info"
 msgstr "荐㊤�篏睡������篋肴�荐�"
 
-#: src/protocols/toc/toc.c:1591
+#: src/protocols/toc/toc.c:1605
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "�≧����� %s 篁ヤ�絲��ワ�"
 
-#: src/protocols/toc/toc.c:1627
+#: src/protocols/toc/toc.c:1641
 msgid "File transfer failed; other side probably canceled."
 msgstr "罟�罅��活叱紊掩��鐚����醇����劫�羔��活叱��"
 
-#: src/protocols/toc/toc.c:1672 src/protocols/toc/toc.c:1712
-#: src/protocols/toc/toc.c:1924
+#: src/protocols/toc/toc.c:1686 src/protocols/toc/toc.c:1726
+#: src/protocols/toc/toc.c:1938
 msgid "Could not connect for transfer."
 msgstr "�≧������g�篁ヤ��活叱��"
 
-#: src/protocols/toc/toc.c:1836
+#: src/protocols/toc/toc.c:1850
 msgid "Could not connect for transfer!"
 msgstr "�≧������活叱���g�鐚�"
 
-#: src/protocols/toc/toc.c:1869
+#: src/protocols/toc/toc.c:1883
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "�≧�絲��ユ��㊧�荐�������罟�罅�絨�筝���茴��渇����"
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:1969
+#: src/protocols/toc/toc.c:1983 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr "Gaim - �峨���..."
 
-#: src/protocols/toc/toc.c:2003
+#: src/protocols/toc/toc.c:2017
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 荀�羆� %s �ユ�� %d ��罟�罅�鐚�%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2010
+#: src/protocols/toc/toc.c:2024
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 荀�羆����渇��罟�罅�腟��鐚�絅刻���"
@@ -3542,15 +3559,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2085 src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2099 src/protocols/toc/toc.c:2101
 msgid "TOC Protocol Plugin"
 msgstr "TOC ��絎�罔∞�"
 
-#: src/protocols/toc/toc.c:2104
+#: src/protocols/toc/toc.c:2118
 msgid "TOC host"
 msgstr "TOC 篌堺����"
 
-#: src/protocols/toc/toc.c:2108
+#: src/protocols/toc/toc.c:2122
 msgid "TOC port"
 msgstr "TOC ��荐���"
 
@@ -3560,12 +3577,12 @@
 msgstr "�堺�����"
 
 #. First Name
-#: src/dialogs.c:1990 src/dialogs.c:2644 src/protocols/trepia/trepia.c:300
+#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1931 src/dialogs.c:2562
 msgid "First Name"
 msgstr "��"
 
 #. Last Name
-#: src/dialogs.c:2013 src/dialogs.c:2664 src/protocols/trepia/trepia.c:307
+#: src/protocols/trepia/trepia.c:307 src/dialogs.c:1954 src/dialogs.c:2582
 msgid "Last Name"
 msgstr "紮�"
 
@@ -3626,7 +3643,7 @@
 msgstr "��箴���"
 
 #. State
-#: src/dialogs.c:2046 src/dialogs.c:2693 src/protocols/trepia/trepia.c:368
+#: src/protocols/trepia/trepia.c:368 src/dialogs.c:1987 src/dialogs.c:2611
 msgid "State"
 msgstr "���怨�"
 
@@ -3635,11 +3652,6 @@
 msgid "Set your Trepia profile data."
 msgstr "荐㊤����� Trepia ��篋肴�����"
 
-#: src/dialogs.c:2088 src/dialogs.c:2269 src/dialogs.c:3435 src/dialogs.c:4240
-#: src/dialogs.c:4878 src/gtkrequest.c:177 src/protocols/trepia/trepia.c:379
-msgid "Save"
-msgstr "�峨�"
-
 #: src/protocols/trepia/trepia.c:523
 msgid "Set Profile"
 msgstr "荐㊤���篋肴���"
@@ -3663,6 +3675,10 @@
 msgid "Logging in"
 msgstr "�糸�ヤ賢"
 
+#: src/protocols/trepia/trepia.c:1148
+msgid "Unable to create socket"
+msgstr "�≧�綮榊� Socket"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -3681,6 +3697,14 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "���� Yahoo! 荐���研羃���茴����冴��"
 
+#: src/protocols/yahoo/yahoo.c:897
+msgid "Unable to read"
+msgstr "�≧�莅���"
+
+#: src/protocols/yahoo/yahoo.c:995
+msgid "Connection problem"
+msgstr "�g����"
+
 #: src/protocols/yahoo/yahoo.c:1057 src/protocols/yahoo/yahoo.c:1265
 #: src/protocols/yahoo/yahoo.c:1339
 msgid "Not At Home"
@@ -3873,23 +3897,23 @@
 "paladin@ms1.hinet.net\">paladin@ms1.hinet.net</A>&gt;<BR>  URL: <A HREF="
 "\"http://gaim.dnsq.org/\">http://gaim.dnsq.org</A><BR><BR>"
 
-#: src/away.c:222
+#: src/away.c:211
 msgid "Gaim - Away!"
 msgstr "Gaim - �∫��鐚�"
 
-#: src/away.c:282
+#: src/away.c:272
 msgid "I'm Back!"
 msgstr "����箴�篋�鐚�"
 
-#: src/away.c:384
+#: src/away.c:377
 msgid "New Away Message"
 msgstr "�亥���∫��荐���"
 
-#: src/away.c:404
+#: src/away.c:397
 msgid "Remove Away Message"
 msgstr "腱脂�ら�∫��荐���"
 
-#: src/away.c:599
+#: src/away.c:592
 msgid "Set All Away"
 msgstr "����┃�咲�∫��"
 
@@ -3900,39 +3924,42 @@
 #: src/blist.c:751
 #, c-format
 msgid ""
+"%d buddy from group %s was not removed because its account was not logged "
+"in.  This buddy and the group were not removed.\n"
+msgid_plural ""
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
-msgstr ""
+msgstr[0] ""
 "%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�����絨�����絽活��筝�����糸�ャ����篋�絅遵���"
 "臂ょ�羃���茴�Щ�ゃ��\n"
 
-#: src/blist.c:756
+#: src/blist.c:760
 msgid "Group not removed"
 msgstr "臂ょ���←腱脂��"
 
-#: src/blist.c:947
+#: src/blist.c:973
 msgid "Invalid Groupname"
 msgstr "�≧����臂ょ���腮�"
 
-#: src/blist.c:1703
+#: src/blist.c:1729
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "��В������絅遵�羝������主�������絅遵�羝������茴���ャ��"
 
-#: src/blist.c:1705
+#: src/blist.c:1731
 msgid "Buddy List Error"
 msgstr "絅遵�羝������"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1713
+#: src/blist.c:1739
 #, 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:1716
+#: src/blist.c:1742
 msgid "Converting Buddy List"
 msgstr "莉���絅遵�羝���賢"
 
@@ -3947,15 +3974,15 @@
 "Unable to launch your browser because the 'Manual' browser command has been "
 "chosen, but no command has been set."
 msgstr ""
-"���堺��戎�����篏睡��������頳遵�������檎��鐚����頳遵��研羃���茴�┃絎�鐚�"
-"��罩ょ�頳遵�����莨��茴�������"
+"���堺��戎�����篏睡��������頳遵�������檎��鐚����頳遵��研羃���茴�┃絎�鐚���罩ょ�頳遵�����"
+"莨��茴�������"
 
 #: src/browser.c:586
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
 msgstr "���������御�����頳遵�����主�����鐚�%s"
 
-#: src/buddy_chat.c:316 src/dialogs.c:1333
+#: src/buddy_chat.c:316 src/dialogs.c:1274
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -3978,6 +4005,29 @@
 msgid "Join"
 msgstr "����"
 
+#: src/connection.c:113
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "�鞘��� %s ����絎�罔∞�"
+
+#: src/connection.c:118 src/connection.c:408
+msgid "Connection Error"
+msgstr "�g����"
+
+#: src/connection.c:138
+#, c-format
+msgid "Enter password for %s"
+msgstr "莠後�� %s ��絲�腆�"
+
+#: src/connection.c:404
+#, c-format
+msgid "%s has been disconnected"
+msgstr "%s 綏牙�筝㊥�潔�g�"
+
+#: src/connection.c:407
+msgid "Reason Unknown."
+msgstr "���延�����"
+
 #: src/conversation.c:405
 msgid "Unable to send message. The message is too large."
 msgstr "�≧����肴���������荐���お紊т���"
@@ -3991,7 +4041,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1926
+#: src/conversation.c:1924
 #, c-format
 msgid "%s entered the room."
 msgstr "%s �峨�ヨ��紊����"
@@ -4001,51 +4051,51 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1929
+#: src/conversation.c:1927
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] �峨�ヨ��紊����"
 
-#: src/conversation.c:1979
+#: src/conversation.c:1977
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �壕��援┗�� %s"
 
-#: src/conversation.c:2021
+#: src/conversation.c:2019
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s �∫����紊�� (%s)��"
 
-#: src/conversation.c:2023
+#: src/conversation.c:2021
 #, c-format
 msgid "%s left the room."
 msgstr "%s �∫����紊����"
 
-#: src/conversation.c:2224
+#: src/conversation.c:2222
 msgid "Last created window"
 msgstr "筝�筝���������荀�腦�"
 
+#: src/conversation.c:2224
+msgid "New window"
+msgstr "�域�腦�"
+
 #: src/conversation.c:2226
-msgid "New window"
-msgstr "�域�腦�"
-
-#: src/conversation.c:2228
 msgid "By group"
 msgstr "箴�臂ょ�"
 
-#: src/conversation.c:2230
+#: src/conversation.c:2228
 msgid "By account"
 msgstr "箴�絽活��"
 
-#: src/dialogs.c:345
+#: src/dialogs.c:337
 msgid "Warn User"
 msgstr "茘���篏睡����"
 
-#: src/dialogs.c:348
+#: src/dialogs.c:340
 msgid "_Warn"
 msgstr "茘���(_W)"
 
-#: src/dialogs.c:364
+#: src/dialogs.c:356
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -4057,431 +4107,474 @@
 "\n"
 "������篏�絨���紜��� %s ��茘���膈�膣�鐚�����篁� / 絅劫�茴����銀札�翫�贋�主���������吟��\n"
 
-#: src/dialogs.c:373
+#: src/dialogs.c:365
 msgid "Warn _anonymously?"
 msgstr "篁ュ�水����荳�蚕�弱�肴⑥��鐚�(_A)"
 
-#: src/dialogs.c:380
+#: src/dialogs.c:372
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�水����茘���罸�莠�筝�羃����i瑳�顔����</b>"
 
-#: src/dialogs.c:455
+#: src/dialogs.c:449
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "��③荅���絨� %s  緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
-#: src/dialogs.c:457 src/dialogs.c:458
+#: src/dialogs.c:451 src/dialogs.c:452
 msgid "Remove Buddy"
 msgstr "腱脂�ゅソ��"
 
-#: src/dialogs.c:467
+#: src/dialogs.c:461
 #, 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:469 src/dialogs.c:470
+#: src/dialogs.c:463 src/dialogs.c:464
 msgid "Remove Chat"
 msgstr "腱脂�よ��紊��"
 
-#: src/dialogs.c:479
+#: src/dialogs.c:473
 #, 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:482 src/dialogs.c:483
+"��③荅���絨�臂ょ� %s ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
+
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Group"
 msgstr "腱脂�ょ召腟�"
 
-#: src/dialogs.c:632
+#: src/dialogs.c:626
 msgid "New Message"
 msgstr "�域���"
 
-#: src/dialogs.c:650
+#: src/dialogs.c:644
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "茫�莠後�ユ�����活��守���恰��荐����莟∞��絽活����\n"
 
-#: src/dialogs.c:666 src/dialogs.c:743 src/dialogs.c:3767
+#: src/dialogs.c:660 src/dialogs.c:737
 msgid "_Screenname:"
 msgstr "絽活��(_S)鐚�"
 
-#: src/dialogs.c:681 src/dialogs.c:759 src/gtkpounce.c:408
+#: src/dialogs.c:675 src/dialogs.c:753 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "絽活��(_A)鐚�"
 
-#: src/dialogs.c:712
+# XXX ����緇�篏睡����莖�荐�����③腆肴⑮羈�鐚�篏�絎�絲���お�隙�鐚�篁ょ���√�絅��� (GTK Layout Bug?)
+#: src/dialogs.c:706
 msgid "Get User Info"
 msgstr "��緇�篏睡����莖�荐�"
 
-#: src/dialogs.c:731
+#: src/dialogs.c:725
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "茫�莠後�ユ�����活��ヨ�絨�莟∞��絽活����\n"
 
-#: src/dialogs.c:889
+#: src/dialogs.c:863
 msgid "Add Group"
 msgstr "���ョ召腟�"
 
-#: src/dialogs.c:906
-msgid "Please enter the name of the group to be added.\n"
-msgstr "茫�莠後�ョ召腟���腮延札�画��医���\n"
-
-#: src/dialogs.c:915 src/dialogs.c:4319
-msgid "_Group:"
-msgstr "臂ょ�(_G)鐚�"
-
-#: src/dialogs.c:951
+#: src/dialogs.c:863
+msgid "Add a new group"
+msgstr "�医�臂ょ�"
+
+# FIXME 筝�紊�����
+#: src/dialogs.c:864
+msgid "Please enter the name of the group to be added."
+msgstr "茫�莠後�ョ召腟���腮延札�画��医���"
+
+#: src/dialogs.c:892
 msgid "Add Buddy"
 msgstr "�医�絅遵�"
 
-#: src/dialogs.c:970
+#: src/dialogs.c:911
 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. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
-"茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�"
-"������荐㊤�絨�����ソ��羝���賢蕁�ず��\n"
-
-#: src/dialogs.c:989
+"茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�������荐㊤�絨���"
+"��ソ��羝���賢蕁�ず��\n"
+
+#: src/dialogs.c:930
 msgid "Screen Name"
 msgstr "絽活��"
 
-#: src/dialogs.c:1002
+#: src/dialogs.c:943
 msgid "Alias"
 msgstr "�ュ��"
 
-#: src/dialogs.c:1012
+#: src/dialogs.c:953
 msgid "Group"
 msgstr "臂ょ�"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1021
+#: src/dialogs.c:962
 msgid "Add To"
 msgstr "紜�����"
 
-#: src/dialogs.c:1340
+#: src/dialogs.c:1281
 msgid "Add Chat"
 msgstr "���ヨ��紊��"
 
-#: src/dialogs.c:1363
+#: src/dialogs.c:1304
 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:1372
+#: src/dialogs.c:1313
 msgid "Account:"
 msgstr "絽活��鐚�"
 
-#: src/dialogs.c:1391 src/gtkaccount.c:430
+#: src/dialogs.c:1332 src/gtkaccount.c:428
 msgid "Alias:"
 msgstr "�ュ��鐚�"
 
-#: src/dialogs.c:1402
+#: src/dialogs.c:1343
 msgid "Group:"
 msgstr "臂ょ�鐚�"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1689
 msgid "Privacy"
 msgstr "�援�荐㊤�"
 
-#: src/dialogs.c:1764
+#: src/dialogs.c:1705
 msgid "Changes to privacy settings take effect immediately."
 msgstr "�援�荐㊤�絨�腴��紫������"
 
-#: src/dialogs.c:1773
+#: src/dialogs.c:1714
 msgid "Set privacy for:"
 msgstr "絽活��鐚�"
 
-#: src/dialogs.c:1790
+#: src/dialogs.c:1731
 msgid "Allow all users to contact me"
 msgstr "��荐掩������篏睡����������機"
 
-#: src/dialogs.c:1794
+#: src/dialogs.c:1735
 msgid "Allow only users on my buddy list"
 msgstr "����荐怨ソ��羝���賢��篏睡����"
 
-#: src/dialogs.c:1798
+#: src/dialogs.c:1739
 msgid "Allow only the users below"
 msgstr "��荐延�����篏睡����������機"
 
-#: src/dialogs.c:1836
+#: src/dialogs.c:1777
 msgid "Deny all users"
 msgstr "��腟�����篏睡����"
 
-#: src/dialogs.c:1840
+#: src/dialogs.c:1781
 msgid "Block the users below"
 msgstr "��腟�篁ヤ���篏睡����"
 
-#: src/dialogs.c:1956
+#: src/dialogs.c:1897
 msgid "Set Directory Info"
 msgstr "荐㊤�篏睡����莖�荐�"
 
-#: src/dialogs.c:1964
+#: src/dialogs.c:1905
 msgid "Directory Info"
 msgstr "����莖�荐�"
 
-#: src/dialogs.c:1974
+#: src/dialogs.c:1915
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "荐㊤� %s ��篏睡����莖�荐�鐚�"
 
-#: src/dialogs.c:1987
+#: src/dialogs.c:1928
 msgid "Allow Web Searches To Find Your Info"
 msgstr "��荐怨�� Web ��絨�箴�罟∵�������篋肴�荐�"
 
+# TODO: Untranslated
 #. Line 2
-#: src/dialogs.c:2001 src/dialogs.c:2654
+#: src/dialogs.c:1942 src/dialogs.c:2572
 msgid "Middle Name"
 msgstr ""
 
 # NOTE��絨����鎀ф�箙���札鐚�篏���Maiden Name����絽娯�����������������
 #. Line 4
-#: src/dialogs.c:2024 src/dialogs.c:2674
+#: src/dialogs.c:1965 src/dialogs.c:2592
 msgid "Maiden Name"
 msgstr "���"
 
-#: src/dialogs.c:2111
+#: src/dialogs.c:2052
 msgid "New passwords do not match."
 msgstr "�医�腆寂研筝��悟���"
 
-#: src/dialogs.c:2117
+#: src/dialogs.c:2058
 msgid "Fill out all fields completely."
 msgstr "茫�絎�������茵��主��紂����"
 
-#: src/dialogs.c:2162
+#: src/dialogs.c:2103
 #, c-format
 msgid "Changing password for %s:"
 msgstr "篆��� %s ��絲�腆種�"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2111
 msgid "Original Password"
 msgstr "��絲�腆�"
 
-#: src/dialogs.c:2181
+#: src/dialogs.c:2122
 msgid "New Password"
 msgstr "�医�腆�"
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2133
 msgid "New Password (again)"
 msgstr "�医�腆種���罨∞∈茯�鐚�"
 
-#: src/dialogs.c:2241
+#: src/dialogs.c:2182
 #, c-format
 msgid "Changing info for %s:"
 msgstr "篆��� %s ��莖�荐�鐚�"
 
-#: src/dialogs.c:2327
+#: src/dialogs.c:2268
 msgid "Below are the results of your search: "
 msgstr "篁ヤ����������ヨ���腟���鐚�"
 
-#: src/dialogs.c:2438
-msgid "Permit"
-msgstr "荐怨�"
-
-#: src/dialogs.c:2470
-msgid "Add Permit"
-msgstr "����┗��"
-
-#: src/dialogs.c:2472
-msgid "Add Deny"
-msgstr "���ユ��腟�"
-
-#: src/dialogs.c:2539
+#: src/dialogs.c:2369
+#, c-format
+msgid "Unblock %s?"
+msgstr "茹e� %s鐚�"
+
+#: src/dialogs.c:2371
+#, c-format
+msgid ""
+"You are about to unblock %s. This will allow %s to speak to you again. Do "
+"you want to continue?"
+msgstr "���荀�茹e� %s鐚�%s 絨�����罨≦����荅宴�����膵主�������篏����"
+
+#: src/dialogs.c:2375 src/dialogs.c:2388
+msgid "Unblock User"
+msgstr "茹e�篏睡����"
+
+#: src/dialogs.c:2377 src/gtkrequest.c:197
+msgid "Unblock"
+msgstr "茹e�"
+
+#: src/dialogs.c:2382
+#, c-format
+msgid "Block %s?"
+msgstr "茹e� %s鐚�"
+
+#: src/dialogs.c:2384
+#, c-format
+msgid ""
+"You are about to block %s. This will prevent %s from speaking to you again. "
+"Do you want to continue?"
+msgstr "���荀�絨��� %s鐚�%s 絨�筝����遵����荅宴�����膵主�������篏����"
+
+#. Block button
+#: src/dialogs.c:2390 src/gtkconv.c:2995 src/gtkrequest.c:196
+msgid "Block"
+msgstr "絨���"
+
+#: src/dialogs.c:2457
 msgid "Log Conversation"
 msgstr "荐���篋よ�"
 
-#: src/dialogs.c:2620 src/dialogs.c:2753
+#: src/dialogs.c:2538 src/dialogs.c:2671
 msgid "Search for Buddy"
 msgstr "�上�絅遵�"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:2638
 msgid "Find Buddy By Info"
 msgstr "篁ヨ�荐��上�絅遵�"
 
-#: src/dialogs.c:2747
+#: src/dialogs.c:2665
 msgid "Find Buddy By Email"
 msgstr "篁ラ�糸��灸散箴��上�絅遵�"
 
-#: src/dialogs.c:2851
+#: src/dialogs.c:2769
 msgid "Insert Link"
 msgstr "���ラ�g�"
 
-#: src/dialogs.c:2853
+#: src/dialogs.c:2771
 msgid "Insert"
 msgstr "����"
 
-#: src/dialogs.c:2872
+#: src/dialogs.c:2790
 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:3041 src/dialogs.c:3058
+#: src/dialogs.c:2959 src/dialogs.c:2976
 msgid "Select Text Color"
 msgstr "荐㊤���絖�蕁��"
 
-#: src/dialogs.c:3093 src/dialogs.c:3110
+#: src/dialogs.c:3011 src/dialogs.c:3028
 msgid "Select Background Color"
 msgstr "頥㊤��������"
 
-#: src/dialogs.c:3207 src/dialogs.c:3233
+#: src/dialogs.c:3125 src/dialogs.c:3151
 msgid "Select Font"
 msgstr "�御��絖���"
 
-#: src/dialogs.c:3299
+#: src/dialogs.c:3217
 msgid "You cannot save an away message with a blank title"
 msgstr "����遵�峨�筝���羃����������∫��荐���"
 
-#: src/dialogs.c:3301
+#: src/dialogs.c:3219
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "茫�腟��荐������罔�蕁�鐚�������篏睡����箴�篏睡�������筝��峨�絎���"
 
-#: src/dialogs.c:3311
+#: src/dialogs.c:3229
 msgid "You cannot create an empty away message"
 msgstr "���≧�綮榊�筝���腥榊�順���∫��荐���"
 
-#: src/dialogs.c:3376 src/dialogs.c:3384
+#: src/dialogs.c:3294 src/dialogs.c:3302
 msgid "New away message"
 msgstr "�亥���∫��荐���"
 
-#: src/dialogs.c:3394
+#: src/dialogs.c:3312
 msgid "Away title: "
 msgstr "�∫������鐚�"
 
-#: src/dialogs.c:3439
+#: src/dialogs.c:3357
 msgid "Save & Use"
 msgstr "�峨�筝�戎��"
 
-#: src/dialogs.c:3443
+#: src/dialogs.c:3361
 msgid "Use"
 msgstr "篏睡��"
 
 #. show everything
-#: src/dialogs.c:3592
+#: src/dialogs.c:3510
 msgid "Smile!"
 msgstr "膃�筝���鐚�"
 
-#: src/dialogs.c:3638
+#: src/dialogs.c:3528
 msgid "Alias Chat"
 msgstr "腟���紊���劫�ュ��"
 
-#. Setup the label containing the description.
-#: src/dialogs.c:3667
-msgid "Please enter an aliased name for this chat.\n"
-msgstr "茫��咲������紊��莠後�ヤ����ュ����\n"
-
-#: src/dialogs.c:3679 src/dialogs.c:3782
-msgid "_Alias:"
-msgstr "�ュ��(_A)鐚�"
-
-#: src/dialogs.c:3716
+#: src/dialogs.c:3528
+msgid "Alias chat"
+msgstr "腟���紊���劫�ュ��"
+
+#: src/dialogs.c:3529
+msgid "Please enter an aliased name for this chat."
+msgstr "茫��咲������紊��莠後�ヤ����ュ����"
+
+#: src/dialogs.c:3560
+msgid "_Screenname"
+msgstr "絽活��(_S)"
+
+#: src/dialogs.c:3564 src/gtkblist.c:429 src/gtkblist.c:475
+msgid "_Alias"
+msgstr "�ュ��(_A)"
+
+#: src/dialogs.c:3568
 msgid "Alias Buddy"
 msgstr "�阪ソ����筝��ュ��"
 
+#: src/dialogs.c:3569
+msgid "Alias buddy"
+msgstr "�阪ソ����筝��ュ��"
+
 # NOTE ����茘����荅我����馹���鐚��決����ュ����箴���絲���篏睡����羈�鐚�
 # NOTE 篏�������筝���篋阪��...���合�堺�亥��茘��...��
-#. Setup the label containing the description.
-#: src/dialogs.c:3746
+#: src/dialogs.c:3570
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
-"your buddy list.\n"
-msgstr "顇��咲����絅遵�荐㊤��ュ��鐚������贋�剛���ソ��羝���賢��荐�����絽活����\n"
-
-#: src/dialogs.c:3836 src/dialogs.c:3843
+"your buddy list."
+msgstr "茫��咲����絅遵�荐㊤��ュ��鐚������贋�剛�鐚�絅刻���ソ��羝���賢��荐�����絽活����"
+
+#: src/dialogs.c:3606 src/dialogs.c:3613
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "�≧�絲��ュ�� %s��"
 
-#: src/dialogs.c:3867
+#: src/dialogs.c:3637
 msgid "Save Log File"
 msgstr "�峨��ヨ�罟�"
 
-#: src/dialogs.c:3897
+#: src/dialogs.c:3667
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "�≧����ゆ�罅� %s��"
 
-#: src/dialogs.c:3916
+#: src/dialogs.c:3686
 msgid "Clear Log"
 msgstr "羝��ゆ�ヨ�"
 
-#: src/dialogs.c:3925
+#: src/dialogs.c:3695
 msgid "Really clear log?"
 msgstr "����荀�羝��ゆ�ヨ����"
 
-#: src/dialogs.c:3970
+#: src/dialogs.c:3740
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "�≧������ヨ�罟� %s��"
 
-#: src/dialogs.c:4112
+#: src/dialogs.c:3882
 #, c-format
 msgid "Conversations with %s"
 msgstr "�� %s ��篋よ�"
 
-#: src/dialogs.c:4114
+#: src/dialogs.c:3884
 msgid "System Log"
 msgstr "膤紫輝�ヨ�"
 
-#: src/dialogs.c:4135
+#: src/dialogs.c:3905
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "�≧������ヨ�罟� %s"
 
-#: src/dialogs.c:4156
+#: src/dialogs.c:3926
 msgid "Date"
 msgstr "�ユ��"
 
-#: src/dialogs.c:4213
+#: src/dialogs.c:3983
 msgid "Log"
 msgstr "�ヨ�"
 
-#: src/dialogs.c:4235
+#: src/dialogs.c:4005
 msgid "Clear"
 msgstr "羝���"
 
-#: src/dialogs.c:4293
+#: src/dialogs.c:4044
 msgid "Rename Group"
 msgstr "篆��合召腟���腮�"
 
-#: src/dialogs.c:4310
-msgid "Please enter a new name for the selected group.\n"
-msgstr "茫��咲�後���臂ょ�莠後�ヤ����亥����腮宴��\n"
-
-#: src/ft.c:121
+#: src/dialogs.c:4044
+msgid "New group name"
+msgstr "�医��絖�"
+
+#: src/dialogs.c:4045
+msgid "Please enter a new name for the selected group."
+msgstr "茫��咲�後���臂ょ�莠後�ヤ����亥����腮宴��"
+
+#: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 筝������������罟�罅���腮宴��\n"
 
-#: src/ft.c:135
+#: src/ft.c:137
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s �鞘��違��\n"
 
-#: src/ft.c:727
+#: src/ft.c:693
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "�渇��罟�罅��� %s 茴��羔���\n"
 
-#: src/ft.c:729
+#: src/ft.c:695
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "�� %s �渇��罟�罅�茴��羔���\n"
 
+# TODO: Untranslated
 #: src/gaim-disclosure.c:253
 msgid "Expander Size"
 msgstr ""
 
+# TODO: Untranslated
 #: src/gaim-disclosure.c:254
 msgid "Size of the expander arrow"
 msgstr ""
@@ -4565,29 +4658,28 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "筝�絅醇��������∫��筝�筝�筝���"
 
-#: src/gaimrc.c:364 src/gaimrc.c:1515
+#: src/gaimrc.c:368 src/gaimrc.c:1600
 msgid "boring default"
 msgstr "�∴��鐚���荐㍼�"
 
-#: src/gaimrc.c:1179 src/gtkblist.c:1392
+#: src/gaimrc.c:1264 src/gtkblist.c:1394
 msgid "Alphabetical"
 msgstr "箴��у�罸�"
 
-#: src/gaimrc.c:1181 src/gtkblist.c:1393
+#: src/gaimrc.c:1266 src/gtkblist.c:1395
 msgid "By status"
 msgstr "箴��х����"
 
-#: src/gaimrc.c:1183 src/gtkblist.c:1394
+#: src/gaimrc.c:1268 src/gtkblist.c:1396
 msgid "By log size"
 msgstr "箴��ф�ヨ�紊у�"
 
-#: src/gaimrc.c:1613
+#: src/gaimrc.c:1698
 #, c-format
 msgid "Could not open config file %s."
 msgstr "�≧�����荐㊤�罟� %s��"
 
-# XXX 荀�茲��ヨ⑮��
-#: src/gtkaccount.c:255
+#: src/gtkaccount.c:253
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -4599,294 +4691,290 @@
 "<b>���鎞阪�鐚�</b> %d�%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:330
+#: src/gtkaccount.c:328
 msgid "Login Options"
 msgstr "�糸�ラ�檎��"
 
-#: src/gtkaccount.c:347
+#: src/gtkaccount.c:345
 msgid "Protocol:"
 msgstr "��荐���絎�鐚�"
 
-#: src/gtkaccount.c:352
+#: src/gtkaccount.c:350
 msgid "Screenname:"
 msgstr "絽活��鐚�"
 
-#: src/gtkaccount.c:434
+#: src/gtkaccount.c:432
 msgid "Remember password"
 msgstr "荐�篏鎛�腆�"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:488
+#: src/gtkaccount.c:486
 msgid "User Options"
 msgstr "篏睡��������檎��"
 
-#: src/gtkaccount.c:501
+#: src/gtkaccount.c:499
 msgid "New mail notifications"
 msgstr "�育�灸散����"
 
-#: src/gtkaccount.c:510
+#: src/gtkaccount.c:508
 msgid "Buddy icon file:"
 msgstr "絅遵���腓堺�罅�鐚�"
 
-#: src/gtkaccount.c:519
+#: src/gtkaccount.c:517
 msgid "_Browse"
 msgstr "�頳�(_B)"
 
-#: src/gtkaccount.c:525
+#: src/gtkaccount.c:523
 msgid "_Reset"
 msgstr "��臀�(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:586
+#: src/gtkaccount.c:584
 #, c-format
 msgid "%s Options"
 msgstr "%s �檎��"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:707
+#: src/gtkaccount.c:705
 msgid "Use Global Proxy Settings"
 msgstr "篏睡��������篁g��篌堺����┃絎�"
 
 # NOTE ���怨����鐚�筝�����罸�����鐚��合�冴��筝�篏睡����
 #. No Proxy
-#: src/gtkaccount.c:714
+#: src/gtkaccount.c:712
 msgid "No Proxy"
 msgstr "筝�篏睡��撮��篌堺����"
 
 #. HTTP
-#: src/gtkaccount.c:721
+#: src/gtkaccount.c:719
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:728
+#: src/gtkaccount.c:726
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:735
+#: src/gtkaccount.c:733
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/gtkaccount.c:767
+#: src/gtkaccount.c:765
 msgid "you can see the butterflies mating"
 msgstr "藉�藉��頑�銀���緇�荀���"
 
-#: src/gtkaccount.c:771
+#: src/gtkaccount.c:769
 msgid "If you look real closely"
 msgstr "絋�������緇�紊�篁�膣�"
 
-#: src/gtkaccount.c:787
+#: src/gtkaccount.c:785
 msgid "Proxy Options"
 msgstr "篁g��篌堺�����檎��"
 
-#: src/gtkaccount.c:803 src/gtkprefs.c:1100
+#: src/gtkaccount.c:801 src/gtkprefs.c:1100
 msgid "Proxy _type:"
 msgstr "篁g��篌堺��������(_T)鐚�"
 
-#: src/gtkaccount.c:812
+#: src/gtkaccount.c:810
 msgid "_Host:"
 msgstr "筝紙�篏���(_H)鐚�"
 
-#: src/gtkaccount.c:816
+#: src/gtkaccount.c:814
 msgid "_Port:"
 msgstr "��荐���(_P)鐚�"
 
-#: src/gtkaccount.c:824
+#: src/gtkaccount.c:822
 msgid "_Username:"
 msgstr "篏睡����(_U)鐚�"
 
-#: src/gtkaccount.c:829
+#: src/gtkaccount.c:827
 msgid "Pa_ssword:"
 msgstr "絲�腆�(_S)鐚�"
 
+#: src/gtkaccount.c:1140
+msgid "Add Account"
+msgstr "�医�絽活��"
+
 #: src/gtkaccount.c:1142
-msgid "Add Account"
-msgstr "�医�絽活��"
-
-#: src/gtkaccount.c:1144
 msgid "Modify Account"
 msgstr "篆��劫験��"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1168
+#: src/gtkaccount.c:1166
 msgid "Show more options"
 msgstr "蕁�ず莠�紊����檎��"
 
-#: src/gtkaccount.c:1169
+#: src/gtkaccount.c:1167
 msgid "Show fewer options"
 msgstr "蕁�ず莠�絨����檎��"
 
 #. Register button
-#: src/gtkaccount.c:1196
+#: src/gtkaccount.c:1194
 msgid "Register"
 msgstr "荐糸��"
 
-#: src/gtkaccount.c:1475
+#: src/gtkaccount.c:1473
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "��∈絎�荀����� %s鐚�"
 
-#: src/gtkaccount.c:1479 src/gtkrequest.c:174
+#: src/gtkaccount.c:1477 src/gtkrequest.c:192
 msgid "Delete"
 msgstr "����"
 
-#: src/gtkaccount.c:1557
+#: src/gtkaccount.c:1555
 msgid "Screenname"
 msgstr "絽活��"
 
-#: src/gtkaccount.c:1598
+#: src/gtkaccount.c:1596
 msgid "Protocol"
 msgstr "��荐���絎�"
 
-#: src/gtkblist.c:409
+#: src/gtkblist.c:410
 msgid "Add a _Buddy"
 msgstr "�医�筝���絅遵�(_B)"
 
-#: src/gtkblist.c:411
+#: src/gtkblist.c:412
 msgid "Add a C_hat"
 msgstr "�医�筝�����紊��(_H)"
 
-#: src/gtkblist.c:413
+#: src/gtkblist.c:414
 msgid "_Delete Group"
 msgstr "���ょ召腟�(_D)"
 
-#: src/gtkblist.c:415
+#: src/gtkblist.c:416
 msgid "_Rename"
 msgstr "���遵��(_R)"
 
-#: src/gtkblist.c:423
+#: src/gtkblist.c:424
 msgid "_Join"
 msgstr "����(_J)"
 
-#: src/gtkblist.c:425
+#: src/gtkblist.c:426
 msgid "Auto-Join"
 msgstr "��������"
 
-#: src/gtkblist.c:428 src/gtkblist.c:474
-msgid "_Alias"
-msgstr "�ュ��(_A)"
-
-#: src/gtkblist.c:430 src/gtkblist.c:476
+#: src/gtkblist.c:431 src/gtkblist.c:477
 msgid "_Remove"
 msgstr "腱脂��(_R)"
 
-#: src/gtkblist.c:448
+#: src/gtkblist.c:449
 msgid "_Get Info"
 msgstr "��緇�莖�荐�(_G)"
 
-#: src/gtkblist.c:451
+#: src/gtkblist.c:452
 msgid "_IM"
 msgstr "�恰��荐���(_I)"
 
-#: src/gtkblist.c:453
+#: src/gtkblist.c:454
 msgid "Add Buddy _Pounce"
 msgstr "���ュソ����������(_P)"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:456
 msgid "View _Log"
 msgstr "茹����ヨ�(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:780
+#: src/gtkblist.c:781
 msgid "/_Buddies"
 msgstr "/絅遵�(_B)"
 
-#: src/gtkblist.c:781
-msgid "/Buddies/New _Instant Message..."
-msgstr "/絅遵�/�医�恰��荐���(_I)"
-
 #: src/gtkblist.c:782
-msgid "/Buddies/Join a _Chat..."
-msgstr "/絅遵�/���ヨ��紊��(_C)"
+msgid "/Buddies/New _Instant Message..."
+msgstr "/絅遵�/�医�恰��荐���(_I)"
 
 #: src/gtkblist.c:783
+msgid "/Buddies/Join a _Chat..."
+msgstr "/絅遵�/���ヨ��紊��(_C)"
+
+#: src/gtkblist.c:784
 msgid "/Buddies/Get _User Info..."
 msgstr "/絅遵�/��緇�篏睡����莖�荐�(_U)"
 
-#: src/gtkblist.c:785
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/絅遵�/蕁�ず�∝�絅遵�(_O)"
-
 #: src/gtkblist.c:786
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/絅遵�/蕁�ず腥榊�順��臂ょ�(_E)"
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/絅遵�/蕁�ず�∝�絅遵�(_O)"
 
 #: src/gtkblist.c:787
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/絅遵�/蕁�ず腥榊�順��臂ょ�(_E)"
+
+#: src/gtkblist.c:788
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/絅遵�/�医�筝���絅遵�(_A)"
 
-#: src/gtkblist.c:788
+#: src/gtkblist.c:789
 msgid "/Buddies/Add a C_hat..."
 msgstr "/絅遵�/�医�筝�����紊��(_H)"
 
-#: src/gtkblist.c:789
+#: src/gtkblist.c:790
 msgid "/Buddies/Add a _Group..."
 msgstr "/絅遵�/�医�筝���臂ょ�(_G)"
 
-#: src/gtkblist.c:791
+#: src/gtkblist.c:792
 msgid "/Buddies/_Signoff"
 msgstr "/絅遵�/�糸��(_S)"
 
-#: src/gtkblist.c:792
+#: src/gtkblist.c:793
 msgid "/Buddies/_Quit"
 msgstr "/絅遵�/腟���腮�綣�(_Q)"
 
 #. Tools
-#: src/gtkblist.c:795
+#: src/gtkblist.c:796
 msgid "/_Tools"
 msgstr "綏ュ��(_T)"
 
-#: src/gtkblist.c:796
+#: src/gtkblist.c:797
 msgid "/Tools/_Away"
 msgstr "/綏ュ��/�∫��(_A)"
 
-#: src/gtkblist.c:797
+#: src/gtkblist.c:798
 msgid "/Tools/Buddy _Pounce"
 msgstr "/綏ュ��/絅遵���������(_P)"
 
-#: src/gtkblist.c:798
+#: src/gtkblist.c:799
 msgid "/Tools/P_rotocol Actions"
 msgstr "/綏ュ��/��荐���絎��檎��荐㊤�(_R)"
 
-#: src/gtkblist.c:800
+#: src/gtkblist.c:801
 msgid "/Tools/A_ccounts"
 msgstr "/綏ュ��/絽活��羝���(_C)"
 
-#: src/gtkblist.c:801
-msgid "/Tools/_File Transfers..."
-msgstr "/綏ュ��/罟�罅��活叱(_F)"
-
 #: src/gtkblist.c:802
-msgid "/Tools/Preferences"
-msgstr "/綏ュ��/�鎁処┃絎�"
+msgid "/Tools/_File Transfers..."
+msgstr "/綏ュ��/罟�罅��活叱(_F)"
 
 #: src/gtkblist.c:803
+msgid "/Tools/Preferences"
+msgstr "/綏ュ��/�鎁処┃絎�"
+
+#: src/gtkblist.c:804
 msgid "/Tools/Pr_ivacy"
 msgstr "/綏ュ��/�援�荐㊤�(_I)"
 
-#: src/gtkblist.c:805
+#: src/gtkblist.c:806
 msgid "/Tools/View System _Log"
 msgstr "茹���膤紫輝�ヨ�(_L)"
 
 #. Help
-#: src/gtkblist.c:808
+#: src/gtkblist.c:809
 msgid "/_Help"
 msgstr "茯���(_H)"
 
-#: src/gtkblist.c:809
-msgid "/Help/Online _Help"
-msgstr "膩�筝�茯���(_H)"
-
 #: src/gtkblist.c:810
-msgid "/Help/_Debug Window"
-msgstr "/茯���/�ら���腦�(_D)"
+msgid "/Help/Online _Help"
+msgstr "膩�筝�茯���(_H)"
 
 #: src/gtkblist.c:811
+msgid "/Help/_Debug Window"
+msgstr "/茯���/�ら���腦�(_D)"
+
+#: src/gtkblist.c:812
 msgid "/Help/_About"
 msgstr "/茯���/����(_A)"
 
-#: src/gtkblist.c:845
+#: src/gtkblist.c:846
 #, c-format
 msgid ""
 "\n"
@@ -4895,12 +4983,12 @@
 "\n"
 "<b>絽活��鐚�</b>%s"
 
-#: src/gtkblist.c:907
+#: src/gtkblist.c:908
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:921
+#: src/gtkblist.c:922
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4908,7 +4996,7 @@
 "\n"
 "<b>絽活��鐚�</b>"
 
-#: src/gtkblist.c:922
+#: src/gtkblist.c:923
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4916,7 +5004,7 @@
 "\n"
 "<b>�ュ��鐚�</b>"
 
-#: src/gtkblist.c:923
+#: src/gtkblist.c:924
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4924,7 +5012,7 @@
 "\n"
 "<b>�援┗鐚�</b>"
 
-#: src/gtkblist.c:924
+#: src/gtkblist.c:925
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4932,7 +5020,7 @@
 "\n"
 "<b>��臀��</b>"
 
-#: src/gtkblist.c:925
+#: src/gtkblist.c:926
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -4940,7 +5028,7 @@
 "\n"
 "<b>茘���鐚�<b>"
 
-#: src/gtkblist.c:927
+#: src/gtkblist.c:928
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -4948,7 +5036,7 @@
 "\n"
 "<b>篁�膣刻�</b>綛初��篌主��"
 
-#: src/gtkblist.c:928
+#: src/gtkblist.c:929
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -4957,7 +5045,7 @@
 "<b>����鐚�</b>緇�絅�"
 
 # XXX �h�絖�鐚�紊ф���荅画⑮���h�?!
-#: src/gtkblist.c:929
+#: src/gtkblist.c:930
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -4965,430 +5053,425 @@
 "\n"
 "<b>����鐚�</b>緇�絅�"
 
-#: src/gtkblist.c:1226
+#: src/gtkblist.c:1228
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "��臀��%d 絨�� %d ����"
 
-#: src/gtkblist.c:1228
+#: src/gtkblist.c:1230
 #, c-format
 msgid "Idle (%dm) "
 msgstr "��臀��%d ��鐚�"
 
-#: src/gtkblist.c:1232
+#: src/gtkblist.c:1234
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%)"
 
-#: src/gtkblist.c:1235
+#: src/gtkblist.c:1237
 msgid "Offline "
 msgstr "�∝�"
 
-#: src/gtkblist.c:1391 src/gtkprefs.c:845 src/gtkprefs.c:1535
+#: src/gtkblist.c:1393 src/gtkprefs.c:845 src/gtkprefs.c:1535
 msgid "None"
 msgstr "��"
 
-#: src/gtkblist.c:1430 src/gtkprefs.c:2289
+#: src/gtkblist.c:1432 src/gtkprefs.c:2289
 msgid "Buddy List"
 msgstr "絅遵�羝���"
 
-#: src/gtkblist.c:1454
+#: src/gtkblist.c:1456
 msgid "/Tools/Away"
 msgstr "/綏ュ��/�∫��"
 
-#: src/gtkblist.c:1457
+#: src/gtkblist.c:1459
 msgid "/Tools/Buddy Pounce"
 msgstr "/綏ュ��/絅遵���������"
 
-#: src/gtkblist.c:1460
+#: src/gtkblist.c:1462
 msgid "/Tools/Protocol Actions"
 msgstr "/綏ュ��/��荐���絎��檎��荐㊤�"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1543
+#: src/gtkblist.c:1545
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�"
 
-#: src/gtkblist.c:1545
+#: src/gtkblist.c:1547
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊��絅順��臂ょ�"
 
-#: src/gtkblist.c:1563 src/gtkconv.c:1071
+#: src/gtkblist.c:1565 src/gtkconv.c:1073
 msgid "IM"
 msgstr "�恰��荐���"
 
-#: src/gtkblist.c:1569
+#: src/gtkblist.c:1571
 msgid "Send a message to the selected buddy"
 msgstr "�渇��荐���畿茴��後���絅遵�"
 
-#: src/gtkblist.c:1578
+#: src/gtkblist.c:1580
 msgid "Get information on the selected buddy"
 msgstr "��緇�茴��後�絅遵���莖�荐�"
 
-#: src/gtkblist.c:1586
+#: src/gtkblist.c:1588
 msgid "Join a chat room"
 msgstr "���ヤ�����紊��"
 
-#: src/gtkblist.c:1594
+#: src/gtkblist.c:1596
 msgid "Set an away message"
 msgstr "荐㊤�筝����∫��荐���"
 
-#: src/gtkblist.c:2584
+#: src/gtkblist.c:2585
 msgid "No actions available"
 msgstr "筝���荐延算篏���篏�"
 
-#: src/gtkconn.c:56 src/gtkconn.c:241 src/gtkconn.c:254
+#: src/gtkconn.c:57 src/gtkconn.c:242 src/gtkconn.c:255
 msgid "Done."
 msgstr "絎�����"
 
-#: src/gtkconn.c:135
+#: src/gtkconn.c:136
 msgid "Signon: "
 msgstr "�糸�ワ�"
 
-#: src/gtkconn.c:193
+#: src/gtkconn.c:194
 msgid "Signon"
 msgstr "�糸��"
 
-#: src/gtkconn.c:206
+#: src/gtkconn.c:207
 msgid "Cancel All"
 msgstr "�����羔�"
 
-#: src/gtkconv.c:180
+#: src/gtkconv.c:182
 msgid "That file already exists"
 msgstr "�e��罟�罅�綏牙�絖���"
 
-#: src/gtkconv.c:181 src/gtkft.c:1034
+#: src/gtkconv.c:183 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "���荀���絎����"
 
-#: src/gtkconv.c:276
+#: src/gtkconv.c:278
 msgid "Gaim - Insert Image"
 msgstr "Gaim - ���ュ襲��"
 
-#: src/gtkconv.c:580
+#: src/gtkconv.c:582
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - ��茫�絅遵��峨�ヨ��紊��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:608
+#: src/gtkconv.c:610
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "茫�莠後�ユ���渇��茫���篏睡������腮縁�篁ュ���茫���荐�����"
 
-#: src/gtkconv.c:629
+#: src/gtkconv.c:631
 msgid "_Buddy:"
 msgstr "絅遵�(_B)鐚�"
 
-#: src/gtkconv.c:649
+#: src/gtkconv.c:651
 msgid "_Message:"
 msgstr "荐���(_M)鐚�"
 
-#: src/gtkconv.c:1079
+#: src/gtkconv.c:1081
 msgid "Un-Ignore"
 msgstr "��羔�綽順�ヤ戎����"
 
-#: src/gtkconv.c:1081 src/gtkprefs.c:777
+#: src/gtkconv.c:1083 src/gtkprefs.c:777
 msgid "Ignore"
 msgstr "綽順�ヤ戎����"
 
 # XXX��Info����篏���室箙����緇�篏睡����莖�荐�鐚�篏�筝����鐚���篋��銀�po罟�篁������������藝�
 # XXX javajsp (Ka-Hing CHEUNG) 荀�������Info����膣����醇������緇�篏睡����莖�荐���
 #. Info button
-#: src/gtkconv.c:1090 src/gtkconv.c:2986
+#: src/gtkconv.c:1092 src/gtkconv.c:2988
 msgid "Info"
 msgstr "��緇�篏睡����莖�荐�"
 
-#: src/gtkconv.c:1110 src/gtkconv.c:2969 src/gtkconv.c:4108
-#: src/gtkrequest.c:176
+#: src/gtkconv.c:1112 src/gtkconv.c:2971 src/gtkconv.c:4111
+#: src/gtkrequest.c:194
 msgid "Remove"
 msgstr "腱脂��"
 
-#: src/gtkconv.c:2199
+#: src/gtkconv.c:2201
 msgid "User is typing..."
 msgstr "篏睡����罩e��叱��..."
 
-#: src/gtkconv.c:2207
+#: src/gtkconv.c:2209
 msgid "User has typed something and paused"
 msgstr "篏睡����莠後�ヤ�篋��沿タ鐚�筝�����������莠後��"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2309
+#: src/gtkconv.c:2311
 msgid "_Send As"
 msgstr "篏睡��験��(_S)"
 
-#: src/gtkconv.c:2765
+#: src/gtkconv.c:2767
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - �峨���紊��у�"
 
 #. Conversation menu
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2784
 msgid "/_Conversation"
 msgstr "/篋よ�(_C)"
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2786
 msgid "/Conversation/_Save As..."
 msgstr "/篋よ�/����井�(_S)..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2788
 msgid "/Conversation/View _Log..."
 msgstr "/篋よ�/茹���罩桁兓���(_L)"
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:2792
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/篋よ�/�医�絅遵���������(_P)..."
 
-#: src/gtkconv.c:2792
+#: src/gtkconv.c:2794
 msgid "/Conversation/A_lias..."
 msgstr "/篋よ�/�ュ��(_L)..."
 
-#: src/gtkconv.c:2794
+#: src/gtkconv.c:2796
 msgid "/Conversation/_Get Info..."
 msgstr "/篋よ�/��緇�莖�荐�(_G)..."
 
-#: src/gtkconv.c:2796
+#: src/gtkconv.c:2798
 msgid "/Conversation/In_vite..."
 msgstr "/篋よ�/��茫�(_V)..."
 
-#: src/gtkconv.c:2801
+#: src/gtkconv.c:2803
 msgid "/Conversation/Insert _URL..."
 msgstr "/篋よ�/���� URL(_U)"
 
-#: src/gtkconv.c:2803
+#: src/gtkconv.c:2805
 msgid "/Conversation/Insert _Image..."
 msgstr "/篋よ�/���ュ襲��(_I)"
 
-#: src/gtkconv.c:2808
-msgid "/Conversation/_Warn..."
-msgstr "/篋よ�/茘���(_W)..."
-
 #: src/gtkconv.c:2810
+msgid "/Conversation/_Warn..."
+msgstr "/篋よ�/茘���(_W)..."
+
+#: src/gtkconv.c:2812
 msgid "/Conversation/_Block..."
 msgstr "/篋よ�/絨���(_B)..."
 
-#: src/gtkconv.c:2812
+#: src/gtkconv.c:2814
 msgid "/Conversation/_Add..."
 msgstr "/篋よ�/�医�(_A)..."
 
-#: src/gtkconv.c:2814
+#: src/gtkconv.c:2816
 msgid "/Conversation/_Remove..."
 msgstr "/篋よ�/腱脂��(_R)..."
 
-#: src/gtkconv.c:2819
+#: src/gtkconv.c:2821
 msgid "/Conversation/_Close"
 msgstr "/篋よ�/����(_C)"
 
 #. Options
-#: src/gtkconv.c:2823
+#: src/gtkconv.c:2825
 msgid "/_Options"
 msgstr "/�檎��(_O)"
 
-#: src/gtkconv.c:2824
+#: src/gtkconv.c:2826
 msgid "/Options/Enable _Logging"
 msgstr "/�檎��/��紮�荐����ヨ�(_L)"
 
-#: src/gtkconv.c:2825
+#: src/gtkconv.c:2827
 msgid "/Options/Enable _Sounds"
 msgstr "/�檎��/�����恰��(_S)"
 
-#: src/gtkconv.c:2865
+#: src/gtkconv.c:2867
 msgid "/Conversation/View Log..."
 msgstr "/篋よ�/茹���罩桁兓���"
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2872
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/篋よ�/�医�絅遵���������..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2876
 msgid "/Conversation/Alias..."
 msgstr "/篋よ�/�ュ��..."
 
-#: src/gtkconv.c:2878
+#: src/gtkconv.c:2880
 msgid "/Conversation/Get Info..."
 msgstr "/篋よ�/��緇�莖�荐�..."
 
-#: src/gtkconv.c:2882
+#: src/gtkconv.c:2884
 msgid "/Conversation/Invite..."
 msgstr "/篋よ�/��茫�..."
 
-#: src/gtkconv.c:2888
+#: src/gtkconv.c:2890
 msgid "/Conversation/Insert URL..."
 msgstr "/篋よ�/���� URL..."
 
-#: src/gtkconv.c:2892
+#: src/gtkconv.c:2894
 msgid "/Conversation/Insert Image..."
 msgstr "/篋よ�/���ュ襲��..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2900
 msgid "/Conversation/Warn..."
 msgstr "/篋よ�/茘���..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2904
 msgid "/Conversation/Block..."
 msgstr "/篋よ�/絨���..."
 
-#: src/gtkconv.c:2906
+#: src/gtkconv.c:2908
 msgid "/Conversation/Add..."
 msgstr "/篋よ�/�医�..."
 
-#: src/gtkconv.c:2910
+#: src/gtkconv.c:2912
 msgid "/Conversation/Remove..."
 msgstr "/篋よ�/腱脂��..."
 
-#: src/gtkconv.c:2916
+#: src/gtkconv.c:2918
 msgid "/Options/Enable Logging"
 msgstr "/�檎��/��紮�荐����ヨ�"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:2921
 msgid "/Options/Enable Sounds"
 msgstr "/�檎��/�����恰��"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2943 src/gtkconv.c:2945 src/gtkconv.c:3043 src/gtkconv.c:3045
-#: src/gtkconv.c:5684
+#: src/gtkconv.c:2945 src/gtkconv.c:2947 src/gtkconv.c:3045 src/gtkconv.c:3047
+#: src/gtkconv.c:5687
 msgid "Send"
 msgstr "����"
 
-#: src/gtkconv.c:2966 src/gtkconv.c:4126
+#: src/gtkconv.c:2968 src/gtkconv.c:4129
 msgid "Add the user to your buddy list"
 msgstr "絨�篏睡�������ユ����絅遵�羝���"
 
-#: src/gtkconv.c:2972 src/gtkconv.c:4111
+#: src/gtkconv.c:2974 src/gtkconv.c:4114
 msgid "Remove the user from your buddy list"
 msgstr "絨�篏睡����������絅遵�羝���賢腱脂��"
 
 #. Warn button
-#: src/gtkconv.c:2979
+#: src/gtkconv.c:2981
 msgid "Warn"
 msgstr "茘���"
 
-#: src/gtkconv.c:2983
+#: src/gtkconv.c:2985
 msgid "Warn the user"
 msgstr "茘���篏睡����"
 
-#: src/gtkconv.c:2990 src/gtkconv.c:3425
+#: src/gtkconv.c:2992 src/gtkconv.c:3427
 msgid "Get the user's information"
 msgstr "��緇�篏睡����莖�荐�"
 
-#. Block button
-#: src/gtkconv.c:2993
-msgid "Block"
-msgstr "絨���"
-
-#: src/gtkconv.c:2997
+#: src/gtkconv.c:2999
 msgid "Block the user"
 msgstr "絨���篏睡����"
 
 #. Invite
-#: src/gtkconv.c:3055 src/gtkconv.c:5687
+#: src/gtkconv.c:3057 src/gtkconv.c:5690
 msgid "Invite"
 msgstr "��茫�"
 
-#: src/gtkconv.c:3058
+#: src/gtkconv.c:3060
 msgid "Invite a user"
 msgstr "��茫�篏睡����"
 
-#: src/gtkconv.c:3097
+#: src/gtkconv.c:3099
 msgid "Bold"
 msgstr "膕�蕭�"
 
-#: src/gtkconv.c:3108
+#: src/gtkconv.c:3110
 msgid "Italic"
 msgstr "��蕭�"
 
-#: src/gtkconv.c:3119
+#: src/gtkconv.c:3121
 msgid "Underline"
 msgstr "綺�膩�"
 
-#: src/gtkconv.c:3135
+#: src/gtkconv.c:3137
 msgid "Larger font size"
 msgstr "�上ぇ絖�蕭�"
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3149
 msgid "Normal font size"
 msgstr "罩e幻絖�蕭�"
 
-#: src/gtkconv.c:3159
+#: src/gtkconv.c:3161
 msgid "Smaller font size"
 msgstr "膰��絖�蕭�"
 
-#: src/gtkconv.c:3176
+#: src/gtkconv.c:3178
 msgid "Font Face"
 msgstr "絖���"
 
-#: src/gtkconv.c:3188
+#: src/gtkconv.c:3190
 msgid "Foreground font color"
 msgstr "�������"
 
-#: src/gtkconv.c:3200
+#: src/gtkconv.c:3202
 msgid "Background color"
 msgstr "�������"
 
-#: src/gtkconv.c:3215
+#: src/gtkconv.c:3217
 msgid "Insert image"
 msgstr "���ュ襲��"
 
-#: src/gtkconv.c:3226
+#: src/gtkconv.c:3228
 msgid "Insert link"
 msgstr "���ラ�g�"
 
-#: src/gtkconv.c:3237
+#: src/gtkconv.c:3239
 msgid "Insert smiley"
 msgstr "���ヨ;��"
 
-#: src/gtkconv.c:3294
+#: src/gtkconv.c:3296
 msgid "Topic:"
 msgstr "筝脂�鐚�"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3345
+#: src/gtkconv.c:3347
 msgid "0 people in room"
 msgstr "羃���篋阪�������翠��"
 
-#: src/gtkconv.c:3402
+#: src/gtkconv.c:3404
 msgid "IM the user"
 msgstr "���阪�恰��荐���畿篏睡����"
 
-#: src/gtkconv.c:3414
+#: src/gtkconv.c:3416
 msgid "Ignore the user"
 msgstr "綽順�ヤ戎����"
 
-#: src/gtkconv.c:3910 src/server.c:1298
+#: src/gtkconv.c:3913 src/server.c:1299
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- �� %s ���遺困茫� ----</H3><BR>\n"
 
-#: src/gtkconv.c:3914 src/server.c:1301
+#: src/gtkconv.c:3917 src/server.c:1302
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- �� %s ���遺困茫� ----\n"
 
-#: src/gtkconv.c:3946
+#: src/gtkconv.c:3949
 msgid "Close conversation"
 msgstr "����篋よ�"
 
-#: src/gtkconv.c:4604 src/gtkconv.c:4726
+#: src/gtkconv.c:4607 src/gtkconv.c:4729
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ��篋阪�������翠��"
 
-#: src/gtkconv.c:5000
+#: src/gtkconv.c:5003
 msgid "Disable Animation"
 msgstr "��������"
 
-#: src/gtkconv.c:5009
+#: src/gtkconv.c:5012
 msgid "Enable Animation"
 msgstr "��������"
 
-#: src/gtkconv.c:5016
+#: src/gtkconv.c:5019
 msgid "Hide Icon"
 msgstr "�沿���霚�"
 
-#: src/gtkconv.c:5022
+#: src/gtkconv.c:5025
 msgid "Save Icon As..."
 msgstr "�峨���腓榊��..."
 
@@ -5397,11 +5480,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:201
+#: src/gtkft.c:200
 msgid "<b>Receiving From:</b>"
 msgstr "<b>�ユ�区���</b>"
 
-#: src/gtkft.c:204
+#: src/gtkft.c:203
 msgid "<b>Sending To:</b>"
 msgstr "<b>�渇���逸�</b>"
 
@@ -5441,34 +5524,34 @@
 msgid "Time Remaining:"
 msgstr "絨�������鐚�"
 
-#: src/gtkft.c:586
+#: src/gtkft.c:588
 msgid "_Keep the dialog open"
 msgstr "篆���絨�荅掩�����(_K)"
 
-#: src/gtkft.c:596
+#: src/gtkft.c:598
 msgid "_Clear finished transfers"
 msgstr "羝��ゅ群絎������活叱(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:605
+#: src/gtkft.c:607
 msgid "Show download details"
 msgstr "蕁�ず筝�莠�膣亥�"
 
-#: src/gtkft.c:606
+#: src/gtkft.c:608
 msgid "Hide download details"
 msgstr "�沿�鋇�莠�膣亥�"
 
 #. Pause button
-#: src/gtkft.c:648 src/stock.c:86
+#: src/gtkft.c:650 src/stock.c:86
 msgid "_Pause"
 msgstr "����(_P)"
 
 #. Resume button
-#: src/gtkft.c:658
+#: src/gtkft.c:660
 msgid "_Resume"
 msgstr "�√奨(_R)"
 
-#: src/gtkft.c:1013
+#: src/gtkft.c:1011
 msgid "That file does not exist."
 msgstr "罟�罅�筝�絖�����"
 
@@ -5498,22 +5581,22 @@
 msgstr "���頳遵��賢�����g�(_O)"
 
 # NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
-#: src/gtkimhtml.c:1652
+#: src/gtkimhtml.c:1632
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim �≧�箴��у�����箴��ゅ�ュ襲��弢�鐚�����倶�� PNG 罟�������"
 
-#: src/gtkimhtml.c:1660
+#: src/gtkimhtml.c:1640
 #, c-format
 msgid "Error saving image: %s"
 msgstr "�峨�綵怨����鐚�%s"
 
-#: src/gtkimhtml.c:1669
+#: src/gtkimhtml.c:1649
 msgid "Save Image"
 msgstr "�峨�綵怨��"
 
-#: src/gtkimhtml.c:1691
+#: src/gtkimhtml.c:1671
 msgid "_Save Image..."
 msgstr "�峨�綵怨��(_S)..."
 
@@ -6349,62 +6432,62 @@
 msgid "Plugins"
 msgstr "罔∞�羝���"
 
-#: src/gtkrequest.c:172
+#: src/gtkrequest.c:190
 msgid "Apply"
 msgstr "絅���"
 
-#: src/gtksound.c:60
+#: src/gtksound.c:61
 msgid "Buddy logs in"
 msgstr "絅遵��糸��"
 
-#: src/gtksound.c:61
+#: src/gtksound.c:62
 msgid "Buddy logs out"
 msgstr "絅遵��糸��"
 
-#: src/gtksound.c:62
+#: src/gtksound.c:63
 msgid "Message received"
 msgstr "�九�域���"
 
-#: src/gtksound.c:63
+#: src/gtksound.c:64
 msgid "Message received begins conversation"
 msgstr "荐����九�逸���紮��画�篋よ�"
 
-#: src/gtksound.c:64
+#: src/gtksound.c:65
 msgid "Message sent"
 msgstr "荐�������"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:66
 msgid "Person enters chat"
 msgstr "��篋咲�峨�ヨ��紊��"
 
-#: src/gtksound.c:66
+#: src/gtksound.c:67
 msgid "Person leaves chat"
 msgstr "��篋咲�∫����紊��"
 
-#: src/gtksound.c:67
+#: src/gtksound.c:68
 msgid "You talk in chat"
 msgstr "��群�峨�ヨ��紊��"
 
-#: src/gtksound.c:68
+#: src/gtksound.c:69
 msgid "Others talk in chat"
 msgstr "�銀�篋咲�峨�ヨ��紊��"
 
-#: src/gtksound.c:71
+#: src/gtksound.c:72
 msgid "Someone says your name in chat"
 msgstr "��篋阪����紊��筝㊥��井������絖�"
 
-#: src/gtksound.c:150
+#: src/gtksound.c:154
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "�≧��㊥�冗�恰��鐚����堺���後���罟�罅� (%s) 筝�絖�����"
 
-#: src/gtksound.c:166
+#: src/gtksound.c:170
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr "�≧��㊥�冗�恰��鐚����咲�後�篋�����篁ゃ���堺�㊥�丈─綣������研羃���荐㊤�篁私���篁ゃ��"
 
-#: src/gtksound.c:175
+#: src/gtksound.c:179
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -6420,7 +6503,7 @@
 msgstr "Gaim - �峨���腓�"
 
 #. full help text
-#: src/gtkutils.c:908
+#: src/gtkutils.c:909
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -6454,7 +6537,7 @@
 "  -h, --help          蕁�ず����茯������研�∫��\n"
 
 #. short message
-#: src/gtkutils.c:923
+#: src/gtkutils.c:924
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s���決� `%s -h' 篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
@@ -6581,26 +6664,30 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) �怨�� %s �演��臀���� @ %s"
 
-#: src/main.c:235
+#: src/main.c:145
 msgid "Please enter your login."
 msgstr "茫����糸�ャ��"
 
-#: src/main.c:323
+#: src/main.c:228
 msgid "<New User>"
 msgstr "<�遺戎����>"
 
-#: src/main.c:365
+#: src/main.c:270
 msgid "Login"
 msgstr "�糸��"
 
-#: src/main.c:381
+#: src/main.c:286
 msgid "Screen Name:"
 msgstr "絽活��鐚�"
 
-#: src/main.c:431
+#: src/main.c:336
 msgid "Sign On"
 msgstr "�糸��"
 
+#: src/prefs.c:113 src/status.c:266
+msgid "Slightly less boring default"
+msgstr "莠��堺��i瑳�∴������荐�"
+
 #: src/prpl.c:292
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
@@ -6637,24 +6724,25 @@
 
 #: src/server.c:874
 #, c-format
-msgid "(%d messages)"
-msgstr "鐚�%d ��荐����"
-
-#: src/server.c:886
+msgid "(%d message)"
+msgid_plural "(%d messages)"
+msgstr[0] "鐚�%d ��荐����"
+
+#: src/server.c:887
 msgid "(1 message)"
 msgstr "鐚�筝���荐����"
 
-#: src/server.c:1084 src/server.c:1094
+#: src/server.c:1085 src/server.c:1095
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ャ��"
 
-#: src/server.c:1112 src/server.c:1120
+#: src/server.c:1113 src/server.c:1121
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�冴��"
 
-#: src/server.c:1161
+#: src/server.c:1162
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -6663,11 +6751,11 @@
 "%s ����茴� %s 茘���篋���\n"
 "�����域⑥��膈�膣��� %d%%"
 
-#: src/server.c:1164
+#: src/server.c:1165
 msgid "an anonymous person"
 msgstr "筝����水����"
 
-#: src/server.c:1254
+#: src/server.c:1255
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -6676,23 +6764,30 @@
 "篏睡������%s����茫� %s �医ソ����紊��鐚���%s��\n"
 "%s"
 
-#: src/server.c:1258
+#: src/server.c:1259
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "篏睡������%s����茫� %s �医ソ����紊��鐚���%s��\n"
 
-#: src/server.c:1264
+#: src/server.c:1265
 msgid "Accept chat invitation?"
 msgstr "�ュ���茫����"
 
-#: src/server.c:1436
+#: src/server.c:1437
 msgid "Gaim - Popup"
 msgstr "Gaim - 荐���"
 
-#: src/server.c:1463
+#: src/server.c:1464
 msgid "More Info"
 msgstr "�翫�莖�荐�"
 
+#. for people like myself who are too lazy to add an away msg :)
+#. I don't know who "myself" is in this context.  The exclamation point
+#. * makes it slightly less boring ;)
+#: src/status.c:31
+msgid "Sorry, I ran out for a bit!"
+msgstr "筝�絅醇��������∫��筝�筝�筝�鐚�"
+
 #: src/stock.c:84
 msgid "_Modify"
 msgstr "篆���(_M)"
@@ -6738,18 +6833,156 @@
 msgid "Custom"
 msgstr "篏睡�������"
 
-#: src/gtkdebug.c:142
+#: src/gtkdebug.c:133
 msgid "Debug Window"
 msgstr "�ら���腦�"
 
-#: src/gtkdebug.c:182
+#: src/gtkdebug.c:173
 msgid "Pause"
 msgstr "����"
 
-#: src/gtkdebug.c:188
+#: src/gtkdebug.c:179
 msgid "Timestamps"
 msgstr "�����活�"
 
+#~ msgid "DCC Chat with %s closed"
+#~ msgstr "�� %s �� DCC ��紊�群����"
+
+#~ msgid "DCC Chat with %s established"
+#~ msgstr "�� %s �� DCC ��紊�群膓�茴�産腴�"
+
+#~ msgid "User"
+#~ msgstr "篏睡����"
+
+#~ msgid "IRC Operator"
+#~ msgstr "IRC ��篏���"
+
+#~ msgid "Channels"
+#~ msgstr "�脂��"
+
+#~ msgid "%s is an Identified User"
+#~ msgstr "%s �����綏臥�茘���篏睡����"
+
+#~ msgid "%ld seconds [signon: %s]"
+#~ msgstr "%ld 腱� [�糸�ワ�%s]"
+
+#~ msgid "Rehashing server"
+#~ msgstr "���域┃絎�篌堺����賢"
+
+#~ msgid "IRC Error"
+#~ msgstr "IRC ���"
+
+#~ msgid "No such server"
+#~ msgstr "羃����i��失����"
+
+#~ msgid "No nickname given"
+#~ msgstr "羃���腟���援┗"
+
+#~ msgid "You're not an IRC operator!"
+#~ msgstr "�������� IRC ��篏���鐚�"
+
+#~ msgid "That nick is already in use.  Please enter a new nick"
+#~ msgstr "�����援┗綏牙���戎��賢��茫�莠後�ヤ����亥���援┗"
+
+#~ msgid "IRC CTCP info"
+#~ msgstr "IRC CTCP 莖�荐�"
+
+#~ msgid "%s would like to establish a DCC chat"
+#~ msgstr "%s �活�綮榊�筝��� DCC ��紊�"
+
+#~ msgid ""
+#~ "This requires a direct connection to be established between the two "
+#~ "computers.  Messages sent will not pass through the IRC server"
+#~ msgstr ""
+#~ "����荀�羆�絨���綮榊�莎桁�����肢�������g�鐚���荐����筝������ IRC 鋍堺������画��渇��"
+
+#~ msgid "Received an invalid file send request from %s."
+#~ msgstr "�九�遺���箴����� %s �≧����罟�罅����咲��羆���"
+
+#~ msgid "CTCP ClientInfo"
+#~ msgstr "CTCP 絎∽�句�莖�荐�"
+
+#~ msgid "CTCP UserInfo"
+#~ msgstr "CTCP 篏睡����莖�荐�"
+
+#~ msgid "CTCP Version"
+#~ msgstr "CTCP ����"
+
+#~ msgid "CTCP Ping"
+#~ msgstr "CTCP Ping"
+
+#~ msgid "You have left %s"
+#~ msgstr "���∫��篋� %s"
+
+#~ msgid "IRC Part"
+#~ msgstr "IRC �∫��"
+
+#~ msgid "<I>Requesting DCC CHAT</I>"
+#~ msgstr "<I>荀�羆� DCC ��紊�賢</I>"
+
+#~ msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
+#~ msgstr "<B>IRC ��篏�����篁わ�<BR>REHASH RESTART</B>"
+
+#~ msgid ""
+#~ "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
+#~ "<nick><BR>PING <nick></B><BR>"
+#~ msgstr ""
+#~ "<B>CTCP ��篁わ�<BR>CLIENTINFO <�援┗><BR>USERINFO <�援┗><BR>VERSION <�援┗"
+#~ "><BR>PING <�援┗></B><BR>"
+
+#~ msgid "<B>DCC commands:<BR>CHAT <nick></B>"
+#~ msgstr "<B>DCC ��篁わ�<BR>CHAT <�援┗></B>"
+
+#~ 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 W WHOWAS<BR>Type /HELP OPER for operator commands<BR>Type /HELP "
+#~ "CTCP for CTCP commands<BR>Type /HELP DCC for DCC commands"
+#~ msgstr ""
+#~ "<B>������吡����篁わ�<BR>WHOIS INVITE NICK LIST<BR>JOIN PART TOPIC "
+#~ "KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION W "
+#~ "WHOWAS<BR>莠後�� /HELP OPER 蕁�ず��篏�����篁�<BR>莠後�� /HELP CTCP 蕁�ず CTCP ��篁�"
+#~ "<BR>莠後�� /HELP DCC 蕁�ず DCC ��篁�"
+
+#~ msgid "DCC Chat"
+#~ msgstr "DCC ��紊�"
+
+#~ msgid "User Identity"
+#~ msgstr "篏睡����茘���"
+
+#~ msgid "Permit"
+#~ msgstr "荐怨�"
+
+#~ msgid "Add Permit"
+#~ msgstr "����┗��"
+
+#~ msgid "Add Deny"
+#~ msgstr "���ユ��腟�"
+
+#~ msgid "_Group:"
+#~ msgstr "臂ょ�(_G)鐚�"
+
+#~ msgid "_Alias:"
+#~ msgstr "�ュ��(_A)鐚�"
+
+#~ msgid "Gaim Instant Messenger"
+#~ msgstr "Gaim"
+
+#~ msgid "Gaim Instant Messenger - Signed off"
+#~ msgstr "Gaim - 綏牙�糸��"
+
+#~ msgid "Gaim Instant Messenger - Away"
+#~ msgstr "Gaim - �∫��"
+
+#~ msgid "Unable to write to config file"
+#~ msgstr "�≧�絲��ヨ┃絎�罟�"
+
+#~ msgid "Notify plugin"
+#~ msgstr "���ユ─腟�"
+
+#~ msgid "Appl_y"
+#~ msgstr "絅���(_Y)"
+
 #~ msgid "Enter your password."
 #~ msgstr "茫�莠後�ユ����絲�腆若��"
 
@@ -6769,21 +7002,6 @@
 #~ msgid "Notice"
 #~ msgstr "����"
 
-#~ msgid "%s has been signed off"
-#~ msgstr "%s 綏牙��糸��"
-
-#~ msgid "Connection Error"
-#~ msgstr "�g����"
-
-#~ msgid "Gaim Instant Messenger"
-#~ msgstr "Gaim"
-
-#~ msgid "Gaim Instant Messenger - Signed off"
-#~ msgstr "Gaim - 綏牙�糸��"
-
-#~ msgid "Gaim Instant Messenger - Away"
-#~ msgstr "Gaim - �∫��"
-
 #~ msgid "New"
 #~ msgstr "�域���"
 
@@ -6805,9 +7023,6 @@
 #~ msgid "Rename Buddy"
 #~ msgstr "篆��劫ソ����腮�"
 
-#~ msgid "New name:"
-#~ msgstr "�医��絖�鐚�"
-
 #~ msgid "Control-_W closes window"
 #~ msgstr "��筝� Ctrl-W ����荀�腦�(_W)"
 
@@ -6908,4 +7123,4 @@
 #~ "筝������箴��糸�ョ�����純��"
 
 #~ msgid "Account Editor"
-#~ msgstr "絽活��羝���"
\ No newline at end of file
+#~ msgstr "絽活��羝���"