# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1064229400 0
# Node ID b5f948794e43fe24a5625136f017f31e0e154a2b
# Parent  37d1699df8e2a383de4f17965ed24ff09c02e68b
[gaim-migrate @ 7458]
updated zh_CN from Wang (fundawang)

committer: Tailor Script <tailor@pidgin.im>

diff -r 37d1699df8e2 -r b5f948794e43 po/zh_CN.po
--- a/po/zh_CN.po	Mon Sep 22 01:18:47 2003 +0000
+++ b/po/zh_CN.po	Mon Sep 22 11:16:40 2003 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-09-13 00:01-0700\n"
-"PO-Revision-Date: 2003-09-13 17:00+0800\n"
+"POT-Creation-Date: 2003-09-20 08:00-0700\n"
+"PO-Revision-Date: 2003-09-21 00:42+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"
@@ -65,7 +65,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 胼糸�"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:463 src/gtkaccount.c:1654
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:463 src/gtkaccount.c:1658
 msgid "Auto-login"
 msgstr "�����糸�"
 
@@ -81,12 +81,12 @@
 msgid "New..."
 msgstr "�医産..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1778 src/gtkpounce.c:461
-#: src/gtkprefs.c:1511 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1794 src/gtkpounce.c:461
+#: src/gtkprefs.c:1468 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
 #: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3531
-#: src/protocols/jabber/jabber.c:3585 src/protocols/oscar/oscar.c:2840
-#: src/protocols/oscar/oscar.c:4582 src/protocols/oscar/oscar.c:5488
-#: src/protocols/oscar/oscar.c:5880
+#: src/protocols/jabber/jabber.c:3585 src/protocols/oscar/oscar.c:2846
+#: src/protocols/oscar/oscar.c:4601 src/protocols/oscar/oscar.c:5519
+#: src/protocols/oscar/oscar.c:5913
 msgid "Away"
 msgstr "胼糸�"
 
@@ -103,11 +103,11 @@
 msgstr "��篁銀���"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1812 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1816 src/main.c:315
 msgid "Accounts"
 msgstr "茣���"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2365 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2322 src/main.c:325
 msgid "Preferences"
 msgstr "薤���蕁�"
 
@@ -119,11 +119,11 @@
 msgid "Quit"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:482
+#: plugins/docklet/docklet.c:476
 msgid "Tray Icon Configuration"
 msgstr "�����丈����臀�"
 
-#: plugins/docklet/docklet.c:486
+#: plugins/docklet/docklet.c:480
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "�翫�亥�劫�紙�����丈�����丞ず�井���(_H)"
 
@@ -134,19 +134,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:510
+#: plugins/docklet/docklet.c:504
 msgid "System Tray Icon"
 msgstr "膤紫������丈��"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:513
+#: plugins/docklet/docklet.c:507
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "��鎧膸�����筝㊥�丞ず Gaim ���丈����"
 
 #. *  description
-#: plugins/docklet/docklet.c:515
+#: plugins/docklet/docklet.c:509
 msgid ""
 "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, "
@@ -329,15 +329,15 @@
 msgid "Change"
 msgstr "����"
 
-#: plugins/history.c:90
+#: plugins/history.c:98
 msgid "History"
 msgstr "����"
 
-#: plugins/history.c:92
+#: plugins/history.c:100
 msgid "Shows recently logged conversations in new conversations."
 msgstr "���医�莚�筝㊥�丞ず�丞ず��菴�莅医���絲壕���"
 
-#: plugins/history.c:93
+#: plugins/history.c:101
 msgid ""
 "When a new conversation is opened this plugin will insert the last XXX of "
 "the last conversation into the current conversation."
@@ -389,6 +389,55 @@
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "��莅御��������臀����>�紊��炊�狗��"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ipc-test-client.c:84
+msgid "IPC Test Client"
+msgstr "IPC 羌�莚�絎∽��"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ipc-test-client.c:87
+msgid "Test plugin IPC support, as a client."
+msgstr "羌�莚���篁� IPC ����鐚�篏�筝阪��激��"
+
+#. *  description
+#: plugins/ipc-test-client.c:89
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"羌�莚���篁� IPC ����鐚�篏�筝阪��激��菴�絨�絎�篏����≦���篁九攻莪���絵�����巡擦��"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ipc-test-server.c:71
+msgid "IPC Test Server"
+msgstr "IPC 羌�莚����≦��"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ipc-test-server.c:74
+msgid "Test plugin IPC support, as a server."
+msgstr "羌�莚���篁� IPC ����鐚�篏�筝堺���≦����"
+
+#. *  description
+#: plugins/ipc-test-server.c:76
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "羌�莚���篁� IPC ����鐚�篏�筝堺���≦����菴�絨�羈��� IPC �巡擦��"
+
 #: plugins/mailchk.c:156
 msgid "Mail Checker"
 msgstr "��散罍��ュ��"
@@ -487,15 +536,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "��箴�茖��� Perl ��篁句��������"
 
-#: plugins/raw.c:151
+#: plugins/raw.c:154
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:153
+#: plugins/raw.c:156
 msgid "Lets you send raw input to text-based protocols."
 msgstr "��莅御��������決��ュ�坂��������顒���"
 
-#: plugins/raw.c:154
+#: plugins/raw.c:157
 msgid ""
 "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."
@@ -539,35 +588,35 @@
 msgid "Tests to see that most things are working."
 msgstr "羌�莚�����紊у��医���醇����③絽吾��"
 
-#: plugins/spellchk.c:410
+#: plugins/spellchk.c:412
 msgid "Text Replacements"
 msgstr "��絖��炊��"
 
-#: plugins/spellchk.c:434
+#: plugins/spellchk.c:436
 msgid "You type"
 msgstr "莨��ユ��絖�"
 
-#: plugins/spellchk.c:446
+#: plugins/spellchk.c:448
 msgid "You send"
 msgstr "���堺��絖�"
 
-#: plugins/spellchk.c:472
+#: plugins/spellchk.c:474
 msgid "Add a new text replacement"
 msgstr "羞糸���亥����絖��炊��"
 
-#: plugins/spellchk.c:479
+#: plugins/spellchk.c:481
 msgid "You _type:"
 msgstr "莨��ユ��絖�(_T):"
 
-#: plugins/spellchk.c:493
+#: plugins/spellchk.c:495
 msgid "You _send:"
 msgstr "���堺��絖�(_S):"
 
-#: plugins/spellchk.c:533
+#: plugins/spellchk.c:535
 msgid "Text replacement"
 msgstr "�����炊��"
 
-#: plugins/spellchk.c:535 plugins/spellchk.c:536
+#: plugins/spellchk.c:537 plugins/spellchk.c:538
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "�号�����決���箙���茹����炊�√��堺���賢����絖���"
 
@@ -611,6 +660,14 @@
 "idle."
 msgstr "絅遵�胼糸�/菴���������/�♂���九���莚�腦��g��咲���ャ��"
 
+#: plugins/tcl/tcl.c:344
+msgid "Tcl Plugin Loader"
+msgstr "Tcl ��篁区��ュ��"
+
+#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
+msgid "Provides support for loading Tcl plugins"
+msgstr "��箴�茖��� Tcl ��篁句������"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -679,7 +736,7 @@
 msgstr "���恰�倶�����d賢�丞ず羯���(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:848
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
 msgid "Buddy List Window"
 msgstr "絅遵���茵����"
 
@@ -726,8 +783,8 @@
 msgstr "Windows �����九���� Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1619
-#: src/gtkprefs.c:2298
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1635
+#: src/gtkprefs.c:2255
 msgid "Buddy List"
 msgstr "絅遵���茵�"
 
@@ -746,8 +803,8 @@
 msgstr "絅遵���茵���e幻絮�蕁句�(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:897
-#: src/gtkprefs.c:2299
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:893
+#: src/gtkprefs.c:2256
 msgid "Conversations"
 msgstr "絲壕�"
 
@@ -802,164 +859,164 @@
 msgid "win32 port"
 msgstr "Win32 腱紙�"
 
-#: src/about.c:114 src/about.c:115
+#: src/about.c:114 src/about.c:115 src/about.c:116
 msgid "developer"
 msgstr "綣�����"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "support"
 msgstr "����"
 
-#: src/about.c:123
+#: src/about.c:124
 msgid "Crazy Patch Writers"
 msgstr "����茵ヤ�膽�����"
 
-#: src/about.c:135
+#: src/about.c:136
 msgid "Retired Developers"
 msgstr "��篌�綣�����"
 
-#: src/about.c:136
+#: src/about.c:137
 msgid "former libfaim maintainer"
 msgstr "���� libfaim 膸贋�よ��"
 
-#: src/about.c:137
+#: src/about.c:138
 msgid "former lead developer"
 msgstr "����蘂�絲弱�����"
 
-#: src/about.c:140
-msgid "former maintainer"
-msgstr "����膸贋�よ��"
-
 #: src/about.c:141
-msgid "former Jabber developer"
-msgstr "���� Jabber 綣�����"
+msgid "former maintainer"
+msgstr "����膸贋�よ��"
 
 #: src/about.c:142
+msgid "former Jabber developer"
+msgstr "���� Jabber 綣�����"
+
+#: src/about.c:143
 msgid "original author"
 msgstr "��篏���"
 
-#: src/about.c:145
+#: src/about.c:146
 msgid "hacker and designated driver [lazy bum]"
 msgstr "薨�絎√��筝�絮�薊怨���綺�[lazy bum]"
 
-#: src/about.c:153
+#: src/about.c:154
 msgid "Current Translators"
 msgstr "綵���膺肢���"
 
-#: src/about.c:154 src/about.c:181
+#: src/about.c:155 src/about.c:183
 msgid "Catalan"
 msgstr "��羈亥�絨寂�莚�"
 
-#: src/about.c:155 src/about.c:182
+#: src/about.c:156 src/about.c:184
 msgid "Czech"
 msgstr "�桁��莚�"
 
-#: src/about.c:156
+#: src/about.c:157
 msgid "Danish"
 msgstr "筝拷墾莚�"
 
-#: src/about.c:157 src/about.c:183
+#: src/about.c:158 src/about.c:185
 msgid "German"
 msgstr "緇決�"
 
-#: src/about.c:158 src/about.c:184
+#: src/about.c:159 src/about.c:186
 msgid "Spanish"
 msgstr "茱睡���莚�"
 
-#: src/about.c:159 src/about.c:185
+#: src/about.c:160 src/about.c:187
 msgid "French"
 msgstr "羈�莚�"
 
-#: src/about.c:160
+#: src/about.c:161
 msgid "Hindi"
 msgstr "�医�域�"
 
-#: src/about.c:161
+#: src/about.c:162
 msgid "Hungarian"
 msgstr "�������"
 
-#: src/about.c:162 src/about.c:187
+#: src/about.c:163 src/about.c:189
 msgid "Italian"
 msgstr "�鎀у���"
 
-#: src/about.c:163 src/about.c:189
+#: src/about.c:164 src/about.c:191
 msgid "Korean"
 msgstr "��蕾�莚�"
 
-#: src/about.c:164
-msgid "Dutch; Flemish"
-msgstr "�桁�域�"
-
 #: src/about.c:165
-msgid "Portuguese-Brazil"
-msgstr "綏頑タ�∴����莚�"
+msgid "Dutch; Flemish"
+msgstr "�桁�域�"
 
 #: src/about.c:166
+msgid "Portuguese-Brazil"
+msgstr "綏頑タ�∴����莚�"
+
+#: src/about.c:167
 msgid "Portuguese-Portugal"
 msgstr "�∴����莚�"
 
-#: src/about.c:167
+#: src/about.c:168
 msgid "Romanian"
 msgstr "臀�薊�絢篋�莚�"
 
-#: src/about.c:168
-msgid "Serbian"
-msgstr "紂�絨�膸岩�莚�"
-
 #: src/about.c:169 src/about.c:194
-msgid "Swedish"
-msgstr "���梧�"
+msgid "Russian"
+msgstr "篆�莚�"
 
 #: src/about.c:170
+msgid "Serbian"
+msgstr "紂�絨�膸岩�莚�"
+
+#: src/about.c:171 src/about.c:196
+msgid "Swedish"
+msgstr "���梧�"
+
+#: src/about.c:172
 msgid "Simplified Chinese"
 msgstr "膊�篏�筝㊥��"
 
-#: src/about.c:171
+#: src/about.c:173
 msgid "Traditional Chinese"
 msgstr "膵�篏�筝㊥��"
 
-#: src/about.c:178
+#: src/about.c:180
 msgid "Past Translators"
 msgstr "����膺肢���"
 
-#: src/about.c:179
+#: src/about.c:181
 msgid "Amharic"
 msgstr "�水�����莚�"
 
-#: src/about.c:180
+#: src/about.c:182
 msgid "Bulgarian"
 msgstr "篆������莚�"
 
-#: src/about.c:186
+#: src/about.c:188
 msgid "Hebrew"
 msgstr "絽�篌�ア莚�"
 
-#: src/about.c:188
+#: src/about.c:190
 msgid "Japanese"
 msgstr "�ヨ�"
 
-#: src/about.c:190
+#: src/about.c:192
 msgid "Norwegian"
 msgstr "���莚�"
 
-#: src/about.c:191
+#: src/about.c:193
 msgid "Polish"
 msgstr "羈√�域�"
 
-#: src/about.c:192
-msgid "Russian"
-msgstr "篆�莚�"
-
-#: src/about.c:193
+#: src/about.c:195
 msgid "Slovak"
 msgstr "���篌���莚�"
 
-#: src/about.c:195
+#: src/about.c:197
 msgid "Chinese"
 msgstr "筝㊥��"
 
-#: src/about.c:208 src/dialogs.c:3508 src/gtkrequest.c:191
-#: src/protocols/msn/msn.c:238 src/server.c:1552
+#: src/about.c:210 src/dialogs.c:3509 src/gtkrequest.c:191
+#: src/protocols/msn/msn.c:240 src/server.c:1567
 msgid "Close"
 msgstr "�渇��"
 
@@ -983,16 +1040,16 @@
 msgid "Set All Away"
 msgstr "�����筝榊�綣�"
 
-#: src/blist.c:469 src/gtkprefs.c:2301
+#: src/blist.c:538 src/gtkprefs.c:2258
 msgid "Chats"
 msgstr "��紊�"
 
-#: src/blist.c:564 src/blist.c:729 src/dialogs.c:880
-#: src/protocols/jabber/jabber.c:1917 src/protocols/msn/notification.c:1120
+#: src/blist.c:633 src/blist.c:799 src/dialogs.c:872
+#: src/protocols/jabber/jabber.c:1917 src/protocols/msn/notification.c:1135
 msgid "Buddies"
 msgstr "絅遵�"
 
-#: src/blist.c:991
+#: src/blist.c:1065
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1004,25 +1061,25 @@
 "%2$s 膸�筝㊦�� %1$d 筝�ソ�������わ��������区侃�傑���糸�ャ��菴�篋�絅遵���莚ョ�筝�篌�茴���"
 "�ゃ��\n"
 
-#: src/blist.c:1000
+#: src/blist.c:1074
 msgid "Group not removed"
 msgstr "膸�������"
 
-#: src/blist.c:1068 src/gtkaccount.c:140 src/gtkpounce.c:307
-#: src/gtkutils.c:843 src/protocols/jabber/jabber.c:1261
+#: src/blist.c:1125 src/gtkaccount.c:140 src/gtkpounce.c:307
+#: src/gtkutils.c:842 src/protocols/jabber/jabber.c:1261
 msgid "Unknown"
 msgstr "����"
 
-#: src/blist.c:1358
+#: src/blist.c:1435
 msgid "Invalid Groupname"
 msgstr "膸�������"
 
-#: src/blist.c:2136
+#: src/blist.c:2215
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "紊�������絅遵���茵��九�咲����絅遵���茵�����ャ��"
 
-#: src/blist.c:2138
+#: src/blist.c:2217
 msgid "Buddy List Error"
 msgstr "絅遵���茵��咲��"
 
@@ -1032,18 +1089,26 @@
 "again."
 msgstr "筝��茹�����莅��榊ー�����莚桁�渇�㊥����腦��o�腮�����莚�筝�罨<��"
 
+#: src/browser.c:570 src/browser.c:590 src/browser.c:598
+msgid "Unable to open URL"
+msgstr "��羈���綣� URL"
+
 #: src/browser.c:571
 msgid ""
-"Unable to launch your browser because the 'Manual' browser command has been "
-"chosen, but no command has been set."
-msgstr "��羈�莪�������羌頵�����������������������羌頵����巡擦鐚�篏����臀��巡擦��"
-
-#: src/browser.c:591
-#, c-format
-msgid "There was an error launching your chosen browser: %s"
-msgstr "莪�����������羌頵��� %s �咲��"
-
-#: src/buddy_chat.c:316 src/dialogs.c:1326
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "�������������羌頵����巡擦鐚�篏����臀��巡擦��"
+
+#: src/browser.c:588
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr "羌頵�����%s��������"
+
+#: src/browser.c:595
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr "莪������巡擦���咲��鐚�%s"
+
+#: src/buddy_chat.c:316 src/dialogs.c:1318
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1067,22 +1132,22 @@
 msgstr "����"
 
 #. Cancel button.
-#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:484
-#: src/dialogs.c:496 src/dialogs.c:509 src/dialogs.c:530 src/dialogs.c:918
-#: src/dialogs.c:1610 src/dialogs.c:1725 src/dialogs.c:1791 src/dialogs.c:2044
-#: src/dialogs.c:2193 src/dialogs.c:2865 src/dialogs.c:3032 src/dialogs.c:3074
-#: src/dialogs.c:3211 src/dialogs.c:3555 src/gtkaccount.c:1543
+#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:487
+#: src/dialogs.c:499 src/dialogs.c:512 src/dialogs.c:533 src/dialogs.c:910
+#: src/dialogs.c:1602 src/dialogs.c:1717 src/dialogs.c:1783 src/dialogs.c:2045
+#: src/dialogs.c:2194 src/dialogs.c:2866 src/dialogs.c:3033 src/dialogs.c:3075
+#: src/dialogs.c:3212 src/dialogs.c:3556 src/gtkaccount.c:1547
 #: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
 #: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:189
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4200
-#: src/protocols/msn/msn.c:173 src/protocols/msn/msn.c:184
-#: src/protocols/msn/msn.c:195 src/protocols/msn/msn.c:206
-#: src/protocols/msn/msn.c:219 src/protocols/oscar/oscar.c:2419
-#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2491
-#: src/protocols/oscar/oscar.c:2536 src/protocols/oscar/oscar.c:5758
-#: src/protocols/oscar/oscar.c:5973 src/protocols/oscar/oscar.c:6022
-#: src/protocols/oscar/oscar.c:6086 src/protocols/trepia/trepia.c:379
-#: src/protocols/yahoo/yahoo.c:1576 src/prpl.c:316 src/request.h:813
+#: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
+#: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
+#: src/protocols/msn/msn.c:221 src/protocols/oscar/oscar.c:2425
+#: src/protocols/oscar/oscar.c:2462 src/protocols/oscar/oscar.c:2497
+#: src/protocols/oscar/oscar.c:2542 src/protocols/oscar/oscar.c:5791
+#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6055
+#: src/protocols/oscar/oscar.c:6119 src/protocols/trepia/trepia.c:379
+#: src/protocols/yahoo/yahoo.c:1632 src/prpl.c:164 src/request.h:813
 #: src/request.h:823
 msgid "Cancel"
 msgstr "��羔�"
@@ -1106,14 +1171,14 @@
 msgstr "莨��� %s ��絲���"
 
 #. Build OK Button
-#: src/connection.c:193 src/dialogs.c:1721 src/dialogs.c:1860
-#: src/dialogs.c:2043 src/dialogs.c:2189 src/dialogs.c:3031 src/dialogs.c:3073
-#: src/dialogs.c:3204 src/dialogs.c:3554 src/gtkrequest.c:188
-#: src/protocols/msn/msn.c:172 src/protocols/msn/msn.c:183
-#: src/protocols/msn/msn.c:194 src/protocols/msn/msn.c:205
-#: src/protocols/oscar/oscar.c:2455 src/protocols/oscar/oscar.c:2535
-#: src/protocols/oscar/oscar.c:5972 src/protocols/oscar/oscar.c:6021
-#: src/protocols/oscar/oscar.c:6085 src/protocols/yahoo/yahoo.c:1575
+#: src/connection.c:193 src/dialogs.c:1713 src/dialogs.c:1853
+#: src/dialogs.c:2044 src/dialogs.c:2190 src/dialogs.c:3032 src/dialogs.c:3074
+#: src/dialogs.c:3205 src/dialogs.c:3555 src/gtkrequest.c:188
+#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:185
+#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
+#: src/protocols/oscar/oscar.c:2461 src/protocols/oscar/oscar.c:2541
+#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6054
+#: src/protocols/oscar/oscar.c:6118 src/protocols/yahoo/yahoo.c:1631
 #: src/request.h:813
 msgid "OK"
 msgstr "隋��"
@@ -1126,54 +1191,54 @@
 msgid "Unable to send message."
 msgstr "��羈�����羔�����"
 
-#: src/conversation.c:1955
+#: src/conversation.c:1983
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 菴��ヤ���紊����"
 
-#: src/conversation.c:1958
+#: src/conversation.c:1986
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 菴��ヤ���紊����"
 
-#: src/conversation.c:2043
+#: src/conversation.c:2071
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �医��û�� %s��"
 
-#: src/conversation.c:2085
+#: src/conversation.c:2113
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 胼糸�篋���紊��(%s)��"
 
-#: src/conversation.c:2087
+#: src/conversation.c:2115
 #, c-format
 msgid "%s left the room."
 msgstr "%s 胼糸�篋���紊����"
 
-#: src/conversation.c:2160
+#: src/conversation.c:2188
 #, c-format
 msgid "(+%d more)"
 msgstr "(菴��� %d 篋�)"
 
-#: src/conversation.c:2162
+#: src/conversation.c:2190
 #, c-format
 msgid " left the room (%s)."
 msgstr "胼糸�篋���紊��(%s)��"
 
-#: src/conversation.c:2444
+#: src/conversation.c:2472
 msgid "Last created window"
 msgstr "筝�罨≦��綮榊��腦���"
 
-#: src/conversation.c:2446
+#: src/conversation.c:2474
 msgid "New window"
 msgstr "�医産腦���"
 
-#: src/conversation.c:2448
+#: src/conversation.c:2476
 msgid "By group"
 msgstr "��膸�"
 
-#: src/conversation.c:2450
+#: src/conversation.c:2478
 msgid "By account"
 msgstr "��茣���"
 
@@ -1205,98 +1270,100 @@
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�水��茘���莨�筝�絎号��綣�莎傑絵���</b>"
 
-#: src/dialogs.c:480
+#: src/dialogs.c:483
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "���喝�篁�����絅遵���茵�賢���� %s��������荀�菴�箙�����鐚�"
 
-#: src/dialogs.c:482 src/dialogs.c:483
+#: src/dialogs.c:485 src/dialogs.c:486
 msgid "Remove Buddy"
 msgstr "���ゅソ��"
 
-#: src/dialogs.c:492
+#: src/dialogs.c:495
 #, 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:494 src/dialogs.c:495
+#: src/dialogs.c:497 src/dialogs.c:498
 msgid "Remove Chat"
 msgstr "���よ��紊�"
 
-#: src/dialogs.c:504
+#: src/dialogs.c:507
 #, 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:507 src/dialogs.c:508
+#: src/dialogs.c:510 src/dialogs.c:511
 msgid "Remove Group"
 msgstr "���ょ�"
 
-#: src/dialogs.c:525
+#: src/dialogs.c:528
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr "���喝�篁�����絅遵���茵�賢���ゅ���� %s �� %d 筝��九�絅遵�����膤私査��������荀�菴�箙�����鐚�"
-
-#: src/dialogs.c:528 src/dialogs.c:529
+msgstr ""
+"���喝�篁�����絅遵���茵�賢���ゅ���� %s �� %d 筝��九�絅遵�����膤私査��������荀�菴�箙���"
+"��鐚�"
+
+#: src/dialogs.c:531 src/dialogs.c:532
 msgid "Remove Contact"
 msgstr "���よ��膤私査"
 
-#: src/dialogs.c:677
+#: src/dialogs.c:680
 msgid "New Message"
 msgstr "�井���"
 
-#: src/dialogs.c:695
+#: src/dialogs.c:698
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "���活�莊�莪���鐚�莚決��ヤ�/絅合�����桁����\n"
 
-#: src/dialogs.c:711 src/dialogs.c:788
+#: src/dialogs.c:714 src/dialogs.c:791
 msgid "_Screenname:"
 msgstr "���桁��(_S):"
 
-#: src/dialogs.c:726 src/dialogs.c:804 src/gtkpounce.c:408
+#: src/dialogs.c:729 src/dialogs.c:807 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "茣���(_A):"
 
-#: src/dialogs.c:757
+#: src/dialogs.c:760
 msgid "Get User Info"
 msgstr "�桁����隙拭��"
 
-#: src/dialogs.c:776
+#: src/dialogs.c:779
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "���活��ョ��莪���篆≧���莚決��ヤ�/絅合�����桁����\n"
 
-#: src/dialogs.c:914
+#: src/dialogs.c:906
 msgid "Add Group"
 msgstr "羞糸��膸�"
 
-#: src/dialogs.c:914
+#: src/dialogs.c:906
 msgid "Add a new group"
 msgstr "羞糸���亥�"
 
-#: src/dialogs.c:915
+#: src/dialogs.c:907
 msgid "Please enter the name of the group to be added."
 msgstr "莚決��ヨ�羞糸����膸���腱違��"
 
-#: src/dialogs.c:917 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
+#: src/dialogs.c:909 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
 #: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2688 src/prpl.c:315
+#: src/protocols/oscar/oscar.c:2694 src/prpl.c:163
 msgid "Add"
 msgstr "羞糸��"
 
-#: src/dialogs.c:943 src/protocols/yahoo/yahoo.c:1509
+#: src/dialogs.c:935 src/protocols/yahoo/yahoo.c:1565
 msgid "Add Buddy"
 msgstr "羞糸��絅遵�"
 
-#: src/dialogs.c:962
+#: src/dialogs.c:954
 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. "
@@ -1305,336 +1372,336 @@
 "���活�絨�莪���筝阪ソ��鐚�莚決��ヤ�/絅合�����桁���������減絅遵�莨��ュ�������窮О���������"
 "��莚�鐚�����絨�篌��推撮���桁���丞ず��\n"
 
-#: src/dialogs.c:981 src/gtkaccount.c:1620
+#: src/dialogs.c:973 src/gtkaccount.c:1624
 msgid "Screen Name"
 msgstr "���桁��"
 
-#: src/dialogs.c:994
+#: src/dialogs.c:986
 msgid "Alias"
 msgstr "����"
 
-#: src/dialogs.c:1004
+#: src/dialogs.c:996
 msgid "Group"
 msgstr "膸�"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1013
+#: src/dialogs.c:1005
 msgid "Add To"
 msgstr "羞糸����"
 
-#: src/dialogs.c:1333
+#: src/dialogs.c:1325
 msgid "Add Chat"
 msgstr "羞糸����紊�"
 
-#: src/dialogs.c:1356
+#: src/dialogs.c:1348
 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:1365
+#: src/dialogs.c:1357
 msgid "Account:"
 msgstr "茣���:"
 
-#: src/dialogs.c:1384 src/gtkaccount.c:450
+#: src/dialogs.c:1376 src/gtkaccount.c:450
 msgid "Alias:"
 msgstr "����:"
 
-#: src/dialogs.c:1395
+#: src/dialogs.c:1387
 msgid "Group:"
 msgstr "膸�:"
 
-#: src/dialogs.c:1474
+#: src/dialogs.c:1466
 msgid "Set Directory Info"
 msgstr "莅丞舟���篆≧��"
 
-#: src/dialogs.c:1482
+#: src/dialogs.c:1474
 msgid "Directory Info"
 msgstr "���篆≧��"
 
-#: src/dialogs.c:1492
+#: src/dialogs.c:1484
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "莅丞舟 %s �����篆≧��:"
 
-#: src/dialogs.c:1505
+#: src/dialogs.c:1497
 msgid "Allow Web Searches To Find Your Info"
 msgstr "��莅御��膣√����ユ�丈����篆≧��"
 
 #. Line 1
-#: src/dialogs.c:1508 src/dialogs.c:2062 src/protocols/oscar/oscar.c:3957
+#: src/dialogs.c:1500 src/dialogs.c:2063 src/protocols/oscar/oscar.c:3969
 #: src/protocols/trepia/trepia.c:299
 msgid "First Name"
 msgstr "��"
 
 #. Line 2
-#: src/dialogs.c:1519 src/dialogs.c:2072
+#: src/dialogs.c:1511 src/dialogs.c:2073
 msgid "Middle Name"
 msgstr "筝㊤��"
 
 #. Line 3
-#: src/dialogs.c:1531 src/dialogs.c:2082 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3960 src/protocols/trepia/trepia.c:306
+#: src/dialogs.c:1523 src/dialogs.c:2083 src/protocols/gg/gg.c:676
+#: src/protocols/oscar/oscar.c:3972 src/protocols/trepia/trepia.c:306
 msgid "Last Name"
 msgstr "紮�"
 
 #. Line 4
-#: src/dialogs.c:1542 src/dialogs.c:2092
+#: src/dialogs.c:1534 src/dialogs.c:2093
 msgid "Maiden Name"
 msgstr "紲�絎九��"
 
 #. Line 5
-#: src/dialogs.c:1553 src/dialogs.c:2102 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4006 src/protocols/oscar/oscar.c:4022
+#: src/dialogs.c:1545 src/dialogs.c:2103 src/protocols/gg/gg.c:704
+#: src/protocols/oscar/oscar.c:4018 src/protocols/oscar/oscar.c:4034
 #: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
 msgid "City"
 msgstr "���"
 
 #. Line 6
-#: src/dialogs.c:1564 src/dialogs.c:2111 src/protocols/oscar/oscar.c:4009
-#: src/protocols/oscar/oscar.c:4025 src/protocols/trepia/trepia.c:367
+#: src/dialogs.c:1556 src/dialogs.c:2112 src/protocols/oscar/oscar.c:4021
+#: src/protocols/oscar/oscar.c:4037 src/protocols/trepia/trepia.c:367
 #: src/protocols/trepia/trepia.c:471
 msgid "State"
 msgstr "綏�/��"
 
 #. Line 7
-#: src/dialogs.c:1575 src/dialogs.c:2120 src/protocols/jabber/jabber.c:3729
+#: src/dialogs.c:1567 src/dialogs.c:2121 src/protocols/jabber/jabber.c:3729
 #: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
 msgid "Country"
 msgstr "�遵�"
 
-#: src/dialogs.c:1606 src/dialogs.c:1787 src/dialogs.c:2853 src/dialogs.c:3517
+#: src/dialogs.c:1598 src/dialogs.c:1779 src/dialogs.c:2854 src/dialogs.c:3518
 #: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4199
 #: src/protocols/trepia/trepia.c:378
 msgid "Save"
 msgstr "篆�絖�"
 
-#: src/dialogs.c:1629
+#: src/dialogs.c:1621
 msgid "New passwords do not match."
 msgstr "�医���筝��後����"
 
-#: src/dialogs.c:1635
+#: src/dialogs.c:1627
 msgid "Fill out all fields completely."
 msgstr "絎���゛�ユ����絖�罧泣��"
 
-#: src/dialogs.c:1664 src/dialogs.c:1673 src/protocols/gg/gg.c:1198
-#: src/protocols/jabber/jabber.c:4418 src/protocols/oscar/oscar.c:6153
-#: src/protocols/toc/toc.c:1514
+#: src/dialogs.c:1656 src/dialogs.c:1665 src/protocols/gg/gg.c:1198
+#: src/protocols/jabber/jabber.c:4418 src/protocols/oscar/oscar.c:6186
+#: src/protocols/toc/toc.c:1534
 msgid "Change Password"
 msgstr "�贋�劫���"
 
-#: src/dialogs.c:1680
+#: src/dialogs.c:1672
 #, c-format
 msgid "Changing password for %s:"
 msgstr "�贋�� %s ��絲���:"
 
-#: src/dialogs.c:1688
+#: src/dialogs.c:1680
 msgid "Original Password"
 msgstr "��"
 
-#: src/dialogs.c:1699
+#: src/dialogs.c:1691
 msgid "New Password"
 msgstr "�医���"
 
-#: src/dialogs.c:1710
+#: src/dialogs.c:1702
 msgid "New Password (again)"
 msgstr "��罨∴��ユ�医���"
 
-#: src/dialogs.c:1750 src/protocols/jabber/jabber.c:4404
-#: src/protocols/oscar/oscar.c:6139 src/protocols/toc/toc.c:1502
+#: src/dialogs.c:1742 src/protocols/jabber/jabber.c:4404
+#: src/protocols/oscar/oscar.c:6172 src/protocols/toc/toc.c:1522
 msgid "Set User Info"
 msgstr "莅丞舟���隙拭��"
 
-#: src/dialogs.c:1759
+#: src/dialogs.c:1751
 #, c-format
 msgid "Changing info for %s:"
 msgstr "�贋�� %s ��篆≧��:"
 
-#: src/dialogs.c:1846
+#: src/dialogs.c:1839
 msgid "Below are the results of your search: "
 msgstr "筝��∽������膣∝��膸���:"
 
-#: src/dialogs.c:1957
+#: src/dialogs.c:1958
 msgid "Log Conversation"
 msgstr "絲壕�莅医�"
 
-#: src/dialogs.c:2038 src/dialogs.c:2171
+#: src/dialogs.c:2039 src/dialogs.c:2172
 msgid "Search for Buddy"
 msgstr "��膣√ソ��"
 
-#: src/dialogs.c:2138
+#: src/dialogs.c:2139
 msgid "Find Buddy By Info"
 msgstr "��篆≧���ユ�上ソ��"
 
-#: src/dialogs.c:2165
+#: src/dialogs.c:2166
 msgid "Find Buddy By Email"
 msgstr "���球���散�ユ�上ソ��"
 
-#: src/dialogs.c:2178 src/protocols/jabber/jabber.c:3731
-#: src/protocols/yahoo/yahoo.c:1961
+#: src/dialogs.c:2179 src/protocols/jabber/jabber.c:3731
+#: src/protocols/yahoo/yahoo.c:2041
 msgid "Email"
 msgstr "�球���散"
 
-#: src/dialogs.c:2269
+#: src/dialogs.c:2270
 msgid "Insert Link"
 msgstr "���ラ�丈・"
 
-#: src/dialogs.c:2271
+#: src/dialogs.c:2272
 msgid "Insert"
 msgstr "����"
 
-#: src/dialogs.c:2290
+#: src/dialogs.c:2291
 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:2314 src/protocols/jabber/jabber.c:3723
+#: src/dialogs.c:2315 src/protocols/jabber/jabber.c:3723
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2324 src/gtkprefs.c:604 src/gtkprefs.c:1847
+#: src/dialogs.c:2325 src/gtkprefs.c:600 src/gtkprefs.c:1804
 #: src/protocols/jabber/jabber.c:3737
 msgid "Description"
 msgstr "�颷�"
 
-#: src/dialogs.c:2459 src/dialogs.c:2476
+#: src/dialogs.c:2460 src/dialogs.c:2477
 msgid "Select Text Color"
 msgstr "������絖�蘂���"
 
-#: src/dialogs.c:2511 src/dialogs.c:2528
+#: src/dialogs.c:2512 src/dialogs.c:2529
 msgid "Select Background Color"
 msgstr "�����������"
 
-#: src/dialogs.c:2625 src/dialogs.c:2651
+#: src/dialogs.c:2626 src/dialogs.c:2652
 msgid "Select Font"
 msgstr "�����篏�"
 
-#: src/dialogs.c:2717
+#: src/dialogs.c:2718
 msgid "You cannot save an away message with a blank title"
 msgstr "����巡�絖�腥堺��蘂���胼糸�羔���"
 
-#: src/dialogs.c:2719
+#: src/dialogs.c:2720
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "莚欠�羔�����絎���蘂�鐚�����筝�篆�絖��贋・��篏睡������"
 
-#: src/dialogs.c:2729
+#: src/dialogs.c:2730
 msgid "You cannot create an empty away message"
 msgstr "����遵��綮榊���胼糸�羔���"
 
-#: src/dialogs.c:2794 src/dialogs.c:2802
+#: src/dialogs.c:2795 src/dialogs.c:2803
 msgid "New away message"
 msgstr "�医産胼糸�羔���"
 
-#: src/dialogs.c:2812
+#: src/dialogs.c:2813
 msgid "Away title: "
 msgstr "胼糸���蘂�:"
 
-#: src/dialogs.c:2857
+#: src/dialogs.c:2858
 msgid "Save & Use"
 msgstr "篆�絖�綛銀戎��"
 
-#: src/dialogs.c:2861
+#: src/dialogs.c:2862
 msgid "Use"
 msgstr "篏睡��"
 
 #. show everything
-#: src/dialogs.c:3010
+#: src/dialogs.c:3011
 msgid "Smile!"
 msgstr "膃���"
 
-#: src/dialogs.c:3028
+#: src/dialogs.c:3029
 msgid "Alias Chat"
 msgstr "膸���紊�儀��"
 
-#: src/dialogs.c:3028
-msgid "Alias chat"
-msgstr "膸���紊�儀��"
-
 #: src/dialogs.c:3029
+msgid "Alias chat"
+msgstr "膸���紊�儀��"
+
+#: src/dialogs.c:3030
 msgid "Please enter an aliased name for this chat."
 msgstr "莚決��ユ④��紊���������"
 
-#: src/dialogs.c:3060
+#: src/dialogs.c:3061
 msgid "_Screenname"
 msgstr "���桁��(_S)"
 
-#: src/dialogs.c:3064 src/gtkblist.c:477 src/gtkblist.c:536
+#: src/dialogs.c:3065 src/gtkblist.c:477 src/gtkblist.c:536
 msgid "_Alias"
 msgstr "����(_A)"
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3069
 msgid "Alias Buddy"
 msgstr "絅遵�����"
 
-#: src/dialogs.c:3069
-msgid "Alias buddy"
-msgstr "絅遵�����"
-
 #: src/dialogs.c:3070
+msgid "Alias buddy"
+msgstr "絅遵�����"
+
+#: src/dialogs.c:3071
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
 msgstr "莚隙減篁ヤ�絅遵�莨��ュ����鐚�������ソ����茵�賢膸�莚ヨ��膤私査�劫����"
 
-#: src/dialogs.c:3106 src/dialogs.c:3113
+#: src/dialogs.c:3107 src/dialogs.c:3114
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "��羈����� %s��"
 
-#: src/dialogs.c:3137
+#: src/dialogs.c:3138
 msgid "Save Log File"
 msgstr "篆�絖��ュ���篁�"
 
-#: src/dialogs.c:3167
+#: src/dialogs.c:3168
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "��羈����ゆ��篁� %s��"
 
-#: src/dialogs.c:3186
+#: src/dialogs.c:3187
 msgid "Clear Log"
 msgstr "羝��ゆ�ュ�"
 
-#: src/dialogs.c:3195
+#: src/dialogs.c:3196
 msgid "Really clear log?"
 msgstr "����荀�羝��ゆ�ュ���鐚�"
 
-#: src/dialogs.c:3240 src/dialogs.c:3411
+#: src/dialogs.c:3241 src/dialogs.c:3412
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "��羈���綣��ュ���篁� %s��"
 
-#: src/dialogs.c:3388
+#: src/dialogs.c:3389
 #, c-format
 msgid "Conversations with %s"
 msgstr "筝� %s ��絲壕�"
 
-#: src/dialogs.c:3390
+#: src/dialogs.c:3391
 msgid "System Log"
 msgstr "膤紫��ュ�"
 
-#: src/dialogs.c:3432
+#: src/dialogs.c:3433
 msgid "Date"
 msgstr "�ユ��"
 
-#: src/dialogs.c:3489
+#: src/dialogs.c:3490
 msgid "Log"
 msgstr "�ュ�"
 
-#: src/dialogs.c:3512
+#: src/dialogs.c:3513
 msgid "Clear"
 msgstr "羝���"
 
-#: src/dialogs.c:3551
+#: src/dialogs.c:3552
 msgid "Rename Group"
 msgstr "���遵��膸�"
 
-#: src/dialogs.c:3551
+#: src/dialogs.c:3552
 msgid "New group name"
 msgstr "�亥���腱�"
 
-#: src/dialogs.c:3552
+#: src/dialogs.c:3553
 msgid "Please enter a new name for the selected group."
 msgstr "莚決��ラ��筝㊦����医��絖���"
 
@@ -1748,7 +1815,7 @@
 msgid "boring default"
 msgstr "��Ⅶ��篋�"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1579
+#: src/gaimrc.c:1267 src/gtkblist.c:1595
 msgid "Alphabetical"
 msgstr "絖�罸�綺�"
 
@@ -1776,7 +1843,7 @@
 "<b>��篁九ぇ絨�:</b> %s\n"
 "<b>�上�鎀у�:</b> %dx%d"
 
-#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3085
+#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3091
 msgid "Buddy Icon"
 msgstr "絅遵��丈��"
 
@@ -1854,7 +1921,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:762 src/gtkprefs.c:1111
+#: src/gtkaccount.c:762 src/gtkprefs.c:1107
 msgid "Use Environmental Settings"
 msgstr "篏睡��ッ紜�莅丞舟"
 
@@ -1870,7 +1937,7 @@
 msgid "Proxy Options"
 msgstr "篁g����蕁�"
 
-#: src/gtkaccount.c:831 src/gtkprefs.c:1105
+#: src/gtkaccount.c:831 src/gtkprefs.c:1101
 msgid "Proxy _type:"
 msgstr "篁g��膠糸��(_T):"
 
@@ -1890,47 +1957,47 @@
 msgid "Pa_ssword:"
 msgstr "絲���(_S):"
 
-#: src/gtkaccount.c:1186
+#: src/gtkaccount.c:1190
 msgid "Add Account"
 msgstr "羞糸��茣���"
 
-#: src/gtkaccount.c:1188
+#: src/gtkaccount.c:1192
 msgid "Modify Account"
 msgstr "篆��壕侃��"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1212
+#: src/gtkaccount.c:1216
 msgid "Show more options"
 msgstr "�丞ず������蕁�"
 
-#: src/gtkaccount.c:1213
+#: src/gtkaccount.c:1217
 msgid "Show fewer options"
 msgstr "�丞ず筝肢���蕁�"
 
 #. Register button
-#: src/gtkaccount.c:1240
+#: src/gtkaccount.c:1244
 msgid "Register"
 msgstr "羈���"
 
-#: src/gtkaccount.c:1538
+#: src/gtkaccount.c:1542
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�������活����� %s ��鐚�"
 
-#: src/gtkaccount.c:1542 src/gtkrequest.c:192
+#: src/gtkaccount.c:1546 src/gtkrequest.c:192
 msgid "Delete"
 msgstr "����"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:3529
-#: src/protocols/jabber/jabber.c:3579 src/protocols/oscar/oscar.c:2846
-#: src/protocols/oscar/oscar.c:4580 src/protocols/oscar/oscar.c:5879
-#: src/protocols/yahoo/yahoo.c:1375 src/protocols/zephyr/zephyr.c:872
+#: src/gtkaccount.c:1647 src/protocols/jabber/jabber.c:3529
+#: src/protocols/jabber/jabber.c:3579 src/protocols/oscar/oscar.c:2852
+#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:5912
+#: src/protocols/yahoo/yahoo.c:1431 src/protocols/zephyr/zephyr.c:872
 #: src/protocols/zephyr/zephyr.c:882
 msgid "Online"
 msgstr "��鎖"
 
-#: src/gtkaccount.c:1661
+#: src/gtkaccount.c:1665
 msgid "Protocol"
 msgstr "�顒�"
 
@@ -1987,105 +2054,105 @@
 msgstr "絮�綣�(_E)"
 
 #. Buddies menu
-#: src/gtkblist.c:989
+#: src/gtkblist.c:1005
 msgid "/_Buddies"
 msgstr "/絅遵�(_B)"
 
-#: src/gtkblist.c:990
+#: src/gtkblist.c:1006
 msgid "/Buddies/New _Instant Message..."
 msgstr "/絅遵�(B)/�医�恰�倶���(_I)..."
 
-#: src/gtkblist.c:991
+#: src/gtkblist.c:1007
 msgid "/Buddies/Join a _Chat..."
 msgstr "/絅遵�(B)/���ヨ��紊�(_C)..."
 
-#: src/gtkblist.c:992
+#: src/gtkblist.c:1008
 msgid "/Buddies/Get _User Info..."
 msgstr "/絅遵�(B)/�桁����隙拭��(_U)..."
 
-#: src/gtkblist.c:994
+#: src/gtkblist.c:1010
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(_O)"
 
-#: src/gtkblist.c:995
+#: src/gtkblist.c:1011
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/絅遵�(B)/�丞ず腥榊�(_E)"
 
-#: src/gtkblist.c:996
+#: src/gtkblist.c:1012
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/絅遵�(B)/羞糸��絅遵�(_A)..."
 
-#: src/gtkblist.c:997
+#: src/gtkblist.c:1013
 msgid "/Buddies/Add a C_hat..."
 msgstr "/絅遵�(B)/羞糸����紊�(_H)..."
 
-#: src/gtkblist.c:998
+#: src/gtkblist.c:1014
 msgid "/Buddies/Add a _Group..."
 msgstr "/絅遵�(B)/羞糸��膸�(_G)..."
 
-#: src/gtkblist.c:1000
+#: src/gtkblist.c:1016
 msgid "/Buddies/_Signoff"
 msgstr "/絅遵�(B)/�糸��(_S)"
 
-#: src/gtkblist.c:1001
+#: src/gtkblist.c:1017
 msgid "/Buddies/_Quit"
 msgstr "/絅遵�(B)/����(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1004
+#: src/gtkblist.c:1020
 msgid "/_Tools"
 msgstr "/綏ュ��(_T)"
 
-#: src/gtkblist.c:1005
+#: src/gtkblist.c:1021
 msgid "/Tools/_Away"
 msgstr "/綏ュ��(T)/胼糸�(_A)"
 
-#: src/gtkblist.c:1006
+#: src/gtkblist.c:1022
 msgid "/Tools/Buddy _Pounce"
 msgstr "/綏ュ��(T)/絅遵�������(_P)"
 
-#: src/gtkblist.c:1007
+#: src/gtkblist.c:1023
 msgid "/Tools/P_rotocol Actions"
 msgstr "/綏ュ��(T)/�顒���篏�(_R)"
 
-#: src/gtkblist.c:1009
+#: src/gtkblist.c:1025
 msgid "/Tools/A_ccounts"
 msgstr "/綏ュ��(T)/茣���(_C)"
 
-#: src/gtkblist.c:1010
+#: src/gtkblist.c:1026
 msgid "/Tools/_File Transfers..."
 msgstr "/綏ュ��(T)/��篁銀���(_F)..."
 
-#: src/gtkblist.c:1011
+#: src/gtkblist.c:1027
 msgid "/Tools/Preferences"
 msgstr "/綏ュ��(T)/薤���蕁�"
 
-#: src/gtkblist.c:1012
+#: src/gtkblist.c:1028
 msgid "/Tools/Pr_ivacy"
 msgstr "/綏ュ��(T)/��腱�(_I)"
 
-#: src/gtkblist.c:1014
+#: src/gtkblist.c:1030
 msgid "/Tools/View System _Log"
 msgstr "/綏ュ��(T)/�ョ��膤紫��ュ�(_L)"
 
 #. Help
-#: src/gtkblist.c:1017
+#: src/gtkblist.c:1033
 msgid "/_Help"
 msgstr "/絽���(_H)"
 
-#: src/gtkblist.c:1018
+#: src/gtkblist.c:1034
 msgid "/Help/Online _Help"
 msgstr "/絽���(H)/��鎖絽���(_H)"
 
-#: src/gtkblist.c:1019
+#: src/gtkblist.c:1035
 msgid "/Help/_Debug Window"
 msgstr "/絽���(H)/莪�莚�腦���(_D)"
 
-#: src/gtkblist.c:1020
+#: src/gtkblist.c:1036
 msgid "/Help/_About"
 msgstr "/絽���(H)/�割�(_A)"
 
-#: src/gtkblist.c:1050
+#: src/gtkblist.c:1066
 #, c-format
 msgid ""
 "\n"
@@ -2094,16 +2161,16 @@
 "\n"
 "<b>茣���:</b>%s"
 
-#: src/gtkblist.c:1109 src/protocols/oscar/oscar.c:5468
+#: src/gtkblist.c:1125 src/protocols/oscar/oscar.c:5499
 msgid "<b>Status:</b> Offline"
 msgstr "<b>�倶��:</b> 胼紫鎖"
 
-#: src/gtkblist.c:1121
+#: src/gtkblist.c:1137
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1135
+#: src/gtkblist.c:1151
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2111,7 +2178,7 @@
 "\n"
 "<b>茣���:</b>"
 
-#: src/gtkblist.c:1136
+#: src/gtkblist.c:1152
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2119,7 +2186,7 @@
 "\n"
 "<b>����:</b>"
 
-#: src/gtkblist.c:1137
+#: src/gtkblist.c:1153
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2127,7 +2194,7 @@
 "\n"
 "<b>�窮О:</b>"
 
-#: src/gtkblist.c:1138
+#: src/gtkblist.c:1154
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2135,7 +2202,7 @@
 "\n"
 "<b>����:</b>"
 
-#: src/gtkblist.c:1139
+#: src/gtkblist.c:1155
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2143,7 +2210,7 @@
 "\n"
 "<b>茘���:</b>"
 
-#: src/gtkblist.c:1141
+#: src/gtkblist.c:1157
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2151,7 +2218,7 @@
 "\n"
 "<b>�颷�:</b>�ヨ�"
 
-#: src/gtkblist.c:1142
+#: src/gtkblist.c:1158
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2159,7 +2226,7 @@
 "\n"
 "<b>�倶��</b>鐚�����"
 
-#: src/gtkblist.c:1143
+#: src/gtkblist.c:1159
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2167,81 +2234,81 @@
 "\n"
 "<b>�倶��</b>鐚�羞隙恒"
 
-#: src/gtkblist.c:1397
+#: src/gtkblist.c:1413
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "���>賢 (%d絨��%02d��) "
 
-#: src/gtkblist.c:1399
+#: src/gtkblist.c:1415
 #, c-format
 msgid "Idle (%dm) "
 msgstr "����賢 (%d��) "
 
-#: src/gtkblist.c:1403
+#: src/gtkblist.c:1419
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%) "
 
-#: src/gtkblist.c:1406
+#: src/gtkblist.c:1422
 msgid "Offline "
 msgstr "胼紫鎖 "
 
-#: src/gtkblist.c:1578 src/gtkprefs.c:845 src/gtkprefs.c:1542
+#: src/gtkblist.c:1594 src/gtkprefs.c:841 src/gtkprefs.c:1499
 msgid "None"
 msgstr "��"
 
-#: src/gtkblist.c:1643
+#: src/gtkblist.c:1659
 msgid "/Tools/Away"
 msgstr "/綏ュ��(T)/胼糸�(A)"
 
-#: src/gtkblist.c:1646
+#: src/gtkblist.c:1662
 msgid "/Tools/Buddy Pounce"
 msgstr "/綏ュ��(T)/絅遵�������(P)"
 
-#: src/gtkblist.c:1649
+#: src/gtkblist.c:1665
 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:1732
+#: src/gtkblist.c:1748
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(O)"
 
-#: src/gtkblist.c:1734
+#: src/gtkblist.c:1750
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�(B)/�丞ず腥榊�(E)"
 
-#: src/gtkblist.c:1752 src/gtkconv.c:1073
+#: src/gtkblist.c:1768 src/gtkconv.c:1073
 msgid "IM"
 msgstr "綣���"
 
-#: src/gtkblist.c:1758
+#: src/gtkblist.c:1774
 msgid "Send a message to the selected buddy"
 msgstr "����筝㊤ソ������羔���"
 
-#: src/gtkblist.c:1761 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1777 src/protocols/napster/napster.c:531
 msgid "Get Info"
 msgstr "篆≧��"
 
-#: src/gtkblist.c:1767
+#: src/gtkblist.c:1783
 msgid "Get information on the selected buddy"
 msgstr "�桁���筝㊤ソ����篆≧��"
 
-#: src/gtkblist.c:1770 src/protocols/oscar/oscar.c:3094
+#: src/gtkblist.c:1786 src/protocols/oscar/oscar.c:3100
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/gtkblist.c:1775
+#: src/gtkblist.c:1791
 msgid "Join a chat room"
 msgstr "���ヨ��紊��"
 
-#: src/gtkblist.c:1783
+#: src/gtkblist.c:1799
 msgid "Set an away message"
 msgstr "莅丞舟胼糸�羔���"
 
-#: src/gtkblist.c:2827
+#: src/gtkblist.c:2846
 msgid "No actions available"
 msgstr "羃≧����������篏�"
 
@@ -2305,7 +2372,7 @@
 msgid "Un-Ignore"
 msgstr "��羔�綽順��"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:777
+#: src/gtkconv.c:1083 src/gtkprefs.c:773
 msgid "Ignore"
 msgstr "綽順��"
 
@@ -2465,7 +2532,7 @@
 #. From right to left...
 #. Send button
 #: src/gtkconv.c:2935 src/gtkconv.c:2937 src/gtkconv.c:3035 src/gtkconv.c:3037
-#: src/gtkconv.c:5911
+#: src/gtkconv.c:5918
 msgid "Send"
 msgstr "����"
 
@@ -2500,7 +2567,7 @@
 msgstr "絮�恝����"
 
 #. Invite
-#: src/gtkconv.c:3047 src/gtkconv.c:5914
+#: src/gtkconv.c:3047 src/gtkconv.c:5921
 msgid "Invite"
 msgstr "��莚�"
 
@@ -2573,12 +2640,12 @@
 msgid "Ignore the user"
 msgstr "綽順�ョ����"
 
-#: src/gtkconv.c:3908 src/server.c:1378
+#: src/gtkconv.c:3908 src/server.c:1393
 #, 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:3912 src/server.c:1381
+#: src/gtkconv.c:3912 src/server.c:1396
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- �医�莚� @ %s ----\n"
@@ -2593,23 +2660,23 @@
 msgid_plural "%d people in room"
 msgstr[0] "��紊������ %d 筝�査"
 
-#: src/gtkconv.c:5184
+#: src/gtkconv.c:5188
 msgid "Disable Animation"
 msgstr "胼�������"
 
-#: src/gtkconv.c:5193
+#: src/gtkconv.c:5197
 msgid "Enable Animation"
 msgstr "��������"
 
-#: src/gtkconv.c:5200
+#: src/gtkconv.c:5204
 msgid "Hide Icon"
 msgstr "����憝��"
 
-#: src/gtkconv.c:5206
+#: src/gtkconv.c:5210
 msgid "Save Icon As..."
 msgstr "�丈�����筝�..."
 
-#: src/gtkconv.c:5681 src/gtkconv.c:5684
+#: src/gtkconv.c:5688 src/gtkconv.c:5691
 msgid "<main>/Conversation/Close"
 msgstr "<main>/絲壕�(C)/�渇��(C)"
 
@@ -2717,7 +2784,7 @@
 msgid "Gaim - Open..."
 msgstr "Gaim - ��綣�..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2009
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2030
 msgid "Gaim - Save As..."
 msgstr "Gaim - ���筝�..."
 
@@ -2734,22 +2801,22 @@
 msgid "_Open Link in Browser"
 msgstr "���茹���賢��綣��丈・(_O)"
 
-#: src/gtkimhtml.c:1641
+#: src/gtkimhtml.c:1652
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim ��羈��号���箴�����篁倶�������羌��上�靏糸������藥�莅ゅ�取�筝� PNG��"
 
-#: src/gtkimhtml.c:1649
+#: src/gtkimhtml.c:1660
 #, c-format
 msgid "Error saving image: %s"
 msgstr "篆�絖��上��尌��鐚�%s"
 
-#: src/gtkimhtml.c:1658
+#: src/gtkimhtml.c:1669
 msgid "Save Image"
 msgstr "篆�絖��上��"
 
-#: src/gtkimhtml.c:1680
+#: src/gtkimhtml.c:1691
 msgid "_Save Image..."
 msgstr "篆�絖��上��(_S)..."
 
@@ -2834,8 +2901,8 @@
 msgid "Return from away"
 msgstr "����"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1539 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1371
+#: src/gtkpounce.c:465 src/gtkprefs.c:1496 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:1427
 msgid "Idle"
 msgstr "����"
 
@@ -2880,7 +2947,7 @@
 msgid "Browse"
 msgstr "羌頵�"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2125
+#: src/gtkpounce.c:518 src/gtkprefs.c:2082
 msgid "Test"
 msgstr "羌�莚�"
 
@@ -2932,378 +2999,373 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "���ョ�������若��莚傑�ュ��罩ら��莚��"
 
-#: src/gtkprefs.c:381
+#: src/gtkprefs.c:377
 msgid "Interface Options"
 msgstr "���∫��蕁�"
 
-#: src/gtkprefs.c:383
+#: src/gtkprefs.c:379
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "絋������臀��������丞ず菴�腮��窮О(_I)"
 
-#: src/gtkprefs.c:564
+#: src/gtkprefs.c:560
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr "莚隙�筝��∫�������篏睡����膃��娯源蘂���絨�筝脂����喝�遺源蘂���茵��喝��茖��遺源蘂���"
 
-#: src/gtkprefs.c:597
+#: src/gtkprefs.c:593
 msgid "Icon"
 msgstr "�丈��"
 
-#: src/gtkprefs.c:671
+#: src/gtkprefs.c:667
 msgid "Style"
 msgstr "�桁�"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:668
 msgid "_Bold"
 msgstr "膕�篏�(_B)"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:670
 msgid "_Italics"
 msgstr "��篏�(_I)"
 
-#: src/gtkprefs.c:676
+#: src/gtkprefs.c:672
 msgid "_Underline"
 msgstr "筝���膾�(_U)"
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:674
 msgid "_Strikethrough"
 msgstr "���ょ鎖(_S)"
 
-#: src/gtkprefs.c:681
+#: src/gtkprefs.c:677
 msgid "Face"
 msgstr "絖�篏�"
 
-#: src/gtkprefs.c:684
+#: src/gtkprefs.c:680
 msgid "Use custo_m face"
 msgstr "篏睡�����箙�絖�篏�(_M)"
 
-#: src/gtkprefs.c:701
+#: src/gtkprefs.c:697
 msgid "Use custom si_ze"
 msgstr "篏睡�����箙�紊у�(_Z)"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:710
 msgid "Color"
 msgstr "蘂���"
 
-#: src/gtkprefs.c:718
+#: src/gtkprefs.c:714
 msgid "_Text color"
 msgstr "��絖�蘂���(_T)"
 
-#: src/gtkprefs.c:737
+#: src/gtkprefs.c:733
 msgid "Bac_kground color"
 msgstr "�������(_K)"
 
-#: src/gtkprefs.c:765 src/gtkprefs.c:1002 src/gtkprefs.c:1055
+#: src/gtkprefs.c:761 src/gtkprefs.c:998 src/gtkprefs.c:1051
 msgid "Display"
 msgstr "�丞ず"
 
+#: src/gtkprefs.c:762
+msgid "Show graphical _smileys"
+msgstr "�丞ず�上就��膃���(_S)"
+
+#: src/gtkprefs.c:764
+msgid "Show _timestamp on messages"
+msgstr "羔����丞ず�狗�贋��(_T)"
+
 #: src/gtkprefs.c:766
-msgid "Show graphical _smileys"
-msgstr "�丞ず�上就��膃���(_S)"
-
-#: src/gtkprefs.c:768
-msgid "Show _timestamp on messages"
-msgstr "羔����丞ず�狗�贋��(_T)"
+msgid "Show _URLs as links"
+msgstr "絨� URLs �丞ず筝咲�丈・(_U)"
 
 #: src/gtkprefs.c:770
-msgid "Show _URLs as links"
-msgstr "絨� URLs �丞ず筝咲�丈・(_U)"
+msgid "_Highlight misspelled words"
+msgstr "腦��堺�丞ず�守������莚�(_H)"
 
 #: src/gtkprefs.c:774
-msgid "_Highlight misspelled words"
-msgstr "腦��堺�丞ず�守������莚�(_H)"
-
-#: src/gtkprefs.c:778
 msgid "Ignore c_olors"
 msgstr "綽順�ラ���(_O)"
 
-#: src/gtkprefs.c:780
+#: src/gtkprefs.c:776
 msgid "Ignore font _faces"
 msgstr "綽順�ュ�篏���腱�(_F)"
 
-#: src/gtkprefs.c:782
+#: src/gtkprefs.c:778
 msgid "Ignore font si_zes"
 msgstr "綽順�ュ�篏�紊у�(_Z)"
 
-#: src/gtkprefs.c:795
+#: src/gtkprefs.c:791
 msgid "Send Message"
 msgstr "����羔���"
 
-#: src/gtkprefs.c:796
+#: src/gtkprefs.c:792
 msgid "Enter _sends message"
 msgstr "��莉������羔���(_S)"
 
+#: src/gtkprefs.c:794
+msgid "C_ontrol-Enter sends message"
+msgstr "Ctrl+��莉������羔���(_O)"
+
+#: src/gtkprefs.c:797
+msgid "Window Closing"
+msgstr "腦��e�渇��"
+
 #: src/gtkprefs.c:798
-msgid "C_ontrol-Enter sends message"
-msgstr "Ctrl+��莉������羔���(_O)"
+msgid "_Escape closes window"
+msgstr "Esc ���渇�㊦���(_E)"
 
 #: src/gtkprefs.c:801
-msgid "Window Closing"
-msgstr "腦��e�渇��"
+msgid "Insertions"
+msgstr "����"
 
 #: src/gtkprefs.c:802
-msgid "_Escape closes window"
-msgstr "Esc ���渇�㊦���(_E)"
-
-#: src/gtkprefs.c:805
-msgid "Insertions"
-msgstr "����"
-
-#: src/gtkprefs.c:806
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "Ctrl+{B/I/U} ���� HTML ��膈�(_H)"
 
-#: src/gtkprefs.c:808
+#: src/gtkprefs.c:804
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+�医�����ョ���(_I)"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:821
 msgid "Buddy List Sorting"
 msgstr "絅遵���茵��綺�"
 
-#: src/gtkprefs.c:834
+#: src/gtkprefs.c:830
 msgid "Sorting:"
 msgstr "��綺�:"
 
-#: src/gtkprefs.c:839
+#: src/gtkprefs.c:835
 msgid "Buddy List Toolbar"
 msgstr "絅遵���茵�轡�傑��"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:836 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Show _buttons as:"
 msgstr "絨������丞ず筝�(_B):"
 
-#: src/gtkprefs.c:842 src/gtkprefs.c:974 src/gtkprefs.c:1030
+#: src/gtkprefs.c:838 src/gtkprefs.c:970 src/gtkprefs.c:1026
 msgid "Pictures"
 msgstr "�丞��"
 
-#: src/gtkprefs.c:843 src/gtkprefs.c:975 src/gtkprefs.c:1031
+#: src/gtkprefs.c:839 src/gtkprefs.c:971 src/gtkprefs.c:1027
 msgid "Text"
 msgstr "��絖�"
 
-#: src/gtkprefs.c:844 src/gtkprefs.c:976 src/gtkprefs.c:1032
+#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
 msgid "Pictures and text"
 msgstr "�丞������絖�"
 
-#: src/gtkprefs.c:849 src/gtkprefs.c:990 src/gtkprefs.c:1046
+#: src/gtkprefs.c:845 src/gtkprefs.c:986 src/gtkprefs.c:1042
 msgid "_Raise window on events"
 msgstr "����篋�篁倶�倶�羇紫���(_R)"
 
-#: src/gtkprefs.c:852
+#: src/gtkprefs.c:848
 msgid "Group Display"
 msgstr "��膸��丞ず"
 
 #. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:854
+#: src/gtkprefs.c:850
 msgid "Show _numbers in groups"
 msgstr "����膸����丞ず�医�(_N)"
 
-#: src/gtkprefs.c:857
+#: src/gtkprefs.c:853
 msgid "Buddy Display"
 msgstr "絅遵��丞ず"
 
-#: src/gtkprefs.c:858 src/gtkprefs.c:997
+#: src/gtkprefs.c:854 src/gtkprefs.c:993
 msgid "Show buddy _icons"
 msgstr "�丞ず絅遵��丈��(_I)"
 
-#: src/gtkprefs.c:860
+#: src/gtkprefs.c:856
 msgid "Show _warning levels"
 msgstr "�丞ず茘���膾у��(_W)"
 
-#: src/gtkprefs.c:863
+#: src/gtkprefs.c:859
 msgid "Show idle _times"
 msgstr "�丞ず���≧�狗��(_T)"
 
-#: src/gtkprefs.c:877
+#: src/gtkprefs.c:873
 msgid "Dim i_dle buddies"
 msgstr "�丞ず�∞����絅遵�(_D)"
 
-#: src/gtkprefs.c:901
+#: src/gtkprefs.c:897
 msgid "_Placement:"
 msgstr "篏�臀�(_P):"
 
-#: src/gtkprefs.c:910
+#: src/gtkprefs.c:906
 msgid "Send _URLs as Links"
 msgstr "絨� URLs ����筝咲�丈・(_U)"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:909
 msgid "Tab Options"
 msgstr "��膈冗��蕁�"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:911
 msgid "_Tab Placement:"
 msgstr "��膈鞘�臀�(_T):"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:913
 msgid "Top"
 msgstr "筝�"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:914
 msgid "Bottom"
 msgstr "筝�"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:915
 msgid "Left"
 msgstr "綏�"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:916
 msgid "Right"
 msgstr "��"
 
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:922
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "����筝���膈丞��e���丞ず�恰�倶�������紊�(_T)"
 
 #. XXX: grey this out when the above is unchecked
-#: src/gtkprefs.c:930
+#: src/gtkprefs.c:926
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "����筝���膈丞��e���丞ず�恰�倶�������紊�(_S)"
 
-#: src/gtkprefs.c:933
+#: src/gtkprefs.c:929
 msgid "Show _close button on tabs"
 msgstr "����膈鞘��丞ず�渇�㊥����(_C)"
 
-#: src/gtkprefs.c:944
+#: src/gtkprefs.c:940
 msgid "Show status _icons on tabs"
 msgstr "����膈鞘��丞ず�倶���丈��(_I)"
 
-#: src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Window"
 msgstr "腦���"
 
-#: src/gtkprefs.c:981 src/gtkprefs.c:1037
+#: src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "New window _width:"
 msgstr "�亥��e�綺�(_W):"
 
-#: src/gtkprefs.c:984 src/gtkprefs.c:1040
+#: src/gtkprefs.c:980 src/gtkprefs.c:1036
 msgid "New window _height:"
 msgstr "�亥��i�綺�(_H):"
 
-#: src/gtkprefs.c:987 src/gtkprefs.c:1043
+#: src/gtkprefs.c:983 src/gtkprefs.c:1039
 msgid "_Entry field height:"
 msgstr "莨��ユ�蕭�綺�(_E):"
 
+#: src/gtkprefs.c:988
+msgid "Hide window on _send"
+msgstr "�����狗���霨���(_S)"
+
 #: src/gtkprefs.c:992
-msgid "Hide window on _send"
-msgstr "�����狗���霨���(_S)"
-
-#: src/gtkprefs.c:996
 msgid "Buddy Icons"
 msgstr "絅遵��丈��"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:995
 msgid "Enable buddy icon a_nimation"
 msgstr "����ソ���丈������(_N)"
 
-#: src/gtkprefs.c:1003
+#: src/gtkprefs.c:999
 msgid "Show _logins in window"
 msgstr "����d賢�丞ず�糸�(_L)"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1001
 msgid "Show a_liases in tabs/titles"
 msgstr "����膈�/��蘂�筝㊥�丞ず����(_L)"
 
-#: src/gtkprefs.c:1008
+#: src/gtkprefs.c:1004
 msgid "Typing Notification"
 msgstr "��絖���腓�"
 
-#: src/gtkprefs.c:1009
+#: src/gtkprefs.c:1005
 msgid "Notify buddies that you are _typing to them"
 msgstr "����絅遵���③����絖�膸�篁�篁�(_T)"
 
-#: src/gtkprefs.c:1049
+#: src/gtkprefs.c:1045
 msgid "Tab Completion"
 msgstr "Tab 茵ュ��"
 
-#: src/gtkprefs.c:1050
+#: src/gtkprefs.c:1046
 msgid "_Tab-complete nicks"
 msgstr "�� Tab 茵ュ���窮О(_T)"
 
+#: src/gtkprefs.c:1048
+msgid "_Old-style tab completion"
+msgstr "�ч��主�� Tab 茵ュ��(_O)"
+
 #: src/gtkprefs.c:1052
-msgid "_Old-style tab completion"
-msgstr "�ч��主�� Tab 茵ュ��(_O)"
-
-#: src/gtkprefs.c:1056
 msgid "_Show people joining in window"
 msgstr "����d賢�丞ず���ョ��篋�(_S)"
 
-#: src/gtkprefs.c:1058
+#: src/gtkprefs.c:1054
 msgid "_Show people leaving in window"
 msgstr "����d賢�丞ず胼糸���篋�(_S)"
 
-#: src/gtkprefs.c:1060
+#: src/gtkprefs.c:1056
 msgid "Co_lorize screennames"
 msgstr "���桁������(_L)"
 
-#: src/gtkprefs.c:1104
+#: src/gtkprefs.c:1100
 msgid "Proxy Type"
 msgstr "篁g��膠糸��"
 
-#: src/gtkprefs.c:1107
+#: src/gtkprefs.c:1103
 msgid "No proxy"
 msgstr "��篁g��"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1110
 msgid "Proxy Server"
 msgstr "篁g�����≦��"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1131
 msgid "_Host"
 msgstr "筝紙��(_H)"
 
-#: src/gtkprefs.c:1152 src/protocols/irc/irc.c:516
-#: src/protocols/jabber/jabber.c:4528 src/protocols/msn/msn.c:1417
+#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:516
+#: src/protocols/jabber/jabber.c:4528 src/protocols/msn/msn.c:1528
 #: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
 msgid "Port"
 msgstr "腴��"
 
-#: src/gtkprefs.c:1170
+#: src/gtkprefs.c:1166
 msgid "_User"
 msgstr "���桁��(_U)"
 
-#: src/gtkprefs.c:1187
+#: src/gtkprefs.c:1183
 msgid "Pa_ssword"
 msgstr "絲���(_S)"
 
-#: src/gtkprefs.c:1243
-#, c-format
-msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
-msgstr "������ョ��羌頵�����%s��������莇�膾ч�丈・��羈�綏ヤ���"
-
-#: src/gtkprefs.c:1263
+#: src/gtkprefs.c:1220
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1264
+#: src/gtkprefs.c:1221
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1265
+#: src/gtkprefs.c:1222
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1266
+#: src/gtkprefs.c:1223
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1267
+#: src/gtkprefs.c:1224
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1276
+#: src/gtkprefs.c:1233
 msgid "Manual"
 msgstr "����"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1274
 msgid "Browser Selection"
 msgstr "羌頵�������"
 
-#: src/gtkprefs.c:1321
+#: src/gtkprefs.c:1278
 msgid "_Browser:"
 msgstr "羌頵���(_B):"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1288
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3312,87 +3374,87 @@
 "����(_M)鐚�\n"
 "(%s 篁h; URL)"
 
-#: src/gtkprefs.c:1352
+#: src/gtkprefs.c:1309
 msgid "Browser Options"
 msgstr "羌頵�����蕁�"
 
-#: src/gtkprefs.c:1353
+#: src/gtkprefs.c:1310
 msgid "Open new _window by default"
 msgstr "藥�莅ゆ��綣��亥���(_W)"
 
-#: src/gtkprefs.c:1368
+#: src/gtkprefs.c:1325
 msgid "Message Logs"
 msgstr "羔����ュ�"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1326
 msgid "_Log all instant messages"
 msgstr "莅医������恰�倶���(_L)"
 
-#: src/gtkprefs.c:1371
+#: src/gtkprefs.c:1328
 msgid "Log all c_hats"
 msgstr "莅医�������紊�(_H)"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1330
 msgid "Strip _HTML from logs"
 msgstr "篁��ュ�筝㊤サ�� HTML(_H)"
 
-#: src/gtkprefs.c:1376
+#: src/gtkprefs.c:1333
 msgid "System Logs"
 msgstr "膤紫��ュ�"
 
-#: src/gtkprefs.c:1377
+#: src/gtkprefs.c:1334
 msgid "Log when buddies _sign on/sign off"
 msgstr "莅医�絅遵����糸��/�糸��(_S)"
 
-#: src/gtkprefs.c:1379
+#: src/gtkprefs.c:1336
 msgid "Log when buddies become _idle/un-idle"
 msgstr "莅医�絅遵�������(_I)"
 
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1338
 msgid "Log when buddies go away/come _back"
 msgstr "莅医�絅遵���胼糸�/����(_B)"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1340
 msgid "Log your _own signons/idleness/awayness"
 msgstr "莅医�����訓���糸��/����/胼糸�(_O)"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1342
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "筝堺�筝�ソ���糸�ュ��綮阪�������ュ���篁�(_N)"
 
-#: src/gtkprefs.c:1428
+#: src/gtkprefs.c:1385
 msgid "Sound Options"
 msgstr "紕育�渇��蕁�"
 
-#: src/gtkprefs.c:1429
+#: src/gtkprefs.c:1386
 msgid "_No sounds when you log in"
 msgstr "���糸�ユ�倶��紕�(_N)"
 
-#: src/gtkprefs.c:1431
+#: src/gtkprefs.c:1388
 msgid "_Sounds while away"
 msgstr "胼糸��九�紕�(_S)"
 
-#: src/gtkprefs.c:1435
+#: src/gtkprefs.c:1392
 msgid "Sound Method"
 msgstr "紕育�恰�劫�"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1393
 msgid "_Method:"
 msgstr "�劫�(_M):"
 
-#: src/gtkprefs.c:1438
+#: src/gtkprefs.c:1395
 msgid "Console beep"
 msgstr "�у�九伾����"
 
-#: src/gtkprefs.c:1440
+#: src/gtkprefs.c:1397
 msgid "Automatic"
 msgstr "����"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1404
 msgid "Command"
 msgstr "�巡擦"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1414
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3401,67 +3463,67 @@
 "紕育�喝�巡擦(_O)鐚�\n"
 "(%s 篁h;��篁九��)"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1469
 msgid "_Sending messages removes away status"
 msgstr "����羔���葦��羔�胼糸����倶��(_S)"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1471
 msgid "_Queue new messages when away"
 msgstr "胼糸��倶���井�����ラ����(_Q)"
 
-#: src/gtkprefs.c:1517
+#: src/gtkprefs.c:1474
 msgid "Auto-response"
 msgstr "������紊�"
 
-#: src/gtkprefs.c:1520
+#: src/gtkprefs.c:1477
 msgid "Seconds before _resending:"
 msgstr "������膈���腱���(_R):"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1480
 msgid "_Send auto-response"
 msgstr "����������紊�(_S)"
 
-#: src/gtkprefs.c:1525
+#: src/gtkprefs.c:1482
 msgid "_Only send auto-response when idle"
 msgstr "篁��������≧�九���������紊�(_O)"
 
-#: src/gtkprefs.c:1527
+#: src/gtkprefs.c:1484
 msgid "Send auto-response in active conversations"
 msgstr "�����絲壕�筝㊤���������紊�"
 
-#: src/gtkprefs.c:1540
+#: src/gtkprefs.c:1497
 msgid "Idle _time reporting:"
 msgstr "���≧�狗�贋�ュ��(_T):"
 
-#: src/gtkprefs.c:1543
+#: src/gtkprefs.c:1500
 msgid "Gaim usage"
 msgstr "Gaim 篏睡��"
 
-#: src/gtkprefs.c:1546
+#: src/gtkprefs.c:1503
 msgid "X usage"
 msgstr "X 篏睡��"
 
-#: src/gtkprefs.c:1548
+#: src/gtkprefs.c:1505
 msgid "Windows usage"
 msgstr "腦��d戎��"
 
-#: src/gtkprefs.c:1556
+#: src/gtkprefs.c:1513
 msgid "Auto-away"
 msgstr "�����綣�"
 
-#: src/gtkprefs.c:1557
+#: src/gtkprefs.c:1514
 msgid "Set away _when idle"
 msgstr "���≦���活�臀��綣�(_W)"
 
-#: src/gtkprefs.c:1559
+#: src/gtkprefs.c:1516
 msgid "_Minutes before setting away:"
 msgstr "莅丞舟胼糸���膈�������(_M):"
 
-#: src/gtkprefs.c:1566
+#: src/gtkprefs.c:1523
 msgid "Away m_essage:"
 msgstr "胼糸�羔���(_E):"
 
-#: src/gtkprefs.c:1628
+#: src/gtkprefs.c:1585
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3476,7 +3538,7 @@
 "<span weight=\"bold\">臀�腴�:</span>\t\t%s\n"
 "<span weight=\"bold\">��篁九��:</span>\t%s"
 
-#: src/gtkprefs.c:1633
+#: src/gtkprefs.c:1590
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3491,97 +3553,97 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">��篁九��:</span>  %s"
 
-#: src/gtkprefs.c:1811
+#: src/gtkprefs.c:1768
 msgid "Load"
 msgstr "茖���"
 
-#: src/gtkprefs.c:1818 src/protocols/msn/msn.c:1237
+#: src/gtkprefs.c:1775 src/protocols/msn/msn.c:1283
 #: src/protocols/trepia/trepia.c:433
 msgid "Name"
 msgstr "��腱�"
 
-#: src/gtkprefs.c:1865
+#: src/gtkprefs.c:1822
 msgid "Details"
 msgstr "膸���"
 
-#: src/gtkprefs.c:1992
+#: src/gtkprefs.c:1949
 msgid "Sound Selection"
 msgstr "紕育�渇����"
 
-#: src/gtkprefs.c:2099
+#: src/gtkprefs.c:2056
 msgid "Play"
 msgstr "�㊥��"
 
-#: src/gtkprefs.c:2106
+#: src/gtkprefs.c:2063
 msgid "Event"
 msgstr "篋�篁�"
 
-#: src/gtkprefs.c:2129
+#: src/gtkprefs.c:2086
 msgid "Reset"
 msgstr "��臀�"
 
-#: src/gtkprefs.c:2133
+#: src/gtkprefs.c:2090
 msgid "Choose..."
 msgstr "����..."
 
-#: src/gtkprefs.c:2257
+#: src/gtkprefs.c:2214
 msgid "_Edit"
 msgstr "膽�莨�(_E)"
 
-#: src/gtkprefs.c:2293
+#: src/gtkprefs.c:2250
 msgid "Interface"
 msgstr "����"
 
-#: src/gtkprefs.c:2294
+#: src/gtkprefs.c:2251
 msgid "Smiley Themes"
 msgstr "膃��娯源蘂�"
 
-#: src/gtkprefs.c:2295
+#: src/gtkprefs.c:2252
 msgid "Fonts"
 msgstr "絖�篏�"
 
-#: src/gtkprefs.c:2296
+#: src/gtkprefs.c:2253
 msgid "Message Text"
 msgstr "羔�������"
 
-#: src/gtkprefs.c:2297
+#: src/gtkprefs.c:2254
 msgid "Shortcuts"
 msgstr "綽��潔��"
 
-#: src/gtkprefs.c:2300
+#: src/gtkprefs.c:2257
 msgid "IMs"
 msgstr "�恰�倶���"
 
-#: src/gtkprefs.c:2302
+#: src/gtkprefs.c:2259
 msgid "Proxy"
 msgstr "篁g��"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2305
+#: src/gtkprefs.c:2262
 msgid "Browser"
 msgstr "羌頵���"
 
-#: src/gtkprefs.c:2307
+#: src/gtkprefs.c:2264
 msgid "Logging"
 msgstr "�ュ�"
 
-#: src/gtkprefs.c:2308
+#: src/gtkprefs.c:2265
 msgid "Sounds"
 msgstr "紕育��"
 
-#: src/gtkprefs.c:2309
+#: src/gtkprefs.c:2266
 msgid "Sound Events"
 msgstr "紕育�割�篁�"
 
-#: src/gtkprefs.c:2310
+#: src/gtkprefs.c:2267
 msgid "Away / Idle"
 msgstr "胼糸�/����"
 
-#: src/gtkprefs.c:2311
+#: src/gtkprefs.c:2268
 msgid "Away Messages"
 msgstr "胼糸�羔���"
 
-#: src/gtkprefs.c:2314
+#: src/gtkprefs.c:2271
 msgid "Plugins"
 msgstr "��篁�"
 
@@ -3739,16 +3801,16 @@
 "launched: %s"
 msgstr "��羈��㊥�上0�鰹���������臀���羈�莪�����臀���紕育�喝�巡擦鐚�%s"
 
-#: src/gtkutils.c:290
+#: src/gtkutils.c:289
 msgid "Can't save icon file to disk."
 msgstr "��羈�篆�絖� 0 絖������丈����篁吟��"
 
-#: src/gtkutils.c:325
+#: src/gtkutils.c:324
 msgid "Gaim - Save Icon"
 msgstr "Gaim - 篆�絖��丈��"
 
 #. full help text
-#: src/gtkutils.c:1038
+#: src/gtkutils.c:1037
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3780,7 +3842,7 @@
 "  -h, --help          �丞ず絽���攻����\n"
 
 #. short message
-#: src/gtkutils.c:1053
+#: src/gtkutils.c:1052
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s��莚�莚���%s -h���ョ��絽�����\n"
@@ -3923,18 +3985,18 @@
 msgid "Screen Name:"
 msgstr "���桁��:"
 
-#: src/plugin.c:257
+#: src/plugin.c:258
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "������篁� %s ���上�違��絎�茖�罩ゆ�篁句�九����莚�筝�罨<��"
 
-#: src/plugin.c:262 src/plugin.c:290
+#: src/plugin.c:263 src/plugin.c:291
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ��羈�茖��ユ������篁吟��"
 
-#: src/plugin.c:286
+#: src/plugin.c:287
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "������篁� %s ��羈�茖��ャ��"
@@ -3944,10 +4006,10 @@
 msgstr "��Ⅶ��篋�"
 
 #: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1276
-#: src/protocols/msn/msn.c:335 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:1647
-#: src/protocols/yahoo/yahoo.c:1742
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1703
+#: src/protocols/yahoo/yahoo.c:1804
 msgid "Available"
 msgstr "����"
 
@@ -3960,10 +4022,10 @@
 msgstr "���絅遵�胼糸�"
 
 #: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3534
-#: src/protocols/jabber/jabber.c:3597 src/protocols/oscar/oscar.c:2844
-#: src/protocols/oscar/oscar.c:4570 src/protocols/oscar/oscar.c:4597
-#: src/protocols/oscar/oscar.c:5885 src/protocols/yahoo/yahoo.c:1369
-#: src/protocols/yahoo/yahoo.c:1669 src/protocols/yahoo/yahoo.c:1752
+#: src/protocols/jabber/jabber.c:3597 src/protocols/oscar/oscar.c:2850
+#: src/protocols/oscar/oscar.c:4589 src/protocols/oscar/oscar.c:4616
+#: src/protocols/oscar/oscar.c:5918 src/protocols/yahoo/yahoo.c:1425
+#: src/protocols/yahoo/yahoo.c:1723 src/protocols/yahoo/yahoo.c:1814
 msgid "Invisible"
 msgstr "��荳�"
 
@@ -4018,7 +4080,7 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:208
+#: src/protocols/toc/toc.c:204
 msgid "Unable to connect."
 msgstr "��羈�菴��ャ��"
 
@@ -4043,7 +4105,7 @@
 msgstr "GG 綺����渇����莚�\n"
 
 #: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:184
+#: src/protocols/toc/toc.c:180
 #, c-format
 msgid "Connect to %s failed"
 msgstr "菴��ュ�� %s 紊沿乾"
@@ -4080,7 +4142,7 @@
 msgid "Active"
 msgstr "羇肢�"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3952
+#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3964
 msgid "UIN"
 msgstr "UIN"
 
@@ -4089,7 +4151,7 @@
 msgstr "��"
 
 #: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1383
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3954
+#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3966
 msgid "Nick"
 msgstr "�窮О"
 
@@ -4241,16 +4303,16 @@
 msgstr "���� %s (%s%s%s%s%s) ��荀����������"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1806
-#: src/protocols/msn/notification.c:911 src/protocols/msn/notification.c:1230
-#: src/protocols/msn/notification.c:1396 src/protocols/oscar/oscar.c:2616
-#: src/protocols/oscar/oscar.c:5134
+#: src/protocols/msn/notification.c:924 src/protocols/msn/notification.c:1245
+#: src/protocols/msn/notification.c:1411 src/protocols/oscar/oscar.c:2622
+#: src/protocols/oscar/oscar.c:5153
 msgid "Authorize"
 msgstr "����"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1807
-#: src/protocols/msn/notification.c:912 src/protocols/msn/notification.c:1232
-#: src/protocols/msn/notification.c:1398 src/protocols/oscar/oscar.c:2618
-#: src/protocols/oscar/oscar.c:5135
+#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1247
+#: src/protocols/msn/notification.c:1413 src/protocols/oscar/oscar.c:2624
+#: src/protocols/oscar/oscar.c:5154
 msgid "Deny"
 msgstr "��靳�"
 
@@ -4310,8 +4372,8 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC �窮О筝��遵�������"
 
-#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:684
-#: src/protocols/toc/toc.c:236
+#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:686
+#: src/protocols/toc/toc.c:232
 #, c-format
 msgid "Signon: %s"
 msgstr "�糸���鐚�%s"
@@ -4373,7 +4435,7 @@
 msgid "Username"
 msgstr "���桁��"
 
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:1969
+#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:2049
 msgid "Realname"
 msgstr "����"
 
@@ -4519,24 +4581,22 @@
 
 #: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:574
 #: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:601
-#: 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:523 src/protocols/msn/msn.c:73
-#: src/protocols/msn/msn.c:93 src/protocols/msn/msn.c:151
-#: src/protocols/msn/msn.c:251 src/protocols/msn/msn.c:504
-#: src/protocols/msn/msn.c:615 src/protocols/msn/msn.c:631
-#: src/protocols/msn/msn.c:679 src/protocols/msn/msn.c:702
-#: src/protocols/msn/msn.c:734 src/protocols/msn/msn.c:742
-#: src/protocols/msn/msn.c:775 src/protocols/msn/msn.c:783
-#: src/protocols/msn/msn.c:797 src/protocols/msn/msn.c:806
-#: src/protocols/msn/msn.c:820 src/protocols/msn/msn.c:844
-#: src/protocols/msn/msn.c:894 src/protocols/msn/msn.c:932
-#: src/protocols/msn/msn.c:1029 src/protocols/msn/msn.c:1057
-#: src/protocols/msn/msn.c:1077 src/protocols/msn/msn.c:1088
-#: src/protocols/msn/msn.c:1099 src/protocols/msn/msn.c:1123
-#: src/protocols/msn/msn.c:1135 src/protocols/msn/notification.c:170
-#: src/protocols/msn/notification.c:197 src/protocols/msn/notification.c:1612
-#: src/protocols/msn/notification.c:1632 src/protocols/trepia/trepia.c:280
+#: src/protocols/msn/msn.c:75 src/protocols/msn/msn.c:95
+#: src/protocols/msn/msn.c:153 src/protocols/msn/msn.c:253
+#: src/protocols/msn/msn.c:509 src/protocols/msn/msn.c:620
+#: src/protocols/msn/msn.c:636 src/protocols/msn/msn.c:684
+#: src/protocols/msn/msn.c:707 src/protocols/msn/msn.c:739
+#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:780
+#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:802
+#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
+#: src/protocols/msn/msn.c:849 src/protocols/msn/msn.c:899
+#: src/protocols/msn/msn.c:937 src/protocols/msn/msn.c:1034
+#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1086
+#: src/protocols/msn/msn.c:1097 src/protocols/msn/msn.c:1108
+#: src/protocols/msn/msn.c:1132 src/protocols/msn/msn.c:1144
+#: src/protocols/msn/msn.c:1209 src/protocols/msn/notification.c:179
+#: src/protocols/msn/notification.c:206 src/protocols/msn/notification.c:1643
+#: src/protocols/msn/notification.c:1663 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
 #: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
 #: src/protocols/trepia/trepia.c:1263
@@ -4571,8 +4631,8 @@
 msgstr "菴�菴�胼糸�"
 
 #: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3533
-#: src/protocols/jabber/jabber.c:3593 src/protocols/oscar/oscar.c:2834
-#: src/protocols/oscar/oscar.c:4585 src/protocols/oscar/oscar.c:5881
+#: src/protocols/jabber/jabber.c:3593 src/protocols/oscar/oscar.c:2840
+#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:5914
 msgid "Do Not Disturb"
 msgstr "莚桁�炊����"
 
@@ -4623,9 +4683,9 @@
 
 #: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:2459
 #: src/protocols/jabber/jabber.c:4334 src/protocols/jabber/jabber.c:4383
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:458
-#: src/protocols/msn/notification.c:2069 src/protocols/napster/napster.c:465
-#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1248
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:463
+#: src/protocols/msn/notification.c:2100 src/protocols/napster/napster.c:465
+#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1304
 msgid "Unable to connect"
 msgstr "��羈�菴���"
 
@@ -4639,8 +4699,8 @@
 
 #. we have no chats yet
 #: src/protocols/jabber/jabber.c:2453 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:449 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1271
+#: src/protocols/msn/msn.c:454 src/protocols/napster/napster.c:489
+#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1327
 msgid "Connecting"
 msgstr "罩e�����"
 
@@ -4688,7 +4748,7 @@
 msgstr "�倶��"
 
 #: src/protocols/jabber/jabber.c:3440 src/protocols/jabber/jabber.c:3462
-#: src/protocols/oscar/oscar.c:5496
+#: src/protocols/oscar/oscar.c:5527
 msgid "Not Authorized"
 msgstr "���莚�"
 
@@ -4708,7 +4768,7 @@
 msgid "Cancel Presence Notification"
 msgstr "��羔�����������"
 
-#: src/protocols/jabber/jabber.c:3516 src/protocols/oscar/oscar.c:5942
+#: src/protocols/jabber/jabber.c:3516
 msgid "Re-request authorization"
 msgstr "���域�羆�莅よ�"
 
@@ -4724,7 +4784,7 @@
 msgid "Given Name"
 msgstr "��"
 
-#: src/protocols/jabber/jabber.c:3722 src/protocols/yahoo/yahoo.c:1965
+#: src/protocols/jabber/jabber.c:3722 src/protocols/yahoo/yahoo.c:2045
 msgid "Nickname"
 msgstr "�窮О"
 
@@ -4768,7 +4828,7 @@
 msgid "Role"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:3736 src/protocols/oscar/oscar.c:3986
+#: src/protocols/jabber/jabber.c:3736 src/protocols/oscar/oscar.c:3998
 msgid "Birthday"
 msgstr "����"
 
@@ -4821,20 +4881,20 @@
 msgid "Connect server"
 msgstr "菴��ユ���≦��"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:268
-#: src/protocols/msn/notification.c:489
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:277
+#: src/protocols/msn/notification.c:498
 msgid "Unable to request USR\n"
 msgstr "��羈�莚傑� USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:285
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:294
 msgid "Unable to login using MD5"
 msgstr "��羈�篏睡�� MD5 �糸��"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:294
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:303
 msgid "Unable to send USR"
 msgstr "��羈����� USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:299
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:308
 msgid "Requesting to send password"
 msgstr "罩e���羆�����絲���"
 
@@ -4842,15 +4902,15 @@
 msgid "Protocol version not supported"
 msgstr "�顒����������"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:747
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:760
 msgid "Unable to request CVR\n"
 msgstr "��羈�莚傑� CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:756
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:769
 msgid "Unable to request INF\n"
 msgstr "��羈�莚傑� INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1846
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1877
 msgid "Got invalid XFR"
 msgstr "緇��井������ XFR"
 
@@ -4862,16 +4922,16 @@
 msgid "Unable to parse message."
 msgstr "��羈�紊���羔�����"
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:852
-#: src/protocols/msn/notification.c:2091
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:865
+#: src/protocols/msn/notification.c:2122
 msgid "Unable to write to server"
 msgstr "��羈����ユ���≦����"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2098
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2129
 msgid "Syncing with server"
 msgstr "罩e������≦����罩�"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2112
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2143
 msgid "Error reading from server"
 msgstr "篁����≦������九�咲��"
 
@@ -4927,150 +4987,187 @@
 msgid "Already in opposite list"
 msgstr "綏峨���後���茵�"
 
-#: src/protocols/msn/error.c:75
-msgid "Tried to add a contact to a group that doesn't exist"
-msgstr "莚��上��筝�絖�����膸�筝㊥兄����膤私査"
-
-#: src/protocols/msn/error.c:79
-msgid "Switchboard failed"
-msgstr "���∽�水け茣�"
-
-#: src/protocols/msn/error.c:82
-msgid "Notify Transfer failed"
-msgstr "���ヤ���紊沿乾"
+#: src/protocols/msn/error.c:74
+msgid "Too many groups"
+msgstr "膸�紊��"
+
+#: src/protocols/msn/error.c:77
+msgid "Invalid group"
+msgstr "������膸�"
+
+#: src/protocols/msn/error.c:80
+msgid "User not in group"
+msgstr "���傑�����筝�"
+
+#: src/protocols/msn/error.c:83
+msgid "Group name too long"
+msgstr "膸���紊���"
 
 #: src/protocols/msn/error.c:86
+msgid "Cannot remove group zero"
+msgstr "��羈����ら�句�"
+
+#: src/protocols/msn/error.c:90
+msgid "Tried to add a contact to a group that doesn't exist"
+msgstr "莚��上��筝�絖�����膸�筝㊥兄����膤私査"
+
+#: src/protocols/msn/error.c:94
+msgid "Switchboard failed"
+msgstr "���∽�水け茣�"
+
+#: src/protocols/msn/error.c:97
+msgid "Notify Transfer failed"
+msgstr "���ヤ���紊沿乾"
+
+#: src/protocols/msn/error.c:101
 msgid "Required fields missing"
 msgstr "膽阪�綽�蕁糸��"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:183
+#: src/protocols/msn/error.c:104
+msgid "Too many hits to a FND"
+msgstr "FND ��罨≧�医お紊�"
+
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
 msgid "Not logged in"
 msgstr "���糸��"
 
-#: src/protocols/msn/error.c:93
+#: src/protocols/msn/error.c:111
 msgid "Internal server error"
 msgstr "�������≦����莚�"
 
-#: src/protocols/msn/error.c:96
+#: src/protocols/msn/error.c:114
 msgid "Database server error"
 msgstr "�井������≦����莚�"
 
-#: src/protocols/msn/error.c:99
+#: src/protocols/msn/error.c:117
 msgid "File operation error"
 msgstr "��篁倶��篏���莚�"
 
-#: src/protocols/msn/error.c:102
+#: src/protocols/msn/error.c:120
 msgid "Memory allocation error"
 msgstr "��絖�������莚�"
 
-#: src/protocols/msn/error.c:105
+#: src/protocols/msn/error.c:123
 msgid "Wrong CHL value sent to server"
 msgstr "膸����≦������� CHL �守��莚�"
 
-#: src/protocols/msn/error.c:109
+#: src/protocols/msn/error.c:127
 msgid "Server busy"
 msgstr "���≦���"
 
-#: src/protocols/msn/error.c:112
+#: src/protocols/msn/error.c:130 src/protocols/msn/error.c:143
+#: src/protocols/msn/error.c:198
 msgid "Server unavailable"
 msgstr "���≦�������"
 
-#: src/protocols/msn/error.c:115
+#: src/protocols/msn/error.c:133
 msgid "Peer Notification server down"
 msgstr "�拷���ユ���≦��惨�や賢"
 
-#: src/protocols/msn/error.c:118
+#: src/protocols/msn/error.c:136
 msgid "Database connect error"
 msgstr "�井���菴��ラ��莚�"
 
-#: src/protocols/msn/error.c:122
+#: src/protocols/msn/error.c:140
 msgid "Server is going down (abandon ship)"
 msgstr "���≦���喝�膸贋��"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:147
 msgid "Error creating connection"
 msgstr "��綮肴��ュ�咲��"
 
-#: src/protocols/msn/error.c:130
+#: src/protocols/msn/error.c:151
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR ���井���ユ��筝���莅�"
 
-#: src/protocols/msn/error.c:133 src/protocols/msn/notification.c:599
-#: src/protocols/msn/notification.c:1243 src/protocols/msn/notification.c:1411
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:612
+#: src/protocols/msn/notification.c:1258 src/protocols/msn/notification.c:1426
 msgid "Unable to write"
 msgstr "��羈�����"
 
-#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:157
 msgid "Session overload"
 msgstr "篌�莚�菴�莉�"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:160
 msgid "User is too active"
 msgstr "���桁お羇肢�"
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:163
 msgid "Too many sessions"
 msgstr "篌�莚�紊��"
 
-#: src/protocols/msn/error.c:145
+#: src/protocols/msn/error.c:166 src/protocols/msn/error.c:172
 msgid "Not expected"
 msgstr "����緇�"
 
-#: src/protocols/msn/error.c:148
+#: src/protocols/msn/error.c:169
 msgid "Bad friend file"
 msgstr "������絅遵���篁�"
 
-#: src/protocols/msn/error.c:152 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:666
+#: src/protocols/msn/error.c:177
+msgid "Friendly name changes too rapidly"
+msgstr "��絅順����腱井�贋�劫お蘂�膵�"
+
+#: src/protocols/msn/error.c:186
+msgid "Server too busy"
+msgstr "���≦��お綽�"
+
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1087
+#: src/protocols/toc/toc.c:662
 msgid "Authentication failed"
 msgstr "莅よ�紊沿乾"
 
-#: src/protocols/msn/error.c:155
+#: src/protocols/msn/error.c:193
 msgid "Not allowed when offline"
 msgstr "胼紫鎖�銀���莅�"
 
-#: src/protocols/msn/error.c:158
+#: src/protocols/msn/error.c:201
 msgid "Not accepting new users"
 msgstr "筝��ュ��亥����"
 
-#: src/protocols/msn/error.c:162
+#: src/protocols/msn/error.c:205
+msgid "Kids Passport without parental consent"
+msgstr "羃≧���倶������睡� Passport"
+
+#: src/protocols/msn/error.c:209
 msgid "Passport account not yet verified"
 msgstr "Passport 茣��傑���莚�"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:213
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "���ョ����莚�撮�� %d"
 
-#: src/protocols/msn/msn.c:61
+#: src/protocols/msn/msn.c:63
 msgid "Your new MSN friendly name is too long."
 msgstr "�亥�� MSN ��絅遵��腱医お�帥��"
 
-#: src/protocols/msn/msn.c:168
+#: src/protocols/msn/msn.c:170
 msgid "Set your friendly name."
 msgstr "莅丞舟������絅遵��腱違��"
 
-#: src/protocols/msn/msn.c:169
+#: src/protocols/msn/msn.c:171
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "菴����銀��� MSN 絅遵����亥����絖���"
 
-#: src/protocols/msn/msn.c:181
+#: src/protocols/msn/msn.c:183
 msgid "Set your home phone number."
 msgstr "莅丞舟����絎九梱�笈��欠����"
 
-#: src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:194
 msgid "Set your work phone number."
 msgstr "莅丞舟����綏ヤ��笈��欠����"
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:205
 msgid "Set your mobile phone number."
 msgstr "莅丞舟����腱糸���笈��欠����"
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:214
 msgid "Allow MSN Mobile pages?"
 msgstr "��莅� MSN 腱糸����弱��鐚�"
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:215
 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?"
@@ -5078,94 +5175,94 @@
 "��������莅娯�筝�鐚�����絅遵���札膸�����腱糸���笈����九�腱糸���紊����� MSN 腱糸����若����"
 "�活���莅梧����罩∵�筝����緒�"
 
-#: src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:219
 msgid "Allow"
 msgstr "��莅�"
 
-#: src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:220
 msgid "Disallow"
 msgstr "胼�罩�"
 
-#: src/protocols/msn/msn.c:235
+#: src/protocols/msn/msn.c:237
 msgid "Send a mobile message."
 msgstr "����腱糸�������"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:239
 msgid "Page"
 msgstr "絲糸��"
 
-#: src/protocols/msn/msn.c:323 src/protocols/yahoo/yahoo.c:1485
+#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1541
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>�倶��:</b> %s"
 
-#: src/protocols/msn/msn.c:336 src/protocols/msn/msn.c:591
+#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:596
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "菴�胼紫�笈��"
 
-#: src/protocols/msn/msn.c:337 src/protocols/msn/msn.c:593
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1351
-#: src/protocols/yahoo/yahoo.c:1651 src/protocols/yahoo/yahoo.c:1743
+#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:598
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1407
+#: src/protocols/yahoo/yahoo.c:1705 src/protocols/yahoo/yahoo.c:1805
 msgid "Be Right Back"
 msgstr "薊������"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:595
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1353
-#: src/protocols/yahoo/yahoo.c:1653 src/protocols/yahoo/yahoo.c:1744
+#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:600
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1409
+#: src/protocols/yahoo/yahoo.c:1707 src/protocols/yahoo/yahoo.c:1806
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:597
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1361
-#: src/protocols/yahoo/yahoo.c:1661 src/protocols/yahoo/yahoo.c:1748
+#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:602
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1417
+#: src/protocols/yahoo/yahoo.c:1715 src/protocols/yahoo/yahoo.c:1810
 msgid "On The Phone"
 msgstr "�ュ���笈�"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:599
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1365
-#: src/protocols/yahoo/yahoo.c:1665 src/protocols/yahoo/yahoo.c:1750
+#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:604
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1421
+#: src/protocols/yahoo/yahoo.c:1719 src/protocols/yahoo/yahoo.c:1812
 msgid "Out To Lunch"
 msgstr "紊��阪葦蕕�"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:601
+#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:606
 #: src/protocols/zephyr/zephyr.c:869 src/protocols/zephyr/zephyr.c:884
 msgid "Hidden"
 msgstr "��荳�"
 
-#: src/protocols/msn/msn.c:353
+#: src/protocols/msn/msn.c:355
 msgid "Set Friendly Name"
 msgstr "莅丞舟��絅順����腱�"
 
-#: src/protocols/msn/msn.c:361
+#: src/protocols/msn/msn.c:363
 msgid "Set Home Phone Number"
 msgstr "莅丞舟絎九梱�笈��欠��"
 
-#: src/protocols/msn/msn.c:367
+#: src/protocols/msn/msn.c:369
 msgid "Set Work Phone Number"
 msgstr "莅丞舟綏ヤ��笈��欠��"
 
-#: src/protocols/msn/msn.c:373
+#: src/protocols/msn/msn.c:375
 msgid "Set Mobile Phone Number"
 msgstr "莅丞舟腱糸���笈��欠��"
 
-#: src/protocols/msn/msn.c:382
+#: src/protocols/msn/msn.c:384
 msgid "Enable/Disable Mobile Devices"
 msgstr "����/胼���Щ���紊�"
 
-#: src/protocols/msn/msn.c:389
+#: src/protocols/msn/msn.c:391
 msgid "Allow/Disallow Mobile Pages"
 msgstr "��莅�/胼�罩∝Щ�����"
 
-#: src/protocols/msn/msn.c:412
+#: src/protocols/msn/msn.c:417
 msgid "Send to Mobile"
 msgstr "�����亥Щ���紊�"
 
-#: src/protocols/msn/msn.c:421
+#: src/protocols/msn/msn.c:426
 msgid "Initiate Chat"
 msgstr "菴��ヨ��紊��"
 
-#: src/protocols/msn/msn.c:715
+#: src/protocols/msn/msn.c:720
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5174,11 +5271,11 @@
 "MSN ���桁�����弱�綽�蕁紙����user@server.com�������醇��������� %s@hotmail.com������"
 "��莅後��茵����篁私��贋�鴻��"
 
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:759
+#: src/protocols/msn/msn.c:724 src/protocols/msn/msn.c:764
 msgid "Invalid MSN screenname"
 msgstr "������ MSN ���桁��"
 
-#: src/protocols/msn/msn.c:755
+#: src/protocols/msn/msn.c:760
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5187,63 +5284,63 @@
 "MSN ���桁�����弱�綽�蕁紙����user@server.com�������醇��������� %s@hotmail.com������"
 "絮�恖��茵����篁私��贋�鴻��"
 
-#: src/protocols/msn/msn.c:1193 src/protocols/yahoo/yahoo.c:1895
+#: src/protocols/msn/msn.c:1227 src/protocols/yahoo/yahoo.c:1975
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>�桁�筝�査莎����咲��</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1241 src/protocols/oscar/oscar.c:3991
+#: src/protocols/msn/msn.c:1287 src/protocols/oscar/oscar.c:4003
 #: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
-#: src/protocols/yahoo/yahoo.c:1977
+#: src/protocols/yahoo/yahoo.c:2057
 msgid "Age"
 msgstr "綛顔�"
 
 #. Gender
-#: src/protocols/msn/msn.c:1245 src/protocols/oscar/oscar.c:3977
+#: src/protocols/msn/msn.c:1291 src/protocols/oscar/oscar.c:3989
 #: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
-#: src/protocols/yahoo/yahoo.c:1985
+#: src/protocols/yahoo/yahoo.c:2065
 msgid "Gender"
 msgstr "�у��"
 
-#: src/protocols/msn/msn.c:1249 src/protocols/yahoo/yahoo.c:1981
+#: src/protocols/msn/msn.c:1295 src/protocols/yahoo/yahoo.c:2061
 msgid "Marital Status"
 msgstr "紿�紮紫�九��"
 
-#: src/protocols/msn/msn.c:1253 src/protocols/yahoo/yahoo.c:1973
+#: src/protocols/msn/msn.c:1299 src/protocols/yahoo/yahoo.c:2053
 msgid "Location"
 msgstr "篏�臀�"
 
-#: src/protocols/msn/msn.c:1257 src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/msn/msn.c:1303 src/protocols/yahoo/yahoo.c:2069
 msgid "Occupation"
 msgstr "��筝�"
 
-#: src/protocols/msn/msn.c:1267 src/protocols/msn/msn.c:1269
-#: src/protocols/msn/msn.c:1271 src/protocols/msn/msn.c:1273
-#: src/protocols/msn/msn.c:1275
+#: src/protocols/msn/msn.c:1316 src/protocols/msn/msn.c:1323
+#: src/protocols/msn/msn.c:1331 src/protocols/msn/msn.c:1339
+#: src/protocols/msn/msn.c:1346
 msgid "A Little About Me"
 msgstr "����篁�膸�"
 
-#: src/protocols/msn/msn.c:1279 src/protocols/msn/msn.c:1283
-#: src/protocols/msn/msn.c:1285
+#: src/protocols/msn/msn.c:1352 src/protocols/msn/msn.c:1365
+#: src/protocols/msn/msn.c:1372
 msgid "Favorite Things"
 msgstr "�区��"
 
-#: src/protocols/msn/msn.c:1289 src/protocols/msn/msn.c:1291
-#: src/protocols/msn/msn.c:1293
+#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1385
+#: src/protocols/msn/msn.c:1392
 msgid "Hobbies and Interests"
 msgstr "��絅遵���頑僑"
 
-#: src/protocols/msn/msn.c:1297 src/protocols/msn/msn.c:1299
-#: src/protocols/yahoo/yahoo.c:2009
+#: src/protocols/msn/msn.c:1398 src/protocols/msn/msn.c:1404
+#: src/protocols/yahoo/yahoo.c:2089
 msgid "Favorite Quote"
 msgstr "�取�"
 
-#: src/protocols/msn/msn.c:1303 src/protocols/yahoo/yahoo.c:2038
+#: src/protocols/msn/msn.c:1409 src/protocols/yahoo/yahoo.c:2118
 msgid "Last Updated"
 msgstr "筝�罨≧�贋��"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1308 src/protocols/trepia/trepia.c:321
+#: src/protocols/msn/msn.c:1416 src/protocols/trepia/trepia.c:321
 #: src/protocols/trepia/trepia.c:489
 msgid "Homepage"
 msgstr "筝脂ゝ"
@@ -5258,82 +5355,82 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1393 src/protocols/msn/msn.c:1395
+#: src/protocols/msn/msn.c:1504 src/protocols/msn/msn.c:1506
 msgid "MSN Protocol Plugin"
 msgstr "MSN �顒��篁�"
 
-#: src/protocols/msn/msn.c:1412 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1523 src/protocols/trepia/trepia.c:1371
 msgid "Login server"
 msgstr "�糸����≦��"
 
-#: src/protocols/msn/notification.c:237
+#: src/protocols/msn/notification.c:246
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN ��莚��%s\n"
 
-#: src/protocols/msn/notification.c:353 src/protocols/msn/notification.c:514
+#: src/protocols/msn/notification.c:362 src/protocols/msn/notification.c:523
 msgid "Unable to write to MSN Nexus server."
 msgstr "��羈����� MSN Nexus ���≦����"
 
-#: src/protocols/msn/notification.c:362 src/protocols/msn/notification.c:525
+#: src/protocols/msn/notification.c:371 src/protocols/msn/notification.c:538
 msgid "Unable to read from MSN Nexus server."
 msgstr "��羈�篁� MSN Nexus ���≦�������"
 
-#: src/protocols/msn/notification.c:382
+#: src/protocols/msn/notification.c:391
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Nexus ���≦�����篋���������絎���篆≧����"
 
-#: src/protocols/msn/notification.c:428
+#: src/protocols/msn/notification.c:437
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "莚��乗�莚� MSN �糸����≦���九���篋����ラ��莚���"
 
-#: src/protocols/msn/notification.c:536
+#: src/protocols/msn/notification.c:549
 msgid "MSN Nexus server returned invalid information."
 msgstr "MSN Nexus ���≦�����篋�������篆≧����"
 
-#: src/protocols/msn/notification.c:604 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/notification.c:617 src/protocols/trepia/trepia.c:718
 msgid "Retrieving buddy list"
 msgstr "罩e��キ��絅遵���茵�"
 
-#: src/protocols/msn/notification.c:666
+#: src/protocols/msn/notification.c:679
 msgid "Unable to connect to passport server"
 msgstr "��羈�菴��ュ�� Passport ���≦��"
 
-#: src/protocols/msn/notification.c:671 src/protocols/msn/notification.c:703
+#: src/protocols/msn/notification.c:684 src/protocols/msn/notification.c:716
 msgid "Password sent"
 msgstr "絲���綏臥����"
 
-#: src/protocols/msn/notification.c:698
+#: src/protocols/msn/notification.c:711
 msgid "Unable to send password"
 msgstr "��羈�����絲���"
 
-#: src/protocols/msn/notification.c:734
+#: src/protocols/msn/notification.c:747
 msgid "Protocol not supported"
 msgstr "�顒������"
 
-#: src/protocols/msn/notification.c:776
+#: src/protocols/msn/notification.c:789
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "��群膸頮��㊤��������������九�篏�臀���④���桁���糸�ヤ���"
 
-#: src/protocols/msn/notification.c:781
+#: src/protocols/msn/notification.c:794
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "��群膸頮��㊤���MSN ���≦������膸贋�や賢��"
 
-#: src/protocols/msn/notification.c:907
+#: src/protocols/msn/notification.c:920
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "���� %s(%s) �活�絨� %s 羞糸��筝阪ソ����"
 
-#: src/protocols/msn/notification.c:1224 src/protocols/msn/notification.c:1390
+#: src/protocols/msn/notification.c:1239 src/protocols/msn/notification.c:1405
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "���� %s(%s) �活�絨���兄��筝阪ソ����"
 
-#: src/protocols/msn/notification.c:1888
+#: src/protocols/msn/notification.c:1919
 msgid "Unable to transfer to notification server"
 msgstr "��羈�篌����育���ユ���≦����"
 
-#: src/protocols/msn/notification.c:2032
+#: src/protocols/msn/notification.c:2063
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5355,16 +5452,16 @@
 "\n"
 "膸贋�ゅ����������遵������糸�ャ��"
 
-#: src/protocols/msn/switchboard.c:145
+#: src/protocols/msn/switchboard.c:147
 msgid "The conversation has become inactive and timed out."
 msgstr "絲壕�綏峨��罩√攻莇��吟��"
 
-#: src/protocols/msn/switchboard.c:152
+#: src/protocols/msn/switchboard.c:154
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s 綏牙��渇�℡�絲壕�腦��c��"
 
-#: src/protocols/msn/switchboard.c:274
+#: src/protocols/msn/switchboard.c:277
 msgid "An MSN message may not have been received."
 msgstr "MSN 羔�����醇押���九�違��"
 
@@ -5410,8 +5507,8 @@
 msgid "%s requested a PING"
 msgstr "%s 莚傑� PING"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5205
-#: src/protocols/toc/toc.c:1241
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5224
+#: src/protocols/toc/toc.c:1261
 msgid "Join what group:"
 msgstr "���ョ�:"
 
@@ -5429,174 +5526,174 @@
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER �顒��篁�"
 
-#: src/protocols/oscar/oscar.c:179
+#: src/protocols/oscar/oscar.c:181
 msgid "Invalid error"
 msgstr "������莚�"
 
-#: src/protocols/oscar/oscar.c:180
+#: src/protocols/oscar/oscar.c:182
 msgid "Invalid SNAC"
 msgstr "���� SNAC"
 
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:183
 msgid "Rate to host"
 msgstr "筝紙�榊�膾�"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:184
 msgid "Rate to client"
 msgstr "絎∽�欠�膾�"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:186
 msgid "Service unavailable"
 msgstr "���>�����"
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:187
 msgid "Service not defined"
 msgstr "���≧���箙�"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:188
 msgid "Obsolete SNAC"
 msgstr "綺��� SNAC"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:189
 msgid "Not supported by host"
 msgstr "筝紙�坂�����"
 
-#: src/protocols/oscar/oscar.c:188
+#: src/protocols/oscar/oscar.c:190
 msgid "Not supported by client"
 msgstr "絎∽�隙�����"
 
-#: src/protocols/oscar/oscar.c:189
+#: src/protocols/oscar/oscar.c:191
 msgid "Refused by client"
 msgstr "絎∽�傑��膸�"
 
-#: src/protocols/oscar/oscar.c:190
-msgid "Reply too big"
-msgstr "��紊�紊�ぇ"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Responses lost"
-msgstr "��綺�筝√け"
-
 #: src/protocols/oscar/oscar.c:192
-msgid "Request denied"
-msgstr "莚傑�茴��罩�"
+msgid "Reply too big"
+msgstr "��紊�紊�ぇ"
 
 #: src/protocols/oscar/oscar.c:193
+msgid "Responses lost"
+msgstr "��綺�筝√け"
+
+#: src/protocols/oscar/oscar.c:194
+msgid "Request denied"
+msgstr "莚傑�茴��罩�"
+
+#: src/protocols/oscar/oscar.c:195
 msgid "Busted SNAC payload"
 msgstr "SNAC ����茣�莉醇�紜�"
 
-#: src/protocols/oscar/oscar.c:194
+#: src/protocols/oscar/oscar.c:196
 msgid "Insufficient rights"
 msgstr "����筝�紊�"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:197
 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 "���隙鹸�銀�����"
+msgid "Too evil (sender)"
+msgstr "紊�����(������)"
 
 #: src/protocols/oscar/oscar.c:199
-msgid "No match"
-msgstr "���拷��"
+msgid "Too evil (receiver)"
+msgstr "紊�����(�ユ�区��)"
 
 #: src/protocols/oscar/oscar.c:200
-msgid "List overflow"
-msgstr "��茵�頃��"
+msgid "User temporarily unavailable"
+msgstr "���隙鹸�銀�����"
 
 #: src/protocols/oscar/oscar.c:201
+msgid "No match"
+msgstr "���拷��"
+
+#: src/protocols/oscar/oscar.c:202
+msgid "List overflow"
+msgstr "��茵�頃��"
+
+#: src/protocols/oscar/oscar.c:203
 msgid "Request ambiguous"
 msgstr "莚傑����"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:204
 msgid "Queue full"
 msgstr "����羯�"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:205
 msgid "Not while on AOL"
 msgstr "筝�篏�篋� AOL 筝�"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:477
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "筝� %s ��篋�篋坂���綏峨�渇��"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:479
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "筝� %s ��篋�篋坂���紊沿乾"
 
-#: src/protocols/oscar/oscar.c:536 src/protocols/toc/toc.c:226
-#: src/protocols/toc/toc.c:632 src/protocols/toc/toc.c:648
-#: src/protocols/toc/toc.c:716
+#: src/protocols/oscar/oscar.c:538 src/protocols/toc/toc.c:222
+#: src/protocols/toc/toc.c:628 src/protocols/toc/toc.c:644
+#: src/protocols/toc/toc.c:712
 msgid "Disconnected."
 msgstr "綏我�㊤�菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:548 src/protocols/toc/toc.c:892
+#: src/protocols/oscar/oscar.c:550 src/protocols/toc/toc.c:888
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膸���筝���紊�� %s ��菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:564
+#: src/protocols/oscar/oscar.c:566
 msgid "Chat is currently unavailable"
 msgstr "��紊�����筝�����"
 
-#: src/protocols/oscar/oscar.c:638 src/protocols/oscar/oscar.c:695
+#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:697
 msgid "Couldn't connect to host"
 msgstr "��羈�菴��ュ�遺源��"
 
-#: src/protocols/oscar/oscar.c:680
+#: src/protocols/oscar/oscar.c:682
 msgid "Unable to login to AIM"
 msgstr "��羈��糸�� AIM"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:791 src/protocols/oscar/oscar.c:1178
 msgid "Could Not Connect"
 msgstr "��羈�菴���"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:798
 msgid "Connection established, cookie sent"
 msgstr "菴��ュ群綮榊�鐚�綏峨��� cookie"
 
-#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:865 src/protocols/oscar/oscar.c:878
+#: src/protocols/oscar/oscar.c:883
 msgid "File Transfer Aborted"
 msgstr "��篁銀���筝㊥②"
 
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:866
 msgid "Unable to establish listener socket."
 msgstr "��羈�綮榊�������ュ���"
 
-#: src/protocols/oscar/oscar.c:877
+#: src/protocols/oscar/oscar.c:879
 msgid "Unable to establish file descriptor."
 msgstr "��羈�綮榊���篁倶�菴亥���"
 
-#: src/protocols/oscar/oscar.c:882
+#: src/protocols/oscar/oscar.c:884
 msgid "Unable to create new connection."
 msgstr "��羈���綮堺�域��ャ��"
 
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:578
+#: src/protocols/oscar/oscar.c:1064 src/protocols/toc/toc.c:574
 msgid "Incorrect nickname or password."
 msgstr "�窮О��絲���筝�絲鴻��"
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1069
 msgid "Your account is currently suspended."
 msgstr "����茣��決←������"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1073
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL �恰�狗��莅����≧���銀�������"
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1078
 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."
@@ -5604,17 +5701,17 @@
 "����ュ���㊤�緇�紊��膵���莚欠�������鐚��九����莚�筝�罨<��絋�����薩膸㊨��莚�鐚�������狗�翫�"
 "�恔��顔�帥��"
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1083
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "��戎����絎∽�欠����お����莚桁�� %s ��膾�"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1115
 msgid "Internal Error"
 msgstr "������莚�"
 
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1217 src/protocols/oscar/oscar.c:1247
+#: src/protocols/oscar/oscar.c:1335
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5622,29 +5719,29 @@
 msgstr ""
 "���喝�茴��㊤�������醇�活�篏睡�� TOC �翫�域�筝����茴�信罩c��莚傑��� %s 筝����贋�違��"
 
-#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1220 src/protocols/oscar/oscar.c:1250
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim ��羈��桁������� AIM �糸�����"
 
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1338
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim ��羈��桁��������糸�����"
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5596
+#: src/protocols/oscar/oscar.c:1918 src/protocols/oscar/oscar.c:5627
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "筝� %s ��篋�篋坂���綏峨産腴�"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2247 src/protocols/oscar/oscar.c:2269
 msgid "(There was an error receiving this message)"
 msgstr "(�ユ�倶④羔����咲��)"
 
-#: src/protocols/oscar/oscar.c:2410
+#: src/protocols/oscar/oscar.c:2416
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����莚傑��� %s 篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:2413
+#: src/protocols/oscar/oscar.c:2419
 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 "
@@ -5653,46 +5750,46 @@
 "�医����荀���犬�域�膊��坂��翫産腴��贋・菴��ワ�菴�絲剛��恰�銀����上����荀�����篏����絨���"
 "�我���� IP �医��鐚���篁ュ��初����羹�������腱�蕋�����"
 
-#: src/protocols/oscar/oscar.c:2418 src/protocols/oscar/oscar.c:5757
+#: src/protocols/oscar/oscar.c:2424 src/protocols/oscar/oscar.c:5790
 msgid "Connect"
 msgstr "菴���"
 
-#: src/protocols/oscar/oscar.c:2445
+#: src/protocols/oscar/oscar.c:2451
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "莚桁�����鎞������ュソ����"
 
-#: src/protocols/oscar/oscar.c:2453
+#: src/protocols/oscar/oscar.c:2459
 msgid "Authorization Request Message:"
 msgstr "莅よ�莚傑�羔���:"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2460
 msgid "Please authorize me!"
 msgstr "莚桁�����鎞������ュソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:2482
+#: src/protocols/oscar/oscar.c:2488
 #, 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:2487 src/protocols/oscar/oscar.c:2489
+#: src/protocols/oscar/oscar.c:2493 src/protocols/oscar/oscar.c:2495
 msgid "Request Authorization"
 msgstr "莚傑�莅よ�"
 
-#: src/protocols/oscar/oscar.c:2525 src/protocols/oscar/oscar.c:2527
-#: src/protocols/oscar/oscar.c:2534 src/protocols/oscar/oscar.c:2606
-#: src/protocols/oscar/oscar.c:2626 src/protocols/oscar/oscar.c:3001
-#: src/protocols/oscar/oscar.c:3053 src/protocols/oscar/oscar.c:5126
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:2531 src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2540 src/protocols/oscar/oscar.c:2612
+#: src/protocols/oscar/oscar.c:2632 src/protocols/oscar/oscar.c:3007
+#: src/protocols/oscar/oscar.c:3059 src/protocols/oscar/oscar.c:5145
+#: src/protocols/oscar/oscar.c:5191
 msgid "No reason given."
 msgstr "羃≧��膸��榊���宴��"
 
-#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2539
 msgid "Authorization Denied Message:"
 msgstr "莅よ���膸�羔���:"
 
-#: src/protocols/oscar/oscar.c:2606
+#: src/protocols/oscar/oscar.c:2612
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5701,11 +5798,11 @@
 "���� %u �活�絨�����筝坂�/絅合��絅遵�鐚����怨�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2614 src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:2620 src/protocols/oscar/oscar.c:5151
 msgid "Authorization Request"
 msgstr "莅よ�莚傑�"
 
-#: src/protocols/oscar/oscar.c:2626
+#: src/protocols/oscar/oscar.c:2632
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -5715,17 +5812,17 @@
 "���� %u ��膸�篋����篁�/絅劫��筝阪ソ����莚傑�鐚�����絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2633
 msgid "ICQ authorization denied."
 msgstr "ICQ 莚傑�莅よ�茴���膸���"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2634
+#: src/protocols/oscar/oscar.c:2640
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "���� %u ������篁�/絅劫��筝阪ソ����"
 
-#: src/protocols/oscar/oscar.c:2642
+#: src/protocols/oscar/oscar.c:2648
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -5738,7 +5835,7 @@
 "���坂査鐚�%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2650
+#: src/protocols/oscar/oscar.c:2656
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5751,7 +5848,7 @@
 "���坂査鐚�%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2658
+#: src/protocols/oscar/oscar.c:2664
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5764,32 +5861,32 @@
 "��絎号���\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2679
+#: src/protocols/oscar/oscar.c:2685
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr "ICQ ���� %u 膸������篋�筝�筝���膤私査鐚�%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2685
+#: src/protocols/oscar/oscar.c:2691
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "�������活�絨�罩よ��膤私査��筝阪ソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:2689
+#: src/protocols/oscar/oscar.c:2695
 msgid "Decline"
 msgstr "��膸�"
 
-#: src/protocols/oscar/oscar.c:2771
+#: src/protocols/oscar/oscar.c:2777
 #, 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:2780
+#: src/protocols/oscar/oscar.c:2786
 #, 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:2789
+#: src/protocols/oscar/oscar.c:2795
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -5797,163 +5894,167 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧����������松�遺�膈�膾ч���吟��"
 
-#: src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:2804
 #, 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:2807
+#: src/protocols/oscar/oscar.c:2813
 #, 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:2816
+#: src/protocols/oscar/oscar.c:2822
 #, 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:2832 src/protocols/oscar/oscar.c:4594
-#: src/protocols/oscar/oscar.c:5884
+#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:5917
 msgid "Free For Chat"
 msgstr "��篋��画��"
 
-#: src/protocols/oscar/oscar.c:2836 src/protocols/oscar/oscar.c:4588
-#: src/protocols/oscar/oscar.c:5882
+#: src/protocols/oscar/oscar.c:2842 src/protocols/oscar/oscar.c:4607
+#: src/protocols/oscar/oscar.c:5915
 msgid "Not Available"
 msgstr "筝�����"
 
-#: src/protocols/oscar/oscar.c:2838 src/protocols/oscar/oscar.c:4591
-#: src/protocols/oscar/oscar.c:5883
+#: src/protocols/oscar/oscar.c:2844 src/protocols/oscar/oscar.c:4610
+#: src/protocols/oscar/oscar.c:5916
 msgid "Occupied"
 msgstr "��篋�膽�荳�"
 
-#: src/protocols/oscar/oscar.c:2842
+#: src/protocols/oscar/oscar.c:2848
 msgid "Web Aware"
 msgstr "臀�筝�����"
 
-#: src/protocols/oscar/oscar.c:2902
+#: src/protocols/oscar/oscar.c:2908
 #, 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:2904
+#: src/protocols/oscar/oscar.c:2910
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>�倶��:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2963
+#: src/protocols/oscar/oscar.c:2969
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ���咲��莚��%s\n"
 
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2970
 msgid "Unknown error"
 msgstr "���ラ��莚�"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2999
+#: src/protocols/oscar/oscar.c:3005
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "��� %s ��羔��������:"
 
-#: src/protocols/oscar/oscar.c:3051
+#: src/protocols/oscar/oscar.c:3057
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s �����隙拭�����:"
 
-#: src/protocols/oscar/oscar.c:3088
+#: src/protocols/oscar/oscar.c:3094
 msgid "Voice"
 msgstr "莚㊨��"
 
-#: src/protocols/oscar/oscar.c:3091 src/protocols/oscar/oscar.c:5913
+#: src/protocols/oscar/oscar.c:3097 src/protocols/oscar/oscar.c:5946
 msgid "Direct IM"
 msgstr "篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:3097 src/protocols/oscar/oscar.c:5929
+#: src/protocols/oscar/oscar.c:3103 src/protocols/oscar/oscar.c:5962
 msgid "Get File"
 msgstr "�桁���篁�"
 
-#: src/protocols/oscar/oscar.c:3100 src/protocols/oscar/oscar.c:5921
+#: src/protocols/oscar/oscar.c:3106 src/protocols/oscar/oscar.c:5954
 msgid "Send File"
 msgstr "������篁�"
 
-#: src/protocols/oscar/oscar.c:3104
+#: src/protocols/oscar/oscar.c:3110
 msgid "Games"
 msgstr "羝御��"
 
-#: src/protocols/oscar/oscar.c:3107
+#: src/protocols/oscar/oscar.c:3113
 msgid "Add-Ins"
 msgstr "紊���"
 
-#: src/protocols/oscar/oscar.c:3110
-msgid "Send Buddy List"
-msgstr "����絅遵���茵�"
-
-#: src/protocols/oscar/oscar.c:3113
-msgid "EveryBuddy Bug"
-msgstr "罸鋇�ソ���� Bug"
-
 #: src/protocols/oscar/oscar.c:3116
+msgid "Send Buddy List"
+msgstr "����絅遵���茵�"
+
+#: src/protocols/oscar/oscar.c:3119
+msgid "EveryBuddy Bug"
+msgstr "罸鋇�ソ���� Bug"
+
+#: src/protocols/oscar/oscar.c:3122
 msgid "AP User"
 msgstr "AP ����"
 
-#: src/protocols/oscar/oscar.c:3119
+#: src/protocols/oscar/oscar.c:3125
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3122
-msgid "Nihilist"
-msgstr "Nihilist"
-
-#: src/protocols/oscar/oscar.c:3125
-msgid "ICQ Server Relay"
-msgstr "ICQ ���≦��習��"
-
 #: src/protocols/oscar/oscar.c:3128
-msgid "ICQ Unknown"
-msgstr "ICQ ����"
+msgid "Nihilist"
+msgstr "Nihilist"
 
 #: src/protocols/oscar/oscar.c:3131
-msgid "Trillian Encryption"
-msgstr "Trillian ��絲�"
+msgid "ICQ Server Relay"
+msgstr "ICQ ���≦��習��"
 
 #: src/protocols/oscar/oscar.c:3134
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Old ICQ UTF8"
+msgstr "�х�� ICQ UTF8"
 
 #: src/protocols/oscar/oscar.c:3137
+msgid "Trillian Encryption"
+msgstr "Trillian ��絲�"
+
+#: src/protocols/oscar/oscar.c:3140
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:3143
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3177
+#: src/protocols/oscar/oscar.c:3146
+msgid "Secure IM"
+msgstr "絎��� IM"
+
+#: src/protocols/oscar/oscar.c:3186
 msgid ""
 "<i>Unable to display information because it was sent in an unknown encoding."
 "</i>"
 msgstr "<i>��羈��丞ず篆≧����������九���膽������ャ��</i>"
 
-#: src/protocols/oscar/oscar.c:3184
+#: src/protocols/oscar/oscar.c:3193
 #, c-format
 msgid "Online Since : <b>%s</b><br>\n"
 msgstr "筝�膾炊�狗��:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3189
+#: src/protocols/oscar/oscar.c:3198
 #, c-format
 msgid "Member Since : <b>%s</b><br>\n"
 msgstr "�����狗��:<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3195
+#: src/protocols/oscar/oscar.c:3204
 #, c-format
 msgid "Idle : <b>%s</b>"
 msgstr "����:<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3198
+#: src/protocols/oscar/oscar.c:3207
 msgid "Idle: <b>Active</b>"
 msgstr "����:<b>羇肢�</b>"
 
-#: src/protocols/oscar/oscar.c:3200
+#: src/protocols/oscar/oscar.c:3209
 #, c-format
 msgid ""
 "Username : <b>%s</b>  %s <br>\n"
@@ -5966,27 +6067,27 @@
 "%s%s%s\n"
 "<hr>\n"
 
-#: src/protocols/oscar/oscar.c:3232
+#: src/protocols/oscar/oscar.c:3241
 msgid "<i>User has no away message</i>"
 msgstr "<i>���傑��胼糸�羔���</i>"
 
-#: src/protocols/oscar/oscar.c:3243
+#: src/protocols/oscar/oscar.c:3252
 msgid "Client Capabilities: "
 msgstr "絎∽�決�遵��:"
 
-#: src/protocols/oscar/oscar.c:3249
+#: src/protocols/oscar/oscar.c:3258
 msgid "<i>No Information Provided</i>"
 msgstr "<i>羃≧����箴�篆≧��</i>"
 
-#: src/protocols/oscar/oscar.c:3273
+#: src/protocols/oscar/oscar.c:3282
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM 菴��ュ��遵群筝√け��"
 
-#: src/protocols/oscar/oscar.c:3660
+#: src/protocols/oscar/oscar.c:3670
 msgid "Rate limiting error."
 msgstr "��綺����狗��莚���"
 
-#: src/protocols/oscar/oscar.c:3661
+#: src/protocols/oscar/oscar.c:3671
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -5994,149 +6095,158 @@
 "����丞�������罨≧��篏����ц�鐚���������群膸鏅��遺���綺�������莚欠� 10 腱�鐚��九����莚�"
 "筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3732
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��群膸���篋�菴��ワ������������九�篏�臀���④���桁���糸�ヤ���"
 
-#: src/protocols/oscar/oscar.c:3724
+#: src/protocols/oscar/oscar.c:3734
 msgid "You have been signed off for an unknown reason."
 msgstr "��群膸�嶃�坂�鐚��������ャ��"
 
-#: src/protocols/oscar/oscar.c:3963 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:3975 src/protocols/oscar/oscar.c:3981
 msgid "Email Address"
 msgstr "�球���散�医��"
 
-#: src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:3986
 msgid "Mobile Phone"
 msgstr "腱糸���笈�"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:313
+#: src/protocols/oscar/oscar.c:3989 src/protocols/trepia/trepia.c:313
 #: src/protocols/trepia/trepia.c:454
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:3977 src/protocols/trepia/trepia.c:312
+#: src/protocols/oscar/oscar.c:3989 src/protocols/trepia/trepia.c:312
 #: src/protocols/trepia/trepia.c:454
 msgid "Male"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:4006
 msgid "Personal Web Page"
 msgstr "筝�査筝脂ゝ"
 
-#: src/protocols/oscar/oscar.c:3997
+#: src/protocols/oscar/oscar.c:4009
 msgid "Additional Information"
 msgstr "蘂�紊�篆≧��"
 
-#: src/protocols/oscar/oscar.c:4001
+#: src/protocols/oscar/oscar.c:4013
 msgid "Home Address"
 msgstr "絎九梱篏��"
 
-#: src/protocols/oscar/oscar.c:4003 src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4015 src/protocols/oscar/oscar.c:4031
 msgid "Address"
 msgstr "�伾��"
 
-#: src/protocols/oscar/oscar.c:4012 src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:4024 src/protocols/oscar/oscar.c:4040
 msgid "Zip Code"
 msgstr "���睡���"
 
-#: src/protocols/oscar/oscar.c:4017
+#: src/protocols/oscar/oscar.c:4029
 msgid "Work Address"
 msgstr "�����医��"
 
-#: src/protocols/oscar/oscar.c:4033
+#: src/protocols/oscar/oscar.c:4045
 msgid "Work Information"
 msgstr "綏ヤ�篆≧��"
 
-#: src/protocols/oscar/oscar.c:4035
+#: src/protocols/oscar/oscar.c:4047
 msgid "Company"
 msgstr "���"
 
-#: src/protocols/oscar/oscar.c:4038
+#: src/protocols/oscar/oscar.c:4050
 msgid "Division"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:4053
 msgid "Position"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:4056
 msgid "Web Page"
 msgstr "臀�蕁�"
 
-#: src/protocols/oscar/oscar.c:4112
-#, c-format
-msgid "<B>%s has the following screen names:</B><BR>"
-msgstr "<B>%s �ユ��筝������桁��:</B><BR>"
-
-#: src/protocols/oscar/oscar.c:4130
+#: src/protocols/oscar/oscar.c:4062
+#, c-format
+msgid "ICQ Info for %s"
+msgstr "%s ICQ 篆≧��"
+
+#: src/protocols/oscar/oscar.c:4128
+#, c-format
+msgid "The following screennames are associated with %s"
+msgstr "筝������桁��綏牙��� %s �活��"
+
+#: src/protocols/oscar/oscar.c:4132
+msgid "Search Results"
+msgstr "��膣∝���"
+
+#: src/protocols/oscar/oscar.c:4149
 #, c-format
 msgid "No results found for email address %s"
 msgstr "���上�遺��球���散�医�� %s �拷����膸���"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4170
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "���綵��九�域���`莅� %s ����散��"
 
-#: src/protocols/oscar/oscar.c:4153
+#: src/protocols/oscar/oscar.c:4172
 msgid "Account Confirmation Requested"
 msgstr "莚傑�篋�茣��欠`莅�"
 
-#: src/protocols/oscar/oscar.c:4181
+#: src/protocols/oscar/oscar.c:4200
 msgid "Error Changing Account Info"
 msgstr "�贋�壕侃�隙拭���咲��"
 
-#: src/protocols/oscar/oscar.c:4184
+#: src/protocols/oscar/oscar.c:4203
 #, 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:4187
+#: src/protocols/oscar/oscar.c:4206
 #, 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:4190
+#: src/protocols/oscar/oscar.c:4209
 #, 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:4193
+#: src/protocols/oscar/oscar.c:4212
 #, 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:4196
+#: src/protocols/oscar/oscar.c:4215
 #, 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:4199
+#: src/protocols/oscar/oscar.c:4218
 #, 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:4202
+#: src/protocols/oscar/oscar.c:4221
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��莚� 0x%04x鐚����ラ��莚���"
 
-#: src/protocols/oscar/oscar.c:4212
+#: src/protocols/oscar/oscar.c:4231
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6145,20 +6255,20 @@
 "�������桁���弱������筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4213 src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4232 src/protocols/oscar/oscar.c:4239
 msgid "Account Info"
 msgstr "茣��隙拭��"
 
-#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/oscar/oscar.c:4237
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���球���散�医��筝� %s"
 
-#: src/protocols/oscar/oscar.c:4453
+#: src/protocols/oscar/oscar.c:4472
 msgid "Unable to set AIM profile."
 msgstr "��羈�莅丞舟 AIM ��臀���篁吟��"
 
-#: src/protocols/oscar/oscar.c:4454
+#: src/protocols/oscar/oscar.c:4473
 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 "
@@ -6167,7 +6277,7 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上���臀���篁吟��������臀���篁九����絎�鐚�莚桁���������ュ��"
 "��莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4484
+#: src/protocols/oscar/oscar.c:4503
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6177,15 +6287,15 @@
 "truncated it for you."
 msgstr[0] "綏牙�莇�菴�篋���臀���篁句����紊ч�水墾 %d 絖�����Gaim 筝堺���������℡���"
 
-#: src/protocols/oscar/oscar.c:4489
+#: src/protocols/oscar/oscar.c:4508
 msgid "Profile too long."
 msgstr "��臀���篁九お�帥��"
 
-#: src/protocols/oscar/oscar.c:4508
+#: src/protocols/oscar/oscar.c:4527
 msgid "Unable to set AIM away message."
 msgstr "��羈�莅丞舟 AIM 胼糸�羔�����"
 
-#: src/protocols/oscar/oscar.c:4509
+#: src/protocols/oscar/oscar.c:4528
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6194,7 +6304,7 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上�胼糸�羔��������絨�紊�篋��������倶��鐚�莚桁���������ュ��"
 "��莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4549
+#: src/protocols/oscar/oscar.c:4568
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6206,15 +6316,15 @@
 "綏牙�莇�菴�篋�胼糸�羔�������紊ч�水墾 %d 絖�����Gaim ����減�����℡�羔����綛九����筝榊�"
 "綣���"
 
-#: src/protocols/oscar/oscar.c:4554
+#: src/protocols/oscar/oscar.c:4573
 msgid "Away message too long."
 msgstr "胼糸�羔���お�帥��"
 
-#: src/protocols/oscar/oscar.c:4774
+#: src/protocols/oscar/oscar.c:4793
 msgid "Unable To Retrieve Buddy List"
 msgstr "��羈��桁�絅遵���茵�"
 
-#: src/protocols/oscar/oscar.c:4775
+#: src/protocols/oscar/oscar.c:4794
 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 "
@@ -6223,12 +6333,12 @@
 "Gaim ���倶��羈�篁� AIM ���≦��キ������絅遵���茵�������絅遵���茵�押��筝√け鐚����順�膈���"
 "絨�嚭葦�順�����"
 
-#: src/protocols/oscar/oscar.c:4866 src/protocols/oscar/oscar.c:4867
-#: src/protocols/oscar/oscar.c:4872
+#: src/protocols/oscar/oscar.c:4885 src/protocols/oscar/oscar.c:4886
+#: src/protocols/oscar/oscar.c:4891
 msgid "Orphans"
 msgstr "絖ゅ��"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6236,15 +6346,15 @@
 msgstr ""
 "��羈�絨� %s ��筝阪ソ��鐚�����������絅遵�紊����莚桁���ゅ�銀賢筝�筝�ソ��鐚��九����莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:5039 src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5071
 msgid "(no name)"
 msgstr "(����腱�)"
 
-#: src/protocols/oscar/oscar.c:5040 src/protocols/oscar/oscar.c:5053
+#: src/protocols/oscar/oscar.c:5059 src/protocols/oscar/oscar.c:5072
 msgid "Unable To Add"
 msgstr "��羈�羞糸��"
 
-#: src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5071
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6254,18 +6364,18 @@
 "��羈�羞糸��絅遵� %s鐚��������ャ�������順������������絅遵���茵�賢絅遵����亥��群膸颴上�遺���"
 "��莅悟����紊у�若��"
 
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5106
 #, 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:5093
+#: src/protocols/oscar/oscar.c:5112
 msgid "Authorization Given"
 msgstr "膸��榊��莅よ�"
 
-#: src/protocols/oscar/oscar.c:5126
+#: src/protocols/oscar/oscar.c:5145
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6275,17 +6385,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5168
+#: src/protocols/oscar/oscar.c:5187
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "���� %s ��莅御���篁�/絅劫���ュソ����"
 
-#: src/protocols/oscar/oscar.c:5169
+#: src/protocols/oscar/oscar.c:5188
 msgid "Authorization Granted"
 msgstr "莅よ�茴����"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5172
+#: src/protocols/oscar/oscar.c:5191
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -6295,128 +6405,135 @@
 "���� %s ��膸�篋�����九���ヨ��膤私査��茵���莚傑�鐚�����絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5173
+#: src/protocols/oscar/oscar.c:5192
 msgid "Authorization Denied"
 msgstr "莅よ�茴���膸�"
 
-#: src/protocols/oscar/oscar.c:5210 src/protocols/toc/toc.c:1246
+#: src/protocols/oscar/oscar.c:5229 src/protocols/toc/toc.c:1266
 msgid "Exchange:"
 msgstr "篋ゆ��:"
 
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/oscar/oscar.c:5451
 msgid "<b>Status:</b> "
 msgstr "<b>�倶��:</b>"
 
-#: src/protocols/oscar/oscar.c:5441
+#: src/protocols/oscar/oscar.c:5460
 msgid "<b>Logged In:</b> "
 msgstr "<b>�糸��:</b>"
 
-#: src/protocols/oscar/oscar.c:5448
+#: src/protocols/oscar/oscar.c:5471
+msgid "<b>IP Address:</b> "
+msgstr "<b>IP �医��:</b> "
+
+#: src/protocols/oscar/oscar.c:5479
 msgid "<b>Capabilities:</b> "
 msgstr "<b>�遵��:</b>"
 
-#: src/protocols/oscar/oscar.c:5455
+#: src/protocols/oscar/oscar.c:5486
 msgid "<b>Available:</b> "
 msgstr "<b>����:</b>"
 
-#: src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:5495
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>�倶��:</b>���莚�"
 
-#: src/protocols/oscar/oscar.c:5498 src/protocols/yahoo/yahoo.c:1373
+#: src/protocols/oscar/oscar.c:5529 src/protocols/yahoo/yahoo.c:1429
 msgid "Offline"
 msgstr "胼紫鎖"
 
-#: src/protocols/oscar/oscar.c:5737
+#: src/protocols/oscar/oscar.c:5770
 msgid "Unable to open Direct IM"
 msgstr "��羈�綣�紮�篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:5750
+#: src/protocols/oscar/oscar.c:5783
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�������筝� %s 菴�茵�篋�篋坂���菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:5753
+#: src/protocols/oscar/oscar.c:5786
 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:5898
+#: src/protocols/oscar/oscar.c:5931
 msgid "Get Status Msg"
 msgstr "�桁��倶��羔���"
 
-#: src/protocols/oscar/oscar.c:5963
+#: src/protocols/oscar/oscar.c:5975
+msgid "Re-request Authorization"
+msgstr "���域�羆�莅よ�"
+
+#: src/protocols/oscar/oscar.c:5996
 msgid "The new formatting is invalid."
 msgstr "�井�弱���������"
 
-#: src/protocols/oscar/oscar.c:5964
+#: src/protocols/oscar/oscar.c:5997
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "���桁���弱������贋�劫ぇ����腥堺�若��"
 
-#: src/protocols/oscar/oscar.c:5970
+#: src/protocols/oscar/oscar.c:6003
 msgid "New screenname formatting:"
 msgstr "�亥�����桁���弱���:"
 
-#: src/protocols/oscar/oscar.c:6019
+#: src/protocols/oscar/oscar.c:6052
 msgid "Change Address To:"
 msgstr "絨��医���贋�剛減:"
 
-#: src/protocols/oscar/oscar.c:6033
-msgid "You are awaiting authorization from the following buddies:<BR>"
-msgstr "��③���緇�筝���絅遵���莅よ�:<BR>"
-
-#: src/protocols/oscar/oscar.c:6062
+#: src/protocols/oscar/oscar.c:6096
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��攻筝������莅よ�</i>"
 
-#: src/protocols/oscar/oscar.c:6067
-#, c-format
+#: src/protocols/oscar/oscar.c:6099
+msgid "You are awaiting authorization from the following buddies"
+msgstr "��③���緇�筝���絅遵���莅よ�"
+
+#: src/protocols/oscar/oscar.c:6100
 msgid ""
-"%s<BR><BR>You can re-request authorization from these buddies by right-"
-"clicking on them and clicking \"Re-request authorization.\""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
 msgstr ""
-"%s<BR><BR>絋������活���菴�篋�絅遵����域�羆�莅よ�鐚�����������渇�����肢�篋�絅遵�鐚��九��"
+"絋������活���菴�篋�絅遵����域�羆�莅よ�鐚�����������渇�����肢�篋�絅遵�鐚��九��"
 "���獅�����域�羆�莅よ�����"
 
-#: src/protocols/oscar/oscar.c:6083
+#: src/protocols/oscar/oscar.c:6116
 msgid "Available Message:"
 msgstr "�������:"
 
-#: src/protocols/oscar/oscar.c:6084
+#: src/protocols/oscar/oscar.c:6117
 msgid "Please talk to me, I'm lonely! (and single)"
 msgstr "絖ょ����篋堺����紫��鐚�莊��������э�"
 
-#: src/protocols/oscar/oscar.c:6146
+#: src/protocols/oscar/oscar.c:6179
 msgid "Set Available Message"
 msgstr "莅丞舟�������"
 
-#: src/protocols/oscar/oscar.c:6160
+#: src/protocols/oscar/oscar.c:6193
 msgid "Change Password (URL)"
 msgstr "�贋�劫���(URL)"
 
-#: src/protocols/oscar/oscar.c:6171
+#: src/protocols/oscar/oscar.c:6204
 msgid "Format Screenname"
 msgstr "�弱������桁��"
 
-#: src/protocols/oscar/oscar.c:6177
+#: src/protocols/oscar/oscar.c:6210
 msgid "Confirm Account"
 msgstr "隋��茣���"
 
-#: src/protocols/oscar/oscar.c:6183
+#: src/protocols/oscar/oscar.c:6216
 msgid "Display Current Registered Address"
 msgstr "�丞ず綵���羈������医��"
 
-#: src/protocols/oscar/oscar.c:6189
+#: src/protocols/oscar/oscar.c:6222
 msgid "Change Current Registered Address"
 msgstr "�贋�劫���羈������医��"
 
-#: src/protocols/oscar/oscar.c:6198
+#: src/protocols/oscar/oscar.c:6231
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�丞ず罩e�����莅よ���絅遵�"
 
-#: src/protocols/oscar/oscar.c:6206
+#: src/protocols/oscar/oscar.c:6239
 msgid "Search for Buddy by Email"
 msgstr "���球���散��膣√ソ��"
 
@@ -6430,122 +6547,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6327 src/protocols/oscar/oscar.c:6329
+#: src/protocols/oscar/oscar.c:6360 src/protocols/oscar/oscar.c:6362
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ �顒��篁�"
 
-#: src/protocols/oscar/oscar.c:6346
+#: src/protocols/oscar/oscar.c:6379
 msgid "Auth host"
 msgstr "莅よ�筝紙��"
 
-#: src/protocols/oscar/oscar.c:6351
+#: src/protocols/oscar/oscar.c:6384
 msgid "Auth port"
 msgstr "莅よ�腴��"
 
-#: src/protocols/toc/toc.c:175
+#: src/protocols/toc/toc.c:171
 #, c-format
 msgid "Looking up %s"
 msgstr "���� %s"
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:513
 #, c-format
 msgid "Unable to write file %s."
 msgstr "��羈����ユ��篁� %s��"
 
-#: src/protocols/toc/toc.c:520
+#: src/protocols/toc/toc.c:516
 #, c-format
 msgid "Unable to read file %s."
 msgstr "��羈�莚糸���篁� %s��"
 
-#: src/protocols/toc/toc.c:523
+#: src/protocols/toc/toc.c:519
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "羔���お�随����� %s 絖���茴����㏍��"
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:522
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s �������糸�ャ��"
 
-#: src/protocols/toc/toc.c:529
+#: src/protocols/toc/toc.c:525
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "筝���莅後� %s ���肴⑥����"
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:528
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "筝√け篋�筝��≧�������菴�篋����≦����綺����吟��"
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:531
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "�� %s 筝㊥��羈���紊���"
 
-#: src/protocols/toc/toc.c:538
+#: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "��� %s ����羔�������綺�お綽���"
 
-#: src/protocols/toc/toc.c:541
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "����菴�篋��ヨ�� %s ��羔�����������羔���お紊с��"
 
-#: src/protocols/toc/toc.c:544
+#: src/protocols/toc/toc.c:540
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "����菴�篋��ヨ�� %s ��羔�������������紊�辱��"
 
-#: src/protocols/toc/toc.c:547
+#: src/protocols/toc/toc.c:543
 msgid "Failure."
 msgstr "紊沿乾��"
 
-#: src/protocols/toc/toc.c:550
+#: src/protocols/toc/toc.c:546
 msgid "Too many matches."
 msgstr "�拷��紊����"
 
-#: src/protocols/toc/toc.c:553
+#: src/protocols/toc/toc.c:549
 msgid "Need more qualifiers."
 msgstr "��荀��翫��>散��"
 
-#: src/protocols/toc/toc.c:556
+#: src/protocols/toc/toc.c:552
 msgid "Dir service temporarily unavailable."
 msgstr "������≧���銀�������"
 
-#: src/protocols/toc/toc.c:559
+#: src/protocols/toc/toc.c:555
 msgid "Email lookup restricted."
 msgstr "�球���散�ラ��茴����吟��"
 
-#: src/protocols/toc/toc.c:562
+#: src/protocols/toc/toc.c:558
 msgid "Keyword ignored."
 msgstr "�渇���茴�申�ャ��"
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:561
 msgid "No keywords."
 msgstr "���渇�����"
 
+#: src/protocols/toc/toc.c:564
+msgid "User has no directory information."
+msgstr "���傑押�����篆≧����"
+
 #: src/protocols/toc/toc.c:568
-msgid "User has no directory information."
-msgstr "���傑押�����篆≧����"
-
-#: src/protocols/toc/toc.c:572
 msgid "Country not supported."
 msgstr "�遵�筝�茴�������"
 
-#: src/protocols/toc/toc.c:575
+#: src/protocols/toc/toc.c:571
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "���ュけ茣ワ�%s��"
 
-#: src/protocols/toc/toc.c:581
+#: src/protocols/toc/toc.c:577
 msgid "The service is temporarily unavailable."
 msgstr "���≧���銀�������"
 
-#: src/protocols/toc/toc.c:584
+#: src/protocols/toc/toc.c:580
 msgid "Your warning level is currently too high to log in."
 msgstr "����茘���膾у��お蕭�鐚���羈��糸�ャ��"
 
-#: src/protocols/toc/toc.c:587
+#: src/protocols/toc/toc.c:583
 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."
@@ -6553,37 +6670,37 @@
 "����ュ���㊤�緇�紊��膵���莚欠�������鐚��九����莚�筝�罨<��絋�����薩膸㊨��莚�鐚�������狗�翫�"
 "�恔��顔�帥��"
 
-#: src/protocols/toc/toc.c:589
+#: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "����篋����ョ�糸�ラ��莚��%s��"
 
-#: src/protocols/toc/toc.c:592
+#: src/protocols/toc/toc.c:588
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "����篋����ラ��莚� %d��篆≧���%s"
 
-#: src/protocols/toc/toc.c:612
+#: src/protocols/toc/toc.c:608
 msgid "Connection Closed"
 msgstr "菴��ュ群�渇��"
 
-#: src/protocols/toc/toc.c:652
+#: src/protocols/toc/toc.c:648
 msgid "Waiting for reply..."
 msgstr "罩e�������紊�..."
 
-#: src/protocols/toc/toc.c:722
+#: src/protocols/toc/toc.c:718
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 篁�����筝㊥�√�����ー���札��罨≦���羔������"
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:906
 msgid "Password Change Successful"
 msgstr "絲����贋�号����"
 
-#: src/protocols/toc/toc.c:914
+#: src/protocols/toc/toc.c:910
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ����篋� PAUSE �巡擦��"
 
-#: src/protocols/toc/toc.c:915
+#: src/protocols/toc/toc.c:911
 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 "
@@ -6593,43 +6710,43 @@
 "絨���権�阪サ��Gaim 絨�篌������������榊��篁私���絎鴻��菴�篁�篁���鹸�句��鐚���篁ヨ���綽�腮�膈���"
 "�祉��"
 
-#: src/protocols/toc/toc.c:1384
+#: src/protocols/toc/toc.c:1404
 msgid "Get Dir Info"
 msgstr "�桁����篆≧��"
 
-#: src/protocols/toc/toc.c:1508
+#: src/protocols/toc/toc.c:1528
 msgid "Set Dir Info"
 msgstr "莅丞舟���篆≧��"
 
-#: src/protocols/toc/toc.c:1631
+#: src/protocols/toc/toc.c:1652
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "��羈���綣� %s ���ワ�"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1688
 msgid "File transfer failed; other side probably canceled."
 msgstr "��篁銀���紊沿乾鐚����遵�銀賢筝�腴��羔�篋�篌�����"
 
-#: src/protocols/toc/toc.c:1712 src/protocols/toc/toc.c:1752
-#: src/protocols/toc/toc.c:1964
+#: src/protocols/toc/toc.c:1733 src/protocols/toc/toc.c:1773
+#: src/protocols/toc/toc.c:1985
 msgid "Could not connect for transfer."
 msgstr "��羈�菴��ヨ�茵�篌�����"
 
-#: src/protocols/toc/toc.c:1876
+#: src/protocols/toc/toc.c:1897
 msgid "Could not connect for transfer!"
 msgstr "��羈�菴��ヨ�茵�篌���鐚�"
 
-#: src/protocols/toc/toc.c:1909
+#: src/protocols/toc/toc.c:1930
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "��羈����ユ��篁九ご����篁九�筝�篌�茴������"
 
-#: src/protocols/toc/toc.c:2043
+#: src/protocols/toc/toc.c:2064
 #, 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:2050
+#: src/protocols/toc/toc.c:2071
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 莚傑��������篁�"
@@ -6644,15 +6761,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2125 src/protocols/toc/toc.c:2127
+#: src/protocols/toc/toc.c:2147 src/protocols/toc/toc.c:2149
 msgid "TOC Protocol Plugin"
 msgstr "TOC �顒��篁�"
 
-#: src/protocols/toc/toc.c:2144
+#: src/protocols/toc/toc.c:2166
 msgid "TOC host"
 msgstr "TOC 筝紙��"
 
-#: src/protocols/toc/toc.c:2148
+#: src/protocols/toc/toc.c:2170
 msgid "TOC port"
 msgstr "TOC 腴��"
 
@@ -6747,25 +6864,27 @@
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia �顒��篁�"
 
-#: src/protocols/yahoo/yahoo.c:689
+#: src/protocols/yahoo/yahoo.c:694
 msgid "Your Yahoo! message did not get sent."
 msgstr "��������� Yahoo! 羔�����"
 
-#: src/protocols/yahoo/yahoo.c:747
+#: src/protocols/yahoo/yahoo.c:752
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s ��膸����篁�/絅劫���ュソ����"
 
-#: src/protocols/yahoo/yahoo.c:749
+#: src/protocols/yahoo/yahoo.c:754
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr ""
-"%s ��膸�篋�����九��筝阪ソ����莚傑�鐚�����絋�筝�:"
-"%s��"
-
-#: src/protocols/yahoo/yahoo.c:1041
+msgstr "%s ��膸�篋�����九��筝阪ソ����莚傑�鐚�����絋�筝�:%s��"
+
+#: src/protocols/yahoo/yahoo.c:755
+msgid "Add buddy rejected"
+msgstr "羞糸����膸���絅遵�"
+
+#: src/protocols/yahoo/yahoo.c:1046
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -6773,122 +6892,131 @@
 msgstr ""
 "����上申�� %s鐚�篏�������隙�篋�����絅遵���茵�賢�����獅������絨����ゅ攻綽順�ュソ����"
 
-#: src/protocols/yahoo/yahoo.c:1044
+#: src/protocols/yahoo/yahoo.c:1049
 msgid "Ignore buddy?"
 msgstr "綽順�ュソ��?"
 
-#: src/protocols/yahoo/yahoo.c:1073
+#: src/protocols/yahoo/yahoo.c:1078
 msgid "Invalid username."
 msgstr "���桁��������"
 
-#: src/protocols/yahoo/yahoo.c:1076
+#: src/protocols/yahoo/yahoo.c:1081
 msgid "Incorrect password."
 msgstr "絲���筝�絲鴻��"
 
-#: src/protocols/yahoo/yahoo.c:1079
+#: src/protocols/yahoo/yahoo.c:1084
 msgid "Unknown error."
 msgstr "���ラ��莚���"
 
-#: src/protocols/yahoo/yahoo.c:1180
+#: src/protocols/yahoo/yahoo.c:1132
+#, c-format
+msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgstr "��羈�絨�絅遵� %s 羞糸���域侃�� %s 篏�篋����≦����茵����膸� %s��"
+
+#: src/protocols/yahoo/yahoo.c:1134
+msgid "Could not add buddy to server list"
+msgstr "��羈�絨�絅遵�羞糸���井���≦����茵�"
+
+#: src/protocols/yahoo/yahoo.c:1236
 msgid "Unable to read"
 msgstr "��羈�莚糸�"
 
-#: src/protocols/yahoo/yahoo.c:1281
+#: src/protocols/yahoo/yahoo.c:1337
 msgid "Connection problem"
 msgstr "菴��ラ���"
 
-#: src/protocols/yahoo/yahoo.c:1355 src/protocols/yahoo/yahoo.c:1655
-#: src/protocols/yahoo/yahoo.c:1745
+#: src/protocols/yahoo/yahoo.c:1411 src/protocols/yahoo/yahoo.c:1709
+#: src/protocols/yahoo/yahoo.c:1807
 msgid "Not At Home"
 msgstr "筝����"
 
-#: src/protocols/yahoo/yahoo.c:1357 src/protocols/yahoo/yahoo.c:1657
-#: src/protocols/yahoo/yahoo.c:1746
+#: src/protocols/yahoo/yahoo.c:1413 src/protocols/yahoo/yahoo.c:1711
+#: src/protocols/yahoo/yahoo.c:1808
 msgid "Not At Desk"
 msgstr "筝������"
 
-#: src/protocols/yahoo/yahoo.c:1359 src/protocols/yahoo/yahoo.c:1659
-#: src/protocols/yahoo/yahoo.c:1747
+#: src/protocols/yahoo/yahoo.c:1415 src/protocols/yahoo/yahoo.c:1713
+#: src/protocols/yahoo/yahoo.c:1809
 msgid "Not In Office"
 msgstr "筝��������"
 
-#: src/protocols/yahoo/yahoo.c:1363 src/protocols/yahoo/yahoo.c:1663
-#: src/protocols/yahoo/yahoo.c:1749
+#: src/protocols/yahoo/yahoo.c:1419 src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1811
 msgid "On Vacation"
 msgstr "綺���筝�"
 
-#: src/protocols/yahoo/yahoo.c:1367 src/protocols/yahoo/yahoo.c:1667
-#: src/protocols/yahoo/yahoo.c:1751
+#: src/protocols/yahoo/yahoo.c:1423 src/protocols/yahoo/yahoo.c:1721
+#: src/protocols/yahoo/yahoo.c:1813
 msgid "Stepped Out"
 msgstr "��羝�"
 
-#: src/protocols/yahoo/yahoo.c:1431 src/protocols/yahoo/yahoo.c:1465
+#: src/protocols/yahoo/yahoo.c:1487 src/protocols/yahoo/yahoo.c:1521
 msgid "Not on server list"
 msgstr "筝������≦����茵�賢"
 
-#: src/protocols/yahoo/yahoo.c:1521
+#: src/protocols/yahoo/yahoo.c:1577
 msgid "Join in Chat"
 msgstr "���ヨ��紊�"
 
-#: src/protocols/yahoo/yahoo.c:1527
+#: src/protocols/yahoo/yahoo.c:1583
 msgid "Initiate Conference"
 msgstr "��莎隙�莅�"
 
-#: src/protocols/yahoo/yahoo.c:1573
+#: src/protocols/yahoo/yahoo.c:1629
 msgid "Active which ID?"
 msgstr "羶�羇糸��肩 ID鐚�"
 
-#: src/protocols/yahoo/yahoo.c:1584
+#: src/protocols/yahoo/yahoo.c:1640
 msgid "Activate ID"
 msgstr "羶�羇� ID"
 
-#: src/protocols/yahoo/yahoo.c:1907
+#: src/protocols/yahoo/yahoo.c:1987
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>�掩�鐚���筝阪������篋阪��絎合��筝�査莎�������筝�茴�������</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:1909 src/protocols/yahoo/yahoo.c:1925
+#: src/protocols/yahoo/yahoo.c:1989 src/protocols/yahoo/yahoo.c:2005
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
 msgstr "絋������活��ョ��罩よ���鐚�����荀������� Web 羌頵���賢羌頵�罩ら�丈・"
 
-#: src/protocols/yahoo/yahoo.c:1923
+#: src/protocols/yahoo/yahoo.c:2003
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>�掩�鐚�����筝��������沿���筝�査莎�����</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:1957
+#: src/protocols/yahoo/yahoo.c:2037
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo.c:1999 src/protocols/yahoo/yahoo.c:2001
-#: src/protocols/yahoo/yahoo.c:2003
+#: src/protocols/yahoo/yahoo.c:2079 src/protocols/yahoo/yahoo.c:2081
+#: src/protocols/yahoo/yahoo.c:2083
 msgid "Hobbies"
 msgstr "��絅�"
 
-#: src/protocols/yahoo/yahoo.c:2005 src/protocols/yahoo/yahoo.c:2007
+#: src/protocols/yahoo/yahoo.c:2085 src/protocols/yahoo/yahoo.c:2087
 msgid "Latest News"
 msgstr "���井�育��"
 
-#: src/protocols/yahoo/yahoo.c:2016
+#: src/protocols/yahoo/yahoo.c:2096
 msgid "Home Page"
 msgstr "筝脂ゝ"
 
-#: src/protocols/yahoo/yahoo.c:2026
+#: src/protocols/yahoo/yahoo.c:2106
 msgid "Cool Link 1"
 msgstr "�潔�丈・ 1"
 
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:2108
 msgid "Cool Link 2"
 msgstr "�潔�丈・ 2"
 
-#: src/protocols/yahoo/yahoo.c:2030
+#: src/protocols/yahoo/yahoo.c:2110
 msgid "Cool Link 3"
 msgstr "�潔�丈・ 3"
 
-#: src/protocols/yahoo/yahoo.c:2034
+#: src/protocols/yahoo/yahoo.c:2114
 msgid "Member Since"
 msgstr "羈����狗��"
 
@@ -6902,18 +7030,43 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2170 src/protocols/yahoo/yahoo.c:2172
+#: src/protocols/yahoo/yahoo.c:2250 src/protocols/yahoo/yahoo.c:2252
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo �顒��篁�"
 
-#: src/protocols/yahoo/yahoo.c:2189
+#: src/protocols/yahoo/yahoo.c:2269
 msgid "Pager host"
 msgstr "絲糸�寂源��"
 
-#: src/protocols/yahoo/yahoo.c:2194
+#: src/protocols/yahoo/yahoo.c:2274
 msgid "Pager port"
 msgstr "絲糸�主���"
 
+#: src/protocols/yahoo/yahoochat.c:191
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s ��膸������ユ�翠�癌��%s����篌�莅���莚件�����筝財��%s����"
+
+#: src/protocols/yahoo/yahoochat.c:193
+msgid "Invitation Rejected"
+msgstr "��莚桁群��膸�"
+
+#: src/protocols/yahoo/yahoochat.c:317
+msgid "Failed to join chat"
+msgstr "���ヨ��紊�け茣�"
+
+#: src/protocols/yahoo/yahoochat.c:317
+msgid "Maybe the room is full?"
+msgstr "���醇�翠�翫群羯�?"
+
+#: src/protocols/yahoo/yahoochat.c:509
+msgid "Failed to join buddy in chat"
+msgstr "����紊�賢���ュソ��紊沿乾"
+
+#: src/protocols/yahoo/yahoochat.c:510
+msgid "Maybe they're not in a chat?"
+msgstr "���巡�篁�������紊�賢?"
+
 #: src/protocols/zephyr/zephyr.c:336
 #, c-format
 msgid "<b>User:</b> %s<br>"
@@ -6979,22 +7132,22 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr �顒��篁�"
 
-#: src/proxy.c:1680
+#: src/proxy.c:1681
 msgid "Invalid proxy settings"
 msgstr "������篁g��莅丞舟"
 
-#: src/proxy.c:1680
+#: src/proxy.c:1681
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "��減膸�絎�篁g��膠糸������絎���筝紙�阪����腴��垽������"
 
-#: src/prpl.c:295
+#: src/prpl.c:143
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s 綏牙�絨� %s ��筝阪ソ��%s%s%s"
 
-#: src/prpl.c:307
+#: src/prpl.c:155
 msgid ""
 "\n"
 "\n"
@@ -7004,11 +7157,11 @@
 "\n"
 "�������活�絨�篁�/絅号兄��筝堺����絅遵�鐚�"
 
-#: src/prpl.c:310
+#: src/prpl.c:158
 msgid "Gaim - Information"
 msgstr "Gaim - 篆≧��"
 
-#: src/prpl.c:313
+#: src/prpl.c:161
 msgid "Add buddy to your list?"
 msgstr "絨����桁��筝阪ソ����鐚�"
 
@@ -7024,31 +7177,31 @@
 msgid "Accept"
 msgstr "�ュ�"
 
-#: src/server.c:57
+#: src/server.c:56
 msgid "Please enter your password"
 msgstr "莚決��ユ����絲���"
 
-#: src/server.c:942
+#: src/server.c:956
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d �≧���)"
 
-#: src/server.c:955
+#: src/server.c:969
 msgid "(1 message)"
 msgstr "(1 �≧���)"
 
-#: src/server.c:1147 src/server.c:1157
+#: src/server.c:1156 src/server.c:1166
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ヤ���"
 
-#: src/server.c:1176 src/server.c:1184
+#: src/server.c:1184 src/server.c:1192
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�坂���"
 
-#: src/server.c:1233
+#: src/server.c:1240
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7057,11 +7210,11 @@
 "%s ����茴� %s 茘�����\n"
 "���亥��茘���膾у���� %d%%"
 
-#: src/server.c:1236
+#: src/server.c:1243
 msgid "an anonymous person"
 msgstr "����羂�"
 
-#: src/server.c:1331
+#: src/server.c:1346
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7070,20 +7223,20 @@
 "���撃��%s����莚� %s ���ュソ����紊��鐚���%s��\n"
 "%s"
 
-#: src/server.c:1335
+#: src/server.c:1350
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "���撃��%s����莚� %s ���ュソ����紊��鐚���%s��\n"
 
-#: src/server.c:1341
+#: src/server.c:1356
 msgid "Accept chat invitation?"
 msgstr "�ュ���紊���莚桁��鐚�"
 
-#: src/server.c:1530
+#: src/server.c:1545
 msgid "Gaim - Popup"
 msgstr "Gaim - 綣劫�榊���"
 
-#: src/server.c:1557
+#: src/server.c:1572
 msgid "More Info"
 msgstr "�翫�篆≧��"
 
@@ -7117,48 +7270,26 @@
 msgid_plural "minutes"
 msgstr[0] "��"
 
-#: src/util.c:934
+#: src/util.c:950
 msgid "Calculating..."
 msgstr "罩e���膊�..."
 
-#: src/util.c:937
+#: src/util.c:953
 msgid "Unknown."
 msgstr "���ャ��"
 
-#: plugins/tcl/tcl.c:344
-msgid "Tcl Plugin Loader"
-msgstr "Tcl ��篁区��ュ��"
-
-#: plugins/tcl/tcl.c:346 plugins/tcl/tcl.c:347
-msgid "Provides support for loading Tcl plugins"
-msgstr "��箴�茖��� Tcl ��篁句������"
-
-#: plugins/tcl/tcl_cmds.c:420
-msgid "gc"
-msgstr "gc"
-
-#: src/protocols/yahoo/yahoochat.c:191
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s ��膸������ユ�翠�癌��%s����篌�莅���莚件�����筝財��%s����"
-
-#: src/protocols/yahoo/yahoochat.c:193
-msgid "Invitation Rejected"
-msgstr "��莚桁群��膸�"
-
-#: src/protocols/yahoo/yahoochat.c:317
-msgid "Failed to join chat"
-msgstr "���ヨ��紊�け茣�"
-
-#: src/protocols/yahoo/yahoochat.c:317
-msgid "Maybe the room is full?"
-msgstr "���醇�翠�翫群羯�?"
-
-#: src/protocols/yahoo/yahoochat.c:509
-msgid "Failed to join buddy in chat"
-msgstr "����紊�賢���ュソ��紊沿乾"
-
-#: src/protocols/yahoo/yahoochat.c:510
-msgid "Maybe they're not in a chat?"
-msgstr "���巡�篁�������紊�賢?"
-
+#~ msgid "There was an error launching your chosen browser: %s"
+#~ msgstr "莪�����������羌頵��� %s �咲��"
+
+#~ msgid ""
+#~ "The entered manual browser '%s' is not valid. Hyperlinks will not work."
+#~ msgstr "������ョ��羌頵�����%s��������莇�膾ч�丈・��羈�綏ヤ���"
+
+#~ msgid "ICQ Unknown"
+#~ msgstr "ICQ ����"
+
+#~ msgid "<B>%s has the following screen names:</B><BR>"
+#~ msgstr "<B>%s �ユ��筝������桁��:</B><BR>"
+
+#~ msgid "gc"
+#~ msgstr "gc"