changeset 9346:cbc7c336fe88

[gaim-migrate @ 10154] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 22 Jun 2004 13:17:24 +0000 (2004-06-22)
parents 09338cd93c7d
children e9abe32d6700
files po/ChangeLog po/zh_CN.po po/zh_TW.po
diffstat 3 files changed, 3232 insertions(+), 2843 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Jun 22 13:13:49 2004 +0000
+++ b/po/ChangeLog	Tue Jun 22 13:17:24 2004 +0000
@@ -2,6 +2,7 @@
 
 version 0.79cvs
 	* Chinese (Simplified) translation updated (Funda Wang)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* English (Canadian) translation updated (Adam Weinberger)
 	* French translation updated (Eric Boumaour)
--- a/po/zh_CN.po	Tue Jun 22 13:13:49 2004 +0000
+++ b/po/zh_CN.po	Tue Jun 22 13:17:24 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-12 00:02-0400\n"
-"PO-Revision-Date: 2004-06-12 12:24+0800\n"
+"POT-Creation-Date: 2004-06-21 00:02-0400\n"
+"PO-Revision-Date: 2004-06-21 21:56+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"
@@ -142,7 +142,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 胼糸�"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:643 src/gtkaccount.c:2065
 msgid "Auto-login"
 msgstr "�����糸�"
 
@@ -158,21 +158,21 @@
 msgid "New..."
 msgstr "�医産..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1793 src/protocols/gg/gg.c:51
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1796 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5466
-#: src/protocols/oscar/oscar.c:6448 src/protocols/oscar/oscar.c:6647
-#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:46
+#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2718
+#: src/protocols/novell/novell.c:2835 src/protocols/novell/novell.c:2887
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5465
+#: src/protocols/oscar/oscar.c:6463 src/protocols/oscar/oscar.c:6662
+#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "胼糸�"
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5384 src/protocols/oscar/oscar.c:6655
+#: src/protocols/oscar/oscar.c:5383 src/protocols/oscar/oscar.c:6670
 msgid "Back"
 msgstr "����"
 
@@ -184,11 +184,11 @@
 msgid "File Transfers"
 msgstr "��篁銀���"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2244
 msgid "Accounts"
 msgstr "茣���"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2483
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2490
 msgid "Preferences"
 msgstr "薤���蕁�"
 
@@ -440,15 +440,15 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2958 src/gtkprefs.c:914 src/gtkprefs.c:967
-#: src/gtkprefs.c:1806 src/protocols/jabber/jabber.c:923
+#: src/gtkblist.c:2982 src/gtkprefs.c:913 src/gtkprefs.c:966
+#: src/gtkprefs.c:1809 src/protocols/jabber/jabber.c:923
 msgid "None"
 msgstr "��"
 
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2155
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2162
 #: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
-#: src/protocols/msn/msn.c:1284 src/protocols/trepia/trepia.c:398
+#: src/protocols/msn/msn.c:1286 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "��腱�"
 
@@ -463,13 +463,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6934
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6949
 msgid "Search"
 msgstr "��膣�"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3984
-#: src/gtkblist.c:4313
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:4011
+#: src/gtkblist.c:4339
 msgid "Group:"
 msgstr "膸�:"
 
@@ -505,8 +505,8 @@
 msgid "_Associate Buddy"
 msgstr "�活��絅遵�(_A)"
 
-#: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3808
+#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
+#: src/blist.c:775 src/blist.c:963 src/blist.c:2060 src/gtkblist.c:3832
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "絅遵�"
@@ -570,7 +570,7 @@
 msgstr "蘂�紊�篆≧��:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
+#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:340
 #: src/protocols/oscar/oscar.c:433
 msgid "Buddy Icon"
 msgstr "絅遵��丈��"
@@ -636,7 +636,7 @@
 msgid "_Set"
 msgstr "莅丞舟(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:795
+#: plugins/idle.c:67 src/dialogs.c:786
 msgid "_Cancel"
 msgstr "��羔�(_C)"
 
@@ -705,69 +705,69 @@
 msgstr "��ソ����茵����丞ず筝�筝���劫��鐚��������������育��散��"
 
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:572
+#: plugins/notify.c:599
 msgid "Notify For"
 msgstr "����"
 
-#: plugins/notify.c:576
+#: plugins/notify.c:603
 msgid "_IM windows"
 msgstr "�恰�倶������(_I)"
 
-#: plugins/notify.c:583
+#: plugins/notify.c:610
 msgid "C_hat windows"
 msgstr "��紊����(_H)"
 
-#: plugins/notify.c:590
+#: plugins/notify.c:617
 msgid "_Focused windows"
 msgstr "�������(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:598
+#: plugins/notify.c:625
 msgid "Notification Methods"
 msgstr "���ユ�劫�"
 
-#: plugins/notify.c:605
+#: plugins/notify.c:632
 msgid "Prepend _string into window title:"
 msgstr "����f��蘂���菴遵��絖�膃�顕(_S):"
 
 #. Count method button
-#: plugins/notify.c:624
+#: plugins/notify.c:651
 msgid "Insert c_ount of new messages into window title"
 msgstr "����f��蘂�筝㊥��ユ�井�����(_O)"
 
 #. Urgent method button
-#: plugins/notify.c:633
+#: plugins/notify.c:659
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "莅丞舟腦��g�������膣ф�モ����腓�(_U)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:640
+#: plugins/notify.c:667
 msgid "Notification Removal"
 msgstr "���ュ����"
 
 #. Remove on focus button
-#: plugins/notify.c:646
+#: plugins/notify.c:672
 msgid "Remove when conversation window _gains focus"
 msgstr "絲壕�腦��hキ緇����劫���喝����(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:654
+#: plugins/notify.c:679
 msgid "Remove when conversation window _receives click"
 msgstr "���糸�莚�腦��e���喝����(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:662
+#: plugins/notify.c:687
 msgid "Remove when _typing in conversation window"
 msgstr "���莚�腦��d賢��絖����喝����(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:670
+#: plugins/notify.c:695
 msgid "Remove when a _message gets sent"
 msgstr "羔������阪���喝����(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:679
-msgid "Remove on conversation ta_b switch"
+#: plugins/notify.c:704
+msgid "Remove on switch to conversation ta_b"
 msgstr "���√�莚���膈上���喝����(_B)"
 
 #. *< api_version
@@ -777,7 +777,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:762
+#: plugins/notify.c:792
 msgid "Message Notification"
 msgstr "��散����"
 
@@ -785,7 +785,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:765 plugins/notify.c:767
+#: plugins/notify.c:795 plugins/notify.c:797
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "��箴���腱��号����ユ���������散��"
 
@@ -1125,7 +1125,7 @@
 msgstr "���恰�倶�����d賢�丞ず羯���(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:908
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:907
 msgid "Buddy List Window"
 msgstr "絅遵���茵����"
 
@@ -1177,8 +1177,8 @@
 msgstr "Windows �����九���� Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
-#: src/gtkprefs.c:2392
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3023
+#: src/gtkprefs.c:2399
 msgid "Buddy List"
 msgstr "絅遵���茵�"
 
@@ -1197,8 +1197,8 @@
 msgstr "絅遵���茵���e幻絮�蕁句�(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:959
-#: src/gtkprefs.c:2393 src/protocols/msn/msn.c:1609
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:958
+#: src/gtkprefs.c:2400 src/protocols/msn/msn.c:1611
 msgid "Conversations"
 msgstr "絲壕�"
 
@@ -1225,219 +1225,219 @@
 
 #: src/about.c:95
 msgid ""
-"Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
-"Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
-"written using Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr ""
-"Gaim ��─�������恰�狗��莅���欠�綺�����倶���� AIM鐚�ICQ鐚�Yahoo!鐚�MSN鐚�IRC鐚�"
-"Jabber鐚�Napster鐚�Zephyr �� Gadu-Gadu�����綺�� Gtk+ ������綛銀札 GPL 莅後��顒��"
-"茵���<BR><BR>"
-
-#: src/about.c:105
+"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+"Gaim ��─�������恰�狗��莅���欠�綺�����倶���� AIM��MSN��Yahoo!��Jabber��ICQ��"
+"IRC��SILC��Novell GroupWise��Napster��Zephyr �� Gadu-Gadu�����綺�� Gtk+ ��"
+"����綛銀札 GPL 莅後��顒��茵���<BR><BR>"
+
+#: src/about.c:106
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #gaim<BR><BR>"
 
-#: src/about.c:110
+#: src/about.c:111
 msgid "Active Developers"
 msgstr "綵���綣�����"
 
-#: src/about.c:111
+#: src/about.c:112
 msgid "maintainer"
 msgstr "膸贋�よ��"
 
-#: src/about.c:113
+#: src/about.c:114
 msgid "lead developer"
 msgstr "蘂�絲弱�����"
 
-#: src/about.c:116
+#: src/about.c:117
 msgid "developer & webmaster"
 msgstr "綣�������臀�膊�"
 
-#: src/about.c:117
+#: src/about.c:118
 msgid "win32 port"
 msgstr "Win32 腱紙�"
 
-#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
+#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
 msgid "developer"
 msgstr "綣�����"
 
-#: src/about.c:124
+#: src/about.c:125
 msgid "support"
 msgstr "����"
 
-#: src/about.c:131
+#: src/about.c:132
 msgid "Crazy Patch Writers"
 msgstr "����茵ヤ�膽�����"
 
-#: src/about.c:146
+#: src/about.c:147
 msgid "Retired Developers"
 msgstr "��篌�綣�����"
 
-#: src/about.c:147
-msgid "former libfaim maintainer"
-msgstr "���� libfaim 膸贋�よ��"
-
 #: src/about.c:148
+msgid "former libfaim maintainer"
+msgstr "���� libfaim 膸贋�よ��"
+
+#: src/about.c:149
 msgid "former lead developer"
 msgstr "����蘂�絲弱�����"
 
-#: src/about.c:151
+#: src/about.c:152
 msgid "former maintainer"
 msgstr "����膸贋�よ��"
 
-#: src/about.c:152
-msgid "former Jabber developer"
-msgstr "���� Jabber 綣�����"
-
 #: src/about.c:153
+msgid "former Jabber developer"
+msgstr "���� Jabber 綣�����"
+
+#: src/about.c:154
 msgid "original author"
 msgstr "��篏���"
 
-#: src/about.c:156
+#: src/about.c:157
 msgid "hacker and designated driver [lazy bum]"
 msgstr "薨�絎√��筝�絮�薊怨���綺�[lazy bum]"
 
-#: src/about.c:164
+#: src/about.c:165
 msgid "Current Translators"
 msgstr "綵���膺肢���"
 
-#: src/about.c:165 src/about.c:203
+#: src/about.c:166 src/about.c:204
 msgid "Catalan"
 msgstr "��羈亥�絨寂�莚�"
 
-#: src/about.c:166 src/about.c:204
+#: src/about.c:167 src/about.c:205
 msgid "Czech"
 msgstr "�桁��莚�"
 
-#: src/about.c:167
+#: src/about.c:168
 msgid "Danish"
 msgstr "筝拷墾莚�"
 
-#: src/about.c:168
-msgid "British English"
-msgstr "�怨�処�沿�"
-
 #: src/about.c:169
+msgid "British English"
+msgstr "�怨�処�沿�"
+
+#: src/about.c:170
 msgid "Canadian English"
 msgstr "���水ぇ�沿�"
 
-#: src/about.c:170 src/about.c:205
+#: src/about.c:171 src/about.c:206
 msgid "German"
 msgstr "緇決�"
 
-#: src/about.c:171 src/about.c:206
+#: src/about.c:172 src/about.c:207
 msgid "Spanish"
 msgstr "茱睡���莚�"
 
-#: src/about.c:172 src/about.c:207
+#: src/about.c:173 src/about.c:208
 msgid "Finnish"
 msgstr "���域�"
 
-#: src/about.c:173 src/about.c:208
+#: src/about.c:174 src/about.c:209
 msgid "French"
 msgstr "羈�莚�"
 
-#: src/about.c:174
+#: src/about.c:175
 msgid "Hebrew"
 msgstr "絽�篌�ア莚�"
 
-#: src/about.c:175
+#: src/about.c:176
 msgid "Hindi"
 msgstr "�医�域�"
 
-#: src/about.c:176
+#: src/about.c:177
 msgid "Hungarian"
 msgstr "�������"
 
-#: src/about.c:177 src/about.c:209
+#: src/about.c:178 src/about.c:210
 msgid "Italian"
 msgstr "�鎀у���"
 
-#: src/about.c:178 src/about.c:211
+#: src/about.c:179 src/about.c:212
 msgid "Korean"
 msgstr "��蕾�莚�"
 
-#: src/about.c:179
+#: src/about.c:180
 msgid "Dutch; Flemish"
 msgstr "�桁�域�"
 
-#: src/about.c:180
+#: src/about.c:181
 msgid "Macedonian"
 msgstr "薊��狗/莚�"
 
-#: src/about.c:181
+#: src/about.c:182
 msgid "Norwegian"
 msgstr "���莚�"
 
-#: src/about.c:182 src/about.c:212
+#: src/about.c:183 src/about.c:213
 msgid "Polish"
 msgstr "羈√�域�"
 
-#: src/about.c:183
+#: src/about.c:184
 msgid "Portuguese"
 msgstr "�∴����莚�"
 
-#: src/about.c:184
+#: src/about.c:185
 msgid "Portuguese-Brazil"
 msgstr "綏頑タ�∴����莚�"
 
-#: src/about.c:185
+#: src/about.c:186
 msgid "Romanian"
 msgstr "臀�薊�絢篋�莚�"
 
-#: src/about.c:186 src/about.c:213
+#: src/about.c:187 src/about.c:214 src/about.c:215
 msgid "Russian"
 msgstr "篆�莚�"
 
-#: src/about.c:187
+#: src/about.c:188
 msgid "Serbian"
 msgstr "紂�絨�膸岩�莚�"
 
-#: src/about.c:188
+#: src/about.c:189
 msgid "Slovenian"
 msgstr "�����絨寂�莚�"
 
-#: src/about.c:189 src/about.c:215
+#: src/about.c:190 src/about.c:217
 msgid "Swedish"
 msgstr "���梧�"
 
-#: src/about.c:190
+#: src/about.c:191
 msgid "Vietnamese"
 msgstr "莇���莚�"
 
-#: src/about.c:190
+#: src/about.c:191
 msgid "Gnome Vi Team"
 msgstr "Gnome 莇���莚㊤�∫��"
 
-#: src/about.c:192
+#: src/about.c:193
 msgid "Simplified Chinese"
 msgstr "膊�篏�筝㊥��"
 
-#: src/about.c:193
+#: src/about.c:194
 msgid "Traditional Chinese"
 msgstr "膵�篏�筝㊥��"
 
-#: src/about.c:200
+#: src/about.c:201
 msgid "Past Translators"
 msgstr "����膺肢���"
 
-#: src/about.c:201
-msgid "Amharic"
-msgstr "�水�����莚�"
-
 #: src/about.c:202
+msgid "Amharic"
+msgstr "�水�����莚�"
+
+#: src/about.c:203
 msgid "Bulgarian"
 msgstr "篆������莚�"
 
-#: src/about.c:210
+#: src/about.c:211
 msgid "Japanese"
 msgstr "�ヨ�"
 
-#: src/about.c:214
+#: src/about.c:216
 msgid "Slovak"
 msgstr "���篌���莚�"
 
-#: src/about.c:216
+#: src/about.c:218
 msgid "Chinese"
 msgstr "筝㊥��"
 
@@ -1473,45 +1473,47 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
-#: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
+#: src/account.c:343 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
+#: src/dialogs.c:571 src/gtkblist.c:2341 src/gtkrequest.c:235
 #: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
-#: src/protocols/oscar/oscar.c:3352 src/protocols/oscar/oscar.c:3446
-#: src/protocols/oscar/oscar.c:6716 src/protocols/oscar/oscar.c:6813
-#: src/protocols/oscar/oscar.c:6865 src/protocols/oscar/oscar.c:6951
-#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1134
-#: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
+#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3447
+#: src/protocols/oscar/oscar.c:6731 src/protocols/oscar/oscar.c:6828
+#: src/protocols/oscar/oscar.c:6880 src/protocols/oscar/oscar.c:6966
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:406 src/protocols/silc/chat.c:444
+#: src/protocols/silc/chat.c:707 src/protocols/silc/ops.c:994
 #: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2642 src/protocols/yahoo/yahoo.c:2651
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2754
 #: src/request.h:1242
 msgid "OK"
 msgstr "隋��"
 
 #: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
-#: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
-#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:818
-#: src/dialogs.c:835 src/dialogs.c:854 src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4352
-#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
+#: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
+#: src/dialogs.c:463 src/dialogs.c:519 src/dialogs.c:572 src/dialogs.c:808
+#: src/dialogs.c:824 src/dialogs.c:842 src/gtkaccount.c:1918
+#: src/gtkaccount.c:2409 src/gtkblist.c:2342 src/gtkblist.c:4377
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:600 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 #: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
 #: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
 #: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:227
 #: src/protocols/msn/msn.c:242 src/protocols/msn/msn.c:257
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3312
-#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3390
-#: src/protocols/oscar/oscar.c:3447 src/protocols/oscar/oscar.c:6717
-#: src/protocols/oscar/oscar.c:6814 src/protocols/oscar/oscar.c:6866
-#: src/protocols/oscar/oscar.c:6935 src/protocols/oscar/oscar.c:6952
-#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1135 src/protocols/silc/chat.c:710
-#: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2643
-#: src/protocols/yahoo/yahoo.c:2652 src/request.h:1242 src/request.h:1252
+#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3313
+#: src/protocols/oscar/oscar.c:3354 src/protocols/oscar/oscar.c:3391
+#: src/protocols/oscar/oscar.c:3448 src/protocols/oscar/oscar.c:6732
+#: src/protocols/oscar/oscar.c:6829 src/protocols/oscar/oscar.c:6881
+#: src/protocols/oscar/oscar.c:6950 src/protocols/oscar/oscar.c:6967
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:579
+#: src/protocols/silc/chat.c:708 src/protocols/silc/ops.c:1406
+#: src/protocols/silc/silc.c:689 src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2755
+#: src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "��羔�"
 
@@ -1543,7 +1545,7 @@
 msgstr "���ょ�綣�羔���"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1359 src/gtkconv.c:3541 src/gtkconv.c:3640
+#: src/away.c:333 src/gtkconv.c:1352 src/gtkconv.c:3570 src/gtkconv.c:3669
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "����"
@@ -1556,11 +1558,11 @@
 msgid "Set All Away"
 msgstr "�����筝榊�綣�"
 
-#: src/blist.c:590
+#: src/blist.c:681
 msgid "Chats"
 msgstr "��紊�"
 
-#: src/blist.c:1192
+#: src/blist.c:1321
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1572,27 +1574,27 @@
 "%2$s 膸�筝㊦�� %1$d 筝�ソ�������わ��������区侃�傑���糸�ャ��菴�篋�絅遵���莚ョ�筝�篌�茴���"
 "�ゃ��\n"
 
-#: src/blist.c:1201
+#: src/blist.c:1330
 msgid "Group not removed"
 msgstr "膸�������"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:721
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
+#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:161 src/gtkutils.c:721
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2730
 msgid "Unknown"
 msgstr "����"
 
-#: src/blist.c:1579
+#: src/blist.c:1721
 msgid "Invalid Groupname"
 msgstr "膸�������"
 
-#: src/blist.c:2236
+#: src/blist.c:2192
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 msgstr ""
 "��������絅遵���茵��九�咲����絅遵���茵�����ワ��ф��篁区←腱糸���� blist.xml~ 筝℡���"
 
-#: src/blist.c:2239
+#: src/blist.c:2195
 msgid "Buddy List Error"
 msgstr "絅遵���茵��咲��"
 
@@ -1622,71 +1624,71 @@
 msgid "Unable to send message."
 msgstr "��羈�����羔�����"
 
-#: src/conversation.c:1957
+#: src/conversation.c:1960
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 菴��ヤ���紊����"
 
-#: src/conversation.c:1960
+#: src/conversation.c:1963
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 菴��ヤ���紊����"
 
-#: src/conversation.c:2051
+#: src/conversation.c:2054
 #, c-format
 msgid "You are now known as %s"
 msgstr "��ー��û�� %s"
 
-#: src/conversation.c:2054
+#: src/conversation.c:2057
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �医��û�� %s��"
 
-#: src/conversation.c:2096
+#: src/conversation.c:2099
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 胼糸�篋���紊��(%s)��"
 
-#: src/conversation.c:2098
+#: src/conversation.c:2101
 #, c-format
 msgid "%s left the room."
 msgstr "%s 胼糸�篋���紊����"
 
-#: src/conversation.c:2169
+#: src/conversation.c:2172
 #, c-format
 msgid "(+%d more)"
 msgstr "(菴��� %d 篋�)"
 
-#: src/conversation.c:2171
+#: src/conversation.c:2174
 #, c-format
 msgid " left the room (%s)."
 msgstr "胼糸�篋���紊��(%s)��"
 
-#: src/conversation.c:2461
+#: src/conversation.c:2464
 msgid "Last created window"
 msgstr "筝�罨≦��綮榊��腦���"
 
-#: src/conversation.c:2463
+#: src/conversation.c:2466
 msgid "Separate IM and Chat windows"
 msgstr "��胼糸�恰�倶�������紊����"
 
-#: src/conversation.c:2465 src/gtkprefs.c:1332
+#: src/conversation.c:2468 src/gtkprefs.c:1335
 msgid "New window"
 msgstr "�医産腦���"
 
-#: src/conversation.c:2467
+#: src/conversation.c:2470
 msgid "By group"
 msgstr "��膸�"
 
-#: src/conversation.c:2469
+#: src/conversation.c:2472
 msgid "By account"
 msgstr "��茣���"
 
-#: src/dialogs.c:154
+#: src/dialogs.c:149
 msgid "Warn User"
 msgstr "茘�������"
 
-#: src/dialogs.c:173
+#: src/dialogs.c:168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1698,47 +1700,47 @@
 "\n"
 "菴�絨�紜��� %s ��茘���膾у���篁�/絅剛�絨�茴�辱�球��翫��筝ユ�主����綺����吟��\n"
 
-#: src/dialogs.c:182
+#: src/dialogs.c:177
 msgid "Warn _anonymously?"
 msgstr "�水��茘�����(_A)鐚�"
 
-#: src/dialogs.c:189
+#: src/dialogs.c:184
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�水��茘���莨�筝�絎号��綣�莎傑絵���</b>"
 
-#: src/dialogs.c:301
+#: src/dialogs.c:295
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "���喝�篁�����絅遵���茵�賢���� %s��������荀�菴�箙�����鐚�"
 
-#: src/dialogs.c:303 src/dialogs.c:304
+#: src/dialogs.c:297 src/dialogs.c:298
 msgid "Remove Buddy"
 msgstr "���ゅソ��"
 
-#: src/dialogs.c:313
+#: src/dialogs.c:307
 #, 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:315 src/dialogs.c:316
+#: src/dialogs.c:309 src/dialogs.c:310
 msgid "Remove Chat"
 msgstr "���よ��紊�"
 
-#: src/dialogs.c:325
+#: src/dialogs.c:319
 #, 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:328 src/dialogs.c:329
+#: src/dialogs.c:322 src/dialogs.c:323
 msgid "Remove Group"
 msgstr "���ょ�"
 
-#: src/dialogs.c:346
+#: src/dialogs.c:340
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1747,104 +1749,104 @@
 "���喝�篁�����絅遵���茵�賢���ゅ���� %s �� %d 筝��九�絅遵�����膤私査��������荀�菴�箙���"
 "��鐚�"
 
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:343 src/dialogs.c:344
 msgid "Remove Contact"
 msgstr "���よ��膤私査"
 
-#: src/dialogs.c:453 src/dialogs.c:509 src/dialogs.c:561
+#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
 msgid "_Screen name"
 msgstr "���桁��(_S)"
 
-#: src/dialogs.c:459 src/dialogs.c:515 src/dialogs.c:567
+#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
 msgid "_Account"
 msgstr "茣���(_A)"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:457
 msgid "New Instant Message"
 msgstr "�医�恰�倶���"
 
-#: src/dialogs.c:468
+#: src/dialogs.c:459
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "���活�莊�莪���鐚�莚決��ヤ�/絅合�����桁����"
 
-#: src/dialogs.c:522
+#: src/dialogs.c:513
 msgid "Get User Info"
 msgstr "�桁����隙拭��"
 
-#: src/dialogs.c:524
+#: src/dialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "���活��ョ��莪���篆≧���莚決��ヤ�/絅合�����桁����"
 
-#: src/dialogs.c:575
+#: src/dialogs.c:566
 msgid "Get User Log"
 msgstr "�桁����傑�ュ�"
 
-#: src/dialogs.c:577
+#: src/dialogs.c:568
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "���活��ョ��莪����ュ�鐚�莚決��ヤ�/絅合�����桁����"
 
-#: src/dialogs.c:632
+#: src/dialogs.c:623
 msgid "You cannot save an away message with a blank title"
 msgstr "����巡�絖�腥堺��蘂���胼糸�羔���"
 
-#: src/dialogs.c:634
+#: src/dialogs.c:625
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "莚欠�羔�����絎���蘂�鐚�����筝�篆�絖��贋・��篏睡������"
 
-#: src/dialogs.c:644
+#: src/dialogs.c:635
 msgid "You cannot create an empty away message"
 msgstr "����遵��綮榊���胼糸�羔���"
 
-#: src/dialogs.c:706
+#: src/dialogs.c:697
 msgid "New away message"
 msgstr "�医産胼糸�羔���"
 
-#: src/dialogs.c:727
+#: src/dialogs.c:718
 msgid "Away title: "
 msgstr "胼糸���蘂�:"
 
-#: src/dialogs.c:783
+#: src/dialogs.c:774
 msgid "_Save"
 msgstr "篆�絖�(_S)"
 
-#: src/dialogs.c:787
+#: src/dialogs.c:778
 msgid "Sa_ve & Use"
 msgstr "篆�絖�綛銀戎��(_V)"
 
-#: src/dialogs.c:791
+#: src/dialogs.c:782
 msgid "_Use"
 msgstr "篏睡��(_U)"
 
-#: src/dialogs.c:814
+#: src/dialogs.c:804
 msgid "Alias Chat"
 msgstr "膸���紊�儀��"
 
-#: src/dialogs.c:815
+#: src/dialogs.c:805
 msgid "Enter an alias for this chat."
 msgstr "莚決��ユ④��紊���������"
 
-#: src/dialogs.c:817 src/dialogs.c:834 src/dialogs.c:853 src/gtkrequest.c:243
-#: src/protocols/silc/chat.c:571
+#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:243
+#: src/protocols/silc/chat.c:569
 msgid "Alias"
 msgstr "����"
 
-#: src/dialogs.c:831
+#: src/dialogs.c:820
 msgid "Alias Contact"
 msgstr "膸���膤私査莎桁��"
 
-#: src/dialogs.c:832
+#: src/dialogs.c:821
 msgid "Enter an alias for this contact."
 msgstr "莚決��ユ④��膤私査��������"
 
-#: src/dialogs.c:849
+#: src/dialogs.c:837
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "莨��� %s ��������"
 
-#: src/dialogs.c:851
+#: src/dialogs.c:839
 msgid "Alias Buddy"
 msgstr "絅遵�����"
 
@@ -1958,19 +1960,19 @@
 msgid "boring default"
 msgstr "筝贋�倶��篋�"
 
-#: src/gaimrc.c:1219 src/gtkblist.c:2960
+#: src/gaimrc.c:1219 src/gtkblist.c:2984
 msgid "Alphabetical"
 msgstr "��絖�罸�綺�"
 
-#: src/gaimrc.c:1221 src/gtkblist.c:2961
+#: src/gaimrc.c:1221 src/gtkblist.c:2985
 msgid "By status"
 msgstr "���倶��"
 
-#: src/gaimrc.c:1223 src/gtkblist.c:2962
+#: src/gaimrc.c:1223 src/gtkblist.c:2986
 msgid "By log size"
 msgstr "���ュ�紊у�"
 
-#: src/gtkaccount.c:289
+#: src/gtkaccount.c:309
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1982,172 +1984,164 @@
 "<b>�上�鎀у�:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:384
+#: src/gtkaccount.c:530
 msgid "Login Options"
 msgstr "�糸�ラ��蕁�"
 
-#: src/gtkaccount.c:401
+#: src/gtkaccount.c:547
 msgid "Protocol:"
 msgstr "�顒�:"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3956
+#: src/gtkaccount.c:552 src/gtkblist.c:3983
 msgid "Screen Name:"
 msgstr "���桁��:"
 
-#: src/gtkaccount.c:479
+#: src/gtkaccount.c:625
 msgid "Password:"
 msgstr "絲���:"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3970 src/gtkblist.c:4299
+#: src/gtkaccount.c:630 src/gtkblist.c:3997 src/gtkblist.c:4325
 msgid "Alias:"
 msgstr "����:"
 
-#: src/gtkaccount.c:488
+#: src/gtkaccount.c:634
 msgid "Remember password"
 msgstr "莅遺�絲���"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:542
+#: src/gtkaccount.c:690
 msgid "User Options"
 msgstr "���潔��蕁�"
 
-#: src/gtkaccount.c:555
+#: src/gtkaccount.c:703
 msgid "New mail notifications"
 msgstr "�育��散����"
 
-#: src/gtkaccount.c:564
-msgid "Buddy icon file:"
-msgstr "絅遵��丈����篁�:"
-
-#: src/gtkaccount.c:574
-msgid "_Browse"
-msgstr "羌頵�(_B)"
-
-#: src/gtkaccount.c:580
-msgid "_Reset"
-msgstr "��臀�(_R)"
+#: src/gtkaccount.c:712
+msgid "Buddy icon:"
+msgstr "絅遵��丈��:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:642
+#: src/gtkaccount.c:801
 #, c-format
 msgid "%s Options"
 msgstr "%s ��蕁�"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:778 src/gtkaccount.c:825
+#: src/gtkaccount.c:937 src/gtkaccount.c:984
 msgid "Use Global Proxy Settings"
 msgstr "篏睡�����篁g��莅丞舟"
 
 #. No Proxy
-#: src/gtkaccount.c:784 src/gtkaccount.c:832
+#: src/gtkaccount.c:943 src/gtkaccount.c:991
 msgid "No Proxy"
 msgstr "��篁g��"
 
 #. HTTP
-#: src/gtkaccount.c:790 src/gtkaccount.c:839
+#: src/gtkaccount.c:949 src/gtkaccount.c:998
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:796 src/gtkaccount.c:846
+#: src/gtkaccount.c:955 src/gtkaccount.c:1005
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:802 src/gtkaccount.c:853
+#: src/gtkaccount.c:961 src/gtkaccount.c:1012
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1136
+#: src/gtkaccount.c:967 src/gtkaccount.c:1019 src/gtkprefs.c:1139
 msgid "Use Environmental Settings"
 msgstr "篏睡��ッ紜�莅丞舟"
 
-#: src/gtkaccount.c:899
+#: src/gtkaccount.c:1058
 msgid "you can see the butterflies mating"
 msgstr "���ュ�����"
 
-#: src/gtkaccount.c:903
+#: src/gtkaccount.c:1062
 msgid "If you look real closely"
 msgstr "筝�篋���莵�莊�"
 
-#: src/gtkaccount.c:919
+#: src/gtkaccount.c:1078
 msgid "Proxy Options"
 msgstr "篁g����蕁�"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1130
+#: src/gtkaccount.c:1096 src/gtkprefs.c:1133
 msgid "Proxy _type:"
 msgstr "篁g��膠糸��(_T):"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1157
+#: src/gtkaccount.c:1105 src/gtkprefs.c:1160
 msgid "_Host:"
 msgstr "筝紙��(_H):"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1175
+#: src/gtkaccount.c:1109 src/gtkprefs.c:1178
 msgid "_Port:"
 msgstr "腴��(_P):"
 
-#: src/gtkaccount.c:958
+#: src/gtkaccount.c:1117
 msgid "_Username:"
 msgstr "���桁��(_U):"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1212
+#: src/gtkaccount.c:1122 src/gtkprefs.c:1215
 msgid "Pa_ssword:"
 msgstr "絲���(_S):"
 
-#: src/gtkaccount.c:1331
+#: src/gtkaccount.c:1494
 msgid "Add Account"
 msgstr "羞糸��茣���"
 
-#: src/gtkaccount.c:1333
+#: src/gtkaccount.c:1496
 msgid "Modify Account"
 msgstr "篆��壕侃��"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1357
+#: src/gtkaccount.c:1520
 msgid "Show more options"
 msgstr "�丞ず������蕁�"
 
-#: src/gtkaccount.c:1358
+#: src/gtkaccount.c:1521
 msgid "Show fewer options"
 msgstr "�丞ず筝肢���蕁�"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:665
+#: src/gtkaccount.c:1548 src/protocols/jabber/jabber.c:665
 msgid "Register"
 msgstr "羈���"
 
-#: src/gtkaccount.c:1739
+#: src/gtkaccount.c:1913
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�������活����� %s ��鐚�"
 
-#: src/gtkaccount.c:1743 src/gtkrequest.c:239
+#: src/gtkaccount.c:1917 src/gtkrequest.c:239
 msgid "Delete"
 msgstr "����"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3980
+#: src/gtkaccount.c:2031 src/protocols/oscar/oscar.c:3981
 msgid "Screen Name"
 msgstr "���桁��"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:957
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5464
-#: src/protocols/oscar/oscar.c:6646 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2385 src/protocols/zephyr/zephyr.c:1167
-#: src/protocols/zephyr/zephyr.c:1177
+#: src/gtkaccount.c:2054 src/protocols/jabber/jabber.c:957
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5463
+#: src/protocols/oscar/oscar.c:6661 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2492 src/protocols/zephyr/zephyr.c:1208
+#: src/protocols/zephyr/zephyr.c:1218
 msgid "Online"
 msgstr "��鎖"
 
-#: src/gtkaccount.c:1898
+#: src/gtkaccount.c:2072
 msgid "Protocol"
 msgstr "�顒�"
 
-#: src/gtkaccount.c:2210
+#: src/gtkaccount.c:2384
 #, 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/gtkaccount.c:2224
+#: src/gtkaccount.c:2398
 msgid ""
 "\n"
 "\n"
@@ -2157,223 +2151,224 @@
 "\n"
 "�������活�絨�篁�/絅号兄��筝堺����絅遵�鐚�"
 
-#: src/gtkaccount.c:2228
+#: src/gtkaccount.c:2402
 msgid "Information"
 msgstr "篆≧��"
 
-#: src/gtkaccount.c:2232
+#: src/gtkaccount.c:2406
 msgid "Add buddy to your list?"
 msgstr "絨����桁��筝阪ソ����鐚�"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4351 src/gtkconv.c:1361
-#: src/gtkconv.c:3534 src/gtkconv.c:3633 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3609
+#: src/gtkaccount.c:2408 src/gtkblist.c:4376 src/gtkconv.c:1354
+#: src/gtkconv.c:3563 src/gtkconv.c:3662 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3610
+#: src/protocols/silc/chat.c:578
 msgid "Add"
 msgstr "羞糸��"
 
-#: src/gtkblist.c:812
+#: src/gtkblist.c:810
 msgid "Join a Chat"
 msgstr "���ヨ��紊�"
 
-#: src/gtkblist.c:833
+#: src/gtkblist.c:831
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "莚決��ユ���活����ョ����紊���絲劫�篆≧����\n"
 
-#: src/gtkblist.c:844 src/gtkpounce.c:445 src/gtkroomlist.c:354
+#: src/gtkblist.c:842 src/gtkpounce.c:445 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "茣���(_A):"
 
-#: src/gtkblist.c:1132 src/gtkblist.c:3153
+#: src/gtkblist.c:1128 src/gtkblist.c:3177
 msgid "Get _Info"
 msgstr "�桁�篆≧��(_I)"
 
-#: src/gtkblist.c:1135 src/gtkblist.c:3144
+#: src/gtkblist.c:1131 src/gtkblist.c:3168
 msgid "I_M"
 msgstr "綣���(_M)"
 
-#: src/gtkblist.c:1137
+#: src/gtkblist.c:1133
 msgid "Add Buddy _Pounce"
 msgstr "羞糸��絅遵�������(_P)"
 
-#: src/gtkblist.c:1139
+#: src/gtkblist.c:1135
 msgid "View _Log"
 msgstr "�ョ���ュ�(_L)"
 
-#: src/gtkblist.c:1147 src/gtkblist.c:1233 src/gtkblist.c:1247
+#: src/gtkblist.c:1143 src/gtkblist.c:1229 src/gtkblist.c:1243
 msgid "_Alias..."
 msgstr "����(_A)..."
 
-#: src/gtkblist.c:1149 src/gtkblist.c:1235 src/gtkblist.c:1252
+#: src/gtkblist.c:1145 src/gtkblist.c:1231 src/gtkblist.c:1248
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "����(_R)"
 
-#: src/gtkblist.c:1195
+#: src/gtkblist.c:1191
 msgid "Add a _Buddy"
 msgstr "羞糸��絅遵�(_B)"
 
-#: src/gtkblist.c:1197
+#: src/gtkblist.c:1193
 msgid "Add a C_hat"
 msgstr "羞糸����紊�(_H)"
 
-#: src/gtkblist.c:1199
+#: src/gtkblist.c:1195
 msgid "_Delete Group"
 msgstr "���ょ�(_D)"
 
-#: src/gtkblist.c:1201
+#: src/gtkblist.c:1197
 msgid "_Rename"
 msgstr "���遵��(_R)"
 
 #. join button
-#: src/gtkblist.c:1223 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1219 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "����(_J)"
 
-#: src/gtkblist.c:1225
+#: src/gtkblist.c:1221
 msgid "Auto-Join"
 msgstr "��������"
 
-#: src/gtkblist.c:1249 src/gtkblist.c:1278
+#: src/gtkblist.c:1245 src/gtkblist.c:1274
 msgid "_Collapse"
 msgstr "����(_C)"
 
-#: src/gtkblist.c:1283
+#: src/gtkblist.c:1279
 msgid "_Expand"
 msgstr "絮�綣�(_E)"
 
-#: src/gtkblist.c:1941 src/gtkconv.c:4166 src/gtkpounce.c:347
+#: src/gtkblist.c:1935 src/gtkconv.c:4199 src/gtkpounce.c:347
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "�������糸�ョ���顒�賢羃≧��筝�筝��札羞糸��絅遵�����"
 
 #. Buddies menu
-#: src/gtkblist.c:2292
+#: src/gtkblist.c:2286
 msgid "/_Buddies"
 msgstr "/絅遵�(_B)"
 
-#: src/gtkblist.c:2293
+#: src/gtkblist.c:2287
 msgid "/Buddies/New Instant _Message..."
 msgstr "/絅遵�(B)/�医�恰�倶���(_M)..."
 
-#: src/gtkblist.c:2294
+#: src/gtkblist.c:2288
 msgid "/Buddies/Join a _Chat..."
 msgstr "/絅遵�(B)/���ヨ��紊�(_C)..."
 
-#: src/gtkblist.c:2295
+#: src/gtkblist.c:2289
 msgid "/Buddies/Get User _Info..."
 msgstr "/絅遵�(B)/�桁����隙拭��(_I)..."
 
-#: src/gtkblist.c:2296
+#: src/gtkblist.c:2290
 msgid "/Buddies/View User _Log..."
 msgstr "/絅遵�(B)/�ョ�����傑�ュ�(_L)..."
 
-#: src/gtkblist.c:2298
+#: src/gtkblist.c:2292
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(_O)"
 
-#: src/gtkblist.c:2299
+#: src/gtkblist.c:2293
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/絅遵�(B)/�丞ず腥榊�(_E)"
 
-#: src/gtkblist.c:2300
+#: src/gtkblist.c:2294
 msgid "/Buddies/_Add Buddy..."
 msgstr "/絅遵�(B)/羞糸��絅遵�(_A)..."
 
-#: src/gtkblist.c:2301
+#: src/gtkblist.c:2295
 msgid "/Buddies/Add C_hat..."
 msgstr "/絅遵�(B)/羞糸����紊�(_H)..."
 
-#: src/gtkblist.c:2302
+#: src/gtkblist.c:2296
 msgid "/Buddies/Add _Group..."
 msgstr "/絅遵�(B)/羞糸��膸�(_G)..."
 
-#: src/gtkblist.c:2304
+#: src/gtkblist.c:2298
 msgid "/Buddies/_Signoff"
 msgstr "/絅遵�(B)/�糸��(_S)"
 
-#: src/gtkblist.c:2305
+#: src/gtkblist.c:2299
 msgid "/Buddies/_Quit"
 msgstr "/絅遵�(B)/����(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2308
+#: src/gtkblist.c:2302
 msgid "/_Tools"
 msgstr "/綏ュ��(_T)"
 
-#: src/gtkblist.c:2309
+#: src/gtkblist.c:2303
 msgid "/Tools/_Away"
 msgstr "/綏ュ��(T)/胼糸�(_A)"
 
+#: src/gtkblist.c:2304
+msgid "/Tools/Buddy _Pounce"
+msgstr "/綏ュ��(T)/絅遵�������(_P)"
+
+#: src/gtkblist.c:2305
+msgid "/Tools/Account Ac_tions"
+msgstr "/綏ュ��(T)/茣��傑��篏�(_T)"
+
+#: src/gtkblist.c:2306
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/綏ュ��(T)/��篁倶��篏�(_U)"
+
+#: src/gtkblist.c:2308
+msgid "/Tools/A_ccounts"
+msgstr "/綏ュ��(T)/茣���(_C)"
+
+#: src/gtkblist.c:2309
+msgid "/Tools/_File Transfers"
+msgstr "/綏ュ��(T)/��篁銀���(_F)"
+
 #: src/gtkblist.c:2310
-msgid "/Tools/Buddy _Pounce"
-msgstr "/綏ュ��(T)/絅遵�������(_P)"
+msgid "/Tools/R_oom List"
+msgstr "/綏ュ��(T)/�翠�翫��茵�(_O)"
 
 #: src/gtkblist.c:2311
-msgid "/Tools/Account Ac_tions"
-msgstr "/綏ュ��(T)/茣��傑��篏�(_T)"
+msgid "/Tools/Pr_eferences"
+msgstr "/綏ュ��(T)/薤���蕁�(_E)"
 
 #: src/gtkblist.c:2312
-msgid "/Tools/Pl_ugin Actions"
-msgstr "/綏ュ��(T)/��篁倶��篏�(_U)"
+msgid "/Tools/Pr_ivacy"
+msgstr "/綏ュ��(T)/��腱�(_I)"
 
 #: src/gtkblist.c:2314
-msgid "/Tools/A_ccounts"
-msgstr "/綏ュ��(T)/茣���(_C)"
-
-#: src/gtkblist.c:2315
-msgid "/Tools/_File Transfers"
-msgstr "/綏ュ��(T)/��篁銀���(_F)"
-
-#: src/gtkblist.c:2316
-msgid "/Tools/R_oom List"
-msgstr "/綏ュ��(T)/�翠�翫��茵�(_O)"
-
-#: src/gtkblist.c:2317
-msgid "/Tools/Pr_eferences"
-msgstr "/綏ュ��(T)/薤���蕁�(_E)"
-
-#: src/gtkblist.c:2318
-msgid "/Tools/Pr_ivacy"
-msgstr "/綏ュ��(T)/��腱�(_I)"
-
-#: src/gtkblist.c:2320
 msgid "/Tools/View System _Log"
 msgstr "/綏ュ��(T)/�ョ��膤紫��ュ�(_L)"
 
 #. Help
-#: src/gtkblist.c:2323
+#: src/gtkblist.c:2317
 msgid "/_Help"
 msgstr "/絽���(_H)"
 
-#: src/gtkblist.c:2324
+#: src/gtkblist.c:2318
 msgid "/Help/Online _Help"
 msgstr "/絽���(H)/��鎖絽���(_H)"
 
-#: src/gtkblist.c:2325
+#: src/gtkblist.c:2319
 msgid "/Help/_Debug Window"
 msgstr "/絽���(H)/莪�莚�腦���(_D)"
 
-#: src/gtkblist.c:2326
+#: src/gtkblist.c:2320
 msgid "/Help/_About"
 msgstr "/絽���(H)/�割�(_A)"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2338
 msgid "Rename Group"
 msgstr "���遵��膸�"
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2338
 msgid "New group name"
 msgstr "�亥���腱�"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2339
 msgid "Please enter a new name for the selected group."
 msgstr "莚決��ラ��筝㊦����医��絖���"
 
-#: src/gtkblist.c:2371
+#: src/gtkblist.c:2367
 #, c-format
 msgid ""
 "\n"
@@ -2382,7 +2377,7 @@
 "\n"
 "<b>茣���:</b>%s"
 
-#: src/gtkblist.c:2435
+#: src/gtkblist.c:2431
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2390,12 +2385,12 @@
 "\n"
 "<b>�倶��:</b> 胼紫鎖"
 
-#: src/gtkblist.c:2450
+#: src/gtkblist.c:2446
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2466
+#: src/gtkblist.c:2462
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2403,7 +2398,7 @@
 "\n"
 "<b>茣���:</b>"
 
-#: src/gtkblist.c:2467
+#: src/gtkblist.c:2463
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2411,7 +2406,7 @@
 "\n"
 "<b>��膤私査����:</b>"
 
-#: src/gtkblist.c:2468
+#: src/gtkblist.c:2464
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2419,7 +2414,7 @@
 "\n"
 "<b>����:</b>"
 
-#: src/gtkblist.c:2469
+#: src/gtkblist.c:2465
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2427,7 +2422,7 @@
 "\n"
 "<b>�窮О:</b>"
 
-#: src/gtkblist.c:2470
+#: src/gtkblist.c:2466
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2435,7 +2430,7 @@
 "\n"
 "<b>�糸��:</b>"
 
-#: src/gtkblist.c:2471
+#: src/gtkblist.c:2467
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2443,7 +2438,7 @@
 "\n"
 "<b>����:</b>"
 
-#: src/gtkblist.c:2472
+#: src/gtkblist.c:2468
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2451,7 +2446,7 @@
 "\n"
 "<b>茘���:</b>"
 
-#: src/gtkblist.c:2474
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2459,7 +2454,7 @@
 "\n"
 "<b>�颷�:</b>�ヨ�"
 
-#: src/gtkblist.c:2475
+#: src/gtkblist.c:2471
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2467,7 +2462,7 @@
 "\n"
 "<b>�倶��</b>: ����"
 
-#: src/gtkblist.c:2476
+#: src/gtkblist.c:2472
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2475,96 +2470,96 @@
 "\n"
 "<b>�倶��</b>: 羞隙恒"
 
-#: src/gtkblist.c:2747
+#: src/gtkblist.c:2771
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "���>賢 (%d絨��%02d��) "
 
-#: src/gtkblist.c:2749
+#: src/gtkblist.c:2773
 #, c-format
 msgid "Idle (%dm) "
 msgstr "����賢 (%d��) "
 
-#: src/gtkblist.c:2754
+#: src/gtkblist.c:2778
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%) "
 
-#: src/gtkblist.c:2757
+#: src/gtkblist.c:2781
 msgid "Offline "
 msgstr "胼紫鎖 "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2875
+#: src/gtkblist.c:2899
 msgid "/Buddies/Join a Chat..."
 msgstr "/絅遵�(B)/���ヨ��紊�(C)..."
 
-#: src/gtkblist.c:2878
+#: src/gtkblist.c:2902
 msgid "/Tools/Room List"
 msgstr "/綏ュ��(T)/�翠�翫��茵�(O)"
 
-#: src/gtkblist.c:2881
+#: src/gtkblist.c:2905
 msgid "/Tools/Privacy"
 msgstr "/綏ュ��(T)/��腱�(I)"
 
-#: src/gtkblist.c:3026
+#: src/gtkblist.c:3050
 msgid "/Tools/Away"
 msgstr "/綏ュ��(T)/胼糸�(A)"
 
-#: src/gtkblist.c:3029
+#: src/gtkblist.c:3053
 msgid "/Tools/Buddy Pounce"
 msgstr "/綏ュ��(T)/絅遵�������(P)"
 
-#: src/gtkblist.c:3032
+#: src/gtkblist.c:3056
 msgid "/Tools/Account Actions"
 msgstr "/綏ュ��(T)/茣��傑��篏�(T)"
 
-#: src/gtkblist.c:3035
+#: src/gtkblist.c:3059
 msgid "/Tools/Plugin Actions"
 msgstr "/綏ュ��(T)/��篁倶��篏�(U)"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3124
+#: src/gtkblist.c:3148
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(O)"
 
-#: src/gtkblist.c:3126
-msgid "/Buddies/Show Empty Groups"
-msgstr "/絅遵�(B)/�丞ず腥榊�(E)"
-
 #: src/gtkblist.c:3150
+msgid "/Buddies/Show Empty Groups"
+msgstr "/絅遵�(B)/�丞ず腥榊�(E)"
+
+#: src/gtkblist.c:3174
 msgid "Send a message to the selected buddy"
 msgstr "����筝㊤ソ������羔���"
 
-#: src/gtkblist.c:3159
+#: src/gtkblist.c:3183
 msgid "Get information on the selected buddy"
 msgstr "�桁���筝㊤ソ����篆≧��"
 
-#: src/gtkblist.c:3162
+#: src/gtkblist.c:3186
 msgid "_Chat"
 msgstr "��紊�(_C)"
 
-#: src/gtkblist.c:3167
+#: src/gtkblist.c:3191
 msgid "Join a chat room"
 msgstr "���ヨ��紊��"
 
-#: src/gtkblist.c:3170
+#: src/gtkblist.c:3194
 msgid "_Away"
 msgstr "胼糸�(_A)"
 
-#: src/gtkblist.c:3175
+#: src/gtkblist.c:3199
 msgid "Set an away message"
 msgstr "莅丞舟胼糸�羔���"
 
-#: src/gtkblist.c:3910 src/protocols/silc/buddy.c:731
-#: src/protocols/silc/buddy.c:991 src/protocols/silc/buddy.c:1036
-#: src/protocols/silc/buddy.c:1126 src/protocols/yahoo/yahoo.c:2566
+#: src/gtkblist.c:3937 src/protocols/silc/buddy.c:731
+#: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2672
 msgid "Add Buddy"
 msgstr "羞糸��絅遵�"
 
-#: src/gtkblist.c:3934
+#: src/gtkblist.c:3961
 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. "
@@ -2574,35 +2569,35 @@
 "��莚�鐚�����絨�篌��推撮���桁���丞ず��\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3994 src/gtkblist.c:4279
+#: src/gtkblist.c:4021 src/gtkblist.c:4305
 msgid "Account:"
 msgstr "茣���:"
 
-#: src/gtkblist.c:4238
+#: src/gtkblist.c:4264
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "�������糸�ョ���顒�賢羃≧��筝�筝��札��紊�����"
 
-#: src/gtkblist.c:4245
+#: src/gtkblist.c:4271
 msgid "Add Chat"
 msgstr "羞糸����紊�"
 
-#: src/gtkblist.c:4269
+#: src/gtkblist.c:4295
 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/gtkblist.c:4348
+#: src/gtkblist.c:4373
 msgid "Add Group"
 msgstr "羞糸��膸�"
 
-#: src/gtkblist.c:4349
+#: src/gtkblist.c:4374
 msgid "Please enter the name of the group to be added."
 msgstr "莚決��ヨ�羞糸����膸���腱違��"
 
-#: src/gtkblist.c:4916 src/gtkblist.c:5013
+#: src/gtkblist.c:4941 src/gtkblist.c:5038
 msgid "No actions available"
 msgstr "羃≧����������篏�"
 
@@ -2651,41 +2646,41 @@
 msgid "Time"
 msgstr "�狗��"
 
-#: src/gtkconv.c:173
+#: src/gtkconv.c:168
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>筝� %s ��莪�莚�</h1>\n"
 
-#: src/gtkconv.c:191 src/gtkdebug.c:212
+#: src/gtkconv.c:186 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "莚ユ��篁銀�絖���"
 
-#: src/gtkconv.c:192 src/gtkdebug.c:213 src/gtkft.c:1123
+#: src/gtkconv.c:187 src/gtkdebug.c:213 src/gtkft.c:1123
 msgid "Would you like to overwrite it?"
 msgstr "�������活�荀���鐚�"
 
-#: src/gtkconv.c:370
+#: src/gtkconv.c:365
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr "��罩e��戎�� Gaim v%s��"
 
-#: src/gtkconv.c:379
+#: src/gtkconv.c:374
 msgid "Supported debug options are:  version"
-msgstr "������莪�莚���蕁号��鐚�version"
-
-#: src/gtkconv.c:392
+msgstr "������莪�莚���蕁号��: version"
+
+#: src/gtkconv.c:387
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 "篏睡����/help &lt;�巡擦&gt;����キ緇��隙��巡擦��絽�����\n"
-"罩ょッ紜�筝���戎������巡擦鐚�\n"
-
-#: src/gtkconv.c:426
+"罩ょッ紜�筝���戎������巡擦:\n"
+
+#: src/gtkconv.c:421
 msgid "No such command (in this context)."
 msgstr "羃≧��菴��欠���巡擦(��④���筝�)��"
 
-#: src/gtkconv.c:473
+#: src/gtkconv.c:468
 msgid ""
 "No such command. If you didn't mean to type a command, you can turn commands "
 "off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
@@ -2694,360 +2689,360 @@
 "羃≧��菴��欠���巡擦��絋��������ュ攻筝��活��ュ�巡擦鐚����札��轡��->薤���蕁�->����->莉���->"
 "��������膾垂���巡擦筝㊤�渇�㊤�巡擦��"
 
-#: src/gtkconv.c:481
+#: src/gtkconv.c:476
 msgid ""
 "Syntax Error:  You typed the wrong number of arguments to that command. If "
 "you didn't mean to type a command, you can turn commands off from Tools-"
 ">Preferences->Interface->Conversation->Enable \"slash\" commands."
 msgstr ""
-"莚㊥���莚����減�巡擦莨��ョ�����遺肩�遺�絲鴻��絋��������ュ攻筝��活��ュ�巡擦鐚����札��轡��-"
+"莚㊥���莚�: ��減�巡擦莨��ョ�����遺肩�遺�絲鴻��絋��������ュ攻筝��活��ュ�巡擦鐚����札��轡��-"
 ">薤���蕁�->����->莉���->��������膾垂���巡擦筝㊤�渇�㊤�巡擦��"
 
-#: src/gtkconv.c:488
+#: src/gtkconv.c:483
 msgid "Your command failed for an unknown reason."
 msgstr "�����巡擦紊沿乾鐚��������ャ��"
 
-#: src/gtkconv.c:495
+#: src/gtkconv.c:490
 msgid "That command only works in Chats, not IMs."
 msgstr "�巡擦������紊�賢�����絲壕�筝㊥������"
 
-#: src/gtkconv.c:498
+#: src/gtkconv.c:493
 msgid "That command only works in IMs, not Chats."
 msgstr "�巡擦�����莚�筝㊤������紊�賢������"
 
-#: src/gtkconv.c:502
+#: src/gtkconv.c:497
 msgid "That command doesn't work on this protocol."
 msgstr "�巡擦��羈���④�顒��綏ヤ���"
 
-#: src/gtkconv.c:718
+#: src/gtkconv.c:713
 msgid "Invite Buddy Into Chat Room"
 msgstr "��莚桁ソ��菴��ヨ��紊��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:746
+#: src/gtkconv.c:741
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "���活���莚決�鐚�莚決��ヤ�/絅合����絖�鐚�篁ュ���������莚傑�����"
 
-#: src/gtkconv.c:767
+#: src/gtkconv.c:762
 msgid "_Buddy:"
 msgstr "絅遵�(_B):"
 
-#: src/gtkconv.c:787
+#: src/gtkconv.c:782
 msgid "_Message:"
 msgstr "羔���(_M):"
 
-#: src/gtkconv.c:895 src/gtkdebug.c:127
+#: src/gtkconv.c:890 src/gtkdebug.c:127
 msgid "Find"
 msgstr "�ユ��"
 
-#: src/gtkconv.c:921 src/gtkdebug.c:155
+#: src/gtkconv.c:916 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "��膣∽��絖�(_S):"
 
-#: src/gtkconv.c:1319
+#: src/gtkconv.c:1312
 msgid "IM"
 msgstr "綣���"
 
-#: src/gtkconv.c:1327
+#: src/gtkconv.c:1320
 msgid "Un-Ignore"
 msgstr "��羔�綽順��"
 
-#: src/gtkconv.c:1329 src/gtkprefs.c:779
+#: src/gtkconv.c:1322 src/gtkprefs.c:778
 msgid "Ignore"
 msgstr "綽順��"
 
 #. Info button
-#: src/gtkconv.c:1338 src/gtkconv.c:3548
+#: src/gtkconv.c:1331 src/gtkconv.c:3577
 msgid "Info"
 msgstr "篆≧��"
 
-#: src/gtkconv.c:1347
+#: src/gtkconv.c:1340
 msgid "Get Away Msg"
 msgstr "�桁�胼糸�羔���"
 
-#: src/gtkconv.c:2435
+#: src/gtkconv.c:2467
 msgid "Animate"
 msgstr "����"
 
-#: src/gtkconv.c:2440
+#: src/gtkconv.c:2472
 msgid "Hide Icon"
 msgstr "����憝��"
 
-#: src/gtkconv.c:2446
+#: src/gtkconv.c:2478
 msgid "Save Icon As..."
 msgstr "�丈�����筝�..."
 
-#: src/gtkconv.c:2818
+#: src/gtkconv.c:2847
 msgid "User is typing..."
 msgstr "���傑③����絖�..."
 
-#: src/gtkconv.c:2826
+#: src/gtkconv.c:2855
 msgid "User has typed something and paused"
 msgstr "���傑��篋���筝��鐚���篋�筝�筝�"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2929
+#: src/gtkconv.c:2958
 msgid "_Send As"
 msgstr "����荳�蚕(_S)"
 
-#: src/gtkconv.c:3306
+#: src/gtkconv.c:3335
 msgid "Save Conversation"
 msgstr "篆�絖�絲壕�"
 
 #. Conversation menu
-#: src/gtkconv.c:3323
+#: src/gtkconv.c:3352
 msgid "/_Conversation"
 msgstr "/絲壕�(_C)"
 
-#: src/gtkconv.c:3325
+#: src/gtkconv.c:3354
 msgid "/Conversation/New Instant _Message..."
 msgstr "/絲壕�(C)/�医�恰�倶���(_M)..."
 
-#: src/gtkconv.c:3330
+#: src/gtkconv.c:3359
 msgid "/Conversation/_Find..."
 msgstr "/絲壕�(C)/�ユ��(_F)..."
 
-#: src/gtkconv.c:3332
+#: src/gtkconv.c:3361
 msgid "/Conversation/View _Log"
 msgstr "/絲壕�(C)/�ョ���ュ�(_L)"
 
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3362
 msgid "/Conversation/_Save As..."
 msgstr "/絲壕�(C)/���筝�(_S)..."
 
-#: src/gtkconv.c:3335
+#: src/gtkconv.c:3364
 msgid "/Conversation/Clear"
 msgstr "/絲壕�(C)/羝���"
 
-#: src/gtkconv.c:3339
+#: src/gtkconv.c:3368
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/絲壕�(C)/羞糸��絅遵�������(_P)..."
 
-#: src/gtkconv.c:3341
+#: src/gtkconv.c:3370
 msgid "/Conversation/_Get Info"
 msgstr "/絲壕�(C)/�桁�篆≧��(_G)"
 
-#: src/gtkconv.c:3343
+#: src/gtkconv.c:3372
 msgid "/Conversation/_Warn..."
 msgstr "/絲壕�(C)/茘���(_W)..."
 
-#: src/gtkconv.c:3345
+#: src/gtkconv.c:3374
 msgid "/Conversation/In_vite..."
 msgstr "/絲壕�(C)/��莚�(_V)..."
 
-#: src/gtkconv.c:3350
+#: src/gtkconv.c:3379
 msgid "/Conversation/A_lias..."
 msgstr "/絲壕�(C)/����(_L)..."
 
-#: src/gtkconv.c:3352
+#: src/gtkconv.c:3381
 msgid "/Conversation/_Block..."
 msgstr "/絲壕�(C)/絮��(_B)..."
 
-#: src/gtkconv.c:3354
+#: src/gtkconv.c:3383
 msgid "/Conversation/_Add..."
 msgstr "/鎛壕�(C)/羞糸��(_A)..."
 
-#: src/gtkconv.c:3356
+#: src/gtkconv.c:3385
 msgid "/Conversation/_Remove..."
 msgstr "/絲壕�(C)/����(_R)..."
 
-#: src/gtkconv.c:3361
+#: src/gtkconv.c:3390
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/絲壕�(C)/���ラ�丈・(_K)..."
 
-#: src/gtkconv.c:3363
+#: src/gtkconv.c:3392
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/絲壕�(C)/���ュ�上��(_E)..."
 
-#: src/gtkconv.c:3368
+#: src/gtkconv.c:3397
 msgid "/Conversation/_Close"
 msgstr "/絲壕�(C)/�渇��(_C)"
 
 #. Options
-#: src/gtkconv.c:3372
+#: src/gtkconv.c:3401
 msgid "/_Options"
 msgstr "/��蕁�(_O)"
 
-#: src/gtkconv.c:3373
+#: src/gtkconv.c:3402
 msgid "/Options/Enable _Logging"
 msgstr "/��蕁�(O)/��莅梧�綵��ュ�(_L)"
 
-#: src/gtkconv.c:3374
+#: src/gtkconv.c:3403
 msgid "/Options/Enable _Sounds"
 msgstr "/��蕁�(O)/��莅後0��(_S)"
 
-#: src/gtkconv.c:3375
+#: src/gtkconv.c:3404
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/��蕁�(O)/�丞ず�弱�綏ュ�傑��(_T)"
 
-#: src/gtkconv.c:3376
+#: src/gtkconv.c:3405
 msgid "/Options/Show T_imestamps"
 msgstr "/��蕁�/�丞ず�狗�贋��(_I)"
 
-#: src/gtkconv.c:3418
+#: src/gtkconv.c:3447
 msgid "/Conversation/View Log"
 msgstr "/絲壕�(C)/�ョ���ュ�(L)"
 
-#: src/gtkconv.c:3423
+#: src/gtkconv.c:3452
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/絲壕�(C)/羞糸��絅遵�������(P)..."
 
-#: src/gtkconv.c:3429
+#: src/gtkconv.c:3458
 msgid "/Conversation/Get Info"
 msgstr "/絲壕�(C)/�桁�篆≧��(G)"
 
-#: src/gtkconv.c:3433
+#: src/gtkconv.c:3462
 msgid "/Conversation/Warn..."
 msgstr "/絲壕�(C)/茘���(W)..."
 
-#: src/gtkconv.c:3437
+#: src/gtkconv.c:3466
 msgid "/Conversation/Invite..."
 msgstr "/絲壕�(C)/��莚�(V)..."
 
-#: src/gtkconv.c:3443
+#: src/gtkconv.c:3472
 msgid "/Conversation/Alias..."
 msgstr "/絲壕�(C)/����(L)..."
 
-#: src/gtkconv.c:3447
+#: src/gtkconv.c:3476
 msgid "/Conversation/Block..."
 msgstr "/絲壕�(C)/絮��(B)..."
 
-#: src/gtkconv.c:3451
+#: src/gtkconv.c:3480
 msgid "/Conversation/Add..."
 msgstr "/鎛壕�(C)/羞糸��(A)..."
 
-#: src/gtkconv.c:3455
+#: src/gtkconv.c:3484
 msgid "/Conversation/Remove..."
 msgstr "/絲壕�(C)/����(R)..."
 
-#: src/gtkconv.c:3461
+#: src/gtkconv.c:3490
 msgid "/Conversation/Insert Link..."
 msgstr "/絲壕�(C)/���ラ�丈・(K)..."
 
-#: src/gtkconv.c:3465
+#: src/gtkconv.c:3494
 msgid "/Conversation/Insert Image..."
 msgstr "/絲壕�(C)/���ュ�上��(I)..."
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3500
 msgid "/Options/Enable Logging"
 msgstr "/��蕁�(O)/��莅梧�綵�(L)"
 
-#: src/gtkconv.c:3474
+#: src/gtkconv.c:3503
 msgid "/Options/Enable Sounds"
 msgstr "/��蕁�(O)/��莅後0��(S)"
 
-#: src/gtkconv.c:3477
+#: src/gtkconv.c:3506
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/��蕁�(O)/�丞ず�弱�綏ュ�傑��(T)"
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3509
 msgid "/Options/Show Timestamps"
 msgstr "/��蕁�/�丞ず�狗�贋��(I)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3504 src/gtkconv.c:3506 src/gtkconv.c:3612 src/gtkconv.c:3614
+#: src/gtkconv.c:3533 src/gtkconv.c:3535 src/gtkconv.c:3641 src/gtkconv.c:3643
 msgid "Send"
 msgstr "����"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3520
+#: src/gtkconv.c:3549
 msgid "Warn"
 msgstr "茘���"
 
-#: src/gtkconv.c:3523
+#: src/gtkconv.c:3552
 msgid "Warn the user"
 msgstr "茘�������"
 
 #. Block button
-#: src/gtkconv.c:3527 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkconv.c:3556 src/gtkprivacy.c:624 src/gtkprivacy.c:635
 msgid "Block"
 msgstr "絮��"
 
-#: src/gtkconv.c:3530
+#: src/gtkconv.c:3559
 msgid "Block the user"
 msgstr "鎡�恝����"
 
-#: src/gtkconv.c:3537
+#: src/gtkconv.c:3566
 msgid "Add the user to your buddy list"
 msgstr "絨����桁��筝阪ソ��"
 
-#: src/gtkconv.c:3544
+#: src/gtkconv.c:3573
 msgid "Remove the user from your buddy list"
 msgstr "篁�����絅遵���茵�賢���よ�����"
 
-#: src/gtkconv.c:3551 src/gtkconv.c:3895
+#: src/gtkconv.c:3580 src/gtkconv.c:3923
 msgid "Get the user's information"
 msgstr "�桁����隙拭��"
 
 #. Invite
-#: src/gtkconv.c:3626
+#: src/gtkconv.c:3655
 msgid "Invite"
 msgstr "��莚�"
 
-#: src/gtkconv.c:3629
+#: src/gtkconv.c:3658
 msgid "Invite a user"
 msgstr "��莚欠����"
 
-#: src/gtkconv.c:3636
+#: src/gtkconv.c:3665
 msgid "Add the chat to your buddy list"
 msgstr "絨���紊�兄���井����絅遵���茵�"
 
-#: src/gtkconv.c:3643
+#: src/gtkconv.c:3672
 msgid "Remove the chat from your buddy list"
 msgstr "篁�����絅遵���茵�賢���よ��紊�"
 
-#: src/gtkconv.c:3753
+#: src/gtkconv.c:3782
 msgid "Topic:"
 msgstr "莚�蘂�:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3817
+#: src/gtkconv.c:3845
 msgid "0 people in room"
 msgstr "��紊����羃≧��篋�"
 
-#: src/gtkconv.c:3872
+#: src/gtkconv.c:3900
 msgid "IM the user"
 msgstr "膸����桁����恰�倶���"
 
-#: src/gtkconv.c:3884
+#: src/gtkconv.c:3912
 msgid "Ignore the user"
 msgstr "綽順�ョ����"
 
-#: src/gtkconv.c:4457
+#: src/gtkconv.c:4490
 msgid "Close conversation"
 msgstr "�渇�㊤�莚�"
 
-#: src/gtkconv.c:4998 src/gtkconv.c:5030 src/gtkconv.c:5151 src/gtkconv.c:5218
+#: src/gtkconv.c:5035 src/gtkconv.c:5067 src/gtkconv.c:5188 src/gtkconv.c:5255
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "��紊������ %d 筝�査"
 
-#: src/gtkconv.c:5733 src/gtkconv.c:5736
+#: src/gtkconv.c:5757 src/gtkconv.c:5760
 msgid "<main>/Conversation/Close"
 msgstr "<main>/絲壕�(C)/�渇��(C)"
 
-#: src/gtkconv.c:6107
+#: src/gtkconv.c:6132
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;���&gt;鐚���絅遵�����紊���� IRC 蕋��主�������"
-
-#: src/gtkconv.c:6110
+msgstr "me &lt;���&gt;: ��絅遵�����紊���� IRC 蕋��主�������"
+
+#: src/gtkconv.c:6135
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "debug &lt;��蕁�&gt;鐚������絲壕�筝㊤�����腱�莪�莚�篆≧����"
-
-#: src/gtkconv.c:6114
+msgstr "debug &lt;��蕁�&gt;: �����絲壕�筝㊤�����腱�莪�莚�篆≧����"
+
+#: src/gtkconv.c:6139
 msgid "help:  List available commands."
-msgstr "help鐚����阪������巡擦��"
-
-#: src/gtkconv.c:6118
+msgstr "help: ���阪������巡擦��"
+
+#: src/gtkconv.c:6143
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;�巡擦&gt;鐚��割��隙��巡擦��絽�����"
+msgstr "help &lt;�巡擦&gt;: �割��隙��巡擦��絽�����"
 
 #: src/gtkdebug.c:226
 msgid "Save Debug Log"
@@ -3178,7 +3173,7 @@
 msgstr "莚ユ��篁銀�絖�����"
 
 #. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1025
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1023
 msgid "Open..."
 msgstr "��綣�..."
 
@@ -3207,46 +3202,46 @@
 "菴�腮�筝紙��: %s\n"
 "菴�腮�腴��: %d"
 
-#: src/gtkimhtml.c:559
+#: src/gtkimhtml.c:567
 msgid "Pa_ste As Text"
 msgstr "靕�茣岩減����(_S)"
 
-#: src/gtkimhtml.c:1004
+#: src/gtkimhtml.c:1012
 msgid "Hyperlink color"
 msgstr "莇�膾ч�丈・蘂���"
 
-#: src/gtkimhtml.c:1005
+#: src/gtkimhtml.c:1013
 msgid "Color to draw hyperlinks."
 msgstr "膸��区�膾ч�丈・��蘂��蚊��"
 
-#: src/gtkimhtml.c:1211
+#: src/gtkimhtml.c:1218
 msgid "_Copy E-Mail Address"
 msgstr "紊��句�球���散�医��(_C)"
 
-#: src/gtkimhtml.c:1223
+#: src/gtkimhtml.c:1230
 msgid "_Copy Link Location"
 msgstr "紊��狗�丈・�医��(_C)"
 
-#: src/gtkimhtml.c:1233
+#: src/gtkimhtml.c:1240
 msgid "_Open Link in Browser"
 msgstr "���茹���賢��綣��丈・(_O)"
 
-#: src/gtkimhtml.c:2669
+#: src/gtkimhtml.c:2761
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim ��羈��号���箴�����篁倶�������羌��上�靏糸������藥�莅ゅ�取�筝� PNG��"
 
-#: src/gtkimhtml.c:2677
+#: src/gtkimhtml.c:2769
 #, c-format
 msgid "Error saving image: %s"
 msgstr "篆�絖��上��尌��: %s"
 
-#: src/gtkimhtml.c:2686
+#: src/gtkimhtml.c:2778
 msgid "Save Image"
 msgstr "篆�絖��上��"
 
-#: src/gtkimhtml.c:2709
+#: src/gtkimhtml.c:2801
 msgid "_Save Image..."
 msgstr "篆�絖��上��(_S)..."
 
@@ -3288,65 +3283,65 @@
 msgid "_Insert"
 msgstr "����(_I)"
 
-#: src/gtkimhtmltoolbar.c:473
+#: src/gtkimhtmltoolbar.c:472
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "絖����上�鎀沿乾: %s\n"
 
-#: src/gtkimhtmltoolbar.c:499
+#: src/gtkimhtmltoolbar.c:498
 msgid "Insert Image"
 msgstr "���ュ�上��"
 
-#: src/gtkimhtmltoolbar.c:638
+#: src/gtkimhtmltoolbar.c:637
 msgid "This theme has no available smileys."
 msgstr "罩や源蘂�羃≧��������膃��吾��"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:653
+#: src/gtkimhtmltoolbar.c:652
 msgid "Smile!"
 msgstr "膃���"
 
-#: src/gtkimhtmltoolbar.c:871
+#: src/gtkimhtmltoolbar.c:870
 msgid "Bold"
 msgstr "膕�篏�"
 
-#: src/gtkimhtmltoolbar.c:882
+#: src/gtkimhtmltoolbar.c:881
 msgid "Italic"
 msgstr "��篏�"
 
-#: src/gtkimhtmltoolbar.c:893
+#: src/gtkimhtmltoolbar.c:892
 msgid "Underline"
 msgstr "筝���膾�"
 
-#: src/gtkimhtmltoolbar.c:909
+#: src/gtkimhtmltoolbar.c:908
 msgid "Larger font size"
 msgstr "莨�紊у�篏�"
 
-#: src/gtkimhtmltoolbar.c:921
+#: src/gtkimhtmltoolbar.c:920
 msgid "Smaller font size"
 msgstr "莨�絨鎕�篏�"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:937
 msgid "Font Face"
 msgstr "絖�篏�"
 
-#: src/gtkimhtmltoolbar.c:950
+#: src/gtkimhtmltoolbar.c:949
 msgid "Foreground font color"
 msgstr "絖�篏�蘂���"
 
-#: src/gtkimhtmltoolbar.c:962
+#: src/gtkimhtmltoolbar.c:961
 msgid "Background color"
 msgstr "�������"
 
-#: src/gtkimhtmltoolbar.c:977
+#: src/gtkimhtmltoolbar.c:976
 msgid "Insert link"
 msgstr "���ラ�丈・"
 
-#: src/gtkimhtmltoolbar.c:987
+#: src/gtkimhtmltoolbar.c:986
 msgid "Insert image"
 msgstr "���ュ�上��"
 
-#: src/gtkimhtmltoolbar.c:998
+#: src/gtkimhtmltoolbar.c:997
 msgid "Insert smiley"
 msgstr "���ョ���"
 
@@ -3571,168 +3566,172 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "���ョ�������若��莚傑�ュ��罩ら��莚��"
 
-#: src/gtkprefs.c:402
+#: src/gtkprefs.c:401
 msgid "Interface Options"
 msgstr "���∫��蕁�"
 
-#: src/gtkprefs.c:404
+#: src/gtkprefs.c:403
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "絋������臀��������丞ず菴�腮��窮О(_I)"
 
-#: src/gtkprefs.c:628
+#: src/gtkprefs.c:627
 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:668
+#: src/gtkprefs.c:667
 msgid "Icon"
 msgstr "�丈��"
 
-#: src/gtkprefs.c:675 src/gtkprefs.c:2192 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:674 src/gtkprefs.c:2199 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "�颷�"
 
-#: src/gtkprefs.c:771
+#: src/gtkprefs.c:770
 msgid "Display"
 msgstr "�丞ず"
 
-#: src/gtkprefs.c:772
+#: src/gtkprefs.c:771
 msgid "Show _timestamp on messages"
 msgstr "羔����丞ず�狗�贋��(_T)"
 
-#: src/gtkprefs.c:775
+#: src/gtkprefs.c:774
 msgid "_Highlight misspelled words"
 msgstr "腦��堺�丞ず�守������莚�(_H)"
 
-#: src/gtkprefs.c:780
+#: src/gtkprefs.c:779
 msgid "Ignore c_olors"
 msgstr "綽順�ラ���(_O)"
 
-#: src/gtkprefs.c:782
+#: src/gtkprefs.c:781
 msgid "Ignore font _faces"
 msgstr "綽順�ュ�篏�(_F)"
 
-#: src/gtkprefs.c:784
+#: src/gtkprefs.c:783
 msgid "Ignore font si_zes"
 msgstr "莨�紊у�篏�(_Z)"
 
-#: src/gtkprefs.c:787
+#: src/gtkprefs.c:786
 msgid "_Ignore formatting on incoming messages"
 msgstr "綽順�ユ�九�遺拭�����弱�(_I)"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:790
 msgid "Default Formatting"
 msgstr "藥�莅ゆ�弱�"
 
-#: src/gtkprefs.c:793
+#: src/gtkprefs.c:792
 msgid "_Send default formatting with outgoing messages"
 msgstr "���坂拭��戎���莅ゆ�弱�(_S)"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:824
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "綵���戎�����顒������弱��駈������榊��篆≧���篌��丞ず筝肴��激��"
 
-#: src/gtkprefs.c:828
+#: src/gtkprefs.c:827
 msgid "_Clear Formatting"
 msgstr "羝��ゆ�弱�(_C)"
 
+#: src/gtkprefs.c:864
+msgid "Send Message"
+msgstr "����羔���"
+
 #: src/gtkprefs.c:865
-msgid "Send Message"
-msgstr "����羔���"
-
-#: src/gtkprefs.c:866
 msgid "Enter _sends message"
 msgstr "��莉������羔���(_S)"
 
-#: src/gtkprefs.c:868
+#: src/gtkprefs.c:867
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+��莉������羔���(_O)"
 
+#: src/gtkprefs.c:870
+msgid "Window Closing"
+msgstr "腦��e�渇��"
+
 #: src/gtkprefs.c:871
-msgid "Window Closing"
-msgstr "腦��e�渇��"
-
-#: src/gtkprefs.c:872
 msgid "_Escape closes window"
 msgstr "Esc ���渇�㊦���(_E)"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:874
 msgid "Insertions"
 msgstr "����"
 
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:875
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Ctrl+{B/I/U} �贋�号�弱�(_F)"
 
-#: src/gtkprefs.c:878
+#: src/gtkprefs.c:877
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+�医�����ョ���(_I)"
 
-#: src/gtkprefs.c:894
+#: src/gtkprefs.c:893
 msgid "Buddy List Sorting"
 msgstr "絅遵���茵��綺�"
 
-#: src/gtkprefs.c:903
+#: src/gtkprefs.c:902
 msgid "_Sorting:"
 msgstr "��綺�(_S):"
 
-#: src/gtkprefs.c:909 src/gtkprefs.c:962
+#: src/gtkprefs.c:908 src/gtkprefs.c:961
 msgid "Show _buttons as:"
 msgstr "絨������丞ず筝�(_B):"
 
+#: src/gtkprefs.c:910 src/gtkprefs.c:963
+msgid "Pictures"
+msgstr "�丞��"
+
 #: src/gtkprefs.c:911 src/gtkprefs.c:964
-msgid "Pictures"
-msgstr "�丞��"
+msgid "Text"
+msgstr "��絖�"
 
 #: src/gtkprefs.c:912 src/gtkprefs.c:965
-msgid "Text"
-msgstr "��絖�"
-
-#: src/gtkprefs.c:913 src/gtkprefs.c:966
 msgid "Pictures and text"
 msgstr "�丞������絖�"
 
-#: src/gtkprefs.c:916 src/gtkprefs.c:981
+#: src/gtkprefs.c:915
 msgid "_Raise window on events"
 msgstr "����篋�篁倶�倶�羇紫���(_R)"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:918
 msgid "Buddy Display"
 msgstr "絅遵��丞ず"
 
-#: src/gtkprefs.c:920 src/gtkprefs.c:977
+#: src/gtkprefs.c:919 src/gtkprefs.c:979
 msgid "Show buddy _icons"
 msgstr "�丞ず絅遵��丈��(_I)"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:921
 msgid "Show _warning levels"
 msgstr "�丞ず茘���膾у��(_W)"
 
-#: src/gtkprefs.c:924
+#: src/gtkprefs.c:923
 msgid "Show idle _times"
 msgstr "�丞ず���≧�狗��(_T)"
 
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:925
 msgid "Dim i_dle buddies"
 msgstr "�丞ず�∞����絅遵�(_D)"
 
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:927
 msgid "_Automatically expand contacts"
 msgstr "�����綣���膤私査(_A)"
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:972
+msgid "Enable \"_slash\" commands"
+msgstr "��莅御��膾水�紊雁���巡擦(_S)"
+
+#: src/gtkprefs.c:975
 msgid "Show _formatting toolbar"
 msgstr "�丞ず�弱�綏ュ�傑��(_F)"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:977
 msgid "Show _aliases in tabs/titles"
 msgstr "����膈�/��蘂�筝㊥�丞ず����(_A)"
 
-#: src/gtkprefs.c:979
+#: src/gtkprefs.c:981
 msgid "Enable buddy ic_on animation"
 msgstr "����ソ���丈������(_O)"
 
@@ -3741,152 +3740,156 @@
 msgstr "����絅遵���③����絖�膸�篁�篁�(_N)"
 
 #: src/gtkprefs.c:985
-msgid "Enable \"_slash\" commands"
-msgstr "��莅御��膾水�紊雁���巡擦(_S)"
-
-#: src/gtkprefs.c:987
+msgid "_Raise IM window on events"
+msgstr "����篋�篁倶�倶�羇糸�莚�腦���(_R)"
+
+#: src/gtkprefs.c:988
+msgid "Raise chat _window on events"
+msgstr "����篋�篁倶�倶�羇肢��紊����(_W)"
+
+#: src/gtkprefs.c:990
 msgid "Use _multi-colored screen names in chats"
 msgstr "����紊�賢篏睡���腱�蘂��我�ュ�阪�����桁��(_M)"
 
 #. All the tab options!
-#: src/gtkprefs.c:991
+#: src/gtkprefs.c:994
 msgid "Tab Options"
 msgstr "��膈冗��蕁�"
 
-#: src/gtkprefs.c:993
+#: src/gtkprefs.c:996
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "����筝���膈丞��e���丞ず�恰�倶�������紊�(_T)"
 
-#: src/gtkprefs.c:1008
+#: src/gtkprefs.c:1011
 msgid "Show _close button on tabs"
 msgstr "����膈鞘��丞ず�渇�㊥����(_C)"
 
-#: src/gtkprefs.c:1011
+#: src/gtkprefs.c:1014
 msgid "Tab p_lacement:"
 msgstr "��膈鞘�臀�(_L):"
 
-#: src/gtkprefs.c:1013
+#: src/gtkprefs.c:1016
 msgid "Top"
 msgstr "筝�"
 
-#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1017
 msgid "Bottom"
 msgstr "筝�"
 
-#: src/gtkprefs.c:1015
+#: src/gtkprefs.c:1018
 msgid "Left"
 msgstr "綏�"
 
-#: src/gtkprefs.c:1016
+#: src/gtkprefs.c:1019
 msgid "Right"
 msgstr "��"
 
-#: src/gtkprefs.c:1022
+#: src/gtkprefs.c:1025
 msgid "New conversation _placement:"
-msgstr "�医�莚��丞舟(_P)鐚�"
-
-#: src/gtkprefs.c:1073 src/protocols/oscar/oscar.c:592
+msgstr "�医�莚��丞舟(_P):"
+
+#: src/gtkprefs.c:1076 src/protocols/oscar/oscar.c:592
 #: src/protocols/oscar/oscar.c:4837
 msgid "IP Address"
 msgstr "IP �医��"
 
-#: src/gtkprefs.c:1075
+#: src/gtkprefs.c:1078
 msgid "_Autodetect IP Address"
 msgstr "�����羌� IP �医��(_A)"
 
-#: src/gtkprefs.c:1084
+#: src/gtkprefs.c:1087
 msgid "Public _IP:"
 msgstr "��� _IP:"
 
-#: src/gtkprefs.c:1108
+#: src/gtkprefs.c:1111
 msgid "Ports"
 msgstr "腴��"
 
-#: src/gtkprefs.c:1111
+#: src/gtkprefs.c:1114
 msgid "_Manually specify range of ports to listen on"
 msgstr "������絎�荀�������腴������(_M)"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1117
 msgid "_Start Port:"
 msgstr "莎桁�腴��(_S):"
 
-#: src/gtkprefs.c:1121
+#: src/gtkprefs.c:1124
 msgid "_End Port:"
 msgstr "靳�罩∝���(_E):"
 
-#: src/gtkprefs.c:1128
+#: src/gtkprefs.c:1131
 msgid "Proxy Server"
 msgstr "篁g�����≦��"
 
-#: src/gtkprefs.c:1132
+#: src/gtkprefs.c:1135
 msgid "No proxy"
 msgstr "��篁g��"
 
-#: src/gtkprefs.c:1194
+#: src/gtkprefs.c:1197
 msgid "_User:"
 msgstr "����(_U):"
 
-#: src/gtkprefs.c:1250
-msgid "Opera"
-msgstr "Opera"
-
-#: src/gtkprefs.c:1251
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/gtkprefs.c:1252
-msgid "Mozilla"
-msgstr "Mozilla"
-
 #: src/gtkprefs.c:1253
-msgid "Konqueror"
-msgstr "Konqueror"
+msgid "Opera"
+msgstr "Opera"
 
 #: src/gtkprefs.c:1254
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/gtkprefs.c:1255
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: src/gtkprefs.c:1256
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: src/gtkprefs.c:1257
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1255
+#: src/gtkprefs.c:1258
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1256
+#: src/gtkprefs.c:1259
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1257
+#: src/gtkprefs.c:1260
 msgid "Gnome Default"
 msgstr "GNOME 藥�莅�"
 
-#: src/gtkprefs.c:1266
+#: src/gtkprefs.c:1269
 msgid "Manual"
 msgstr "����"
 
-#: src/gtkprefs.c:1317
+#: src/gtkprefs.c:1320
 msgid "Browser Selection"
 msgstr "羌頵�������"
 
-#: src/gtkprefs.c:1321
+#: src/gtkprefs.c:1324
 msgid "_Browser:"
 msgstr "羌頵���(_B):"
 
-#: src/gtkprefs.c:1328
+#: src/gtkprefs.c:1331
 msgid "_Open link in:"
 msgstr "��綣��丈・���劫�(_O):"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1333
 msgid "Browser default"
 msgstr "羌頵����莅�"
 
-#: src/gtkprefs.c:1331
+#: src/gtkprefs.c:1334
 msgid "Existing window"
 msgstr "�井��腦���"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1336
 msgid "New tab"
 msgstr "�医産��膈�"
 
-#: src/gtkprefs.c:1347
+#: src/gtkprefs.c:1350
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3895,83 +3898,83 @@
 "����(_M):\n"
 "(%s 篁h; URL)"
 
-#: src/gtkprefs.c:1384
+#: src/gtkprefs.c:1387
 msgid "Message Logs"
 msgstr "羔����ュ�"
 
-#: src/gtkprefs.c:1387
-msgid "Log _Format:"
-msgstr "�ュ��弱�(_F):"
-
 #: src/gtkprefs.c:1390
+msgid "Log _Format:"
+msgstr "�ュ��弱�(_F):"
+
+#: src/gtkprefs.c:1393
 msgid "_Log all instant messages"
 msgstr "莅医������恰�倶���(_L)"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1395
 msgid "Log all c_hats"
 msgstr "莅医�������紊�(_H)"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1398
 msgid "System Logs"
 msgstr "膤紫��ュ�"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1400
 msgid "_Enable system log"
 msgstr "����鎧膸��ュ�(_E)"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1403
 msgid "Log when buddies _sign on/sign off"
 msgstr "莅医�絅遵����糸��/�糸��(_S)"
 
-#: src/gtkprefs.c:1406
+#: src/gtkprefs.c:1409
 msgid "Log when buddies become _idle/un-idle"
 msgstr "莅医�絅遵�������/�♂��(_I)"
 
-#: src/gtkprefs.c:1412
+#: src/gtkprefs.c:1415
 msgid "Log when buddies go away/come _back"
 msgstr "莅医�絅遵���胼糸�/����(_B)"
 
-#: src/gtkprefs.c:1418
+#: src/gtkprefs.c:1421
 msgid "Log your _own signons/idleness/awayness"
 msgstr "莅医�����訓���糸��/����/胼糸�(_O)"
 
-#: src/gtkprefs.c:1556
+#: src/gtkprefs.c:1559
 msgid "Sound Selection"
 msgstr "紕育�渇����"
 
-#: src/gtkprefs.c:1631
+#: src/gtkprefs.c:1634
 msgid "Sound Options"
 msgstr "紕育�渇��蕁�"
 
-#: src/gtkprefs.c:1632
+#: src/gtkprefs.c:1635
 msgid "Sounds when conversation has _focus"
 msgstr "絲壕��桁����劫���紕�(_F)"
 
-#: src/gtkprefs.c:1634
+#: src/gtkprefs.c:1637
 msgid "_Sounds while away"
 msgstr "胼糸��九�紕�(_S)"
 
-#: src/gtkprefs.c:1638
+#: src/gtkprefs.c:1641
 msgid "Sound Method"
 msgstr "紕育�恰�劫�"
 
-#: src/gtkprefs.c:1639
+#: src/gtkprefs.c:1642
 msgid "_Method:"
 msgstr "�劫�(_M):"
 
-#: src/gtkprefs.c:1641
+#: src/gtkprefs.c:1644
 msgid "Console beep"
 msgstr "�у�九伾����"
 
-#: src/gtkprefs.c:1643
+#: src/gtkprefs.c:1646
 msgid "Automatic"
 msgstr "����"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1653
 msgid "Command"
 msgstr "�巡擦"
 
-#: src/gtkprefs.c:1658
+#: src/gtkprefs.c:1661
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3980,86 +3983,86 @@
 "紕育�喝�巡擦(_O):\n"
 "(%s 篁h;��篁九��)"
 
-#: src/gtkprefs.c:1685
+#: src/gtkprefs.c:1688
 msgid "Sound Events"
 msgstr "紕育�割�篁�"
 
-#: src/gtkprefs.c:1736
+#: src/gtkprefs.c:1739
 msgid "Play"
 msgstr "�㊥��"
 
-#: src/gtkprefs.c:1743
+#: src/gtkprefs.c:1746
 msgid "Event"
 msgstr "篋�篁�"
 
-#: src/gtkprefs.c:1762
+#: src/gtkprefs.c:1765
 msgid "Test"
 msgstr "羌�莚�"
 
-#: src/gtkprefs.c:1766
+#: src/gtkprefs.c:1769
 msgid "Reset"
 msgstr "��臀�"
 
-#: src/gtkprefs.c:1770
+#: src/gtkprefs.c:1773
 msgid "Choose..."
 msgstr "����..."
 
-#: src/gtkprefs.c:1794
-msgid "_Queue new messages when away"
-msgstr "胼糸��倶���井�����ラ����(_Q)"
-
 #: src/gtkprefs.c:1797
+msgid "_Queue new messages when away"
+msgstr "胼糸��倶���井�����ラ����(_Q)"
+
+#: src/gtkprefs.c:1800
 msgid "Auto-response"
 msgstr "������紊�"
 
-#: src/gtkprefs.c:1798
+#: src/gtkprefs.c:1801
 msgid "_Send auto-response"
 msgstr "����������紊�(_S)"
 
-#: src/gtkprefs.c:1800
+#: src/gtkprefs.c:1803
 msgid "_Only send auto-response when idle"
 msgstr "篁��������≧�九���������紊�(_O)"
 
-#: src/gtkprefs.c:1803 src/protocols/msn/msn.c:1154
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2729
-#: src/protocols/oscar/oscar.c:3993 src/protocols/yahoo/yahoo.c:2381
-#: src/protocols/yahoo/yahoo_profile.c:651
+#: src/gtkprefs.c:1806 src/protocols/msn/msn.c:1156
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2724
+#: src/protocols/oscar/oscar.c:3994 src/protocols/yahoo/yahoo.c:2488
+#: src/protocols/yahoo/yahoo_profile.c:653
 msgid "Idle"
 msgstr "����"
 
-#: src/gtkprefs.c:1804
+#: src/gtkprefs.c:1807
 msgid "Idle _time reporting:"
 msgstr "���≧�狗�贋�ュ��(_T):"
 
-#: src/gtkprefs.c:1807
+#: src/gtkprefs.c:1810
 msgid "Gaim usage"
 msgstr "Gaim 篏睡��"
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1813
 msgid "X usage"
 msgstr "X 篏睡��"
 
-#: src/gtkprefs.c:1812
+#: src/gtkprefs.c:1815
 msgid "Windows usage"
 msgstr "腦��d戎��"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1823
 msgid "Auto-away"
 msgstr "�����綣�"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1824
 msgid "Set away _when idle"
 msgstr "���≦���活�臀��綣�(_W)"
 
-#: src/gtkprefs.c:1825
+#: src/gtkprefs.c:1828
 msgid "_Minutes before setting away:"
 msgstr "莅丞舟胼糸���膈�������(_M):"
 
-#: src/gtkprefs.c:1833
+#: src/gtkprefs.c:1836
 msgid "Away m_essage:"
 msgstr "胼糸�羔���(_E):"
 
-#: src/gtkprefs.c:1910
+#: src/gtkprefs.c:1917
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4074,7 +4077,7 @@
 "<span weight=\"bold\">臀�腴�:</span>\t\t%s\n"
 "<span weight=\"bold\">��篁九��:</span>\t%s"
 
-#: src/gtkprefs.c:1915
+#: src/gtkprefs.c:1922
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4089,64 +4092,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">��篁九��:</span>  %s"
 
-#: src/gtkprefs.c:2148
+#: src/gtkprefs.c:2155
 msgid "Load"
 msgstr "茖���"
 
-#: src/gtkprefs.c:2162
+#: src/gtkprefs.c:2169
 msgid "Summary"
 msgstr "网�茹�"
 
-#: src/gtkprefs.c:2210
+#: src/gtkprefs.c:2217
 msgid "Details"
 msgstr "膸���"
 
-#: src/gtkprefs.c:2355
+#: src/gtkprefs.c:2362
 msgid "_Edit"
 msgstr "膽�莨�(_E)"
 
-#: src/gtkprefs.c:2391
+#: src/gtkprefs.c:2398
 msgid "Interface"
 msgstr "����"
 
-#: src/gtkprefs.c:2394
+#: src/gtkprefs.c:2401
 msgid "Message Text"
 msgstr "羔�������"
 
-#: src/gtkprefs.c:2395
+#: src/gtkprefs.c:2402
 msgid "Shortcuts"
 msgstr "綽��潔��"
 
-#: src/gtkprefs.c:2396
+#: src/gtkprefs.c:2403
 msgid "Smiley Themes"
 msgstr "膃��娯源蘂�"
 
-#: src/gtkprefs.c:2397
+#: src/gtkprefs.c:2404
 msgid "Sounds"
 msgstr "紕育��"
 
-#: src/gtkprefs.c:2398
+#: src/gtkprefs.c:2405
 msgid "Network"
 msgstr "臀�膸�"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2401
+#: src/gtkprefs.c:2408
 msgid "Browser"
 msgstr "羌頵���"
 
-#: src/gtkprefs.c:2403
+#: src/gtkprefs.c:2410
 msgid "Logging"
 msgstr "�ュ�"
 
-#: src/gtkprefs.c:2404
+#: src/gtkprefs.c:2411
 msgid "Away / Idle"
 msgstr "胼糸�/����"
 
-#: src/gtkprefs.c:2405
+#: src/gtkprefs.c:2412
 msgid "Away Messages"
 msgstr "胼糸�羔���"
 
-#: src/gtkprefs.c:2408
+#: src/gtkprefs.c:2415
 msgid "Plugins"
 msgstr "��篁�"
 
@@ -4170,63 +4173,63 @@
 msgid "Block only the users below"
 msgstr "����巡札筝�����"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1448
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1448
 msgid "Privacy"
 msgstr "��腱�"
 
-#: src/gtkprivacy.c:401
+#: src/gtkprivacy.c:400
 msgid "Changes to privacy settings take effect immediately."
 msgstr "絲拷��腱�莅丞舟���贋�劫�篌�腴��括������"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:413
+#: src/gtkprivacy.c:412
 msgid "Set privacy for:"
 msgstr "莅丞舟��腱���茣���:"
 
-#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
 msgid "Permit User"
 msgstr "��莅悟����"
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:582
 msgid "Type a user you permit to contact you."
 msgstr "莨��ュ��莅梧��膤紙�������激��"
 
-#: src/gtkprivacy.c:584
+#: src/gtkprivacy.c:583
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "���活���莅後��肩���決��膤紙���莚決��ヤ�/絎�����絖���"
 
-#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
+#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
 msgid "Permit"
 msgstr "��莅�"
 
-#: src/gtkprivacy.c:592
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "��莅� %s ��膤紙����鐚�"
 
-#: src/gtkprivacy.c:594
+#: src/gtkprivacy.c:593
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "�������活���莅� %s ��膤紙����鐚�"
 
-#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
+#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
 msgid "Block User"
 msgstr "絮�恝����"
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:621
 msgid "Type a user to block."
 msgstr "莨��ヨ�絮�恝�����激��"
 
-#: src/gtkprivacy.c:623
+#: src/gtkprivacy.c:622
 msgid "Please enter the name of the user you wish to block."
 msgstr "莚決��ユ���活�絮�恝�����桁��腱違��"
 
-#: src/gtkprivacy.c:630
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Block %s?"
 msgstr "絮�� %s ����"
 
-#: src/gtkprivacy.c:632
+#: src/gtkprivacy.c:631
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "�������活�絮�� %s ����"
@@ -4234,14 +4237,14 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/gtkrequest.c:233 src/protocols/gg/gg.c:867
+#: src/protocols/novell/novell.c:1844 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "��"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
-#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/gtkrequest.c:234 src/protocols/gg/gg.c:867
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "��"
@@ -4251,7 +4254,7 @@
 msgstr "綺���"
 
 #: src/gtkrequest.c:238 src/protocols/msn/msn.c:316
-#: src/protocols/silc/util.c:300
+#: src/protocols/silc/util.c:311
 msgid "Close"
 msgstr "�渇��"
 
@@ -4465,10 +4468,10 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:465 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2720
-#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2738
-#: src/protocols/yahoo/yahoo.c:2853
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2715
+#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2885
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2844
+#: src/protocols/yahoo/yahoo.c:2959
 msgid "Available"
 msgstr "����"
 
@@ -4482,10 +4485,10 @@
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
 #: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5379 src/protocols/oscar/oscar.c:5457
-#: src/protocols/oscar/oscar.c:5481 src/protocols/oscar/oscar.c:6652
-#: src/protocols/oscar/oscar.c:6657 src/protocols/yahoo/yahoo.c:2379
-#: src/protocols/yahoo/yahoo.c:2758 src/protocols/yahoo/yahoo.c:2863
+#: src/protocols/oscar/oscar.c:5378 src/protocols/oscar/oscar.c:5456
+#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6667
+#: src/protocols/oscar/oscar.c:6672 src/protocols/yahoo/yahoo.c:2486
+#: src/protocols/yahoo/yahoo.c:2864 src/protocols/yahoo/yahoo.c:2969
 msgid "Invisible"
 msgstr "��荳�"
 
@@ -4501,7 +4504,7 @@
 msgid "Unable to resolve hostname."
 msgstr "��羈�茹f��筝紙�阪����"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1667
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1664
 msgid "Unable to connect to server."
 msgstr "��羈�菴��ュ�井���≦����"
 
@@ -4533,67 +4536,67 @@
 msgid "Status: %s"
 msgstr "�倶��: %s"
 
-#: src/protocols/gg/gg.c:407
+#: src/protocols/gg/gg.c:406
 msgid "Could not connect"
 msgstr "��羈�菴���"
 
-#: src/protocols/gg/gg.c:414
+#: src/protocols/gg/gg.c:413
 msgid "Unable to read socket"
 msgstr "��羈�莚糸�絅��ュ�"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:601 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/napster/napster.c:474 src/protocols/napster/napster.c:505
-#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2032
-#: src/protocols/yahoo/yahoo.c:2063 src/protocols/yahoo/yahoo.c:2126
+#: src/protocols/gg/gg.c:600 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/napster/napster.c:475 src/protocols/napster/napster.c:506
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2124
+#: src/protocols/yahoo/yahoo.c:2155 src/protocols/yahoo/yahoo.c:2218
 #: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:139
+#: src/protocols/yahoo/yahoo_filexfer.c:109
 msgid "Unable to connect."
 msgstr "��羈�菴��ャ��"
 
-#: src/protocols/gg/gg.c:617
+#: src/protocols/gg/gg.c:616
 msgid "Reading data"
 msgstr "罩e������井��"
 
-#: src/protocols/gg/gg.c:620
+#: src/protocols/gg/gg.c:619
 msgid "Balancer handshake"
 msgstr "綛活 �����"
 
-#: src/protocols/gg/gg.c:623
+#: src/protocols/gg/gg.c:622
 msgid "Reading server key"
 msgstr "罩e��������≦�����"
 
-#: src/protocols/gg/gg.c:626
+#: src/protocols/gg/gg.c:625
 msgid "Exchanging key hash"
 msgstr "罩e��困�√���"
 
-#: src/protocols/gg/gg.c:636
+#: src/protocols/gg/gg.c:635
 msgid "Critical error in GG library\n"
 msgstr "GG 綺����渇����莚�\n"
 
-#: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:653 src/protocols/gg/gg.c:744
 #: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "菴��ュ�� %s 紊沿乾"
 
-#: src/protocols/gg/gg.c:702
+#: src/protocols/gg/gg.c:701
 msgid "Unable to ping server"
 msgstr "��羈�菴������≦��"
 
-#: src/protocols/gg/gg.c:714
+#: src/protocols/gg/gg.c:713
 msgid "Send as message"
 msgstr "����筝堺���"
 
-#: src/protocols/gg/gg.c:719
+#: src/protocols/gg/gg.c:718
 msgid "Looking up GG server"
 msgstr "罩e���ラ�� GG ���≦��"
 
-#: src/protocols/gg/gg.c:722
+#: src/protocols/gg/gg.c:721
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "��絎��� Gadu-Gadu UIN ����"
 
-#: src/protocols/gg/gg.c:769
+#: src/protocols/gg/gg.c:768
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "����上�������� Gadu-Gadu UIN ����羔�����"
 
@@ -4605,43 +4608,43 @@
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu ��膣√���"
 
-#: src/protocols/gg/gg.c:865
+#: src/protocols/gg/gg.c:866
 msgid "Active"
 msgstr "羇肢�"
 
-#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4829
+#: src/protocols/gg/gg.c:871 src/protocols/oscar/oscar.c:4829
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
-#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:612
+#: src/protocols/gg/gg.c:875 src/protocols/jabber/jabber.c:612
 #: src/protocols/oscar/oscar.c:4840 src/protocols/silc/ops.c:774
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "��"
 
 #. Last Name
-#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:617
+#: src/protocols/gg/gg.c:880 src/protocols/jabber/jabber.c:617
 #: src/protocols/oscar/oscar.c:4841 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "紮�"
 
-#: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
+#: src/protocols/gg/gg.c:884 src/protocols/gg/gg.c:1623
 #: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4830
 msgid "Nick"
 msgstr "�窮О"
 
-#: src/protocols/gg/gg.c:890 src/protocols/gg/gg.c:893
+#: src/protocols/gg/gg.c:891 src/protocols/gg/gg.c:894
 msgid "Birth Year"
 msgstr "�榊��綛岩蚕"
 
-#: src/protocols/gg/gg.c:899 src/protocols/gg/gg.c:901
-#: src/protocols/gg/gg.c:903
+#: src/protocols/gg/gg.c:900 src/protocols/gg/gg.c:902
+#: src/protocols/gg/gg.c:904
 msgid "Sex"
 msgstr "�у��"
 
 #. City
-#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:627
+#: src/protocols/gg/gg.c:908 src/protocols/jabber/jabber.c:627
 #: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4892
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
@@ -4649,22 +4652,22 @@
 
 #. res[0] == username
 #. show it to the user
-#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1223
-#: src/protocols/msn/msn.c:1531 src/protocols/msn/msn.c:1547
-#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3806
-#: src/protocols/oscar/oscar.c:4022 src/protocols/toc/toc.c:468
-#: src/protocols/yahoo/yahoo_profile.c:740
-#: src/protocols/yahoo/yahoo_profile.c:777
-#: src/protocols/yahoo/yahoo_profile.c:829
-#: src/protocols/yahoo/yahoo_profile.c:1124 src/protocols/zephyr/zephyr.c:568
+#: src/protocols/gg/gg.c:929 src/protocols/msn/msn.c:1225
+#: src/protocols/msn/msn.c:1533 src/protocols/msn/msn.c:1549
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3807
+#: src/protocols/oscar/oscar.c:4023 src/protocols/toc/toc.c:468
+#: src/protocols/yahoo/yahoo_profile.c:748
+#: src/protocols/yahoo/yahoo_profile.c:785
+#: src/protocols/yahoo/yahoo_profile.c:837
+#: src/protocols/yahoo/yahoo_profile.c:1132 src/protocols/zephyr/zephyr.c:610
 msgid "Buddy Information"
 msgstr "絅遵�篆≧��"
 
-#: src/protocols/gg/gg.c:950
+#: src/protocols/gg/gg.c:951
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu ���≦��押��絖���ソ����茵���"
 
-#: src/protocols/gg/gg.c:958
+#: src/protocols/gg/gg.c:959
 msgid "Couldn't Import Buddy List from Server"
 msgstr "��羈�篁����≦����ュソ����茵�"
 
@@ -4754,7 +4757,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
-#: src/protocols/toc/toc.c:1543
+#: src/protocols/toc/toc.c:1550
 msgid "Change Password"
 msgstr "�贋�劫���"
 
@@ -4792,7 +4795,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1601 src/protocols/gg/gg.c:1603
+#: src/protocols/gg/gg.c:1602 src/protocols/gg/gg.c:1604
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu �顒��篁�"
 
@@ -4805,15 +4808,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "���� %s (%s%s%s%s%s) ��荀����������"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:231
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3537
-#: src/protocols/oscar/oscar.c:6085
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3538
+#: src/protocols/oscar/oscar.c:6100
 msgid "Authorize"
 msgstr "����"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3539
-#: src/protocols/oscar/oscar.c:6086
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3540
+#: src/protocols/oscar/oscar.c:6101
 msgid "Deny"
 msgstr "��靳�"
 
@@ -4825,11 +4828,11 @@
 msgid "Connecting..."
 msgstr "罩e�����..."
 
-#: src/protocols/icq/gaim_icq.c:497
+#: src/protocols/icq/gaim_icq.c:498
 msgid "Nick:"
 msgstr "�窮О:"
 
-#: src/protocols/icq/gaim_icq.c:498
+#: src/protocols/icq/gaim_icq.c:499
 msgid "Gaim User"
 msgstr "Gaim ����"
 
@@ -4847,10 +4850,10 @@
 msgid "No topic is set"
 msgstr "���絎�莚�蘂�"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
-#: src/protocols/yahoo/yahoo_filexfer.c:228
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:169
+#: src/protocols/yahoo/yahoo_filexfer.c:179
+#: src/protocols/yahoo/yahoo_filexfer.c:188
+#: src/protocols/yahoo/yahoo_filexfer.c:198
 msgid "File Transfer Aborted"
 msgstr "��篁銀���筝㊥②"
 
@@ -4880,9 +4883,9 @@
 msgstr "�ョ�� MOTD"
 
 #. FIXME: remove this when the ui does it for us.
-#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
+#: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:928
 #: src/protocols/msn/msn.c:543 src/protocols/oscar/oscar.c:448
-#: src/protocols/oscar/oscar.c:6756 src/protocols/yahoo/yahoo.c:2585
+#: src/protocols/oscar/oscar.c:6771 src/protocols/yahoo/yahoo.c:2691
 msgid "Send File"
 msgstr "������篁�"
 
@@ -4912,17 +4915,17 @@
 msgid "Couldn't connect to host"
 msgstr "��羈�菴��ュ�遺源��"
 
-#: src/protocols/irc/irc.c:388 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:387 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "莚糸���莚�"
 
-#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1345
-#: src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:538 src/protocols/silc/chat.c:1343
+#: src/protocols/yahoo/yahoochat.c:1341
 msgid "Users"
 msgstr "����"
 
-#: src/protocols/irc/irc.c:542 src/protocols/silc/chat.c:1348
-#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:541 src/protocols/silc/chat.c:1346
+#: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1350
 msgid "Topic"
 msgstr "莚�蘂�"
 
@@ -4945,23 +4948,23 @@
 msgstr "��莚��翫��� IRC �顒��篁�"
 
 #: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1555 src/protocols/napster/napster.c:640
+#: src/protocols/jabber/jabber.c:1556 src/protocols/napster/napster.c:642
 #: src/protocols/silc/ops.c:935
 msgid "Server"
 msgstr "���≦��"
 
-#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1576
-#: src/protocols/msn/msn.c:1726 src/protocols/napster/napster.c:645
-#: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1577
+#: src/protocols/msn/msn.c:1729 src/protocols/napster/napster.c:647
+#: src/protocols/silc/silc.c:1363 src/protocols/trepia/trepia.c:1295
 msgid "Port"
 msgstr "腴��"
 
-#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1383
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1442
 msgid "Encoding"
 msgstr "靶���"
 
 #: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1477
+#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1449
 #: src/protocols/silc/ops.c:931
 msgid "Username"
 msgstr "���桁��"
@@ -4988,7 +4991,7 @@
 msgstr " <i>(identified)</i>"
 
 #: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo_profile.c:992
+#: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Realname"
 msgstr "����"
 
@@ -5037,6 +5040,11 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim ����篋� IRC ���≦����羈���茹g��篆≧����"
 
+#: src/protocols/irc/msgs.c:323
+#, c-format
+msgid "Users on %s: %s"
+msgstr "%s 筝������傑��: %s"
+
 #: src/protocols/irc/msgs.c:405
 msgid "No such channel"
 msgstr "羃≧��菴��欠��蘂���"
@@ -5120,20 +5128,20 @@
 
 #: src/protocols/irc/parse.c:109
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;荀��ц������&gt;鐚��ц������"
+msgstr "action &lt;荀��ц������&gt;: �ц������"
 
 #: src/protocols/irc/parse.c:110
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
-msgstr "away [羔���]鐚�莅丞舟胼糸�羔����筝�絨冗�闉�����篁h;胼糸���"
+msgstr "away [羔���]: 莅丞舟胼糸�羔����筝�絨冗�闉�����篁h;胼糸���"
 
 #: src/protocols/irc/parse.c:111
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;�窮О1&gt; [�窮О2]��������ゆ��篋榊��膊∞�����倶�������蕁紙�����膊∞������"
+"deop &lt;�窮О1&gt; [�窮О2]����: ���ゆ��篋榊��膊∞�����倶�������蕁紙�����膊∞������"
 
 #: src/protocols/irc/parse.c:112
 msgid ""
@@ -5141,140 +5149,140 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;�窮О1&gt; [�窮О2]��������ゆ��篋榊��蘂���莚㊨�括�倶��鐚�篏水�倶��羈������茴����"
+"devoice &lt;�窮О1&gt; [�窮О2]����: ���ゆ��篋榊��蘂���莚㊨�括�倶��鐚�篏水�倶��羈������茴����"
 "(+m)�区�莚������蕁紙�����膊∞������"
 
 #: src/protocols/irc/parse.c:113
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr "invite &lt;�窮О&gt; [�翠��]鐚���莚傑��篋阪���ユ����絎���蘂���鐚�����綵���蘂�����"
+msgstr "invite &lt;�窮О&gt; [�翠��]: ��莚傑��篋阪���ユ����絎���蘂���鐚�����綵���蘂�����"
 
 #: src/protocols/irc/parse.c:114
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;�翠��1&gt;[,�翠��][,����] [絲���1[,絲���2][,����]]鐚�莨��ヤ�筝���紊�筝����鐚�絋���荀���"
-"莚�������箴�蘂���絲��ャ��"
+"j &lt;�翠��1&gt;[,�翠��][,����] [絲���1[,絲���2][,����]]: 莨��ヤ�筝���紊�筝����鐚�絋���荀�"
+"��莚�������箴�蘂���絲��ャ��"
 
 #: src/protocols/irc/parse.c:115
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;�翠��1&gt;[,�翠��][,����] [絲���1[,絲���2][,����]]鐚�莨��ヤ�筝���紊�筝����鐚�絋���"
+"join &lt;�翠��1&gt;[,�翠��][,����] [絲���1[,絲���2][,����]]: 莨��ヤ�筝���紊�筝����鐚�絋���"
 "荀���莚�������箴�蘂���絲��ャ��"
 
 #: src/protocols/irc/parse.c:116
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
-msgstr "kick &lt;�窮О&gt; [羔���]鐚�絨���篋肴権�咲��������蕁紙�����膊∞������"
+msgstr "kick &lt;�窮О&gt; [羔���]: 絨���篋肴権�咲��������蕁紙�����膊∞������"
 
 #: src/protocols/irc/parse.c:117
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list鐚��丞ず臀�膸�筝�����紊����茵���<i>茘���鐚���篋����≦����遵��罩よ���㊤�����菴��ャ��</i>"
+"list: �丞ず臀�膸�筝�����紊����茵���<i>茘���鐚���篋����≦����遵��罩よ���㊤�����菴��ャ��</i>"
 
 #: src/protocols/irc/parse.c:118
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;荀��ц������&gt;鐚��ц������"
+msgstr "me &lt;荀��ц������&gt;: �ц������"
 
 #: src/protocols/irc/parse.c:119
 msgid ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;�窮О|蘂���&gt; &lt;+|-&gt;&lt;A-Za-z&gt;鐚�莅丞舟����羔�蘂��������傑─綣��"
+"mode &lt;�喂О|蘂���&gt; &lt;+|-&gt;&lt;A-Za-z&gt;: 莅丞舟����羔�蘂��������傑─綣��"
 
 #: src/protocols/irc/parse.c:120
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "msg &lt;�喂О&gt; &lt;羔���&gt;鐚�膸����桁���腱�筝�羔���(筝�����後�)��"
+msgstr "msg &lt;�窮О&gt; &lt;羔���&gt;: 膸����桁���腱�筝�羔���(筝�����後�)��"
 
 #: src/protocols/irc/parse.c:121
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "name [蘂���]鐚����咲���筝㊦���������激��"
-
-#: src/protocols/irc/parse.c:122
-msgid "nick &lt;new nick name&gt;:  Change your nick name."
-msgstr "nick &lt;�井�窮О&gt;鐚��贋�号�����窮О��"
+msgstr "name [蘂���]: ���咲���筝㊦���������激��"
+
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1406
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "nick &lt;�井�窮О&gt;: �贋�号�����窮О��"
 
 #: src/protocols/irc/parse.c:123
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;�窮О1&gt; [�窮О2]�����筝堺��篋堺�篋�蘂���膊∞�����倶�������蕁紙�����膊∞������"
+"op &lt;�窮О1&gt; [�窮О2]����: 筝堺��篋堺�篋�蘂���膊∞�����倶�������蕁紙�����膊∞������"
 
 #: src/protocols/irc/parse.c:124
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
-msgstr "operwall &lt;羔���&gt;鐚�絋�������ラ��菴����箙����緒�莚隙�荀�篏睡����"
+msgstr "operwall &lt;羔���&gt;: 絋�������ラ��菴����箙����緒�莚隙�荀�篏睡����"
 
 #: src/protocols/irc/parse.c:125
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [�翠��] [羔���]鐚�胼糸�綵���蘂�������絎�蘂���鐚�綛句��筝�������羔�����"
+msgstr "part [�翠��] [羔���]: 胼糸�綵���蘂�������絎�蘂���鐚�綛句��筝�������羔�����"
 
 #: src/protocols/irc/parse.c:126
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
-msgstr "ping [�窮О]鐚�莚∫�����桁�篋�紊��炊�狗�翫��(�ユ����絎����桁��篁h;���≦��)��"
+msgstr "ping [�窮О]: 莚∫�����桁�篋�紊��炊�狗�翫��(�ユ����絎����桁��篁h;���≦��)��"
 
 #: src/protocols/irc/parse.c:127
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "query &lt;�窮О&gt; &lt;羔���&gt;鐚�膸����桁���腱�筝�羔���(筝�����後�)��"
+msgstr "query &lt;�窮О&gt; &lt;羔���&gt;: 膸����桁���腱�筝�羔���(筝�����後�)��"
 
 #: src/protocols/irc/parse.c:128
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [羔���]鐚��㊤�筝����≦����菴��ワ�綛句��筝�������羔�����"
+msgstr "quit [羔���]: �㊤�筝����≦����菴��ワ�綛句��筝�������羔�����"
 
 #: src/protocols/irc/parse.c:129
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quot [����]鐚������≦�������紮��巡擦��"
+msgstr "quot [����]: �����≦�������紮��巡擦��"
 
 #: src/protocols/irc/parse.c:130
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;�窮О&gt; [羔���]鐚�篁��翠�翫���ゆ��篋冴�����蕁紙�����膊∞������"
+msgstr "remove &lt;�窮О&gt; [羔���]: 篁��翠�翫���ゆ��篋冴�����蕁紙�����膊∞������"
 
 #: src/protocols/irc/parse.c:131
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [�域�蘂�]鐚��ョ�����贋�拷���莚�蘂���"
+msgstr "topic [�域�蘂�]: �ョ�����贋�拷���莚�蘂���"
 
 #: src/protocols/irc/parse.c:132
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;鐚�莅丞舟����羔����傑─綣��"
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;: 顒丞舟����羔����傑─綣��"
 
 #: src/protocols/irc/parse.c:133
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;�喂О1&gt; [�窮О2]鐚�筝堺��篋堺�篋�蘂���莚㊨�括�倶�������蕁紙�����膊∞������"
+"voice &lt;�窮О1&gt; [�窮О2]: 筝堺��篋堺�篋�蘂���莚㊨�括�倶�������蕁紙�����膊∞������"
 
 #: src/protocols/irc/parse.c:134
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr "wallops &lt;羔���&gt;鐚�絋�������ラ��菴����箙����緒�莚隙�荀�篏睡����"
+msgstr "wallops &lt;羔���&gt;: 絋�������ラ��菴����箙����緒�莚隙�荀�篏睡����"
 
 #: src/protocols/irc/parse.c:135
 msgid "whois &lt;nick&gt;:  Get information on a user."
-msgstr "whois &lt;�窮О&gt;鐚��桁����隙拭����"
-
-#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:199
+msgstr "whois &lt;�窮О&gt;: �桁����隙拭����"
+
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:236
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
@@ -5295,7 +5303,7 @@
 
 #: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
-#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:686
+#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
 msgstr "綏我�㊤�菴��ャ��"
 
@@ -5340,10 +5348,10 @@
 msgid "Given Name"
 msgstr "��"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
-#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1148
-#: src/protocols/silc/buddy.c:1474 src/protocols/silc/ops.c:786
-#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:987
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:607 src/protocols/msn/msn.c:1150
+#: src/protocols/silc/buddy.c:1446 src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:927 src/protocols/yahoo/yahoo_profile.c:995
 msgid "Nickname"
 msgstr "�窮О"
 
@@ -5351,62 +5359,61 @@
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:664
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "茵����医��"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:660
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "蘂�紊��医��"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:668
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "�医��"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:672
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "�阪��"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
 #: src/protocols/jabber/jabber.c:637
 msgid "Postal Code"
 msgstr "���睡���"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:681
-#: src/protocols/silc/util.c:287 src/protocols/trepia/trepia.c:339
-#: src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
+#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "�遵�"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:692
-#: src/protocols/jabber/buddy.c:699
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "�笈��欠��"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
-#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1529
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:982
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:990
 msgid "Email"
 msgstr "�球���散"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:733
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "膸�膸���腱�"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:737
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "膸�膸�����"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:743
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "��蘂�"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:746
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "����"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
 #: src/protocols/oscar/oscar.c:4865
 msgid "Birthday"
 msgstr "����"
@@ -5427,14 +5434,14 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
-#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2742
-#: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
+#: src/protocols/msn/msn.c:453 src/protocols/novell/novell.c:2737
+#: src/protocols/novell/novell.c:2741 src/protocols/oscar/oscar.c:574
 #: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2611
 msgid "Status"
 msgstr "�倶��"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1558
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1559
 msgid "Resource"
 msgstr "莎�羣�"
 
@@ -5442,53 +5449,53 @@
 msgid "Middle Name"
 msgstr "筝㊤��"
 
-#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:622
+#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:622
 #: src/protocols/oscar/oscar.c:4883 src/protocols/oscar/oscar.c:4891
 #: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "�医��"
 
-#: src/protocols/jabber/buddy.c:656
+#: src/protocols/jabber/buddy.c:655
 msgid "P.O. Box"
 msgstr "���推拭膊�"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Photo"
 msgstr "�悟��"
 
-#: src/protocols/jabber/buddy.c:762
+#: src/protocols/jabber/buddy.c:761
 msgid "Logo"
 msgstr "�丞�"
 
-#: src/protocols/jabber/buddy.c:778
+#: src/protocols/jabber/buddy.c:777
 msgid "Jabber Profile"
 msgstr "Jabber 莎���"
 
-#: src/protocols/jabber/buddy.c:937
+#: src/protocols/jabber/buddy.c:936
 msgid "Un-hide From"
 msgstr "��羔���荳�"
 
-#: src/protocols/jabber/buddy.c:940
+#: src/protocols/jabber/buddy.c:939
 msgid "Temporarily Hide From"
 msgstr "筝贋�狗��荳�"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:947
+#: src/protocols/jabber/buddy.c:946
 msgid "Cancel Presence Notification"
 msgstr "��羔�����������"
 
-#: src/protocols/jabber/buddy.c:953
+#: src/protocols/jabber/buddy.c:952
 msgid "(Re-)Request authorization"
 msgstr "(����)莚傑�莅よ�"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:961
+#: src/protocols/jabber/buddy.c:960
 msgid "Unsubscribe"
 msgstr "��莅�"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:963
 msgid "_Room:"
 msgstr "�翠��(_R):"
 
@@ -5582,7 +5589,7 @@
 #: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
-#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
+#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
 msgid "Write error"
 msgstr "����莚�"
 
@@ -5647,7 +5654,7 @@
 msgid "State"
 msgstr "綏�/��"
 
-#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1531
+#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1501
 #: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "�笈�"
@@ -5670,9 +5677,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:616
-#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2105
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2104
 #: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2251 src/protocols/zephyr/zephyr.c:865
+#: src/protocols/yahoo/yahoo.c:2353 src/protocols/zephyr/zephyr.c:906
 msgid "Connecting"
 msgstr "罩e�����"
 
@@ -5690,7 +5697,7 @@
 
 #: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
 #: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6456
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6471
 msgid "Not Authorized"
 msgstr "���莚�"
 
@@ -5734,8 +5741,8 @@
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5469
-#: src/protocols/oscar/oscar.c:6648
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5468
+#: src/protocols/oscar/oscar.c:6663
 msgid "Do Not Disturb"
 msgstr "莚桁�炊����"
 
@@ -5763,7 +5770,7 @@
 msgid "Please enter your new password"
 msgstr "莚決��ユ�����医���"
 
-#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1533
+#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1540
 msgid "Set User Info"
 msgstr "莅丞舟���隙拭��"
 
@@ -5975,48 +5982,44 @@
 
 #: src/protocols/jabber/jabber.c:1400
 msgid "config:  Configure a chat room."
-msgstr "config鐚���臀���紊����"
+msgstr "config: ��臀���紊����"
 
 #: src/protocols/jabber/jabber.c:1403
 msgid "configure:  Configure a chat room."
-msgstr "configure鐚���臀���紊����"
-
-#: src/protocols/jabber/jabber.c:1406
-msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;�井�窮О&gt;鐚��贋�号�����窮О��"
+msgstr "configure: ��臀���紊����"
 
 #: src/protocols/jabber/jabber.c:1410
 msgid "part [room]:  Leave the room."
-msgstr "part [�翠��]鐚�胼糸���紊����"
+msgstr "part [�翠��]: 胼糸���紊����"
 
 #: src/protocols/jabber/jabber.c:1413
 msgid "register:  Register with a chat room."
-msgstr "register鐚�羈�����紊����"
+msgstr "register: 羈�����紊����"
 
 #: src/protocols/jabber/jabber.c:1418
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [�域�蘂�]鐚��ョ�����贋�壕�蘂���"
+msgstr "topic [�域�蘂�]: �ョ�����贋�壕�蘂���"
 
 #: src/protocols/jabber/jabber.c:1422
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;����&gt; [�翠��]鐚����翠�岩賢絮�恔�筝����激��"
+msgstr "ban &lt;����&gt; [�翠��]: ���翠�岩賢絮�恔�筝����激��"
 
 #: src/protocols/jabber/jabber.c:1426
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
-msgstr "invite &lt;����&gt; [�翠��]鐚���莚欠���桁���ユ�翠�眼��"
+msgstr "invite &lt;����&gt; [�翠��]: ��莚欠���桁���ユ�翠�眼��"
 
 #: src/protocols/jabber/jabber.c:1430
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr "join: &lt;�翠��&gt; [���≦��]鐚����ユ④���≦�������紊���紊����"
+msgstr "join: &lt;�翠��&gt; [���≦��]: ���ユ④���≦�������紊���紊����"
 
 #: src/protocols/jabber/jabber.c:1434
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;����&gt; [�翠��]鐚�篁��翠�岩賢荼√�坂�筝����激��"
+msgstr "kick &lt;����&gt; [�翠��]: 篁��翠�岩賢荼√�坂�筝����激��"
 
 #: src/protocols/jabber/jabber.c:1438
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;����&gt; &lt;羔���&gt;鐚��������絅遵�����腱�篋堺�����"
+msgstr "msg &lt;����&gt; &lt;羔���&gt;: �������絅遵�����腱�篋堺�����"
 
 #: src/protocols/jabber/jabber.c:1452
 msgid "Hide Operating System"
@@ -6033,24 +6036,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1533 src/protocols/jabber/jabber.c:1535
+#: src/protocols/jabber/jabber.c:1534 src/protocols/jabber/jabber.c:1536
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber �顒��篁�"
 
-#: src/protocols/jabber/jabber.c:1561
+#: src/protocols/jabber/jabber.c:1562
 msgid "Use TLS if available"
 msgstr "�ュ�����篏睡�� TLS"
 
-#: src/protocols/jabber/jabber.c:1566
+#: src/protocols/jabber/jabber.c:1567
 msgid "Force old SSL"
 msgstr "綣阪�倶�� SSL"
 
-#: src/protocols/jabber/jabber.c:1571
+#: src/protocols/jabber/jabber.c:1572
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "��莅後�����絲�羌�筝���膾������莚�"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1580 src/protocols/silc/silc.c:1051
+#: src/protocols/jabber/jabber.c:1581 src/protocols/silc/silc.c:1359
 msgid "Connect server"
 msgstr "菴��ユ���≦��"
 
@@ -6087,39 +6090,39 @@
 msgid "XML Parse error"
 msgstr "XML ������莚�"
 
-#: src/protocols/jabber/presence.c:223
+#: src/protocols/jabber/presence.c:224
 msgid "Unknown Error in presence"
 msgstr "�榊ー���ラ��莚�"
 
-#: src/protocols/jabber/presence.c:226
+#: src/protocols/jabber/presence.c:227
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "���� %s �活�絨���兄��筝阪ソ����"
 
-#: src/protocols/jabber/presence.c:279 src/protocols/jabber/presence.c:280
+#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
 msgid "Create New Room"
 msgstr "��綮堺�井�翠��"
 
-#: src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:282
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "��③����綮堺�井�翠�眼�������活�菴�茵���臀��菴����活��ュ�藥�莅よ�臀��"
 
-#: src/protocols/jabber/presence.c:283
+#: src/protocols/jabber/presence.c:284
 msgid "Configure Room"
 msgstr "��臀��翠��"
 
-#: src/protocols/jabber/presence.c:285
+#: src/protocols/jabber/presence.c:286
 msgid "Accept Defaults"
 msgstr "�ュ�藥�莅ゅ��"
 
-#: src/protocols/jabber/presence.c:307
+#: src/protocols/jabber/presence.c:308
 #, c-format
 msgid "Error in chat %s"
 msgstr "��紊� %s �咲��"
 
-#: src/protocols/jabber/presence.c:310
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error joining chat %s"
 msgstr "���ヨ��紊� %s �咲��"
@@ -6151,7 +6154,7 @@
 
 #: src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
-msgstr "莚㊥���莚�(���醇�� Gaim �� bug)"
+msgstr "��莚�(���醇�� Gaim �� bug)"
 
 #: src/protocols/msn/error.c:42
 msgid "Invalid email address"
@@ -6189,7 +6192,7 @@
 msgid "Not on list"
 msgstr "������"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:528
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:570
 msgid "User is offline"
 msgstr "���欠�膾�"
 
@@ -6427,34 +6430,34 @@
 msgstr "菴�胼紫�笈��"
 
 #: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:766
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2361
-#: src/protocols/yahoo/yahoo.c:2740 src/protocols/yahoo/yahoo.c:2854
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2468
+#: src/protocols/yahoo/yahoo.c:2846 src/protocols/yahoo/yahoo.c:2960
 msgid "Be Right Back"
 msgstr "薊������"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:768
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2726
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
-#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2363
-#: src/protocols/yahoo/yahoo.c:2742 src/protocols/yahoo/yahoo.c:2855
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2721
+#: src/protocols/novell/novell.c:2836 src/protocols/novell/novell.c:2890
+#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2470
+#: src/protocols/yahoo/yahoo.c:2848 src/protocols/yahoo/yahoo.c:2961
 msgid "Busy"
 msgstr "綽�腆�"
 
 #: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:770
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2371
-#: src/protocols/yahoo/yahoo.c:2750 src/protocols/yahoo/yahoo.c:2859
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2478
+#: src/protocols/yahoo/yahoo.c:2856 src/protocols/yahoo/yahoo.c:2965
 msgid "On The Phone"
 msgstr "�ュ���笈�"
 
 #: src/protocols/msn/msn.c:470 src/protocols/msn/msn.c:772
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2375
-#: src/protocols/yahoo/yahoo.c:2754 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2482
+#: src/protocols/yahoo/yahoo.c:2860 src/protocols/yahoo/yahoo.c:2967
 msgid "Out To Lunch"
 msgstr "紊��阪葦蕕�"
 
 #: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:774
-#: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
+#: src/protocols/zephyr/zephyr.c:1205 src/protocols/zephyr/zephyr.c:1220
 msgid "Hidden"
 msgstr "��荳�"
 
@@ -6502,106 +6505,106 @@
 "MSN ��荀� SSL ������莚桁�茖���蒐篁倶������ SSL 綺���莚桁��� http://gaim.sf.net/faq-"
 "ssl.php 筝㊦���翫�篆≧����"
 
-#: src/protocols/msn/msn.c:1135 src/protocols/msn/msn.c:1148
-#: src/protocols/msn/msn.c:1154 src/protocols/yahoo/yahoo_profile.c:638
-#: src/protocols/yahoo/yahoo_profile.c:651
+#: src/protocols/msn/msn.c:1137 src/protocols/msn/msn.c:1150
+#: src/protocols/msn/msn.c:1156 src/protocols/yahoo/yahoo_profile.c:640
+#: src/protocols/yahoo/yahoo_profile.c:653
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1135
+#: src/protocols/msn/msn.c:1137
 msgid "MSN ID"
 msgstr "MSN ID"
 
-#: src/protocols/msn/msn.c:1143 src/protocols/yahoo/yahoo_profile.c:646
-#: src/protocols/zephyr/zephyr.c:560
+#: src/protocols/msn/msn.c:1145 src/protocols/yahoo/yahoo_profile.c:648
+#: src/protocols/zephyr/zephyr.c:602
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>����:</b> %s<br>"
 
-#: src/protocols/msn/msn.c:1220 src/protocols/msn/msn.c:1544
-#: src/protocols/yahoo/yahoo_profile.c:738
-#: src/protocols/yahoo/yahoo_profile.c:826
+#: src/protocols/msn/msn.c:1222 src/protocols/msn/msn.c:1546
+#: src/protocols/yahoo/yahoo_profile.c:746
+#: src/protocols/yahoo/yahoo_profile.c:834
 msgid "Error retrieving profile"
 msgstr "�桁���臀���篁九�咲��"
 
 #. Age
-#: src/protocols/msn/msn.c:1291 src/protocols/oscar/oscar.c:4870
+#: src/protocols/msn/msn.c:1293 src/protocols/oscar/oscar.c:4870
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1002
+#: src/protocols/yahoo/yahoo_profile.c:1010
 msgid "Age"
 msgstr "綛顔�"
 
 #. Gender
-#: src/protocols/msn/msn.c:1298 src/protocols/oscar/oscar.c:4856
+#: src/protocols/msn/msn.c:1300 src/protocols/oscar/oscar.c:4856
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1012
+#: src/protocols/yahoo/yahoo_profile.c:1020
 msgid "Gender"
 msgstr "�у��"
 
-#: src/protocols/msn/msn.c:1307 src/protocols/yahoo/yahoo_profile.c:1007
+#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Marital Status"
 msgstr "紿�紮紫�九��"
 
-#: src/protocols/msn/msn.c:1314 src/protocols/yahoo/yahoo_profile.c:997
+#: src/protocols/msn/msn.c:1316 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Location"
 msgstr "篏�臀�"
 
-#: src/protocols/msn/msn.c:1322 src/protocols/yahoo/yahoo_profile.c:1017
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Occupation"
 msgstr "��筝�"
 
-#: src/protocols/msn/msn.c:1339 src/protocols/msn/msn.c:1345
-#: src/protocols/msn/msn.c:1352 src/protocols/msn/msn.c:1360
-#: src/protocols/msn/msn.c:1367
+#: src/protocols/msn/msn.c:1341 src/protocols/msn/msn.c:1347
+#: src/protocols/msn/msn.c:1354 src/protocols/msn/msn.c:1362
+#: src/protocols/msn/msn.c:1369
 msgid "A Little About Me"
 msgstr "����篁�膸�"
 
-#: src/protocols/msn/msn.c:1376 src/protocols/msn/msn.c:1382
-#: src/protocols/msn/msn.c:1389 src/protocols/msn/msn.c:1396
+#: src/protocols/msn/msn.c:1378 src/protocols/msn/msn.c:1384
+#: src/protocols/msn/msn.c:1391 src/protocols/msn/msn.c:1398
 msgid "Favorite Things"
 msgstr "�区��"
 
-#: src/protocols/msn/msn.c:1405 src/protocols/msn/msn.c:1411
-#: src/protocols/msn/msn.c:1418
+#: src/protocols/msn/msn.c:1407 src/protocols/msn/msn.c:1413
+#: src/protocols/msn/msn.c:1420
 msgid "Hobbies and Interests"
 msgstr "��絅遵���頑僑"
 
-#: src/protocols/msn/msn.c:1427 src/protocols/msn/msn.c:1433
-#: src/protocols/yahoo/yahoo_profile.c:1059
+#: src/protocols/msn/msn.c:1429 src/protocols/msn/msn.c:1435
+#: src/protocols/yahoo/yahoo_profile.c:1067
 msgid "Favorite Quote"
 msgstr "�取�"
 
-#: src/protocols/msn/msn.c:1441 src/protocols/yahoo/yahoo_profile.c:1110
+#: src/protocols/msn/msn.c:1443 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Last Updated"
 msgstr "筝�罨≧�贋��"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1452 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1454 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "筝脂ゝ"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1463 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
 #: src/util.c:792
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1463 src/protocols/yahoo/yahoo_profile.c:1113
+#: src/protocols/msn/msn.c:1465 src/protocols/yahoo/yahoo_profile.c:1121
 msgid "Profile URL"
 msgstr "��臀���篁� URL"
 
-#: src/protocols/msn/msn.c:1545 src/protocols/yahoo/yahoo_profile.c:1132
+#: src/protocols/msn/msn.c:1547 src/protocols/yahoo/yahoo_profile.c:1140
 msgid "The user's profile is empty."
 msgstr "���欠����臀���篁銀減腥冴��"
 
-#: src/protocols/msn/msn.c:1614
+#: src/protocols/msn/msn.c:1616
 msgid "Display conversation closed notices"
 msgstr "�丞ず絲壕��渇�㊨����"
 
-#: src/protocols/msn/msn.c:1619
+#: src/protocols/msn/msn.c:1621
 msgid "Display timeout notices"
 msgstr "�丞ず莇��狗����"
 
@@ -6616,15 +6619,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1700 src/protocols/msn/msn.c:1702
+#: src/protocols/msn/msn.c:1703 src/protocols/msn/msn.c:1705
 msgid "MSN Protocol Plugin"
 msgstr "MSN �顒��篁�"
 
-#: src/protocols/msn/msn.c:1721 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1724 src/protocols/trepia/trepia.c:1290
 msgid "Login server"
 msgstr "�糸����≦��"
 
-#: src/protocols/msn/msn.c:1730
+#: src/protocols/msn/msn.c:1733
 msgid "Use HTTP Method"
 msgstr "篏睡�� HTTP �劫�"
 
@@ -6723,50 +6726,50 @@
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "���� %s �活�絨� %s 羞糸��筝阪ソ����"
 
-#: src/protocols/napster/napster.c:229
+#: src/protocols/napster/napster.c:230
 msgid "Unable to read header from server"
 msgstr "��羈�篁����≦�����紊�"
 
-#: src/protocols/napster/napster.c:243
+#: src/protocols/napster/napster.c:244
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "��羈�篁����≦�� %s 莚糸�篆≧�����巡擦筝� %hd鐚��水墾筝� %hd��"
 
-#: src/protocols/napster/napster.c:306
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "���傑��: %s鐚���篁倶��: %s鐚�紊у�: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:317
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "��羈�絨���%s��羞糸���井���� Napster 綽��傑�鋇�"
 
-#: src/protocols/napster/napster.c:325
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "��群膸���筝����≦����菴��ャ��"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:383
+#: src/protocols/napster/napster.c:384
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 莚傑�����篆≧��"
 
-#: src/protocols/napster/napster.c:421
+#: src/protocols/napster/napster.c:422
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "��群膸鋌����≦���㊤�鐚������������九�篏�臀��糸�ヤ���"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:427
+#: src/protocols/napster/napster.c:428
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 莚傑� PING"
 
-#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6156
-#: src/protocols/toc/toc.c:1259
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6171
+#: src/protocols/toc/toc.c:1266
 msgid "_Group:"
 msgstr "膸�(_G):"
 
@@ -6781,225 +6784,225 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:620 src/protocols/napster/napster.c:622
+#: src/protocols/napster/napster.c:622 src/protocols/napster/napster.c:624
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER �顒��篁�"
 
-#: src/protocols/novell/nmuser.c:2027
+#: src/protocols/novell/nmuser.c:2046
 msgid "Required parameters not passed in"
 msgstr "莚傑������井�����"
 
-#: src/protocols/novell/nmuser.c:2030
+#: src/protocols/novell/nmuser.c:2049
 msgid "Unable to write to network"
 msgstr "��羈����ョ�膸�"
 
-#: src/protocols/novell/nmuser.c:2033
+#: src/protocols/novell/nmuser.c:2052
 msgid "Unable to read from network"
 msgstr "��羈�篁��膸�莚糸�絅��ュ�"
 
-#: src/protocols/novell/nmuser.c:2036
+#: src/protocols/novell/nmuser.c:2055
 msgid "Error communicating with server"
 msgstr "筝����≦����莅��咲��"
 
-#: src/protocols/novell/nmuser.c:2040
+#: src/protocols/novell/nmuser.c:2059
 msgid "Conference not found"
 msgstr "篌�莅����上��"
 
-#: src/protocols/novell/nmuser.c:2043
+#: src/protocols/novell/nmuser.c:2062
 msgid "Conference does not exist"
 msgstr "篌�莅��絖���"
 
-#: src/protocols/novell/nmuser.c:2047
+#: src/protocols/novell/nmuser.c:2066
 msgid "A folder with that name already exists"
 msgstr "綏峨���������篁九す"
 
-#: src/protocols/novell/nmuser.c:2050
+#: src/protocols/novell/nmuser.c:2069
 msgid "Not supported"
 msgstr "����"
 
-#: src/protocols/novell/nmuser.c:2054
+#: src/protocols/novell/nmuser.c:2073
 msgid "Password has expired"
 msgstr "絲���綏画���"
 
-#: src/protocols/novell/nmuser.c:2057
+#: src/protocols/novell/nmuser.c:2076
 msgid "Invalid password"
 msgstr "������絲���"
 
-#: src/protocols/novell/nmuser.c:2060
+#: src/protocols/novell/nmuser.c:2079
 msgid "User not found"
 msgstr "���傑���上��"
 
-#: src/protocols/novell/nmuser.c:2063
+#: src/protocols/novell/nmuser.c:2082
 msgid "Account has been disabled"
 msgstr "茣��桁群膸頮����"
 
-#: src/protocols/novell/nmuser.c:2066
+#: src/protocols/novell/nmuser.c:2085
 msgid "The server could not access the directory"
 msgstr "���≦����羈�莅翠�����"
 
-#: src/protocols/novell/nmuser.c:2069
+#: src/protocols/novell/nmuser.c:2088
 msgid "Your system administrator has disabled this operation"
 msgstr "����膤紫�膊∞����綏牙�胼���④��篏�"
 
-#: src/protocols/novell/nmuser.c:2072
+#: src/protocols/novell/nmuser.c:2091
 msgid "The server is unavailable; try again later"
 msgstr "���≦��������莚欠�����莚�"
 
-#: src/protocols/novell/nmuser.c:2075
+#: src/protocols/novell/nmuser.c:2094
 msgid "Cannot add a contact to the same folder twice"
 msgstr "��羈�筝阪��筝�筝���篁九す羞糸��筝ゆ���膤私査"
 
-#: src/protocols/novell/nmuser.c:2078
+#: src/protocols/novell/nmuser.c:2097
 msgid "Cannot add yourself"
 msgstr "��羈�羞糸������訓"
 
-#: src/protocols/novell/nmuser.c:2081
+#: src/protocols/novell/nmuser.c:2100
 msgid "Master archive is misconfigured"
 msgstr "筝糸�罅i��臀���莚�"
 
-#: src/protocols/novell/nmuser.c:2085
+#: src/protocols/novell/nmuser.c:2104
 msgid "Invalid username or password"
 msgstr "���������桁����絲���"
 
-#: src/protocols/novell/nmuser.c:2088
+#: src/protocols/novell/nmuser.c:2107
 msgid "Could not recognize the host of the username you entered"
 msgstr "��羈�莚�������ョ���桁����筝紙��"
 
-#: src/protocols/novell/nmuser.c:2091
+#: src/protocols/novell/nmuser.c:2110
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
 msgstr "����茣��桁群膸頮��������������絲�����罨≧�医お紊�"
 
-#: src/protocols/novell/nmuser.c:2094
+#: src/protocols/novell/nmuser.c:2113
 msgid "You cannot add the same person twice to a conversation"
 msgstr "����羈�絨���筝�筝�査筝ゆ�羞糸���医�莚�"
 
-#: src/protocols/novell/nmuser.c:2098
+#: src/protocols/novell/nmuser.c:2117
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "��松�遺�����莅梧��膤私査����紊ф�亥��"
 
-#: src/protocols/novell/nmuser.c:2101
+#: src/protocols/novell/nmuser.c:2120
 msgid "You have entered an invalid username"
 msgstr "����ヤ����������桁��"
 
-#: src/protocols/novell/nmuser.c:2104
+#: src/protocols/novell/nmuser.c:2123
 msgid "An error occurred while updating the directory"
 msgstr "�贋�亥����九���篋���莚�"
 
-#: src/protocols/novell/nmuser.c:2107
+#: src/protocols/novell/nmuser.c:2126
 msgid "Incompatible protocol version"
 msgstr "筝��弱����顒�����"
 
-#: src/protocols/novell/nmuser.c:2110
+#: src/protocols/novell/nmuser.c:2129
 msgid "The user has blocked you"
 msgstr "���桁群膸鎡�恔���"
 
-#: src/protocols/novell/nmuser.c:2113
+#: src/protocols/novell/nmuser.c:2132
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr "莚����������莅梧�菴���筝����桁���九��鎖"
 
-#: src/protocols/novell/nmuser.c:2116
+#: src/protocols/novell/nmuser.c:2135
 msgid "The user is either offline or you are blocked"
 msgstr "���傑����胼紫鎖鐚�����綏牙�絮�恔���"
 
-#: src/protocols/novell/nmuser.c:2119
+#: src/protocols/novell/nmuser.c:2138
 #, c-format
 msgid "Unknown error: 0x%X"
-msgstr "���ラ��莚��0x%X"
-
-#: src/protocols/novell/novell.c:119
+msgstr "���ラ��莚�: 0x%X"
+
+#: src/protocols/novell/novell.c:116
 #, c-format
 msgid "Login failed (%s)."
 msgstr "�糸�紊沿乾(%s)��"
 
-#: src/protocols/novell/novell.c:232
+#: src/protocols/novell/novell.c:229
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "��羈�����羔�������羈��桁����欠��莚��篆≧��(%s)��"
 
-#: src/protocols/novell/novell.c:378
+#: src/protocols/novell/novell.c:375
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "��羈�絨� %s 羞糸���井����絅遵���茵�賢(%s)��"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:404
+#: src/protocols/novell/novell.c:401
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "��羈�����羔���(%s)��"
 
-#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:968
+#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "��羈���莚欠����(%s)��"
 
-#: src/protocols/novell/novell.c:514
+#: src/protocols/novell/novell.c:511
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "��羈�膸� %s ����羔�������羈���綮坂�莅�(%s)��"
 
-#: src/protocols/novell/novell.c:519
+#: src/protocols/novell/novell.c:516
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "��羈�����羔�������羈���綮坂�莅�(%s)��"
 
-#: src/protocols/novell/novell.c:566
+#: src/protocols/novell/novell.c:563
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "��羈�絨����� %s �����≦���腱糸���井��篁九す %s����綮堺��篁九す�咲��(%s)��"
 
-#: src/protocols/novell/novell.c:614
+#: src/protocols/novell/novell.c:611
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "��羈�絨� %s 羞糸���井����絅遵���茵��������≦�����綮堺��篁九す�咲��(%s)��"
 
-#: src/protocols/novell/novell.c:686
+#: src/protocols/novell/novell.c:683
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "��羈��桁����� %s ��莚��篆≧��(%s)��"
 
-#: src/protocols/novell/novell.c:732 src/protocols/novell/novell.c:878
+#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "��羈�絨����傑兄���井������腱���茵�賢(%s)��"
 
-#: src/protocols/novell/novell.c:779
+#: src/protocols/novell/novell.c:776
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "��羈�絨���%s��羞糸���井����絅遵���茵�賢(%s)��"
 
-#: src/protocols/novell/novell.c:832
+#: src/protocols/novell/novell.c:829
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "��羈�絨� %s 羞糸���井����莅後���茵�賢(%s)��"
 
-#: src/protocols/novell/novell.c:900
+#: src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "��羈�絨� %s 篁���腱���茵�賢����(%s)��"
 
-#: src/protocols/novell/novell.c:923 src/protocols/novell/novell.c:1576
+#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1573
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "��羈��贋�号���≦�������腱�莅丞舟(%s)��"
 
-#: src/protocols/novell/novell.c:995
+#: src/protocols/novell/novell.c:992
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "��羈���綮坂�莅�(%s)��"
 
-#: src/protocols/novell/novell.c:1106 src/protocols/novell/novell.c:1615
+#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1612
 msgid "Error communicating with server. Closing connection."
 msgstr "筝����≦����莅��咲�����渇�㊧��ャ��"
 
-#: src/protocols/novell/novell.c:1428
+#: src/protocols/novell/novell.c:1425
 msgid "Userid"
 msgstr "���� ID"
 
@@ -7010,46 +7013,46 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1442
+#: src/protocols/novell/novell.c:1439
 msgid "Full name"
 msgstr "����"
 
-#: src/protocols/novell/novell.c:1462
+#: src/protocols/novell/novell.c:1459
 msgid "User Properties"
 msgstr "���桁���"
 
-#: src/protocols/novell/novell.c:1566
+#: src/protocols/novell/novell.c:1563
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 篌�莅� %d"
 
-#: src/protocols/novell/novell.c:1591
+#: src/protocols/novell/novell.c:1588
 msgid "Unable to make SSL connection to server."
 msgstr "��羈���菴� SSL 菴��ュ�井���≦����"
 
-#: src/protocols/novell/novell.c:1621
+#: src/protocols/novell/novell.c:1618
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "紊���篋�篁倶����綺��咲��(%s)��"
 
-#: src/protocols/novell/novell.c:1655
+#: src/protocols/novell/novell.c:1652
 msgid "Authenticating..."
 msgstr "罩e���莚�..."
 
-#: src/protocols/novell/novell.c:1670
+#: src/protocols/novell/novell.c:1667
 msgid "Waiting for response..."
 msgstr "罩e�������綺�..."
 
-#: src/protocols/novell/novell.c:1803
+#: src/protocols/novell/novell.c:1802
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "綏牙���莚� %s ���ユ④絲壕���"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1829
 msgid "Invitation to Conversation"
 msgstr "絲壕���莚�"
 
-#: src/protocols/novell/novell.c:1831
+#: src/protocols/novell/novell.c:1830
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7060,15 +7063,15 @@
 "\n"
 "���堺�狗��: %s"
 
-#: src/protocols/novell/novell.c:1833
+#: src/protocols/novell/novell.c:1832
 msgid "Would you like to join the conversation?"
 msgstr "�������活����ュ�莚�鐚�"
 
-#: src/protocols/novell/novell.c:1938
+#: src/protocols/novell/novell.c:1937
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "��群茴�絵��鐚���筝堺��群篁��九�莅∞��坂��糸���"
 
-#: src/protocols/novell/novell.c:1992
+#: src/protocols/novell/novell.c:1991
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7078,34 +7081,34 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2090
+#: src/protocols/novell/novell.c:2089
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "��羈�菴��ュ�井���≦����莚決��ユ���活�菴��ョ�����≦�����医����"
 
-#: src/protocols/novell/novell.c:2112
+#: src/protocols/novell/novell.c:2111
 msgid "Error. SSL support is not installed."
 msgstr "�咲����SSL �������茖���"
 
-#: src/protocols/novell/novell.c:2421
+#: src/protocols/novell/novell.c:2420
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "罩や�莅�群�括Ⅴ��筝�篌������堺�����"
 
-#: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6458 src/protocols/yahoo/yahoo.c:2383
+#: src/protocols/novell/novell.c:2727 src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:6473 src/protocols/yahoo/yahoo.c:2490
 msgid "Offline"
 msgstr "胼紫鎖"
 
-#: src/protocols/novell/novell.c:2743
+#: src/protocols/novell/novell.c:2738
 msgid "Message"
 msgstr "羔���"
 
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2898
+#: src/protocols/novell/novell.c:2837 src/protocols/novell/novell.c:2893
 msgid "Appear Offline"
 msgstr "�丞ず筝榊�膾�"
 
-#: src/protocols/novell/novell.c:3291
+#: src/protocols/novell/novell.c:3287
 msgid "Initiate _Chat"
 msgstr "��莎決��紊�(_C)"
 
@@ -7120,15 +7123,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3367 src/protocols/novell/novell.c:3369
+#: src/protocols/novell/novell.c:3381 src/protocols/novell/novell.c:3383
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger �顒��篁�"
 
-#: src/protocols/novell/novell.c:3388
+#: src/protocols/novell/novell.c:3402
 msgid "Server address"
 msgstr "���≦���医��"
 
-#: src/protocols/novell/novell.c:3392
+#: src/protocols/novell/novell.c:3406
 msgid "Server port"
 msgstr "���≦�����"
 
@@ -7236,12 +7239,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM 篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1527
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1497
 #: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6762
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6777
 msgid "Get File"
 msgstr "�桁���篁�"
 
@@ -7313,18 +7316,18 @@
 msgid "Camera"
 msgstr "�御��"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5478
-#: src/protocols/oscar/oscar.c:6651
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5477
+#: src/protocols/oscar/oscar.c:6666
 msgid "Free For Chat"
 msgstr "��篋��画��"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5472
-#: src/protocols/oscar/oscar.c:6649
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5471
+#: src/protocols/oscar/oscar.c:6664
 msgid "Not Available"
 msgstr "筝�����"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5475
-#: src/protocols/oscar/oscar.c:6650
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5474
+#: src/protocols/oscar/oscar.c:6665
 msgid "Occupied"
 msgstr "��篋�膽�荳�"
 
@@ -7385,11 +7388,11 @@
 msgstr ""
 "�延�菴��桁��顔�我���� IP �医��鐚���篁ュ��遵研�ユ�������腱�蕋������������活�膸х鮫鐚�"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3311
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3312
 msgid "Connect"
 msgstr "菴���"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:869
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:872
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膸���筝���紊�� %s ��菴��ャ��"
@@ -7424,9 +7427,9 @@
 msgid "Connection established, cookie sent"
 msgstr "菴��ュ群綮榊�鐚�綏峨��� cookie"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:210
-#: src/protocols/yahoo/yahoo_filexfer.c:219
-#: src/protocols/yahoo/yahoo_filexfer.c:229
+#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/yahoo/yahoo_filexfer.c:189
+#: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr "��羈�綮榊���篁倶�菴亥���"
 
@@ -7489,16 +7492,16 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ��羈��桁��������糸�����"
 
-#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3096 src/protocols/oscar/oscar.c:3118
 msgid "(There was an error receiving this message)"
 msgstr "(�ユ�倶④羔����咲��)"
 
-#: src/protocols/oscar/oscar.c:3303
+#: src/protocols/oscar/oscar.c:3304
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����莚傑��� %s 篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:3306
+#: src/protocols/oscar/oscar.c:3307
 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 "
@@ -7507,42 +7510,42 @@
 "�医����荀���犬�域�膊��坂��翫産腴��贋・菴��ワ�菴�絲剛��恰�銀����上����荀�����篏����絨���"
 "�我���� IP �医��鐚���篁ュ��初����羹�������腱�蕋�����"
 
-#: src/protocols/oscar/oscar.c:3342
+#: src/protocols/oscar/oscar.c:3343
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "莚桁�����鎞������ュソ����"
 
-#: src/protocols/oscar/oscar.c:3350
+#: src/protocols/oscar/oscar.c:3351
 msgid "Authorization Request Message:"
 msgstr "莅よ�莚傑�羔���:"
 
-#: src/protocols/oscar/oscar.c:3351
+#: src/protocols/oscar/oscar.c:3352
 msgid "Please authorize me!"
 msgstr "莚桁�����鎞������ュソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:3381
+#: src/protocols/oscar/oscar.c:3382
 #, 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:3386 src/protocols/oscar/oscar.c:3388
+#: src/protocols/oscar/oscar.c:3387 src/protocols/oscar/oscar.c:3389
 msgid "Request Authorization"
 msgstr "莚傑�莅よ�"
 
-#: src/protocols/oscar/oscar.c:3436 src/protocols/oscar/oscar.c:3438
-#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3527
-#: src/protocols/oscar/oscar.c:3547 src/protocols/oscar/oscar.c:3901
-#: src/protocols/oscar/oscar.c:3961 src/protocols/oscar/oscar.c:6077
-#: src/protocols/oscar/oscar.c:6123
+#: src/protocols/oscar/oscar.c:3437 src/protocols/oscar/oscar.c:3439
+#: src/protocols/oscar/oscar.c:3446 src/protocols/oscar/oscar.c:3528
+#: src/protocols/oscar/oscar.c:3548 src/protocols/oscar/oscar.c:3902
+#: src/protocols/oscar/oscar.c:3962 src/protocols/oscar/oscar.c:6092
+#: src/protocols/oscar/oscar.c:6138
 msgid "No reason given."
 msgstr "羃≧��膸��榊���宴��"
 
-#: src/protocols/oscar/oscar.c:3444
+#: src/protocols/oscar/oscar.c:3445
 msgid "Authorization Denied Message:"
 msgstr "莅よ���膸�羔���:"
 
-#: src/protocols/oscar/oscar.c:3527
+#: src/protocols/oscar/oscar.c:3528
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7551,11 +7554,11 @@
 "���� %u �活�絨�����筝坂�/絅合��絅遵�鐚����怨�筝�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3535 src/protocols/oscar/oscar.c:6083
+#: src/protocols/oscar/oscar.c:3536 src/protocols/oscar/oscar.c:6098
 msgid "Authorization Request"
 msgstr "莅よ�莚傑�"
 
-#: src/protocols/oscar/oscar.c:3547
+#: src/protocols/oscar/oscar.c:3548
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7565,17 +7568,17 @@
 "���� %u ��膸�篋����篁�/絅劫��筝阪ソ����莚傑�鐚�����絋�筝�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:3549
 msgid "ICQ authorization denied."
 msgstr "ICQ 莚傑�莅よ�茴���膸���"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3555
+#: src/protocols/oscar/oscar.c:3556
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "���� %u ������篁�/絅劫��筝阪ソ����"
 
-#: src/protocols/oscar/oscar.c:3563
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7588,7 +7591,7 @@
 "���坂査: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3571
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7601,7 +7604,7 @@
 "���坂査: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3579
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7614,32 +7617,32 @@
 "��絎号��:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3600
+#: src/protocols/oscar/oscar.c:3601
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ���� %u 膸������篋�筝�筝�ソ��: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3606
+#: src/protocols/oscar/oscar.c:3607
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "�������活�絨�罩や査��筝阪ソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:3610
+#: src/protocols/oscar/oscar.c:3611
 msgid "Decline"
 msgstr "��膸�"
 
-#: src/protocols/oscar/oscar.c:3695
+#: src/protocols/oscar/oscar.c:3696
 #, 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:3704
+#: src/protocols/oscar/oscar.c:3705
 #, 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:3713
+#: src/protocols/oscar/oscar.c:3714
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7647,72 +7650,72 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧����������松�遺�膈�膾ч���吟��"
 
-#: src/protocols/oscar/oscar.c:3722
+#: src/protocols/oscar/oscar.c:3723
 #, 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:3731
+#: src/protocols/oscar/oscar.c:3732
 #, 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:3740
+#: src/protocols/oscar/oscar.c:3741
 #, 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:3797 src/protocols/oscar/oscar.c:4021
+#: src/protocols/oscar/oscar.c:3798 src/protocols/oscar/oscar.c:4022
 #, c-format
 msgid "Info for %s"
 msgstr "%s ��篆≧��"
 
-#: src/protocols/oscar/oscar.c:3802
+#: src/protocols/oscar/oscar.c:3803
 #, 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:3863
+#: src/protocols/oscar/oscar.c:3864
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ���咲��莚�: %s\n"
 
-#: src/protocols/oscar/oscar.c:3864
+#: src/protocols/oscar/oscar.c:3865
 msgid "Unknown error"
 msgstr "���ラ��莚�"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3899
+#: src/protocols/oscar/oscar.c:3900
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "��� %s ��羔��������:"
 
-#: src/protocols/oscar/oscar.c:3958
+#: src/protocols/oscar/oscar.c:3959
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s �����隙拭�������:"
 
-#: src/protocols/oscar/oscar.c:3981
+#: src/protocols/oscar/oscar.c:3982
 msgid "Warning Level"
 msgstr "茘���膾у��"
 
-#: src/protocols/oscar/oscar.c:3984
+#: src/protocols/oscar/oscar.c:3985
 msgid "Online Since"
 msgstr "筝�膾炊�狗��"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/yahoo/yahoo_profile.c:1105
+#: src/protocols/oscar/oscar.c:3989 src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Member Since"
 msgstr "羈����狗��"
 
-#: src/protocols/oscar/oscar.c:4072
+#: src/protocols/oscar/oscar.c:4073
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM 菴��ュ��遵群筝√け��"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4258
+#: src/protocols/oscar/oscar.c:4259
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7748,7 +7751,7 @@
 msgid "Email Address"
 msgstr "�球���散�医��"
 
-#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1555
+#: src/protocols/oscar/oscar.c:4855 src/protocols/silc/buddy.c:1524
 msgid "Mobile Phone"
 msgstr "腱糸���笈�"
 
@@ -7811,85 +7814,85 @@
 msgid "ICQ Info for %s"
 msgstr "%s �� ICQ 篆≧��"
 
-#: src/protocols/oscar/oscar.c:4959
+#: src/protocols/oscar/oscar.c:4958
 msgid "Pop-Up Message"
 msgstr "綣劫�堺���"
 
-#: src/protocols/oscar/oscar.c:4980
+#: src/protocols/oscar/oscar.c:4979
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "筝������桁��綏牙��� %s �活��"
 
-#: src/protocols/oscar/oscar.c:4984
+#: src/protocols/oscar/oscar.c:4983
 msgid "Search Results"
 msgstr "��膣∝���"
 
-#: src/protocols/oscar/oscar.c:5001
+#: src/protocols/oscar/oscar.c:5000
 #, c-format
 msgid "No results found for email address %s"
 msgstr "���上�遺��球���散�医�� %s �拷����膸���"
 
-#: src/protocols/oscar/oscar.c:5022
+#: src/protocols/oscar/oscar.c:5021
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "���綵��九�域���`莅� %s ����散��"
 
-#: src/protocols/oscar/oscar.c:5024
+#: src/protocols/oscar/oscar.c:5023
 msgid "Account Confirmation Requested"
 msgstr "莚傑�篋�茣��欠`莅�"
 
-#: src/protocols/oscar/oscar.c:5052
+#: src/protocols/oscar/oscar.c:5051
 msgid "Error Changing Account Info"
 msgstr "�贋�壕侃�隙拭���咲��"
 
-#: src/protocols/oscar/oscar.c:5055
+#: src/protocols/oscar/oscar.c:5054
 #, 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:5058
+#: src/protocols/oscar/oscar.c:5057
 #, 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:5061
+#: src/protocols/oscar/oscar.c:5060
 #, 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:5064
+#: src/protocols/oscar/oscar.c:5063
 #, 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:5067
+#: src/protocols/oscar/oscar.c:5066
 #, 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:5070
+#: src/protocols/oscar/oscar.c:5069
 #, 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:5073
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��莚� 0x%04x: ���ラ��莚���"
 
-#: src/protocols/oscar/oscar.c:5083
+#: src/protocols/oscar/oscar.c:5082
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7898,25 +7901,25 @@
 "�������桁���弱������筝�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5084 src/protocols/oscar/oscar.c:5091
+#: src/protocols/oscar/oscar.c:5083 src/protocols/oscar/oscar.c:5090
 msgid "Account Info"
 msgstr "茣��隙拭��"
 
-#: src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5088
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���球���散�医��筝� %s"
 
-#: src/protocols/oscar/oscar.c:5154
+#: src/protocols/oscar/oscar.c:5153
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "������紊��上��Ū���冴��荀�������紊��上������蕁肢��ヤ減篋�篋坂�����"
 
-#: src/protocols/oscar/oscar.c:5327
+#: src/protocols/oscar/oscar.c:5326
 msgid "Unable to set AIM profile."
 msgstr "��羈�莅丞舟 AIM ��臀���篁吟��"
 
-#: src/protocols/oscar/oscar.c:5328
+#: src/protocols/oscar/oscar.c:5327
 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 "
@@ -7925,7 +7928,7 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上���臀���篁吟��������臀���篁九����絎�鐚�莚桁���������ュ��"
 "��莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:5355
+#: src/protocols/oscar/oscar.c:5354
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -7935,19 +7938,19 @@
 "truncated it for you."
 msgstr[0] "綏牙�莇�菴�篋���臀���篁句����紊ч�水墾 %d 絖�����Gaim 筝堺���������℡���"
 
-#: src/protocols/oscar/oscar.c:5360
+#: src/protocols/oscar/oscar.c:5359
 msgid "Profile too long."
 msgstr "��臀���篁九お�帥��"
 
-#: src/protocols/oscar/oscar.c:5376 src/protocols/oscar/oscar.c:6656
+#: src/protocols/oscar/oscar.c:5375 src/protocols/oscar/oscar.c:6671
 msgid "Visible"
 msgstr "�乗昆"
 
-#: src/protocols/oscar/oscar.c:5394
+#: src/protocols/oscar/oscar.c:5393
 msgid "Unable to set AIM away message."
 msgstr "��羈�莅丞舟 AIM 胼糸�羔�����"
 
-#: src/protocols/oscar/oscar.c:5395
+#: src/protocols/oscar/oscar.c:5394
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -7956,7 +7959,7 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上�胼糸�羔��������絨�紊�篋��������倶��鐚�莚桁���������ュ��"
 "��莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:5435
+#: src/protocols/oscar/oscar.c:5434
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -7968,11 +7971,11 @@
 "綏牙�莇�菴�篋�胼糸�羔�������紊ч�水墾 %d 絖�����Gaim ����減�����℡�羔����綛九����筝榊�"
 "綣���"
 
-#: src/protocols/oscar/oscar.c:5440
+#: src/protocols/oscar/oscar.c:5439
 msgid "Away message too long."
 msgstr "胼糸�羔���お�帥��"
 
-#: src/protocols/oscar/oscar.c:5526
+#: src/protocols/oscar/oscar.c:5517
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7982,16 +7985,16 @@
 "��羈�羞糸��絅遵� %s鐚����������桁�����������桁��綽�蕁私札絖�罸�綣�紊器��銀賢���遵�����罸�����"
 "絖���腥堺�種������������医���莚ュソ��絨�篁�����絅遵���茵�賢���ゃ��"
 
-#: src/protocols/oscar/oscar.c:5527 src/protocols/oscar/oscar.c:5944
-#: src/protocols/oscar/oscar.c:5957
+#: src/protocols/oscar/oscar.c:5518 src/protocols/oscar/oscar.c:5959
+#: src/protocols/oscar/oscar.c:5972
 msgid "Unable To Add"
 msgstr "��羈�羞糸��"
 
-#: src/protocols/oscar/oscar.c:5663
+#: src/protocols/oscar/oscar.c:5678
 msgid "Unable To Retrieve Buddy List"
 msgstr "��羈��桁�絅遵���茵�"
 
-#: src/protocols/oscar/oscar.c:5664
+#: src/protocols/oscar/oscar.c:5679
 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 "
@@ -8000,13 +8003,13 @@
 "Gaim ���倶��羈�篁� AIM ���≦��キ������絅遵���茵�������絅遵���茵�押��筝√け鐚����順�膈���"
 "絨�嚭葦�順�����"
 
-#: src/protocols/oscar/oscar.c:5840 src/protocols/oscar/oscar.c:5841
-#: src/protocols/oscar/oscar.c:5846 src/protocols/oscar/oscar.c:6001
-#: src/protocols/oscar/oscar.c:6002 src/protocols/oscar/oscar.c:6007
+#: src/protocols/oscar/oscar.c:5855 src/protocols/oscar/oscar.c:5856
+#: src/protocols/oscar/oscar.c:5861 src/protocols/oscar/oscar.c:6016
+#: src/protocols/oscar/oscar.c:6017 src/protocols/oscar/oscar.c:6022
 msgid "Orphans"
 msgstr "絖ゅ��"
 
-#: src/protocols/oscar/oscar.c:5943
+#: src/protocols/oscar/oscar.c:5958
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8014,11 +8017,11 @@
 msgstr ""
 "��羈�絨� %s ��筝阪ソ��鐚�����������絅遵�紊����莚桁���ゅ�銀賢筝�筝�ソ��鐚��九����莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:5943 src/protocols/oscar/oscar.c:5956
+#: src/protocols/oscar/oscar.c:5958 src/protocols/oscar/oscar.c:5971
 msgid "(no name)"
 msgstr "(����腱�)"
 
-#: src/protocols/oscar/oscar.c:5956
+#: src/protocols/oscar/oscar.c:5971
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8028,18 +8031,18 @@
 "��羈�羞糸��絅遵� %s鐚��������ャ�������順������������絅遵���茵�賢絅遵����亥��群膸颴上�遺���"
 "��莅悟����紊у�若��"
 
-#: src/protocols/oscar/oscar.c:6038
+#: src/protocols/oscar/oscar.c:6053
 #, 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:6044
+#: src/protocols/oscar/oscar.c:6059
 msgid "Authorization Given"
 msgstr "膸��榊��莅よ�"
 
-#: src/protocols/oscar/oscar.c:6077
+#: src/protocols/oscar/oscar.c:6092
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8049,17 +8052,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6119
+#: src/protocols/oscar/oscar.c:6134
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "���� %s ��莅御���篁�/絅劫���ュソ����"
 
-#: src/protocols/oscar/oscar.c:6120
+#: src/protocols/oscar/oscar.c:6135
 msgid "Authorization Granted"
 msgstr "莅よ�茴����"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6123
+#: src/protocols/oscar/oscar.c:6138
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8069,71 +8072,71 @@
 "���� %s ��膸�篋�����九���ュソ����茵���莚傑�鐚�����絋�筝�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6124
+#: src/protocols/oscar/oscar.c:6139
 msgid "Authorization Denied"
 msgstr "莅よ�茴���膸�"
 
-#: src/protocols/oscar/oscar.c:6161 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:6176 src/protocols/toc/toc.c:1271
 msgid "_Exchange:"
 msgstr "篋ゆ��(_E):"
 
-#: src/protocols/oscar/oscar.c:6183
+#: src/protocols/oscar/oscar.c:6198
 msgid "Invalid chat name specified."
 msgstr "��絎�����紊���腱井������"
 
-#: src/protocols/oscar/oscar.c:6273
+#: src/protocols/oscar/oscar.c:6288
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "������紊��上��Ū���冴������遵�� AIM ��紊�賢������紊��上���"
 
-#: src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:6445
 msgid "Away Message"
 msgstr "霝糸�羔���"
 
-#: src/protocols/oscar/oscar.c:6714
+#: src/protocols/oscar/oscar.c:6729
 msgid "Buddy Comment:"
 msgstr "絅遵�羈���:"
 
-#: src/protocols/oscar/oscar.c:6732
+#: src/protocols/oscar/oscar.c:6747
 msgid "Edit Buddy Comment"
 msgstr "膽�莨�絅遵�羈���"
 
-#: src/protocols/oscar/oscar.c:6738
+#: src/protocols/oscar/oscar.c:6753
 msgid "Get Status Msg"
 msgstr "�桁��倶��羔���"
 
-#: src/protocols/oscar/oscar.c:6750
+#: src/protocols/oscar/oscar.c:6765
 msgid "Direct IM"
 msgstr "篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:6773
+#: src/protocols/oscar/oscar.c:6788
 msgid "Re-request Authorization"
 msgstr "���域�羆�莅よ�"
 
-#: src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:6818
 msgid "The new formatting is invalid."
 msgstr "�井�弱���������"
 
-#: src/protocols/oscar/oscar.c:6804
+#: src/protocols/oscar/oscar.c:6819
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "���桁���弱������贋�劫ぇ����腥堺�若��"
 
-#: src/protocols/oscar/oscar.c:6811
+#: src/protocols/oscar/oscar.c:6826
 msgid "New screen name formatting:"
 msgstr "�亥�����桁���弱���:"
 
-#: src/protocols/oscar/oscar.c:6863
+#: src/protocols/oscar/oscar.c:6878
 msgid "Change Address To:"
 msgstr "絨��医���贋�剛減:"
 
-#: src/protocols/oscar/oscar.c:6908
+#: src/protocols/oscar/oscar.c:6923
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��攻筝������莅よ�</i>"
 
-#: src/protocols/oscar/oscar.c:6911
+#: src/protocols/oscar/oscar.c:6926
 msgid "You are awaiting authorization from the following buddies"
 msgstr "��③���緇�筝���絅遵���莅よ�"
 
-#: src/protocols/oscar/oscar.c:6912
+#: src/protocols/oscar/oscar.c:6927
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8141,75 +8144,75 @@
 "絋������活���菴�篋�絅遵����域�羆�莅よ�鐚�����������渇�����肢�篋�絅遵�鐚��九�����獅�����域�"
 "羆�莅よ�����"
 
-#: src/protocols/oscar/oscar.c:6929
+#: src/protocols/oscar/oscar.c:6944
 msgid "Find Buddy by E-mail"
 msgstr "���球���散�ユ�上ソ��"
 
-#: src/protocols/oscar/oscar.c:6930
+#: src/protocols/oscar/oscar.c:6945
 msgid "Search for a buddy by e-mail address"
 msgstr "���球���散�医����膣√ソ��"
 
-#: src/protocols/oscar/oscar.c:6931
+#: src/protocols/oscar/oscar.c:6946
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "莨��ユ���活���膣∝��絅遵����球���散�医����"
 
-#: src/protocols/oscar/oscar.c:6948
+#: src/protocols/oscar/oscar.c:6963
 msgid "Available Message:"
 msgstr "�������:"
 
-#: src/protocols/oscar/oscar.c:6949
+#: src/protocols/oscar/oscar.c:6964
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "��罩e��轡篏�鐚�羝贋��茴����� - �惹��!"
 
-#: src/protocols/oscar/oscar.c:7030
+#: src/protocols/oscar/oscar.c:7045 src/protocols/silc/silc.c:782
 msgid "Set User Info..."
 msgstr "莅丞舟���隙拭��..."
 
-#: src/protocols/oscar/oscar.c:7035
+#: src/protocols/oscar/oscar.c:7050
 msgid "Set User Info (URL)..."
 msgstr "莅丞舟���隙拭��(URL)..."
 
-#: src/protocols/oscar/oscar.c:7041
+#: src/protocols/oscar/oscar.c:7056
 msgid "Set Available Message..."
 msgstr "莅丞舟�������..."
 
-#: src/protocols/oscar/oscar.c:7046
+#: src/protocols/oscar/oscar.c:7061 src/protocols/silc/silc.c:778
 msgid "Change Password..."
 msgstr "�贋�劫���..."
 
-#: src/protocols/oscar/oscar.c:7051
+#: src/protocols/oscar/oscar.c:7066
 msgid "Change Password (URL)"
 msgstr "�贋�劫���(URL)"
 
-#: src/protocols/oscar/oscar.c:7055
+#: src/protocols/oscar/oscar.c:7070
 msgid "Configure IM Forwarding (URL)"
 msgstr "��臀� IM 莉��(URL)"
 
-#: src/protocols/oscar/oscar.c:7064
+#: src/protocols/oscar/oscar.c:7079
 msgid "Format Screen Name..."
 msgstr "�弱������桁��..."
 
-#: src/protocols/oscar/oscar.c:7068
+#: src/protocols/oscar/oscar.c:7083
 msgid "Confirm Account"
 msgstr "隋��茣���"
 
-#: src/protocols/oscar/oscar.c:7072
+#: src/protocols/oscar/oscar.c:7087
 msgid "Display Currently Registered Address"
 msgstr "�丞ず綵���羈������医��"
 
-#: src/protocols/oscar/oscar.c:7076
+#: src/protocols/oscar/oscar.c:7091
 msgid "Change Currently Registered Address..."
 msgstr "�贋�劫���羈������医��..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7098
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�丞ず罩e�����莅よ���絅遵�"
 
-#: src/protocols/oscar/oscar.c:7089
+#: src/protocols/oscar/oscar.c:7104
 msgid "Search for Buddy by Email..."
 msgstr "���球���散��膣√ソ��..."
 
-#: src/protocols/oscar/oscar.c:7094
+#: src/protocols/oscar/oscar.c:7109
 msgid "Search for Buddy by Information"
 msgstr "��篆≧����膣√ソ��"
 
@@ -8224,15 +8227,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7209 src/protocols/oscar/oscar.c:7211
+#: src/protocols/oscar/oscar.c:7225 src/protocols/oscar/oscar.c:7227
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ �顒��篁�"
 
-#: src/protocols/oscar/oscar.c:7230
+#: src/protocols/oscar/oscar.c:7246
 msgid "Auth host"
 msgstr "莅よ�筝紙��"
 
-#: src/protocols/oscar/oscar.c:7235
+#: src/protocols/oscar/oscar.c:7251
 msgid "Auth port"
 msgstr "莅よ�腴��"
 
@@ -8328,12 +8331,12 @@
 msgid "Cannot fetch the public key"
 msgstr "��閿��桁�����"
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1650
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1619
 msgid "Show Public Key"
 msgstr "�丞ず����"
 
-#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:991
-#: src/protocols/silc/chat.c:218
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/chat.c:219
 msgid "Could not load public key"
 msgstr "��羈�茖��ュ����"
 
@@ -8361,199 +8364,199 @@
 "�ら������ュソ�������ワ���������羈��九�医ソ�����ャ�����札篏睡��キ�����ュ�巡擦�ヨキ����"
 "�ャ��"
 
-#: src/protocols/silc/buddy.c:1034
+#: src/protocols/silc/buddy.c:1032
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s 絅遵����榊ー篋��膸�筝�"
 
-#: src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1035
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr "荀�羞糸��絅遵�鐚����蕁糸��ヤ�/絅合�����ャ��莚傑��[絲弱��]篁ュ��ュ���ャ��"
 
-#: src/protocols/silc/buddy.c:1040
+#: src/protocols/silc/buddy.c:1038
 msgid "Import..."
 msgstr "絲弱��..."
 
+#: src/protocols/silc/buddy.c:1125
+msgid "Select correct user"
+msgstr "����③隋�����"
+
 #: src/protocols/silc/buddy.c:1127
-msgid "Select correct user"
-msgstr "����③隋�����"
-
-#: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 "���遺�紊�筝����隙戎�����欠�����ャ��莚隙���茵�賢�����活�羞糸���医ソ����茵�賢���d肩篋冴��"
 
-#: src/protocols/silc/buddy.c:1131
+#: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "���遺�紊�筝����隙戎�����欠����腱違��莚隙���茵�賢�����活�羞糸���医ソ����茵�賢���d肩篋冴��"
 
-#: src/protocols/silc/buddy.c:1405
+#: src/protocols/silc/buddy.c:1377
 msgid "Detached"
 msgstr "綏画�援�"
 
-#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:48
+#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48
 #: src/protocols/silc/silc.c:80
 msgid "Indisposed"
 msgstr "筝�����"
 
-#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:49
+#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49
 #: src/protocols/silc/silc.c:82
 msgid "Wake Me Up"
 msgstr "������"
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:45
+#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45
 #: src/protocols/silc/silc.c:74
 msgid "Hyper Active"
 msgstr "紊���"
 
-#: src/protocols/silc/buddy.c:1417
+#: src/protocols/silc/buddy.c:1389
 msgid "Robot"
 msgstr "�阪��査"
 
-#: src/protocols/silc/buddy.c:1424 src/protocols/silc/buddy.c:1492
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/buddy.c:1464
 #: src/protocols/silc/silc.c:606
 msgid "Happy"
 msgstr "蕭���"
 
-#: src/protocols/silc/buddy.c:1426 src/protocols/silc/buddy.c:1494
+#: src/protocols/silc/buddy.c:1398 src/protocols/silc/buddy.c:1466
 #: src/protocols/silc/silc.c:608
 msgid "Sad"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1428 src/protocols/silc/buddy.c:1496
+#: src/protocols/silc/buddy.c:1400 src/protocols/silc/buddy.c:1468
 #: src/protocols/silc/silc.c:610
 msgid "Angry"
 msgstr "��羂�"
 
-#: src/protocols/silc/buddy.c:1430 src/protocols/silc/buddy.c:1498
+#: src/protocols/silc/buddy.c:1402 src/protocols/silc/buddy.c:1470
 #: src/protocols/silc/silc.c:612
 msgid "Jealous"
 msgstr "茘���"
 
-#: src/protocols/silc/buddy.c:1432 src/protocols/silc/buddy.c:1500
+#: src/protocols/silc/buddy.c:1404 src/protocols/silc/buddy.c:1472
 #: src/protocols/silc/silc.c:614
 msgid "Ashamed"
 msgstr "絎括�"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/buddy.c:1502
+#: src/protocols/silc/buddy.c:1406 src/protocols/silc/buddy.c:1474
 #: src/protocols/silc/silc.c:616
 msgid "Invincible"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/buddy.c:1504
+#: src/protocols/silc/buddy.c:1408 src/protocols/silc/buddy.c:1476
 #: src/protocols/silc/silc.c:618
 msgid "In Love"
 msgstr "�㊥��"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/buddy.c:1506
+#: src/protocols/silc/buddy.c:1410 src/protocols/silc/buddy.c:1478
 #: src/protocols/silc/silc.c:620
 msgid "Sleepy"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/buddy.c:1508
+#: src/protocols/silc/buddy.c:1412 src/protocols/silc/buddy.c:1480
 #: src/protocols/silc/silc.c:622
 msgid "Bored"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/buddy.c:1510
+#: src/protocols/silc/buddy.c:1414 src/protocols/silc/buddy.c:1482
 #: src/protocols/silc/silc.c:624
 msgid "Excited"
 msgstr "羶���"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/buddy.c:1512
+#: src/protocols/silc/buddy.c:1416 src/protocols/silc/buddy.c:1484
 #: src/protocols/silc/silc.c:626
 msgid "Anxious"
 msgstr "薀ユ鹸"
 
-#: src/protocols/silc/buddy.c:1480
+#: src/protocols/silc/buddy.c:1452
 msgid "Modes"
 msgstr "罔≦�"
 
+#: src/protocols/silc/buddy.c:1462
+msgid "Mood"
+msgstr "綽���"
+
 #: src/protocols/silc/buddy.c:1490
-msgid "Mood"
-msgstr "綽���"
-
-#: src/protocols/silc/buddy.c:1520
 msgid "Status Text"
 msgstr "�倶������"
 
-#: src/protocols/silc/buddy.c:1525
+#: src/protocols/silc/buddy.c:1495
 msgid "Preferred Contact"
 msgstr "薤�����膤私査"
 
-#: src/protocols/silc/buddy.c:1533
+#: src/protocols/silc/buddy.c:1503
 msgid "Paging"
 msgstr "絲糸��"
 
-#: src/protocols/silc/buddy.c:1535 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1505 src/protocols/silc/silc.c:637
 msgid "SMS"
 msgstr "�℡拭"
 
-#: src/protocols/silc/buddy.c:1537 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1507 src/protocols/silc/silc.c:639
 msgid "MMS"
 msgstr "綵�拭"
 
-#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1509 src/protocols/silc/silc.c:641
 msgid "Video Conferencing"
 msgstr "茹�蘂�篌�莅�"
 
-#: src/protocols/silc/buddy.c:1546
+#: src/protocols/silc/buddy.c:1515
 msgid "Preferred Language"
 msgstr "薤���莚㊧�"
 
-#: src/protocols/silc/buddy.c:1551
+#: src/protocols/silc/buddy.c:1520
 msgid "Device"
 msgstr "莅上�"
 
-#: src/protocols/silc/buddy.c:1553
+#: src/protocols/silc/buddy.c:1522
 msgid "Computer"
 msgstr "莅∞���"
 
-#: src/protocols/silc/buddy.c:1557
+#: src/protocols/silc/buddy.c:1526
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/buddy.c:1559
+#: src/protocols/silc/buddy.c:1528
 msgid "Terminal"
 msgstr "膸�腴�"
 
-#: src/protocols/silc/buddy.c:1570 src/protocols/silc/silc.c:674
+#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:674
 #: src/protocols/silc/silc.c:676
 msgid "Timezone"
 msgstr "�九��"
 
-#: src/protocols/silc/buddy.c:1576
+#: src/protocols/silc/buddy.c:1545
 msgid "Geolocation"
 msgstr "�亥��篏�臀�"
 
-#: src/protocols/silc/buddy.c:1635
+#: src/protocols/silc/buddy.c:1604
 msgid "Reset IM Key"
 msgstr "��臀���紊����"
 
-#: src/protocols/silc/buddy.c:1640
+#: src/protocols/silc/buddy.c:1609
 msgid "IM with Key Exchange"
 msgstr "絽���ヤ困�√���"
 
-#: src/protocols/silc/buddy.c:1644
+#: src/protocols/silc/buddy.c:1613
 msgid "IM with Password"
 msgstr "絽����綣���"
 
-#: src/protocols/silc/buddy.c:1655
+#: src/protocols/silc/buddy.c:1624
 msgid "Get Public Key..."
 msgstr "�桁�����..."
 
-#: src/protocols/silc/buddy.c:1660
+#: src/protocols/silc/buddy.c:1629
 msgid "Send File..."
 msgstr "������篁�..."
 
-#: src/protocols/silc/buddy.c:1665 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1634 src/protocols/silc/ops.c:1127
 msgid "Kill User"
 msgstr "��罩紫����"
 
@@ -8575,24 +8578,86 @@
 msgid "Cannot get channel information"
 msgstr "��羈��桁�蘂���篆≧��拭��"
 
-#: src/protocols/silc/chat.c:217
+#: src/protocols/silc/chat.c:104
+#, c-format
+msgid "Channel Name:\t\t%s\n"
+msgstr "蘂�����腱�:\t%s\n"
+
+#: src/protocols/silc/chat.c:106
+#, c-format
+msgid "User Count:\t\t%d\n"
+msgstr "���決���:\t%d\n"
+
+#: src/protocols/silc/chat.c:112
+#, c-format
+msgid "Channel Founder:\t%s\n"
+msgstr "蘂�����綮坂査:\t%s\n"
+
+#: src/protocols/silc/chat.c:120
+#, c-format
+msgid "Channel Cipher:\t\t%s\n"
+msgstr "蘂���絲�����:\t%s\n"
+
+#: src/protocols/silc/chat.c:123
+#, c-format
+msgid "Channel HMAC:\t\t%s\n"
+msgstr "蘂��� HMAC:\t%s\n"
+
+#: src/protocols/silc/chat.c:127
+#, c-format
+msgid ""
+"\n"
+"Channel Topic:\n"
+"\t%s\n"
+msgstr ""
+"\n"
+"蘂���筝脂�:\n"
+"\t%s\n"
+
+#: src/protocols/silc/chat.c:130
+msgid ""
+"\n"
+"Channel Modes:\n"
+msgstr "\n蘂���罔≦�:\n"
+
+#: src/protocols/silc/chat.c:144
+#, c-format
+msgid ""
+"\n"
+"Founder Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"\n"
+"��綮肴��絲��ユ��膾�:\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/chat.c:145
+#, c-format
+msgid ""
+"Founder Key Babbleprint:\n"
+"%s"
+msgstr "��綮肴��絲��ユ���:\n%s"
+
+#: src/protocols/silc/chat.c:218
 msgid "Add Channel Public Key"
 msgstr "羞糸��蘂�������"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:272
+#: src/protocols/silc/chat.c:273
 msgid "Open Public Key..."
 msgstr "��綣�����..."
 
-#: src/protocols/silc/chat.c:383
+#: src/protocols/silc/chat.c:382
 msgid "Channel Passphrase"
 msgstr "蘂���絲�����"
 
-#: src/protocols/silc/chat.c:390
+#: src/protocols/silc/chat.c:389
 msgid "Channel Public Keys List"
 msgstr "蘂������ュ��茵�"
 
-#: src/protocols/silc/chat.c:395
+#: src/protocols/silc/chat.c:394
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -8604,118 +8669,122 @@
 "絋���莅上�篋�絲����ワ��d���荀���箴�絲����ユ���遵���ャ��絋���莅上�篋�蘂������ワ��d�������"
 "篋����ュ群膸���寴�����傑���遵���ャ��"
 
-#: src/protocols/silc/chat.c:404 src/protocols/silc/chat.c:405
-#: src/protocols/silc/chat.c:442 src/protocols/silc/chat.c:443
-#: src/protocols/silc/chat.c:873
+#: src/protocols/silc/chat.c:403 src/protocols/silc/chat.c:404
+#: src/protocols/silc/chat.c:441 src/protocols/silc/chat.c:442
+#: src/protocols/silc/chat.c:871
 msgid "Channel Authentication"
 msgstr "蘂���莅よ�"
 
-#: src/protocols/silc/chat.c:562
+#: src/protocols/silc/chat.c:405 src/protocols/silc/chat.c:443
+msgid "Add / Remove"
+msgstr "羞糸��/����"
+
+#: src/protocols/silc/chat.c:560
 msgid "Group Name"
 msgstr "膸���腱�"
 
-#: src/protocols/silc/chat.c:566 src/protocols/silc/ops.c:1403
+#: src/protocols/silc/chat.c:564 src/protocols/silc/ops.c:1403
 msgid "Passphrase"
 msgstr "絲�����"
 
-#: src/protocols/silc/chat.c:577
+#: src/protocols/silc/chat.c:575
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "莚決��� %s 蘂���腱���膸�����腱医��絲����ャ��"
 
-#: src/protocols/silc/chat.c:579
+#: src/protocols/silc/chat.c:577
 msgid "Add Channel Private Group"
 msgstr "羞糸��蘂���腱���膸�"
 
-#: src/protocols/silc/chat.c:706
+#: src/protocols/silc/chat.c:704
 msgid "User Limit"
 msgstr "��莅檎����"
 
-#: src/protocols/silc/chat.c:707
+#: src/protocols/silc/chat.c:705
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "莅上�蘂��������潔���吟��莅鞘減 0 絨���臀����潔���吟��"
 
-#: src/protocols/silc/chat.c:849
+#: src/protocols/silc/chat.c:847
 msgid "Get Info"
 msgstr "篆≧��"
 
-#: src/protocols/silc/chat.c:856
+#: src/protocols/silc/chat.c:854
 msgid "Invite List"
 msgstr "��莚桁��茵�"
 
-#: src/protocols/silc/chat.c:860
+#: src/protocols/silc/chat.c:858
 msgid "Ban List"
 msgstr "絮�恖��茵�"
 
-#: src/protocols/silc/chat.c:867
+#: src/protocols/silc/chat.c:865
 msgid "Add Private Group"
 msgstr "羞糸��腱���膸�"
 
-#: src/protocols/silc/chat.c:878
+#: src/protocols/silc/chat.c:876
 msgid "Reset Permanent"
 msgstr "��臀�宛箙�"
 
-#: src/protocols/silc/chat.c:882
+#: src/protocols/silc/chat.c:880
 msgid "Set Permanent"
 msgstr "莅丞舟羂娯�"
 
-#: src/protocols/silc/chat.c:889
+#: src/protocols/silc/chat.c:887
 msgid "Set User Limit"
 msgstr "莅丞舟���潔����"
 
-#: src/protocols/silc/chat.c:894
+#: src/protocols/silc/chat.c:892
 msgid "Reset Topic Restriction"
 msgstr "��臀��蘂�����"
 
-#: src/protocols/silc/chat.c:898
+#: src/protocols/silc/chat.c:896
 msgid "Set Topic Restriction"
 msgstr "莅上�莚�蘂�����"
 
-#: src/protocols/silc/chat.c:904
+#: src/protocols/silc/chat.c:902
 msgid "Reset Private Channel"
 msgstr "��臀����蘂���"
 
-#: src/protocols/silc/chat.c:908
+#: src/protocols/silc/chat.c:906
 msgid "Set Private Channel"
 msgstr "莅上�腱���蘂���"
 
-#: src/protocols/silc/chat.c:914
+#: src/protocols/silc/chat.c:912
 msgid "Reset Secret Channel"
 msgstr "��臀��絲�蘂���"
 
-#: src/protocols/silc/chat.c:918
+#: src/protocols/silc/chat.c:916
 msgid "Set Secret Channel"
 msgstr "莅上�膸�絲�蘂���"
 
-#: src/protocols/silc/chat.c:988
+#: src/protocols/silc/chat.c:986
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "���� <I>%s</I> ��蘂���綮榊���"
 
-#: src/protocols/silc/chat.c:992
+#: src/protocols/silc/chat.c:990
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> ��蘂���綮榊����� <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1042
+#: src/protocols/silc/chat.c:1040
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "�������ョ���膸�箙���鐚�綽�蕁糸������ %s 蘂���"
 
-#: src/protocols/silc/chat.c:1044
+#: src/protocols/silc/chat.c:1042
 msgid "Join Private Group"
 msgstr "���ョ���膸�"
 
-#: src/protocols/silc/chat.c:1045
+#: src/protocols/silc/chat.c:1043
 msgid "Cannot join private group"
 msgstr "��羈����ョ���膸�"
 
-#: src/protocols/silc/chat.c:1227 src/protocols/silc/silc.c:842
+#: src/protocols/silc/chat.c:1225 src/protocols/silc/silc.c:875
 msgid "Cannot call command"
 msgstr "��羈�莪����巡擦"
 
-#: src/protocols/silc/chat.c:1228 src/protocols/silc/silc.c:843
+#: src/protocols/silc/chat.c:1226 src/protocols/silc/silc.c:876
 msgid "Unknown command"
 msgstr "���ュ�巡擦"
 
@@ -8828,7 +8897,7 @@
 msgid "Job Role"
 msgstr "��篏�"
 
-#: src/protocols/silc/ops.c:802 src/protocols/silc/util.c:285
+#: src/protocols/silc/ops.c:802
 msgid "Organization"
 msgstr "膸�膸�"
 
@@ -8836,7 +8905,7 @@
 msgid "Unit"
 msgstr "����"
 
-#: src/protocols/silc/ops.c:825 src/protocols/silc/util.c:281
+#: src/protocols/silc/ops.c:825
 msgid "EMail"
 msgstr "�球���散"
 
@@ -8860,11 +8929,11 @@
 msgid "Channels"
 msgstr "蘂���"
 
-#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:292
+#: src/protocols/silc/ops.c:981
 msgid "Public Key Fingerprint"
 msgstr "���ユ��膾�"
 
-#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:293
+#: src/protocols/silc/ops.c:982
 msgid "Public Key Babbleprint"
 msgstr "���ユ���"
 
@@ -8872,7 +8941,7 @@
 msgid "More..."
 msgstr "�翫�..."
 
-#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:745
+#: src/protocols/silc/ops.c:1006 src/protocols/silc/silc.c:770
 msgid "Detach From Server"
 msgstr "筝����≦���援�"
 
@@ -9091,63 +9160,112 @@
 "�亥�����恰����訓��篆≧����"
 
 #: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:728
+#: src/protocols/silc/silc.c:1096 src/protocols/silc/silc.c:1101
 msgid "Message of the Day"
 msgstr "罸�����"
 
-#: src/protocols/silc/silc.c:723
+#: src/protocols/silc/silc.c:723 src/protocols/silc/silc.c:1096
 msgid "No Message of the Day available"
 msgstr "羃≧��������罸�����"
 
-#: src/protocols/silc/silc.c:724
+#: src/protocols/silc/silc.c:724 src/protocols/silc/silc.c:1097
 msgid "There is no Message of the Day associated with this connection"
 msgstr "羃≧��筝�④菴��ュ�活����罸�����"
 
-#: src/protocols/silc/silc.c:740
+#: src/protocols/silc/silc.c:765
 msgid "Online Status"
 msgstr "��鎖�倶��"
 
-#: src/protocols/silc/silc.c:749
+#: src/protocols/silc/silc.c:774
 msgid "View Message of the Day"
 msgstr "�ョ��罸�����"
 
-#: src/protocols/silc/silc.c:813
+#: src/protocols/silc/silc.c:846
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "���� <I>%s</I> ���榊ー篋��膸�筝�"
 
-#: src/protocols/silc/silc.c:907
+#: src/protocols/silc/silc.c:1159
+msgid "part:  Leave the chat"
+msgstr "part: 胼糸���紊�"
+
+#: src/protocols/silc/silc.c:1162
+msgid "leave:  Leave the chat"
+msgstr "leave: 胼糸���紊�"
+
+#: src/protocols/silc/silc.c:1166
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr "topic [&lt;�域�蘂�&gt;]: �ョ�����贋�壕�蘂�"
+
+#: src/protocols/silc/silc.c:1171
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr "join: &lt;�翠��&gt; [&lt;���≦��&gt;]: ���ユ④臀�膸�筝�����紊��"
+
+#: src/protocols/silc/silc.c:1175
+msgid "list:  List channels on this network"
+msgstr "list: ���堺④臀�膸�筝���蘂���"
+
+#: src/protocols/silc/silc.c:1179
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;�窮О&gt;: �ョ���窮О篆≧��"
+
+#: src/protocols/silc/silc.c:1183
+msgid "invite &lt;nick&gt;:  Invite nick to join this channel"
+msgstr "invite &lt;�窮О&gt;: ��莚傑�窮О���ユ④蘂���"
+
+#: src/protocols/silc/silc.c:1187
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr "msg &lt;�窮О&gt; &lt;羔���&gt;: �����桁���腱�篋堺���"
+
+#: src/protocols/silc/silc.c:1191
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr "query &lt;�窮О&gt; [&lt;羔���&gt;]: �������絅遵�����腱�篋堺���"
+
+#: src/protocols/silc/silc.c:1195
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd: �ョ�����≦����罸�����"
+
+#: src/protocols/silc/silc.c:1199
+msgid "detach:  Detach this session"
+msgstr "detach: �援�罩や�莚�"
+
+#: src/protocols/silc/silc.c:1203
+msgid "umode &lt;usermodes&gt;:  Set your user options"
+msgstr "umode &lt;���傑─綣�&gt;: 莅丞舟�������潔��蕁�"
+
+#: src/protocols/silc/silc.c:1214
 msgid "Instant Messages"
 msgstr "�恰�倶���"
 
-#: src/protocols/silc/silc.c:912
+#: src/protocols/silc/silc.c:1219
 msgid "Digitally sign all IM messages"
 msgstr "絲劫������紊�����茵��医�膈上��"
 
-#: src/protocols/silc/silc.c:917
+#: src/protocols/silc/silc.c:1224
 msgid "Verify all IM message signatures"
 msgstr "�♂�������紊����Ⅹ��"
 
-#: src/protocols/silc/silc.c:920
+#: src/protocols/silc/silc.c:1227
 msgid "Channel Messages"
 msgstr "蘂���羔���"
 
-#: src/protocols/silc/silc.c:925
+#: src/protocols/silc/silc.c:1232
 msgid "Digitally sign all channel messages"
 msgstr "絲劫�������羔����茵��医�膈上��"
 
-#: src/protocols/silc/silc.c:930
+#: src/protocols/silc/silc.c:1237
 msgid "Verify all channel message signatures"
 msgstr "�♂��������羔���Ⅹ��"
 
-#: src/protocols/silc/silc.c:933
+#: src/protocols/silc/silc.c:1240
 msgid "Default SILC Key Pair"
 msgstr "藥�莅� SILC 絲��ュ�"
 
-#: src/protocols/silc/silc.c:938
+#: src/protocols/silc/silc.c:1245
 msgid "SILC Public Key"
 msgstr "SILC ����"
 
-#: src/protocols/silc/silc.c:943
+#: src/protocols/silc/silc.c:1250
 msgid "SILC Private Key"
 msgstr "SILC 腱���"
 
@@ -9161,73 +9279,106 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1026
+#: src/protocols/silc/silc.c:1334
 msgid "SILC Protocol Plugin"
 msgstr "SILC �顒��篁�"
 
 #. *  description
-#: src/protocols/silc/silc.c:1028
+#: src/protocols/silc/silc.c:1336
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "絎������絎��銀�莅�(SILC)�顒�"
 
-#: src/protocols/silc/silc.c:1058
+#: src/protocols/silc/silc.c:1366
 msgid "Public key authentication"
 msgstr "���ヨ�莚�"
 
-#: src/protocols/silc/silc.c:1064
+#: src/protocols/silc/silc.c:1372
 msgid "Public Key File"
 msgstr "���ユ��篁�"
 
-#: src/protocols/silc/silc.c:1068
+#: src/protocols/silc/silc.c:1376
 msgid "Private Key File"
 msgstr "腱��ユ��篁�"
 
-#: src/protocols/silc/silc.c:1073
+#: src/protocols/silc/silc.c:1381
 msgid "Reject watching by other users"
 msgstr "��膸��銀����欠��茹�"
 
-#: src/protocols/silc/silc.c:1076
+#: src/protocols/silc/silc.c:1384
 msgid "Block invites"
 msgstr "絮�恧��莚�"
 
-#: src/protocols/silc/silc.c:1079
+#: src/protocols/silc/silc.c:1387
 msgid "Block IMs without Key Exchange"
 msgstr "絮�恗押��絲��ヤ困�∝����紊�"
 
-#: src/protocols/silc/silc.c:1082
+#: src/protocols/silc/silc.c:1390
 msgid "Reject online status attribute requests"
 msgstr "��膸���鎖�倶��絮��ц�羆�"
 
-#: src/protocols/silc/util.c:197 src/protocols/silc/util.c:217
+#: src/protocols/silc/util.c:200 src/protocols/silc/util.c:223
 msgid "Creating SILC key pair..."
 msgstr "��綮� SILC 絲��ュ�..."
 
-#: src/protocols/silc/util.c:277
-msgid "Real Name"
-msgstr "����"
-
-#: src/protocols/silc/util.c:279
-msgid "User Name"
-msgstr "���桁��"
-
-#: src/protocols/silc/util.c:283
-msgid "Host Name"
-msgstr "筝紙�阪��"
-
-#: src/protocols/silc/util.c:288
-msgid "Algorithm"
-msgstr "膊�羈�"
-
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
 #: src/protocols/silc/util.c:289
-msgid "Key Length"
-msgstr "絲��ラ�水墾"
-
-#: src/protocols/silc/util.c:290
-#, c-format
-msgid "%d bits"
-msgstr "%d 篏�"
-
-#: src/protocols/silc/util.c:297 src/protocols/silc/util.c:298
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "����:\t%s\n"
+
+#: src/protocols/silc/util.c:291
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "���桁��:\t%s\n"
+
+#: src/protocols/silc/util.c:293
+#, c-format
+msgid "EMail: \t\t%s\n"
+msgstr "�球���散:\t%s\n"
+
+#: src/protocols/silc/util.c:295
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "筝紙�阪��:\t%s\n"
+
+#: src/protocols/silc/util.c:297
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "膸�膸�:\t%s\n"
+
+#: src/protocols/silc/util.c:299
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "�遵�:\t%s\n"
+
+#: src/protocols/silc/util.c:300
+#, c-format
+msgid "Algorithm: \t\t%s\n"
+msgstr "膊�羈�:\t%s\n"
+
+#: src/protocols/silc/util.c:301
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "絲��ラ�水墾:\t%d 篏�\n"
+
+#: src/protocols/silc/util.c:303
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr "���ユ��膾�:\n%s\n\n"
+
+#: src/protocols/silc/util.c:304
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr "���ユ���:\n%s"
+
+#: src/protocols/silc/util.c:308 src/protocols/silc/util.c:309
 msgid "Public Key Information"
 msgstr "���ヤ拭��"
 
@@ -9360,19 +9511,19 @@
 msgid "Waiting for reply..."
 msgstr "罩e�������紊�..."
 
-#: src/protocols/toc/toc.c:692
+#: src/protocols/toc/toc.c:695
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 篁�����筝㊥�√�����ー���札��罨≦���羔������"
 
-#: src/protocols/toc/toc.c:887
+#: src/protocols/toc/toc.c:890
 msgid "Password Change Successful"
 msgstr "絲����贋�号����"
 
-#: src/protocols/toc/toc.c:891
+#: src/protocols/toc/toc.c:894
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ����篋� PAUSE �巡擦��"
 
-#: src/protocols/toc/toc.c:892
+#: src/protocols/toc/toc.c:895
 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 "
@@ -9382,43 +9533,43 @@
 "絨���権�阪サ��Gaim 絨�篌������������榊��篁私���絎鴻��菴�篁�篁���鹸�句��鐚���篁ヨ���綽�腮�膈���"
 "�祉��"
 
-#: src/protocols/toc/toc.c:1402
+#: src/protocols/toc/toc.c:1409
 msgid "Get Dir Info"
 msgstr "�桁����篆≧��"
 
-#: src/protocols/toc/toc.c:1538
+#: src/protocols/toc/toc.c:1545
 msgid "Set Dir Info"
 msgstr "莅丞舟���篆≧��"
 
-#: src/protocols/toc/toc.c:1660
+#: src/protocols/toc/toc.c:1667
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "��羈���綣� %s ���ワ�"
 
-#: src/protocols/toc/toc.c:1696
+#: src/protocols/toc/toc.c:1703
 msgid "File transfer failed; other side probably canceled."
 msgstr "��篁銀���紊沿乾鐚����遵�銀賢筝�腴��羔�篋�篌�����"
 
-#: src/protocols/toc/toc.c:1741 src/protocols/toc/toc.c:1781
-#: src/protocols/toc/toc.c:1905 src/protocols/toc/toc.c:1993
+#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
+#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
 msgid "Could not connect for transfer."
 msgstr "��羈�菴��ヨ�茵�篌�����"
 
-#: src/protocols/toc/toc.c:1938
+#: src/protocols/toc/toc.c:1945
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "��羈����ユ��篁九ご����篁九�筝�篌�茴������"
 
-#: src/protocols/toc/toc.c:2038
+#: src/protocols/toc/toc.c:2045
 msgid "Gaim - Save As..."
 msgstr "Gaim - ���筝�..."
 
-#: src/protocols/toc/toc.c:2072
+#: src/protocols/toc/toc.c:2079
 #, 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:2079
+#: src/protocols/toc/toc.c:2086
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 莚傑��������篁�"
@@ -9434,15 +9585,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
+#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
 msgid "TOC Protocol Plugin"
 msgstr "TOC �顒��篁�"
 
-#: src/protocols/toc/toc.c:2180
+#: src/protocols/toc/toc.c:2188
 msgid "TOC host"
 msgstr "TOC 筝紙��"
 
-#: src/protocols/toc/toc.c:2184
+#: src/protocols/toc/toc.c:2192
 msgid "TOC port"
 msgstr "TOC 腴��"
 
@@ -9526,46 +9677,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1278 src/protocols/trepia/trepia.c:1280
+#: src/protocols/trepia/trepia.c:1269 src/protocols/trepia/trepia.c:1271
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia �顒��篁�"
 
-#: src/protocols/yahoo/yahoo.c:300
+#: src/protocols/yahoo/yahoo.c:328
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "��群茴�絵��鐚���筝堺��群篁��九�莅∞��堺��莅上�筝��糸���"
 
-#: src/protocols/yahoo/yahoo.c:742
+#: src/protocols/yahoo/yahoo.c:798
 msgid "Your Yahoo! message did not get sent."
 msgstr "��������� Yahoo! 羔�����"
 
-#: src/protocols/yahoo/yahoo.c:760
+#: src/protocols/yahoo/yahoo.c:817
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:795
+#: src/protocols/yahoo/yahoo.c:860
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s �� Yahoo! 膤紫�羔���:"
 
-#: src/protocols/yahoo/yahoo.c:861
+#: src/protocols/yahoo/yahoo.c:926
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s ��膸����篁�/絅劫���ュソ����"
 
-#: src/protocols/yahoo/yahoo.c:864
+#: src/protocols/yahoo/yahoo.c:929
 #, 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:867
+#: src/protocols/yahoo/yahoo.c:932
 msgid "Add buddy rejected"
 msgstr "羞糸����膸���絅遵�"
 
-#: src/protocols/yahoo/yahoo.c:1618
+#: src/protocols/yahoo/yahoo.c:1688
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9575,11 +9726,11 @@
 "Yahoo ���≦���羆�篏睡���������莅よ��劫���罩ょ������ Gaim ���醇��羈������糸�� Yahoo��"
 "莚傑��� %s 筝����贋�違��"
 
-#: src/protocols/yahoo/yahoo.c:1621
+#: src/protocols/yahoo/yahoo.c:1691
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 莅よ�紊沿乾"
 
-#: src/protocols/yahoo/yahoo.c:1694
+#: src/protocols/yahoo/yahoo.c:1763
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9587,76 +9738,76 @@
 msgstr ""
 "����上申�� %s鐚�篏�������隙�篋�����絅遵���茵�賢�����獅������絨����ゅ攻綽順�ュソ����"
 
-#: src/protocols/yahoo/yahoo.c:1697
+#: src/protocols/yahoo/yahoo.c:1766
 msgid "Ignore buddy?"
 msgstr "綽順�ュソ��鐚�"
 
-#: src/protocols/yahoo/yahoo.c:1730
+#: src/protocols/yahoo/yahoo.c:1799
 msgid "Invalid username."
 msgstr "���桁��������"
 
-#: src/protocols/yahoo/yahoo.c:1733
+#: src/protocols/yahoo/yahoo.c:1802
 msgid "Incorrect password."
 msgstr "絲���筝�絲鴻��"
 
-#: src/protocols/yahoo/yahoo.c:1736
-msgid "Your account is locked, please log in to the yahoo website."
-msgstr "����茣��桁群��絎�鐚�莚欠�糸��� Yahoo 臀�腴���"
-
-#: src/protocols/yahoo/yahoo.c:1739
-#, c-format
-msgid "Unknown error number %d."
-msgstr "���ョ����莚�撮�� %d��"
-
-#: src/protocols/yahoo/yahoo.c:1796
+#: src/protocols/yahoo/yahoo.c:1805
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr "����茣��桁群��絎�鐚�莚欠�糸��� Yahoo! 臀�腴���"
+
+#: src/protocols/yahoo/yahoo.c:1808
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr "篏�臀���莚�� %d���嶃��� Yahoo! 臀�腴����巡信紊���"
+
+#: src/protocols/yahoo/yahoo.c:1862
 #, 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:1798
+#: src/protocols/yahoo/yahoo.c:1864
 msgid "Could not add buddy to server list"
 msgstr "��羈�絨�絅遵�羞糸���井���≦����茵�"
 
-#: src/protocols/yahoo/yahoo.c:1963 src/protocols/yahoo/yahoo.c:2094
+#: src/protocols/yahoo/yahoo.c:2055 src/protocols/yahoo/yahoo.c:2186
 msgid "Unable to read"
 msgstr "��羈�莚糸�"
 
-#: src/protocols/yahoo/yahoo.c:2116 src/protocols/yahoo/yahoo.c:2226
-#: src/protocols/yahoo/yahoo.c:2271 src/protocols/yahoo/yahoo.c:2281
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoo.c:2208 src/protocols/yahoo/yahoo.c:2318
+#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2384
+#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
 msgid "Connection problem"
 msgstr "菴��ラ���"
 
-#: src/protocols/yahoo/yahoo.c:2365 src/protocols/yahoo/yahoo.c:2744
-#: src/protocols/yahoo/yahoo.c:2856
+#: src/protocols/yahoo/yahoo.c:2472 src/protocols/yahoo/yahoo.c:2850
+#: src/protocols/yahoo/yahoo.c:2962
 msgid "Not At Home"
 msgstr "筝����"
 
-#: src/protocols/yahoo/yahoo.c:2367 src/protocols/yahoo/yahoo.c:2746
-#: src/protocols/yahoo/yahoo.c:2857
+#: src/protocols/yahoo/yahoo.c:2474 src/protocols/yahoo/yahoo.c:2852
+#: src/protocols/yahoo/yahoo.c:2963
 msgid "Not At Desk"
 msgstr "筝������"
 
-#: src/protocols/yahoo/yahoo.c:2369 src/protocols/yahoo/yahoo.c:2748
-#: src/protocols/yahoo/yahoo.c:2858
+#: src/protocols/yahoo/yahoo.c:2476 src/protocols/yahoo/yahoo.c:2854
+#: src/protocols/yahoo/yahoo.c:2964
 msgid "Not In Office"
 msgstr "筝��������"
 
-#: src/protocols/yahoo/yahoo.c:2373 src/protocols/yahoo/yahoo.c:2752
-#: src/protocols/yahoo/yahoo.c:2860
+#: src/protocols/yahoo/yahoo.c:2480 src/protocols/yahoo/yahoo.c:2858
+#: src/protocols/yahoo/yahoo.c:2966
 msgid "On Vacation"
 msgstr "綺���筝�"
 
-#: src/protocols/yahoo/yahoo.c:2377 src/protocols/yahoo/yahoo.c:2756
-#: src/protocols/yahoo/yahoo.c:2862
+#: src/protocols/yahoo/yahoo.c:2484 src/protocols/yahoo/yahoo.c:2862
+#: src/protocols/yahoo/yahoo.c:2968
 msgid "Stepped Out"
 msgstr "��羝�"
 
-#: src/protocols/yahoo/yahoo.c:2457 src/protocols/yahoo/yahoo.c:2484
+#: src/protocols/yahoo/yahoo.c:2565 src/protocols/yahoo/yahoo.c:2591
 msgid "Not on server list"
 msgstr "筝������≦����茵�賢"
 
-#: src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -9665,27 +9816,27 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/yahoo/yahoo.c:2576
+#: src/protocols/yahoo/yahoo.c:2682
 msgid "Join in Chat"
 msgstr "���ヨ��紊�"
 
-#: src/protocols/yahoo/yahoo.c:2580
+#: src/protocols/yahoo/yahoo.c:2686
 msgid "Initiate Conference"
 msgstr "��莎隙�莅�"
 
-#: src/protocols/yahoo/yahoo.c:2640
+#: src/protocols/yahoo/yahoo.c:2743
 msgid "Active which ID?"
 msgstr "羶�羇糸��肩 ID鐚�"
 
-#: src/protocols/yahoo/yahoo.c:2649
+#: src/protocols/yahoo/yahoo.c:2752
 msgid "Join who in chat?"
 msgstr "絨�莪����ヨ��紊��"
 
-#: src/protocols/yahoo/yahoo.c:2659
+#: src/protocols/yahoo/yahoo.c:2762
 msgid "Activate ID..."
 msgstr "羶�羇� ID..."
 
-#: src/protocols/yahoo/yahoo.c:2663
+#: src/protocols/yahoo/yahoo.c:2766
 msgid "Join user in chat..."
 msgstr "����紊�賢���ョ����..."
 
@@ -9700,100 +9851,105 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3178 src/protocols/yahoo/yahoo.c:3180
+#: src/protocols/yahoo/yahoo.c:3286 src/protocols/yahoo/yahoo.c:3288
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo �顒��篁�"
 
-#: src/protocols/yahoo/yahoo.c:3199
+#: src/protocols/yahoo/yahoo.c:3307
 msgid "Yahoo Japan"
 msgstr "Yahoo �ユ��"
 
-#: src/protocols/yahoo/yahoo.c:3202
+#: src/protocols/yahoo/yahoo.c:3310
 msgid "Pager host"
 msgstr "絲糸�寂源��"
 
-#: src/protocols/yahoo/yahoo.c:3205
+#: src/protocols/yahoo/yahoo.c:3313
 msgid "Japan Pager host"
 msgstr "�ユ����寂源��"
 
-#: src/protocols/yahoo/yahoo.c:3208
+#: src/protocols/yahoo/yahoo.c:3316
 msgid "Pager port"
 msgstr "絲糸�主���"
 
-#: src/protocols/yahoo/yahoo.c:3211
+#: src/protocols/yahoo/yahoo.c:3319
 msgid "File transfer host"
 msgstr "��篁銀���筝紙��"
 
-#: src/protocols/yahoo/yahoo.c:3214
+#: src/protocols/yahoo/yahoo.c:3322
 msgid "Japan File transfer host"
 msgstr "�ユ����篁銀���筝紙��"
 
-#: src/protocols/yahoo/yahoo.c:3217
+#: src/protocols/yahoo/yahoo.c:3325
 msgid "File transfer port"
 msgstr "��篁銀���腴��"
 
-#: src/protocols/yahoo/yahoo.c:3220
+#: src/protocols/yahoo/yahoo.c:3328
 msgid "Chat Room List Url"
 msgstr "��鎀��翠�翫��茵� URL"
 
-#: src/protocols/yahoo/yahoo_filexfer.c:200
+#: src/protocols/yahoo/yahoo_filexfer.c:170
 msgid ""
 "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 "(1,048,576 bytes)."
 msgstr "Gaim ��羈���菴��������莇�菴� 1 ��(1 048 576 絖���)����篁吟��"
 
-#: src/protocols/yahoo/yahoo_profile.c:638
-#: src/protocols/yahoo/yahoo_profile.c:953
+#: src/protocols/yahoo/yahoo_profile.c:640
+#: src/protocols/yahoo/yahoo_profile.c:961
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: src/protocols/yahoo/yahoo_profile.c:771
+#: src/protocols/yahoo/yahoo_profile.c:664
+#, c-format
+msgid "<b>IP Address:</b> %s<br>"
+msgstr "<b>IP �医��:</b> %s<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:779
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr "�掩�鐚���筝阪������篋阪��絎合��筝�査莎�������筝�茴�������"
 
-#: src/protocols/yahoo/yahoo_profile.c:773
-#: src/protocols/yahoo/yahoo_profile.c:821
+#: src/protocols/yahoo/yahoo_profile.c:781
+#: src/protocols/yahoo/yahoo_profile.c:829
 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_profile.c:819
+#: src/protocols/yahoo/yahoo_profile.c:827
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr "�掩�鐚�罩ら��臀���篁銀室箙�������綛銀�������莚㊧���"
 
-#: src/protocols/yahoo/yahoo_profile.c:1030
-#: src/protocols/yahoo/yahoo_profile.c:1034
 #: src/protocols/yahoo/yahoo_profile.c:1038
+#: src/protocols/yahoo/yahoo_profile.c:1042
+#: src/protocols/yahoo/yahoo_profile.c:1046
 msgid "Hobbies"
 msgstr "��絅�"
 
-#: src/protocols/yahoo/yahoo_profile.c:1048
-#: src/protocols/yahoo/yahoo_profile.c:1052
+#: src/protocols/yahoo/yahoo_profile.c:1056
+#: src/protocols/yahoo/yahoo_profile.c:1060
 msgid "Latest News"
 msgstr "���井�育��"
 
-#: src/protocols/yahoo/yahoo_profile.c:1073
+#: src/protocols/yahoo/yahoo_profile.c:1081
 msgid "Home Page"
 msgstr "筝脂ゝ"
 
-#: src/protocols/yahoo/yahoo_profile.c:1088
+#: src/protocols/yahoo/yahoo_profile.c:1096
 msgid "Cool Link 1"
 msgstr "�潔�丈・ 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1093
+#: src/protocols/yahoo/yahoo_profile.c:1101
 msgid "Cool Link 2"
 msgstr "�潔�丈・ 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1097
+#: src/protocols/yahoo/yahoo_profile.c:1105
 msgid "Cool Link 3"
 msgstr "�潔�丈・ 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1130
+#: src/protocols/yahoo/yahoo_profile.c:1138
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s �����隙拭�������"
@@ -9815,66 +9971,71 @@
 msgid "Maybe the room is full?"
 msgstr "���醇�翠�翫群羯¥�"
 
-#: src/protocols/yahoo/yahoochat.c:426
+#: src/protocols/yahoo/yahoochat.c:424
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "��ー��③�� %s 筝㊧��紊���"
 
-#: src/protocols/yahoo/yahoochat.c:580
+#: src/protocols/yahoo/yahoochat.c:578
 msgid "Failed to join buddy in chat"
 msgstr "����紊�賢���ュソ��紊沿乾"
 
-#: src/protocols/yahoo/yahoochat.c:581
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Maybe they're not in a chat?"
 msgstr "���巡�篁�������紊�賢鐚�"
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1299
 msgid "Unable to connect"
 msgstr "��羈�菴���"
 
-#: src/protocols/yahoo/yahoochat.c:1301
+#: src/protocols/yahoo/yahoochat.c:1299
 msgid "Fetching the room list failed."
 msgstr "�桁��翠�翫��茵�け茣ャ��"
 
-#: src/protocols/yahoo/yahoochat.c:1346
+#: src/protocols/yahoo/yahoochat.c:1344
 msgid "Voices"
 msgstr "莚㊨��"
 
-#: src/protocols/yahoo/yahoochat.c:1349
+#: src/protocols/yahoo/yahoochat.c:1347
 msgid "Webcams"
 msgstr "���鎀�"
 
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoochat.c:1358 src/protocols/yahoo/yahoochat.c:1419
 msgid "Unable to fetch room list."
 msgstr "��羈��桁��翠�翫��茵���"
 
-#: src/protocols/yahoo/yahoochat.c:1414
+#: src/protocols/yahoo/yahoochat.c:1412
 msgid "User Rooms"
 msgstr "���傑�翠��"
 
-#: src/protocols/zephyr/zephyr.c:558
+#: src/protocols/zephyr/zephyr.c:566
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
+msgstr "��羈�����膸���紊� %s,%s,%s"
+
+#: src/protocols/zephyr/zephyr.c:600
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>����:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:562
+#: src/protocols/zephyr/zephyr.c:604
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>��荳������糸��"
 
-#: src/protocols/zephyr/zephyr.c:566
+#: src/protocols/zephyr/zephyr.c:608
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>篁� %s鐚��� %s 莎�"
 
-#: src/protocols/zephyr/zephyr.c:832 src/protocols/zephyr/zephyr.c:833
+#: src/protocols/zephyr/zephyr.c:873 src/protocols/zephyr/zephyr.c:874
 msgid "Anyone"
 msgstr "篁私�篋�"
 
-#: src/protocols/zephyr/zephyr.c:859
+#: src/protocols/zephyr/zephyr.c:900
 msgid "Already logged in with Zephyr"
 msgstr "綏牙��糸�� Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:859
+#: src/protocols/zephyr/zephyr.c:900
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
@@ -9882,15 +10043,15 @@
 "�延� Zephyr 絨�篏睡������膤紫����桁��鐚�絋�����群���後�������欠�糸�ワ������羈��ユ��紊�筝�"
 "茣��激��"
 
-#: src/protocols/zephyr/zephyr.c:1191
+#: src/protocols/zephyr/zephyr.c:1232
 msgid "_Class:"
 msgstr "膠�(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1197
+#: src/protocols/zephyr/zephyr.c:1238
 msgid "_Instance:"
 msgstr "絎�箴�(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1203
+#: src/protocols/zephyr/zephyr.c:1244
 msgid "_Recipient:"
 msgstr "�ユ�区��(_R):"
 
@@ -9905,19 +10066,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1353 src/protocols/zephyr/zephyr.c:1355
+#: src/protocols/zephyr/zephyr.c:1412 src/protocols/zephyr/zephyr.c:1414
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr �顒��篁�"
 
-#: src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1433
 msgid "Export to .anyone"
 msgstr "絲弱�阪�� .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1377
+#: src/protocols/zephyr/zephyr.c:1436
 msgid "Export to .zephyr.subs"
 msgstr "絲弱�阪�� .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1380
+#: src/protocols/zephyr/zephyr.c:1439
 msgid "Exposure"
 msgstr "�顔��"
 
@@ -9944,7 +10105,7 @@
 msgstr "��減膸�絎�篁g��膠糸������絎���筝紙�阪����腴��垽������"
 
 #. * Custom away message.
-#: src/prpl.h:177
+#: src/prpl.h:205
 msgid "Custom"
 msgstr "���箙�"
 
@@ -9959,62 +10120,62 @@
 msgid "Please enter your password"
 msgstr "莚決��ユ����絲���"
 
-#: src/server.c:511
+#: src/server.c:528
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s �医��û�� %s��\n"
 
-#: src/server.c:932
+#: src/server.c:938
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d �≧���)"
 
-#: src/server.c:946
+#: src/server.c:952
 msgid "(1 message)"
 msgstr "(1 �≧���)"
 
-#: src/server.c:1167 src/server.c:1177
+#: src/server.c:1176 src/server.c:1186
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ヤ���"
 
-#: src/server.c:1190
+#: src/server.c:1199
 #, c-format
 msgid "%s signed on"
 msgstr "%s 綏牙�糸��"
 
-#: src/server.c:1206
+#: src/server.c:1215
 #, c-format
 msgid "%s came back"
 msgstr "%s ���ヤ�"
 
-#: src/server.c:1208
+#: src/server.c:1217
 #, c-format
 msgid "%s went away"
 msgstr "%s 莎遺�"
 
-#: src/server.c:1222
+#: src/server.c:1231
 #, c-format
 msgid "%s became idle"
 msgstr "%s ��莎欠����"
 
-#: src/server.c:1234
+#: src/server.c:1243
 #, c-format
 msgid "%s became unidle"
 msgstr "%s �♂��篋�"
 
-#: src/server.c:1245 src/server.c:1253
+#: src/server.c:1254 src/server.c:1262
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�坂���"
 
-#: src/server.c:1267
+#: src/server.c:1276
 #, c-format
 msgid "%s signed off"
 msgstr "%s 綏牙�糸��"
 
-#: src/server.c:1329
+#: src/server.c:1338
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10023,11 +10184,11 @@
 "%s ����茴� %s 茘�����\n"
 "���亥��茘���膾у���� %d%%"
 
-#: src/server.c:1332
+#: src/server.c:1341
 msgid "an anonymous person"
 msgstr "����羂�"
 
-#: src/server.c:1442
+#: src/server.c:1451
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10036,12 +10197,12 @@
 "���撃��%s����莚� %s ���ュソ����紊��: ��%s��\n"
 "%s"
 
-#: src/server.c:1446
+#: src/server.c:1455
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "���撃��%s����莚� %s ���ュソ����紊��: ��%s��\n"
 
-#: src/server.c:1452
+#: src/server.c:1461
 msgid "Accept chat invitation?"
 msgstr "�ュ���紊���莚桁��鐚�"
 
@@ -10068,30 +10229,30 @@
 msgid "_Warn"
 msgstr "茘���(_W)"
 
-#: src/util.c:2353
+#: src/util.c:2363
 msgid "Calculating..."
 msgstr "罩e���膊�..."
 
-#: src/util.c:2356
+#: src/util.c:2366
 msgid "Unknown."
 msgstr "���ャ��"
 
-#: src/util.c:2389
+#: src/util.c:2399
 msgid "day"
 msgid_plural "days"
 msgstr[0] "紊�"
 
-#: src/util.c:2397
+#: src/util.c:2407
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "絨��"
 
-#: src/util.c:2405
+#: src/util.c:2415
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "��"
 
-#: src/util.c:2792
+#: src/util.c:2824
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ��鏁�菴��ュ�咲����\n"
 
--- a/po/zh_TW.po	Tue Jun 22 13:13:49 2004 +0000
+++ b/po/zh_TW.po	Tue Jun 22 13:17:24 2004 +0000
@@ -34,14 +34,15 @@
 # NOTE  筝㊥��腟延�������綣���鐚�URL����篁ょ�荅牙�� '/" ���ゅ�
 # NOTE  篁ュ������Deny��(��腟�) ����Block��(絨���)鐚��上�����篋�
 # NOTE  ��腟���札茯�����弱�������筝���篏睡��������巷鐚����������罸�莠�絅純��
+# NOTE  MSN6.0筝㊥����絨���Block��筝�荅���茘����冴��絨�����
 # XXX   Stream ��⑮��筝我���鐚���荅俄�����������
 # NOTE  nplurals ��荐㊦�� 2鐚����咲��������荀���莨��絋���絎�������絎�����筝�蕁���絖���
 # ----------------------------------------------------------
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.78\n"
-"POT-Creation-Date: 2004-05-25 03:43-0400\n"
+"Project-Id-Version: Gaim 0.79\n"
+"POT-Creation-Date: 2004-06-06 17:23-0400\n"
 "PO-Revision-Date: 2004-04-22 11:18+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -213,21 +214,21 @@
 msgid "New..."
 msgstr "�医�..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1645 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:957
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1804 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:959
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
 #: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2723
 #: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2892
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5440
-#: src/protocols/oscar/oscar.c:6422 src/protocols/oscar/oscar.c:6621
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:46
+#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5461
+#: src/protocols/oscar/oscar.c:6443 src/protocols/oscar/oscar.c:6642
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
 msgstr "�∫��"
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:550
-#: src/protocols/oscar/oscar.c:5358 src/protocols/oscar/oscar.c:6629
+#: src/protocols/oscar/oscar.c:5379 src/protocols/oscar/oscar.c:6650
 msgid "Back"
 msgstr "菴���"
 
@@ -243,7 +244,7 @@
 msgid "Accounts"
 msgstr "絽活��羝���"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2596
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2494
 msgid "Preferences"
 msgstr "�鎁処┃絎�"
 
@@ -294,6 +295,47 @@
 "綽�������篏� Gaim ��綛冗��絽悟�����緒���������������絅遵�羝������糸�ヨ�腦�鐚�鐚�筝�����"
 "鋌ラ�御��絨��九�亥��荐�����遺���筝㍼��翫�医轡篏��e��腓肴←藥���鐚�絋���篏睡�� ICQ 筝�罔c��"
 
+#: plugins/extplacement.c:85
+msgid "Separate IM and Chat windows"
+msgstr "篁ヤ�����荀�腦�蕁�ず�恰��荐�������紊�"
+
+#: plugins/extplacement.c:87
+msgid "By conversation count"
+msgstr "箴�篋よ�����"
+
+#: plugins/extplacement.c:109
+msgid "Conversation Placement"
+msgstr "篋よ�篏�臀�"
+
+#: plugins/extplacement.c:114
+msgid "Number of conversations per window"
+msgstr "荀�腦��т�篋よ����娯���"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/extplacement.c:134
+msgid "ExtPlacement"
+msgstr "荀�腦�篏�臀��紊��檎��"
+
+#. *< name
+#. *< version
+#: plugins/extplacement.c:136
+msgid "Extra conversation placement options."
+msgstr "篋よ�荀�腦�篏�臀��紊��檎����"
+
+#. *< summary
+#. *  description
+#: plugins/extplacement.c:138
+msgid ""
+"Either restrict the number of conversations per windows or use separate "
+"windows for IMs and Chats"
+msgstr "���区�腦����箙�篋よ��悟�����篁ヤ�����荀�腦�蕁�ず�恰��荐�������紊�"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -464,16 +506,16 @@
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
 #: plugins/gevolution/assoc-buddy.c:84 plugins/gevolution/assoc-buddy.c:95
-#: src/gtkblist.c:2958 src/gtkprefs.c:918 src/gtkprefs.c:1064
-#: src/gtkprefs.c:1106 src/gtkprefs.c:1658 src/protocols/jabber/jabber.c:921
+#: src/gtkblist.c:2958 src/gtkprefs.c:914 src/gtkprefs.c:967
+#: src/gtkprefs.c:1817 src/protocols/jabber/jabber.c:923
 msgid "None"
 msgstr "��"
 
 # NOTE ���処⑮����腮宴��鐚����阪����茹d���篋阪��������罔∞���腮宴��
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2005
-#: src/gtkroomlist.c:548 src/protocols/jabber/jabber.c:596
-#: src/protocols/msn/msn.c:1371 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:178 src/gtkprefs.c:2166
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:597
+#: src/protocols/msn/msn.c:1174 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "��腮�"
 
@@ -491,13 +533,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6908
+#: plugins/gevolution/assoc-buddy.c:383 src/protocols/oscar/oscar.c:6929
 msgid "Search"
 msgstr "��絨�"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3983
-#: src/gtkblist.c:4312
+#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3986
+#: src/gtkblist.c:4315
 msgid "Group:"
 msgstr "臂ょ�鐚�"
 
@@ -541,8 +583,8 @@
 msgstr "���絅遵� (_A)"
 
 #: plugins/gevolution/gevo-util.c:68 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:799
+#: src/blist.c:685 src/blist.c:872 src/blist.c:2106 src/gtkblist.c:3810
+#: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "絅遵�"
 
@@ -679,7 +721,7 @@
 msgid "_Set"
 msgstr "荐㊤�(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:793
+#: plugins/idle.c:67 src/dialogs.c:795
 msgid "_Cancel"
 msgstr "��羔�(_C)"
 
@@ -1059,7 +1101,7 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "�堺��� SSL ���恖�綺��箴�筝��� Wrapper��"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:910
+#: plugins/statenotify.c:30
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 綏牙��∫����"
@@ -1125,19 +1167,19 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "絅遵�羝�����羂翫抗�峨������"
 
-#: plugins/timestamp.c:95
+#: plugins/timestamp.c:185
 msgid "iChat Timestamp"
 msgstr "iChat �����活�"
 
-#: plugins/timestamp.c:102
+#: plugins/timestamp.c:192
 msgid "Delay"
 msgstr "綮狗��"
 
-#: plugins/timestamp.c:109
+#: plugins/timestamp.c:199
 msgid "minutes."
 msgstr "������"
 
-#: plugins/timestamp.c:115
+#: plugins/timestamp.c:205
 msgid "_Apply"
 msgstr "絅���(_A)"
 
@@ -1148,14 +1190,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:173
+#: plugins/timestamp.c:268
 msgid "Timestamp"
 msgstr "�����活�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:176 plugins/timestamp.c:178
+#: plugins/timestamp.c:271 plugins/timestamp.c:273
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "罸�� N �������� iChat 馺��主�������活��遺困茫�筝㏍��"
 
@@ -1179,7 +1221,7 @@
 msgstr "���恰��荐����腦�筝㊨¨腓� Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:912
+#: plugins/win32/transparency/win2ktrans.c:406 src/gtkprefs.c:908
 msgid "Buddy List Window"
 msgstr "絅遵�羝����腦�"
 
@@ -1232,7 +1274,7 @@
 
 #. Buddy List
 #: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:2999
-#: src/gtkprefs.c:2503
+#: src/gtkprefs.c:2406
 msgid "Buddy List"
 msgstr "絅遵�羝���"
 
@@ -1251,8 +1293,8 @@
 msgstr "絨�絅遵�羝����腦�篆�������∝����筝�絮�(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:965
-#: src/gtkprefs.c:2504 src/protocols/msn/msn.c:1613
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:959
+#: src/gtkprefs.c:2407 src/protocols/msn/msn.c:1420
 msgid "Conversations"
 msgstr "篋よ�"
 
@@ -1363,11 +1405,11 @@
 msgstr "�鞘算茘���"
 
 # NOTE 絲��坂�����������鐚�筝�����茯���鐚�筝��� :-)
-#: src/about.c:165 src/about.c:202
+#: src/about.c:165 src/about.c:203
 msgid "Catalan"
 msgstr "��羈育����"
 
-#: src/about.c:166 src/about.c:203
+#: src/about.c:166 src/about.c:204
 msgid "Czech"
 msgstr "�桁����"
 
@@ -1383,19 +1425,19 @@
 msgid "Canadian English"
 msgstr "���水ぇ綣�偎��"
 
-#: src/about.c:170 src/about.c:204
+#: src/about.c:170 src/about.c:205
 msgid "German"
 msgstr "緇傑��"
 
-#: src/about.c:171 src/about.c:205
+#: src/about.c:171 src/about.c:206
 msgid "Spanish"
 msgstr "茱睡�����"
 
-#: src/about.c:172 src/about.c:206
+#: src/about.c:172 src/about.c:207
 msgid "Finnish"
 msgstr "���㊥��"
 
-#: src/about.c:173 src/about.c:207
+#: src/about.c:173 src/about.c:208
 msgid "French"
 msgstr "羈���"
 
@@ -1415,11 +1457,11 @@
 #  NOTE ��茯��肢�俄����育�緒�綮f�沿����峨�紫�後勲�������榊�f��膓牙�絲����鎀у����鐚�
 #  NOTE �榊�g��筝㊤�����後��蕁�羈�篋������鎀у����罌�鐚�茘����鎀у������荅我�莠�絅純��
 #  NOTE����荀���Slovenian����
-#: src/about.c:177 src/about.c:208
+#: src/about.c:177 src/about.c:209
 msgid "Italian"
 msgstr "�鎀у����"
 
-#: src/about.c:178 src/about.c:210
+#: src/about.c:178 src/about.c:211
 msgid "Korean"
 msgstr "����"
 
@@ -1438,7 +1480,7 @@
 msgid "Norwegian"
 msgstr "�����"
 
-#: src/about.c:182 src/about.c:211
+#: src/about.c:182 src/about.c:212
 msgid "Polish"
 msgstr "羈∵�㊥��"
 
@@ -1454,7 +1496,7 @@
 msgid "Romanian"
 msgstr "臂�薤�絢篋���"
 
-#: src/about.c:186 src/about.c:212
+#: src/about.c:186 src/about.c:213
 msgid "Russian"
 msgstr "篆���"
 
@@ -1470,7 +1512,7 @@
 msgid "Slovenian"
 msgstr "���膓㊤絢篋���"
 
-#: src/about.c:189 src/about.c:214
+#: src/about.c:189 src/about.c:215
 msgid "Swedish"
 msgstr "���御��"
 
@@ -1482,40 +1524,40 @@
 msgid "Gnome Vi Team"
 msgstr "Gnome 莇�����膺肢⑮絨靚�"
 
-#: src/about.c:191
+#: src/about.c:192
 msgid "Simplified Chinese"
 msgstr "膂♂�筝㊥��"
 
-#: src/about.c:192
+#: src/about.c:193
 msgid "Traditional Chinese"
 msgstr "罩i�筝㊥��"
 
-#: src/about.c:199
+#: src/about.c:200
 msgid "Past Translators"
 msgstr "��篁肢⑮��"
 
 # XXX Yahoo茘��
-#: src/about.c:200
+#: src/about.c:201
 msgid "Amharic"
 msgstr "�水�������"
 
-#: src/about.c:201
+#: src/about.c:202
 msgid "Bulgarian"
 msgstr "篆��������"
 
-#: src/about.c:209
+#: src/about.c:210
 msgid "Japanese"
 msgstr "�ユ��"
 
-#: src/about.c:213
+#: src/about.c:214
 msgid "Slovak"
 msgstr "���篌�����"
 
-#: src/about.c:215
+#: src/about.c:216
 msgid "Chinese"
 msgstr "筝㊥��"
 
-#: src/account.c:278 src/protocols/jabber/jabber.c:998
+#: src/account.c:278 src/protocols/jabber/jabber.c:1000
 msgid "New passwords do not match."
 msgstr "�医�腆寂研筝��悟���"
 
@@ -1550,43 +1592,43 @@
 #.
 #: src/account.c:343 src/connection.c:197 src/dialogs.c:471 src/dialogs.c:527
 #: src/dialogs.c:580 src/gtkblist.c:2345 src/gtkrequest.c:235
-#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/xdata.c:337
-#: src/protocols/msn/msn.c:193 src/protocols/msn/msn.c:205
-#: src/protocols/msn/msn.c:217 src/protocols/msn/msn.c:229
-#: src/protocols/oscar/oscar.c:3331 src/protocols/oscar/oscar.c:3425
-#: src/protocols/oscar/oscar.c:6690 src/protocols/oscar/oscar.c:6787
-#: src/protocols/oscar/oscar.c:6839 src/protocols/oscar/oscar.c:6925
-#: src/protocols/silc/buddy.c:453 src/protocols/silc/buddy.c:1125
+#: src/protocols/jabber/jabber.c:1047 src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:208 src/protocols/msn/msn.c:223
+#: src/protocols/msn/msn.c:238 src/protocols/msn/msn.c:253
+#: src/protocols/oscar/oscar.c:3352 src/protocols/oscar/oscar.c:3446
+#: src/protocols/oscar/oscar.c:6711 src/protocols/oscar/oscar.c:6808
+#: src/protocols/oscar/oscar.c:6860 src/protocols/oscar/oscar.c:6946
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1134
 #: src/protocols/silc/chat.c:709 src/protocols/silc/ops.c:994
 #: src/protocols/silc/ops.c:1405 src/protocols/silc/silc.c:688
-#: src/protocols/yahoo/yahoo.c:2564 src/protocols/yahoo/yahoo.c:2573
+#: src/protocols/yahoo/yahoo.c:2648 src/protocols/yahoo/yahoo.c:2657
 #: src/request.h:1242
 msgid "OK"
 msgstr "腆阪�"
 
 #: src/account.c:344 src/account.c:382 src/away.c:334 src/connection.c:198
 #: src/dialogs.c:305 src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351
-#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:815
-#: src/dialogs.c:832 src/dialogs.c:851 src/gtkaccount.c:1744
-#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4351
+#: src/dialogs.c:472 src/dialogs.c:528 src/dialogs.c:581 src/dialogs.c:818
+#: src/dialogs.c:835 src/dialogs.c:854 src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235 src/gtkblist.c:2346 src/gtkblist.c:4354
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:414 src/gtkprivacy.c:588
 #: src/gtkprivacy.c:601 src/gtkprivacy.c:626 src/gtkprivacy.c:637
 #: src/gtkrequest.c:236 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:693
-#: src/protocols/jabber/jabber.c:665 src/protocols/jabber/jabber.c:1046
-#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:194
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:218
-#: src/protocols/msn/msn.c:230 src/protocols/msn/msn.c:244
-#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3291
-#: src/protocols/oscar/oscar.c:3332 src/protocols/oscar/oscar.c:3369
-#: src/protocols/oscar/oscar.c:3426 src/protocols/oscar/oscar.c:6691
-#: src/protocols/oscar/oscar.c:6788 src/protocols/oscar/oscar.c:6840
-#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6926
-#: src/protocols/silc/buddy.c:454 src/protocols/silc/buddy.c:1030
-#: src/protocols/silc/buddy.c:1126 src/protocols/silc/chat.c:710
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/jabber.c:666 src/protocols/jabber/jabber.c:1048
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:209
+#: src/protocols/msn/msn.c:224 src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:254 src/protocols/msn/msn.c:271
+#: src/protocols/oscar/oscar.c:1371 src/protocols/oscar/oscar.c:3312
+#: src/protocols/oscar/oscar.c:3353 src/protocols/oscar/oscar.c:3390
+#: src/protocols/oscar/oscar.c:3447 src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6809 src/protocols/oscar/oscar.c:6861
+#: src/protocols/oscar/oscar.c:6930 src/protocols/oscar/oscar.c:6947
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1039
+#: src/protocols/silc/buddy.c:1135 src/protocols/silc/chat.c:710
 #: src/protocols/silc/ops.c:1406 src/protocols/silc/silc.c:689
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2565
-#: src/protocols/yahoo/yahoo.c:2574 src/request.h:1242 src/request.h:1252
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2649
+#: src/protocols/yahoo/yahoo.c:2658 src/request.h:1242 src/request.h:1252
 msgid "Cancel"
 msgstr "��羔�"
 
@@ -1618,7 +1660,7 @@
 msgstr "腱脂�ら�∫��荐���"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1175 src/gtkconv.c:3354 src/gtkconv.c:3453
+#: src/away.c:333 src/gtkconv.c:1359 src/gtkconv.c:3541 src/gtkconv.c:3640
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "腱脂��"
@@ -1631,7 +1673,7 @@
 msgid "Set All Away"
 msgstr "����┃�咲�∫��"
 
-#: src/blist.c:590 src/gtkprefs.c:2506
+#: src/blist.c:590
 msgid "Chats"
 msgstr "��紊�"
 
@@ -1654,7 +1696,7 @@
 msgid "Group not removed"
 msgstr "臂ょ���←腱脂��"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:732
+#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:161 src/gtkutils.c:721
 #: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2735
 msgid "Unknown"
 msgstr "����"
@@ -1692,11 +1734,11 @@
 msgid "Enter password for %s"
 msgstr "莠後�� %s ��絲�腆�"
 
-#: src/conversation.c:293
+#: src/conversation.c:271
 msgid "Unable to send message. The message is too large."
 msgstr "�≧����肴���������荐���お紊т���"
 
-#: src/conversation.c:301
+#: src/conversation.c:279
 msgid "Unable to send message."
 msgstr "�≧����肴�����"
 
@@ -1705,7 +1747,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1953
+#: src/conversation.c:1920
 #, c-format
 msgid "%s entered the room."
 msgstr "%s �峨�ヨ��紊����"
@@ -1715,61 +1757,57 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1956
+#: src/conversation.c:1923
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] �峨�ヨ��紊����"
 
-#: src/conversation.c:2047
+#: src/conversation.c:2014
 #, c-format
 msgid "You are now known as %s"
 msgstr "篏��壕��援┗�� %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2017
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �壕��援┗�� %s"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2059
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s �∫����紊�� (%s)��"
 
-#: src/conversation.c:2094
+#: src/conversation.c:2061
 #, c-format
 msgid "%s left the room."
 msgstr "%s �∫����紊����"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2132
 #, c-format
 msgid "(+%d more)"
 msgstr "鐚�篁ュ���� %d ��鐚�"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2134
 #, c-format
 msgid " left the room (%s)."
 msgstr " �∫����紊�� (%s)��"
 
-#: src/conversation.c:2487
+#: src/conversation.c:2458
 msgid "Last created window"
 msgstr "筝�筝���������荀�腦�"
 
-#: src/conversation.c:2489 src/gtkprefs.c:1438
+#: src/conversation.c:2460 src/gtkprefs.c:1343
 msgid "New window"
 msgstr "�域�腦�"
 
-#: src/conversation.c:2491
+#: src/conversation.c:2462
 msgid "By group"
 msgstr "箴�臂ょ�"
 
-#: src/conversation.c:2493
+#: src/conversation.c:2464
 msgid "By account"
 msgstr "箴�絽活��"
 
-#: src/conversation.c:2495
-msgid "By conversation count"
-msgstr "箴�篋よ�����"
-
 #: src/dialogs.c:154
 msgid "Warn User"
 msgstr "茘���篏睡����"
@@ -1898,47 +1936,47 @@
 msgid "Away title: "
 msgstr "�∫������鐚�"
 
-#: src/dialogs.c:781
+#: src/dialogs.c:783
 msgid "_Save"
 msgstr "�峨�(_S)"
 
-#: src/dialogs.c:785
+#: src/dialogs.c:787
 msgid "Sa_ve & Use"
 msgstr "�峨�筝�戎��(_V)"
 
-#: src/dialogs.c:789
+#: src/dialogs.c:791
 msgid "_Use"
 msgstr "篏睡��(_U)"
 
-#: src/dialogs.c:811
+#: src/dialogs.c:814
 msgid "Alias Chat"
 msgstr "腟���紊���劫�ュ��"
 
-#: src/dialogs.c:812
+#: src/dialogs.c:815
 msgid "Enter an alias for this chat."
 msgstr "茫��咲������紊��莠後�ヤ����ュ����"
 
-#: src/dialogs.c:814 src/dialogs.c:831 src/dialogs.c:850 src/gtkrequest.c:243
+#: src/dialogs.c:817 src/dialogs.c:834 src/dialogs.c:853 src/gtkrequest.c:243
 #: src/protocols/silc/chat.c:571
 msgid "Alias"
 msgstr "�ュ��"
 
 # XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
-#: src/dialogs.c:828
+#: src/dialogs.c:831
 msgid "Alias Contact"
 msgstr "腟�ソ���劫�ュ��"
 
 # XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
-#: src/dialogs.c:829
+#: src/dialogs.c:832
 msgid "Enter an alias for this contact."
 msgstr "茫��咲����絅遵�莠後�ヤ����ュ����"
 
-#: src/dialogs.c:846
+#: src/dialogs.c:849
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "茫��� %s 莠後�ヤ����ュ��"
 
-#: src/dialogs.c:848
+#: src/dialogs.c:851
 msgid "Alias Buddy"
 msgstr "�阪ソ����筝��ュ��"
 
@@ -1980,7 +2018,7 @@
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
-"       -h, --help [command]    Show help for command\n"
+"       -h, --help [command]     Show help for command\n"
 msgstr ""
 "篏睡���劫�: %s command [OPTIONS] [URI]\n"
 "\n"
@@ -1989,7 +2027,7 @@
 "       quit                     ����罩e���決��� Gaim\n"
 "\n"
 "    �檎��:\n"
-"       -h, --help [command]    蕁�ず��篁ょ��茯���\n"
+"       -h, --help [commmand]    蕁�ず��篁ょ��茯���\n"
 
 #: src/gaim-remote.c:174 src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
@@ -2085,7 +2123,7 @@
 msgid "Protocol:"
 msgstr "��荐���絎�鐚�"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3955
+#: src/gtkaccount.c:406 src/gtkblist.c:3958
 msgid "Screen Name:"
 msgstr "絽活��鐚�"
 
@@ -2093,7 +2131,7 @@
 msgid "Password:"
 msgstr "絲�腆種�"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3969 src/gtkblist.c:4298
+#: src/gtkaccount.c:484 src/gtkblist.c:3972 src/gtkblist.c:4301
 msgid "Alias:"
 msgstr "�ュ��鐚�"
 
@@ -2156,7 +2194,7 @@
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1239
+#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1147
 msgid "Use Environmental Settings"
 msgstr "篏睡���医�莅��梧┃絎�"
 
@@ -2172,15 +2210,15 @@
 msgid "Proxy Options"
 msgstr "篁g��篌堺�����檎��"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1233
+#: src/gtkaccount.c:937 src/gtkprefs.c:1141
 msgid "Proxy _type:"
 msgstr "篁g��篌堺��������(_T)鐚�"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1263
+#: src/gtkaccount.c:946 src/gtkprefs.c:1168
 msgid "_Host:"
 msgstr "筝紙�篏���(_H)鐚�"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1281
+#: src/gtkaccount.c:950 src/gtkprefs.c:1186
 msgid "_Port:"
 msgstr "��荐���(_P)鐚�"
 
@@ -2188,7 +2226,7 @@
 msgid "_Username:"
 msgstr "篏睡����(_U)鐚�"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1318
+#: src/gtkaccount.c:963 src/gtkprefs.c:1223
 msgid "Pa_ssword:"
 msgstr "絲�腆�(_S)鐚�"
 
@@ -2206,12 +2244,13 @@
 msgid "Show more options"
 msgstr "蕁�ず膣亥�"
 
+#  NOTE 茘����翫�� by Ambrose
 #: src/gtkaccount.c:1358
 msgid "Show fewer options"
-msgstr "蕁�ず莠�絨����檎��"
+msgstr "�沿�靘亥�"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:664
+#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:665
 msgid "Register"
 msgstr "荐糸��"
 
@@ -2224,14 +2263,14 @@
 msgid "Delete"
 msgstr "����"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3956
+#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3977
 msgid "Screen Name"
 msgstr "絽活��"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:955
-#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5438
-#: src/protocols/oscar/oscar.c:6620 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2301 src/protocols/zephyr/zephyr.c:1167
+#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:957
+#: src/protocols/oscar/oscar.c:534 src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:6641 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2385 src/protocols/zephyr/zephyr.c:1167
 #: src/protocols/zephyr/zephyr.c:1177
 msgid "Online"
 msgstr "筝�膩�"
@@ -2264,9 +2303,9 @@
 msgstr "絨�篏睡�������ユ����絅遵�羝����"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4350 src/gtkconv.c:1177
-#: src/gtkconv.c:3347 src/gtkconv.c:3446 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3588
+#: src/gtkaccount.c:2234 src/gtkblist.c:4353 src/gtkconv.c:1361
+#: src/gtkconv.c:3534 src/gtkconv.c:3633 src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3609
 msgid "Add"
 msgstr "����"
 
@@ -2282,15 +2321,15 @@
 "join.\n"
 msgstr "茫�莠後�ラ���惹�����喝���ュソ��羝�������紊�������区�荐���\n"
 
-#: src/gtkblist.c:844 src/gtkpounce.c:431 src/gtkroomlist.c:352
+#: src/gtkblist.c:844 src/gtkpounce.c:445 src/gtkroomlist.c:354
 msgid "_Account:"
 msgstr "絽活��(_A)鐚�"
 
-#: src/gtkblist.c:1132 src/gtkblist.c:3152
+#: src/gtkblist.c:1132 src/gtkblist.c:3153
 msgid "Get _Info"
 msgstr "��緇�莖�荐�(_I)"
 
-#: src/gtkblist.c:1135 src/gtkblist.c:3143
+#: src/gtkblist.c:1135 src/gtkblist.c:3144
 msgid "I_M"
 msgstr "�恰��荐���(_M)"
 
@@ -2328,7 +2367,7 @@
 msgstr "���遵��(_R)"
 
 #. join button
-#: src/gtkblist.c:1223 src/gtkroomlist.c:261 src/gtkroomlist.c:404
+#: src/gtkblist.c:1223 src/gtkroomlist.c:263 src/gtkroomlist.c:409
 #: src/stock.c:87
 msgid "_Join"
 msgstr "����(_J)"
@@ -2346,7 +2385,7 @@
 msgstr "絮���(_E)"
 
 # XXX ��⑮
-#: src/gtkblist.c:1941 src/gtkconv.c:3967 src/gtkpounce.c:333
+#: src/gtkblist.c:1941 src/gtkconv.c:4166 src/gtkpounce.c:347
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "��研���糸�ヤ算篏�筝���������医�����絅遵�����荐���絎���"
@@ -2628,45 +2667,45 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3123
+#: src/gtkblist.c:3124
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�"
 
-#: src/gtkblist.c:3125
+#: src/gtkblist.c:3126
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊��絅順��臂ょ�"
 
-#: src/gtkblist.c:3149
+#: src/gtkblist.c:3150
 msgid "Send a message to the selected buddy"
 msgstr "�渇��荐���畿茴��後���絅遵�"
 
-#: src/gtkblist.c:3158
+#: src/gtkblist.c:3159
 msgid "Get information on the selected buddy"
 msgstr "��緇�茴��後�絅遵���莖�荐�"
 
-#: src/gtkblist.c:3161
+#: src/gtkblist.c:3162
 msgid "_Chat"
 msgstr "��紊�(_C)"
 
-#: src/gtkblist.c:3166
+#: src/gtkblist.c:3167
 msgid "Join a chat room"
 msgstr "���ヤ�����紊��"
 
-#: src/gtkblist.c:3169
+#: src/gtkblist.c:3170
 msgid "_Away"
 msgstr "�∫��(_A)"
 
-#: src/gtkblist.c:3174
+#: src/gtkblist.c:3175
 msgid "Set an away message"
 msgstr "荐㊤�筝����∫��荐���"
 
-#: src/gtkblist.c:3909 src/protocols/silc/buddy.c:724
-#: src/protocols/silc/buddy.c:982 src/protocols/silc/buddy.c:1027
-#: src/protocols/silc/buddy.c:1117 src/protocols/yahoo/yahoo.c:2488
+#: src/gtkblist.c:3912 src/protocols/silc/buddy.c:731
+#: src/protocols/silc/buddy.c:991 src/protocols/silc/buddy.c:1036
+#: src/protocols/silc/buddy.c:1126 src/protocols/yahoo/yahoo.c:2572
 msgid "Add Buddy"
 msgstr "�医�絅遵�"
 
-#: src/gtkblist.c:3933
+#: src/gtkblist.c:3936
 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. "
@@ -2676,37 +2715,37 @@
 "��ソ��羝���賢蕁�ず��\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3993 src/gtkblist.c:4278
+#: src/gtkblist.c:3996 src/gtkblist.c:4281
 msgid "Account:"
 msgstr "絽活��鐚�"
 
-#: src/gtkblist.c:4237
+#: src/gtkblist.c:4240
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "��研���糸�ヤ算篏�筝�����������ヨ��紊������荐���絎���"
 
-#: src/gtkblist.c:4244
+#: src/gtkblist.c:4247
 msgid "Add Chat"
 msgstr "�医���紊��"
 
-#: src/gtkblist.c:4268
+#: src/gtkblist.c:4271
 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/gtkblist.c:4347
+#: src/gtkblist.c:4350
 msgid "Add Group"
 msgstr "���ョ召腟�"
 
-#: src/gtkblist.c:4348
+#: src/gtkblist.c:4351
 msgid "Please enter the name of the group to be added."
 msgstr "茫�腟����医���臂ょ�莠後�ュ��腮宴��"
 
 #  NOTE ��筝�����筝���荐宴��������羃�����鐚�絨ゅ�倶�����亥����罔∞��檎����篁ゃ��羝����
 #  NOTE 茘�����筝���荐宴������絽御��
-#: src/gtkblist.c:4915 src/gtkblist.c:5012
+#: src/gtkblist.c:4918 src/gtkblist.c:5015
 msgid "No actions available"
 msgstr "羃����檎����篁�"
 
@@ -2756,326 +2795,405 @@
 msgid "Time"
 msgstr "����"
 
-#: src/gtkconv.c:172
+#: src/gtkconv.c:173
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>�� %s ��篋よ�</h1>\n"
 
-#: src/gtkconv.c:190 src/gtkdebug.c:212
+#: src/gtkconv.c:191 src/gtkdebug.c:212
 msgid "That file already exists"
 msgstr "�e��罟�罅�綏牙�絖���"
 
-#: src/gtkconv.c:191 src/gtkdebug.c:213 src/gtkft.c:1123
+#: src/gtkconv.c:192 src/gtkdebug.c:213 src/gtkft.c:1123
 msgid "Would you like to overwrite it?"
 msgstr "���荀���絎����"
 
-#: src/gtkconv.c:554
+#: src/gtkconv.c:370
+#, c-format
+msgid "me is using Gaim v%s."
+msgstr "������ Gaim v%s��"
+
+#: src/gtkconv.c:379
+msgid "Supported debug options are:  version"
+msgstr "��吡���ら���檎���削�version"
+
+#: src/gtkconv.c:392
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"荀��峨���筝���篁ょ��茯������叱�ャ��/help &lt;��篁�&gt;��\n"
+"��������羈�筝�鐚���������篁ゅ�筝�鐚�\n"
+
+#: src/gtkconv.c:426
+msgid "No such command (in this context)."
+msgstr "鐚���������羈�筝�鐚�羃���������篁�"
+
+#: src/gtkconv.c:473
+msgid ""
+"No such command. If you didn't mean to type a command, you can turn commands "
+"off from Tools->Preferences->Interface->Conversation->Enable \"slash\" "
+"commands."
+msgstr ""
+"羃���������篁ゃ��"
+"��絋�篏��≧�颮後�ユ��篁わ�篏���札�����鎴ュ�撃���鎁処┃絎���篁��≒��篋よ���篏睡������膩����鋌ゃ���檎����罩∽��篁よ叱�ョ�����純��"
+
+#: src/gtkconv.c:481
+msgid ""
+"Syntax Error:  You typed the wrong number of arguments to that command. If "
+"you didn't mean to type a command, you can turn commands off from Tools-"
+">Preferences->Interface->Conversation->Enable \"slash\" commands."
+msgstr ""
+"茯�羈����鐚�莠後�ョ�����後��惹��篁ゆ���������御�檎���"
+"��鎂�篏��≧�颮後�ユ��篁わ�篏���札�����鎴ュ�撃���鎁処┃絎���篁��≒��篋よ���篏睡������膩����鋌ゃ���檎����罩∽��篁よ叱�ョ�����純��"
+
+#: src/gtkconv.c:488
+msgid "Your command failed for an unknown reason."
+msgstr "��篁ょ���決����坂������紊掩����"
+
+#: src/gtkconv.c:495
+msgid "That command only works in Chats, not IMs."
+msgstr "������篁ゅÛ����紊���ф����鐚����恰��荐���賢�≧����"
+
+#: src/gtkconv.c:498
+msgid "That command only works in IMs, not Chats."
+msgstr "������篁ゅÛ���恰��荐���賢����鐚�����紊���х�≧����"
+
+#: src/gtkconv.c:502
+msgid "That command doesn't work on this protocol."
+msgstr "������篁ゅ��������荐���絎��х�≧����"
+
+#: src/gtkconv.c:718
 msgid "Invite Buddy Into Chat Room"
 msgstr "��茫�絅遵��峨�ヨ��紊��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:582
+#: src/gtkconv.c:746
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "茫�莠後�ユ���渇��茫���篏睡������腮縁�篁ュ���茫���荐�����"
 
-#: src/gtkconv.c:603
+#: src/gtkconv.c:767
 msgid "_Buddy:"
 msgstr "絅遵�(_B)鐚�"
 
-#: src/gtkconv.c:623
+#: src/gtkconv.c:787
 msgid "_Message:"
 msgstr "荐���(_M)鐚�"
 
-#: src/gtkconv.c:731 src/gtkdebug.c:127
+#: src/gtkconv.c:895 src/gtkdebug.c:127
 msgid "Find"
 msgstr "��絨�"
 
-#: src/gtkconv.c:757 src/gtkdebug.c:155
+#: src/gtkconv.c:921 src/gtkdebug.c:155
 msgid "_Search for:"
 msgstr "��絨�(_S)鐚�"
 
-#: src/gtkconv.c:1135
+#: src/gtkconv.c:1319
 msgid "IM"
 msgstr "�恰��荐���"
 
-#: src/gtkconv.c:1143
+#: src/gtkconv.c:1327
 msgid "Un-Ignore"
 msgstr "��羔�綽順�ヤ戎����"
 
-#: src/gtkconv.c:1145 src/gtkprefs.c:783
+#: src/gtkconv.c:1329 src/gtkprefs.c:779
 msgid "Ignore"
 msgstr "綽順�ヤ戎����"
 
 # XXX��Info����篏���室箙����緇�篏睡����莖�荐�鐚�篏�筝����鐚���篋��銀�po罟�篁������������藝�
 # XXX javajsp (Ka-Hing CHEUNG) 荀�������Info����膣����醇������緇�篏睡����莖�荐���
 #. Info button
-#: src/gtkconv.c:1154 src/gtkconv.c:3361
+#: src/gtkconv.c:1338 src/gtkconv.c:3548
 msgid "Info"
 msgstr "��緇�莖�荐�"
 
-#: src/gtkconv.c:1163
+#: src/gtkconv.c:1347
 msgid "Get Away Msg"
 msgstr "��緇��∝�荐���"
 
-#: src/gtkconv.c:2255
+#: src/gtkconv.c:2435
 msgid "Animate"
 msgstr "����"
 
-#: src/gtkconv.c:2260
+#: src/gtkconv.c:2440
 msgid "Hide Icon"
 msgstr "�沿���霚�"
 
-#: src/gtkconv.c:2266
+#: src/gtkconv.c:2446
 msgid "Save Icon As..."
 msgstr "�峨���腓榊��..."
 
-#: src/gtkconv.c:2635
+#: src/gtkconv.c:2818
 msgid "User is typing..."
 msgstr "篏睡����罩e��叱��..."
 
-#: src/gtkconv.c:2643
+#: src/gtkconv.c:2826
 msgid "User has typed something and paused"
 msgstr "篏睡����莠後�ヤ�篋��沿タ鐚�筝�����������莠後��"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2746
+#: src/gtkconv.c:2929
 msgid "_Send As"
 msgstr "篏睡��験��(_S)"
 
-#: src/gtkconv.c:3123
+#: src/gtkconv.c:3306
 msgid "Save Conversation"
 msgstr "�峨���紊��у�"
 
 #. Conversation menu
-#: src/gtkconv.c:3140
+#: src/gtkconv.c:3323
 msgid "/_Conversation"
 msgstr "/篋よ�(_C)"
 
-#: src/gtkconv.c:3142
+#: src/gtkconv.c:3325
 msgid "/Conversation/New Instant _Message..."
 msgstr "/絅遵�/�医�恰��荐���(_M)..."
 
-#: src/gtkconv.c:3147
+#: src/gtkconv.c:3330
 msgid "/Conversation/_Find..."
 msgstr "/篋よ�/��絨�(_F)..."
 
-#: src/gtkconv.c:3149
+#: src/gtkconv.c:3332
 msgid "/Conversation/View _Log"
 msgstr "/篋よ�/茹���罩桁兓���(_L)"
 
-#: src/gtkconv.c:3150
+#: src/gtkconv.c:3333
 msgid "/Conversation/_Save As..."
 msgstr "/篋よ�/����井�(_S)..."
 
-#: src/gtkconv.c:3152
+#: src/gtkconv.c:3335
 msgid "/Conversation/Clear"
 msgstr "/篋よ�/羝�腥�"
 
-#: src/gtkconv.c:3156
+#: src/gtkconv.c:3339
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/篋よ�/�医�絅遵���������(_P)..."
 
-#: src/gtkconv.c:3158
+#: src/gtkconv.c:3341
 msgid "/Conversation/_Get Info"
 msgstr "/篋よ�/��緇�莖�荐�(_G)"
 
-#: src/gtkconv.c:3160
+#: src/gtkconv.c:3343
 msgid "/Conversation/_Warn..."
 msgstr "/篋よ�/茘���(_W)..."
 
-#: src/gtkconv.c:3162
+#: src/gtkconv.c:3345
 msgid "/Conversation/In_vite..."
 msgstr "/篋よ�/��茫�(_V)..."
 
-#: src/gtkconv.c:3167
+#: src/gtkconv.c:3350
 msgid "/Conversation/A_lias..."
 msgstr "/篋よ�/�ュ��(_L)..."
 
-#: src/gtkconv.c:3169
+#: src/gtkconv.c:3352
 msgid "/Conversation/_Block..."
 msgstr "/篋よ�/絨���(_B)..."
 
-#: src/gtkconv.c:3171
+#: src/gtkconv.c:3354
 msgid "/Conversation/_Add..."
 msgstr "/篋よ�/�医�(_A)..."
 
-#: src/gtkconv.c:3173
+#: src/gtkconv.c:3356
 msgid "/Conversation/_Remove..."
 msgstr "/篋よ�/腱脂��(_R)..."
 
-#: src/gtkconv.c:3178
+#: src/gtkconv.c:3361
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/篋よ�/���ラ�g�(_k)..."
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3363
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/篋よ�/���ュ襲��(_E)..."
 
-#: src/gtkconv.c:3185
+#: src/gtkconv.c:3368
 msgid "/Conversation/_Close"
 msgstr "/篋よ�/����(_C)"
 
 #. Options
-#: src/gtkconv.c:3189
+#: src/gtkconv.c:3372
 msgid "/_Options"
 msgstr "/�檎��(_O)"
 
-#: src/gtkconv.c:3190
+#: src/gtkconv.c:3373
 msgid "/Options/Enable _Logging"
 msgstr "/�檎��/��紮�荐����ヨ�(_L)"
 
-#: src/gtkconv.c:3191
+#: src/gtkconv.c:3374
 msgid "/Options/Enable _Sounds"
 msgstr "/�檎��/�����恰��(_S)"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3375
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/�檎��/蕁�ず�弱�綏ュ�桁��(_T)"
 
-#: src/gtkconv.c:3234
+#: src/gtkconv.c:3376
+msgid "/Options/Show T_imestamps"
+msgstr "/�檎��/蕁�ず�����活�(_I)"
+
+#: src/gtkconv.c:3418
 msgid "/Conversation/View Log"
 msgstr "/篋よ�/茹���罩桁兓���"
 
-#: src/gtkconv.c:3239
+#: src/gtkconv.c:3423
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/篋よ�/�医�絅遵���������..."
 
-#: src/gtkconv.c:3245
+#: src/gtkconv.c:3429
 msgid "/Conversation/Get Info"
 msgstr "/篋よ�/��緇�莖�荐�"
 
-#: src/gtkconv.c:3249
+#: src/gtkconv.c:3433
 msgid "/Conversation/Warn..."
 msgstr "/篋よ�/茘���..."
 
-#: src/gtkconv.c:3253
+#: src/gtkconv.c:3437
 msgid "/Conversation/Invite..."
 msgstr "/篋よ�/��茫�..."
 
-#: src/gtkconv.c:3259
+#: src/gtkconv.c:3443
 msgid "/Conversation/Alias..."
 msgstr "/篋よ�/�ュ��..."
 
-#: src/gtkconv.c:3263
+#: src/gtkconv.c:3447
 msgid "/Conversation/Block..."
 msgstr "/篋よ�/絨���..."
 
-#: src/gtkconv.c:3267
+#: src/gtkconv.c:3451
 msgid "/Conversation/Add..."
 msgstr "/篋よ�/�医�..."
 
-#: src/gtkconv.c:3271
+#: src/gtkconv.c:3455
 msgid "/Conversation/Remove..."
 msgstr "/篋よ�/腱脂��..."
 
-#: src/gtkconv.c:3277
+#: src/gtkconv.c:3461
 msgid "/Conversation/Insert Link..."
 msgstr "/篋よ�/���ラ�g�..."
 
-#: src/gtkconv.c:3281
+#: src/gtkconv.c:3465
 msgid "/Conversation/Insert Image..."
 msgstr "/篋よ�/���ュ襲��..."
 
-#: src/gtkconv.c:3287
+#: src/gtkconv.c:3471
 msgid "/Options/Enable Logging"
 msgstr "/�檎��/��紮�荐����ヨ�"
 
-#: src/gtkconv.c:3290
+#: src/gtkconv.c:3474
 msgid "/Options/Enable Sounds"
 msgstr "/�檎��/�����恰��"
 
-#: src/gtkconv.c:3293
+#: src/gtkconv.c:3477
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/�檎��/蕁�ず�弱�綏ュ�桁��"
 
+#: src/gtkconv.c:3480
+msgid "/Options/Show Timestamps"
+msgstr "/�檎��/蕁�ず�����活�"
+
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3317 src/gtkconv.c:3319 src/gtkconv.c:3425 src/gtkconv.c:3427
+#: src/gtkconv.c:3504 src/gtkconv.c:3506 src/gtkconv.c:3612 src/gtkconv.c:3614
 msgid "Send"
 msgstr "����"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3333
+#: src/gtkconv.c:3520
 msgid "Warn"
 msgstr "茘���"
 
-#: src/gtkconv.c:3336
+#: src/gtkconv.c:3523
 msgid "Warn the user"
 msgstr "茘���篏睡����"
 
 #. Block button
-#: src/gtkconv.c:3340 src/gtkprivacy.c:625 src/gtkprivacy.c:636
+#: src/gtkconv.c:3527 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 msgid "Block"
 msgstr "絨���"
 
-#: src/gtkconv.c:3343
+#: src/gtkconv.c:3530
 msgid "Block the user"
 msgstr "絨���篏睡����"
 
-#: src/gtkconv.c:3350
+#: src/gtkconv.c:3537
 msgid "Add the user to your buddy list"
 msgstr "絨�篏睡�������ユ����絅遵�羝���"
 
-#: src/gtkconv.c:3357
+#: src/gtkconv.c:3544
 msgid "Remove the user from your buddy list"
 msgstr "絨�篏睡����������絅遵�羝���賢腱脂��"
 
-#: src/gtkconv.c:3364 src/gtkconv.c:3708
+#: src/gtkconv.c:3551 src/gtkconv.c:3895
 msgid "Get the user's information"
 msgstr "��緇�篏睡����莖�荐�"
 
 #. Invite
-#: src/gtkconv.c:3439
+#: src/gtkconv.c:3626
 msgid "Invite"
 msgstr "��茫�"
 
-#: src/gtkconv.c:3442
+#: src/gtkconv.c:3629
 msgid "Invite a user"
 msgstr "��茫�篏睡����"
 
-#: src/gtkconv.c:3449
+#: src/gtkconv.c:3636
 msgid "Add the chat to your buddy list"
 msgstr "絨�������紊�����ユ����絅遵�羝���"
 
-#: src/gtkconv.c:3456
+#: src/gtkconv.c:3643
 msgid "Remove the chat from your buddy list"
 msgstr "絨�������紊��������絅遵�羝���賢腱脂��"
 
-#: src/gtkconv.c:3566
+#: src/gtkconv.c:3753
 msgid "Topic:"
 msgstr "筝脂�鐚�"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3630
+#: src/gtkconv.c:3817
 msgid "0 people in room"
 msgstr "羃���篋阪�������翠��"
 
-#: src/gtkconv.c:3685
+#: src/gtkconv.c:3872
 msgid "IM the user"
 msgstr "���阪�恰��荐���畿篏睡����"
 
-#: src/gtkconv.c:3697
+#: src/gtkconv.c:3884
 msgid "Ignore the user"
 msgstr "綽順�ヤ戎����"
 
-#: src/gtkconv.c:4252
+#: src/gtkconv.c:4457
 msgid "Close conversation"
 msgstr "����篋よ�"
 
-#: src/gtkconv.c:4784 src/gtkconv.c:4816 src/gtkconv.c:4937 src/gtkconv.c:5004
+#: src/gtkconv.c:4985 src/gtkconv.c:5017 src/gtkconv.c:5138 src/gtkconv.c:5205
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ��篋阪�������翠��"
 msgstr[1] "%d ��篋阪�������翠��"
 
-#: src/gtkconv.c:5503 src/gtkconv.c:5506
+#: src/gtkconv.c:5704 src/gtkconv.c:5707
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/篋よ�/����"
 
+#: src/gtkconv.c:6078
+msgid "Send an IRC style action to a buddy or chat."
+msgstr ""
+
+#: src/gtkconv.c:6081
+msgid "Send various debug information to the current conversation."
+msgstr "��������篋よ����坂�篋��ら���荐���"
+
+#: src/gtkconv.c:6085
+msgid "/help:  List available commands."
+msgstr "/help鐚����阪�������篁ゃ��"
+
+#: src/gtkconv.c:6089
+msgid "/help &lt;command&gt;:  Help on a specific command."
+msgstr "/help &lt;��篁�&gt;鐚�蕁�ず��筝���篁ょ��茯�����"
+
 #  NOTE���ら���ヨ���緇�������ら�������莠����o���筝�綏牙���篋榊��
 #: src/gtkdebug.c:226
 msgid "Save Debug Log"
@@ -3209,7 +3327,7 @@
 msgstr "�e��罟�罅�綏牙�絖�����"
 
 #. Open file selector to select the public key.
-#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1016
+#: src/gtkft.c:1148 src/protocols/silc/buddy.c:1025
 msgid "Open..."
 msgstr "����..."
 
@@ -3266,22 +3384,22 @@
 msgstr "���頳遵��賢�����g�(_O)"
 
 # NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
-#: src/gtkimhtml.c:2667
+#: src/gtkimhtml.c:2668
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim �≧�箴��у�����箴��ゅ�ュ襲��弢�鐚�����倶�� PNG 罟�������"
 
-#: src/gtkimhtml.c:2675
+#: src/gtkimhtml.c:2676
 #, c-format
 msgid "Error saving image: %s"
 msgstr "�峨�綵怨����鐚�%s"
 
-#: src/gtkimhtml.c:2684
+#: src/gtkimhtml.c:2685
 msgid "Save Image"
 msgstr "�峨�綵怨��"
 
-#: src/gtkimhtml.c:2707
+#: src/gtkimhtml.c:2708
 msgid "_Save Image..."
 msgstr "�峨�綵怨��(_S)..."
 
@@ -3392,7 +3510,7 @@
 msgstr "篋よ�鐚�"
 
 #. Window **********
-#: src/gtklog.c:370 src/gtklog.c:386
+#: src/gtklog.c:372 src/gtklog.c:388
 msgid "System Log"
 msgstr "膤紫輝�ヨ�"
 
@@ -3460,159 +3578,164 @@
 msgid "Select a file"
 msgstr "�御��罟�罅�"
 
-#: src/gtkpounce.c:193
+#: src/gtkpounce.c:194
 msgid "Please enter a buddy to pounce."
 msgstr "茫�莠後�ヤ���絅遵�篁ラ�画�������"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:406 src/gtkpounce.c:846
+#: src/gtkpounce.c:420 src/gtkpounce.c:923
 msgid "New Buddy Pounce"
 msgstr "�医�絅遵���������"
 
-#: src/gtkpounce.c:406
+#: src/gtkpounce.c:420
 msgid "Edit Buddy Pounce"
 msgstr "膩�鹿絅遵���������"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:424
+#: src/gtkpounce.c:438
 msgid "Pounce Who"
 msgstr "荀�����茯亥������"
 
-#: src/gtkpounce.c:451
+#: src/gtkpounce.c:465
 msgid "_Buddy name:"
 msgstr "絅遵���腮�(_B)鐚�"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:475
+#: src/gtkpounce.c:489
 msgid "Pounce When"
 msgstr "����篁�藝惹┌������"
 
-#: src/gtkpounce.c:483 src/main.c:296
+#: src/gtkpounce.c:497 src/main.c:296
 msgid "_Sign on"
 msgstr "�糸��(_S)"
 
-#: src/gtkpounce.c:485
+#: src/gtkpounce.c:499
 msgid "Sign _off"
 msgstr "�糸��(_O)"
 
-#: src/gtkpounce.c:487
+#: src/gtkpounce.c:501
 msgid "A_way"
 msgstr "�∫��(_W)"
 
-#: src/gtkpounce.c:489
+#: src/gtkpounce.c:503
 msgid "Re_turn from away"
 msgstr "�演�∫��菴���(_T)"
 
-#: src/gtkpounce.c:491
+#: src/gtkpounce.c:505
 msgid "_Idle"
 msgstr "��臀�(_I)"
 
-#: src/gtkpounce.c:493
+#: src/gtkpounce.c:507
 msgid "Retur_n from idle"
 msgstr "�演��臀����(_N)"
 
-#: src/gtkpounce.c:495
+#: src/gtkpounce.c:509
 msgid "Buddy starts _typing"
 msgstr "絅遵���紮�莠後��(_T)"
 
-#: src/gtkpounce.c:497
+#: src/gtkpounce.c:511
 msgid "Buddy stops t_yping"
 msgstr "絅遵���罩∵叱��(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:526
+#: src/gtkpounce.c:540
 msgid "Pounce Action"
 msgstr "������篏�"
 
-#: src/gtkpounce.c:533
+#: src/gtkpounce.c:548
 msgid "Op_en an IM window"
 msgstr "�����恰��荐����腦�(_E)"
 
-#: src/gtkpounce.c:534
+#: src/gtkpounce.c:550
 msgid "_Popup notification"
 msgstr "綵��咲����(_P)"
 
-#: src/gtkpounce.c:535
+#: src/gtkpounce.c:552
 msgid "Send a _message"
 msgstr "���肴���(_M)"
 
-#: src/gtkpounce.c:536
+#: src/gtkpounce.c:554
 msgid "E_xecute a command"
 msgstr "�決���篁�(_X)"
 
-#: src/gtkpounce.c:537
+#: src/gtkpounce.c:556
 msgid "P_lay a sound"
 msgstr "�㊥�冗�恰��(_L)"
 
-#: src/gtkpounce.c:541
+#: src/gtkpounce.c:560
 msgid "B_rowse..."
 msgstr "�頳�(_R)..."
 
-#: src/gtkpounce.c:543
+#: src/gtkpounce.c:562
 msgid "Bro_wse..."
 msgstr "�頳�(_W)..."
 
-#: src/gtkpounce.c:544
+#: src/gtkpounce.c:563
 msgid "Pre_view"
 msgstr "��荀�(_V)"
 
-#: src/gtkpounce.c:627
+#: src/gtkpounce.c:646
 msgid "Sav_e this pounce after activation"
 msgstr "�峨�荐㊤�筝�����(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:853
+#: src/gtkpounce.c:930
 msgid "Remove Buddy Pounce"
 msgstr "腱脂�ゅソ����������"
 
-#: src/gtkpounce.c:903
-#, c-format
-msgid "%s has started typing to you"
-msgstr "%s ��紮�莠後�ヨ���畿��"
-
-#: src/gtkpounce.c:904
-#, c-format
-msgid "%s has signed on"
-msgstr "%s 綏牙��糸��"
-
-#: src/gtkpounce.c:905
-#, c-format
-msgid "%s has returned from being idle"
-msgstr "%s �演��臀����"
-
-#: src/gtkpounce.c:906
-#, c-format
-msgid "%s has returned from being away"
-msgstr "%s �演�∫��菴���"
-
-#: src/gtkpounce.c:907
-#, c-format
-msgid "%s has stopped typing to you"
-msgstr "%s ��罩∵叱�ヨ���畿��"
-
-#: src/gtkpounce.c:908
-#, c-format
-msgid "%s has signed off"
-msgstr "%s 綏牙��糸��"
-
-#: src/gtkpounce.c:909
-#, c-format
-msgid "%s has become idle"
-msgstr "%s 莅��雁�����咲��臀�"
-
-#: src/gtkpounce.c:911
+#: src/gtkpounce.c:994
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s ��紮�莠後�ヨ���畿�� (%s)"
+
+#: src/gtkpounce.c:996
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s 綏牙��糸�� (%s)"
+
+#: src/gtkpounce.c:998
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s �演��臀���� (%s)"
+
+#: src/gtkpounce.c:1000
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s �演�∫��菴��� (%s)"
+
+#: src/gtkpounce.c:1002
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s ��罩∵叱�ヨ���畿�� (%s)"
+
+#: src/gtkpounce.c:1004
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s 綏牙��糸�� (%s)"
+
+#: src/gtkpounce.c:1006
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s 莅��雁�����咲��臀� (%s)"
+
+#: src/gtkpounce.c:1008
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s 綏牙��∫���� (%s)"
+
+#: src/gtkpounce.c:1009
 msgid "Unknown pounce event. Please report this!"
 msgstr "���ョ������篋�篁吟��茫����演�����馹�鐚�"
 
-#: src/gtkprefs.c:406
+#: src/gtkprefs.c:402
 msgid "Interface Options"
 msgstr "篁��∫�檎��"
 
-#: src/gtkprefs.c:408
+#: src/gtkprefs.c:404
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "�九�ュ��羃���荐㊤���鐚�篁ュ��号��荐㊤����援┗蕁�ず(_I)"
 
-#: src/gtkprefs.c:632
+#: src/gtkprefs.c:628
 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."
@@ -3620,164 +3743,172 @@
 "����∝��羝���賢�後�筝��������喝��罩∞��茵���筝脂������札�����括���劫�絨��亥��茵���筝脂�"
 "絎�茖��井���賢��"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:668
 msgid "Icon"
 msgstr "��腓�"
 
-#: src/gtkprefs.c:679 src/gtkprefs.c:2042 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:675 src/gtkprefs.c:2203 src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:749 src/protocols/jabber/chat.c:701
 msgid "Description"
 msgstr "�颷�"
 
-#: src/gtkprefs.c:775 src/gtkprefs.c:1114
+#: src/gtkprefs.c:771
 msgid "Display"
 msgstr "蕁�ず"
 
-#: src/gtkprefs.c:776
+#: src/gtkprefs.c:772
 msgid "Show _timestamp on messages"
 msgstr "蕁�ず荐�������(_T)"
 
-#: src/gtkprefs.c:779
+#: src/gtkprefs.c:775
 msgid "_Highlight misspelled words"
 msgstr "罔�腓阪�堺�守����絖�(_H)"
 
+#: src/gtkprefs.c:780
+msgid "Ignore c_olors"
+msgstr "綽順�ラ���(_O)"
+
+#: src/gtkprefs.c:782
+msgid "Ignore font _faces"
+msgstr "綽順�ュ�蕭�(_F)"
+
 #: src/gtkprefs.c:784
-msgid "Ignore c_olors"
-msgstr "綽順�ラ���(_O)"
-
-#: src/gtkprefs.c:786
-msgid "Ignore font _faces"
-msgstr "綽順�ュ�蕭�(_F)"
-
-#: src/gtkprefs.c:788
 msgid "Ignore font si_zes"
 msgstr "綽順�ュ�蕭�紊у�(_Z)"
 
+#: src/gtkprefs.c:787
+msgid "_Ignore formatting on incoming messages"
+msgstr "綽順�ユ���区������弱���(_I)"
+
 #: src/gtkprefs.c:791
-msgid "_Ignore formatting on incoming messages"
-msgstr "綽順�ユ���区������弱���(_I)"
-
-#: src/gtkprefs.c:795
 msgid "Default Formatting"
 msgstr "��荐㊥�弱�"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:793
 msgid "_Send default formatting with outgoing messages"
 msgstr "���肴�����篏睡����荐㊥�弱���(_S)"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:825
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "��絋���戎������絎���吚�弱���鐚����肴�����綣閞e���蕁�篌寂札筝���罔f���"
 
 #  XXX ��⑮
-#: src/gtkprefs.c:832
+#: src/gtkprefs.c:828
 msgid "_Clear Formatting"
 msgstr "羝��ゆ�弱���(_C)"
 
-#: src/gtkprefs.c:869
+#: src/gtkprefs.c:865
 msgid "Send Message"
 msgstr "���肴���"
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:866
 msgid "Enter _sends message"
 msgstr "��筝� Enter ���肴���(_S)"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:868
 msgid "C_ontrol-Enter sends message"
 msgstr "��筝� Ctrl-Enter ���肴���(_O)"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:871
 msgid "Window Closing"
 msgstr "荀�腦�����"
 
-#: src/gtkprefs.c:876
+#: src/gtkprefs.c:872
 msgid "_Escape closes window"
 msgstr "��筝� Escape ����荀�腦�(_E)"
 
-#: src/gtkprefs.c:879
+#: src/gtkprefs.c:875
 msgid "Insertions"
 msgstr "���ラ�檎��"
 
-#: src/gtkprefs.c:880
+#: src/gtkprefs.c:876
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "��筝� Ctrl-{B/I/U} �贋�劫���罔e�(_F)"
 
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:878
 msgid "Control-(number) _inserts smileys"
 msgstr "��筝� Ctrl-(�後���) ���ヨ;��(_I)"
 
-#: src/gtkprefs.c:898
+#: src/gtkprefs.c:894
 msgid "Buddy List Sorting"
 msgstr "絅遵�羝����綺�"
 
-#: src/gtkprefs.c:907
+#: src/gtkprefs.c:903
 msgid "_Sorting:"
 msgstr "��綺�婧�(_S)鐚�"
 
-#: src/gtkprefs.c:913 src/gtkprefs.c:1059 src/gtkprefs.c:1101
+#: src/gtkprefs.c:909 src/gtkprefs.c:962
 msgid "Show _buttons as:"
 msgstr "蕁�ず���窮��(_B)鐚�"
 
-#: src/gtkprefs.c:915 src/gtkprefs.c:1061 src/gtkprefs.c:1103
+#: src/gtkprefs.c:911 src/gtkprefs.c:964
 msgid "Pictures"
 msgstr "��綵�"
 
-#: src/gtkprefs.c:916 src/gtkprefs.c:1062 src/gtkprefs.c:1104
+#: src/gtkprefs.c:912 src/gtkprefs.c:965
 msgid "Text"
 msgstr "��絖�"
 
-#: src/gtkprefs.c:917 src/gtkprefs.c:1063 src/gtkprefs.c:1105
+#: src/gtkprefs.c:913 src/gtkprefs.c:966
 msgid "Pictures and text"
 msgstr "��綵∵����絖�"
 
-#: src/gtkprefs.c:920 src/gtkprefs.c:1070 src/gtkprefs.c:1112
+#: src/gtkprefs.c:916 src/gtkprefs.c:981
 msgid "_Raise window on events"
 msgstr "�銀�篁句�主����鐚�絨�荀�腦����井��筝���(_R)"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:919
 msgid "Buddy Display"
 msgstr "絅遵�蕁�ず"
 
-#: src/gtkprefs.c:924 src/gtkprefs.c:1074
+#: src/gtkprefs.c:920 src/gtkprefs.c:977
 msgid "Show buddy _icons"
 msgstr "蕁�ず絅遵���腓�(_I)"
 
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:922
 msgid "Show _warning levels"
 msgstr "蕁�ず茘���膈�膣�(_W)"
 
-#: src/gtkprefs.c:928
+#: src/gtkprefs.c:924
 msgid "Show idle _times"
 msgstr "蕁�ず��臀�����(_T)"
 
-#: src/gtkprefs.c:930
+#: src/gtkprefs.c:926
 msgid "Dim i_dle buddies"
 msgstr "����臀���絅遵�荐㊦�榊�域��(_D)"
 
 # XXX ��⑮
-#: src/gtkprefs.c:932
+#: src/gtkprefs.c:928
 msgid "_Automatically expand contacts"
 msgstr "����絮���絅遵�(_A)"
 
-#: src/gtkprefs.c:969
-msgid "_Placement:"
-msgstr "篏�臀�(_P)鐚�"
-
-#  FIXME 茘�����緇��拷��
-#: src/gtkprefs.c:976
-msgid "Number of conversations per window"
-msgstr "荀�腦�蕁�ず箙�篋よ����娯���"
+#: src/gtkprefs.c:973
+msgid "Show _formatting toolbar"
+msgstr "蕁�ず�弱�綏ュ�桁��(_F)"
+
+#: src/gtkprefs.c:975
+msgid "Show _aliases in tabs/titles"
+msgstr "���蕁���罔�膠や�蕁�ず�ュ��(_A)"
+
+#: src/gtkprefs.c:979
+msgid "Enable buddy ic_on animation"
+msgstr "����絅遵���腓阪����(_O)"
+
+#: src/gtkprefs.c:983
+msgid "_Notify buddies that you are typing to them"
+msgstr "���ユ����絅遵���③���取���畿篁���(_N)"
 
 #: src/gtkprefs.c:985
-msgid "Show _formatting toolbar"
-msgstr "蕁�ず�弱�綏ュ�桁��(_F)"
-
-#: src/gtkprefs.c:988
-msgid "Show a_liases in tabs/titles"
-msgstr "���蕁���罔�膠や�蕁�ず�ュ��(_L)"
-
+msgid "Enable \"_slash\" commands"
+msgstr "篏睡������膩�����篁�(_S)"
+
+#: src/gtkprefs.c:987
+msgid "Use _multi-colored screen names in chats"
+msgstr "����紊���т札筝���蕁�兂���ヤ������援┗(_M)"
+
+#. All the tab options!
 #: src/gtkprefs.c:991
 msgid "Tab Options"
 msgstr "罔�膠ら�檎��"
@@ -3786,165 +3917,146 @@
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "篏睡���膠よ�腦�蕁�ず�恰��荐�������紊�(_T)"
 
-#: src/gtkprefs.c:996
+#: src/gtkprefs.c:1009
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "篏睡����筝���罔�膠よ�腦�蕁�ず�恰��荐�������紊�(_S)"
 
-#: src/gtkprefs.c:1006
+#: src/gtkprefs.c:1013
 msgid "Show _close button on tabs"
 msgstr "���膠や�蕁�ず������(_C)"
 
+#: src/gtkprefs.c:1016
+msgid "Tab p_lacement:"
+msgstr "罔�膠や�臀�(_L)鐚�"
+
+#: src/gtkprefs.c:1018
+msgid "Top"
+msgstr "荀�腦�筝���"
+
 #: src/gtkprefs.c:1019
-msgid "_Tab Placement:"
-msgstr "罔�膠や�臀�(_T)鐚�"
+msgid "Bottom"
+msgstr "荀�腦�筝���"
+
+#: src/gtkprefs.c:1020
+msgid "Left"
+msgstr "荀�腦�綏���"
 
 #: src/gtkprefs.c:1021
-msgid "Top"
-msgstr "荀�腦�筝���"
-
-#: src/gtkprefs.c:1022
-msgid "Bottom"
-msgstr "荀�腦�筝���"
-
-#: src/gtkprefs.c:1023
-msgid "Left"
-msgstr "荀�腦�綏���"
-
-#: src/gtkprefs.c:1024
 msgid "Right"
 msgstr "荀�腦��喝��"
 
-#: src/gtkprefs.c:1057 src/gtkprefs.c:1099
-msgid "Window"
-msgstr "荀�腦�"
-
-#: src/gtkprefs.c:1073
-msgid "Buddy Icons"
-msgstr "絅遵���腓�"
-
-#: src/gtkprefs.c:1076
-msgid "Enable buddy icon a_nimation"
-msgstr "����絅遵���腓阪����(_N)"
-
-#: src/gtkprefs.c:1079
-msgid "Typing Notification"
-msgstr "莠後�ラ����"
-
-#: src/gtkprefs.c:1080
-msgid "Notify buddies that you are _typing to them"
-msgstr "���ユ����絅遵���③���取���畿篁���(_T)"
-
-#: src/gtkprefs.c:1115
-msgid "Co_lorize screen names"
-msgstr "絨�絽活��篁ラ��峨����(_L)"
-
-#: src/gtkprefs.c:1136 src/protocols/oscar/oscar.c:592
-#: src/protocols/oscar/oscar.c:4811
+#: src/gtkprefs.c:1027
+msgid "New window _placement:"
+msgstr "�域�腦�篏�臀�(_P)鐚�"
+
+#  FIXME 茘�����緇��拷��
+#: src/gtkprefs.c:1034
+msgid "Number of conversations per window:"
+msgstr "荀�腦��т�篋よ����娯���鐚�"
+
+#: src/gtkprefs.c:1084 src/protocols/oscar/oscar.c:592
+#: src/protocols/oscar/oscar.c:4832
 msgid "IP Address"
 msgstr "IP 篏���"
 
-#: src/gtkprefs.c:1138
+#: src/gtkprefs.c:1086
 msgid "_Autodetect IP Address"
 msgstr "�����究謙 IP 篏���(_A)"
 
-#: src/gtkprefs.c:1147
+#: src/gtkprefs.c:1095
 msgid "Public _IP:"
 msgstr "����IP (_I)鐚�"
 
-#: src/gtkprefs.c:1171
+#: src/gtkprefs.c:1119
 msgid "Ports"
 msgstr "��荐���"
 
-#: src/gtkprefs.c:1174
+#: src/gtkprefs.c:1122
 msgid "_Manually specify range of ports to listen on"
 msgstr "�����荐����h�順���(_M)"
 
-#: src/gtkprefs.c:1177
+#: src/gtkprefs.c:1125
 msgid "_Start Port:"
 msgstr "��紮���荐���(_S)鐚�"
 
-#: src/gtkprefs.c:1184
+#: src/gtkprefs.c:1132
 msgid "_End Port:"
 msgstr "腟�����荐���(_E)鐚�"
 
-#: src/gtkprefs.c:1232
-msgid "Proxy Type"
-msgstr "篁g��篌堺��������"
+#: src/gtkprefs.c:1139
+msgid "Proxy Server"
+msgstr "篁g��篌堺����"
 
 # NOTE ���怨����鐚�筝�����罸�����鐚��合�冴��筝�篏睡����
-#: src/gtkprefs.c:1235
+#: src/gtkprefs.c:1143
 msgid "No proxy"
 msgstr "筝�篏睡��撮��篌堺����"
 
-#: src/gtkprefs.c:1242
-msgid "Proxy Server"
-msgstr "篁g��篌堺����"
-
-#: src/gtkprefs.c:1300
+#: src/gtkprefs.c:1205
 msgid "_User:"
 msgstr "篏睡����(_U)鐚�"
 
-#: src/gtkprefs.c:1356
+#: src/gtkprefs.c:1261
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1357
+#: src/gtkprefs.c:1262
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1358
+#: src/gtkprefs.c:1263
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1359
+#: src/gtkprefs.c:1264
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1360
+#: src/gtkprefs.c:1265
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1361
+#: src/gtkprefs.c:1266
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1362
+#: src/gtkprefs.c:1267
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1363
+#: src/gtkprefs.c:1268
 msgid "Gnome Default"
 msgstr "GNOME��荐㊤��"
 
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1277
 msgid "Manual"
 msgstr "篏睡�������"
 
-#: src/gtkprefs.c:1423
+#: src/gtkprefs.c:1328
 msgid "Browser Selection"
 msgstr "�御���頳遵��"
 
-#: src/gtkprefs.c:1427
+#: src/gtkprefs.c:1332
 msgid "_Browser:"
 msgstr "�頳遵��(_B)鐚�"
 
-#: src/gtkprefs.c:1434
+#: src/gtkprefs.c:1339
 msgid "_Open link in:"
 msgstr "���頳遵��賢�����g�(_O)鐚�"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1341
 msgid "Browser default"
 msgstr "�頳遵����荐�"
 
-#: src/gtkprefs.c:1437
+#: src/gtkprefs.c:1342
 msgid "Existing window"
 msgstr "�∽����荀�腦�"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1344
 msgid "New tab"
 msgstr "�井�膠�"
 
-#: src/gtkprefs.c:1453
+#: src/gtkprefs.c:1358
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3953,79 +4065,83 @@
 "篏睡�������(_M)鐚�\n"
 "(茫�篁� %s 篁h;膓峨��)"
 
-#: src/gtkprefs.c:1490
+#: src/gtkprefs.c:1395
 msgid "Message Logs"
 msgstr "荐����ヨ�"
 
-#: src/gtkprefs.c:1493
+#: src/gtkprefs.c:1398
 msgid "Log _Format:"
 msgstr "�ヨ��弱�(_F)鐚�"
 
-#: src/gtkprefs.c:1496
+#: src/gtkprefs.c:1401
 msgid "_Log all instant messages"
 msgstr "荐��������恰��荐���(_L)"
 
-#: src/gtkprefs.c:1498
+#: src/gtkprefs.c:1403
 msgid "Log all c_hats"
 msgstr "荐���������紊��у�(_H)"
 
-#: src/gtkprefs.c:1501
+#: src/gtkprefs.c:1406
 msgid "System Logs"
 msgstr "膤紫輝�ヨ�"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1408
 msgid "_Enable system log"
 msgstr "篏睡��鎧腟掩�ヨ�(_E)"
 
-#: src/gtkprefs.c:1506
+#: src/gtkprefs.c:1411
 msgid "Log when buddies _sign on/sign off"
 msgstr "荐���絅遵����糸�ワ��糸��(_S)"
 
-#: src/gtkprefs.c:1512
+#: src/gtkprefs.c:1417
 msgid "Log when buddies become _idle/un-idle"
 msgstr "荐���絅遵�����臀����羔���臀�(_I)"
 
-#: src/gtkprefs.c:1518
+#: src/gtkprefs.c:1423
 msgid "Log when buddies go away/come _back"
 msgstr "荐���絅遵��∫��鐚��鋐�(_B)"
 
-#: src/gtkprefs.c:1524
+#: src/gtkprefs.c:1429
 msgid "Log your _own signons/idleness/awayness"
 msgstr "荐�������群�糸�ワ���臀���∫��膈�����(_O)"
 
-#: src/gtkprefs.c:1570
+#: src/gtkprefs.c:1567
+msgid "Sound Selection"
+msgstr "�後��恰��"
+
+#: src/gtkprefs.c:1642
 msgid "Sound Options"
 msgstr "�恰���檎��"
 
-#: src/gtkprefs.c:1571
+#: src/gtkprefs.c:1643
 msgid "Sounds when conversation has _focus"
 msgstr "�銀困茫���緇�莠後�ョ����弱�咲�恰��(_F)"
 
-#: src/gtkprefs.c:1573
+#: src/gtkprefs.c:1645
 msgid "_Sounds while away"
 msgstr "�∫����篁��弱�咲�恰��(_S)"
 
-#: src/gtkprefs.c:1577
+#: src/gtkprefs.c:1649
 msgid "Sound Method"
 msgstr "�恰���㊥�丈�劫�"
 
-#: src/gtkprefs.c:1578
+#: src/gtkprefs.c:1650
 msgid "_Method:"
 msgstr "�㊥�丈�劫�(_M)鐚�"
 
-#: src/gtkprefs.c:1580
+#: src/gtkprefs.c:1652
 msgid "Console beep"
 msgstr "�銀���"
 
-#: src/gtkprefs.c:1582
+#: src/gtkprefs.c:1654
 msgid "Automatic"
 msgstr "����"
 
-#: src/gtkprefs.c:1589
+#: src/gtkprefs.c:1661
 msgid "Command"
 msgstr "��篁�"
 
-#: src/gtkprefs.c:1599
+#: src/gtkprefs.c:1669
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4034,62 +4150,86 @@
 "�恰����篁�(_C)鐚�\n"
 "(茫�篁� %s 篁h;罟���)"
 
-#: src/gtkprefs.c:1646
+#: src/gtkprefs.c:1696
+msgid "Sound Events"
+msgstr "篋�篁狗�恰��"
+
+#: src/gtkprefs.c:1747
+msgid "Play"
+msgstr "�㊥��"
+
+#: src/gtkprefs.c:1754
+msgid "Event"
+msgstr "篋�篁�"
+
+#: src/gtkprefs.c:1773
+msgid "Test"
+msgstr "羝��"
+
+#: src/gtkprefs.c:1777
+msgid "Reset"
+msgstr "��臀�"
+
+#: src/gtkprefs.c:1781
+msgid "Choose..."
+msgstr "�御��..."
+
+#: src/gtkprefs.c:1805
 msgid "_Queue new messages when away"
 msgstr "���∫����鐚�絨��������域���舟�ヤ���筝�(_Q)"
 
-#: src/gtkprefs.c:1649
+#: src/gtkprefs.c:1808
 msgid "Auto-response"
 msgstr "��������"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1809
 msgid "_Send auto-response"
 msgstr "���肴��������(_S)"
 
-#: src/gtkprefs.c:1652
+#: src/gtkprefs.c:1811
 msgid "_Only send auto-response when idle"
 msgstr "������臀����������肴��������(_O)"
 
-#: src/gtkprefs.c:1655 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3969
-#: src/protocols/yahoo/yahoo.c:2297
+#: src/gtkprefs.c:1814 src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2729 src/protocols/oscar/oscar.c:3990
+#: src/protocols/yahoo/yahoo.c:2381 src/protocols/yahoo/yahoo_profile.c:785
 msgid "Idle"
 msgstr "��臀�"
 
-#: src/gtkprefs.c:1656
+#: src/gtkprefs.c:1815
 msgid "Idle _time reporting:"
 msgstr "��臀������怨��(_T)鐚�"
 
-#: src/gtkprefs.c:1659
+#: src/gtkprefs.c:1818
 msgid "Gaim usage"
 msgstr "Gaim 篏睡����羈�"
 
-#: src/gtkprefs.c:1662
+#: src/gtkprefs.c:1821
 msgid "X usage"
 msgstr "X Window 篏睡����羈�"
 
-#: src/gtkprefs.c:1664
+#: src/gtkprefs.c:1823
 msgid "Windows usage"
 msgstr "Windows 篏睡����羈�"
 
-#: src/gtkprefs.c:1672
+#: src/gtkprefs.c:1831
 msgid "Auto-away"
 msgstr "�����∫��"
 
-#: src/gtkprefs.c:1673
+#: src/gtkprefs.c:1832
 msgid "Set away _when idle"
 msgstr "��臀�������荐㊦�咲�∫��(_W)"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/gtkprefs.c:1677
+#: src/gtkprefs.c:1836
 msgid "_Minutes before setting away:"
 msgstr "��臀��絨�����荐㊦�咲�∫��(_M)鐚�"
 
-#: src/gtkprefs.c:1685
+#: src/gtkprefs.c:1844
 msgid "Away m_essage:"
 msgstr "�∫��荐���(_M)鐚�"
 
-#: src/gtkprefs.c:1760
+#: src/gtkprefs.c:1921
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4104,7 +4244,7 @@
 "<span weight=\"bold\">膓牙�鐚�</span>\t\t%s\n"
 "<span weight=\"bold\">罟���鐚�</span>\t%s"
 
-#: src/gtkprefs.c:1765
+#: src/gtkprefs.c:1926
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4119,105 +4259,65 @@
 "<span weight=\"bold\">膓牙�鐚�</span>  %s\n"
 "<span weight=\"bold\">罟���鐚�</span>  %s"
 
-#: src/gtkprefs.c:1998
+#: src/gtkprefs.c:2159
 msgid "Load"
 msgstr "莠���"
 
-#: src/gtkprefs.c:2012
+#: src/gtkprefs.c:2173
 msgid "Summary"
 msgstr "膂∴唇"
 
 #  NOTE��膣亥���緇��亥�駈����榊���≫����醇���g���膣亥�鐚��e�堺������巡�絅�
-#: src/gtkprefs.c:2060
+#: src/gtkprefs.c:2221
 msgid "Details"
 msgstr "膣亥�"
 
-#: src/gtkprefs.c:2187
-msgid "Sound Selection"
-msgstr "�後��恰��"
-
-#: src/gtkprefs.c:2294
-msgid "Play"
-msgstr "�㊥��"
-
-#: src/gtkprefs.c:2301
-msgid "Event"
-msgstr "篋�篁�"
-
-#: src/gtkprefs.c:2320
-msgid "Test"
-msgstr "羝��"
-
-#: src/gtkprefs.c:2324
-msgid "Reset"
-msgstr "��臀�"
-
-#: src/gtkprefs.c:2328
-msgid "Choose..."
-msgstr "�御��..."
-
-#: src/gtkprefs.c:2463
+#: src/gtkprefs.c:2366
 msgid "_Edit"
 msgstr "膩�鹿(_E)"
 
-#: src/gtkprefs.c:2499
+#: src/gtkprefs.c:2402
 msgid "Interface"
 msgstr "篁���"
 
-#: src/gtkprefs.c:2500
+#: src/gtkprefs.c:2403
 msgid "Smiley Themes"
 msgstr "茵���筝脂�"
 
-#: src/gtkprefs.c:2501
+#: src/gtkprefs.c:2404
 msgid "Message Text"
 msgstr "荐�����絖�"
 
-#: src/gtkprefs.c:2502
+#: src/gtkprefs.c:2405
 msgid "Shortcuts"
 msgstr "綽��潔��"
 
-#: src/gtkprefs.c:2505
-msgid "IMs"
-msgstr "�恰��荐���"
-
-#: src/gtkprefs.c:2507
+#: src/gtkprefs.c:2408
+msgid "Sounds"
+msgstr "�恰��"
+
+#: src/gtkprefs.c:2409
 msgid "Network"
 msgstr "膓画君"
 
-#: src/gtkprefs.c:2508
-msgid "Proxy"
-msgstr "篁g��篌堺����"
-
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2511
+#: src/gtkprefs.c:2412
 msgid "Browser"
 msgstr "�頳遵��"
 
-#: src/gtkprefs.c:2513
+#: src/gtkprefs.c:2414
 msgid "Logging"
 msgstr "�ヨ�"
 
-#: src/gtkprefs.c:2514
-msgid "Sounds"
-msgstr "�恰��"
-
-#: src/gtkprefs.c:2515
-msgid "Sound Events"
-msgstr "篋�篁狗�恰��"
-
-#: src/gtkprefs.c:2516
+#: src/gtkprefs.c:2415
 msgid "Away / Idle"
 msgstr "�∫�� / ��臀�"
 
-#: src/gtkprefs.c:2517
+#: src/gtkprefs.c:2416
 msgid "Away Messages"
 msgstr "�∫��荐���"
 
-#: src/gtkprefs.c:2520
-msgid "Protocols"
-msgstr "��荐���絎�"
-
-#: src/gtkprefs.c:2521
+#: src/gtkprefs.c:2419
 msgid "Plugins"
 msgstr "罔∞�羝���"
 
@@ -4241,7 +4341,7 @@
 msgid "Block only the users below"
 msgstr "絨���篁ヤ���篏睡����"
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1275
+#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1448
 msgid "Privacy"
 msgstr "�援�荐㊤�"
 
@@ -4306,13 +4406,13 @@
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
 #: src/gtkrequest.c:233 src/protocols/gg/gg.c:866
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:303
+#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1233
 msgid "Yes"
 msgstr "��"
 
 #: src/gtkrequest.c:234 src/protocols/gg/gg.c:866
-#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:304
+#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1233
 msgid "No"
 msgstr "��"
@@ -4321,18 +4421,18 @@
 msgid "Apply"
 msgstr "絅���"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:271
-#: src/protocols/silc/util.c:299
+#: src/gtkrequest.c:238 src/protocols/msn/msn.c:298
+#: src/protocols/silc/util.c:300
 msgid "Close"
 msgstr "����"
 
-#: src/gtkroomlist.c:328
+#: src/gtkroomlist.c:330
 msgid "Room List"
 msgstr "��紊��羝���"
 
 #  list button
 #. list button
-#: src/gtkroomlist.c:397
+#: src/gtkroomlist.c:402
 msgid "_Get List"
 msgstr "��緇�羝���(_G)"
 
@@ -4538,12 +4638,12 @@
 msgstr "�∴��鐚���荐㍼�"
 
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:378 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/novell/novell.c:2720
+#: src/protocols/msn/msn.c:433 src/protocols/msn/state.c:29
+#: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2720
 #: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2890
-#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2656
-#: src/protocols/yahoo/yahoo.c:2771
+#: src/protocols/oscar/oscar.c:611 src/protocols/yahoo/yahoo.c:2744
+#: src/protocols/yahoo/yahoo.c:2859
 msgid "Available"
 msgstr "筝�膩�"
 
@@ -4555,12 +4655,12 @@
 msgid "Away for friends only"
 msgstr "�∫��鐚�����絅遵���札���井��鐚�"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:961
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:963
 #: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:532
-#: src/protocols/oscar/oscar.c:5353 src/protocols/oscar/oscar.c:5431
-#: src/protocols/oscar/oscar.c:5455 src/protocols/oscar/oscar.c:6626
-#: src/protocols/oscar/oscar.c:6631 src/protocols/yahoo/yahoo.c:2295
-#: src/protocols/yahoo/yahoo.c:2676 src/protocols/yahoo/yahoo.c:2781
+#: src/protocols/oscar/oscar.c:5374 src/protocols/oscar/oscar.c:5452
+#: src/protocols/oscar/oscar.c:5476 src/protocols/oscar/oscar.c:6647
+#: src/protocols/oscar/oscar.c:6652 src/protocols/yahoo/yahoo.c:2379
+#: src/protocols/yahoo/yahoo.c:2764 src/protocols/yahoo/yahoo.c:2869
 msgid "Invisible"
 msgstr "�沿昆"
 
@@ -4584,7 +4684,7 @@
 #: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
 #: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
 #: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:104
+#: src/protocols/jabber/jabber.c:105
 msgid "Invalid response from server."
 msgstr "�≧����篌堺����������"
 
@@ -4619,11 +4719,10 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:601 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:524
-#: src/protocols/msn/servconn.c:47 src/protocols/napster/napster.c:474
-#: src/protocols/napster/napster.c:505 src/protocols/toc/toc.c:199
-#: src/protocols/yahoo/yahoo.c:1960 src/protocols/yahoo/yahoo.c:1991
-#: src/protocols/yahoo/yahoo.c:2054 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/napster/napster.c:474 src/protocols/napster/napster.c:505
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2032
+#: src/protocols/yahoo/yahoo.c:2063 src/protocols/yahoo/yahoo.c:2126
+#: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "�≧��g���"
@@ -4649,7 +4748,7 @@
 msgstr "�� GG Library 筝㊦����紊ч���\n"
 
 #: src/protocols/gg/gg.c:654 src/protocols/gg/gg.c:745
-#: src/protocols/toc/toc.c:175
+#: src/protocols/toc/toc.c:146
 #, c-format
 msgid "Connect to %s failed"
 msgstr "�g��� %s 紊掩��"
@@ -4688,25 +4787,25 @@
 msgid "Active"
 msgstr "����"
 
-#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4803
+#: src/protocols/gg/gg.c:870 src/protocols/oscar/oscar.c:4824
 msgid "UIN"
 msgstr "絽活��"
 
 #. First Name
-#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4814 src/protocols/silc/ops.c:774
+#: src/protocols/gg/gg.c:874 src/protocols/jabber/jabber.c:612
+#: src/protocols/oscar/oscar.c:4835 src/protocols/silc/ops.c:774
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "��"
 
 #. Last Name
-#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4815 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:879 src/protocols/jabber/jabber.c:617
+#: src/protocols/oscar/oscar.c:4836 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "紮�"
 
 #: src/protocols/gg/gg.c:883 src/protocols/gg/gg.c:1622
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4804
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4825
 msgid "Nick"
 msgstr "�援┗"
 
@@ -4720,19 +4819,20 @@
 msgstr "�у��"
 
 #. City
-#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:626
-#: src/protocols/oscar/oscar.c:4858 src/protocols/oscar/oscar.c:4866
+#: src/protocols/gg/gg.c:907 src/protocols/jabber/jabber.c:627
+#: src/protocols/oscar/oscar.c:4879 src/protocols/oscar/oscar.c:4887
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "���"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1307
-#: src/protocols/msn/msn.c:1551 src/protocols/napster/napster.c:392
-#: src/protocols/oscar/oscar.c:3781 src/protocols/oscar/oscar.c:3997
-#: src/protocols/toc/toc.c:497 src/protocols/yahoo/yahoo.c:2955
-#: src/protocols/yahoo/yahoo.c:2977 src/protocols/yahoo/yahoo.c:3000
-#: src/protocols/yahoo/yahoo.c:3158 src/protocols/zephyr/zephyr.c:568
+#: src/protocols/gg/gg.c:928 src/protocols/msn/msn.c:1110
+#: src/protocols/msn/msn.c:1355 src/protocols/napster/napster.c:392
+#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4018
+#: src/protocols/toc/toc.c:468 src/protocols/yahoo/yahoo_profile.c:643
+#: src/protocols/yahoo/yahoo_profile.c:665
+#: src/protocols/yahoo/yahoo_profile.c:705
+#: src/protocols/yahoo/yahoo_profile.c:917 src/protocols/zephyr/zephyr.c:568
 msgid "Buddy Information"
 msgstr "絅遵�莖�荐�"
 
@@ -4832,8 +4932,8 @@
 msgstr "������絨�"
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1059
-#: src/protocols/toc/toc.c:1558
+#: src/protocols/gg/gg.c:1415 src/protocols/jabber/jabber.c:1061
+#: src/protocols/toc/toc.c:1543
 msgid "Change Password"
 msgstr "篆��劫�腆�"
 
@@ -4884,17 +4984,15 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "篏睡���� %s (%s%s%s%s%s) 荀�羆�����茯�茘���"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:531 src/protocols/msn/notification.c:917
-#: src/protocols/msn/notification.c:1084 src/protocols/oscar/oscar.c:3516
-#: src/protocols/oscar/oscar.c:6059
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:231
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3537
+#: src/protocols/oscar/oscar.c:6080
 msgid "Authorize"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:532 src/protocols/msn/notification.c:919
-#: src/protocols/msn/notification.c:1086 src/protocols/oscar/oscar.c:3518
-#: src/protocols/oscar/oscar.c:6060
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:232
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3539
+#: src/protocols/oscar/oscar.c:6081
 msgid "Deny"
 msgstr "��腟�"
 
@@ -4919,7 +5017,7 @@
 msgid "Unknown command: %s"
 msgstr "���ョ����篁わ�%s"
 
-#: src/protocols/irc/cmds.c:137
+#: src/protocols/irc/cmds.c:141
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
@@ -4929,7 +5027,7 @@
 "NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
 "UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 
-#: src/protocols/irc/cmds.c:146
+#: src/protocols/irc/cmds.c:150
 msgid ""
 "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
@@ -4937,18 +5035,19 @@
 "<B>��吡�� IRC ��篁わ�</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
 "PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
 
-#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
+#: src/protocols/irc/cmds.c:473 src/protocols/jabber/chat.c:544
 #, c-format
 msgid "current topic is: %s"
 msgstr "�上����筝脂��削�%s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:476 src/protocols/jabber/chat.c:546
 msgid "No topic is set"
 msgstr "羃���荐㊤�筝脂�"
 
 #: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
-#: src/protocols/yahoo/yahoo_filexfer.c:208
-#: src/protocols/yahoo/yahoo_filexfer.c:217
+#: src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/yahoo/yahoo_filexfer.c:218
+#: src/protocols/yahoo/yahoo_filexfer.c:228
 msgid "File Transfer Aborted"
 msgstr "罟�罅��活叱綏画←��羔�"
 
@@ -4979,8 +5078,8 @@
 
 #. FIXME: remove this when the ui does it for us.
 #: src/protocols/irc/irc.c:168 src/protocols/jabber/buddy.c:929
-#: src/protocols/oscar/oscar.c:448 src/protocols/oscar/oscar.c:6730
-#: src/protocols/yahoo/yahoo.c:2507
+#: src/protocols/msn/msn.c:502 src/protocols/oscar/oscar.c:448
+#: src/protocols/oscar/oscar.c:6751 src/protocols/yahoo/yahoo.c:2591
 msgid "Send File"
 msgstr "�渇��罟�罅�"
 
@@ -4996,7 +5095,7 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC �援┗筝�������腥榊�遵���"
 
-#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:227
+#: src/protocols/irc/irc.c:226 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "�糸�ワ�%s"
@@ -5005,7 +5104,7 @@
 msgid "Couldn't create socket"
 msgstr "�≧�綮榊� Socket"
 
-#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:295
+#: src/protocols/irc/irc.c:250 src/protocols/jabber/jabber.c:296
 #: src/protocols/oscar/oscar.c:1523 src/protocols/oscar/oscar.c:1587
 msgid "Couldn't connect to host"
 msgstr "�≧��e�遺失����"
@@ -5015,12 +5114,12 @@
 msgid "Read error"
 msgstr "莅������"
 
-#: src/protocols/irc/irc.c:520 src/protocols/silc/chat.c:1345
+#: src/protocols/irc/irc.c:537 src/protocols/silc/chat.c:1345
 #: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "篏睡����"
 
-#: src/protocols/irc/irc.c:523 src/protocols/silc/chat.c:1348
+#: src/protocols/irc/irc.c:540 src/protocols/silc/chat.c:1348
 #: src/protocols/silc/ops.c:1017 src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "筝脂�"
@@ -5034,33 +5133,33 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:624
+#: src/protocols/irc/irc.c:641
 msgid "IRC Protocol Plugin"
 msgstr "IRC ��絎�罔∞�"
 
 #. *  summary
-#: src/protocols/irc/irc.c:625
+#: src/protocols/irc/irc.c:642
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "莠�絅順�� IRC ��絎�罔∞�"
 
-#: src/protocols/irc/irc.c:644 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:640
+#: src/protocols/irc/irc.c:661 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1555 src/protocols/napster/napster.c:640
 #: src/protocols/silc/ops.c:935
 msgid "Server"
 msgstr "篌堺����"
 
-#: src/protocols/irc/irc.c:647 src/protocols/jabber/jabber.c:1403
-#: src/protocols/msn/msn.c:1730 src/protocols/napster/napster.c:645
+#: src/protocols/irc/irc.c:664 src/protocols/jabber/jabber.c:1576
+#: src/protocols/msn/msn.c:1537 src/protocols/napster/napster.c:645
 #: src/protocols/silc/silc.c:1055 src/protocols/trepia/trepia.c:1304
 msgid "Port"
 msgstr "��荐���"
 
-#: src/protocols/irc/irc.c:650 src/protocols/zephyr/zephyr.c:1383
+#: src/protocols/irc/irc.c:667 src/protocols/zephyr/zephyr.c:1383
 msgid "Encoding"
 msgstr "膩�⊆"
 
-#: src/protocols/irc/irc.c:653 src/protocols/irc/msgs.c:191
-#: src/protocols/jabber/jabber.c:586 src/protocols/silc/buddy.c:1468
+#: src/protocols/irc/irc.c:670 src/protocols/irc/msgs.c:191
+#: src/protocols/jabber/jabber.c:587 src/protocols/silc/buddy.c:1477
 #: src/protocols/silc/ops.c:931
 msgid "Username"
 msgstr "篏睡����"
@@ -5090,7 +5189,7 @@
 msgstr " <i>(綏臥�茘�)</i>"
 
 #: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:929
-#: src/protocols/yahoo/yahoo.c:3058
+#: src/protocols/yahoo/yahoo_profile.c:804
 msgid "Realname"
 msgstr "紮���"
 
@@ -5141,109 +5240,113 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim �渇��篋�筝��� IRC 篌堺��������順��荐�����"
 
-#: src/protocols/irc/msgs.c:404
+#: src/protocols/irc/msgs.c:405
 msgid "No such channel"
 msgstr "羃����e���脂��"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:415
+#: src/protocols/irc/msgs.c:416
 msgid "no such channel"
 msgstr "羃����e���脂��"
 
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:419
 msgid "User is not logged in"
 msgstr "篏睡����羃����糸��"
 
-#: src/protocols/irc/msgs.c:423
+#: src/protocols/irc/msgs.c:424
 msgid "No such nick or channel"
 msgstr "羃����e���援┗���脂��"
 
-#: src/protocols/irc/msgs.c:443
+#: src/protocols/irc/msgs.c:444
 msgid "Could not send"
 msgstr "�≧�����"
 
-#: src/protocols/irc/msgs.c:499
+#: src/protocols/irc/msgs.c:500
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "����茴���茫����������� %s��"
 
-#: src/protocols/irc/msgs.c:500
+#: src/protocols/irc/msgs.c:501
 msgid "Invitation only"
 msgstr "����茴���茫���"
 
-#: src/protocols/irc/msgs.c:596
+#: src/protocols/irc/msgs.c:597
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "��← %s 荼√�削�(%s)"
 
-#: src/protocols/irc/msgs.c:601
+#: src/protocols/irc/msgs.c:602
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "茴� %s 荼√�� (%s)"
 
-#: src/protocols/irc/msgs.c:622
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "罔≦� (%s %s) 茴� %s 荐㊤�"
 
-#: src/protocols/irc/msgs.c:701
+#: src/protocols/irc/msgs.c:702
 msgid "Could not change nick"
 msgstr "�≧��贋�号�援┗"
 
-#: src/protocols/irc/msgs.c:702
+#: src/protocols/irc/msgs.c:703
 msgid "Cannot change nick"
 msgstr "�≧��贋�号�援┗"
 
-#: src/protocols/irc/msgs.c:723
+#: src/protocols/irc/msgs.c:724
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "���∫��篋��脂��%s%s"
 
-#: src/protocols/irc/msgs.c:763
+#: src/protocols/irc/msgs.c:764
 msgid "Error: invalid PONG from server"
 msgstr "���鐚�箴���失������ PONG �≧��"
 
-#: src/protocols/irc/msgs.c:765
+#: src/protocols/irc/msgs.c:766
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING ��膈�����綮狗�駕�%lu腱�"
 
-#: src/protocols/irc/msgs.c:840
+#: src/protocols/irc/msgs.c:841
 #, c-format
 msgid "Cannot join %s:"
 msgstr "�≧����� %s鐚�"
 
-#: src/protocols/irc/msgs.c:841 src/protocols/silc/ops.c:878
+#: src/protocols/irc/msgs.c:842 src/protocols/silc/ops.c:878
 msgid "Cannot join channel"
 msgstr "�≧����ラ�脂��"
 
-#: src/protocols/irc/msgs.c:871
+#: src/protocols/irc/msgs.c:872
 #, c-format
 msgid "Wallops from %s"
 msgstr "箴��� %s �� Wallops"
 
-#: src/protocols/irc/parse.c:166 src/protocols/zephyr/zephyr.c:199
+#: src/protocols/irc/parse.c:189
+msgid "No help is available at this time for this command."
+msgstr "���������咲������篁ゆ�箴�茯�����"
+
+#: src/protocols/irc/parse.c:228 src/protocols/zephyr/zephyr.c:199
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "鐚��咲����荐������膩�⊆���主��篋������茫�罟∽�ュ験��羝���賢����膩�⊆���檎��鐚�"
 
-#: src/protocols/irc/parse.c:320
+#: src/protocols/irc/parse.c:382
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s ��膈�����鐚�%lu 腱�"
 
-#: src/protocols/irc/parse.c:321
+#: src/protocols/irc/parse.c:383
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:321
+#: src/protocols/irc/parse.c:383
 msgid "CTCP PING reply"
 msgstr "CTCP PING ��膈�"
 
-#: src/protocols/irc/parse.c:423 src/protocols/oscar/oscar.c:1424
-#: src/protocols/toc/toc.c:217 src/protocols/toc/toc.c:624
-#: src/protocols/toc/toc.c:640 src/protocols/toc/toc.c:708
+#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1424
+#: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
+#: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:686
 msgid "Disconnected."
 msgstr "��罩∫�g���"
 
@@ -5290,13 +5393,13 @@
 msgstr "��"
 
 #: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:636
-#: src/protocols/jabber/jabber.c:606 src/protocols/silc/buddy.c:1465
+#: src/protocols/jabber/jabber.c:607 src/protocols/silc/buddy.c:1474
 #: src/protocols/silc/ops.c:786 src/protocols/silc/ops.c:927
-#: src/protocols/yahoo/yahoo.c:3054
+#: src/protocols/yahoo/yahoo_profile.c:800
 msgid "Nickname"
 msgstr "�援┗"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:646
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:647
 msgid "URL"
 msgstr "URL"
 
@@ -5317,7 +5420,7 @@
 msgstr "��鐚鎴�"
 
 #: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:676
-#: src/protocols/jabber/jabber.c:636
+#: src/protocols/jabber/jabber.c:637
 msgid "Postal Code"
 msgstr "�級������"
 
@@ -5334,8 +5437,8 @@
 msgstr "�肢�"
 
 #: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:710
-#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1520
-#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/jabber/buddy.c:718 src/protocols/silc/buddy.c:1529
+#: src/protocols/silc/silc.c:633 src/protocols/yahoo/yahoo_profile.c:796
 msgid "Email"
 msgstr "�糸��灸散"
 
@@ -5356,7 +5459,7 @@
 msgstr "�決岡"
 
 #: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:639
-#: src/protocols/oscar/oscar.c:4839
+#: src/protocols/oscar/oscar.c:4860
 msgid "Birthday"
 msgstr "����"
 
@@ -5375,11 +5478,11 @@
 msgstr "Jabber 絽活��"
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:935
-#: src/protocols/msn/msn.c:366 src/protocols/novell/novell.c:2742
+#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:937
+#: src/protocols/msn/msn.c:421 src/protocols/novell/novell.c:2742
 #: src/protocols/novell/novell.c:2746 src/protocols/oscar/oscar.c:574
 #: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:582
-#: src/protocols/yahoo/yahoo.c:2426
+#: src/protocols/yahoo/yahoo.c:2510
 msgid "Status"
 msgstr "����"
 
@@ -5388,7 +5491,7 @@
 # NOTE Jabber ��絎�����Resource��筝�荅���絽娯���筝�腮�戎���������絖�筝駕�
 # NOTE ��札茵�ず������井�劫�����糸�ヤ�����綵≫�鐚�������絲����臀�
 # NOTE 荀� http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1385
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1558
 msgid "Resource"
 msgstr ""
 
@@ -5398,8 +5501,8 @@
 msgid "Middle Name"
 msgstr "�掩���ュ��"
 
-#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4857 src/protocols/oscar/oscar.c:4865
+#: src/protocols/jabber/buddy.c:644 src/protocols/jabber/jabber.c:622
+#: src/protocols/oscar/oscar.c:4878 src/protocols/oscar/oscar.c:4886
 #: src/protocols/silc/ops.c:814
 msgid "Address"
 msgstr "�医��"
@@ -5459,207 +5562,210 @@
 msgid "_Handle:"
 msgstr "�援┗(_H)鐚�"
 
-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:176
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 筝��������������紊����腮�"
 
-#: src/protocols/jabber/chat.c:165
+#: src/protocols/jabber/chat.c:177
 msgid "Invalid Room Name"
 msgstr "��紊����腮援�≧��"
 
-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:182
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 筝������������篌堺������腮�"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:183 src/protocols/jabber/chat.c:184
 msgid "Invalid Server Name"
 msgstr "篌堺������腮援�≧��"
 
 # NOTE Arto Alakulju �主憗��room handle���恰����紊���т戎�����������援┗��綏�
-#: src/protocols/jabber/chat.c:176
+#: src/protocols/jabber/chat.c:188
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 筝�������������援┗"
 
 # NOTE Arto Alakulju �主憗��room handle���恰����紊���т戎�����������援┗��綏�
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:189 src/protocols/jabber/chat.c:190
 msgid "Invalid Room Handle"
 msgstr "�援┗�≧��"
 
-#: src/protocols/jabber/chat.c:332
+#: src/protocols/jabber/chat.c:349
 msgid "Configuration error"
 msgstr "荐㊤����"
 
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
 msgid "Unable to configure"
 msgstr "�≧�荐㊤�"
 
-#: src/protocols/jabber/chat.c:357
+#: src/protocols/jabber/chat.c:374
 msgid "Room Configuration Error"
 msgstr "��紊��荐㊤����"
 
 # XXX ��⑮鐚�茘������馹�鐚�荀��劫��
-#: src/protocols/jabber/chat.c:358
+#: src/protocols/jabber/chat.c:375
 msgid "This room is not capable of being configured"
 msgstr "������紊��筝���吧┃絎�"
 
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
 msgid "Registration error"
 msgstr "荐糸�����"
 
 # XXX ��⑮
 # NOTE �� faceprint (罔∞�篏���) 腮縁�MUC ���腮��亥����紊����絎�鐚�
 # NOTE 莠���綣����Group Chat�����吓�����
-#: src/protocols/jabber/chat.c:556
+#: src/protocols/jabber/chat.c:573
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "���� MUC 罔≦�����紊���т���吂信�号�援┗"
 
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
 msgid "Roomlist Error"
 msgstr "��紊��羝������"
 
-#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
 msgid "Error retreiving roomlist"
 msgstr "莅�����紊��羝������主�����"
 
-#: src/protocols/jabber/chat.c:652
+#: src/protocols/jabber/chat.c:669
 msgid "Invalid Server"
 msgstr "�≧����篌堺������"
 
 # NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
 # XXX
-#: src/protocols/jabber/chat.c:689
+#: src/protocols/jabber/chat.c:706
 msgid "Enter a Conference Server"
 msgstr "�糸�ユ��茘遺失����"
 
-#: src/protocols/jabber/chat.c:690
+#: src/protocols/jabber/chat.c:707
 msgid "Select a conference server to query"
 msgstr "�御���ヨ�����茘遺失����"
 
-#: src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/chat.c:710
 msgid "Find Rooms"
 msgstr "絨��乗��紊��"
 
 # XXX 茘�����緇��拷��
-#: src/protocols/jabber/jabber.c:74
+#: src/protocols/jabber/jabber.c:75
 msgid "Error initializing session"
 msgstr "絨�綏ヤ�����画���紮������主��篋����"
 
-#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
+#: src/protocols/jabber/jabber.c:205 src/protocols/msn/httpmethod.c:266
 #: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
 #: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
 #: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "絲��ラ���"
 
-#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+#: src/protocols/jabber/jabber.c:243 src/protocols/jabber/jabber.c:263
 msgid "Read Error"
 msgstr "莅������"
 
 # NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX ��罩g����������≧��g��活�茘���������腴��羣���鐚�筝������g�紊掩����鐚�荀�筝�����腴�鐚�
-#: src/protocols/jabber/jabber.c:322
+#: src/protocols/jabber/jabber.c:323
 msgid "Connection Failed"
 msgstr "�≧��g��活�茘���������腴��羣�"
 
-#: src/protocols/jabber/jabber.c:325
+#: src/protocols/jabber/jabber.c:326
 msgid "SSL Handshake Failed"
 msgstr "SSL 篋よ�紊掩��"
 
-#: src/protocols/jabber/jabber.c:368 src/protocols/jabber/jabber.c:697
+#: src/protocols/jabber/jabber.c:369 src/protocols/jabber/jabber.c:698
 msgid "Invalid Jabber ID"
 msgstr "Jabber 絽活���≧��"
 
 # XXX ��⑮
-#: src/protocols/jabber/jabber.c:396 src/protocols/jabber/jabber.c:724
+#: src/protocols/jabber/jabber.c:397 src/protocols/jabber/jabber.c:725
 msgid "SSL support unavailable"
 msgstr "羃��� SSL ���"
 
-#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:734
+#: src/protocols/jabber/jabber.c:407 src/protocols/jabber/jabber.c:735
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "���綮榊� Socket"
 
-#: src/protocols/jabber/jabber.c:431
+#: src/protocols/jabber/jabber.c:432
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "����荐糸�� %s@%s"
 
-#: src/protocols/jabber/jabber.c:433 src/protocols/jabber/jabber.c:434
+#: src/protocols/jabber/jabber.c:434 src/protocols/jabber/jabber.c:435
 msgid "Registration Successful"
 msgstr "荐糸������"
 
-#: src/protocols/jabber/jabber.c:440 src/protocols/jabber/jabber.c:1178
+#: src/protocols/jabber/jabber.c:441 src/protocols/jabber/jabber.c:1180
 msgid "Unknown Error"
 msgstr "���ラ���"
 
-#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:443
+#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
 msgid "Registration Failed"
 msgstr "荐糸��紊掩��"
 
-#: src/protocols/jabber/jabber.c:554 src/protocols/jabber/jabber.c:555
+#: src/protocols/jabber/jabber.c:555 src/protocols/jabber/jabber.c:556
 msgid "Already Registered"
 msgstr "綏牙�荐糸��"
 
-#: src/protocols/jabber/jabber.c:590 src/protocols/jabber/jabber.c:1033
+#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:1035
 msgid "Password"
 msgstr "絲�腆�"
 
-#: src/protocols/jabber/jabber.c:601
+#: src/protocols/jabber/jabber.c:602
 msgid "E-Mail"
 msgstr "�糸��灸散"
 
 #. State
-#: src/protocols/jabber/jabber.c:631 src/protocols/oscar/oscar.c:4859
-#: src/protocols/oscar/oscar.c:4867 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:632 src/protocols/oscar/oscar.c:4880
+#: src/protocols/oscar/oscar.c:4888 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "��鐚鎴�"
 
-#: src/protocols/jabber/jabber.c:641 src/protocols/silc/buddy.c:1522
+#: src/protocols/jabber/jabber.c:642 src/protocols/silc/buddy.c:1531
 #: src/protocols/silc/ops.c:819 src/protocols/silc/silc.c:635
 msgid "Phone"
 msgstr "�肢�"
 
-#: src/protocols/jabber/jabber.c:651
+#: src/protocols/jabber/jabber.c:652
 msgid "Date"
 msgstr "�ユ��"
 
-#: src/protocols/jabber/jabber.c:659
+#: src/protocols/jabber/jabber.c:660
 msgid "Please fill out the information below to register your new account."
 msgstr "�堺�����医験�区┿��鐚�茫�紂��筝���莖���鐚�"
 
-#: src/protocols/jabber/jabber.c:662 src/protocols/jabber/jabber.c:663
+#: src/protocols/jabber/jabber.c:663 src/protocols/jabber/jabber.c:664
 msgid "Register New Jabber Account"
 msgstr "荐糸���亥�� Jabber 絽恰��"
 
+#: src/protocols/jabber/jabber.c:743
+msgid "Logged out"
+msgstr "綏牙�糸�冴��"
+
 #. connect to the server
-#: src/protocols/jabber/jabber.c:780 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:514 src/protocols/napster/napster.c:498
-#: src/protocols/novell/novell.c:2105 src/protocols/oscar/oscar.c:1591
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2179
-#: src/protocols/zephyr/zephyr.c:865
+#: src/protocols/jabber/jabber.c:782 src/protocols/msn/msn.c:578
+#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2105
+#: src/protocols/oscar/oscar.c:1591 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2251 src/protocols/zephyr/zephyr.c:865
 msgid "Connecting"
 msgstr "�g�筝�"
 
-#: src/protocols/jabber/jabber.c:784
+#: src/protocols/jabber/jabber.c:786
 msgid "Initializing Stream"
 msgstr "筝我���紮�筝�"
 
-#: src/protocols/jabber/jabber.c:790
+#: src/protocols/jabber/jabber.c:792
 msgid "Authenticating"
 msgstr "茯�茘�筝�"
 
-#: src/protocols/jabber/jabber.c:799
+#: src/protocols/jabber/jabber.c:801
 msgid "Re-initializing Stream"
 msgstr "筝我����医��紮�筝�"
 
-#: src/protocols/jabber/jabber.c:879 src/protocols/jabber/jabber.c:1156
-#: src/protocols/jabber/jabber.c:1197 src/protocols/jabber/jabber.c:1230
-#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6430
+#: src/protocols/jabber/jabber.c:881 src/protocols/jabber/jabber.c:1158
+#: src/protocols/jabber/jabber.c:1199 src/protocols/jabber/jabber.c:1232
+#: src/protocols/oscar/oscar.c:580 src/protocols/oscar/oscar.c:6451
 msgid "Not Authorized"
 msgstr "���茘�"
 
@@ -5668,86 +5774,86 @@
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: src/protocols/jabber/jabber.c:910
+#: src/protocols/jabber/jabber.c:912
 msgid "Both"
 msgstr "綏俄��梧�茘�"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:912
+#: src/protocols/jabber/jabber.c:914
 msgid "From (To pending)"
 msgstr "綏画�茘�絨��刻�篏�篁�膈�緇�絨��壕�茘����"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:914
+#: src/protocols/jabber/jabber.c:916
 msgid "From"
 msgstr "綏画�茘�絨���"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:917
+#: src/protocols/jabber/jabber.c:919
 msgid "To"
 msgstr "綏牙�峨��壕�茘�"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:919
+#: src/protocols/jabber/jabber.c:921
 msgid "None (To pending)"
 msgstr "�¥�篏�罩g�緇�絨��壕�茘����"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: src/protocols/jabber/jabber.c:923
+#: src/protocols/jabber/jabber.c:925
 msgid "Subscription"
 msgstr "茯�茘�����"
 
-#: src/protocols/jabber/jabber.c:943
+#: src/protocols/jabber/jabber.c:945
 msgid "Error"
 msgstr "���"
 
-#: src/protocols/jabber/jabber.c:956 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:35
 #: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "�活��紊�"
 
-#: src/protocols/jabber/jabber.c:958 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/jabber.c:960 src/protocols/jabber/jutil.c:38
 #: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "�傑�����∫��"
 
-#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5443
-#: src/protocols/oscar/oscar.c:6622
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:6643
 msgid "Do Not Disturb"
 msgstr "茫��炊����"
 
-#: src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/jabber.c:978
 msgid "Password Changed"
 msgstr "絲�腆寂信�号����"
 
-#: src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:979
 msgid "Your password has been changed."
 msgstr "����篆��剛�����絲�腆若��"
 
-#: src/protocols/jabber/jabber.c:981 src/protocols/jabber/jabber.c:982
+#: src/protocols/jabber/jabber.c:983 src/protocols/jabber/jabber.c:984
 msgid "Error changing password"
 msgstr "篆��劫�腆惹�����榊憥���"
 
-#: src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/jabber.c:1040
 msgid "Password (again)"
 msgstr "��絲�腆種���罨∞∈茯�鐚�"
 
-#: src/protocols/jabber/jabber.c:1043 src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1045 src/protocols/jabber/jabber.c:1046
 msgid "Change Jabber Password"
 msgstr "篆��� Jabber 絲�腆�"
 
-#: src/protocols/jabber/jabber.c:1044
+#: src/protocols/jabber/jabber.c:1046
 msgid "Please enter your new password"
 msgstr "茫�莠後�ユ�����医�腆�"
 
-#: src/protocols/jabber/jabber.c:1054 src/protocols/toc/toc.c:1548
+#: src/protocols/jabber/jabber.c:1056 src/protocols/toc/toc.c:1533
 msgid "Set User Info"
 msgstr "荐㊤�篏睡����莖�荐�"
 
 # NOTE 荀� http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1136
+#: src/protocols/jabber/jabber.c:1138
 msgid "Bad Request"
 msgstr "�渇��膓峨�����主��篋�筝��������"
 
@@ -5755,50 +5861,50 @@
 #  NOTE鐚�紊ф�篆����糸�ョ����篏睡�������絖�筝駕���綏ヤ�����糸�ワ�篁ヨ�雁�≧�絖���
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/jabber/jabber.c:1138
+#: src/protocols/jabber/jabber.c:1140
 msgid "Conflict"
 msgstr "��腮掩��篏���茵�腦�"
 
-#: src/protocols/jabber/jabber.c:1140
+#: src/protocols/jabber/jabber.c:1142
 msgid "Feature Not Implemented"
 msgstr "荅峨���遵����篏�"
 
 #  NOTE Jabber ��� <forbidden/>鐚����閫e幻鐚�茵�ず罨���筝�紊�鐚�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1142
+#: src/protocols/jabber/jabber.c:1144
 msgid "Forbidden"
 msgstr "罨���筝�紊�"
 
 #  NOTE Jabber ��� <gone/>鐚�茵�ず篏睡������篌堺�����丞�筝�膩�鐚�緇�箴��≫�膩�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1144
+#: src/protocols/jabber/jabber.c:1146
 msgid "Gone"
 msgstr "綏臥�∝�"
 
-#: src/protocols/jabber/jabber.c:1146 src/protocols/jabber/jabber.c:1220
+#: src/protocols/jabber/jabber.c:1148 src/protocols/jabber/jabber.c:1222
 msgid "Internal Server Error"
 msgstr "篌堺�����ч�����"
 
-#: src/protocols/jabber/jabber.c:1148
+#: src/protocols/jabber/jabber.c:1150
 msgid "Item Not Found"
 msgstr "�������上��"
 
-#: src/protocols/jabber/jabber.c:1150
+#: src/protocols/jabber/jabber.c:1152
 msgid "Malformed Jabber ID"
 msgstr "�後���� Jabber ID"
 
 #  NOTE Jabber ��� <not-acceptable/>鐚�茵�ず�����榊��荀�羆����初���遺失�������銀散篋堺��荐�筝���
 #  NOTE 罌�篁駈�箴�絋�荐���賢����胼�絖�鐚�鐚�篁ヨ�雁�≧�絖���
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1152
+#: src/protocols/jabber/jabber.c:1154
 msgid "Not Acceptable"
 msgstr "�≧��ュ�"
 
-#: src/protocols/jabber/jabber.c:1154
+#: src/protocols/jabber/jabber.c:1156
 msgid "Not Allowed"
 msgstr "筝�茴���荐�"
 
-#: src/protocols/jabber/jabber.c:1158
+#: src/protocols/jabber/jabber.c:1160
 msgid "Payment Required"
 msgstr "綽���篁�罨�"
 
@@ -5806,78 +5912,78 @@
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE�������≧���機����荅我���筝�絖���������
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/jabber/jabber.c:1160
+#: src/protocols/jabber/jabber.c:1162
 msgid "Recipient Unavailable"
 msgstr "�����≧���機�ユ�区��"
 
-#: src/protocols/jabber/jabber.c:1164
-msgid "Registration Required"
-msgstr "綽���荐糸��"
-
 #: src/protocols/jabber/jabber.c:1166
-msgid "Remote Server Not Found"
-msgstr "��腴�失�������上��"
+msgid "Registration Required"
+msgstr "綽���荐糸��"
 
 #: src/protocols/jabber/jabber.c:1168
+msgid "Remote Server Not Found"
+msgstr "��腴�失�������上��"
+
+#: src/protocols/jabber/jabber.c:1170
 msgid "Remote Server Timeout"
 msgstr "��腴�失�����丈��"
 
-#: src/protocols/jabber/jabber.c:1170
+#: src/protocols/jabber/jabber.c:1172
 msgid "Server Overloaded"
 msgstr "篌堺�����莠�"
 
 #  NOTE Jabber ��� <service-unavailable/>鐚�茵�ず篌堺�����九�遺����靸��������篁�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:1174
 msgid "Service Unavailable"
 msgstr "筝���箴�荅臥������"
 
 #  NOTE Jabber ��� <subscription-required/>鐚�茵�ず篏睡������������
 #  NOTE 綽���篋�����緇���Subscription��鐚�茯�茘�鐚�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1174
+#: src/protocols/jabber/jabber.c:1176
 msgid "Subscription Required"
 msgstr "綽���茯�茘�"
 
-#: src/protocols/jabber/jabber.c:1176
+#: src/protocols/jabber/jabber.c:1178
 msgid "Unexpected Request"
 msgstr "��������荀�羆�"
 
-#: src/protocols/jabber/jabber.c:1183
+#: src/protocols/jabber/jabber.c:1185
 msgid "Authorization Aborted"
 msgstr "茯�茘���羔�"
 
-#: src/protocols/jabber/jabber.c:1185
+#: src/protocols/jabber/jabber.c:1187
 msgid "Incorrect encoding in authorization"
 msgstr "茯�茘��������膩�⊆"
 
-#: src/protocols/jabber/jabber.c:1188
+#: src/protocols/jabber/jabber.c:1190
 msgid "Invalid authzid"
 msgstr "�≧���� authzid"
 
 # XXX 荀�荀��ヨ⑮��
-#: src/protocols/jabber/jabber.c:1191
+#: src/protocols/jabber/jabber.c:1193
 msgid "Invalid Authorization Mechanism"
 msgstr "�≧����茯�茘�罘���"
 
-#: src/protocols/jabber/jabber.c:1194
+#: src/protocols/jabber/jabber.c:1196
 msgid "Authorization mechanism too weak"
 msgstr "茯�茘�罘��九お��綣延�"
 
-#: src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1201
 msgid "Temporary Authentication Failure"
 msgstr "茯�茘�����紊掩��"
 
-#: src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1203
 msgid "Authentication Failure"
 msgstr "茯�茘�紊掩��"
 
-#: src/protocols/jabber/jabber.c:1205
+#: src/protocols/jabber/jabber.c:1207
 msgid "Bad Format"
 msgstr "�≧�����弱�"
 
-#: src/protocols/jabber/jabber.c:1207
+#: src/protocols/jabber/jabber.c:1209
 msgid "Bad Namespace Prefix"
 msgstr "�≧���� Namespace Prefix"
 
@@ -5887,119 +5993,175 @@
 # NOTE 荀� http://www.jabber.org/user/userguide.html
 # NOTE Jabber ��絎�筝� Stanza Error ��筝�腮���� <conflict/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1210
+#: src/protocols/jabber/jabber.c:1212
 msgid "Resource Conflict"
 msgstr "綏牙�篁ユ��絎��� Resource ���銀��井�合�糸��"
 
-#: src/protocols/jabber/jabber.c:1212 src/protocols/silc/ops.c:1225
+#: src/protocols/jabber/jabber.c:1214 src/protocols/silc/ops.c:1225
 msgid "Connection Timeout"
 msgstr "�g�綏臥�丈��"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-gone/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1214
+#: src/protocols/jabber/jabber.c:1216
 msgid "Host Gone"
 msgstr "篌堺����群筝�����吚��腟����篌堺������腮�"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-unknown/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1216
+#: src/protocols/jabber/jabber.c:1218
 msgid "Host Unknown"
 msgstr "筝�����篌堺������腮�"
 
-#: src/protocols/jabber/jabber.c:1218
+#: src/protocols/jabber/jabber.c:1220
 msgid "Improper Addressing"
 msgstr "�����絎���"
 
-#: src/protocols/jabber/jabber.c:1222
+#: src/protocols/jabber/jabber.c:1224
 msgid "Invalid ID"
 msgstr "絽活���≧��"
 
 # FIXME 綽���荀��ヨ⑮��
-#: src/protocols/jabber/jabber.c:1224
+#: src/protocols/jabber/jabber.c:1226
 msgid "Invalid Namespace"
 msgstr "�遵��腥咲���≧��"
 
-#: src/protocols/jabber/jabber.c:1226
+#: src/protocols/jabber/jabber.c:1228
 msgid "Invalid XML"
 msgstr "�≧���� XML"
 
 # XXX ������⑮鐚�茘�����緇��拷��
 # NOTE Jabber ��絎�筝㊦����nonmatching-hosts��
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1228
+#: src/protocols/jabber/jabber.c:1230
 msgid "Non-matching Hosts"
 msgstr "筝紙���腮延��娯�"
 
 # XXX ������⑮鐚�茘�����緇��拷�蚊��筝���ソ�������鋋咲��罔e�鐚�紊ф�羃���紊�ぇ���馹�
 # NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <policy-violation/>
 # NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: src/protocols/jabber/jabber.c:1232
+#: src/protocols/jabber/jabber.c:1234
 msgid "Policy Violation"
 msgstr "����篋������睡�"
 
 # NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1234
+#: src/protocols/jabber/jabber.c:1236
 msgid "Remote Connection Failed"
 msgstr "�≧��g��活�茘���������腴��羣�"
 
 # NOTE Jabber ��絎� Stream Error ��筝�腮���� <resource-constraint/>
 # NOTE ����茖�� Resource 鋇�荅����糸�ユ��篏睡���������� Resource 筝�荅��靸�研筝��後��
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1236
+#: src/protocols/jabber/jabber.c:1238
 msgid "Resource Constraint"
 msgstr "篌堺�����羣��㊦失"
 
 # NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <restricted-xml/>
 # NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: src/protocols/jabber/jabber.c:1238
+#: src/protocols/jabber/jabber.c:1240
 msgid "Restricted XML"
 msgstr "XML 筝㊤����� Jabber ��絎�筝�絎壕┗�� XML ��膣�"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <see-other-host/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1240
+#: src/protocols/jabber/jabber.c:1242
 msgid "See Other Host"
 msgstr "篌堺�������茘�����荀�羆�篋����医����喝Ί�篌堺����"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <system-shutdown/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1242
+#: src/protocols/jabber/jabber.c:1244
 msgid "System Shutdown"
 msgstr "篌堺������������罘�筝�"
 
 # NOTE 荀� http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1244
+#: src/protocols/jabber/jabber.c:1246
 msgid "Undefined Condition"
 msgstr "�渇��膓峨�����主��篋�筝��������"
 
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: src/protocols/jabber/jabber.c:1246
+#: src/protocols/jabber/jabber.c:1248
 msgid "Unsupported Encoding"
 msgstr "篌堺�������吡畿絎���絖���膩�⊆"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-stanza-type/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1248
+#: src/protocols/jabber/jabber.c:1250
 msgid "Unsupported Stanza Type"
 msgstr "篌堺�������吡畿絎���罧笈�初��� (Stanza Type)"
 
 # NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-version/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1250
+#: src/protocols/jabber/jabber.c:1252
 msgid "Unsupported Version"
 msgstr "筝���吡畿絎��� XMPP ����"
 
-#: src/protocols/jabber/jabber.c:1252
+#: src/protocols/jabber/jabber.c:1254
 msgid "XML Not Well Formed"
 msgstr "XML ��篁倶�弱����馹�"
 
-#: src/protocols/jabber/jabber.c:1254
+#: src/protocols/jabber/jabber.c:1256
 msgid "Stream Error"
 msgstr "筝我����"
 
-#: src/protocols/jabber/jabber.c:1279
+#: src/protocols/jabber/jabber.c:1323
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "�≧�胼�罩≫戎���� %s"
+
+#: src/protocols/jabber/jabber.c:1375
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "�≧�荼√�坂戎���� %s"
+
+#: src/protocols/jabber/jabber.c:1400 src/protocols/jabber/jabber.c:1403
+msgid "Configure a chat room"
+msgstr "荐㊤�筝�����紊��"
+
+#: src/protocols/jabber/jabber.c:1406
+msgid "Change your nickname"
+msgstr "篆��号�援┗"
+
+# #: src/buddy_chat.c:936 src/buddy_chat.c:1048 src/buddy_chat.c:1511
+# #: src/buddy_chat.c:1544
+# #, c-format
+# msgid "%d %s in room"
+# msgstr "��紊���� %d 絎銀�"
+#: src/protocols/jabber/jabber.c:1410
+msgid "Leave the room"
+msgstr "�∫����紊����"
+
+#: src/protocols/jabber/jabber.c:1413
+#, fuzzy
+msgid "Register with a chat room"
+msgstr "���ヤ�����紊��"
+
+#: src/protocols/jabber/jabber.c:1418
+msgid "View or change the topic"
+msgstr "罟∵���篆��壕��紊�源蕁�"
+
+#: src/protocols/jabber/jabber.c:1422
+msgid "Ban a user from the room"
+msgstr "胼�罩∽��篏睡�����峨�ヨ��紊��"
+
+#: src/protocols/jabber/jabber.c:1426
+msgid "Invite a user to the room"
+msgstr "��茫���篏睡�����峨�ヨ��紊��"
+
+#: src/protocols/jabber/jabber.c:1430
+msgid "Join a chat on this server"
+msgstr "���ヤ��守����篌堺������筝�����紊��"
+
+#: src/protocols/jabber/jabber.c:1434
+msgid "Kick a user from the room"
+msgstr "�沿��紊��荼弱�堺��篏睡����"
+
+#: src/protocols/jabber/jabber.c:1438
+msgid "Send a private message to another user"
+msgstr "�渇��腱�篋肴���畿�����篏睡����"
+
+#: src/protocols/jabber/jabber.c:1452
 msgid "Hide Operating System"
 msgstr "�沿�鋎�罐㊦鎧腟�"
 
@@ -6013,26 +6175,26 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1360 src/protocols/jabber/jabber.c:1362
+#: src/protocols/jabber/jabber.c:1533 src/protocols/jabber/jabber.c:1535
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber ��絎�罔∞�"
 
 # XXX ��⑮
-#: src/protocols/jabber/jabber.c:1388
+#: src/protocols/jabber/jabber.c:1561
 msgid "Use TLS if available"
 msgstr "TLS ��������"
 
-#: src/protocols/jabber/jabber.c:1393
+#: src/protocols/jabber/jabber.c:1566
 msgid "Force old SSL"
 msgstr "綣決辱篏睡����綣� SSL"
 
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/jabber/jabber.c:1398
+#: src/protocols/jabber/jabber.c:1571
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "��荐延戎������鐚��������絲���筝我�筝��画�茯�茘�"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1407 src/protocols/silc/silc.c:1051
+#: src/protocols/jabber/jabber.c:1580 src/protocols/silc/silc.c:1051
 msgid "Connect server"
 msgstr "�g�篌堺����"
 
@@ -6069,39 +6231,39 @@
 msgid "XML Parse error"
 msgstr "XML �������"
 
-#: src/protocols/jabber/presence.c:221
+#: src/protocols/jabber/presence.c:223
 msgid "Unknown Error in presence"
 msgstr "��∈絎�絅遵����g�������鐚��主��篋����ョ�����"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:226
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "篏睡���� %s �活�絨������ヤ�鐚�絅刻���絅遵�羝���賢��"
 
-#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:279 src/protocols/jabber/presence.c:280
 msgid "Create New Room"
 msgstr "綮榊��域��紊��"
 
-#: src/protocols/jabber/presence.c:279
+#: src/protocols/jabber/presence.c:281
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "��③荀�綮榊�筝����亥����紊��鐚����荐㊤�絎�鐚�����戎����荐㊤�種�"
 
-#: src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:283
 msgid "Configure Room"
 msgstr "荐㊤���紊��"
 
-#: src/protocols/jabber/presence.c:283
+#: src/protocols/jabber/presence.c:285
 msgid "Accept Defaults"
 msgstr "篏睡����荐㊤��"
 
-#: src/protocols/jabber/presence.c:303
+#: src/protocols/jabber/presence.c:307
 #, c-format
 msgid "Error in chat %s"
 msgstr "��紊�� %s �主�����"
 
-#: src/protocols/jabber/presence.c:306
+#: src/protocols/jabber/presence.c:310
 #, c-format
 msgid "Error joining chat %s"
 msgstr "���ヨ��紊�� %s ���主�����"
@@ -6115,319 +6277,280 @@
 msgid "File Send Failed"
 msgstr "�渇��罟�罅�紊掩��"
 
-#: src/protocols/msn/dispatch.c:42
-msgid "Unable to request USR\n"
-msgstr "�≧���緇� USR\n"
-
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:219
-msgid "Unable to login using MD5"
-msgstr "�≧�篏睡�� MD5 �糸��"
-
-#: src/protocols/msn/dispatch.c:68
-msgid "Unable to send USR"
-msgstr "�≧����� USR"
-
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:230
-msgid "Requesting to send password"
-msgstr "���阪�腆寂賢"
-
-#: src/protocols/msn/dispatch.c:104
-msgid "Protocol version not supported"
-msgstr "筝���吨������������荐���絎�"
-
-#: src/protocols/msn/dispatch.c:117
-msgid "Unable to request CVR\n"
-msgstr "�≧���緇� CVR\n"
-
-#: src/protocols/msn/dispatch.c:126
-msgid "Unable to request INF\n"
-msgstr "�≧���緇� INF\n"
-
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
-msgid "Got invalid XFR"
-msgstr "��緇��≧���� XFR"
-
-#: src/protocols/msn/dispatch.c:178
-msgid "Unable to transfer"
-msgstr "�≧��渇��"
-
-#: src/protocols/msn/dispatch.c:192
-msgid "Unable to parse message."
-msgstr "�≧�茹f��荐�����"
-
-#: src/protocols/msn/dispatch.c:232
-msgid "Unable to write to server"
-msgstr "�≧�絲��ュ�遺失����"
-
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1861
-msgid "Syncing with server"
-msgstr "��篌堺������罩ヤ賢"
-
-#: src/protocols/msn/dispatch.c:250
-msgid "Error reading from server"
-msgstr "�延失����������主�����"
-
-#: src/protocols/msn/error.c:33
+#  FIXME ��絅遵�鏅��h⑮鐚�茫���綽���茘�
+#: src/protocols/msn/cmdproc.c:336
+msgid "Miscellaneous error"
+msgstr "��蕁����"
+
+#: src/protocols/msn/cmdproc.c:338
+msgid "You have signed on from another location."
+msgstr "���怨�銀����井�合�糸�ャ��"
+
+#: src/protocols/msn/cmdproc.c:340
+msgid "The MSN servers are going down temporarily."
+msgstr "MSN 篌堺���������������"
+
+#: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "�≧�茹f��荐���"
 
 # NOTE MSN ���荐�������� http://www.hypothetic.org/docs/msn2/reference/error_list.php
-#: src/protocols/msn/error.c:36
+#: src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "茯�羈����鐚����醇�� Gaim �� Bug鐚�"
 
-#: src/protocols/msn/error.c:40
+#: src/protocols/msn/error.c:42
 msgid "Invalid email address"
 msgstr "�≧�����糸��灸散篏���"
 
-#: src/protocols/msn/error.c:43
+#: src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "篏睡����筝�絖���"
 
-#: src/protocols/msn/error.c:47
+#: src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "羃�腟��絎��顔������腮� (FQDN)"
 
-#: src/protocols/msn/error.c:50
+#: src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "綏牙��糸��"
 
-#: src/protocols/msn/error.c:53
+#: src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "篏睡������腮援�≧��"
 
-#: src/protocols/msn/error.c:56
+#: src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "�援┗�≧��"
 
-#: src/protocols/msn/error.c:59
+#: src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "絅遵�羝���群羯�"
 
-#: src/protocols/msn/error.c:62
+#: src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "綏牙�������"
 
-#: src/protocols/msn/error.c:65
+#: src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "筝������賢"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:528
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:528
 msgid "User is offline"
 msgstr "篏睡�������∝���"
 
-#: src/protocols/msn/error.c:71
+#: src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "綏牙�������罔≦�筝�"
 
-#: src/protocols/msn/error.c:74
+#: src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "綏牙����後���羝���賢"
 
-#: src/protocols/msn/error.c:77
+#: src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "紊��臂ょ�"
 
-#: src/protocols/msn/error.c:80
+#: src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "�≧����臂ょ�"
 
-#: src/protocols/msn/error.c:83
+#: src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "篏睡����筝���召腟���"
 
-#: src/protocols/msn/error.c:86
+#: src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "臂ょ���腮演����"
 
-#: src/protocols/msn/error.c:89
+#: src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "�≧�腱脂�ゃ���吟����臂ょ�"
 
-#: src/protocols/msn/error.c:93
+#: src/protocols/msn/error.c:95
 msgid "Tried to add a contact to a group that doesn't exist"
 msgstr "�≧�絨�絅遵����ヤ���筝�絖�����臂ょ�"
 
-#: src/protocols/msn/error.c:97
+#: src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Switchboard 紊掩��"
 
-#: src/protocols/msn/error.c:100
+#: src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "�渇�����ュけ��"
 
-#: src/protocols/msn/error.c:104
+#: src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "�鞘��井����荀���罨�篏�"
 
-#: src/protocols/msn/error.c:107
+#: src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "FND ��腟�����紊���拷��"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:190
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:190
 msgid "Not logged in"
 msgstr "絨����糸��"
 
 #  NOTE�������≧�篏睡������荅我�������筝�絖���������
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/msn/error.c:114
+#: src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "�����≧�篏睡������"
 
-#: src/protocols/msn/error.c:117
+#: src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "莖���綺����"
 
 #  XXX ��⑮
-#: src/protocols/msn/error.c:120
+#: src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "��篁よ←����"
 
-#: src/protocols/msn/error.c:123
+#: src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "罟�罅���篏����"
 
-#: src/protocols/msn/error.c:126
+#: src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "荐��狗��������"
 
-#: src/protocols/msn/error.c:129
+#: src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "����� CHL �弱�渇���遺�篌堺����"
 
-#: src/protocols/msn/error.c:133
+#: src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "篌堺�����腆�"
 
-#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
-#: src/protocols/msn/error.c:204
+#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "篌堺��������筝���箴�����"
 
-#: src/protocols/msn/error.c:139
+#: src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "藥�絨�藥����ヤ失������������"
 
-#: src/protocols/msn/error.c:142
+#: src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "莖���綺��g����"
 
-#: src/protocols/msn/error.c:146
+#: src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "篌堺�������������"
 
-#: src/protocols/msn/error.c:153
+#: src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "�g��������"
 
-#: src/protocols/msn/error.c:157
+#: src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR ���御�����ユ�������荐援��"
 
-#: src/protocols/msn/error.c:160
+#: src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "�≧�絲���"
 
-#: src/protocols/msn/error.c:163
+#: src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "綏ヤ����莇�莠�"
 
-#: src/protocols/msn/error.c:166
+#: src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "篏睡����紊���柑荳�"
 
-#: src/protocols/msn/error.c:169
+#: src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "紊��綏ヤ����"
 
-#: src/protocols/msn/error.c:172
+#: src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "茘欠�у験��絨�������茘�"
 
-#: src/protocols/msn/error.c:175
+#: src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "絅遵�罟�罅��≧��"
 
 # NOTE ���延���膓牙� (www.hypothetic.org) 膃�715�����
-#: src/protocols/msn/error.c:178
+#: src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "羃����������≧������"
 
-#: src/protocols/msn/error.c:183
+#: src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "�援┗��莅��顔���惹�ラ��"
 
-#: src/protocols/msn/error.c:192
+#: src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "篌堺����お綽�腆�"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:2010
-#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:658
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2010
+#: src/protocols/silc/ops.c:1214 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "茯�茘�紊掩��"
 
-#: src/protocols/msn/error.c:199
+#: src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "���∝���筝���荐演������篁�"
 
-#: src/protocols/msn/error.c:207
+#: src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "筝��ュ��亥��篏睡����"
 
-#: src/protocols/msn/error.c:211
+#: src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "���絎狗�桁���鋇�篏睡����腴ヨⅢ��"
 
-#: src/protocols/msn/error.c:215
+#: src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "茘欠�у験��絨�������茘�"
 
-#: src/protocols/msn/error.c:218
+#: src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr ""
 
-#: src/protocols/msn/error.c:222
+#: src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "���ョ�����篁g⊆ %d"
 
-#: src/protocols/msn/error.c:234
+#: src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN ���鐚�%s\n"
 
-#: src/protocols/msn/msn.c:80
+#: src/protocols/msn/msn.c:96
 msgid "Your new MSN friendly name is too long."
 msgstr "������ MSN �援┗紊��激��"
 
-#: src/protocols/msn/msn.c:189
+#: src/protocols/msn/msn.c:204
 msgid "Set your friendly name."
 msgstr "荐㊤������援┗��"
 
 # NOTE MSN���援┗筝���Yahoo鐚�篏睡������札莠後�ヤ算篏����井�援┗鐚�
 # NOTE �割戎��篏睡������絽活��罸��♂��篆�鐚�篌寂�箙���������
 # XXX ����箴��������菴医��篋�絲�����篏睡�����弱�榊��茫�羆�鐚�馹�
-#: src/protocols/msn/msn.c:190
+#: src/protocols/msn/msn.c:205
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�ヤ査�� MSN �ラ�掩������篋肴�����蕁�ず�����援┗��"
 
-#: src/protocols/msn/msn.c:203
+#: src/protocols/msn/msn.c:221
 msgid "Set your home phone number."
 msgstr "荐㊤�����篏鎘狗�肢���腆若��"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:236
 msgid "Set your work phone number."
 msgstr "荐㊤�����莨�����肢���腆若��"
 
-#: src/protocols/msn/msn.c:227
+#: src/protocols/msn/msn.c:251
 msgid "Set your mobile phone number."
 msgstr "荐㊤�����茵����肢���腆若��"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:264
 msgid "Allow MSN Mobile pages?"
 msgstr "��荐� MSN �喝�種�"
 
-#: src/protocols/msn/msn.c:238
+#: src/protocols/msn/msn.c:265
 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?"
@@ -6435,93 +6558,93 @@
 "��������荐怨����ソ��羝���賢��絅遵��渇�� Mobile Page �井����茵����肢�鐚������銀���茵���"
 "茖�臀�����"
 
-#: src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:269
 msgid "Allow"
 msgstr "��荐�"
 
-#: src/protocols/msn/msn.c:243
+#: src/protocols/msn/msn.c:270
 msgid "Disallow"
 msgstr "筝���荐�"
 
-#: src/protocols/msn/msn.c:268
+#: src/protocols/msn/msn.c:295
 msgid "Send a mobile message."
 msgstr "���肴���荐�����"
 
-#: src/protocols/msn/msn.c:270
+#: src/protocols/msn/msn.c:297
 msgid "Page"
 msgstr "�喝��"
 
-#: src/protocols/msn/msn.c:379 src/protocols/msn/msn.c:678
-#: src/protocols/msn/state.c:32
+#: src/protocols/msn/msn.c:434 src/protocols/msn/msn.c:726
+#: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "筝����肢����"
 
-#: src/protocols/msn/msn.c:380 src/protocols/msn/msn.c:680
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2277
-#: src/protocols/yahoo/yahoo.c:2658 src/protocols/yahoo/yahoo.c:2772
+#: src/protocols/msn/msn.c:435 src/protocols/msn/msn.c:728
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2361
+#: src/protocols/yahoo/yahoo.c:2746 src/protocols/yahoo/yahoo.c:2860
 msgid "Be Right Back"
 msgstr "薤����箴�"
 
-#: src/protocols/msn/msn.c:381 src/protocols/msn/msn.c:682
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2726
+#: src/protocols/msn/msn.c:436 src/protocols/msn/msn.c:730
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2726
 #: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2895
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2279
-#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2773
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2363
+#: src/protocols/yahoo/yahoo.c:2748 src/protocols/yahoo/yahoo.c:2861
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: src/protocols/msn/msn.c:382 src/protocols/msn/msn.c:684
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2287
-#: src/protocols/yahoo/yahoo.c:2668 src/protocols/yahoo/yahoo.c:2777
+#: src/protocols/msn/msn.c:437 src/protocols/msn/msn.c:732
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2371
+#: src/protocols/yahoo/yahoo.c:2756 src/protocols/yahoo/yahoo.c:2865
 msgid "On The Phone"
 msgstr "�肢�筝�"
 
-#: src/protocols/msn/msn.c:383 src/protocols/msn/msn.c:686
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2291
-#: src/protocols/yahoo/yahoo.c:2672 src/protocols/yahoo/yahoo.c:2779
+#: src/protocols/msn/msn.c:438 src/protocols/msn/msn.c:734
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2375
+#: src/protocols/yahoo/yahoo.c:2760 src/protocols/yahoo/yahoo.c:2867
 msgid "Out To Lunch"
 msgstr "紊��榊���"
 
-#: src/protocols/msn/msn.c:384 src/protocols/msn/msn.c:688
+#: src/protocols/msn/msn.c:439 src/protocols/msn/msn.c:736
 #: src/protocols/zephyr/zephyr.c:1164 src/protocols/zephyr/zephyr.c:1179
 msgid "Hidden"
 msgstr "�沿��"
 
-#: src/protocols/msn/msn.c:395
+#: src/protocols/msn/msn.c:450
 msgid "Set Friendly Name"
 msgstr "荐㊤��援┗"
 
-#: src/protocols/msn/msn.c:400
+#: src/protocols/msn/msn.c:455
 msgid "Set Home Phone Number"
 msgstr "荐㊤�篏鎘狗�肢���腆�"
 
-#: src/protocols/msn/msn.c:404
+#: src/protocols/msn/msn.c:459
 msgid "Set Work Phone Number"
 msgstr "荐㊤�綏ヤ��肢���腆�"
 
-#: src/protocols/msn/msn.c:408
+#: src/protocols/msn/msn.c:463
 msgid "Set Mobile Phone Number"
 msgstr "荐㊤�茵����肢���腆�"
 
-#: src/protocols/msn/msn.c:414
+#: src/protocols/msn/msn.c:469
 msgid "Enable/Disable Mobile Devices"
 msgstr "���� / ����茵���茖�臀�"
 
-#: src/protocols/msn/msn.c:419
+#: src/protocols/msn/msn.c:474
 msgid "Allow/Disallow Mobile Pages"
 msgstr "��荐� / 筝���荐� Mobile Page"
 
-#: src/protocols/msn/msn.c:439
+#: src/protocols/msn/msn.c:497
 msgid "Send to Mobile"
 msgstr "�渇���活����肢�"
 
-#: src/protocols/msn/msn.c:447
+#: src/protocols/msn/msn.c:511
 msgid "Initiate Chat"
 msgstr "������紊��"
 
 # XXX ��⑮
-#: src/protocols/msn/msn.c:482
+#: src/protocols/msn/msn.c:547
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6529,106 +6652,83 @@
 "MSN ��荀� SSL 腮�綣鎺�����呃�茫�絎�茖�筝�������吡�� SSL 腮�綣鎺���荅恰��茫��� http://"
 "gaim.sf.net/faq-ssl.php��"
 
-#: src/protocols/msn/msn.c:805
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-"MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com����"
-"��絨�筝���莅��贋������荐掩�����"
-
-#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:846
-msgid "Invalid MSN screen name"
-msgstr "�≧���� MSN 篏睡����絽活��"
-
-# MSN6.0筝㊥����絨���Block��筝�荅���茘����冴��絨�����
-#: src/protocols/msn/msn.c:842
-#, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your block list."
-msgstr ""
-"MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com����"
-"��絨�筝���莅��贋����絨���羝�����"
-
-#: src/protocols/msn/msn.c:1308 src/protocols/yahoo/yahoo.c:2956
+#: src/protocols/msn/msn.c:1111 src/protocols/yahoo/yahoo_profile.c:644
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>莅�����篋肴�荐����主�����</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1378 src/protocols/oscar/oscar.c:4844
+#: src/protocols/msn/msn.c:1181 src/protocols/oscar/oscar.c:4865
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo.c:3066
+#: src/protocols/yahoo/yahoo_profile.c:812
 msgid "Age"
 msgstr "綛顔宗"
 
 #. Gender
-#: src/protocols/msn/msn.c:1385 src/protocols/oscar/oscar.c:4830
+#: src/protocols/msn/msn.c:1188 src/protocols/oscar/oscar.c:4851
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo.c:3074
+#: src/protocols/yahoo/yahoo_profile.c:820
 msgid "Gender"
 msgstr "�у��"
 
-#: src/protocols/msn/msn.c:1393 src/protocols/yahoo/yahoo.c:3070
+#: src/protocols/msn/msn.c:1197 src/protocols/yahoo/yahoo_profile.c:816
 msgid "Marital Status"
 msgstr "紿�紮紫��羈�"
 
-#: src/protocols/msn/msn.c:1400 src/protocols/yahoo/yahoo.c:3062
+#: src/protocols/msn/msn.c:1204 src/protocols/yahoo/yahoo_profile.c:808
 msgid "Location"
 msgstr "�����臀�"
 
-#: src/protocols/msn/msn.c:1408 src/protocols/yahoo/yahoo.c:3078
+#: src/protocols/msn/msn.c:1212 src/protocols/yahoo/yahoo_profile.c:824
 msgid "Occupation"
 msgstr "�傑キ"
 
-#: src/protocols/msn/msn.c:1425 src/protocols/msn/msn.c:1431
-#: src/protocols/msn/msn.c:1438 src/protocols/msn/msn.c:1445
-#: src/protocols/msn/msn.c:1452
+#: src/protocols/msn/msn.c:1229 src/protocols/msn/msn.c:1235
+#: src/protocols/msn/msn.c:1242 src/protocols/msn/msn.c:1249
+#: src/protocols/msn/msn.c:1256
 msgid "A Little About Me"
 msgstr "����膂>�"
 
-#: src/protocols/msn/msn.c:1461 src/protocols/msn/msn.c:1474
-#: src/protocols/msn/msn.c:1481
+#: src/protocols/msn/msn.c:1265 src/protocols/msn/msn.c:1278
+#: src/protocols/msn/msn.c:1285
 msgid "Favorite Things"
 msgstr "����篋���"
 
-#: src/protocols/msn/msn.c:1490 src/protocols/msn/msn.c:1496
-#: src/protocols/msn/msn.c:1503
+#: src/protocols/msn/msn.c:1294 src/protocols/msn/msn.c:1300
+#: src/protocols/msn/msn.c:1307
 msgid "Hobbies and Interests"
 msgstr "��絅�/��莇�"
 
 # NOTE �ユ��po罟���MSN��昆��茘���綺у勌����
-#: src/protocols/msn/msn.c:1512 src/protocols/msn/msn.c:1518
-#: src/protocols/yahoo/yahoo.c:3113
+#: src/protocols/msn/msn.c:1316 src/protocols/msn/msn.c:1322
+#: src/protocols/yahoo/yahoo_profile.c:859
 msgid "Favorite Quote"
 msgstr "綺у勌��"
 
-#: src/protocols/msn/msn.c:1526 src/protocols/yahoo/yahoo.c:3149
+#: src/protocols/msn/msn.c:1330 src/protocols/yahoo/yahoo_profile.c:902
 msgid "Last Updated"
 msgstr "�贋�井�ユ��"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1537 src/protocols/silc/ops.c:810
+#: src/protocols/msn/msn.c:1341 src/protocols/silc/ops.c:810
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "膓臥��"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/protocols/msn/msn.c:1559 src/protocols/yahoo/yahoo.c:3164
+#: src/protocols/msn/msn.c:1363 src/protocols/yahoo/yahoo_profile.c:923
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "�≧���緇�篏睡���� %s ����篋肴�荐�"
 
-#: src/protocols/msn/msn.c:1561 src/protocols/yahoo/yahoo.c:3166
+#: src/protocols/msn/msn.c:1366 src/protocols/yahoo/yahoo_profile.c:925
 msgid "The user's profile is empty."
 msgstr "����篏睡������莖�荐�����順����"
 
-#: src/protocols/msn/msn.c:1618
+#: src/protocols/msn/msn.c:1425
 msgid "Display conversation closed notices"
 msgstr "蕁�ず��篋よ�荀�腦�綏臥������������"
 
-#: src/protocols/msn/msn.c:1623
+#: src/protocols/msn/msn.c:1430
 msgid "Display timeout notices"
 msgstr "蕁�ず��篋よ�綏臥�丈����������"
 
@@ -6642,79 +6742,42 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1704 src/protocols/msn/msn.c:1706
+#: src/protocols/msn/msn.c:1511 src/protocols/msn/msn.c:1513
 msgid "MSN Protocol Plugin"
 msgstr "MSN ��絎�罔∞�"
 
-#: src/protocols/msn/msn.c:1725 src/protocols/trepia/trepia.c:1299
+#: src/protocols/msn/msn.c:1532 src/protocols/trepia/trepia.c:1299
 msgid "Login server"
 msgstr "�糸�ヤ失����"
 
-#: src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1541
 msgid "Use HTTP Method"
 msgstr "篏睡�� HTTP �劫�"
 
-#: src/protocols/msn/nexus.c:56
+#: src/protocols/msn/nexus.c:79
 msgid "Unable to connect to server"
 msgstr "�≧��g��遺失����"
 
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
-msgid "Unable to write to MSN Nexus server."
-msgstr "�≧�絲��ュ�� MSN �� Nexus 篌堺������"
-
-#: src/protocols/msn/nexus.c:147
-msgid "MSN Nexus server returned invalid redirect information."
-msgstr "MSN Nexus 篌堺�����喝���≧�������医���莖�荐���"
-
-#: src/protocols/msn/nexus.c:204
+#: src/protocols/msn/nexus.c:215
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "��荅���� MSN ���糸�ヤ失�����画�茯�茘�����鐚��主��篋�筝����������"
 
-#: src/protocols/msn/notification.c:267 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:84
+msgid "Requesting to send password"
+msgstr "���阪�腆寂賢"
+
+#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "莅���絅遵�羝���賢"
 
-#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:323
+#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
 #: src/protocols/oscar/oscar.c:2299
 msgid "Password sent"
 msgstr "絲�腆守����"
 
-#: src/protocols/msn/notification.c:355
-msgid "Protocol not supported"
-msgstr "筝���吨������荐���絎�"
-
-#: src/protocols/msn/notification.c:386
-msgid "You have been disconnected. You have signed on from another location."
-msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ャ��"
-
-#: src/protocols/msn/notification.c:392
-msgid "You have been disconnected. The MSN servers are going down temporarily."
-msgstr "��群筝㊥�潔�g�鐚�MSN 篌堺���������������"
-
-#: src/protocols/msn/notification.c:527
-#, 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:911 src/protocols/msn/notification.c:1078
-#, c-format
-msgid "The user %s (%s) wants to add you to their buddy list."
-msgstr "篏睡���� %s鐚�%s鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���"
-
-#: src/protocols/msn/notification.c:1351
-#, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
-msgstr "�����≧���緇� %s ��絅遵�羝����茫������緇���荅���"
-
-#: src/protocols/msn/notification.c:1612
-msgid "Unable to transfer to notification server"
-msgstr "�≧��渇���渇���ヤ失����"
-
 # NOTE "in %d minutes" ��寚���� %d ����箙��с�������
 # NOTE 顑����翫�� by Ambrose
-#: src/protocols/msn/notification.c:1799
+#: src/protocols/msn/notification.c:1067
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -6741,44 +6804,57 @@
 "\n"
 "�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
 
-#: src/protocols/msn/servconn.c:210
+#: src/protocols/msn/notification.c:1132
+msgid "Syncing with server"
+msgstr "��篌堺������罩ヤ賢"
+
+#: src/protocols/msn/servconn.c:46
 #, c-format
 msgid "Unable to connect to %s server"
 msgstr "�≧��g��� %s 篌堺����"
 
-#: src/protocols/msn/servconn.c:214
+#: src/protocols/msn/servconn.c:50
 #, c-format
 msgid "Error writing to %s server"
 msgstr "�� %s 篌堺����������主�����"
 
-#: src/protocols/msn/servconn.c:218
-#, c-format
-msgid ""
-"Error reading from %s server. Lastcommand was:\n"
-" %s"
-msgstr "�� %s 篌堺����������主�����鐚���緇�筝�����篁ょ�� %s"
-
-#: src/protocols/msn/servconn.c:222
+#: src/protocols/msn/servconn.c:54
+#, c-format
+msgid "Error reading from %s server"
+msgstr "�� %s 篌堺����������主�����"
+
+#: src/protocols/msn/servconn.c:58
 #, c-format
 msgid "Unknown error from %s server"
 msgstr "%s 篌堺�����割�篋�筝���筝��������"
 
-#: src/protocols/msn/servconn.c:315
+#: src/protocols/msn/servconn.c:72
+#, c-format
+msgid "MSN error for account %s"
+msgstr "莖��� %s 箙� MSN ���"
+
+#: src/protocols/msn/servconn.c:346
 msgid "Received HTTP error. Please report this."
 msgstr "�九�遺��� HTTP ���鐚�茫������取���怨����"
 
-#: src/protocols/msn/switchboard.c:121
+#: src/protocols/msn/switchboard.c:201
 msgid "The conversation has become inactive and timed out."
 msgstr "������篋よ���臀�お箙�鐚�筝��綏牙��丈����"
 
-#: src/protocols/msn/switchboard.c:130
+#: src/protocols/msn/switchboard.c:209
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s ����篋�篋よ�荀�腦���"
 
-#: src/protocols/msn/switchboard.c:264
-msgid "An MSN message may not have been received."
-msgstr "���� MSN 荐�����醇�茴��九�違��"
+#: src/protocols/msn/userlist.c:86
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "篏睡���� %s鐚�%s鐚��活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝�����"
+
+#: src/protocols/msn/userlist.c:94
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr "篏睡���� %s �活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝�����"
 
 #: src/protocols/napster/napster.c:229
 msgid "Unable to read header from server"
@@ -6822,8 +6898,8 @@
 msgid "%s requested a PING"
 msgstr "%s 荀�羆�筝��� PING"
 
-#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6130
-#: src/protocols/toc/toc.c:1274
+#: src/protocols/napster/napster.c:540 src/protocols/oscar/oscar.c:6151
+#: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "臂ょ�(_G)鐚�"
 
@@ -7164,7 +7240,7 @@
 msgstr "������茘医群膓��������≧�膵主����坂算篏�荐�����"
 
 #: src/protocols/novell/novell.c:2732 src/protocols/oscar/oscar.c:582
-#: src/protocols/oscar/oscar.c:6432 src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/oscar/oscar.c:6453 src/protocols/yahoo/yahoo.c:2383
 msgid "Offline"
 msgstr "�∝�"
 
@@ -7313,12 +7389,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM 綣�勄��荐���"
 
-#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1518
+#: src/protocols/oscar/oscar.c:442 src/protocols/silc/buddy.c:1527
 #: src/protocols/silc/silc.c:631
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6736
+#: src/protocols/oscar/oscar.c:445 src/protocols/oscar/oscar.c:6757
 msgid "Get File"
 msgstr "�ユ�倶�罅�"
 
@@ -7401,18 +7477,18 @@
 msgid "Camera"
 msgstr "�х�御�"
 
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5452
-#: src/protocols/oscar/oscar.c:6625
+#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:5473
+#: src/protocols/oscar/oscar.c:6646
 msgid "Free For Chat"
 msgstr "����腥肴��紊�"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5446
-#: src/protocols/oscar/oscar.c:6623
+#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5467
+#: src/protocols/oscar/oscar.c:6644
 msgid "Not Available"
 msgstr "�傑�����∫��"
 
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5449
-#: src/protocols/oscar/oscar.c:6624
+#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:6645
 msgid "Occupied"
 msgstr "綽�腆�"
 
@@ -7473,11 +7549,11 @@
 "Do you wish to continue?"
 msgstr "��罔e������峨�堺���� IP 篏���鐚���罩ゅ��醇�����援�筝���蘂��������活�膵主����"
 
-#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3290
+#: src/protocols/oscar/oscar.c:1370 src/protocols/oscar/oscar.c:3311
 msgid "Connect"
 msgstr "�g�"
 
-#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:884
+#: src/protocols/oscar/oscar.c:1436 src/protocols/toc/toc.c:869
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
@@ -7512,8 +7588,9 @@
 msgid "Connection established, cookie sent"
 msgstr "�g�綏峨産腴�鐚�筝�群���� Cookie"
 
-#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:209
-#: src/protocols/yahoo/yahoo_filexfer.c:218
+#: src/protocols/oscar/oscar.c:1797 src/protocols/yahoo/yahoo_filexfer.c:210
+#: src/protocols/yahoo/yahoo_filexfer.c:219
+#: src/protocols/yahoo/yahoo_filexfer.c:229
 msgid "Unable to establish file descriptor."
 msgstr "�≧�綮榊�罟�罅�篁�膣鴻��"
 
@@ -7525,7 +7602,7 @@
 msgid "Unable to establish listener socket."
 msgstr "�≧�綮榊��h�遵�� Socket��"
 
-#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:570
+#: src/protocols/oscar/oscar.c:1987 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "������援┗��絲�腆�"
 
@@ -7579,16 +7656,16 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim �≧���緇��������糸�ョ⊆��"
 
-#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:3117
 msgid "(There was an error receiving this message)"
 msgstr "鐚��九�����荐������主�����鐚�"
 
-#: src/protocols/oscar/oscar.c:3282
+#: src/protocols/oscar/oscar.c:3303
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����荀�羆��贋・�g��� %s"
 
-#: src/protocols/oscar/oscar.c:3285
+#: src/protocols/oscar/oscar.c:3306
 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 "
@@ -7597,42 +7674,42 @@
 "����荀�羆�絨����������肢����綮榊�莎欠�贋・�g�鐚����������渇���恰��荐���襲�����鏆�������"
 "��罔e������我���� IP 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3342
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨������ユ����絅遵�羝���賢��"
 
-#: src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:3350
 msgid "Authorization Request Message:"
 msgstr "茯�茘�荀�羆�荐����"
 
-#: src/protocols/oscar/oscar.c:3330
+#: src/protocols/oscar/oscar.c:3351
 msgid "Please authorize me!"
 msgstr "茫���������茯�茘�鐚�"
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3381
 #, 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:3365 src/protocols/oscar/oscar.c:3367
+#: src/protocols/oscar/oscar.c:3386 src/protocols/oscar/oscar.c:3388
 msgid "Request Authorization"
 msgstr "荀�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:3415 src/protocols/oscar/oscar.c:3417
-#: src/protocols/oscar/oscar.c:3424 src/protocols/oscar/oscar.c:3506
-#: src/protocols/oscar/oscar.c:3526 src/protocols/oscar/oscar.c:3877
-#: src/protocols/oscar/oscar.c:3937 src/protocols/oscar/oscar.c:6051
-#: src/protocols/oscar/oscar.c:6097
+#: src/protocols/oscar/oscar.c:3436 src/protocols/oscar/oscar.c:3438
+#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3527
+#: src/protocols/oscar/oscar.c:3547 src/protocols/oscar/oscar.c:3898
+#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:6072
+#: src/protocols/oscar/oscar.c:6118
 msgid "No reason given."
 msgstr "羃���腟��������"
 
-#: src/protocols/oscar/oscar.c:3423
+#: src/protocols/oscar/oscar.c:3444
 msgid "Authorization Denied Message:"
 msgstr "��腟�茯�茘�荐����"
 
-#: src/protocols/oscar/oscar.c:3506
+#: src/protocols/oscar/oscar.c:3527
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7641,11 +7718,11 @@
 "篏睡���� %u ���坂�������鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���賢鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3514 src/protocols/oscar/oscar.c:6057
+#: src/protocols/oscar/oscar.c:3535 src/protocols/oscar/oscar.c:6078
 msgid "Authorization Request"
 msgstr "茯�茘�荀�羆�"
 
-#: src/protocols/oscar/oscar.c:3526
+#: src/protocols/oscar/oscar.c:3547
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7655,17 +7732,17 @@
 "篏睡���� %u ���坂�������鐚���腟�篋�����九���ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3527
+#: src/protocols/oscar/oscar.c:3548
 msgid "ICQ authorization denied."
 msgstr "ICQ 茯�茘���腟���"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3534
+#: src/protocols/oscar/oscar.c:3555
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "篏睡���� %u ���鋋�����九���ュソ��羝�����荀�羆���"
 
-#: src/protocols/oscar/oscar.c:3542
+#: src/protocols/oscar/oscar.c:3563
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7678,7 +7755,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3550
+#: src/protocols/oscar/oscar.c:3571
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7691,7 +7768,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3558
+#: src/protocols/oscar/oscar.c:3579
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7704,34 +7781,34 @@
 "荐����削�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3579
+#: src/protocols/oscar/oscar.c:3600
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 篏睡���� %u ��箴�筝���絅遵�莖�荐�鐚�%s (%s)"
 
-#: src/protocols/oscar/oscar.c:3585
+#: src/protocols/oscar/oscar.c:3606
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
 
-#: src/protocols/oscar/oscar.c:3589
+#: src/protocols/oscar/oscar.c:3610
 msgid "Decline"
 msgstr "紿���"
 
-#: src/protocols/oscar/oscar.c:3674
+#: src/protocols/oscar/oscar.c:3695
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪����≧������"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪������≧������"
 
-#: src/protocols/oscar/oscar.c:3683
+#: src/protocols/oscar/oscar.c:3704
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪�紊�ぇ篋���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪���紊�ぇ篋���"
 
-#: src/protocols/oscar/oscar.c:3692
+#: src/protocols/oscar/oscar.c:3713
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7741,83 +7818,83 @@
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����渇������綺�お綽���"
 
 # XXX 莊����㊥����茘���������鐚��頑⑮�����<��絅遵�頫�筝���鐚�筝���
-#: src/protocols/oscar/oscar.c:3701
+#: src/protocols/oscar/oscar.c:3722
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������坂�鐚�絅刻�紊����>���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������坂�鐚�絅刻�紊����>���"
 
-#: src/protocols/oscar/oscar.c:3710
+#: src/protocols/oscar/oscar.c:3731
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���>���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���>���"
 
-#: src/protocols/oscar/oscar.c:3719
+#: src/protocols/oscar/oscar.c:3740
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐��������筝�����"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐��������筝�����"
 
-#: src/protocols/oscar/oscar.c:3780
+#: src/protocols/oscar/oscar.c:3801
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>絽活��鐚�</B> %s<BR><B>����鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:3839
+#: src/protocols/oscar/oscar.c:3860
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 筝��咲���鐚�%s\n"
 
-#: src/protocols/oscar/oscar.c:3840
+#: src/protocols/oscar/oscar.c:3861
 msgid "Unknown error"
 msgstr "���ラ���"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3875
+#: src/protocols/oscar/oscar.c:3896
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "�����腟� %s ��荐����≧����削�"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/protocols/oscar/oscar.c:3934
+#: src/protocols/oscar/oscar.c:3955
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "�≧���緇�篏睡���� %s ����篋肴�荐�鐚�"
 
-#: src/protocols/oscar/oscar.c:3957
+#: src/protocols/oscar/oscar.c:3978
 msgid "Warning Level"
 msgstr "茘���膈�膣�"
 
-#: src/protocols/oscar/oscar.c:3960
+#: src/protocols/oscar/oscar.c:3981
 msgid "Online Since"
 msgstr "筝�膩���"
 
 # XXX �壕⑮��荐糸���ユ���������莠�����鐚�
-#: src/protocols/oscar/oscar.c:3964 src/protocols/yahoo/yahoo.c:3145
+#: src/protocols/oscar/oscar.c:3985 src/protocols/yahoo/yahoo_profile.c:898
 msgid "Member Since"
 msgstr "���堺���∞������"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4067
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM ���醇�欠�篋���"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4253
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "���≧�蕁�ず箴�������篏睡������荐�������阪�������≧��絖�������"
 
-#: src/protocols/oscar/oscar.c:4450
+#: src/protocols/oscar/oscar.c:4471
 msgid "Rate limiting error."
 msgstr "�������狗�����"
 
-#: src/protocols/oscar/oscar.c:4451
+#: src/protocols/oscar/oscar.c:4472
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7825,142 +7902,142 @@
 "����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���"
 "荅��罨<��"
 
-#: src/protocols/oscar/oscar.c:4514
+#: src/protocols/oscar/oscar.c:4535
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ラ����絽活����"
 
-#: src/protocols/oscar/oscar.c:4516
+#: src/protocols/oscar/oscar.c:4537
 msgid "You have been signed off for an unknown reason."
 msgstr "�����坂���������糸�冴��"
 
-#: src/protocols/oscar/oscar.c:4547
+#: src/protocols/oscar/oscar.c:4568
 msgid "Finalizing connection"
 msgstr "絎����g�"
 
-#: src/protocols/oscar/oscar.c:4817 src/protocols/oscar/oscar.c:4824
+#: src/protocols/oscar/oscar.c:4838 src/protocols/oscar/oscar.c:4845
 msgid "Email Address"
 msgstr "�糸��灸散"
 
-#: src/protocols/oscar/oscar.c:4829 src/protocols/silc/buddy.c:1546
+#: src/protocols/oscar/oscar.c:4850 src/protocols/silc/buddy.c:1555
 msgid "Mobile Phone"
 msgstr "茵����肢�"
 
-#: src/protocols/oscar/oscar.c:4830
+#: src/protocols/oscar/oscar.c:4851
 msgid "Not specified"
 msgstr "羃���紂��"
 
-#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:4831 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:4847
+#: src/protocols/oscar/oscar.c:4868
 msgid "Personal Web Page"
 msgstr "��篋榊恐��"
 
-#: src/protocols/oscar/oscar.c:4851
-msgid "Additional Information"
-msgstr "�銀�莖�荐�"
-
-#: src/protocols/oscar/oscar.c:4856
-msgid "Home Address"
-msgstr "篏鎘九�医��"
-
-#: src/protocols/oscar/oscar.c:4860 src/protocols/oscar/oscar.c:4868
-msgid "Zip Code"
-msgstr "�級������"
-
-#: src/protocols/oscar/oscar.c:4864
-msgid "Work Address"
-msgstr "綏ヤ��医��"
-
 #: src/protocols/oscar/oscar.c:4872
+msgid "Additional Information"
+msgstr "�銀�莖�荐�"
+
+#: src/protocols/oscar/oscar.c:4877
+msgid "Home Address"
+msgstr "篏鎘九�医��"
+
+#: src/protocols/oscar/oscar.c:4881 src/protocols/oscar/oscar.c:4889
+msgid "Zip Code"
+msgstr "�級������"
+
+#: src/protocols/oscar/oscar.c:4885
+msgid "Work Address"
+msgstr "綏ヤ��医��"
+
+#: src/protocols/oscar/oscar.c:4893
 msgid "Work Information"
 msgstr "綏ヤ�莖�荐�"
 
-#: src/protocols/oscar/oscar.c:4873
+#: src/protocols/oscar/oscar.c:4894
 msgid "Company"
 msgstr "��夔��腮�"
 
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4895
 msgid "Division"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:4875
+#: src/protocols/oscar/oscar.c:4896
 msgid "Position"
 msgstr "�隙�"
 
-#: src/protocols/oscar/oscar.c:4877
+#: src/protocols/oscar/oscar.c:4898
 msgid "Web Page"
 msgstr "膓臥��"
 
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4904
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s �� ICQ 莖�荐�"
 
 # XXX �����藝� (��綵≫��榊憟��)鐚� (絅遵���札��茘���荐��������e��??)
-#: src/protocols/oscar/oscar.c:4933
+#: src/protocols/oscar/oscar.c:4954
 msgid "Pop-Up Message"
 msgstr "綵��肴���"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4954
+#: src/protocols/oscar/oscar.c:4975
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "筝����� %s ��絽活��"
 
-#: src/protocols/oscar/oscar.c:4958
+#: src/protocols/oscar/oscar.c:4979
 msgid "Search Results"
 msgstr "��絨�腟���"
 
-#: src/protocols/oscar/oscar.c:4975
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "No results found for email address %s"
 msgstr "�鞘��医���糸��灸散�医�� %s �檎����腟���"
 
-#: src/protocols/oscar/oscar.c:4996
+#: src/protocols/oscar/oscar.c:5017
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "����荅我���九�遺�絨�荀�羆�絨� %s �画�茯�茘����糸��灸散��"
 
-#: src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5019
 msgid "Account Confirmation Requested"
 msgstr "絽活��腆肴�"
 
-#: src/protocols/oscar/oscar.c:5026
+#: src/protocols/oscar/oscar.c:5047
 msgid "Error Changing Account Info"
 msgstr "�贋�劫験��莖�荐����"
 
-#: src/protocols/oscar/oscar.c:5029
+#: src/protocols/oscar/oscar.c:5050
 #, 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:5032
+#: src/protocols/oscar/oscar.c:5053
 #, 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:5035
+#: src/protocols/oscar/oscar.c:5056
 #, 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:5038
+#: src/protocols/oscar/oscar.c:5059
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -7968,7 +8045,7 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����堺��群膓����榊���銀�荀�羆���������絅純��"
 
-#: src/protocols/oscar/oscar.c:5041
+#: src/protocols/oscar/oscar.c:5062
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -7976,19 +8053,19 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
 
-#: src/protocols/oscar/oscar.c:5044
+#: src/protocols/oscar/oscar.c:5065
 #, 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:5047
+#: src/protocols/oscar/oscar.c:5068
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��� 0x%04x鐚����ラ�����"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:5078
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -7997,25 +8074,25 @@
 "����絽活������茴��弱���絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5065
+#: src/protocols/oscar/oscar.c:5079 src/protocols/oscar/oscar.c:5086
 msgid "Account Info"
 msgstr "絽活��莖�荐�"
 
-#: src/protocols/oscar/oscar.c:5063
+#: src/protocols/oscar/oscar.c:5084
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���糸��灸散�医���� %s"
 
-#: src/protocols/oscar/oscar.c:5128
+#: src/protocols/oscar/oscar.c:5149
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "�≧��渇���恰��荐���襲���荀��渇���恰��荐���襲���綽�����絨��合�贋・�g���"
 
-#: src/protocols/oscar/oscar.c:5301
+#: src/protocols/oscar/oscar.c:5322
 msgid "Unable to set AIM profile."
 msgstr "�≧�荐㊤� AIM ��篋肴�����"
 
-#: src/protocols/oscar/oscar.c:5302
+#: src/protocols/oscar/oscar.c:5323
 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 "
@@ -8024,7 +8101,7 @@
 "�������糸�ュ�����荀�羆�篆��号������篋肴�荐�鐚���篁ラ��篋�莖�荐�筝���←篆��鴻��茫�������糸�ュ�"
 "�����育�画�荐㊤���"
 
-#: src/protocols/oscar/oscar.c:5329
+#: src/protocols/oscar/oscar.c:5350
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8035,19 +8112,19 @@
 msgstr[0] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 msgstr[1] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 
-#: src/protocols/oscar/oscar.c:5334
+#: src/protocols/oscar/oscar.c:5355
 msgid "Profile too long."
 msgstr "��篋肴�荐����激��"
 
-#: src/protocols/oscar/oscar.c:5350 src/protocols/oscar/oscar.c:6630
+#: src/protocols/oscar/oscar.c:5371 src/protocols/oscar/oscar.c:6651
 msgid "Visible"
 msgstr "�乗昆"
 
-#: src/protocols/oscar/oscar.c:5368
+#: src/protocols/oscar/oscar.c:5389
 msgid "Unable to set AIM away message."
 msgstr "�≧�荐㊤� AIM �∫��荐�����"
 
-#: src/protocols/oscar/oscar.c:5369
+#: src/protocols/oscar/oscar.c:5390
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8056,7 +8133,7 @@
 "��������糸�ョ�綺鎘�����篆��号�����∫��荐������������絨�膓㊥��������荐㊤���������茫���"
 "絎����糸�ュ���荐㊤�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:5409
+#: src/protocols/oscar/oscar.c:5430
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8067,11 +8144,11 @@
 msgstr[0] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 msgstr[1] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 
-#: src/protocols/oscar/oscar.c:5414
+#: src/protocols/oscar/oscar.c:5435
 msgid "Away message too long."
 msgstr "�∫��荐������激��"
 
-#: src/protocols/oscar/oscar.c:5500
+#: src/protocols/oscar/oscar.c:5521
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8082,16 +8159,16 @@
 "��絖�罸��咲���㍼������宴���掩��絖�罸��������後�������腥榊�純����腟���鐚��������篁ャ����"
 "絖���腟�����"
 
-#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:5918
-#: src/protocols/oscar/oscar.c:5931
+#: src/protocols/oscar/oscar.c:5522 src/protocols/oscar/oscar.c:5939
+#: src/protocols/oscar/oscar.c:5952
 msgid "Unable To Add"
 msgstr "�≧�����"
 
-#: src/protocols/oscar/oscar.c:5637
+#: src/protocols/oscar/oscar.c:5658
 msgid "Unable To Retrieve Buddy List"
 msgstr "�≧�莅���絅遵�羝���"
 
-#: src/protocols/oscar/oscar.c:5638
+#: src/protocols/oscar/oscar.c:5659
 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 "
@@ -8100,13 +8177,13 @@
 "Gaim ����羃���莨���� AIM 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃�����"
 "紊縁����遵�札��江��絨��鏅���緇���"
 
-#: src/protocols/oscar/oscar.c:5814 src/protocols/oscar/oscar.c:5815
-#: src/protocols/oscar/oscar.c:5820 src/protocols/oscar/oscar.c:5975
-#: src/protocols/oscar/oscar.c:5976 src/protocols/oscar/oscar.c:5981
+#: src/protocols/oscar/oscar.c:5835 src/protocols/oscar/oscar.c:5836
+#: src/protocols/oscar/oscar.c:5841 src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:5997 src/protocols/oscar/oscar.c:6002
 msgid "Orphans"
 msgstr "絖ゅ����"
 
-#: src/protocols/oscar/oscar.c:5917
+#: src/protocols/oscar/oscar.c:5938
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8115,11 +8192,11 @@
 "���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���"
 "荅���"
 
-#: src/protocols/oscar/oscar.c:5917 src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:5938 src/protocols/oscar/oscar.c:5951
 msgid "(no name)"
 msgstr "(羃�����絖�)"
 
-#: src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:5951
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8129,7 +8206,7 @@
 "���坂���������≧�絨�絅遵� %s ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟���"
 "����膤紫輝��荐援��筝�����"
 
-#: src/protocols/oscar/oscar.c:6012
+#: src/protocols/oscar/oscar.c:6033
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8139,11 +8216,11 @@
 "���"
 
 # NOTE ����������荐怨�ヤ査�弱�榊��茯�茘�荀�羆�緇�蕁�ず腟�������訓����
-#: src/protocols/oscar/oscar.c:6018
+#: src/protocols/oscar/oscar.c:6039
 msgid "Authorization Given"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6072
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8153,18 +8230,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6093
+#: src/protocols/oscar/oscar.c:6114
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "篏睡���� %s ��荐延����篁�鐚�絅刻����ュソ��羝�����荀�羆���"
 
 # NOTE ���������弱�榊��茯�茘�荀�羆�茴���劫��荐掩��蕁�ず��
-#: src/protocols/oscar/oscar.c:6094
+#: src/protocols/oscar/oscar.c:6115
 msgid "Authorization Granted"
 msgstr "茯�茘��峨��"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6097
+#: src/protocols/oscar/oscar.c:6118
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8174,74 +8251,74 @@
 "篏睡���� %s ���坂�������鐚���腟�篋����篁�鐚�絅刻����ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6119
 msgid "Authorization Denied"
 msgstr "茯�茘�茴���"
 
 # NOTE: ��茖∞��絖�臂���� #gaim �� MrHappy �� deryni ��箴���
 # NOTE: KingAnt ��箴���絖�臂���篋�筝���鐚�����筝�篋�����
-#: src/protocols/oscar/oscar.c:6135 src/protocols/toc/toc.c:1279
+#: src/protocols/oscar/oscar.c:6156 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "�脂����腆�(_E)鐚�"
 
-#: src/protocols/oscar/oscar.c:6157
+#: src/protocols/oscar/oscar.c:6178
 msgid "Invalid chat name specified."
 msgstr "腟��篋��≧������紊����腮宴��"
 
-#: src/protocols/oscar/oscar.c:6247
+#: src/protocols/oscar/oscar.c:6268
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "�≧��渇���恰��荐���襲���AIM ��紊�研筝���吓�恰��荐���襲����勌����"
 
-#: src/protocols/oscar/oscar.c:6404
+#: src/protocols/oscar/oscar.c:6425
 msgid "Away Message"
 msgstr "�∫��荐���"
 
-#: src/protocols/oscar/oscar.c:6688
+#: src/protocols/oscar/oscar.c:6709
 msgid "Buddy Comment:"
 msgstr "絅遵�茯����"
 
-#: src/protocols/oscar/oscar.c:6706
+#: src/protocols/oscar/oscar.c:6727
 msgid "Edit Buddy Comment"
 msgstr "膩�鹿絅遵�茯���"
 
-#: src/protocols/oscar/oscar.c:6712
+#: src/protocols/oscar/oscar.c:6733
 msgid "Get Status Msg"
 msgstr "��緇�����荐���"
 
 # NOTE 絨����贋・羔������壕⑮�冴���恰��荐�����
-#: src/protocols/oscar/oscar.c:6724
+#: src/protocols/oscar/oscar.c:6745
 msgid "Direct IM"
 msgstr "�恰��荐���"
 
-#: src/protocols/oscar/oscar.c:6747
+#: src/protocols/oscar/oscar.c:6768
 msgid "Re-request Authorization"
 msgstr "���域�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:6777
+#: src/protocols/oscar/oscar.c:6798
 msgid "The new formatting is invalid."
 msgstr "�亥���弱����≧������"
 
-#: src/protocols/oscar/oscar.c:6778
+#: src/protocols/oscar/oscar.c:6799
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "絽活���弱������醇�壕�紊у�篁ュ�腥榊�純��"
 
-#: src/protocols/oscar/oscar.c:6785
+#: src/protocols/oscar/oscar.c:6806
 msgid "New screen name formatting:"
 msgstr "�亥��絽活���弱�鐚�"
 
-#: src/protocols/oscar/oscar.c:6837
+#: src/protocols/oscar/oscar.c:6858
 msgid "Change Address To:"
 msgstr "莅��翫�医���削�"
 
-#: src/protocols/oscar/oscar.c:6882
+#: src/protocols/oscar/oscar.c:6903
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��研羃������緇�薊�茘�</i>"
 
-#: src/protocols/oscar/oscar.c:6885
+#: src/protocols/oscar/oscar.c:6906
 msgid "You are awaiting authorization from the following buddies"
 msgstr "������罩e���緇�筝���絅遵���茯�茘�"
 
-#: src/protocols/oscar/oscar.c:6886
+#: src/protocols/oscar/oscar.c:6907
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8249,76 +8326,76 @@
 "���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��"
 "��荀�羆����域�茘�����"
 
-#: src/protocols/oscar/oscar.c:6903
+#: src/protocols/oscar/oscar.c:6924
 msgid "Find Buddy by E-mail"
 msgstr "篁ラ�糸��灸散�医��箴��上�絅遵�"
 
-#: src/protocols/oscar/oscar.c:6904
+#: src/protocols/oscar/oscar.c:6925
 msgid "Search for a buddy by e-mail address"
 msgstr "篏睡���糸��灸散�医����絨�絅遵�"
 
-#: src/protocols/oscar/oscar.c:6905
+#: src/protocols/oscar/oscar.c:6926
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "茫�莠後�ュ��合���糸��灸散�医����"
 
-#: src/protocols/oscar/oscar.c:6922
+#: src/protocols/oscar/oscar.c:6943
 msgid "Available Message:"
 msgstr "筝�膩�荐����"
 
 # XXX 茫�荀���
-#: src/protocols/oscar/oscar.c:6923
+#: src/protocols/oscar/oscar.c:6944
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "����轡篏�鐚�篏�荀阪�緇��駈���������紊��э�"
 
-#: src/protocols/oscar/oscar.c:7004
+#: src/protocols/oscar/oscar.c:7025
 msgid "Set User Info..."
 msgstr "荐㊤�篏睡����莖�荐�..."
 
-#: src/protocols/oscar/oscar.c:7009
+#: src/protocols/oscar/oscar.c:7030
 msgid "Set User Info (URL)..."
 msgstr "荐㊤�篏睡����莖�荐� (URL)..."
 
-#: src/protocols/oscar/oscar.c:7015
+#: src/protocols/oscar/oscar.c:7036
 msgid "Set Available Message..."
 msgstr "荐㊤�筝�膩�荐���..."
 
-#: src/protocols/oscar/oscar.c:7020
+#: src/protocols/oscar/oscar.c:7041
 msgid "Change Password..."
 msgstr "篆��劫�腆�..."
 
-#: src/protocols/oscar/oscar.c:7025
+#: src/protocols/oscar/oscar.c:7046
 msgid "Change Password (URL)"
 msgstr "篆��劫�腆� (���嘒��)"
 
-#: src/protocols/oscar/oscar.c:7029
+#: src/protocols/oscar/oscar.c:7050
 msgid "Configure IM Forwarding (URL)"
 msgstr "荐㊤��恰��荐�����莉��� (���嘒��)"
 
-#: src/protocols/oscar/oscar.c:7038
+#: src/protocols/oscar/oscar.c:7059
 msgid "Format Screen Name..."
 msgstr "�弱���絽活��..."
 
-#: src/protocols/oscar/oscar.c:7042
+#: src/protocols/oscar/oscar.c:7063
 msgid "Confirm Account"
 msgstr "腆肴�絽活��"
 
-#: src/protocols/oscar/oscar.c:7046
+#: src/protocols/oscar/oscar.c:7067
 msgid "Display Currently Registered Address"
 msgstr "蕁�ず������荐糸�����医��"
 
-#: src/protocols/oscar/oscar.c:7050
+#: src/protocols/oscar/oscar.c:7071
 msgid "Change Currently Registered Address..."
 msgstr "篆��合������荐糸�����医��..."
 
-#: src/protocols/oscar/oscar.c:7057
+#: src/protocols/oscar/oscar.c:7078
 msgid "Show Buddies Awaiting Authorization"
 msgstr "蕁�ず膈�緇�茯�茘���絅遵�"
 
-#: src/protocols/oscar/oscar.c:7063
+#: src/protocols/oscar/oscar.c:7084
 msgid "Search for Buddy by Email..."
 msgstr "篏睡���糸��灸散�医����絨�絅遵�..."
 
-#: src/protocols/oscar/oscar.c:7068
+#: src/protocols/oscar/oscar.c:7089
 msgid "Search for Buddy by Information"
 msgstr "箴��ц�荐�絨��上ソ��"
 
@@ -8332,73 +8409,73 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:7183 src/protocols/oscar/oscar.c:7185
+#: src/protocols/oscar/oscar.c:7204 src/protocols/oscar/oscar.c:7206
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ ��絎�罔∞�"
 
-#: src/protocols/oscar/oscar.c:7204
+#: src/protocols/oscar/oscar.c:7225
 msgid "Auth host"
 msgstr "茯�茘�篌堺����"
 
-#: src/protocols/oscar/oscar.c:7209
+#: src/protocols/oscar/oscar.c:7230
 msgid "Auth port"
 msgstr "茯�茘���荐���"
 
-#: src/protocols/silc/buddy.c:47 src/protocols/silc/buddy.c:407
-#: src/protocols/silc/buddy.c:532 src/protocols/silc/buddy.c:699
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
+#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
 #: src/protocols/silc/ft.c:340
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "篏睡���� %s 筝���恐莊��"
 
-#: src/protocols/silc/buddy.c:48 src/protocols/silc/buddy.c:105
-#: src/protocols/silc/buddy.c:110 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:124
-#: src/protocols/silc/buddy.c:129 src/protocols/silc/buddy.c:247
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
+#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
+#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
 msgid "Key Agreement"
 msgstr "篋ゆ�絲���"
 
-#: src/protocols/silc/buddy.c:49
+#: src/protocols/silc/buddy.c:53
 msgid "Cannot perform the key agreement"
 msgstr "�≧�篋ゆ�絲���"
 
-#: src/protocols/silc/buddy.c:106
+#: src/protocols/silc/buddy.c:110
 msgid "Error occurred during key agreement"
 msgstr "篋ゆ�絲��遺賢�榊憥���"
 
-#: src/protocols/silc/buddy.c:110
+#: src/protocols/silc/buddy.c:114
 msgid "Key Agreement failed"
 msgstr "篋ゆ�絲��医け��"
 
-#: src/protocols/silc/buddy.c:115
+#: src/protocols/silc/buddy.c:119
 msgid "Timeout during key agreement"
 msgstr "篋ゆ�絲��育�丈��"
 
-#: src/protocols/silc/buddy.c:120
+#: src/protocols/silc/buddy.c:124
 msgid "Key agreement was aborted"
 msgstr "篋ゆ�絲��域←筝㊥②"
 
-#: src/protocols/silc/buddy.c:125
+#: src/protocols/silc/buddy.c:129
 msgid "Key agreement is already started"
 msgstr "篋ゆ�絲��医訓��紮�"
 
-#: src/protocols/silc/buddy.c:130
+#: src/protocols/silc/buddy.c:134
 msgid "Key agreement cannot be started with yourself"
 msgstr "筝�������訓篋ゆ�絲���"
 
-#: src/protocols/silc/buddy.c:248 src/protocols/silc/buddy.c:375
-#: src/protocols/silc/buddy.c:500
+#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
+#: src/protocols/silc/buddy.c:507
 msgid "The remote user is not present in the network any more"
 msgstr "��腴�戎����綏俄���恐莊��"
 
-#: src/protocols/silc/buddy.c:284
+#: src/protocols/silc/buddy.c:288
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr "�� %s �九�遺���篋ゆ�絲��域�羆�鐚����割困��絲��医���"
 
-#: src/protocols/silc/buddy.c:288
+#: src/protocols/silc/buddy.c:292
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8409,59 +8486,59 @@
 "��腴�源罘���鐚�%s\n"
 "��腴���荐���鐚�%d"
 
-#: src/protocols/silc/buddy.c:301
+#: src/protocols/silc/buddy.c:305
 msgid "Key Agreement Request"
 msgstr "篋ゆ�絲��域�羆�"
 
-#: src/protocols/silc/buddy.c:374 src/protocols/silc/buddy.c:409
-#: src/protocols/silc/buddy.c:451
+#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
+#: src/protocols/silc/buddy.c:458
 msgid "IM With Password"
 msgstr "��絲�腆寂��恰��荐���"
 
-#: src/protocols/silc/buddy.c:410
+#: src/protocols/silc/buddy.c:417
 msgid "Cannot set IM key"
 msgstr "�≧�荐㊤��恰��荐������"
 
-#: src/protocols/silc/buddy.c:452
+#: src/protocols/silc/buddy.c:459
 msgid "Set IM Password"
 msgstr "荐㊤��恰��荐����腆�"
 
-#: src/protocols/silc/buddy.c:499 src/protocols/silc/buddy.c:534
+#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
 #: src/protocols/silc/ops.c:1080 src/protocols/silc/ops.c:1091
 msgid "Get Public Key"
 msgstr "��緇�����"
 
-#: src/protocols/silc/buddy.c:535 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1081
 #: src/protocols/silc/ops.c:1092
 msgid "Cannot fetch the public key"
 msgstr "�≧���緇�����"
 
-#: src/protocols/silc/buddy.c:622 src/protocols/silc/buddy.c:1641
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1650
 msgid "Show Public Key"
 msgstr "蕁�ず����"
 
-#: src/protocols/silc/buddy.c:623 src/protocols/silc/buddy.c:982
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:991
 #: src/protocols/silc/chat.c:218
 msgid "Could not load public key"
 msgstr "�≧�莠��ュ����"
 
-#: src/protocols/silc/buddy.c:700 src/protocols/silc/ops.c:837
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:837
 #: src/protocols/silc/ops.c:908 src/protocols/silc/ops.c:991
 #: src/protocols/silc/ops.c:992 src/protocols/silc/ops.c:998
 #: src/protocols/silc/ops.c:999
 msgid "User Information"
 msgstr "篏睡����莖�荐�"
 
-#: src/protocols/silc/buddy.c:701 src/protocols/silc/ops.c:909
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:909
 msgid "Cannot get user information"
 msgstr "�≧�莅���篏睡����莖�荐�"
 
-#: src/protocols/silc/buddy.c:722
+#: src/protocols/silc/buddy.c:729
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "絅遵� %s 筝�茴�拭篁�"
 
-#: src/protocols/silc/buddy.c:725
+#: src/protocols/silc/buddy.c:732
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -8469,204 +8546,204 @@
 "�頑�恰�����ュソ�������逸�����≧��九�域�絅遵���絅遵����ャ��荀���緇����逸�������緇���"
 "�違����篁ゅ�喝���"
 
-#: src/protocols/silc/buddy.c:1025
+#: src/protocols/silc/buddy.c:1034
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "絅遵� %s 筝���恐莊��"
 
-#: src/protocols/silc/buddy.c:1028
+#: src/protocols/silc/buddy.c:1037
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr "荀��医�絅遵�鐚�綽������ヤ�鐚�絅刻������違��荀����ュ���逸�茫��������ャ����"
 
-#: src/protocols/silc/buddy.c:1031
+#: src/protocols/silc/buddy.c:1040
 msgid "Import..."
 msgstr "����..."
 
-#: src/protocols/silc/buddy.c:1118
+#: src/protocols/silc/buddy.c:1127
 msgid "Select correct user"
 msgstr "�御��罩g∈��篏睡����"
 
-#: src/protocols/silc/buddy.c:1120
+#: src/protocols/silc/buddy.c:1129
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 "莇������篏睡����篏睡����筝����違��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
 
-#: src/protocols/silc/buddy.c:1122
+#: src/protocols/silc/buddy.c:1131
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "莇������篏睡����篏睡����筝���腮宴��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
 
-#: src/protocols/silc/buddy.c:1396
+#: src/protocols/silc/buddy.c:1405
 msgid "Detached"
 msgstr "�����g�"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:48
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:48
 #: src/protocols/silc/silc.c:80
 msgid "Indisposed"
 msgstr "筝���"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:49
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:49
 #: src/protocols/silc/silc.c:82
 msgid "Wake Me Up"
 msgstr "������鐚�"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:45
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:45
 #: src/protocols/silc/silc.c:74
 msgid "Hyper Active"
 msgstr "罐球墾羇肢�"
 
-#: src/protocols/silc/buddy.c:1408
+#: src/protocols/silc/buddy.c:1417
 msgid "Robot"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1415 src/protocols/silc/buddy.c:1483
+#: src/protocols/silc/buddy.c:1424 src/protocols/silc/buddy.c:1492
 #: src/protocols/silc/silc.c:606
 msgid "Happy"
 msgstr "��綽�"
 
-#: src/protocols/silc/buddy.c:1417 src/protocols/silc/buddy.c:1485
+#: src/protocols/silc/buddy.c:1426 src/protocols/silc/buddy.c:1494
 #: src/protocols/silc/silc.c:608
 msgid "Sad"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/buddy.c:1487
+#: src/protocols/silc/buddy.c:1428 src/protocols/silc/buddy.c:1496
 #: src/protocols/silc/silc.c:610
 msgid "Angry"
 msgstr "�ゆ��"
 
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/buddy.c:1489
+#: src/protocols/silc/buddy.c:1430 src/protocols/silc/buddy.c:1498
 #: src/protocols/silc/silc.c:612
 msgid "Jealous"
 msgstr "絆�絋�"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/buddy.c:1491
+#: src/protocols/silc/buddy.c:1432 src/protocols/silc/buddy.c:1500
 #: src/protocols/silc/silc.c:614
 msgid "Ashamed"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/buddy.c:1493
+#: src/protocols/silc/buddy.c:1434 src/protocols/silc/buddy.c:1502
 #: src/protocols/silc/silc.c:616
 msgid "Invincible"
 msgstr "�≧��"
 
-#: src/protocols/silc/buddy.c:1427 src/protocols/silc/buddy.c:1495
+#: src/protocols/silc/buddy.c:1436 src/protocols/silc/buddy.c:1504
 #: src/protocols/silc/silc.c:618
 msgid "In Love"
 msgstr "����筝�"
 
-#: src/protocols/silc/buddy.c:1429 src/protocols/silc/buddy.c:1497
+#: src/protocols/silc/buddy.c:1438 src/protocols/silc/buddy.c:1506
 #: src/protocols/silc/silc.c:620
 msgid "Sleepy"
 msgstr "�括��"
 
-#: src/protocols/silc/buddy.c:1431 src/protocols/silc/buddy.c:1499
+#: src/protocols/silc/buddy.c:1440 src/protocols/silc/buddy.c:1508
 #: src/protocols/silc/silc.c:622
 msgid "Bored"
 msgstr "�惹��"
 
-#: src/protocols/silc/buddy.c:1433 src/protocols/silc/buddy.c:1501
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/buddy.c:1510
 #: src/protocols/silc/silc.c:624
 msgid "Excited"
 msgstr "��絅�"
 
-#: src/protocols/silc/buddy.c:1435 src/protocols/silc/buddy.c:1503
+#: src/protocols/silc/buddy.c:1444 src/protocols/silc/buddy.c:1512
 #: src/protocols/silc/silc.c:626
 msgid "Anxious"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1471
+#: src/protocols/silc/buddy.c:1480
 msgid "Modes"
 msgstr "罔≦�"
 
-#: src/protocols/silc/buddy.c:1481
+#: src/protocols/silc/buddy.c:1490
 msgid "Mood"
 msgstr "綽���"
 
-#: src/protocols/silc/buddy.c:1511
+#: src/protocols/silc/buddy.c:1520
 msgid "Status Text"
 msgstr "����荐���"
 
-#: src/protocols/silc/buddy.c:1516
+#: src/protocols/silc/buddy.c:1525
 msgid "Preferred Contact"
 msgstr "��機�号�"
 
-#: src/protocols/silc/buddy.c:1524
+#: src/protocols/silc/buddy.c:1533
 msgid "Paging"
 msgstr "�喝��"
 
-#: src/protocols/silc/buddy.c:1526 src/protocols/silc/silc.c:637
+#: src/protocols/silc/buddy.c:1535 src/protocols/silc/silc.c:637
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/buddy.c:1528 src/protocols/silc/silc.c:639
+#: src/protocols/silc/buddy.c:1537 src/protocols/silc/silc.c:639
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/buddy.c:1530 src/protocols/silc/silc.c:641
+#: src/protocols/silc/buddy.c:1539 src/protocols/silc/silc.c:641
 msgid "Video Conferencing"
 msgstr "荀����顑�"
 
-#: src/protocols/silc/buddy.c:1537
+#: src/protocols/silc/buddy.c:1546
 msgid "Preferred Language"
 msgstr "�悟�����"
 
-#: src/protocols/silc/buddy.c:1542
+#: src/protocols/silc/buddy.c:1551
 msgid "Device"
 msgstr "�����臀�"
 
-#: src/protocols/silc/buddy.c:1544
+#: src/protocols/silc/buddy.c:1553
 msgid "Computer"
 msgstr "�肢��"
 
-#: src/protocols/silc/buddy.c:1548
+#: src/protocols/silc/buddy.c:1557
 msgid "PDA"
 msgstr "�糸���絽�"
 
-#: src/protocols/silc/buddy.c:1550
+#: src/protocols/silc/buddy.c:1559
 msgid "Terminal"
 msgstr "腟�腴��"
 
-#: src/protocols/silc/buddy.c:1561 src/protocols/silc/silc.c:674
+#: src/protocols/silc/buddy.c:1570 src/protocols/silc/silc.c:674
 #: src/protocols/silc/silc.c:676
 msgid "Timezone"
 msgstr "����"
 
-#: src/protocols/silc/buddy.c:1567
+#: src/protocols/silc/buddy.c:1576
 msgid "Geolocation"
 msgstr "�����臀�"
 
-#: src/protocols/silc/buddy.c:1626
-msgid "Reset IM Key"
-msgstr "羝��ゅ�恰��荐������"
-
-#: src/protocols/silc/buddy.c:1631
-msgid "IM with Key Exchange"
-msgstr "荀�篋ゆ�絲��遺��恰��荐���"
-
 #: src/protocols/silc/buddy.c:1635
+msgid "Reset IM Key"
+msgstr "羝��ゅ�恰��荐������"
+
+#: src/protocols/silc/buddy.c:1640
+msgid "IM with Key Exchange"
+msgstr "荀�篋ゆ�絲��遺��恰��荐���"
+
+#: src/protocols/silc/buddy.c:1644
 msgid "IM with Password"
 msgstr "��絲�腆寂��恰��荐���"
 
-#: src/protocols/silc/buddy.c:1646
+#: src/protocols/silc/buddy.c:1655
 msgid "Get Public Key..."
 msgstr "��緇�����..."
 
-#: src/protocols/silc/buddy.c:1651
+#: src/protocols/silc/buddy.c:1660
 msgid "Send File..."
 msgstr "�渇��罟�罅�..."
 
-#: src/protocols/silc/buddy.c:1656 src/protocols/silc/ops.c:1127
+#: src/protocols/silc/buddy.c:1665 src/protocols/silc/ops.c:1127
 msgid "Kill User"
 msgstr "緇�膓画君筝�腱脂�や戎����"
 
@@ -8981,11 +9058,11 @@
 msgid "Channels"
 msgstr "�脂��"
 
-#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:291
+#: src/protocols/silc/ops.c:981 src/protocols/silc/util.c:292
 msgid "Public Key Fingerprint"
 msgstr "���井��膣�"
 
-#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:292
+#: src/protocols/silc/ops.c:982 src/protocols/silc/util.c:293
 msgid "Public Key Babbleprint"
 msgstr "���井��膣�������� (Babbleprint)"
 
@@ -9351,119 +9428,124 @@
 msgid "Key Length"
 msgstr "絲��育�桁墾"
 
-#: src/protocols/silc/util.c:296 src/protocols/silc/util.c:297
+#: src/protocols/silc/util.c:290
+#, c-format
+msgid "%d bits"
+msgstr "%d ��篏���"
+
+#: src/protocols/silc/util.c:297 src/protocols/silc/util.c:298
 msgid "Public Key Information"
 msgstr "���域�荐�"
 
-#: src/protocols/toc/toc.c:166
+#: src/protocols/toc/toc.c:137
 #, c-format
 msgid "Looking up %s"
 msgstr "�上� %s 筝�"
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:480
 #, c-format
 msgid "Unable to write file %s."
 msgstr "�≧�絲��ユ�罅� %s��"
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:483
 #, c-format
 msgid "Unable to read file %s."
 msgstr "�≧�莅���罟�罅� %s��"
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:486
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "荐���お�件���緇��� %s 篏���腟�茴���サ��"
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:489
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ����筝����糸�ャ��"
 
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:492
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "筝���荐怨� %s �弱�肴⑥����"
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:495
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "荐���←筝�罍�鐚����堺�����遺�篌堺���������句���守����綺���"
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:498
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "�� %s 筝���札��紊���"
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:501
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "����荐���畿 %s ����綺�お綽����"
 
-#: src/protocols/toc/toc.c:533
+#: src/protocols/toc/toc.c:504
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "���阪け篋�筝����� %s ��箴���荐�������阪�紊�ぇ篋���"
 
-#: src/protocols/toc/toc.c:536
+#: src/protocols/toc/toc.c:507
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "���阪け篋�筝����� %s ��箴���荐�������阪��渇������綺�お綽���"
 
-#: src/protocols/toc/toc.c:539
+#: src/protocols/toc/toc.c:510
 msgid "Failure."
 msgstr "紊掩����"
 
-#: src/protocols/toc/toc.c:542
+#: src/protocols/toc/toc.c:513
 msgid "Too many matches."
 msgstr "�拷��紊����"
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:516
 msgid "Need more qualifiers."
 msgstr "��莠後�ユ�翫�罟∝刈罌�篁吟��"
 
 #  NOTE�������≧�篏睡������荅我�������筝�絖���������
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:519
 msgid "Dir service temporarily unavailable."
 msgstr "�����≧�篏睡������������"
 
-#: src/protocols/toc/toc.c:551
+#: src/protocols/toc/toc.c:522
 msgid "Email lookup restricted."
 msgstr "胼�罩� eMail 罟∽�ャ��"
 
-#: src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:525
 msgid "Keyword ignored."
 msgstr "���球�綏画←綽順�ャ��"
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:528
 msgid "No keywords."
 msgstr "羃������球���"
 
-#: src/protocols/toc/toc.c:560
+#: src/protocols/toc/toc.c:531
 msgid "User has no directory information."
 msgstr "����篏睡����羃���篁����檎��莖�荐���"
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:535
 msgid "Country not supported."
 msgstr "������絎銀�茴���叵��"
 
-#: src/protocols/toc/toc.c:567
+#: src/protocols/toc/toc.c:538
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "���ョ��紊掩������鐚�%s��"
 
 #  NOTE�������≧�篏睡������荅我�������筝�絖���������
 #  NOTE 茘����翫�� by Ambrose
-#: src/protocols/toc/toc.c:573
+#: src/protocols/toc/toc.c:544
 msgid "The service is temporarily unavailable."
 msgstr "�����≧�篏睡�����������"
 
-#: src/protocols/toc/toc.c:576
+#: src/protocols/toc/toc.c:547
 msgid "Your warning level is currently too high to log in."
 msgstr "�������糸�ョ鎧腟援��茘���膈�膣�紊��鐚�篁ヨ�雁�≧��糸�ャ��"
 
-#: src/protocols/toc/toc.c:579
+#: src/protocols/toc/toc.c:550
 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."
@@ -9471,37 +9553,37 @@
 "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
 "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
-#: src/protocols/toc/toc.c:581
+#: src/protocols/toc/toc.c:552
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "�主��篋�筝������ョ���糸�ラ���鐚�%s��"
 
-#: src/protocols/toc/toc.c:584
+#: src/protocols/toc/toc.c:555
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "筝������ョ����� %d �主����莖�荐�鐚�%s"
 
-#: src/protocols/toc/toc.c:604
+#: src/protocols/toc/toc.c:576
 msgid "Connection Closed"
 msgstr "�g�����"
 
-#: src/protocols/toc/toc.c:644
+#: src/protocols/toc/toc.c:616
 msgid "Waiting for reply..."
 msgstr "膈�緇���荀�筝�..."
 
-#: src/protocols/toc/toc.c:714
+#: src/protocols/toc/toc.c:692
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 腟���篋�������������憜���札膵主����渇������荐�����"
 
-#: src/protocols/toc/toc.c:902
+#: src/protocols/toc/toc.c:887
 msgid "Password Change Successful"
 msgstr "絲�腆寂信�号����"
 
-#: src/protocols/toc/toc.c:906
+#: src/protocols/toc/toc.c:891
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ���坂�筝������� (PAUSE) ��篁ゃ��"
 
-#: src/protocols/toc/toc.c:907
+#: src/protocols/toc/toc.c:892
 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 "
@@ -9510,44 +9592,44 @@
 "�狗�����主����鐚�TOC ��綽順�ユ������箴���荐�����������遵�������肴�����鐚�絨���権�榊鎧"
 "腟宴��Gaim 絨��水���主����罔g��篋�����������������х������鐚�茫����茫���"
 
-#: src/protocols/toc/toc.c:1417
+#: src/protocols/toc/toc.c:1402
 msgid "Get Dir Info"
 msgstr "��緇�篏睡������篋肴�荐�"
 
-#: src/protocols/toc/toc.c:1553
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr "荐㊤�篏睡������篋肴�荐�"
 
-#: src/protocols/toc/toc.c:1675
+#: src/protocols/toc/toc.c:1660
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "�≧����� %s 篁ヤ�絲��ワ�"
 
-#: src/protocols/toc/toc.c:1711
+#: src/protocols/toc/toc.c:1696
 msgid "File transfer failed; other side probably canceled."
 msgstr "罟�罅��活叱紊掩��鐚����醇����劫�羔��活叱��"
 
-#: src/protocols/toc/toc.c:1756 src/protocols/toc/toc.c:1796
-#: src/protocols/toc/toc.c:1920 src/protocols/toc/toc.c:2008
+#: src/protocols/toc/toc.c:1741 src/protocols/toc/toc.c:1781
+#: src/protocols/toc/toc.c:1905 src/protocols/toc/toc.c:1993
 msgid "Could not connect for transfer."
 msgstr "�≧������g�篁ヤ��活叱��"
 
-#: src/protocols/toc/toc.c:1953
+#: src/protocols/toc/toc.c:1938
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "�≧�絲��ユ��㊧�荐�������罟�罅�絨�筝���茴��渇����"
 
-#: src/protocols/toc/toc.c:2053
+#: src/protocols/toc/toc.c:2038
 msgid "Gaim - Save As..."
 msgstr "Gaim - �峨���..."
 
-#: src/protocols/toc/toc.c:2087
+#: src/protocols/toc/toc.c:2072
 #, 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"
 msgstr[1] "%s 荀�羆� %s �ユ�� %d ��罟�罅�鐚�%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2094
+#: src/protocols/toc/toc.c:2079
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 荀�羆����渇��罟�罅�腟��鐚�絅刻���"
@@ -9562,15 +9644,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2174 src/protocols/toc/toc.c:2176
+#: src/protocols/toc/toc.c:2159 src/protocols/toc/toc.c:2161
 msgid "TOC Protocol Plugin"
 msgstr "TOC ��絎�罔∞�"
 
-#: src/protocols/toc/toc.c:2195
+#: src/protocols/toc/toc.c:2180
 msgid "TOC host"
 msgstr "TOC 篌堺����"
 
-#: src/protocols/toc/toc.c:2199
+#: src/protocols/toc/toc.c:2184
 msgid "TOC port"
 msgstr "TOC ��荐���"
 
@@ -9661,32 +9743,32 @@
 msgstr "Trepia ��絎�罔∞�"
 
 # XXX ��⑮
-#: src/protocols/yahoo/yahoo.c:307
+#: src/protocols/yahoo/yahoo.c:300
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr "��群膓�茴��糸�削����堺��群��Ί����糸�ャ��"
 
-#: src/protocols/yahoo/yahoo.c:749
+#: src/protocols/yahoo/yahoo.c:742
 msgid "Your Yahoo! message did not get sent."
 msgstr "���� Yahoo! 荐���研羃���茴����冴��"
 
-#: src/protocols/yahoo/yahoo.c:767
+#: src/protocols/yahoo/yahoo.c:760
 msgid "Buzz!!"
 msgstr "�駈�"
 
 # XXX ��⑮
-#: src/protocols/yahoo/yahoo.c:802
+#: src/protocols/yahoo/yahoo.c:795
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s �� Yahoo! 膤紫輝荐����"
 
-#: src/protocols/yahoo/yahoo.c:868
+#: src/protocols/yahoo/yahoo.c:861
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "篏睡���� %s ������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆���"
 
-#: src/protocols/yahoo/yahoo.c:871
+#: src/protocols/yahoo/yahoo.c:864
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -9695,11 +9777,11 @@
 "篏睡���� %s ���坂�������鐚�������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆�鐚�%"
 "s"
 
-#: src/protocols/yahoo/yahoo.c:874
+#: src/protocols/yahoo/yahoo.c:867
 msgid "Add buddy rejected"
 msgstr "�医�絅遵�茴���"
 
-#: src/protocols/yahoo/yahoo.c:1601
+#: src/protocols/yahoo/yahoo.c:1618
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9709,11 +9791,11 @@
 "Yahoo 篌堺�����羆�篋�篏睡���腮������茯�茘��劫�鐚���罩ら���������� Gaim 緇����巡�������"
 "�糸�� Yahoo��茫��� %s 罟∽�ユ��羃����贋�亥��������"
 
-#: src/protocols/yahoo/yahoo.c:1604
+#: src/protocols/yahoo/yahoo.c:1621
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 茯�茘�紊掩��"
 
-#: src/protocols/yahoo/yahoo.c:1677
+#: src/protocols/yahoo/yahoo.c:1694
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -9722,69 +9804,69 @@
 "����荅�申�ュ������絅遵������х�� %s��絋�������膊���篁�鐚�絅刻�緇�����絅遵�羝���賢腱脂�わ�筝�"
 "���喝申�ヤ�鐚�絅刻�鐚�茫���筝�筝���������"
 
-#: src/protocols/yahoo/yahoo.c:1680
+#: src/protocols/yahoo/yahoo.c:1697
 msgid "Ignore buddy?"
 msgstr "綽順�ヤ戎����鐚�"
 
-#: src/protocols/yahoo/yahoo.c:1713
+#: src/protocols/yahoo/yahoo.c:1730
 msgid "Invalid username."
 msgstr "篏睡������腮援�≧����"
 
-#: src/protocols/yahoo/yahoo.c:1716
+#: src/protocols/yahoo/yahoo.c:1733
 msgid "Incorrect password."
 msgstr "�����絲�腆若��"
 
 # XXX ��⑮
-#: src/protocols/yahoo/yahoo.c:1719
+#: src/protocols/yahoo/yahoo.c:1736
 msgid "Your account is locked, please log in to the yahoo website."
 msgstr "篏���絽恰�句����茴������茫����糸�� Yahoo 膓牙���"
 
-#: src/protocols/yahoo/yahoo.c:1722
+#: src/protocols/yahoo/yahoo.c:1739
 #, c-format
 msgid "Unknown error number %d."
 msgstr "���ョ�����篁g⊆ %d��"
 
-#: src/protocols/yahoo/yahoo.c:1779
+#: src/protocols/yahoo/yahoo.c:1796
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "�≧�絨�絅遵���%1$s���医��喝験����%3$s����失�������羝����х��臂ょ���%2$s����"
 
-#: src/protocols/yahoo/yahoo.c:1781
+#: src/protocols/yahoo/yahoo.c:1798
 msgid "Could not add buddy to server list"
 msgstr "�≧�絨�絅遵��医��割失�������羝�����"
 
-#: src/protocols/yahoo/yahoo.c:1891 src/protocols/yahoo/yahoo.c:2022
+#: src/protocols/yahoo/yahoo.c:1963 src/protocols/yahoo/yahoo.c:2094
 msgid "Unable to read"
 msgstr "�≧�莅���"
 
-#: src/protocols/yahoo/yahoo.c:2044 src/protocols/yahoo/yahoo.c:2154
-#: src/protocols/yahoo/yahoo.c:2197 src/protocols/yahoo/yahoochat.c:1360
-#: src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoo.c:2116 src/protocols/yahoo/yahoo.c:2226
+#: src/protocols/yahoo/yahoo.c:2271 src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "�g����"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2662
-#: src/protocols/yahoo/yahoo.c:2774
+#: src/protocols/yahoo/yahoo.c:2365 src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2862
 msgid "Not At Home"
 msgstr "筝����"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2664
-#: src/protocols/yahoo/yahoo.c:2775
+#: src/protocols/yahoo/yahoo.c:2367 src/protocols/yahoo/yahoo.c:2752
+#: src/protocols/yahoo/yahoo.c:2863
 msgid "Not At Desk"
 msgstr "筝���婚篏�"
 
-#: src/protocols/yahoo/yahoo.c:2285 src/protocols/yahoo/yahoo.c:2666
-#: src/protocols/yahoo/yahoo.c:2776
+#: src/protocols/yahoo/yahoo.c:2369 src/protocols/yahoo/yahoo.c:2754
+#: src/protocols/yahoo/yahoo.c:2864
 msgid "Not In Office"
 msgstr "筝���商���"
 
-#: src/protocols/yahoo/yahoo.c:2289 src/protocols/yahoo/yahoo.c:2670
-#: src/protocols/yahoo/yahoo.c:2778
+#: src/protocols/yahoo/yahoo.c:2373 src/protocols/yahoo/yahoo.c:2758
+#: src/protocols/yahoo/yahoo.c:2866
 msgid "On Vacation"
 msgstr "羝≦���私�"
 
-#: src/protocols/yahoo/yahoo.c:2293 src/protocols/yahoo/yahoo.c:2674
-#: src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/yahoo/yahoo.c:2377 src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2868
 msgid "Stepped Out"
 msgstr "莎医�阪サ篋�"
 
@@ -9792,11 +9874,11 @@
 # NOTE ��箙�茵�ず篏�筝�����荀�����絅遵��糸�ョ�膈�����(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2374 src/protocols/yahoo/yahoo.c:2406
+#: src/protocols/yahoo/yahoo.c:2458 src/protocols/yahoo/yahoo.c:2490
 msgid "Not on server list"
 msgstr "筝���失�������羝���賢"
 
-#: src/protocols/yahoo/yahoo.c:2426
+#: src/protocols/yahoo/yahoo.c:2510
 #, c-format
 msgid ""
 "\n"
@@ -9807,80 +9889,33 @@
 
 # NOTE #gaim �� Vann �� LSchiere 茹o�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
 # NOTE Yahoo ����Chat��罩e�茘����冴��������違��
-#: src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2582
 msgid "Join in Chat"
 msgstr "���ュソ��������������紊��"
 
 # NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
-#: src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2586
 msgid "Initiate Conference"
 msgstr "������茘医�"
 
-#: src/protocols/yahoo/yahoo.c:2562
+#: src/protocols/yahoo/yahoo.c:2646
 msgid "Active which ID?"
 msgstr "��������� ID鐚�"
 
 # NOTE #gaim �� Vann �� LSchiere 茹o�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
 # NOTE Yahoo ����Chat��罩e�茘����冴��������違��
-#: src/protocols/yahoo/yahoo.c:2571
+#: src/protocols/yahoo/yahoo.c:2655
 msgid "Join who in chat?"
 msgstr "���ュ����絅遵�������������紊��鐚�"
 
-#: src/protocols/yahoo/yahoo.c:2581
+#: src/protocols/yahoo/yahoo.c:2665
 msgid "Activate ID..."
 msgstr "���� ID..."
 
-#: src/protocols/yahoo/yahoo.c:2585
+#: src/protocols/yahoo/yahoo.c:2669
 msgid "Join user in chat..."
 msgstr "���ュソ��������������紊��..."
 
-#: src/protocols/yahoo/yahoo.c:2973
-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"
-
-# NOTE 羈������腟���⑮��箙�筝�蕁�ず鐚���茘�����篁ヤ���
-#: src/protocols/yahoo/yahoo.c:2974 src/protocols/yahoo/yahoo.c:2997
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser<br>"
-msgstr "������括��������篋肴�荐�鐚�茫��������頳遵������篁ヤ��g�<br>"
-
-#: src/protocols/yahoo/yahoo.c:2996
-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:3044 src/protocols/yahoo/yahoo.c:3045
-msgid "Yahoo! ID"
-msgstr "Yahoo! 絽活��"
-
-#: src/protocols/yahoo/yahoo.c:3089 src/protocols/yahoo/yahoo.c:3092
-#: src/protocols/yahoo/yahoo.c:3095
-msgid "Hobbies"
-msgstr "��絅�"
-
-#: src/protocols/yahoo/yahoo.c:3104 src/protocols/yahoo/yahoo.c:3107
-msgid "Latest News"
-msgstr "���井���"
-
-#: src/protocols/yahoo/yahoo.c:3121
-msgid "Home Page"
-msgstr "膓臥��"
-
-#: src/protocols/yahoo/yahoo.c:3133
-msgid "Cool Link 1"
-msgstr "�潔�g�(筝�)"
-
-#: src/protocols/yahoo/yahoo.c:3137
-msgid "Cool Link 2"
-msgstr "�潔�g�(篋�)"
-
-#: src/protocols/yahoo/yahoo.c:3139
-msgid "Cool Link 3"
-msgstr "�潔�g�(筝�)"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -9891,27 +9926,39 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3347 src/protocols/yahoo/yahoo.c:3349
+#: src/protocols/yahoo/yahoo.c:3184 src/protocols/yahoo/yahoo.c:3186
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo ��絎�罔∞�"
 
-#: src/protocols/yahoo/yahoo.c:3368
+#: src/protocols/yahoo/yahoo.c:3205
+msgid "Yahoo Japan"
+msgstr "Yahoo Japan"
+
+#: src/protocols/yahoo/yahoo.c:3208
 msgid "Pager host"
 msgstr "�喝�主鎧腟延失����"
 
-#: src/protocols/yahoo/yahoo.c:3371
+#: src/protocols/yahoo/yahoo.c:3211
+msgid "Japan Pager host"
+msgstr "�喝�主鎧腟延失������ユ���医��鐚�"
+
+#: src/protocols/yahoo/yahoo.c:3214
 msgid "Pager port"
 msgstr "�喝�主鎧腟演��荐���"
 
-#: src/protocols/yahoo/yahoo.c:3374
+#: src/protocols/yahoo/yahoo.c:3217
 msgid "File transfer host"
 msgstr "罟�罅��活叱筝紙�"
 
-#: src/protocols/yahoo/yahoo.c:3377
+#: src/protocols/yahoo/yahoo.c:3220
+msgid "Japan File transfer host"
+msgstr "罟�罅��活叱筝紙�鐚��ユ���医��鐚�"
+
+#: src/protocols/yahoo/yahoo.c:3223
 msgid "File transfer port"
 msgstr "罟�罅��活叱��荐���"
 
-#: src/protocols/yahoo/yahoo.c:3380
+#: src/protocols/yahoo/yahoo.c:3226
 msgid "Chat Room List Url"
 msgstr "��紊��羝�������恐��"
 
@@ -9921,6 +9968,79 @@
 "(1,048,576 bytes)."
 msgstr "Gaim �≧���� Yahoo! �勌��紊ф�� 1MB (104,8576 ��篏���腟�) ��罟�罅���"
 
+#: src/protocols/yahoo/yahoo_profile.c:661
+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"
+
+# NOTE 羈������腟���⑮��箙�筝�蕁�ず鐚���茘�����篁ヤ���
+#: src/protocols/yahoo/yahoo_profile.c:662
+#: src/protocols/yahoo/yahoo_profile.c:699
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser<br>"
+msgstr "������括��������篋肴�荐�鐚�茫��������頳遵������篁ヤ��g�<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:697
+msgid ""
+"<b>Sorry, this profile seems to be in a language that is not supported at "
+"this time.</b><br><br>\n"
+msgstr "<b>絨�筝�莎件�������篋肴�荐�篌寂�����戎���腮���←��吡��茯�����</b><br><br>\n"
+
+#: src/protocols/yahoo/yahoo_profile.c:771
+#: src/protocols/yahoo/yahoo_profile.c:772
+msgid "Yahoo! ID"
+msgstr "Yahoo! 絽活��"
+
+#: src/protocols/yahoo/yahoo_profile.c:772
+#: src/protocols/yahoo/yahoo_profile.c:785
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s鐚�</b>%s<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:780 src/protocols/zephyr/zephyr.c:560
+#, c-format
+msgid "<b>Alias:</b> %s<br>"
+msgstr "<b>�ュ��鐚�</b>%s<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:835
+#: src/protocols/yahoo/yahoo_profile.c:838
+#: src/protocols/yahoo/yahoo_profile.c:841
+msgid "Hobbies"
+msgstr "��絅�"
+
+#: src/protocols/yahoo/yahoo_profile.c:850
+#: src/protocols/yahoo/yahoo_profile.c:853
+msgid "Latest News"
+msgstr "���井���"
+
+#: src/protocols/yahoo/yahoo_profile.c:872
+msgid "Home Page"
+msgstr "膓臥��"
+
+#: src/protocols/yahoo/yahoo_profile.c:886
+msgid "Cool Link 1"
+msgstr "�潔�g�(筝�)"
+
+#: src/protocols/yahoo/yahoo_profile.c:890
+msgid "Cool Link 2"
+msgstr "�潔�g�(篋�)"
+
+#: src/protocols/yahoo/yahoo_profile.c:892
+msgid "Cool Link 3"
+msgstr "�潔�g�(筝�)"
+
+#. put a link to the actual profile URL
+#: src/protocols/yahoo/yahoo_profile.c:905 src/util.c:789
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s鐚�</b>"
+
+#: src/protocols/yahoo/yahoo_profile.c:905
+msgid "Profile URL"
+msgstr "��篋肴���膓峨��"
+
 #: src/protocols/yahoo/yahoochat.c:198
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
@@ -9985,11 +10105,6 @@
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>篏睡����鐚�</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:560
-#, c-format
-msgid "<b>Alias:</b> %s<br>"
-msgstr "<b>�ュ��鐚�</b>%s<br>"
-
 #: src/protocols/zephyr/zephyr.c:562
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>�沿����Ǔ�糸��"
@@ -10068,22 +10183,23 @@
 msgid "Exposure"
 msgstr "�乗昆腮�綺�"
 
+#. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:853
+#: src/proxy.c:845
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "��腟�絖���鐚�Proxy 篌堺�����罩∫��荐��� %d ��莖����渇����"
 
-#: src/proxy.c:857
+#: src/proxy.c:849
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "篁g��篌堺�����g���� %d"
 
-#: src/proxy.c:1596
+#: src/proxy.c:1486
 msgid "Invalid proxy settings"
 msgstr "�≧����篁g��篌堺����┃絎�"
 
-#: src/proxy.c:1596
+#: src/proxy.c:1486
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -10091,7 +10207,7 @@
 "絨��惹��������荐㊤���篁g��篌堺��������箴�茯������腟����篌堺������腮怨���荐������≧����"
 
 #. * Custom away message.
-#: src/prpl.h:195
+#: src/prpl.h:177
 msgid "Custom"
 msgstr "篏睡�������"
 
@@ -10106,58 +10222,63 @@
 msgid "Please enter your password"
 msgstr "茫�莠後�ユ����絲�腆�"
 
-#: src/server.c:917
+#: src/server.c:502
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr "%s �壕��援┗�� %s��\n"
+
+#: src/server.c:923
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "鐚�%d ��荐����"
 msgstr[1] "鐚�%d ��荐����"
 
-#: src/server.c:931
+#: src/server.c:937
 msgid "(1 message)"
 msgstr "鐚�筝���荐����"
 
-#: src/server.c:1111 src/server.c:1121
+#: src/server.c:1103 src/server.c:1113
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ャ��"
 
-#: src/server.c:1134
+#: src/server.c:1126
 #, c-format
 msgid "%s signed on"
 msgstr "%s 綏牙��糸��"
 
-#: src/server.c:1150
+#: src/server.c:1142
 #, c-format
 msgid "%s came back"
 msgstr "%s ��箴�篋�"
 
-#: src/server.c:1152
+#: src/server.c:1144
 #, c-format
 msgid "%s went away"
 msgstr "%s 綏牙��∫��"
 
-#: src/server.c:1167
+#: src/server.c:1158
 #, c-format
 msgid "%s became idle"
 msgstr "%s 莅��雁�����咲��臀�"
 
-#: src/server.c:1181
+#: src/server.c:1170
 #, c-format
 msgid "%s became unidle"
 msgstr "%s �演��臀����"
 
-#: src/server.c:1192 src/server.c:1200
+#: src/server.c:1181 src/server.c:1189
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�冴��"
 
-#: src/server.c:1214
+#: src/server.c:1203
 #, c-format
 msgid "%s signed off"
 msgstr "%s 綏牙��糸��"
 
-#: src/server.c:1264
+#: src/server.c:1265
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10166,11 +10287,11 @@
 "%s ����茴� %s 茘���篋���\n"
 "�����域⑥��膈�膣��� %d%%"
 
-#: src/server.c:1267
+#: src/server.c:1268
 msgid "an anonymous person"
 msgstr "筝����水����"
 
-#: src/server.c:1377
+#: src/server.c:1378
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10179,12 +10300,12 @@
 "篏睡������%s����茫� %s �医ソ����紊��鐚���%s��\n"
 "%s"
 
-#: src/server.c:1381
+#: src/server.c:1382
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "篏睡������%s����茫� %s �医ソ����紊��鐚���%s��\n"
 
-#: src/server.c:1387
+#: src/server.c:1388
 msgid "Accept chat invitation?"
 msgstr "�ュ���茫����"
 
@@ -10211,48 +10332,157 @@
 msgid "_Warn"
 msgstr "茘���(_W)"
 
-#: src/util.c:2132
+#: src/util.c:2287
 msgid "Calculating..."
 msgstr "荐�膊�筝�..."
 
-#: src/util.c:2135
+#: src/util.c:2290
 msgid "Unknown."
 msgstr "���ャ��"
 
-#: src/util.c:2166 src/util.c:2171 src/util.c:2176 src/util.c:2179
+#: src/util.c:2321 src/util.c:2326 src/util.c:2331 src/util.c:2334
 msgid "day"
 msgid_plural "days"
 msgstr[0] "��"
 msgstr[1] "��"
 
-#: src/util.c:2167 src/util.c:2171 src/util.c:2185 src/util.c:2187
+#: src/util.c:2322 src/util.c:2326 src/util.c:2340 src/util.c:2342
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "絨��"
 msgstr[1] "鎞��"
 
-#: src/util.c:2167 src/util.c:2176 src/util.c:2185 src/util.c:2190
+#: src/util.c:2322 src/util.c:2331 src/util.c:2340 src/util.c:2345
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "��"
 msgstr[1] "��"
 
-#: src/util.c:2527
+#: src/util.c:2682
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ������������\n"
 
-#: src/win32/win32dep.c:272
+#: src/win32/win32dep.c:273
 msgid "Moving Gaim Settings.."
 msgstr "腱糸��荐㊤�罟�罅�筝�..."
 
-#: src/win32/win32dep.c:275
+#: src/win32/win32dep.c:276
 msgid "Moving Gaim user settings to: "
 msgstr "���� Gaim ��篏睡����荐㊤��������上��Щ�鰹�"
 
-#: src/win32/win32dep.c:277
+#: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "����"
 
+#~ msgid "Syntax error"
+#~ msgstr "茯�羈����"
+
+#~ msgid "Command failed"
+#~ msgstr "��篁ゅけ��"
+
+#~ msgid "Unable to request USR\n"
+#~ msgstr "�≧���緇� USR\n"
+
+#~ msgid "Unable to login using MD5"
+#~ msgstr "�≧�篏睡�� MD5 �糸��"
+
+#~ msgid "Unable to send USR"
+#~ msgstr "�≧����� USR"
+
+#~ msgid "Protocol version not supported"
+#~ msgstr "筝���吨������������荐���絎�"
+
+#~ msgid "Unable to request CVR\n"
+#~ msgstr "�≧���緇� CVR\n"
+
+#~ msgid "Unable to request INF\n"
+#~ msgstr "�≧���緇� INF\n"
+
+#~ msgid "Got invalid XFR"
+#~ msgstr "��緇��≧���� XFR"
+
+#~ msgid "Unable to transfer"
+#~ msgstr "�≧��渇��"
+
+#~ msgid "Unable to parse message."
+#~ msgstr "�≧�茹f��荐�����"
+
+#~ msgid "Unable to write to server"
+#~ msgstr "�≧�絲��ュ�遺失����"
+
+#~ msgid "Error reading from server"
+#~ msgstr "�延失����������主�����"
+
+#~ msgid ""
+#~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+#~ "meant %s@hotmail.com. No changes were made to your allow list."
+#~ msgstr ""
+#~ "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com��"
+#~ "����絨�筝���莅��贋������荐掩�����"
+
+#~ msgid "Invalid MSN screen name"
+#~ msgstr "�≧���� MSN 篏睡����絽活��"
+
+# MSN6.0筝㊥����絨���Block��筝�荅���茘����冴��絨�����
+#~ msgid ""
+#~ "An MSN screen name must be in the form \"user@server.com\". Perhaps you "
+#~ "meant %s@hotmail.com. No changes were made to your block list."
+#~ msgstr ""
+#~ "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com��"
+#~ "����絨�筝���莅��贋����絨���羝�����"
+
+#~ msgid "Unable to write to MSN Nexus server."
+#~ msgstr "�≧�絲��ュ�� MSN �� Nexus 篌堺������"
+
+#~ msgid "MSN Nexus server returned invalid redirect information."
+#~ msgstr "MSN Nexus 篌堺�����喝���≧�������医���莖�荐���"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "筝���吨������荐���絎�"
+
+#~ msgid "The user %s (%s) wants to add you to their buddy list."
+#~ msgstr "篏睡���� %s鐚�%s鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���"
+
+#~ msgid ""
+#~ "Your MSN buddy list for %s is temporarily unavailable. Please wait and "
+#~ "try again."
+#~ msgstr "�����≧���緇� %s ��絅遵�羝����茫������緇���荅���"
+
+#~ msgid "Unable to transfer to notification server"
+#~ msgstr "�≧��渇���渇���ヤ失����"
+
+#~ msgid "An MSN message may not have been received."
+#~ msgstr "���� MSN 荐�����醇�茴��九�違��"
+
+#~ msgid "Co_lorize screen names"
+#~ msgstr "絨�絽活��篁ラ��峨����(_L)"
+
+#~ msgid ""
+#~ "Error reading from %s server. Lastcommand was:\n"
+#~ " %s"
+#~ msgstr "�� %s 篌堺����������主�����鐚���緇�筝�����篁ょ�� %s"
+
+#~ msgid "Window"
+#~ msgstr "荀�腦�"
+
+#~ msgid "Buddy Icons"
+#~ msgstr "絅遵���腓�"
+
+#~ msgid "Typing Notification"
+#~ msgstr "莠後�ラ����"
+
+#~ msgid "Proxy Type"
+#~ msgstr "篁g��篌堺��������"
+
+#~ msgid "IMs"
+#~ msgstr "�恰��荐���"
+
+#~ msgid "Proxy"
+#~ msgstr "篁g��篌堺����"
+
+#~ msgid "Protocols"
+#~ msgstr "��荐���絎�"
+
 #~ msgid "Full Name:\t\t%s\n"
 #~ msgstr "����鐚�������\t%s\n"
 
@@ -10356,9 +10586,6 @@
 #~ msgid "New window _width:"
 #~ msgstr "�域�腦�絲�墾(_W)鐚�"
 
-#~ msgid "New window _height:"
-#~ msgstr "�域�腦�蕭�綺�(_H)鐚�"
-
 #~ msgid "_Entry field height:"
 #~ msgstr "莠後�ユ�蕭�綺�(_E)鐚�"