changeset 9652:1ea8b1dc2b5a

[gaim-migrate @ 10500] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Tue, 03 Aug 2004 23:24:06 +0000 (2004-08-03)
parents 8ce2dc65e591
children 5332ebbf437b
files po/ChangeLog po/zh_CN.po
diffstat 2 files changed, 1469 insertions(+), 1426 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Tue Aug 03 23:22:48 2004 +0000
+++ b/po/ChangeLog	Tue Aug 03 23:24:06 2004 +0000
@@ -1,6 +1,7 @@
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
 version 0.81cvs
+	* Chinese (Simplified) translation updated (Funda Wang)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* English (Canadian) translation updated (Adam Weinberger)
 	* Japanese translation updated (Takeshi Aihana)
--- a/po/zh_CN.po	Tue Aug 03 23:22:48 2004 +0000
+++ b/po/zh_CN.po	Tue Aug 03 23:24:06 2004 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-16 00:15-0400\n"
-"PO-Revision-Date: 2004-07-14 11:58+0800\n"
+"POT-Creation-Date: 2004-08-03 00:00-0400\n"
+"PO-Revision-Date: 2004-08-04 02:09+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"
@@ -16,18 +16,22 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plugins/autorecon.c:174
+#: plugins/autorecon.c:233
 msgid "Error Message Suppression"
 msgstr "��莚�������"
 
-#: plugins/autorecon.c:178
+#: plugins/autorecon.c:237
 msgid "Hide Disconnect Errors"
 msgstr "������菴��ラ��莚�"
 
-#: plugins/autorecon.c:182
+#: plugins/autorecon.c:241
 msgid "Hide Login Errors"
 msgstr "����嶃���莚�"
 
+#: plugins/autorecon.c:245
+msgid "Restore Away State On Reconnent"
+msgstr "���域��ユ�倶�√�胼糸��倶��"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -35,7 +39,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:204
+#: plugins/autorecon.c:267
 msgid "Auto-Reconnect"
 msgstr "������菴�"
 
@@ -43,7 +47,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:207 plugins/autorecon.c:209
+#: plugins/autorecon.c:270 plugins/autorecon.c:272
 msgid "When you are kicked offline, this reconnects you."
 msgstr "絋�����←荼√�堺�ヤ�鐚�腮�綺鎞�篌��������域��ャ��"
 
@@ -142,7 +146,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - 胼糸�"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:727 src/gtkaccount.c:2152
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:734 src/gtkaccount.c:2155
 msgid "Auto-login"
 msgstr "�����糸�"
 
@@ -158,21 +162,21 @@
 msgid "New..."
 msgstr "�医産..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:960
+#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2724
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2893
-#: src/protocols/oscar/oscar.c:532 src/protocols/oscar/oscar.c:5484
-#: src/protocols/oscar/oscar.c:6489 src/protocols/oscar/oscar.c:6689
+#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2722
+#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2891
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6494 src/protocols/oscar/oscar.c:6694
 #: 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:5402 src/protocols/oscar/oscar.c:6697
+#: plugins/docklet/docklet.c:159 src/away.c:565
+#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6702
 msgid "Back"
 msgstr "����"
 
@@ -184,11 +188,11 @@
 msgid "File Transfers"
 msgstr "��篁銀���"
 
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2333
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2336
 msgid "Accounts"
 msgstr "茣���"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2503
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2484
 msgid "Preferences"
 msgstr "薤���蕁�"
 
@@ -298,23 +302,23 @@
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "��莅御����ユ��篁銀賢���巡擦�ユァ�� Gaim��"
 
-#: plugins/gaim-remote/remote.c:89
+#: plugins/gaim-remote/remote.c:90
 msgid "Not connected to AIM"
 msgstr "����ュ�� AIM"
 
-#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
+#: plugins/gaim-remote/remote.c:99 plugins/gaim-remote/remote.c:138
 msgid "No screenname given."
 msgstr "羃≧��膸��榊���桁����"
 
-#: plugins/gaim-remote/remote.c:174
+#: plugins/gaim-remote/remote.c:175
 msgid "No roomname given."
 msgstr "羃≧��膸��肴��紊������"
 
-#: plugins/gaim-remote/remote.c:193
+#: plugins/gaim-remote/remote.c:194
 msgid "Invalid AIM URI"
 msgstr "������ AIM URI"
 
-#: plugins/gaim-remote/remote.c:651
+#: plugins/gaim-remote/remote.c:668
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
@@ -323,7 +327,7 @@
 "絨� %s ��羇丞�絅��ュ�紊沿乾:\n"
 "%s"
 
-#: plugins/gaim-remote/remote.c:674
+#: plugins/gaim-remote/remote.c:691
 msgid "Unable to open socket"
 msgstr "��羈���綣�絅��ュ�"
 
@@ -334,19 +338,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:722
+#: plugins/gaim-remote/remote.c:739
 msgid "Remote Control"
 msgstr "菴�腮��у��"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:725
+#: plugins/gaim-remote/remote.c:742
 msgid "Provides remote control for gaim applications."
 msgstr "��箴� gaim 腮�綺��颷�腮��у�吟��"
 
 #. *  description
-#: plugins/gaim-remote/remote.c:727
+#: plugins/gaim-remote/remote.c:744
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -444,14 +448,14 @@
 #: plugins/gevolution/add_buddy_dialog.c:143
 #: plugins/gevolution/add_buddy_dialog.c:154
 #: plugins/gevolution/assoc-buddy.c:81 plugins/gevolution/assoc-buddy.c:92
-#: src/gtkblist.c:3015 src/gtkprefs.c:961 src/gtkprefs.c:1014
-#: src/gtkprefs.c:1822 src/protocols/jabber/jabber.c:924
+#: src/gtkblist.c:3006 src/gtkprefs.c:956 src/gtkprefs.c:1008
+#: src/gtkprefs.c:1816 src/protocols/jabber/jabber.c:924
 msgid "None"
 msgstr "��"
 
 #: plugins/gevolution/add_buddy_dialog.c:187
-#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2175
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
+#: plugins/gevolution/assoc-buddy.c:175 src/gtkprefs.c:2157
+#: src/gtkroomlist.c:552 src/protocols/jabber/jabber.c:598
 #: src/protocols/msn/msn.c:1311 src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "��腱�"
@@ -467,13 +471,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6975
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6978
 msgid "Search"
 msgstr "��膣�"
 
 #: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
-#: src/gtkblist.c:4374
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4044
+#: src/gtkblist.c:4372
 msgid "Group:"
 msgstr "膸�:"
 
@@ -510,7 +514,7 @@
 msgstr "�活��絅遵�(_A)"
 
 #: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:89
-#: src/blist.c:775 src/blist.c:963 src/blist.c:1870 src/gtkblist.c:3867
+#: src/blist.c:775 src/blist.c:963 src/blist.c:1899 src/gtkblist.c:3865
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "絅遵�"
@@ -529,7 +533,7 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "�����絨�絅遵�����兄���医���茣��激��"
 
-#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:619
 msgid "Account"
 msgstr "茣���"
 
@@ -574,8 +578,8 @@
 msgstr "蘂�紊�篆≧��:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:378
-#: src/gtkaccount.c:408 src/protocols/oscar/oscar.c:438
+#: plugins/gevolution/new_person_dialog.c:338 src/gtkaccount.c:380
+#: src/gtkaccount.c:410 src/protocols/oscar/oscar.c:422
 msgid "Buddy Icon"
 msgstr "絅遵��丈��"
 
@@ -640,7 +644,7 @@
 msgid "_Set"
 msgstr "莅丞舟(_S)"
 
-#: plugins/idle.c:67 src/dialogs.c:786
+#: plugins/idle.c:67 src/dialogs.c:808
 msgid "_Cancel"
 msgstr "��羔�(_C)"
 
@@ -800,14 +804,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:531
+#: plugins/perl/perl.c:532
 msgid "Perl Plugin Loader"
 msgstr "Perl ��篁区��ュ��"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:533 plugins/perl/perl.c:534
+#: plugins/perl/perl.c:534 plugins/perl/perl.c:535
 msgid "Provides support for loading perl plugins."
 msgstr "��箴�茖��� Perl ��篁句��������"
 
@@ -886,7 +890,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:566
+#: plugins/signals-test.c:582
 msgid "Signals Test"
 msgstr "篆≦垽�莚�"
 
@@ -894,7 +898,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:569 plugins/signals-test.c:571
+#: plugins/signals-test.c:585 plugins/signals-test.c:587
 msgid "Test to see that all signals are working properly."
 msgstr "羌�莚�����������篆≦垽�����遵轡篏�罩g`��"
 
@@ -975,7 +979,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:312
+#: plugins/ssl/ssl-nss.c:314
 msgid "NSS"
 msgstr "NSS"
 
@@ -983,7 +987,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:317 plugins/ssl/ssl-nss.c:319
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "��箴���菴� Mozilla NSS �� SSL ������"
 
@@ -1006,26 +1010,38 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "��箴� SSL ����綺���"
 
-#: plugins/statenotify.c:30
+#: plugins/statenotify.c:37
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 莎遺���"
 
-#: plugins/statenotify.c:36
+#: plugins/statenotify.c:44
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ���ヤ���"
 
-#: plugins/statenotify.c:42
+#: plugins/statenotify.c:51
 #, c-format
 msgid "%s has become idle."
 msgstr "%s ��莎欠���<��"
 
-#: plugins/statenotify.c:48
+#: plugins/statenotify.c:58
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s �♂��篋���"
 
+#: plugins/statenotify.c:69
+msgid "Notify When"
+msgstr "���ユ����"
+
+#: plugins/statenotify.c:72
+msgid "Buddy Goes _Away"
+msgstr "絅遵�胼糸�(_A)"
+
+#: plugins/statenotify.c:75
+msgid "Buddy Goes _Idle"
+msgstr "絅遵�����(_I)"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -1033,7 +1049,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:78
+#: plugins/statenotify.c:113
 msgid "Buddy State Notification"
 msgstr "絅遵��倶������"
 
@@ -1041,7 +1057,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:81 plugins/statenotify.c:84
+#: plugins/statenotify.c:116 plugins/statenotify.c:119
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1129,7 +1145,7 @@
 msgstr "���恰�倶�����d賢�丞ず羯���(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:955
+#: plugins/win32/transparency/win2ktrans.c:405 src/gtkprefs.c:950
 msgid "Buddy List Window"
 msgstr "絅遵���茵����"
 
@@ -1181,8 +1197,8 @@
 msgstr "Windows �����九���� Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3058
-#: src/gtkprefs.c:2412
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3051
+#: src/gtkprefs.c:2394
 msgid "Buddy List"
 msgstr "絅遵���茵�"
 
@@ -1201,8 +1217,8 @@
 msgstr "絅遵���茵���e幻絮�蕁句�(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1006
-#: src/gtkprefs.c:2413 src/protocols/msn/msn.c:1638
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1001
+#: src/gtkprefs.c:2395 src/protocols/msn/msn.c:1639
 msgid "Conversations"
 msgstr "絲壕�"
 
@@ -1222,12 +1238,12 @@
 msgid "About Gaim"
 msgstr "�割� Gaim"
 
-#: src/about.c:75
+#: src/about.c:74
 #, c-format
 msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#: src/about.c:95
+#: src/about.c:94
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -1237,215 +1253,215 @@
 "IRC��SILC��Novell GroupWise��Napster��Zephyr �� Gadu-Gadu�����綺�� Gtk+ ��"
 "����綛銀札 GPL 莅後��顒��茵���<BR><BR>"
 
-#: src/about.c:106
+#: src/about.c:105
 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
+msgid "Active Developers"
+msgstr "綵���綣�����"
+
 #: src/about.c:111
-msgid "Active Developers"
-msgstr "綵���綣�����"
-
-#: src/about.c:112
 msgid "maintainer"
 msgstr "膸贋�よ��"
 
-#: src/about.c:114
+#: src/about.c:113
 msgid "lead developer"
 msgstr "蘂�絲弱�����"
 
+#: src/about.c:116
+msgid "developer & webmaster"
+msgstr "綣�������臀�膊�"
+
 #: src/about.c:117
-msgid "developer & webmaster"
-msgstr "綣�������臀�膊�"
-
-#: src/about.c:118
 msgid "win32 port"
 msgstr "Win32 腱紙�"
 
-#: src/about.c:121 src/about.c:122 src/about.c:123 src/about.c:124
+#: src/about.c:120 src/about.c:121 src/about.c:122 src/about.c:123
 msgid "developer"
 msgstr "綣�����"
 
-#: src/about.c:125
+#: src/about.c:124
 msgid "support"
 msgstr "����"
 
-#: src/about.c:132
+#: src/about.c:131
 msgid "Crazy Patch Writers"
 msgstr "����茵ヤ�膽�����"
 
+#: src/about.c:147
+msgid "Retired Developers"
+msgstr "��篌�綣�����"
+
 #: src/about.c:148
-msgid "Retired Developers"
-msgstr "��篌�綣�����"
-
-#: src/about.c:149
 msgid "former libfaim maintainer"
 msgstr "���� libfaim 膸贋�よ��"
 
-#: src/about.c:150
+#: src/about.c:149
 msgid "former lead developer"
 msgstr "����蘂�絲弱�����"
 
-#: src/about.c:153
+#: src/about.c:152
 msgid "former maintainer"
 msgstr "����膸贋�よ��"
 
-#: src/about.c:154
+#: src/about.c:153
 msgid "former Jabber developer"
 msgstr "���� Jabber 綣�����"
 
-#: src/about.c:155
+#: src/about.c:154
 msgid "original author"
 msgstr "��篏���"
 
-#: src/about.c:158
+#: src/about.c:157
 msgid "hacker and designated driver [lazy bum]"
 msgstr "薨�絎√��筝�絮�薊怨���綺�[lazy bum]"
 
-#: src/about.c:166
+#: src/about.c:165
 msgid "Current Translators"
 msgstr "綵���膺肢���"
 
+#: src/about.c:166 src/about.c:205
+msgid "Bulgarian"
+msgstr "篆������莚�"
+
 #: src/about.c:167 src/about.c:206
-msgid "Bulgarian"
-msgstr "篆������莚�"
-
-#: src/about.c:168 src/about.c:207
 msgid "Catalan"
 msgstr "��羈亥�絨寂�莚�"
 
-#: src/about.c:169 src/about.c:208
+#: src/about.c:168 src/about.c:207
 msgid "Czech"
 msgstr "�桁��莚�"
 
+#: src/about.c:169
+msgid "Danish"
+msgstr "筝拷墾莚�"
+
 #: src/about.c:170
-msgid "Danish"
-msgstr "筝拷墾莚�"
-
-#: src/about.c:171
 msgid "British English"
 msgstr "�怨�処�沿�"
 
-#: src/about.c:172
+#: src/about.c:171
 msgid "Canadian English"
 msgstr "���水ぇ�沿�"
 
-#: src/about.c:173 src/about.c:209
+#: src/about.c:172 src/about.c:208
 msgid "German"
 msgstr "緇決�"
 
-#: src/about.c:174 src/about.c:210
+#: src/about.c:173 src/about.c:209
 msgid "Spanish"
 msgstr "茱睡���莚�"
 
-#: src/about.c:175 src/about.c:211
+#: src/about.c:174 src/about.c:210
 msgid "Finnish"
 msgstr "���域�"
 
-#: src/about.c:176 src/about.c:212
+#: src/about.c:175 src/about.c:211
 msgid "French"
 msgstr "羈�莚�"
 
+#: src/about.c:176
+msgid "Hebrew"
+msgstr "絽�篌�ア莚�"
+
 #: src/about.c:177
-msgid "Hebrew"
-msgstr "絽�篌�ア莚�"
-
-#: src/about.c:178
 msgid "Hindi"
 msgstr "�医�域�"
 
-#: src/about.c:179
+#: src/about.c:178
 msgid "Hungarian"
 msgstr "�������"
 
+#: src/about.c:179 src/about.c:212
+msgid "Italian"
+msgstr "�鎀у���"
+
 #: src/about.c:180 src/about.c:213
-msgid "Italian"
-msgstr "�鎀у���"
-
-#: src/about.c:181 src/about.c:214
 msgid "Japanese"
 msgstr "�ヨ�"
 
-#: src/about.c:182
+#: src/about.c:181
 msgid "Lithuanian"
 msgstr "腴��九�莚�"
 
-#: src/about.c:183 src/about.c:215
+#: src/about.c:182 src/about.c:214
 msgid "Korean"
 msgstr "��蕾�莚�"
 
-#: src/about.c:184
+#: src/about.c:183
 msgid "Dutch; Flemish"
 msgstr "�桁�域�"
 
+#: src/about.c:184
+msgid "Macedonian"
+msgstr "薊��狗/莚�"
+
 #: src/about.c:185
-msgid "Macedonian"
-msgstr "薊��狗/莚�"
-
-#: src/about.c:186
 msgid "Norwegian"
 msgstr "���莚�"
 
-#: src/about.c:187 src/about.c:216
+#: src/about.c:186 src/about.c:215
 msgid "Polish"
 msgstr "羈√�域�"
 
-#: src/about.c:188
+#: src/about.c:187
 msgid "Portuguese"
 msgstr "�∴����莚�"
 
+#: src/about.c:188
+msgid "Portuguese-Brazil"
+msgstr "綏頑タ�∴����莚�"
+
 #: src/about.c:189
-msgid "Portuguese-Brazil"
-msgstr "綏頑タ�∴����莚�"
-
-#: src/about.c:190
 msgid "Romanian"
 msgstr "臀�薊�絢篋�莚�"
 
-#: src/about.c:191 src/about.c:217 src/about.c:218
+#: src/about.c:190 src/about.c:216 src/about.c:217
 msgid "Russian"
 msgstr "篆�莚�"
 
+#: src/about.c:191
+msgid "Serbian"
+msgstr "紂�絨�膸岩�莚�"
+
 #: src/about.c:192
-msgid "Serbian"
-msgstr "紂�絨�膸岩�莚�"
-
-#: src/about.c:193
 msgid "Slovenian"
 msgstr "�����絨寂�莚�"
 
-#: src/about.c:194 src/about.c:220
+#: src/about.c:193 src/about.c:219
 msgid "Swedish"
 msgstr "���梧�"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "Vietnamese"
 msgstr "莇���莚�"
 
-#: src/about.c:195
+#: src/about.c:194
 msgid "and the Gnome-Vi Team"
 msgstr "�� Gnome 莇���莚㊤�∫��"
 
+#: src/about.c:195
+msgid "Simplified Chinese"
+msgstr "膊�篏�筝㊥��"
+
 #: src/about.c:196
-msgid "Simplified Chinese"
-msgstr "膊�篏�筝㊥��"
-
-#: src/about.c:197
 msgid "Traditional Chinese"
 msgstr "膵�篏�筝㊥��"
 
+#: src/about.c:203
+msgid "Past Translators"
+msgstr "����膺肢���"
+
 #: src/about.c:204
-msgid "Past Translators"
-msgstr "����膺肢���"
-
-#: src/about.c:205
 msgid "Amharic"
 msgstr "�水�����莚�"
 
-#: src/about.c:219
+#: src/about.c:218
 msgid "Slovak"
 msgstr "���篌���莚�"
 
-#: src/about.c:221
+#: src/about.c:220
 msgid "Chinese"
 msgstr "筝㊥��"
 
@@ -1481,46 +1497,46 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:197 src/dialogs.c:462 src/dialogs.c:518
-#: src/dialogs.c:571 src/gtkblist.c:2391 src/gtkrequest.c:242
+#: src/account.c:342 src/connection.c:197 src/dialogs.c:473 src/dialogs.c:529
+#: src/dialogs.c:582 src/gtkblist.c:2380 src/gtkrequest.c:242
 #: src/protocols/jabber/jabber.c:1048 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:3370 src/protocols/oscar/oscar.c:3464
-#: src/protocols/oscar/oscar.c:6758 src/protocols/oscar/oscar.c:6854
-#: src/protocols/oscar/oscar.c:6906 src/protocols/oscar/oscar.c:6992
+#: src/protocols/oscar/oscar.c:3361 src/protocols/oscar/oscar.c:3455
+#: src/protocols/oscar/oscar.c:6765 src/protocols/oscar/oscar.c:6857
+#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6995
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
-#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1063
-#: src/protocols/silc/ops.c:1671 src/protocols/silc/silc.c:692
-#: src/protocols/yahoo/yahoo.c:2752 src/protocols/yahoo/yahoo.c:2761
+#: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1072
+#: src/protocols/silc/ops.c:1680 src/protocols/silc/silc.c:692
+#: src/protocols/yahoo/yahoo.c:2795 src/protocols/yahoo/yahoo.c:2804
 #: src/request.h:1243
 msgid "OK"
 msgstr "隋��"
 
-#: src/account.c:343 src/account.c:381 src/away.c:334 src/connection.c:198
+#: src/account.c:343 src/account.c:381 src/away.c:349 src/connection.c:198
 #: 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:2002
-#: src/gtkaccount.c:2498 src/gtkblist.c:2392 src/gtkblist.c:4412
-#: 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/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
+#: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
+#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
+#: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 #: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:702
 #: src/protocols/jabber/jabber.c:667 src/protocols/jabber/jabber.c:1049
 #: 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:1377 src/protocols/oscar/oscar.c:3330
-#: src/protocols/oscar/oscar.c:3371 src/protocols/oscar/oscar.c:3408
-#: src/protocols/oscar/oscar.c:3465 src/protocols/oscar/oscar.c:6759
-#: src/protocols/oscar/oscar.c:6855 src/protocols/oscar/oscar.c:6907
-#: src/protocols/oscar/oscar.c:6976 src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:1363 src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3362 src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6766
+#: src/protocols/oscar/oscar.c:6858 src/protocols/oscar/oscar.c:6910
+#: src/protocols/oscar/oscar.c:6979 src/protocols/oscar/oscar.c:6996
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
 #: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
-#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1672
+#: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1681
 #: src/protocols/silc/silc.c:693 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2753 src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:2796 src/protocols/yahoo/yahoo.c:2805
 #: src/request.h:1243 src/request.h:1253
 msgid "Cancel"
 msgstr "��羔�"
@@ -1535,34 +1551,34 @@
 msgid "Save"
 msgstr "篆�絖�"
 
-#: src/away.c:211
+#: src/away.c:227
 msgid "Away!"
 msgstr "胼糸�!"
 
-#: src/away.c:276
+#: src/away.c:291
 msgid "I'm Back!"
 msgstr "�����ヤ�鐚�"
 
-#: src/away.c:330
+#: src/away.c:345
 #, c-format
 msgid "Are you sure you want to remove the away message \"%s\"?"
 msgstr "�������活����ょ�綣�羔�����%s����鐚�"
 
-#: src/away.c:332 src/away.c:423
+#: src/away.c:347 src/away.c:438
 msgid "Remove Away Message"
 msgstr "���ょ�綣�羔���"
 
 #. Remove button
-#: src/away.c:333 src/gtkconv.c:1388 src/gtkconv.c:3680 src/gtkconv.c:3784
+#: src/away.c:348 src/gtkconv.c:1378 src/gtkconv.c:3718 src/gtkconv.c:3822
 #: src/gtkrequest.c:248
 msgid "Remove"
 msgstr "����"
 
-#: src/away.c:403
+#: src/away.c:418
 msgid "New Away Message"
 msgstr "�医産胼糸�羔���"
 
-#: src/away.c:618
+#: src/away.c:633
 msgid "Set All Away"
 msgstr "�����筝榊�綣�"
 
@@ -1570,7 +1586,7 @@
 msgid "Chats"
 msgstr "��紊�"
 
-#: src/blist.c:1321
+#: src/blist.c:1318
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1582,23 +1598,18 @@
 "%2$s 膸�筝㊦�� %1$d 筝�ソ�������わ��������区侃�傑���糸�ャ��菴�篋�絅遵���莚ョ�筝�篌�茴���"
 "�ゃ��\n"
 
-#: src/blist.c:1330
+#: src/blist.c:1327
 msgid "Group not removed"
 msgstr "膸�������"
 
-#: src/blist.c:1393 src/gtkaccount.c:167 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2736
-msgid "Unknown"
-msgstr "����"
-
-#: src/blist.c:2001
+#: src/blist.c:2030
 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:2004
+#: src/blist.c:2033
 msgid "Buddy List Error"
 msgstr "絅遵���茵��咲��"
 
@@ -1620,71 +1631,71 @@
 msgid "Enter password for %s"
 msgstr "莨��� %s ��絲���"
 
-#: src/conversation.c:261
+#: src/conversation.c:229
 msgid "Unable to send message. The message is too large."
 msgstr "��羈�����羔�����羔���お紊с��"
 
-#: src/conversation.c:269
+#: src/conversation.c:237
 msgid "Unable to send message."
 msgstr "��羈�����羔�����"
 
-#: src/conversation.c:1953
+#: src/conversation.c:1950
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 菴��ヤ���紊����"
 
-#: src/conversation.c:1956
+#: src/conversation.c:1953
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 菴��ヤ���紊����"
 
-#: src/conversation.c:2047
+#: src/conversation.c:2049
 #, c-format
 msgid "You are now known as %s"
 msgstr "��ー��û�� %s"
 
-#: src/conversation.c:2050
+#: src/conversation.c:2052
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �医��û�� %s��"
 
-#: src/conversation.c:2092
+#: src/conversation.c:2093
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 胼糸�篋���紊��(%s)��"
 
-#: src/conversation.c:2094
+#: src/conversation.c:2095
 #, c-format
 msgid "%s left the room."
 msgstr "%s 胼糸�篋���紊����"
 
-#: src/conversation.c:2165
+#: src/conversation.c:2164
 #, c-format
 msgid "(+%d more)"
 msgstr "(菴��� %d 篋�)"
 
-#: src/conversation.c:2167
+#: src/conversation.c:2166
 #, c-format
 msgid " left the room (%s)."
 msgstr "胼糸�篋���紊��(%s)��"
 
-#: src/conversation.c:2457
+#: src/conversation.c:2571
 msgid "Last created window"
 msgstr "筝�罨≦��綮榊��腦���"
 
-#: src/conversation.c:2459
+#: src/conversation.c:2573
 msgid "Separate IM and Chat windows"
 msgstr "��胼糸�恰�倶�������紊����"
 
-#: src/conversation.c:2461 src/gtkprefs.c:1384
+#: src/conversation.c:2575 src/gtkprefs.c:1377
 msgid "New window"
 msgstr "�医産腦���"
 
-#: src/conversation.c:2463
+#: src/conversation.c:2577
 msgid "By group"
 msgstr "��膸�"
 
-#: src/conversation.c:2465
+#: src/conversation.c:2579
 msgid "By account"
 msgstr "��茣���"
 
@@ -1757,100 +1768,100 @@
 msgid "Remove Contact"
 msgstr "���よ��膤私査"
 
-#: src/dialogs.c:444 src/dialogs.c:500 src/dialogs.c:552
+#: src/dialogs.c:455 src/dialogs.c:511 src/dialogs.c:563
 msgid "_Screen name"
 msgstr "���桁��(_S)"
 
-#: src/dialogs.c:450 src/dialogs.c:506 src/dialogs.c:558
+#: src/dialogs.c:461 src/dialogs.c:517 src/dialogs.c:569
 msgid "_Account"
 msgstr "茣���(_A)"
 
-#: src/dialogs.c:457
+#: src/dialogs.c:468
 msgid "New Instant Message"
 msgstr "�医�恰�倶���"
 
-#: src/dialogs.c:459
+#: src/dialogs.c:470
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr "���活�莊�莪���鐚�莚決��ヤ�/絅合�����桁����"
 
-#: src/dialogs.c:513
+#: src/dialogs.c:524
 msgid "Get User Info"
 msgstr "�桁����隙拭��"
 
-#: src/dialogs.c:515
+#: src/dialogs.c:526
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr "���活��ョ��莪���篆≧���莚決��ヤ�/絅合�����桁����"
 
-#: src/dialogs.c:566
+#: src/dialogs.c:577
 msgid "Get User Log"
 msgstr "�桁����傑�ュ�"
 
-#: src/dialogs.c:568
+#: src/dialogs.c:579
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr "���活��ョ��莪����ュ�鐚�莚決��ヤ�/絅合�����桁����"
 
-#: src/dialogs.c:623
+#: src/dialogs.c:645
 msgid "You cannot save an away message with a blank title"
 msgstr "����巡�絖�腥堺��蘂���胼糸�羔���"
 
-#: src/dialogs.c:625
+#: src/dialogs.c:647
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "莚欠�羔�����絎���蘂�鐚�����筝�篆�絖��贋・��篏睡������"
 
-#: src/dialogs.c:635
+#: src/dialogs.c:657
 msgid "You cannot create an empty away message"
 msgstr "����遵��綮榊���胼糸�羔���"
 
-#: src/dialogs.c:697
+#: src/dialogs.c:719
 msgid "New away message"
 msgstr "�医産胼糸�羔���"
 
-#: src/dialogs.c:718
+#: src/dialogs.c:740
 msgid "Away title: "
 msgstr "胼糸���蘂�:"
 
-#: src/dialogs.c:774
+#: src/dialogs.c:796
 msgid "_Save"
 msgstr "篆�絖�(_S)"
 
-#: src/dialogs.c:778
+#: src/dialogs.c:800
 msgid "Sa_ve & Use"
 msgstr "篆�絖�綛銀戎��(_V)"
 
-#: src/dialogs.c:782
-msgid "_Use"
-msgstr "篏睡��(_U)"
-
 #: src/dialogs.c:804
+msgid "_Use"
+msgstr "篏睡��(_U)"
+
+#: src/dialogs.c:826
 msgid "Alias Chat"
 msgstr "膸���紊�儀��"
 
-#: src/dialogs.c:805
+#: src/dialogs.c:827
 msgid "Enter an alias for this chat."
 msgstr "莚決��ユ④��紊���������"
 
-#: src/dialogs.c:807 src/dialogs.c:823 src/dialogs.c:841 src/gtkrequest.c:250
+#: src/dialogs.c:829 src/dialogs.c:845 src/dialogs.c:863 src/gtkrequest.c:250
 #: src/protocols/silc/chat.c:572
 msgid "Alias"
 msgstr "����"
 
-#: src/dialogs.c:820
+#: src/dialogs.c:842
 msgid "Alias Contact"
 msgstr "膸���膤私査莎桁��"
 
-#: src/dialogs.c:821
+#: src/dialogs.c:843
 msgid "Enter an alias for this contact."
 msgstr "莚決��ユ④��膤私査��������"
 
-#: src/dialogs.c:837
+#: src/dialogs.c:859
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "莨��� %s ��������"
 
-#: src/dialogs.c:839
+#: src/dialogs.c:861
 msgid "Alias Buddy"
 msgstr "絅遵�����"
 
@@ -1918,6 +1929,9 @@
 "\n"
 "    COMMANDS:\n"
 "       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
@@ -1927,16 +1941,19 @@
 "\n"
 "    �巡擦:\n"
 "       uri                      紊��� AIM: URI\n"
+"       away                     綣劫�阪研藥�莅や拭����胼糸�絲壕�罅�\n"
+"       back                     ���ょ�綣�絲壕�罅�\n"
 "       quit                     �渇�� Gaim ��菴�茵�����\n"
 "\n"
 "    ��蕁�:\n"
 "       -h, --help [�巡擦]        �丞ず�巡擦絽���\n"
 
-#: src/gaim-remote.c:174 src/gaim-remote.c:190
+#: src/gaim-remote.c:176 src/gaim-remote.c:192 src/gaim-remote.c:208
+#: src/gaim-remote.c:224
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim ���茵�(篌�莚� 0)\n"
 
-#: src/gaim-remote.c:203
+#: src/gaim-remote.c:238
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1976,7 +1993,7 @@
 "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
 "...��腓堺�����Penguin����筝阪ソ����\n"
 
-#: src/gaim-remote.c:222
+#: src/gaim-remote.c:257
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
@@ -1984,28 +2001,12 @@
 "\n"
 "�渇�� Gaim ��菴�茵�����\n"
 
-#. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:46
-msgid "sorry, i ran out for a while. bbl"
-msgstr "絲剛�莎件���筝贋�倶��篋�胼糸�筝�篌��帥��藝紫�����������膸�����"
-
-#: src/gaimrc.c:372 src/gaimrc.c:1417
-msgid "boring default"
-msgstr "筝贋�倶��篋�"
-
-#: src/gaimrc.c:1227 src/gtkblist.c:3017
-msgid "Alphabetical"
-msgstr "��絖�罸�綺�"
-
-#: src/gaimrc.c:1229 src/gtkblist.c:3018
-msgid "By status"
-msgstr "���倶��"
-
-#: src/gaimrc.c:1231 src/gtkblist.c:3019
-msgid "By log size"
-msgstr "���ュ�紊у�"
-
-#: src/gtkaccount.c:331
+#: src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2734
+msgid "Unknown"
+msgstr "����"
+
+#: src/gtkaccount.c:333
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2017,164 +2018,164 @@
 "<b>�上�鎀у�:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:614
+#: src/gtkaccount.c:621
 msgid "Login Options"
 msgstr "�糸�ラ��蕁�"
 
-#: src/gtkaccount.c:631
+#: src/gtkaccount.c:638
 msgid "Protocol:"
 msgstr "�顒�:"
 
-#: src/gtkaccount.c:636 src/gtkblist.c:4018
+#: src/gtkaccount.c:643 src/gtkblist.c:4016
 msgid "Screen Name:"
 msgstr "���桁��:"
 
-#: src/gtkaccount.c:709
+#: src/gtkaccount.c:716
 msgid "Password:"
 msgstr "絲���:"
 
-#: src/gtkaccount.c:714 src/gtkblist.c:4032 src/gtkblist.c:4360
+#: src/gtkaccount.c:721 src/gtkblist.c:4030 src/gtkblist.c:4358
 msgid "Alias:"
 msgstr "����:"
 
-#: src/gtkaccount.c:718
+#: src/gtkaccount.c:725
 msgid "Remember password"
 msgstr "莅遺�絲���"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:774
+#: src/gtkaccount.c:781
 msgid "User Options"
 msgstr "���潔��蕁�"
 
-#: src/gtkaccount.c:787
+#: src/gtkaccount.c:794
 msgid "New mail notifications"
 msgstr "�育��散����"
 
-#: src/gtkaccount.c:796
+#: src/gtkaccount.c:803
 msgid "Buddy icon:"
 msgstr "絅遵��丈��:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:885
+#: src/gtkaccount.c:892
 #, c-format
 msgid "%s Options"
 msgstr "%s ��蕁�"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:1021 src/gtkaccount.c:1068
+#: src/gtkaccount.c:1028 src/gtkaccount.c:1075
 msgid "Use Global Proxy Settings"
 msgstr "篏睡�����篁g��莅丞舟"
 
 #. No Proxy
-#: src/gtkaccount.c:1027 src/gtkaccount.c:1075
+#: src/gtkaccount.c:1034 src/gtkaccount.c:1082
 msgid "No Proxy"
 msgstr "��篁g��"
 
 #. HTTP
-#: src/gtkaccount.c:1033 src/gtkaccount.c:1082
+#: src/gtkaccount.c:1040 src/gtkaccount.c:1089
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:1039 src/gtkaccount.c:1089
+#: src/gtkaccount.c:1046 src/gtkaccount.c:1096
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:1045 src/gtkaccount.c:1096
+#: src/gtkaccount.c:1052 src/gtkaccount.c:1103
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1051 src/gtkaccount.c:1103 src/gtkprefs.c:1187
+#: src/gtkaccount.c:1058 src/gtkaccount.c:1110 src/gtkprefs.c:1180
 msgid "Use Environmental Settings"
 msgstr "篏睡��ッ紜�莅丞舟"
 
-#: src/gtkaccount.c:1142
+#: src/gtkaccount.c:1149
 msgid "you can see the butterflies mating"
 msgstr "���ュ�����"
 
-#: src/gtkaccount.c:1146
+#: src/gtkaccount.c:1153
 msgid "If you look real closely"
 msgstr "筝�篋���莵�莊�"
 
-#: src/gtkaccount.c:1162
+#: src/gtkaccount.c:1169
 msgid "Proxy Options"
 msgstr "篁g����蕁�"
 
-#: src/gtkaccount.c:1180 src/gtkprefs.c:1181
+#: src/gtkaccount.c:1187 src/gtkprefs.c:1174
 msgid "Proxy _type:"
 msgstr "篁g��膠糸��(_T):"
 
-#: src/gtkaccount.c:1189 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1196 src/gtkprefs.c:1201
 msgid "_Host:"
 msgstr "筝紙��(_H):"
 
-#: src/gtkaccount.c:1193 src/gtkprefs.c:1226
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1219
 msgid "_Port:"
 msgstr "腴��(_P):"
 
-#: src/gtkaccount.c:1201
+#: src/gtkaccount.c:1208
 msgid "_Username:"
 msgstr "���桁��(_U):"
 
-#: src/gtkaccount.c:1206 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1213 src/gtkprefs.c:1256
 msgid "Pa_ssword:"
 msgstr "絲���(_S):"
 
-#: src/gtkaccount.c:1578
+#: src/gtkaccount.c:1581
 msgid "Add Account"
 msgstr "羞糸��茣���"
 
-#: src/gtkaccount.c:1580
+#: src/gtkaccount.c:1583
 msgid "Modify Account"
 msgstr "篆��壕侃��"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1604
+#: src/gtkaccount.c:1607
 msgid "Show more options"
 msgstr "�丞ず������蕁�"
 
-#: src/gtkaccount.c:1605
+#: src/gtkaccount.c:1608
 msgid "Show fewer options"
 msgstr "�丞ず筝肢���蕁�"
 
 #. Register button
-#: src/gtkaccount.c:1632 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1635 src/protocols/jabber/jabber.c:666
 msgid "Register"
 msgstr "羈���"
 
-#: src/gtkaccount.c:1997
+#: src/gtkaccount.c:2000
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�������活����� %s ��鐚�"
 
-#: src/gtkaccount.c:2001 src/gtkrequest.c:246
+#: src/gtkaccount.c:2004 src/gtkrequest.c:246
 msgid "Delete"
 msgstr "����"
 
-#: src/gtkaccount.c:2115 src/protocols/oscar/oscar.c:3998
+#: src/gtkaccount.c:2118 src/protocols/oscar/oscar.c:3990
 msgid "Screen Name"
 msgstr "���桁��"
 
-#: src/gtkaccount.c:2139 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:538 src/protocols/oscar/oscar.c:5482
-#: src/protocols/oscar/oscar.c:6688 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2515 src/protocols/zephyr/zephyr.c:1360
-#: src/protocols/zephyr/zephyr.c:1372
+#: src/gtkaccount.c:2142 src/protocols/jabber/jabber.c:958
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5482
+#: src/protocols/oscar/oscar.c:6693 src/protocols/silc/silc.c:44
+#: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1363
+#: src/protocols/zephyr/zephyr.c:1375
 msgid "Online"
 msgstr "��鎖"
 
-#: src/gtkaccount.c:2160
+#: src/gtkaccount.c:2163
 msgid "Protocol"
 msgstr "�顒�"
 
-#: src/gtkaccount.c:2473
+#: src/gtkaccount.c:2476
 #, 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:2487
+#: src/gtkaccount.c:2490
 msgid ""
 "\n"
 "\n"
@@ -2184,228 +2185,228 @@
 "\n"
 "�������活�絨�篁�/絅号兄��筝堺����絅遵�鐚�"
 
-#: src/gtkaccount.c:2491
+#: src/gtkaccount.c:2494
 msgid "Information"
 msgstr "篆≧��"
 
-#: src/gtkaccount.c:2495
+#: src/gtkaccount.c:2498
 msgid "Add buddy to your list?"
 msgstr "絨����桁��筝阪ソ����鐚�"
 
 #. Add button
-#: src/gtkaccount.c:2497 src/gtkblist.c:4411 src/gtkconv.c:1390
-#: src/gtkconv.c:3673 src/gtkconv.c:3777 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3627
+#: src/gtkaccount.c:2500 src/gtkblist.c:4409 src/gtkconv.c:1380
+#: src/gtkconv.c:3711 src/gtkconv.c:3815 src/gtkrequest.c:247
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3618
 #: src/protocols/silc/chat.c:581
 msgid "Add"
 msgstr "羞糸��"
 
-#: src/gtkblist.c:815
+#: src/gtkblist.c:802
 msgid "Join a Chat"
 msgstr "���ヨ��紊�"
 
-#: src/gtkblist.c:836
+#: src/gtkblist.c:823
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "莚決��ユ���活����ョ����紊���絲劫�篆≧����\n"
 
-#: src/gtkblist.c:847 src/gtkpounce.c:412 src/gtkroomlist.c:354
+#: src/gtkblist.c:834 src/gtkpounce.c:411 src/gtkroomlist.c:353
 msgid "_Account:"
 msgstr "茣���(_A):"
 
-#: src/gtkblist.c:1133 src/gtkblist.c:3212
+#: src/gtkblist.c:1122 src/gtkblist.c:3204
 msgid "Get _Info"
 msgstr "�桁�篆≧��(_I)"
 
-#: src/gtkblist.c:1136 src/gtkblist.c:3203
+#: src/gtkblist.c:1125 src/gtkblist.c:3194
 msgid "I_M"
 msgstr "綣���(_M)"
 
-#: src/gtkblist.c:1141
+#: src/gtkblist.c:1130
 msgid "_Send File"
 msgstr "������篁�(_S)"
 
-#: src/gtkblist.c:1145
+#: src/gtkblist.c:1134
 msgid "Add Buddy _Pounce"
 msgstr "羞糸��絅遵�������(_P)"
 
-#: src/gtkblist.c:1147
+#: src/gtkblist.c:1136
 msgid "View _Log"
 msgstr "�ョ���ュ�(_L)"
 
-#: src/gtkblist.c:1155 src/gtkblist.c:1241 src/gtkblist.c:1255
+#: src/gtkblist.c:1144 src/gtkblist.c:1230 src/gtkblist.c:1244
 msgid "_Alias..."
 msgstr "����(_A)..."
 
-#: src/gtkblist.c:1157 src/gtkblist.c:1243 src/gtkblist.c:1260
-#: src/gtkconn.c:361
+#: src/gtkblist.c:1146 src/gtkblist.c:1232 src/gtkblist.c:1249
+#: src/gtkconn.c:360
 msgid "_Remove"
 msgstr "����(_R)"
 
-#: src/gtkblist.c:1203
+#: src/gtkblist.c:1192
 msgid "Add a _Buddy"
 msgstr "羞糸��絅遵�(_B)"
 
-#: src/gtkblist.c:1205
+#: src/gtkblist.c:1194
 msgid "Add a C_hat"
 msgstr "羞糸����紊�(_H)"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1196
 msgid "_Delete Group"
 msgstr "���ょ�(_D)"
 
-#: src/gtkblist.c:1209
+#: src/gtkblist.c:1198
 msgid "_Rename"
 msgstr "���遵��(_R)"
 
 #. join button
-#: src/gtkblist.c:1231 src/gtkroomlist.c:263 src/gtkroomlist.c:409
+#: src/gtkblist.c:1220 src/gtkroomlist.c:263 src/gtkroomlist.c:408
 #: src/stock.c:87
 msgid "_Join"
 msgstr "����(_J)"
 
-#: src/gtkblist.c:1233
+#: src/gtkblist.c:1222
 msgid "Auto-Join"
 msgstr "��������"
 
-#: src/gtkblist.c:1257 src/gtkblist.c:1286
+#: src/gtkblist.c:1246 src/gtkblist.c:1275
 msgid "_Collapse"
 msgstr "����(_C)"
 
-#: src/gtkblist.c:1291
+#: src/gtkblist.c:1280
 msgid "_Expand"
 msgstr "絮�綣�(_E)"
 
-#: src/gtkblist.c:1949 src/gtkconv.c:4315 src/gtkpounce.c:314
+#: src/gtkblist.c:1938 src/gtkconv.c:4405 src/gtkpounce.c:314
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "�������糸�ョ���顒�賢羃≧��筝�筝��札羞糸��絅遵�����"
 
 #. Buddies menu
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2325
 msgid "/_Buddies"
 msgstr "/絅遵�(_B)"
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2326
 msgid "/Buddies/New Instant _Message..."
 msgstr "/絅遵�(B)/�医�恰�倶���(_M)..."
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2327
 msgid "/Buddies/Join a _Chat..."
 msgstr "/絅遵�(B)/���ヨ��紊�(_C)..."
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2328
 msgid "/Buddies/Get User _Info..."
 msgstr "/絅遵�(B)/�桁����隙拭��(_I)..."
 
-#: src/gtkblist.c:2340
+#: src/gtkblist.c:2329
 msgid "/Buddies/View User _Log..."
 msgstr "/絅遵�(B)/�ョ�����傑�ュ�(_L)..."
 
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2331
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(_O)"
 
-#: src/gtkblist.c:2343
+#: src/gtkblist.c:2332
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/絅遵�(B)/�丞ず腥榊�(_E)"
 
-#: src/gtkblist.c:2344
+#: src/gtkblist.c:2333
 msgid "/Buddies/_Add Buddy..."
 msgstr "/絅遵�(B)/羞糸��絅遵�(_A)..."
 
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2334
 msgid "/Buddies/Add C_hat..."
 msgstr "/絅遵�(B)/羞糸����紊�(_H)..."
 
-#: src/gtkblist.c:2346
+#: src/gtkblist.c:2335
 msgid "/Buddies/Add _Group..."
 msgstr "/絅遵�(B)/羞糸��膸�(_G)..."
 
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2337
 msgid "/Buddies/_Signoff"
 msgstr "/絅遵�(B)/�糸��(_S)"
 
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2338
 msgid "/Buddies/_Quit"
 msgstr "/絅遵�(B)/����(_Q)"
 
 #. Tools
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2341
 msgid "/_Tools"
 msgstr "/綏ュ��(_T)"
 
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2342
 msgid "/Tools/_Away"
 msgstr "/綏ュ��(T)/胼糸�(_A)"
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2343
 msgid "/Tools/Buddy _Pounce"
 msgstr "/綏ュ��(T)/絅遵�������(_P)"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2344
 msgid "/Tools/Account Ac_tions"
 msgstr "/綏ュ��(T)/茣��傑��篏�(_T)"
 
-#: src/gtkblist.c:2356
+#: src/gtkblist.c:2345
 msgid "/Tools/Pl_ugin Actions"
 msgstr "/綏ュ��(T)/��篁倶��篏�(_U)"
 
-#: src/gtkblist.c:2358
+#: src/gtkblist.c:2347
 msgid "/Tools/A_ccounts"
 msgstr "/綏ュ��(T)/茣���(_C)"
 
-#: src/gtkblist.c:2359
+#: src/gtkblist.c:2348
 msgid "/Tools/_File Transfers"
 msgstr "/綏ュ��(T)/��篁銀���(_F)"
 
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2349
 msgid "/Tools/R_oom List"
 msgstr "/綏ュ��(T)/�翠�翫��茵�(_O)"
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2350
 msgid "/Tools/Pr_eferences"
 msgstr "/綏ュ��(T)/薤���蕁�(_E)"
 
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2351
 msgid "/Tools/Pr_ivacy"
 msgstr "/綏ュ��(T)/��腱�(_I)"
 
-#: src/gtkblist.c:2364
+#: src/gtkblist.c:2353
 msgid "/Tools/View System _Log"
 msgstr "/綏ュ��(T)/�ョ��膤紫��ュ�(_L)"
 
 #. Help
-#: src/gtkblist.c:2367
+#: src/gtkblist.c:2356
 msgid "/_Help"
 msgstr "/絽���(_H)"
 
-#: src/gtkblist.c:2368
+#: src/gtkblist.c:2357
 msgid "/Help/Online _Help"
 msgstr "/絽���(H)/��鎖絽���(_H)"
 
-#: src/gtkblist.c:2369
+#: src/gtkblist.c:2358
 msgid "/Help/_Debug Window"
 msgstr "/絽���(H)/莪�莚�腦���(_D)"
 
-#: src/gtkblist.c:2370
+#: src/gtkblist.c:2359
 msgid "/Help/_About"
 msgstr "/絽���(H)/�割�(_A)"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "Rename Group"
 msgstr "���遵��膸�"
 
-#: src/gtkblist.c:2388
+#: src/gtkblist.c:2377
 msgid "New group name"
 msgstr "�亥���腱�"
 
-#: src/gtkblist.c:2389
+#: src/gtkblist.c:2378
 msgid "Please enter a new name for the selected group."
 msgstr "莚決��ラ��筝㊦����医��絖���"
 
-#: src/gtkblist.c:2417
+#: src/gtkblist.c:2406
 #, c-format
 msgid ""
 "\n"
@@ -2414,7 +2415,7 @@
 "\n"
 "<b>茣���:</b>%s"
 
-#: src/gtkblist.c:2481
+#: src/gtkblist.c:2470
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2422,12 +2423,12 @@
 "\n"
 "<b>�倶��:</b> 胼紫鎖"
 
-#: src/gtkblist.c:2496
+#: src/gtkblist.c:2485
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:2512
+#: src/gtkblist.c:2501
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2435,7 +2436,7 @@
 "\n"
 "<b>茣���:</b>"
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2502
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2443,7 +2444,7 @@
 "\n"
 "<b>��膤私査����:</b>"
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2503
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2451,7 +2452,7 @@
 "\n"
 "<b>����:</b>"
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2504
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2459,7 +2460,7 @@
 "\n"
 "<b>�窮О:</b>"
 
-#: src/gtkblist.c:2516
+#: src/gtkblist.c:2505
 msgid ""
 "\n"
 "<b>Logged In:</b>"
@@ -2467,7 +2468,7 @@
 "\n"
 "<b>�糸��:</b>"
 
-#: src/gtkblist.c:2517
+#: src/gtkblist.c:2506
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2475,7 +2476,7 @@
 "\n"
 "<b>����:</b>"
 
-#: src/gtkblist.c:2518
+#: src/gtkblist.c:2507
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2483,7 +2484,7 @@
 "\n"
 "<b>茘���:</b>"
 
-#: src/gtkblist.c:2520
+#: src/gtkblist.c:2509
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2491,7 +2492,7 @@
 "\n"
 "<b>�颷�:</b>�ヨ�"
 
-#: src/gtkblist.c:2521
+#: src/gtkblist.c:2510
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2499,7 +2500,7 @@
 "\n"
 "<b>�倶��</b>: ����"
 
-#: src/gtkblist.c:2522
+#: src/gtkblist.c:2511
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2507,96 +2508,108 @@
 "\n"
 "<b>�倶��</b>: 羞隙恒"
 
-#: src/gtkblist.c:2804
+#: src/gtkblist.c:2793
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "���>賢 (%d絨��%02d��) "
 
-#: src/gtkblist.c:2806
+#: src/gtkblist.c:2795
 #, c-format
 msgid "Idle (%dm) "
 msgstr "����賢 (%d��) "
 
-#: src/gtkblist.c:2811
+#: src/gtkblist.c:2800
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%) "
 
-#: src/gtkblist.c:2814
+#: src/gtkblist.c:2803
 msgid "Offline "
 msgstr "胼紫鎖 "
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2932
+#: src/gtkblist.c:2921
 msgid "/Buddies/Join a Chat..."
 msgstr "/絅遵�(B)/���ヨ��紊�(C)..."
 
-#: src/gtkblist.c:2935
+#: src/gtkblist.c:2924
 msgid "/Tools/Room List"
 msgstr "/綏ュ��(T)/�翠�翫��茵�(O)"
 
-#: src/gtkblist.c:2938
+#: src/gtkblist.c:2927
 msgid "/Tools/Privacy"
 msgstr "/綏ュ��(T)/��腱�(I)"
 
+#: src/gtkblist.c:3008
+msgid "Alphabetical"
+msgstr "��絖�罸�綺�"
+
+#: src/gtkblist.c:3009
+msgid "By status"
+msgstr "���倶��"
+
+#: src/gtkblist.c:3010
+msgid "By log size"
+msgstr "���ュ�紊у�"
+
+#: src/gtkblist.c:3076
+msgid "/Tools/Away"
+msgstr "/綏ュ��(T)/胼糸�(A)"
+
+#: src/gtkblist.c:3079
+msgid "/Tools/Buddy Pounce"
+msgstr "/綏ュ��(T)/絅遵�������(P)"
+
+#: src/gtkblist.c:3082
+msgid "/Tools/Account Actions"
+msgstr "/綏ュ��(T)/茣��傑��篏�(T)"
+
 #: src/gtkblist.c:3085
-msgid "/Tools/Away"
-msgstr "/綏ュ��(T)/胼糸�(A)"
-
-#: src/gtkblist.c:3088
-msgid "/Tools/Buddy Pounce"
-msgstr "/綏ュ��(T)/絅遵�������(P)"
-
-#: src/gtkblist.c:3091
-msgid "/Tools/Account Actions"
-msgstr "/綏ュ��(T)/茣��傑��篏�(T)"
-
-#: src/gtkblist.c:3094
 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:3183
+#: src/gtkblist.c:3174
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(O)"
 
-#: src/gtkblist.c:3185
+#: src/gtkblist.c:3176
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�(B)/�丞ず腥榊�(E)"
 
-#: src/gtkblist.c:3209
+#: src/gtkblist.c:3200
 msgid "Send a message to the selected buddy"
 msgstr "����筝㊤ソ������羔���"
 
-#: src/gtkblist.c:3218
+#: src/gtkblist.c:3210
 msgid "Get information on the selected buddy"
 msgstr "�桁���筝㊤ソ����篆≧��"
 
-#: src/gtkblist.c:3221
+#: src/gtkblist.c:3214
 msgid "_Chat"
 msgstr "��紊�(_C)"
 
-#: src/gtkblist.c:3226
+#: src/gtkblist.c:3219
 msgid "Join a chat room"
 msgstr "���ヨ��紊��"
 
-#: src/gtkblist.c:3229
+#: src/gtkblist.c:3224
 msgid "_Away"
 msgstr "胼糸�(_A)"
 
-#: src/gtkblist.c:3234
+#: src/gtkblist.c:3229
 msgid "Set an away message"
 msgstr "莅丞舟胼糸�羔���"
 
-#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3970 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:2682
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
 msgid "Add Buddy"
 msgstr "羞糸��絅遵�"
 
-#: src/gtkblist.c:3996
+#: src/gtkblist.c:3994
 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. "
@@ -2606,39 +2619,39 @@
 "��莚�鐚�����絨�篌��推撮���桁���丞ず��\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4056 src/gtkblist.c:4340
+#: src/gtkblist.c:4054 src/gtkblist.c:4338
 msgid "Account:"
 msgstr "茣���:"
 
-#: src/gtkblist.c:4299
+#: src/gtkblist.c:4297
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "�������糸�ョ���顒�賢羃≧��筝�筝��札��紊�����"
 
-#: src/gtkblist.c:4306
+#: src/gtkblist.c:4304
 msgid "Add Chat"
 msgstr "羞糸����紊�"
 
-#: src/gtkblist.c:4330
+#: src/gtkblist.c:4328
 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:4408
+#: src/gtkblist.c:4406
 msgid "Add Group"
 msgstr "羞糸��膸�"
 
-#: src/gtkblist.c:4409
+#: src/gtkblist.c:4407
 msgid "Please enter the name of the group to be added."
 msgstr "莚決��ヨ�羞糸����膸���腱違��"
 
-#: src/gtkblist.c:4976 src/gtkblist.c:5073
+#: src/gtkblist.c:4974 src/gtkblist.c:5071
 msgid "No actions available"
 msgstr "羃≧����������篏�"
 
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:78 src/gtkconn.c:249 src/gtkconn.c:260
 msgid "Done."
 msgstr "絎�����"
 
@@ -2650,15 +2663,15 @@
 msgid "Signon"
 msgstr "�糸��"
 
-#: src/gtkconn.c:216
+#: src/gtkconn.c:215
 msgid "Cancel All"
 msgstr "�����羔�"
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:360 src/gtkconn.c:592
 msgid "_Reconnect"
 msgstr "���域���(_R)"
 
-#: src/gtkconn.c:557
+#: src/gtkconn.c:556
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2671,15 +2684,15 @@
 "%s\n"
 "%s"
 
-#: src/gtkconn.c:559
+#: src/gtkconn.c:558
 msgid "Reason Unknown."
 msgstr "�������ャ��"
 
-#: src/gtkconn.c:598
+#: src/gtkconn.c:597
 msgid "Reconnect _All"
 msgstr "�������域���(_A)"
 
-#: src/gtkconn.c:628
+#: src/gtkconn.c:627
 msgid "Time"
 msgstr "�狗��"
 
@@ -2692,7 +2705,11 @@
 msgid "Supported debug options are:  version"
 msgstr "������莪�莚���蕁号��: version"
 
-#: src/gtkconv.c:336
+#: src/gtkconv.c:347
+msgid "No such command (in this context)."
+msgstr "羃≧��菴��欠���巡擦(��④���筝�)��"
+
+#: src/gtkconv.c:350
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2700,11 +2717,7 @@
 "篏睡����/help &lt;�巡擦&gt;����キ緇��隙��巡擦��絽�����\n"
 "罩ょッ紜�筝���戎������巡擦:\n"
 
-#: src/gtkconv.c:370
-msgid "No such command (in this context)."
-msgstr "羃≧��菴��欠���巡擦(��④���筝�)��"
-
-#: src/gtkconv.c:443
+#: src/gtkconv.c:434
 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\" "
@@ -2713,7 +2726,7 @@
 "羃≧��菴��欠���巡擦��絋��������ュ攻筝��活��ュ�巡擦鐚����札��轡��->薤���蕁�->����->莉���->"
 "��������膾垂���巡擦筝㊤�渇�㊤�巡擦��"
 
-#: src/gtkconv.c:451
+#: src/gtkconv.c:442
 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-"
@@ -2722,384 +2735,379 @@
 "莚㊥���莚�: ��減�巡擦莨��ョ�����遺肩�遺�絲鴻��絋��������ュ攻筝��活��ュ�巡擦鐚����札��轡��-"
 ">薤���蕁�->����->莉���->��������膾垂���巡擦筝㊤�渇�㊤�巡擦��"
 
-#: src/gtkconv.c:458
+#: src/gtkconv.c:449
 msgid "Your command failed for an unknown reason."
 msgstr "�����巡擦紊沿乾鐚��������ャ��"
 
-#: src/gtkconv.c:465
+#: src/gtkconv.c:456
 msgid "That command only works in Chats, not IMs."
 msgstr "�巡擦������紊�賢�����絲壕�筝㊥������"
 
-#: src/gtkconv.c:468
+#: src/gtkconv.c:459
 msgid "That command only works in IMs, not Chats."
 msgstr "�巡擦�����莚�筝㊤������紊�賢������"
 
-#: src/gtkconv.c:472
+#: src/gtkconv.c:463
 msgid "That command doesn't work on this protocol."
 msgstr "�巡擦��羈���④�顒��綏ヤ���"
 
-#: src/gtkconv.c:693
+#: src/gtkconv.c:685
 msgid "Invite Buddy Into Chat Room"
 msgstr "��莚桁ソ��菴��ヨ��紊��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:721
+#: src/gtkconv.c:713
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "���活���莚決�鐚�莚決��ヤ�/絅合����絖�鐚�篁ュ���������莚傑�����"
 
-#: src/gtkconv.c:742
+#: src/gtkconv.c:734
 msgid "_Buddy:"
 msgstr "絅遵�(_B):"
 
-#: src/gtkconv.c:762
+#: src/gtkconv.c:754
 msgid "_Message:"
 msgstr "羔���(_M):"
 
-#: src/gtkconv.c:799 src/gtkconv.c:2489 src/gtkdebug.c:182
+#: src/gtkconv.c:791 src/gtkconv.c:2476 src/gtkdebug.c:182
 msgid "Unable to open file."
 msgstr "��羈���綣���篁吟��"
 
-#: src/gtkconv.c:804
+#: src/gtkconv.c:796
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>筝� %s ��莪�莚�</h1>\n"
 
-#: src/gtkconv.c:818
+#: src/gtkconv.c:810
 msgid "Save Conversation"
 msgstr "篆�絖�絲壕�"
 
-#: src/gtkconv.c:895 src/gtkdebug.c:131
+#: src/gtkconv.c:887 src/gtkdebug.c:131
 msgid "Find"
 msgstr "�ユ��"
 
-#: src/gtkconv.c:921 src/gtkdebug.c:159
+#: src/gtkconv.c:913 src/gtkdebug.c:159
 msgid "_Search for:"
 msgstr "��膣∽��絖�(_S):"
 
-#: src/gtkconv.c:1338
+#: src/gtkconv.c:1328
 msgid "IM"
 msgstr "綣���"
 
-#. Block button
-#: src/gtkconv.c:1347 src/gtkconv.c:3666 src/protocols/oscar/oscar.c:453
-#: src/protocols/oscar/oscar.c:6798
+#. Send File button
+#: src/gtkconv.c:1337 src/gtkconv.c:3704 src/protocols/oscar/oscar.c:437
 msgid "Send File"
 msgstr "������篁�"
 
-#: src/gtkconv.c:1356
+#: src/gtkconv.c:1346
 msgid "Un-Ignore"
 msgstr "��羔�綽順��"
 
-#: src/gtkconv.c:1358 src/gtkprefs.c:826
+#: src/gtkconv.c:1348 src/gtkprefs.c:825
 msgid "Ignore"
 msgstr "綽順��"
 
 #. Info button
-#: src/gtkconv.c:1367 src/gtkconv.c:3687
+#: src/gtkconv.c:1357 src/gtkconv.c:3725
 msgid "Info"
 msgstr "篆≧��"
 
-#: src/gtkconv.c:1376
+#: src/gtkconv.c:1366
 msgid "Get Away Msg"
 msgstr "�桁�胼糸�羔���"
 
-#: src/gtkconv.c:2497
+#: src/gtkconv.c:2484
 msgid "Unable to save icon file to disk."
 msgstr "��羈�絨��丈����篁銀�絖��亥�����"
 
-#: src/gtkconv.c:2514
+#: src/gtkconv.c:2501
 msgid "Save Icon"
 msgstr "篆�絖��丈��"
 
-#: src/gtkconv.c:2544
+#: src/gtkconv.c:2531
 msgid "Animate"
 msgstr "����"
 
-#: src/gtkconv.c:2549
+#: src/gtkconv.c:2536
 msgid "Hide Icon"
 msgstr "����憝��"
 
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2542
 msgid "Save Icon As..."
 msgstr "�丈�����筝�..."
 
-#: src/gtkconv.c:2939
+#: src/gtkconv.c:2926
 msgid "User is typing..."
 msgstr "���傑③����絖�..."
 
-#: src/gtkconv.c:2947
+#: src/gtkconv.c:2934
 msgid "User has typed something and paused"
 msgstr "���傑��篋���筝��鐚���篋�筝�筝�"
 
 #. Build the Send As menu
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3037
 msgid "_Send As"
 msgstr "����荳�蚕(_S)"
 
 #. Conversation menu
-#: src/gtkconv.c:3450
+#: src/gtkconv.c:3488
 msgid "/_Conversation"
 msgstr "/絲壕�(_C)"
 
-#: src/gtkconv.c:3452
+#: src/gtkconv.c:3490
 msgid "/Conversation/New Instant _Message..."
 msgstr "/絲壕�(C)/�医�恰�倶���(_M)..."
 
-#: src/gtkconv.c:3457
+#: src/gtkconv.c:3495
 msgid "/Conversation/_Find..."
 msgstr "/絲壕�(C)/�ユ��(_F)..."
 
-#: src/gtkconv.c:3459
+#: src/gtkconv.c:3497
 msgid "/Conversation/View _Log"
 msgstr "/絲壕�(C)/�ョ���ュ�(_L)"
 
-#: src/gtkconv.c:3460
+#: src/gtkconv.c:3498
 msgid "/Conversation/_Save As..."
 msgstr "/絲壕�(C)/���筝�(_S)..."
 
-#: src/gtkconv.c:3462
+#: src/gtkconv.c:3500
 msgid "/Conversation/Clear"
 msgstr "/絲壕�(C)/羝���"
 
-#: src/gtkconv.c:3466
+#: src/gtkconv.c:3504
 msgid "/Conversation/Se_nd File..."
 msgstr "/絲壕�(C)/������篁�(_N)..."
 
-#: src/gtkconv.c:3467
+#: src/gtkconv.c:3505
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/絲壕�(C)/羞糸��絅遵�������(_P)..."
 
-#: src/gtkconv.c:3469
+#: src/gtkconv.c:3507
 msgid "/Conversation/_Get Info"
 msgstr "/絲壕�(C)/�桁�篆≧��(_G)"
 
-#: src/gtkconv.c:3471
+#: src/gtkconv.c:3509
 msgid "/Conversation/_Warn..."
 msgstr "/絲壕�(C)/茘���(_W)..."
 
-#: src/gtkconv.c:3473
+#: src/gtkconv.c:3511
 msgid "/Conversation/In_vite..."
 msgstr "/絲壕�(C)/��莚�(_V)..."
 
-#: src/gtkconv.c:3478
+#: src/gtkconv.c:3516
 msgid "/Conversation/A_lias..."
 msgstr "/絲壕�(C)/����(_L)..."
 
-#: src/gtkconv.c:3480
+#: src/gtkconv.c:3518
 msgid "/Conversation/_Block..."
 msgstr "/絲壕�(C)/絮��(_B)..."
 
-#: src/gtkconv.c:3482
+#: src/gtkconv.c:3520
 msgid "/Conversation/_Add..."
 msgstr "/鎛壕�(C)/羞糸��(_A)..."
 
-#: src/gtkconv.c:3484
+#: src/gtkconv.c:3522
 msgid "/Conversation/_Remove..."
 msgstr "/絲壕�(C)/����(_R)..."
 
-#: src/gtkconv.c:3489
+#: src/gtkconv.c:3527
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/絲壕�(C)/���ラ�丈・(_K)..."
 
-#: src/gtkconv.c:3491
+#: src/gtkconv.c:3529
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/絲壕�(C)/���ュ�上��(_E)..."
 
-#: src/gtkconv.c:3496
+#: src/gtkconv.c:3534
 msgid "/Conversation/_Close"
 msgstr "/絲壕�(C)/�渇��(_C)"
 
 #. Options
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3538
 msgid "/_Options"
 msgstr "/��蕁�(_O)"
 
-#: src/gtkconv.c:3501
+#: src/gtkconv.c:3539
 msgid "/Options/Enable _Logging"
 msgstr "/��蕁�(O)/��莅梧�綵��ュ�(_L)"
 
-#: src/gtkconv.c:3502
+#: src/gtkconv.c:3540
 msgid "/Options/Enable _Sounds"
 msgstr "/��蕁�(O)/��莅後0��(_S)"
 
-#: src/gtkconv.c:3503
+#: src/gtkconv.c:3541
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/��蕁�(O)/�丞ず�弱�綏ュ�傑��(_T)"
 
-#: src/gtkconv.c:3504
+#: src/gtkconv.c:3542
 msgid "/Options/Show T_imestamps"
 msgstr "/��蕁�/�丞ず�狗�贋��(_I)"
 
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3584
 msgid "/Conversation/View Log"
 msgstr "/絲壕�(C)/�ョ���ュ�(L)"
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3589
 msgid "/Conversation/Send File..."
 msgstr "/絲壕�(C)/������篁�(N)..."
 
-#: src/gtkconv.c:3555
+#: src/gtkconv.c:3593
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/絲壕�(C)/羞糸��絅遵�������(P)..."
 
-#: src/gtkconv.c:3561
+#: src/gtkconv.c:3599
 msgid "/Conversation/Get Info"
 msgstr "/絲壕�(C)/�桁�篆≧��(G)"
 
-#: src/gtkconv.c:3565
+#: src/gtkconv.c:3603
 msgid "/Conversation/Warn..."
 msgstr "/絲壕�(C)/茘���(W)..."
 
-#: src/gtkconv.c:3569
+#: src/gtkconv.c:3607
 msgid "/Conversation/Invite..."
 msgstr "/絲壕�(C)/��莚�(V)..."
 
-#: src/gtkconv.c:3575
+#: src/gtkconv.c:3613
 msgid "/Conversation/Alias..."
 msgstr "/絲壕�(C)/����(L)..."
 
-#: src/gtkconv.c:3579
+#: src/gtkconv.c:3617
 msgid "/Conversation/Block..."
 msgstr "/絲壕�(C)/絮��(B)..."
 
-#: src/gtkconv.c:3583
+#: src/gtkconv.c:3621
 msgid "/Conversation/Add..."
 msgstr "/鎛壕�(C)/羞糸��(A)..."
 
-#: src/gtkconv.c:3587
+#: src/gtkconv.c:3625
 msgid "/Conversation/Remove..."
 msgstr "/絲壕�(C)/����(R)..."
 
-#: src/gtkconv.c:3593
+#: src/gtkconv.c:3631
 msgid "/Conversation/Insert Link..."
 msgstr "/絲壕�(C)/���ラ�丈・(K)..."
 
-#: src/gtkconv.c:3597
+#: src/gtkconv.c:3635
 msgid "/Conversation/Insert Image..."
 msgstr "/絲壕�(C)/���ュ�上��(I)..."
 
-#: src/gtkconv.c:3603
+#: src/gtkconv.c:3641
 msgid "/Options/Enable Logging"
 msgstr "/��蕁�(O)/��莅梧�綵�(L)"
 
-#: src/gtkconv.c:3606
+#: src/gtkconv.c:3644
 msgid "/Options/Enable Sounds"
 msgstr "/��蕁�(O)/��莅後0��(S)"
 
-#: src/gtkconv.c:3609
+#: src/gtkconv.c:3647
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/��蕁�(O)/�丞ず�弱�綏ュ�傑��(T)"
 
-#: src/gtkconv.c:3612
+#: src/gtkconv.c:3650
 msgid "/Options/Show Timestamps"
 msgstr "/��蕁�/�丞ず�狗�贋��(I)"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3636 src/gtkconv.c:3638 src/gtkconv.c:3756 src/gtkconv.c:3758
+#: src/gtkconv.c:3674 src/gtkconv.c:3676 src/gtkconv.c:3794 src/gtkconv.c:3796
 msgid "Send"
 msgstr "����"
 
 #. Now, um, just kind of all over the place. Huh?
 #. Warn button
-#: src/gtkconv.c:3652
+#: src/gtkconv.c:3690
 msgid "Warn"
 msgstr "茘���"
 
-#: src/gtkconv.c:3655
+#: src/gtkconv.c:3693
 msgid "Warn the user"
 msgstr "茘�������"
 
 #. Block button
-#: src/gtkconv.c:3659 src/gtkprivacy.c:624 src/gtkprivacy.c:635
+#: src/gtkconv.c:3697 src/gtkprivacy.c:622 src/gtkprivacy.c:633
 msgid "Block"
 msgstr "絮��"
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3700
 msgid "Block the user"
 msgstr "鎡�恝����"
 
-#: src/gtkconv.c:3669
+#: src/gtkconv.c:3707
 msgid "Send a file to the user"
 msgstr "膸����桁�����篁�"
 
-#: src/gtkconv.c:3676
+#: src/gtkconv.c:3714
 msgid "Add the user to your buddy list"
 msgstr "絨����桁��筝阪ソ��"
 
-#: src/gtkconv.c:3683
+#: src/gtkconv.c:3721
 msgid "Remove the user from your buddy list"
 msgstr "篁�����絅遵���茵�賢���よ�����"
 
-#: src/gtkconv.c:3690 src/gtkconv.c:4039
+#: src/gtkconv.c:3728 src/gtkconv.c:4108
 msgid "Get the user's information"
 msgstr "�桁����隙拭��"
 
 #. Invite
-#: src/gtkconv.c:3770
+#: src/gtkconv.c:3808
 msgid "Invite"
 msgstr "��莚�"
 
-#: src/gtkconv.c:3773
+#: src/gtkconv.c:3811
 msgid "Invite a user"
 msgstr "��莚欠����"
 
-#: src/gtkconv.c:3780
+#: src/gtkconv.c:3818
 msgid "Add the chat to your buddy list"
 msgstr "絨���紊�兄���井����絅遵���茵�"
 
-#: src/gtkconv.c:3787
+#: src/gtkconv.c:3825
 msgid "Remove the chat from your buddy list"
 msgstr "篁�����絅遵���茵�賢���よ��紊�"
 
-#: src/gtkconv.c:3897
+#: src/gtkconv.c:3961
 msgid "Topic:"
 msgstr "莚�蘂�:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3960
+#: src/gtkconv.c:4024
 msgid "0 people in room"
 msgstr "��紊����羃≧��篋�"
 
-#: src/gtkconv.c:4016
+#: src/gtkconv.c:4085
 msgid "IM the user"
 msgstr "膸����桁����恰�倶���"
 
-#: src/gtkconv.c:4028
+#: src/gtkconv.c:4097
 msgid "Ignore the user"
 msgstr "綽順�ョ����"
 
-#: src/gtkconv.c:4627
+#: src/gtkconv.c:4695
 msgid "Close conversation"
 msgstr "�渇�㊤�莚�"
 
-#: src/gtkconv.c:5169 src/gtkconv.c:5201 src/gtkconv.c:5322 src/gtkconv.c:5389
+#: src/gtkconv.c:5227 src/gtkconv.c:5256 src/gtkconv.c:5352 src/gtkconv.c:5404
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "��紊������ %d 筝�査"
 
-#: src/gtkconv.c:5901 src/gtkconv.c:5904
+#: src/gtkconv.c:5958 src/gtkconv.c:5961
 msgid "<main>/Conversation/Close"
 msgstr "<main>/絲壕�(C)/�渇��(C)"
 
-#: src/gtkconv.c:6276
+#: src/gtkconv.c:6333
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;���&gt;: ��絅遵�����紊���� IRC 蕋��主�������"
 
-#: src/gtkconv.c:6279
+#: src/gtkconv.c:6336
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;��蕁�&gt;: �����絲壕�筝㊤�����腱�莪�莚�篆≧����"
 
-#: src/gtkconv.c:6283
-msgid "help:  List available commands."
-msgstr "help: ���阪������巡擦��"
-
-#: src/gtkconv.c:6287
+#: src/gtkconv.c:6340
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;�巡擦&gt;: �割��隙��巡擦��絽�����"
 
@@ -3124,11 +3132,11 @@
 msgid "%.2f KB/s"
 msgstr "%.2f KB/腱�"
 
-#: src/gtkft.c:157 src/gtkft.c:967
+#: src/gtkft.c:157 src/gtkft.c:962
 msgid "Finished"
 msgstr "綏峨���"
 
-#: src/gtkft.c:160 src/gtkft.c:918
+#: src/gtkft.c:160 src/gtkft.c:913
 msgid "Canceled"
 msgstr "綏峨�羔�"
 
@@ -3188,34 +3196,34 @@
 msgid "Time Remaining:"
 msgstr "����狗��:"
 
-#: src/gtkft.c:641
+#: src/gtkft.c:636
 msgid "_Keep the dialog open"
 msgstr "篆���絲壕�罅���綣�(_K)"
 
-#: src/gtkft.c:651
+#: src/gtkft.c:646
 msgid "_Clear finished transfers"
 msgstr "羝��ゆ�������篌���(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:660
+#: src/gtkft.c:655
 msgid "Show transfer details"
 msgstr "�丞ず筝�莉順���"
 
-#: src/gtkft.c:661
+#: src/gtkft.c:656
 msgid "Hide transfer details"
 msgstr "���鋇�莉順���"
 
 #. Pause button
-#: src/gtkft.c:703 src/stock.c:90
+#: src/gtkft.c:698 src/stock.c:90
 msgid "_Pause"
 msgstr "����(_P)"
 
 #. Resume button
-#: src/gtkft.c:713
+#: src/gtkft.c:708
 msgid "_Resume"
 msgstr "膸х鮫(_R)"
 
-#: src/gtkft.c:920
+#: src/gtkft.c:915
 msgid "Failed"
 msgstr "綏峨け茣�"
 
@@ -3243,22 +3251,22 @@
 msgid "_Open Link in Browser"
 msgstr "���茹���賢��綣��丈・(_O)"
 
-#: src/gtkimhtml.c:2797
+#: src/gtkimhtml.c:2803
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim ��羈��号���箴�����篁倶�������羌��上�靏糸������藥�莅ゅ�取�筝� PNG��"
 
-#: src/gtkimhtml.c:2805
+#: src/gtkimhtml.c:2811
 #, c-format
 msgid "Error saving image: %s"
 msgstr "篆�絖��上��尌��: %s"
 
-#: src/gtkimhtml.c:2814
+#: src/gtkimhtml.c:2888 src/gtkimhtml.c:2900
 msgid "Save Image"
 msgstr "篆�絖��上��"
 
-#: src/gtkimhtml.c:2837
+#: src/gtkimhtml.c:2921
 msgid "_Save Image..."
 msgstr "篆�絖��上��(_S)..."
 
@@ -3274,100 +3282,101 @@
 msgid "Select Background Color"
 msgstr "�����������"
 
-#: src/gtkimhtmltoolbar.c:392
+#: src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:397
+#: src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "�颷�(_D)"
 
-#: src/gtkimhtmltoolbar.c:400
+#: src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr "莚決��ユ���活����ョ�� URL ���丈・�颷違���颷井���������"
 
-#: src/gtkimhtmltoolbar.c:404
+#: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "莚決��ユ���活����ラ�丈・�� URL��"
 
-#: src/gtkimhtmltoolbar.c:409
+#: src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "���ラ�丈・"
 
-#: src/gtkimhtmltoolbar.c:413
+#: src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "����(_I)"
 
-#: src/gtkimhtmltoolbar.c:481
+#: src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "絖����上�鎀沿乾: %s\n"
 
-#: src/gtkimhtmltoolbar.c:507 src/gtkimhtmltoolbar.c:517
+#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "���ュ�上��"
 
-#: src/gtkimhtmltoolbar.c:655
+#: src/gtkimhtmltoolbar.c:661
 msgid "This theme has no available smileys."
 msgstr "罩や源蘂�羃≧��������膃��吾��"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:670
+#: src/gtkimhtmltoolbar.c:676
 msgid "Smile!"
 msgstr "膃���"
 
-#: src/gtkimhtmltoolbar.c:888
+#: src/gtkimhtmltoolbar.c:894
 msgid "Bold"
 msgstr "膕�篏�"
 
-#: src/gtkimhtmltoolbar.c:899
+#: src/gtkimhtmltoolbar.c:905
 msgid "Italic"
 msgstr "��篏�"
 
-#: src/gtkimhtmltoolbar.c:910
+#: src/gtkimhtmltoolbar.c:916
 msgid "Underline"
 msgstr "筝���膾�"
 
-#: src/gtkimhtmltoolbar.c:926
+#: src/gtkimhtmltoolbar.c:932
 msgid "Larger font size"
 msgstr "莨�紊у�篏�"
 
-#: src/gtkimhtmltoolbar.c:938
+#: src/gtkimhtmltoolbar.c:944
 msgid "Smaller font size"
 msgstr "莨�絨鎕�篏�"
 
-#: src/gtkimhtmltoolbar.c:955
+#: src/gtkimhtmltoolbar.c:961
 msgid "Font Face"
 msgstr "絖�篏�"
 
-#: src/gtkimhtmltoolbar.c:967
+#: src/gtkimhtmltoolbar.c:973
 msgid "Foreground font color"
 msgstr "絖�篏�蘂���"
 
-#: src/gtkimhtmltoolbar.c:979
+#: src/gtkimhtmltoolbar.c:985
 msgid "Background color"
 msgstr "�������"
 
-#: src/gtkimhtmltoolbar.c:994
+#: src/gtkimhtmltoolbar.c:1000
 msgid "Insert link"
 msgstr "���ラ�丈・"
 
-#: src/gtkimhtmltoolbar.c:1004
+#: src/gtkimhtmltoolbar.c:1010
 msgid "Insert image"
 msgstr "���ュ�上��"
 
-#: src/gtkimhtmltoolbar.c:1015
+#: src/gtkimhtmltoolbar.c:1021
 msgid "Insert smiley"
 msgstr "���ョ���"
 
 #: src/gtklog.c:302
-msgid "Conversations with"
-msgstr "篋よ�絲壕院"
+#, c-format
+msgid "Conversations with %s"
+msgstr "筝� %s ��絲壕�"
 
 #. Window **********
-#: src/gtklog.c:392 src/gtklog.c:408
+#: src/gtklog.c:395 src/gtklog.c:411
 msgid "System Log"
 msgstr "膤紫��ュ�"
 
@@ -3410,22 +3419,22 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:429
+#: src/gtknotify.c:421
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "羌頵����巡擦��%s��������"
 
-#: src/gtknotify.c:432 src/gtknotify.c:446 src/gtknotify.c:461
-#: src/gtknotify.c:579
+#: src/gtknotify.c:424 src/gtknotify.c:438 src/gtknotify.c:453
+#: src/gtknotify.c:571
 msgid "Unable to open URL"
 msgstr "��羈���綣� URL"
 
-#: src/gtknotify.c:443 src/gtknotify.c:458
+#: src/gtknotify.c:435 src/gtknotify.c:450
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "莪�����%s���咲��: %s"
 
-#: src/gtknotify.c:580
+#: src/gtknotify.c:572
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "�������������羌頵����巡擦鐚�篏����臀��巡擦��"
@@ -3439,7 +3448,7 @@
 msgstr "莚決��ヨ���茹���絅遵���"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:890
+#: src/gtkpounce.c:387 src/gtkpounce.c:889
 msgid "New Buddy Pounce"
 msgstr "�医産絅遵�������"
 
@@ -3448,138 +3457,138 @@
 msgstr "膽�莨�絅遵�������"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:405
+#: src/gtkpounce.c:404
 msgid "Pounce Who"
 msgstr "��茹�絲壕院"
 
-#: src/gtkpounce.c:432
+#: src/gtkpounce.c:431
 msgid "_Buddy name:"
 msgstr "絅遵���腱�(_B):"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:456
+#: src/gtkpounce.c:455
 msgid "Pounce When"
 msgstr "��茹���篋�篁�"
 
-#: src/gtkpounce.c:464 src/main.c:296
-msgid "_Sign on"
-msgstr "�糸��(_S)"
-
-#: src/gtkpounce.c:466
+#: src/gtkpounce.c:463
+msgid "Si_gn on"
+msgstr "�糸��(_G)"
+
+#: src/gtkpounce.c:465
 msgid "Sign _off"
 msgstr "�糸��(_O)"
 
-#: src/gtkpounce.c:468
+#: src/gtkpounce.c:467
 msgid "A_way"
 msgstr "胼糸�(_W)"
 
-#: src/gtkpounce.c:470
-msgid "Re_turn from away"
-msgstr "����(_T)"
-
-#: src/gtkpounce.c:472
+#: src/gtkpounce.c:469
+msgid "_Return from away"
+msgstr "����(_R)"
+
+#: src/gtkpounce.c:471
 msgid "_Idle"
 msgstr "����(_I)"
 
-#: src/gtkpounce.c:474
+#: src/gtkpounce.c:473
 msgid "Retur_n from idle"
 msgstr "�♂��篋�(_N)"
 
-#: src/gtkpounce.c:476
+#: src/gtkpounce.c:475
 msgid "Buddy starts _typing"
 msgstr "絅遵�綣�紮���絖�(_T)"
 
-#: src/gtkpounce.c:478
+#: src/gtkpounce.c:477
 msgid "Buddy stops t_yping"
 msgstr "絅遵���罩∽��絖�(_Y)"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:507
+#: src/gtkpounce.c:506
 msgid "Pounce Action"
 msgstr "������篏�"
 
-#: src/gtkpounce.c:515
+#: src/gtkpounce.c:514
 msgid "Op_en an IM window"
 msgstr "��綣��恰�倶������(_E)"
 
-#: src/gtkpounce.c:517
+#: src/gtkpounce.c:516
 msgid "_Popup notification"
 msgstr "綣劫�咲����(_P)"
 
-#: src/gtkpounce.c:519
+#: src/gtkpounce.c:518
 msgid "Send a _message"
 msgstr "����羔���(_M)"
 
-#: src/gtkpounce.c:521
+#: src/gtkpounce.c:520
 msgid "E_xecute a command"
 msgstr "�ц��巡擦(_X)"
 
-#: src/gtkpounce.c:523
+#: src/gtkpounce.c:522
 msgid "P_lay a sound"
 msgstr "�㊥�上0��(_L)"
 
-#: src/gtkpounce.c:527
+#: src/gtkpounce.c:526
 msgid "B_rowse..."
 msgstr "羌頵�(_R)..."
 
+#: src/gtkpounce.c:528
+msgid "Bro_wse..."
+msgstr "羌頵�(_W)..."
+
 #: src/gtkpounce.c:529
-msgid "Bro_wse..."
-msgstr "羌頵�(_W)..."
-
-#: src/gtkpounce.c:530
 msgid "Pre_view"
 msgstr "蘂�茹�(_V)"
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:612
 msgid "Sav_e this pounce after activation"
 msgstr "羶�羇糸���絖�罩ゅ������(_E)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:897
+#: src/gtkpounce.c:896
 msgid "Remove Buddy Pounce"
 msgstr "���ゅソ��������"
 
-#: src/gtkpounce.c:961
+#: src/gtkpounce.c:960
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 綣�紮�������絖�(%s)"
 
-#: src/gtkpounce.c:963
+#: src/gtkpounce.c:962
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 綏牙�糸��(%s)"
 
-#: src/gtkpounce.c:965
+#: src/gtkpounce.c:964
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s �♂��篋�(%s)"
 
-#: src/gtkpounce.c:967
+#: src/gtkpounce.c:966
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ���ヤ�(%s)"
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:968
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ��罩≫�膸�����絖�(%s)"
 
-#: src/gtkpounce.c:971
+#: src/gtkpounce.c:970
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 綏牙�糸��(%s)"
 
-#: src/gtkpounce.c:973
+#: src/gtkpounce.c:972
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s ��莎欠����(%s)"
 
-#: src/gtkpounce.c:975
+#: src/gtkpounce.c:974
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 莎遺���(%s)"
 
-#: src/gtkpounce.c:976
+#: src/gtkpounce.c:975
 msgid "Unknown pounce event. Please report this!"
 msgstr "���ョ�������若��莚傑�ュ��罩ら��莚��"
 
@@ -3601,8 +3610,8 @@
 msgid "Icon"
 msgstr "�丈��"
 
-#: src/gtkprefs.c:722 src/gtkprefs.c:2212 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:701
+#: src/gtkprefs.c:722 src/gtkprefs.c:2194 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:693
 msgid "Description"
 msgstr "�颷�"
 
@@ -3618,299 +3627,295 @@
 msgid "_Highlight misspelled words"
 msgstr "腦��堺�丞ず�守������莚�(_H)"
 
-#: src/gtkprefs.c:827
+#: src/gtkprefs.c:826
 msgid "Ignore c_olors"
 msgstr "綽順�ラ���(_O)"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:828
 msgid "Ignore font _faces"
 msgstr "綽順�ュ�篏�(_F)"
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:830
 msgid "Ignore font si_zes"
 msgstr "莨�紊у�篏�(_Z)"
 
-#: src/gtkprefs.c:834
-msgid "_Ignore formatting on incoming messages"
-msgstr "綽順�ユ�九�遺拭�����弱�(_I)"
-
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:833
 msgid "Default Formatting"
 msgstr "藥�莅ゆ�弱�"
 
-#: src/gtkprefs.c:840
+#: src/gtkprefs.c:835
 msgid "_Send default formatting with outgoing messages"
 msgstr "���坂拭��戎���莅ゆ�弱�(_S)"
 
-#: src/gtkprefs.c:872
+#: src/gtkprefs.c:867
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr "綵���戎�����顒������弱��駈������榊��篆≧���篌��丞ず筝肴��激��"
 
-#: src/gtkprefs.c:875
+#: src/gtkprefs.c:870
 msgid "_Clear Formatting"
 msgstr "羝��ゆ�弱�(_C)"
 
-#: src/gtkprefs.c:912
+#: src/gtkprefs.c:907
 msgid "Send Message"
 msgstr "����羔���"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:908
 msgid "Enter _sends message"
 msgstr "��莉������羔���(_S)"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:910
 msgid "C_ontrol-Enter sends message"
 msgstr "Ctrl+��莉������羔���(_O)"
 
-#: src/gtkprefs.c:918
+#: src/gtkprefs.c:913
 msgid "Window Closing"
 msgstr "腦��e�渇��"
 
-#: src/gtkprefs.c:919
+#: src/gtkprefs.c:914
 msgid "_Escape closes window"
 msgstr "Esc ���渇�㊦���(_E)"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:917
 msgid "Insertions"
 msgstr "����"
 
-#: src/gtkprefs.c:923
+#: src/gtkprefs.c:918
 msgid "Control-{B/I/U} changes _formatting"
 msgstr "Ctrl+{B/I/U} �贋�号�弱�(_F)"
 
-#: src/gtkprefs.c:925
+#: src/gtkprefs.c:920
 msgid "Control-(number) _inserts smileys"
 msgstr "Ctrl+�医�����ョ���(_I)"
 
-#: src/gtkprefs.c:941
+#: src/gtkprefs.c:936
 msgid "Buddy List Sorting"
 msgstr "絅遵���茵��綺�"
 
-#: src/gtkprefs.c:950
+#: src/gtkprefs.c:945
 msgid "_Sorting:"
 msgstr "��綺�(_S):"
 
-#: src/gtkprefs.c:956 src/gtkprefs.c:1009
+#: src/gtkprefs.c:951 src/gtkprefs.c:1003
 msgid "Show _buttons as:"
 msgstr "絨������丞ず筝�(_B):"
 
-#: src/gtkprefs.c:958 src/gtkprefs.c:1011
+#: src/gtkprefs.c:953 src/gtkprefs.c:1005
 msgid "Pictures"
 msgstr "�丞��"
 
-#: src/gtkprefs.c:959 src/gtkprefs.c:1012
+#: src/gtkprefs.c:954 src/gtkprefs.c:1006
 msgid "Text"
 msgstr "��絖�"
 
-#: src/gtkprefs.c:960 src/gtkprefs.c:1013
+#: src/gtkprefs.c:955 src/gtkprefs.c:1007
 msgid "Pictures and text"
 msgstr "�丞������絖�"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:958
 msgid "_Raise window on events"
 msgstr "����篋�篁倶�倶�羇紫���(_R)"
 
-#: src/gtkprefs.c:966
+#: src/gtkprefs.c:961
 msgid "Buddy Display"
 msgstr "絅遵��丞ず"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1027
+#: src/gtkprefs.c:962 src/gtkprefs.c:1020
 msgid "Show buddy _icons"
 msgstr "�丞ず絅遵��丈��(_I)"
 
-#: src/gtkprefs.c:969
+#: src/gtkprefs.c:964
 msgid "Show _warning levels"
 msgstr "�丞ず茘���膾у��(_W)"
 
-#: src/gtkprefs.c:971
+#: src/gtkprefs.c:966
 msgid "Show idle _times"
 msgstr "�丞ず���≧�狗��(_T)"
 
-#: src/gtkprefs.c:973
+#: src/gtkprefs.c:968
 msgid "Dim i_dle buddies"
 msgstr "�丞ず�∞����絅遵�(_D)"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:970
 msgid "_Automatically expand contacts"
 msgstr "�����綣���膤私査(_A)"
 
-#: src/gtkprefs.c:1020
+#: src/gtkprefs.c:1013
 msgid "Enable \"_slash\" commands"
 msgstr "��莅御��膾水�紊雁���巡擦(_S)"
 
-#: src/gtkprefs.c:1023
+#: src/gtkprefs.c:1016
 msgid "Show _formatting toolbar"
 msgstr "�丞ず�弱�綏ュ�傑��(_F)"
 
-#: src/gtkprefs.c:1025
+#: src/gtkprefs.c:1018
 msgid "Show _aliases in tabs/titles"
 msgstr "����膈�/��蘂�筝㊥�丞ず����(_A)"
 
-#: src/gtkprefs.c:1029
+#: src/gtkprefs.c:1022
 msgid "Enable buddy ic_on animation"
 msgstr "����ソ���丈������(_O)"
 
-#: src/gtkprefs.c:1031
+#: src/gtkprefs.c:1024
 msgid "_Notify buddies that you are typing to them"
 msgstr "����絅遵���③����絖�膸�篁�篁�(_N)"
 
-#: src/gtkprefs.c:1033
+#: src/gtkprefs.c:1026
 msgid "_Raise IM window on events"
 msgstr "����篋�篁倶�倶�羇糸�莚�腦���(_R)"
 
-#: src/gtkprefs.c:1036
+#: src/gtkprefs.c:1029
 msgid "Raise chat _window on events"
 msgstr "����篋�篁倶�倶�羇肢��紊����(_W)"
 
-#: src/gtkprefs.c:1038
+#: src/gtkprefs.c:1031
 msgid "Use _multi-colored screen names in chats"
 msgstr "����紊�賢篏睡���腱�蘂��我�ュ�阪�����桁��(_M)"
 
 #. All the tab options!
-#: src/gtkprefs.c:1042
+#: src/gtkprefs.c:1035
 msgid "Tab Options"
 msgstr "��膈冗��蕁�"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1037
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "����筝���膈丞��e���丞ず�恰�倶�������紊�(_T)"
 
-#: src/gtkprefs.c:1059
+#: src/gtkprefs.c:1052
 msgid "Show _close button on tabs"
 msgstr "����膈鞘��丞ず�渇�㊥����(_C)"
 
-#: src/gtkprefs.c:1062
+#: src/gtkprefs.c:1055
 msgid "Tab p_lacement:"
 msgstr "��膈鞘�臀�(_L):"
 
-#: src/gtkprefs.c:1064
+#: src/gtkprefs.c:1057
 msgid "Top"
 msgstr "筝�"
 
-#: src/gtkprefs.c:1065
+#: src/gtkprefs.c:1058
 msgid "Bottom"
 msgstr "筝�"
 
-#: src/gtkprefs.c:1066
+#: src/gtkprefs.c:1059
 msgid "Left"
 msgstr "綏�"
 
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:1060
 msgid "Right"
 msgstr "��"
 
-#: src/gtkprefs.c:1073
+#: src/gtkprefs.c:1066
 msgid "New conversation _placement:"
 msgstr "�医�莚��丞舟(_P):"
 
-#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:596
-#: src/protocols/oscar/oscar.c:4855
+#: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:580
+#: src/protocols/oscar/oscar.c:4848
 msgid "IP Address"
 msgstr "IP �医��"
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1119
 msgid "_Autodetect IP Address"
 msgstr "�����羌� IP �医��(_A)"
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1128
 msgid "Public _IP:"
 msgstr "��� _IP:"
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1152
 msgid "Ports"
 msgstr "腴��"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1155
 msgid "_Manually specify range of ports to listen on"
 msgstr "������絎�荀�������腴������(_M)"
 
+#: src/gtkprefs.c:1158
+msgid "_Start Port:"
+msgstr "莎桁�腴��(_S):"
+
 #: src/gtkprefs.c:1165
-msgid "_Start Port:"
-msgstr "顣桁�腴��(_S):"
+msgid "_End Port:"
+msgstr "靳�罩∝���(_E):"
 
 #: src/gtkprefs.c:1172
-msgid "_End Port:"
-msgstr "膸�罩∝���(_E):"
-
-#: src/gtkprefs.c:1179
 msgid "Proxy Server"
 msgstr "篁g�����≦��"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1176
 msgid "No proxy"
 msgstr "��篁g��"
 
-#: src/gtkprefs.c:1245
+#: src/gtkprefs.c:1238
 msgid "_User:"
 msgstr "����(_U):"
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1294
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1302
+#: src/gtkprefs.c:1295
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1303
+#: src/gtkprefs.c:1296
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1304
+#: src/gtkprefs.c:1297
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1305
+#: src/gtkprefs.c:1298
 msgid "Gnome Default"
 msgstr "GNOME 藥�莅�"
 
-#: src/gtkprefs.c:1306
+#: src/gtkprefs.c:1299
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1307
+#: src/gtkprefs.c:1300
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1308
+#: src/gtkprefs.c:1301
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1302
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1318
+#: src/gtkprefs.c:1311
 msgid "Manual"
 msgstr "����"
 
-#: src/gtkprefs.c:1369
+#: src/gtkprefs.c:1362
 msgid "Browser Selection"
 msgstr "羌頵�������"
 
-#: src/gtkprefs.c:1373
+#: src/gtkprefs.c:1366
 msgid "_Browser:"
 msgstr "羌頵���(_B):"
 
-#: src/gtkprefs.c:1380
+#: src/gtkprefs.c:1373
 msgid "_Open link in:"
 msgstr "��綣��丈・���劫�(_O):"
 
-#: src/gtkprefs.c:1382
+#: src/gtkprefs.c:1375
 msgid "Browser default"
 msgstr "羌頵����莅�"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1376
 msgid "Existing window"
 msgstr "�井��腦���"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1378
 msgid "New tab"
 msgstr "�医産��膈�"
 
-#: src/gtkprefs.c:1399
+#: src/gtkprefs.c:1392
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3919,83 +3924,83 @@
 "����(_M):\n"
 "(%s 篁h; URL)"
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1429
 msgid "Message Logs"
 msgstr "羔����ュ�"
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1432
 msgid "Log _Format:"
 msgstr "�ュ��弱�(_F):"
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1435
 msgid "_Log all instant messages"
 msgstr "莅医������恰�倶���(_L)"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1437
 msgid "Log all c_hats"
 msgstr "莅医�������紊�(_H)"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1440
 msgid "System Logs"
 msgstr "膤紫��ュ�"
 
-#: src/gtkprefs.c:1449
+#: src/gtkprefs.c:1442
 msgid "_Enable system log"
 msgstr "����鎧膸��ュ�(_E)"
 
-#: src/gtkprefs.c:1452
+#: src/gtkprefs.c:1445
 msgid "Log when buddies _sign on/sign off"
 msgstr "莅医�絅遵����糸��/�糸��(_S)"
 
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1451
 msgid "Log when buddies become _idle/un-idle"
 msgstr "莅医�絅遵�������/�♂��(_I)"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1457
 msgid "Log when buddies go away/come _back"
 msgstr "莅医�絅遵���胼糸�/����(_B)"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1463
 msgid "Log your _own signons/idleness/awayness"
 msgstr "莅医�����訓���糸��/����/胼糸�(_O)"
 
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1589
 msgid "Sound Selection"
 msgstr "紕育�渇����"
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1640
 msgid "Sound Options"
 msgstr "紕育�渇��蕁�"
 
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1641
 msgid "Sounds when conversation has _focus"
 msgstr "絲壕��桁����劫���紕�(_F)"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1643
 msgid "_Sounds while away"
 msgstr "胼糸��九�紕�(_S)"
 
-#: src/gtkprefs.c:1654
+#: src/gtkprefs.c:1647
 msgid "Sound Method"
 msgstr "紕育�恰�劫�"
 
-#: src/gtkprefs.c:1655
+#: src/gtkprefs.c:1648
 msgid "_Method:"
 msgstr "�劫�(_M):"
 
-#: src/gtkprefs.c:1657
+#: src/gtkprefs.c:1650
 msgid "Console beep"
 msgstr "�у�九伾����"
 
+#: src/gtkprefs.c:1652
+msgid "Automatic"
+msgstr "����"
+
 #: src/gtkprefs.c:1659
-msgid "Automatic"
-msgstr "����"
-
-#: src/gtkprefs.c:1666
 msgid "Command"
 msgstr "�巡擦"
 
-#: src/gtkprefs.c:1674
+#: src/gtkprefs.c:1667
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4004,86 +4009,90 @@
 "紕育�喝�巡擦(_O):\n"
 "(%s 篁h;��篁九��)"
 
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1694
 msgid "Sound Events"
 msgstr "紕育�割�篁�"
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1745
 msgid "Play"
 msgstr "�㊥��"
 
-#: src/gtkprefs.c:1759
+#: src/gtkprefs.c:1752
 msgid "Event"
 msgstr "篋�篁�"
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1771
 msgid "Test"
 msgstr "羌�莚�"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1775
 msgid "Reset"
 msgstr "��臀�"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1779
 msgid "Choose..."
 msgstr "����..."
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1803
 msgid "_Queue new messages when away"
 msgstr "胼糸��倶���井�����ラ����(_Q)"
 
-#: src/gtkprefs.c:1813
-msgid "Auto-response"
-msgstr "������紊�"
-
-#: src/gtkprefs.c:1814
-msgid "_Send auto-response"
-msgstr "����������紊�(_S)"
-
-#: src/gtkprefs.c:1816
-msgid "_Only send auto-response when idle"
-msgstr "篁��������≧�九���������紊�(_O)"
-
-#: src/gtkprefs.c:1819 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2730
-#: src/protocols/oscar/oscar.c:4011 src/protocols/yahoo/yahoo.c:2511
+#: src/gtkprefs.c:1806
+msgid "_Auto-reply:"
+msgstr "������紊�(_A):"
+
+#: src/gtkprefs.c:1808
+msgid "Never"
+msgstr "篁��"
+
+#: src/gtkprefs.c:1809
+msgid "Only when away"
+msgstr "篁�綵�胼糸���"
+
+#: src/gtkprefs.c:1810
+msgid "Only when away and idle"
+msgstr "篁�綵�胼糸������≧��"
+
+#: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2728
+#: src/protocols/oscar/oscar.c:4003 src/protocols/yahoo/yahoo.c:2554
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
 msgstr "����"
 
-#: src/gtkprefs.c:1820
+#: src/gtkprefs.c:1814
 msgid "Idle _time reporting:"
 msgstr "���≧�狗�贋�ュ��(_T):"
 
-#: src/gtkprefs.c:1823
+#: src/gtkprefs.c:1817
 msgid "Gaim usage"
 msgstr "Gaim 篏睡��"
 
-#: src/gtkprefs.c:1826
+#: src/gtkprefs.c:1820
 msgid "X usage"
 msgstr "X 篏睡��"
 
-#: src/gtkprefs.c:1828
+#: src/gtkprefs.c:1822
 msgid "Windows usage"
 msgstr "腦��d戎��"
 
-#: src/gtkprefs.c:1836
+#: src/gtkprefs.c:1830
 msgid "Auto-away"
 msgstr "�����綣�"
 
-#: src/gtkprefs.c:1837
+#: src/gtkprefs.c:1831
 msgid "Set away _when idle"
 msgstr "���≦���活�臀��綣�(_W)"
 
-#: src/gtkprefs.c:1841
+#: src/gtkprefs.c:1835
 msgid "_Minutes before setting away:"
 msgstr "莅丞舟胼糸���膈�������(_M):"
 
-#: src/gtkprefs.c:1849
+#: src/gtkprefs.c:1843
 msgid "Away m_essage:"
 msgstr "胼糸�羔���(_E):"
 
-#: src/gtkprefs.c:1930
+#: src/gtkprefs.c:1912
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4098,7 +4107,7 @@
 "<span weight=\"bold\">臀�腴�:</span>\t\t%s\n"
 "<span weight=\"bold\">��篁九��:</span>\t%s"
 
-#: src/gtkprefs.c:1935
+#: src/gtkprefs.c:1917
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4113,64 +4122,64 @@
 "<span weight=\"bold\">URL:</span>  %s\n"
 "<span weight=\"bold\">��篁九��:</span>  %s"
 
-#: src/gtkprefs.c:2168
+#: src/gtkprefs.c:2150
 msgid "Load"
 msgstr "茖���"
 
-#: src/gtkprefs.c:2182
+#: src/gtkprefs.c:2164
 msgid "Summary"
 msgstr "网�茹�"
 
-#: src/gtkprefs.c:2230
+#: src/gtkprefs.c:2212
 msgid "Details"
 msgstr "膸���"
 
-#: src/gtkprefs.c:2375
+#: src/gtkprefs.c:2357
 msgid "_Edit"
 msgstr "膽�莨�(_E)"
 
-#: src/gtkprefs.c:2411
+#: src/gtkprefs.c:2393
 msgid "Interface"
 msgstr "����"
 
-#: src/gtkprefs.c:2414
+#: src/gtkprefs.c:2396
 msgid "Message Text"
 msgstr "羔�������"
 
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2397
 msgid "Shortcuts"
 msgstr "綽��潔��"
 
-#: src/gtkprefs.c:2416
+#: src/gtkprefs.c:2398
 msgid "Smiley Themes"
 msgstr "膃��娯源蘂�"
 
-#: src/gtkprefs.c:2417
+#: src/gtkprefs.c:2399
 msgid "Sounds"
 msgstr "紕育��"
 
-#: src/gtkprefs.c:2418
+#: src/gtkprefs.c:2400
 msgid "Network"
 msgstr "臀�膸�"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2421
+#: src/gtkprefs.c:2403
 msgid "Browser"
 msgstr "羌頵���"
 
-#: src/gtkprefs.c:2423
+#: src/gtkprefs.c:2405
 msgid "Logging"
 msgstr "�ュ�"
 
-#: src/gtkprefs.c:2424
+#: src/gtkprefs.c:2406
 msgid "Away / Idle"
 msgstr "胼糸�/����"
 
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2407
 msgid "Away Messages"
 msgstr "胼糸�羔���"
 
-#: src/gtkprefs.c:2428
+#: src/gtkprefs.c:2410
 msgid "Plugins"
 msgstr "��篁�"
 
@@ -4194,63 +4203,63 @@
 msgid "Block only the users below"
 msgstr "����巡札筝�����"
 
-#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1449
+#: src/gtkprivacy.c:385 src/protocols/jabber/jabber.c:1466
 msgid "Privacy"
 msgstr "��腱�"
 
-#: src/gtkprivacy.c:400
+#: src/gtkprivacy.c:398
 msgid "Changes to privacy settings take effect immediately."
 msgstr "絲拷��腱�莅丞舟���贋�劫�篌�腴��括������"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:412
+#: src/gtkprivacy.c:410
 msgid "Set privacy for:"
 msgstr "莅丞舟��腱���茣���:"
 
-#: src/gtkprivacy.c:581 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:579 src/gtkprivacy.c:595
 msgid "Permit User"
 msgstr "��莅悟����"
 
-#: src/gtkprivacy.c:582
+#: src/gtkprivacy.c:580
 msgid "Type a user you permit to contact you."
 msgstr "莨��ュ��莅梧��膤紙�������激��"
 
-#: src/gtkprivacy.c:583
+#: src/gtkprivacy.c:581
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "���活���莅後��肩���決��膤紙���莚決��ヤ�/絎�����絖���"
 
-#: src/gtkprivacy.c:586 src/gtkprivacy.c:599
+#: src/gtkprivacy.c:584 src/gtkprivacy.c:597
 msgid "Permit"
 msgstr "��莅�"
 
-#: src/gtkprivacy.c:591
+#: src/gtkprivacy.c:589
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "��莅� %s ��膤紙����鐚�"
 
-#: src/gtkprivacy.c:593
+#: src/gtkprivacy.c:591
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "�������活���莅� %s ��膤紙����鐚�"
 
-#: src/gtkprivacy.c:620 src/gtkprivacy.c:633
+#: src/gtkprivacy.c:618 src/gtkprivacy.c:631
 msgid "Block User"
 msgstr "絮�恝����"
 
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:619
 msgid "Type a user to block."
 msgstr "莨��ヨ�絮�恝�����激��"
 
-#: src/gtkprivacy.c:622
+#: src/gtkprivacy.c:620
 msgid "Please enter the name of the user you wish to block."
 msgstr "莚決��ユ���活�絮�恝�����桁��腱違��"
 
-#: src/gtkprivacy.c:629
+#: src/gtkprivacy.c:627
 #, c-format
 msgid "Block %s?"
 msgstr "絮�� %s ����"
 
-#: src/gtkprivacy.c:631
+#: src/gtkprivacy.c:629
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "�������活�絮�� %s ����"
@@ -4279,19 +4288,19 @@
 msgid "Close"
 msgstr "�渇��"
 
-#: src/gtkrequest.c:1391
+#: src/gtkrequest.c:1392
 msgid "That file already exists"
 msgstr "莚ユ��篁銀�絖���"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1393
 msgid "Would you like to overwrite it?"
 msgstr "�������活�荀���鐚�"
 
-#: src/gtkrequest.c:1430 src/gtkrequest.c:1451
+#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
 msgid "Save File..."
 msgstr "篆�絖���篁�..."
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
 msgid "Open File..."
 msgstr "��綣���篁�..."
 
@@ -4300,7 +4309,7 @@
 msgstr "�翠�翫��茵�"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: src/gtkroomlist.c:401
 msgid "_Get List"
 msgstr "�桁���茵�(_G)"
 
@@ -4370,7 +4379,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:574
+#: src/log.c:575
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4379,7 +4388,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;������紊�&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:576
+#: src/log.c:577
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4388,55 +4397,59 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;������紊�&gt;:"
 "</b></font> %s<br/>\n"
 
-#: src/log.c:627 src/log.c:814
+#: src/log.c:628 src/log.c:815
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�鞘��井�ュ�莊��鐚�</b></font>"
 
-#: src/log.c:637 src/log.c:826
+#: src/log.c:638 src/log.c:827
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>��羈�莚糸���篁�: %s</b></font>"
 
-#: src/log.c:674
+#: src/log.c:675
 msgid "HTML"
 msgstr "HTML"
 
-#: src/log.c:759
+#: src/log.c:760
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <������紊�>: %s\n"
 
-#: src/log.c:859
+#: src/log.c:860
 msgid "Plain text"
 msgstr "膾�����"
 
-#: src/main.c:153
+#: src/main.c:150
 msgid "Please create an account."
 msgstr "莚桁��綮坂�筝�侃�激��"
 
-#: src/main.c:235
+#: src/main.c:232
 msgid "Login"
 msgstr "�糸��"
 
-#: src/main.c:253
+#: src/main.c:248
 msgid "<b>_Account:</b>"
 msgstr "<b>茣���(_A):</b>"
 
-#: src/main.c:267
+#: src/main.c:262
 msgid "<b>_Password:</b>"
 msgstr "<b>絲���(_P):</b>"
 
 #. And now for the buttons
-#: src/main.c:284
+#: src/main.c:279
 msgid "_Accounts"
 msgstr "茣���(_A)"
 
-#: src/main.c:290
+#: src/main.c:285
 msgid "_Preferences"
 msgstr "薤���蕁�(_P)"
 
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "�糸��(_S)"
+
 #. full help text
-#: src/main.c:520
+#: src/main.c:517
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4469,11 +4482,24 @@
 "  -h, --help          �丞ず絽���攻����\n"
 
 #. short message
-#: src/main.c:535
+#: src/main.c:532
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s��莚�莚���%s -h���ョ��絽�����\n"
 
+#: src/main.c:845
+msgid "Unable to load preferences"
+msgstr "��羈�茖��ラ���蕁�"
+
+#: src/main.c:845
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+"Gaim ��羈�茖��ユ����薤���蕁刻�������������蕁号���������弱�紊���鐚�����綏俄�������莚隙戎"
+"�����蕁合��i���育��臀�����莅丞舟��"
+
 #: src/plugin.c:286
 #, c-format
 msgid ""
@@ -4497,10 +4523,10 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 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:2721
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:616 src/protocols/yahoo/yahoo.c:2851
-#: src/protocols/yahoo/yahoo.c:2967
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2719
+#: src/protocols/novell/novell.c:2838 src/protocols/novell/novell.c:2889
+#: src/protocols/oscar/oscar.c:602 src/protocols/yahoo/yahoo.c:2894
+#: src/protocols/yahoo/yahoo.c:3010
 msgid "Available"
 msgstr "����"
 
@@ -4513,11 +4539,11 @@
 msgstr "���絅遵�胼糸�"
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:536
+#: src/protocols/jabber/presence.c:128 src/protocols/oscar/oscar.c:520
 #: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
-#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6694
-#: src/protocols/oscar/oscar.c:6699 src/protocols/yahoo/yahoo.c:2509
-#: src/protocols/yahoo/yahoo.c:2871 src/protocols/yahoo/yahoo.c:2979
+#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6699
+#: src/protocols/oscar/oscar.c:6704 src/protocols/yahoo/yahoo.c:2552
+#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
 msgid "Invisible"
 msgstr "��荳�"
 
@@ -4560,17 +4586,17 @@
 msgid "Unknown Error Code."
 msgstr "���ョ����莚�撮����"
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3820
+#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3807
 #, 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"
 
 #. res[0] == username
 #: src/protocols/gg/gg.c:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3824
-#: src/protocols/oscar/oscar.c:4040 src/protocols/silc/ops.c:1067
-#: src/protocols/silc/ops.c:1128 src/protocols/toc/toc.c:468
-#: src/protocols/zephyr/zephyr.c:635
+#: src/protocols/napster/napster.c:393 src/protocols/oscar/oscar.c:3811
+#: src/protocols/oscar/oscar.c:4032 src/protocols/silc/ops.c:1076
+#: src/protocols/silc/ops.c:1137 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:644
 msgid "Buddy Information"
 msgstr "絅遵�篆≧��"
 
@@ -4590,16 +4616,16 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: src/protocols/gg/gg.c:674 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:2156
-#: src/protocols/yahoo/yahoo.c:2185 src/protocols/yahoo/yahoo.c:2248
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2199
+#: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
 #: src/protocols/yahoo/yahoo_filexfer.c:68
-#: src/protocols/yahoo/yahoo_filexfer.c:109
+#: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr "��羈�菴��ャ��"
 
 #: src/protocols/gg/gg.c:690
 msgid "Reading data"
-msgstr "罩e������井��"
+msgstr "莚糸��井��"
 
 #: src/protocols/gg/gg.c:693
 msgid "Balancer handshake"
@@ -4607,11 +4633,11 @@
 
 #: src/protocols/gg/gg.c:696
 msgid "Reading server key"
-msgstr "罩e��������≦�����"
+msgstr "莚糸����≦�����"
 
 #: src/protocols/gg/gg.c:699
 msgid "Exchanging key hash"
-msgstr "罩e��困�√���"
+msgstr "篋ゆ�√���"
 
 #: src/protocols/gg/gg.c:709
 msgid "Critical error in GG library\n"
@@ -4655,26 +4681,26 @@
 msgid "Active"
 msgstr "羇肢�"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4847
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4840
 msgid "UIN"
 msgstr "UIN"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4858 src/protocols/silc/ops.c:790
+#: src/protocols/oscar/oscar.c:4851 src/protocols/silc/ops.c:799
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "��"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4859 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "紮�"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4848
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4841
+#: src/protocols/silc/ops.c:1193
 msgid "Nick"
 msgstr "�窮О"
 
@@ -4689,7 +4715,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4902 src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4895 src/protocols/oscar/oscar.c:4903
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "���"
@@ -4788,7 +4814,7 @@
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1550
+#: src/protocols/toc/toc.c:1551
 msgid "Change Password"
 msgstr "�贋�劫���"
 
@@ -4839,15 +4865,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:232
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3555
-#: src/protocols/oscar/oscar.c:6126
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:235
+#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3546
+#: src/protocols/oscar/oscar.c:6129
 msgid "Authorize"
 msgstr "����"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:233
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3557
-#: src/protocols/oscar/oscar.c:6127
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:236
+#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3548
+#: src/protocols/oscar/oscar.c:6130
 msgid "Deny"
 msgstr "��靳�"
 
@@ -4872,13 +4898,13 @@
 msgid "Unknown command: %s"
 msgstr "���ョ����莚�撮��: %s"
 
-#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:544
+#: src/protocols/irc/cmds.c:448 src/protocols/jabber/chat.c:536
 #: src/protocols/silc/silc.c:995
 #, c-format
 msgid "current topic is: %s"
 msgstr "������莚�蘂�筝�: %s"
 
-#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:546
+#: src/protocols/irc/cmds.c:451 src/protocols/jabber/chat.c:538
 #: src/protocols/silc/silc.c:998
 msgid "No topic is set"
 msgstr "���絎�莚�蘂�"
@@ -4911,51 +4937,51 @@
 msgid "MOTD for %s"
 msgstr "%s �� MOTD"
 
-#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:373
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:388
 msgid "Server has disconnected"
 msgstr "���≦��群�㊤�菴���"
 
-#: src/protocols/irc/irc.c:147
+#: src/protocols/irc/irc.c:158
 msgid "View MOTD"
 msgstr "�ョ�� MOTD"
 
-#: src/protocols/irc/irc.c:169 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:180 src/protocols/silc/chat.c:32
 msgid "_Channel:"
 msgstr "蘂���(_C):"
 
-#: src/protocols/irc/irc.c:174 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:185 src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "絲���(_P):"
 
-#: src/protocols/irc/irc.c:194
+#: src/protocols/irc/irc.c:205
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC �窮О筝��遵�������"
 
-#: src/protocols/irc/irc.c:213 src/protocols/toc/toc.c:198
+#: src/protocols/irc/irc.c:224 src/protocols/toc/toc.c:198
 #, c-format
 msgid "Signon: %s"
 msgstr "�糸���: %s"
 
-#: src/protocols/irc/irc.c:222
+#: src/protocols/irc/irc.c:233
 msgid "Couldn't create socket"
 msgstr "��羈���綮阪��ュ�"
 
-#: src/protocols/irc/irc.c:237 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1529 src/protocols/oscar/oscar.c:1593
+#: src/protocols/irc/irc.c:248 src/protocols/jabber/jabber.c:297
+#: src/protocols/oscar/oscar.c:1519 src/protocols/oscar/oscar.c:1583
 msgid "Couldn't connect to host"
 msgstr "��羈�菴��ュ�遺源��"
 
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:385 src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "莚糸���莚�"
 
-#: src/protocols/irc/irc.c:521 src/protocols/silc/chat.c:1363
+#: src/protocols/irc/irc.c:536 src/protocols/silc/chat.c:1356
 #: src/protocols/yahoo/yahoochat.c:1380
 msgid "Users"
 msgstr "����"
 
-#: src/protocols/irc/irc.c:524 src/protocols/silc/chat.c:1366
-#: src/protocols/silc/ops.c:1146 src/protocols/yahoo/yahoochat.c:1389
+#: src/protocols/irc/irc.c:539 src/protocols/silc/chat.c:1359
+#: src/protocols/silc/ops.c:1155 src/protocols/yahoo/yahoochat.c:1389
 msgid "Topic"
 msgstr "莚�蘂�"
 
@@ -4968,51 +4994,57 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:628
+#: src/protocols/irc/irc.c:643
 msgid "IRC Protocol Plugin"
 msgstr "IRC �顒��篁�"
 
 #. *  summary
-#: src/protocols/irc/irc.c:629
+#: src/protocols/irc/irc.c:644
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "��莚��翫��� IRC �顒��篁�"
 
-#: src/protocols/irc/irc.c:648 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1559 src/protocols/napster/napster.c:644
-#: src/protocols/silc/ops.c:1008 src/protocols/silc/ops.c:1110
+#: src/protocols/irc/irc.c:663 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1576 src/protocols/napster/napster.c:644
+#: src/protocols/silc/ops.c:1017 src/protocols/silc/ops.c:1119
 msgid "Server"
 msgstr "���≦��"
 
-#: src/protocols/irc/irc.c:651 src/protocols/jabber/jabber.c:1580
-#: src/protocols/msn/msn.c:1758 src/protocols/napster/napster.c:649
-#: src/protocols/silc/silc.c:1576 src/protocols/trepia/trepia.c:1297
+#: src/protocols/irc/irc.c:666 src/protocols/jabber/jabber.c:1597
+#: src/protocols/msn/msn.c:1759 src/protocols/napster/napster.c:649
+#: src/protocols/silc/silc.c:1577 src/protocols/trepia/trepia.c:1297
 msgid "Port"
 msgstr "腴��"
 
-#: src/protocols/irc/irc.c:654 src/protocols/zephyr/zephyr.c:1915
+#: src/protocols/irc/irc.c:669 src/protocols/zephyr/zephyr.c:1919
 msgid "Encoding"
 msgstr "靶���"
 
-#: src/protocols/irc/irc.c:657 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:672 src/protocols/irc/msgs.c:195
 #: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:955 src/protocols/silc/ops.c:957
-#: src/protocols/silc/ops.c:1104 src/protocols/silc/ops.c:1106
+#: src/protocols/silc/ops.c:964 src/protocols/silc/ops.c:966
+#: src/protocols/silc/ops.c:1113 src/protocols/silc/ops.c:1115
 msgid "Username"
 msgstr "���桁��"
 
-#: src/protocols/irc/msgs.c:98
+#: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr "����罔≦�"
 
-#: src/protocols/irc/msgs.c:109
+#: src/protocols/irc/msgs.c:108
 #, c-format
 msgid "You are banned from %s."
 msgstr "��← %s 絮�恔���"
 
-#: src/protocols/irc/msgs.c:110
+#: src/protocols/irc/msgs.c:109
 msgid "Banned"
 msgstr "絮��"
 
+#: src/protocols/irc/msgs.c:182 src/protocols/irc/msgs.c:201
+#: src/protocols/irc/msgs.c:214
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
 #: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
@@ -5021,138 +5053,145 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/silc/ops.c:949
-#: src/protocols/silc/ops.c:1098 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
+#: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
+#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
+
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:958
+#: src/protocols/silc/ops.c:1107 src/protocols/yahoo/yahoo_profile.c:1005
 msgid "Realname"
 msgstr "����"
 
-#: src/protocols/irc/msgs.c:202 src/protocols/silc/ops.c:1021
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1030
 msgid "Currently on"
 msgstr "����篏�篋�"
 
-#: src/protocols/irc/msgs.c:207
+#: src/protocols/irc/msgs.c:212
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>���>�:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:214
 msgid "Online since"
 msgstr "筝�膾炊�狗��"
 
-#: src/protocols/irc/msgs.c:212
+#: src/protocols/irc/msgs.c:217
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>絎�箙�綵√�莚�:</b>�乗徽<br>"
 
-#: src/protocols/irc/msgs.c:219
+#: src/protocols/irc/msgs.c:224
 #, c-format
 msgid "Buddy Information for %s"
 msgstr "%s ��絅遵�篆≧��"
 
-#: src/protocols/irc/msgs.c:279
+#: src/protocols/irc/msgs.c:284
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 絨�莚�蘂��剛減: %s"
 
-#: src/protocols/irc/msgs.c:284
+#: src/protocols/irc/msgs.c:289
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s ��莚�蘂�筝�: %s"
 
-#: src/protocols/irc/msgs.c:301
+#: src/protocols/irc/msgs.c:306
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "���ヤ拭����%s��"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Unknown message"
 msgstr "���ヤ拭��"
 
-#: src/protocols/irc/msgs.c:302
+#: src/protocols/irc/msgs.c:307
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim ����篋� IRC ���≦����羈���茹g��篆≧����"
 
-#: src/protocols/irc/msgs.c:325
+#: src/protocols/irc/msgs.c:330
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s 筝������傑��: %s"
 
-#: src/protocols/irc/msgs.c:407
+#: src/protocols/irc/msgs.c:424
 msgid "No such channel"
 msgstr "羃≧��菴��欠��蘂���"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:418
+#: src/protocols/irc/msgs.c:435
 msgid "no such channel"
 msgstr "羃≧��菴��欠��蘂���"
 
-#: src/protocols/irc/msgs.c:421
+#: src/protocols/irc/msgs.c:438
 msgid "User is not logged in"
 msgstr "���傑���糸��"
 
-#: src/protocols/irc/msgs.c:426
+#: src/protocols/irc/msgs.c:443
 msgid "No such nick or channel"
 msgstr "羃≧��菴��欠���窮О��蘂���"
 
-#: src/protocols/irc/msgs.c:446
+#: src/protocols/irc/msgs.c:463
 msgid "Could not send"
 msgstr "��羈�����"
 
-#: src/protocols/irc/msgs.c:502
+#: src/protocols/irc/msgs.c:519
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "���� %s ��荀���莚激��"
 
-#: src/protocols/irc/msgs.c:503
+#: src/protocols/irc/msgs.c:520
 msgid "Invitation only"
 msgstr "����莚�"
 
-#: src/protocols/irc/msgs.c:606
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "��← %s: %s 荼√�坂�"
 
-#: src/protocols/irc/msgs.c:611
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "茴� %s (%s) 荼√��"
 
-#: src/protocols/irc/msgs.c:632
+#: src/protocols/irc/msgs.c:649
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "�� %3$s 膊∞��(%1$s %2$s)"
 
-#: src/protocols/irc/msgs.c:711
+#: src/protocols/irc/msgs.c:758
 msgid "Could not change nick"
 msgstr "��羈��贋�号�窮О"
 
-#: src/protocols/irc/msgs.c:712
+#: src/protocols/irc/msgs.c:759
 msgid "Cannot change nick"
 msgstr "��羈��贋�号�窮О"
 
-#: src/protocols/irc/msgs.c:733
+#: src/protocols/irc/msgs.c:780
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "��群膸��鋇��蘂���%s%s"
 
-#: src/protocols/irc/msgs.c:773
+#: src/protocols/irc/msgs.c:820
 msgid "Error: invalid PONG from server"
 msgstr "��莚�: ���≦���� PONG ����"
 
-#: src/protocols/irc/msgs.c:775
+#: src/protocols/irc/msgs.c:822
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING ��綺� -- 綮九��: %lu 腱�"
 
-#: src/protocols/irc/msgs.c:850
+#: src/protocols/irc/msgs.c:897
 #, c-format
 msgid "Cannot join %s:"
 msgstr "��羈����� %s:"
 
-#: src/protocols/irc/msgs.c:851 src/protocols/silc/ops.c:894
+#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:903
 msgid "Cannot join channel"
 msgstr "��羈����ラ���"
 
-#: src/protocols/irc/msgs.c:887
+#: src/protocols/irc/msgs.c:934
 #, c-format
 msgid "Wallops from %s"
 msgstr "�ヨ�� %s ���峨��"
@@ -5239,7 +5278,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "name [蘂���]: ���咲���筝㊦���������激��"
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1407
+#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1410
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;�井�窮О&gt;: �贋�号�����窮О��"
 
@@ -5313,26 +5352,26 @@
 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:256
+#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:265
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(莉��∽④篆≧���咲����莚傑��ヨ侃�欠�莨���賢����膽�������蕁�)"
 
-#: src/protocols/irc/parse.c:382
+#: src/protocols/irc/parse.c:394
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s ����紊��狗��: %lu 腱�"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:383
+#: src/protocols/irc/parse.c:395
 msgid "CTCP PING reply"
 msgstr "CTCP PING ��綺�"
 
-#: src/protocols/irc/parse.c:485 src/protocols/oscar/oscar.c:1430
+#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1416
 #: src/protocols/toc/toc.c:188 src/protocols/toc/toc.c:596
 #: src/protocols/toc/toc.c:612 src/protocols/toc/toc.c:689
 msgid "Disconnected."
@@ -5366,12 +5405,12 @@
 msgstr "���≦������������"
 
 #: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:786
+#: src/protocols/silc/ops.c:795
 msgid "Full Name"
 msgstr "����"
 
 #: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:798
+#: src/protocols/silc/ops.c:807
 msgid "Family Name"
 msgstr "紮�"
 
@@ -5381,8 +5420,8 @@
 
 #: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
 #: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1172
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:802
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1094
+#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:811
+#: src/protocols/silc/ops.c:954 src/protocols/silc/ops.c:1103
 #: src/protocols/yahoo/yahoo_profile.c:1000
 msgid "Nickname"
 msgstr "�窮О"
@@ -5446,7 +5485,7 @@
 msgstr "����"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4883
+#: src/protocols/oscar/oscar.c:4876
 msgid "Birthday"
 msgstr "����"
 
@@ -5466,24 +5505,24 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2743
-#: src/protocols/novell/novell.c:2747 src/protocols/oscar/oscar.c:578
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:586
-#: src/protocols/yahoo/yahoo.c:2634
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2741
+#: src/protocols/novell/novell.c:2745 src/protocols/oscar/oscar.c:562
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:570
+#: src/protocols/yahoo/yahoo.c:2677
 msgid "Status"
 msgstr "�倶��"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1562
+#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1579
 msgid "Resource"
 msgstr "莎�羣�"
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:794
+#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:803
 msgid "Middle Name"
 msgstr "筝㊤��"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4901 src/protocols/oscar/oscar.c:4909
-#: src/protocols/silc/ops.c:830
+#: src/protocols/oscar/oscar.c:4894 src/protocols/oscar/oscar.c:4902
+#: src/protocols/silc/ops.c:839
 msgid "Address"
 msgstr "�医��"
 
@@ -5566,51 +5605,51 @@
 msgid "Invalid Room Handle"
 msgstr "�������翠�顔���窮О"
 
-#: src/protocols/jabber/chat.c:349
+#: src/protocols/jabber/chat.c:341
 msgid "Configuration error"
 msgstr "��臀���莚�"
 
-#: src/protocols/jabber/chat.c:358 src/protocols/jabber/chat.c:503
+#: src/protocols/jabber/chat.c:350 src/protocols/jabber/chat.c:495
 msgid "Unable to configure"
 msgstr "��羈���臀�"
 
-#: src/protocols/jabber/chat.c:374
+#: src/protocols/jabber/chat.c:366
 msgid "Room Configuration Error"
 msgstr "�翠�顔��臀���莚�"
 
-#: src/protocols/jabber/chat.c:375
+#: src/protocols/jabber/chat.c:367
 msgid "This room is not capable of being configured"
 msgstr "罩ゆ�翠�贋��羈�菴�茵���臀�"
 
-#: src/protocols/jabber/chat.c:425 src/protocols/jabber/chat.c:494
+#: src/protocols/jabber/chat.c:417 src/protocols/jabber/chat.c:486
 msgid "Registration error"
 msgstr "羈�����莚�"
 
-#: src/protocols/jabber/chat.c:573
+#: src/protocols/jabber/chat.c:565
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "筝��������� MUC ��紊��筝㊥�贋�号�窮О"
 
-#: src/protocols/jabber/chat.c:617 src/protocols/jabber/chat.c:628
+#: src/protocols/jabber/chat.c:609 src/protocols/jabber/chat.c:620
 msgid "Roomlist Error"
 msgstr "�翠�翫��茵���莚�"
 
-#: src/protocols/jabber/chat.c:618 src/protocols/jabber/chat.c:629
+#: src/protocols/jabber/chat.c:610 src/protocols/jabber/chat.c:621
 msgid "Error retreiving roomlist"
 msgstr "�九��翠�翫��茵��九�咲��"
 
-#: src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:661
 msgid "Invalid Server"
 msgstr "���������≦��"
 
-#: src/protocols/jabber/chat.c:706
+#: src/protocols/jabber/chat.c:698
 msgid "Enter a Conference Server"
 msgstr "菴��ヤ�莅����≦��"
 
-#: src/protocols/jabber/chat.c:707
+#: src/protocols/jabber/chat.c:699
 msgid "Select a conference server to query"
 msgstr "������ヨ���篌�莅����≦��"
 
-#: src/protocols/jabber/chat.c:710
+#: src/protocols/jabber/chat.c:702
 msgid "Find Rooms"
 msgstr "�ユ�丈�翠��"
 
@@ -5680,13 +5719,13 @@
 msgstr "�球���散"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4903
-#: src/protocols/oscar/oscar.c:4911 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4896
+#: src/protocols/oscar/oscar.c:4904 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "綏�/��"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:835
+#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:844
 #: src/protocols/silc/silc.c:639 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr "�笈�"
@@ -5709,9 +5748,9 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2105
-#: src/protocols/oscar/oscar.c:1597 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2379 src/protocols/zephyr/zephyr.c:1017
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2103
+#: src/protocols/oscar/oscar.c:1587 src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1018
 msgid "Connecting"
 msgstr "罩e�����"
 
@@ -5729,7 +5768,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:584 src/protocols/oscar/oscar.c:6497
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6502
 msgid "Not Authorized"
 msgstr "���莚�"
 
@@ -5762,19 +5801,19 @@
 msgstr "�咲��"
 
 #: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:119
 msgid "Chatty"
 msgstr "����"
 
 #: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:124
 msgid "Extended Away"
 msgstr "菴�菴�胼糸�"
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:6690
+#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:126
+#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5487
+#: src/protocols/oscar/oscar.c:6695
 msgid "Do Not Disturb"
 msgstr "莚桁�炊����"
 
@@ -5802,7 +5841,7 @@
 msgid "Please enter your new password"
 msgstr "莚決��ユ�����医���"
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1540
+#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1541
 msgid "Set User Info"
 msgstr "莅丞舟���隙拭��"
 
@@ -5922,7 +5961,7 @@
 msgid "Resource Conflict"
 msgstr "莎�羣��牙�"
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1491
+#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1500
 msgid "Connection Timeout"
 msgstr "菴��ヨ���"
 
@@ -6012,48 +6051,48 @@
 msgid "Unable to kick user %s"
 msgstr "��羈�荼√�榊���� %s"
 
-#: src/protocols/jabber/jabber.c:1401
+#: src/protocols/jabber/jabber.c:1402
 msgid "config:  Configure a chat room."
 msgstr "config: ��臀���紊����"
 
-#: src/protocols/jabber/jabber.c:1404
+#: src/protocols/jabber/jabber.c:1406
 msgid "configure:  Configure a chat room."
 msgstr "configure: ��臀���紊����"
 
-#: src/protocols/jabber/jabber.c:1411
+#: src/protocols/jabber/jabber.c:1415
 msgid "part [room]:  Leave the room."
 msgstr "part [�翠��]: 胼糸���紊����"
 
-#: src/protocols/jabber/jabber.c:1414
+#: src/protocols/jabber/jabber.c:1420
 msgid "register:  Register with a chat room."
 msgstr "register: 羈�����紊����"
 
-#: src/protocols/jabber/jabber.c:1419
+#: src/protocols/jabber/jabber.c:1426
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [�域�蘂�]: �ョ�����贋�壕�蘂���"
 
-#: src/protocols/jabber/jabber.c:1423
+#: src/protocols/jabber/jabber.c:1432
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;����&gt; [�翠��]: ���翠�岩賢絮�恔�筝����激��"
 
-#: src/protocols/jabber/jabber.c:1427
+#: src/protocols/jabber/jabber.c:1438
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr "invite &lt;����&gt; [�翠��]: ��莚欠���桁���ユ�翠�眼��"
 
-#: src/protocols/jabber/jabber.c:1431
+#: src/protocols/jabber/jabber.c:1444
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;�翠��&gt; [���≦��]: ���ユ④���≦�������紊���紊����"
 
-#: src/protocols/jabber/jabber.c:1435
+#: src/protocols/jabber/jabber.c:1450
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;����&gt; [�翠��]: 篁��翠�岩賢荼√�坂�筝����激��"
 
-#: src/protocols/jabber/jabber.c:1439
+#: src/protocols/jabber/jabber.c:1455
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;����&gt; &lt;羔���&gt;: �������絅遵�����腱�篋堺�����"
 
-#: src/protocols/jabber/jabber.c:1453
+#: src/protocols/jabber/jabber.c:1470
 msgid "Hide Operating System"
 msgstr "�����鋎�膤紫�"
 
@@ -6068,24 +6107,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1537 src/protocols/jabber/jabber.c:1539
+#: src/protocols/jabber/jabber.c:1554 src/protocols/jabber/jabber.c:1556
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber �顒��篁�"
 
-#: src/protocols/jabber/jabber.c:1565
+#: src/protocols/jabber/jabber.c:1582
 msgid "Use TLS if available"
 msgstr "�ュ�����篏睡�� TLS"
 
-#: src/protocols/jabber/jabber.c:1570
+#: src/protocols/jabber/jabber.c:1587
 msgid "Force old SSL"
 msgstr "綣阪�倶�� SSL"
 
-#: src/protocols/jabber/jabber.c:1575
+#: src/protocols/jabber/jabber.c:1592
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "��莅後�����絲�羌�筝���膾������莚�"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1584 src/protocols/silc/silc.c:1572
+#: src/protocols/jabber/jabber.c:1601 src/protocols/silc/silc.c:1573
 msgid "Connect server"
 msgstr "菴��ユ���≦��"
 
@@ -6104,16 +6143,16 @@
 msgid "The topic is: %s"
 msgstr "莚�蘂�筝�: %s"
 
-#: src/protocols/jabber/message.c:225
+#: src/protocols/jabber/message.c:226
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "������ %s ��羔���け茣�: %s"
 
-#: src/protocols/jabber/message.c:228
+#: src/protocols/jabber/message.c:229
 msgid "Jabber Message Error"
 msgstr "Jabber 羔�����莚�"
 
-#: src/protocols/jabber/message.c:291
+#: src/protocols/jabber/message.c:293
 #, c-format
 msgid " (Code %s)"
 msgstr " (篁g�� %s)"
@@ -6122,39 +6161,39 @@
 msgid "XML Parse error"
 msgstr "XML ������莚�"
 
-#: src/protocols/jabber/presence.c:224
+#: src/protocols/jabber/presence.c:227
 msgid "Unknown Error in presence"
 msgstr "�榊ー���ラ��莚�"
 
-#: src/protocols/jabber/presence.c:227
+#: src/protocols/jabber/presence.c:230
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "���� %s �活�絨���兄��筝阪ソ����"
 
-#: src/protocols/jabber/presence.c:280 src/protocols/jabber/presence.c:281
+#: src/protocols/jabber/presence.c:283 src/protocols/jabber/presence.c:284
 msgid "Create New Room"
 msgstr "��綮堺�井�翠��"
 
-#: src/protocols/jabber/presence.c:282
+#: src/protocols/jabber/presence.c:285
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr "��③����綮堺�井�翠�眼�������活�菴�茵���臀��菴����活��ュ�藥�莅よ�臀��"
 
-#: src/protocols/jabber/presence.c:284
+#: src/protocols/jabber/presence.c:287
 msgid "Configure Room"
 msgstr "��臀��翠��"
 
-#: src/protocols/jabber/presence.c:286
+#: src/protocols/jabber/presence.c:289
 msgid "Accept Defaults"
 msgstr "�ュ�藥�莅ゅ��"
 
-#: src/protocols/jabber/presence.c:308
+#: src/protocols/jabber/presence.c:311
 #, c-format
 msgid "Error in chat %s"
 msgstr "��紊� %s �咲��"
 
-#: src/protocols/jabber/presence.c:311
+#: src/protocols/jabber/presence.c:314
 #, c-format
 msgid "Error joining chat %s"
 msgstr "���ヨ��紊� %s �咲��"
@@ -6172,11 +6211,11 @@
 msgid "Miscellaneous error"
 msgstr "��蕁拷��莚�"
 
-#: src/protocols/msn/cmdproc.c:338
+#: src/protocols/msn/cmdproc.c:339
 msgid "You have signed on from another location."
 msgstr "�����九�篏�臀���④���桁���糸�ヤ���"
 
-#: src/protocols/msn/cmdproc.c:340
+#: src/protocols/msn/cmdproc.c:341
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN ���≦������膸贋�や賢��"
 
@@ -6224,7 +6263,7 @@
 msgid "Not on list"
 msgstr "������"
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:593
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:602
 msgid "User is offline"
 msgstr "���欠�膾�"
 
@@ -6369,8 +6408,8 @@
 msgid "Server too busy"
 msgstr "���≦��お綽�"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2026
-#: src/protocols/silc/ops.c:1480 src/protocols/toc/toc.c:630
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2016
+#: src/protocols/silc/ops.c:1489 src/protocols/toc/toc.c:630
 msgid "Authentication failed"
 msgstr "莅よ�紊沿乾"
 
@@ -6456,40 +6495,49 @@
 msgid "Page"
 msgstr "絲糸��"
 
+#: src/protocols/msn/msn.c:450 src/protocols/yahoo/yahoo.c:2677
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
 #: src/protocols/msn/msn.c:463 src/protocols/msn/msn.c:756
 #: src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "菴�胼紫�笈��"
 
 #: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:758
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2491
-#: src/protocols/yahoo/yahoo.c:2853 src/protocols/yahoo/yahoo.c:2969
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2534
+#: src/protocols/yahoo/yahoo.c:2896 src/protocols/yahoo/yahoo.c:3012
 msgid "Be Right Back"
 msgstr "薊������"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2727
-#: src/protocols/novell/novell.c:2842 src/protocols/novell/novell.c:2896
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2725
+#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2894
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2493
-#: src/protocols/yahoo/yahoo.c:2855 src/protocols/yahoo/yahoo.c:2970
+#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
+#: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
 msgid "Busy"
 msgstr "綽�腆�"
 
 #: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:762
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2501
-#: src/protocols/yahoo/yahoo.c:2863 src/protocols/yahoo/yahoo.c:2974
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2544
+#: src/protocols/yahoo/yahoo.c:2906 src/protocols/yahoo/yahoo.c:3017
 msgid "On The Phone"
 msgstr "�ュ���笈�"
 
 #: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:764
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2505
-#: src/protocols/yahoo/yahoo.c:2867 src/protocols/yahoo/yahoo.c:2976
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2548
+#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3019
 msgid "Out To Lunch"
 msgstr "紊��阪葦蕕�"
 
 #: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:766
-#: src/protocols/zephyr/zephyr.c:1355 src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1358 src/protocols/zephyr/zephyr.c:1377
 msgid "Hidden"
 msgstr "��荳�"
 
@@ -6538,7 +6586,7 @@
 "ssl.php 筝㊦���翫�篆≧����"
 
 #: src/protocols/msn/msn.c:1167 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:626
+#: src/protocols/zephyr/zephyr.c:635
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>����:</b> %s<br>"
@@ -6555,11 +6603,6 @@
 msgid "<font sml=\"msn\">%s</font><br>"
 msgstr "<font sml=\"msn\">%s</font><br>"
 
-#: src/protocols/msn/msn.c:1179 src/protocols/yahoo/yahoo_profile.c:664
-#, c-format
-msgid "<b>%s:</b> %s<br>"
-msgstr "<b>%s:</b> %s<br>"
-
 #: src/protocols/msn/msn.c:1242
 msgid "MSN Profile"
 msgstr "MSN 筝�査莎���"
@@ -6570,14 +6613,14 @@
 msgstr "�桁���臀���篁九�咲��"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4888
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4881
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "綛顔�"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4874
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4867
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -6621,7 +6664,7 @@
 msgstr "筝�罨≧�贋��"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:826
+#: src/protocols/msn/msn.c:1479 src/protocols/silc/ops.c:835
 #: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "筝脂ゝ"
@@ -6649,11 +6692,11 @@
 msgid "Profile URL"
 msgstr "��臀���篁� URL"
 
-#: src/protocols/msn/msn.c:1643
+#: src/protocols/msn/msn.c:1644
 msgid "Display conversation closed notices"
 msgstr "�丞ず絲壕��渇�㊨����"
 
-#: src/protocols/msn/msn.c:1648
+#: src/protocols/msn/msn.c:1649
 msgid "Display timeout notices"
 msgstr "�丞ず莇��狗����"
 
@@ -6668,15 +6711,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1732 src/protocols/msn/msn.c:1734
+#: src/protocols/msn/msn.c:1733 src/protocols/msn/msn.c:1735
 msgid "MSN Protocol Plugin"
 msgstr "MSN �顒��篁�"
 
-#: src/protocols/msn/msn.c:1753 src/protocols/trepia/trepia.c:1292
+#: src/protocols/msn/msn.c:1754 src/protocols/trepia/trepia.c:1292
 msgid "Login server"
 msgstr "�糸����≦��"
 
-#: src/protocols/msn/msn.c:1762
+#: src/protocols/msn/msn.c:1763
 msgid "Use HTTP Method"
 msgstr "篏睡�� HTTP �劫�"
 
@@ -6697,7 +6740,7 @@
 msgstr "罩e��キ��絅遵���茵�"
 
 #: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2315
+#: src/protocols/oscar/oscar.c:2306
 msgid "Password sent"
 msgstr "絲���綏臥����"
 
@@ -6817,8 +6860,8 @@
 msgid "%s requested a PING"
 msgstr "%s 莚傑� PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6197
-#: src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6200
+#: src/protocols/toc/toc.c:1267
 msgid "_Group:"
 msgstr "膸�(_G):"
 
@@ -7116,11 +7159,11 @@
 msgid "Would you like to join the conversation?"
 msgstr "�������活����ュ�莚�鐚�"
 
-#: src/protocols/novell/novell.c:1938
+#: src/protocols/novell/novell.c:1936
 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:1990
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7130,34 +7173,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:2088
 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:2110
 msgid "Error. SSL support is not installed."
 msgstr "�咲����SSL �������茖���"
 
-#: src/protocols/novell/novell.c:2421
+#: src/protocols/novell/novell.c:2419
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "罩や�莅�群�括Ⅴ��筝�篌������堺�����"
 
-#: src/protocols/novell/novell.c:2733 src/protocols/oscar/oscar.c:586
-#: src/protocols/oscar/oscar.c:6499 src/protocols/yahoo/yahoo.c:2513
+#: src/protocols/novell/novell.c:2731 src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:6504 src/protocols/yahoo/yahoo.c:2556
 msgid "Offline"
 msgstr "胼紫鎖"
 
-#: src/protocols/novell/novell.c:2744
+#: src/protocols/novell/novell.c:2742
 msgid "Message"
 msgstr "羔���"
 
-#: src/protocols/novell/novell.c:2843 src/protocols/novell/novell.c:2899
+#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2897
 msgid "Appear Offline"
 msgstr "�丞ず筝榊�膾�"
 
-#: src/protocols/novell/novell.c:3293
+#: src/protocols/novell/novell.c:3291
 msgid "Initiate _Chat"
 msgstr "��莎決��紊�(_C)"
 
@@ -7172,15 +7215,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3389 src/protocols/novell/novell.c:3391
+#: src/protocols/novell/novell.c:3387 src/protocols/novell/novell.c:3389
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger �顒��篁�"
 
-#: src/protocols/novell/novell.c:3410
+#: src/protocols/novell/novell.c:3408
 msgid "Server address"
 msgstr "���≦���医��"
 
-#: src/protocols/novell/novell.c:3414
+#: src/protocols/novell/novell.c:3412
 msgid "Server port"
 msgstr "���≦�����"
 
@@ -7280,187 +7323,187 @@
 msgid "Not while on AOL"
 msgstr "筝�篏�篋� AOL 筝�"
 
-#: src/protocols/oscar/oscar.c:403
+#: src/protocols/oscar/oscar.c:400
 msgid ""
 "(There was an error converting this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr "(莉��∽④篆≧���咲����筝����莚���絅遵����醇③��戎����������絎∽�欠���)"
 
-#: src/protocols/oscar/oscar.c:441
+#: src/protocols/oscar/oscar.c:425
 msgid "Voice"
 msgstr "莚㊨��"
 
-#: src/protocols/oscar/oscar.c:444
+#: src/protocols/oscar/oscar.c:428
 msgid "AIM Direct IM"
 msgstr "AIM 篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:447 src/protocols/silc/silc.c:635
+#: src/protocols/oscar/oscar.c:431 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:506
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:450 src/protocols/oscar/oscar.c:6803
+#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6806
 msgid "Get File"
 msgstr "�桁���篁�"
 
-#: src/protocols/oscar/oscar.c:457
+#: src/protocols/oscar/oscar.c:441
 msgid "Games"
 msgstr "羝御��"
 
-#: src/protocols/oscar/oscar.c:460
+#: src/protocols/oscar/oscar.c:444
 msgid "Add-Ins"
 msgstr "紊���"
 
-#: src/protocols/oscar/oscar.c:463
+#: src/protocols/oscar/oscar.c:447
 msgid "Send Buddy List"
 msgstr "����絅遵���茵�"
 
-#: src/protocols/oscar/oscar.c:466
+#: src/protocols/oscar/oscar.c:450
 msgid "ICQ Direct Connect"
 msgstr "ICQ �贋・菴���"
 
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:453
 msgid "AP User"
 msgstr "AP ����"
 
-#: src/protocols/oscar/oscar.c:472
+#: src/protocols/oscar/oscar.c:456
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:459
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:478
+#: src/protocols/oscar/oscar.c:462
 msgid "ICQ Server Relay"
 msgstr "ICQ ���≦��習��"
 
-#: src/protocols/oscar/oscar.c:481
+#: src/protocols/oscar/oscar.c:465
 msgid "Old ICQ UTF8"
 msgstr "�х�� ICQ UTF8"
 
+#: src/protocols/oscar/oscar.c:468
+msgid "Trillian Encryption"
+msgstr "Trillian ��絲�"
+
+#: src/protocols/oscar/oscar.c:471
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:474
+msgid "Hiptop"
+msgstr "Hiptop"
+
+#: src/protocols/oscar/oscar.c:477
+msgid "Security Enabled"
+msgstr "絎���群����"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Video Chat"
+msgstr "�����紊�"
+
 #: src/protocols/oscar/oscar.c:484
-msgid "Trillian Encryption"
-msgstr "Trillian ��絲�"
+msgid "iChat AV"
+msgstr "iChat AV"
 
 #: src/protocols/oscar/oscar.c:487
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
+msgid "Live Video"
+msgstr "絎��区�蘂�"
 
 #: src/protocols/oscar/oscar.c:490
-msgid "Hiptop"
-msgstr "Hiptop"
-
-#: src/protocols/oscar/oscar.c:493
-msgid "Security Enabled"
-msgstr "絎���群����"
-
-#: src/protocols/oscar/oscar.c:496
-msgid "Video Chat"
-msgstr "�����紊�"
-
-#: src/protocols/oscar/oscar.c:500
-msgid "iChat AV"
-msgstr "iChat AV"
-
-#: src/protocols/oscar/oscar.c:503
-msgid "Live Video"
-msgstr "絎��区�蘂�"
-
-#: src/protocols/oscar/oscar.c:506
 msgid "Camera"
 msgstr "�御��"
 
-#: src/protocols/oscar/oscar.c:524 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5496
+#: src/protocols/oscar/oscar.c:6698
 msgid "Free For Chat"
 msgstr "��篋��画��"
 
-#: src/protocols/oscar/oscar.c:528 src/protocols/oscar/oscar.c:5490
-#: src/protocols/oscar/oscar.c:6691
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5490
+#: src/protocols/oscar/oscar.c:6696
 msgid "Not Available"
 msgstr "筝�����"
 
-#: src/protocols/oscar/oscar.c:530 src/protocols/oscar/oscar.c:5493
-#: src/protocols/oscar/oscar.c:6692
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5493
+#: src/protocols/oscar/oscar.c:6697
 msgid "Occupied"
 msgstr "��篋�膽�荳�"
 
-#: src/protocols/oscar/oscar.c:534
+#: src/protocols/oscar/oscar.c:518
 msgid "Web Aware"
 msgstr "臀�筝�����"
 
-#: src/protocols/oscar/oscar.c:602
+#: src/protocols/oscar/oscar.c:586
 msgid "Capabilities"
 msgstr "�遵��"
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:595
 msgid "Buddy Comment"
 msgstr "絅遵�羈���"
 
-#: src/protocols/oscar/oscar.c:744
+#: src/protocols/oscar/oscar.c:730
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "筝� %s ��篋�篋坂���綏峨�渇��"
 
-#: src/protocols/oscar/oscar.c:746
+#: src/protocols/oscar/oscar.c:732
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "筝� %s ��篋�篋坂���紊沿乾"
 
-#: src/protocols/oscar/oscar.c:753
+#: src/protocols/oscar/oscar.c:739
 msgid "Direct Connect failed"
 msgstr "篋�篋坂���菴��ュけ茣�"
 
-#: src/protocols/oscar/oscar.c:830 src/protocols/oscar/oscar.c:961
+#: src/protocols/oscar/oscar.c:816 src/protocols/oscar/oscar.c:947
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "筝� %s ��篋�篋坂���綏峨産腴�"
 
-#: src/protocols/oscar/oscar.c:911
+#: src/protocols/oscar/oscar.c:897
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "莚��乗��ュ�� %2$s:%3$hu �� %1$s 菴�茵�篋�篋坂�����"
 
-#: src/protocols/oscar/oscar.c:1328
+#: src/protocols/oscar/oscar.c:1314
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "莚傑� %s 菴��ュ�� %s:%hu ��篋�篋坂�����"
 
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1319
 msgid "Unable to open Direct IM"
 msgstr "��羈�綣�紮�篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:1368
+#: src/protocols/oscar/oscar.c:1354
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�������筝� %s 菴�茵�篋�篋坂���菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:1372
+#: src/protocols/oscar/oscar.c:1358
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 "�延�菴��桁��顔�我���� IP �医��鐚���篁ュ��遵研�ユ�������腱�蕋������������活�膸х鮫鐚�"
 
-#: src/protocols/oscar/oscar.c:1376 src/protocols/oscar/oscar.c:3329
+#: src/protocols/oscar/oscar.c:1362 src/protocols/oscar/oscar.c:3320
 msgid "Connect"
 msgstr "菴���"
 
-#: src/protocols/oscar/oscar.c:1442 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1429 src/protocols/toc/toc.c:873
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膸���筝���紊�� %s ��菴��ャ��"
 
-#: src/protocols/oscar/oscar.c:1458
+#: src/protocols/oscar/oscar.c:1448
 msgid "Chat is currently unavailable"
 msgstr "��紊�����筝�����"
 
-#: src/protocols/oscar/oscar.c:1539
+#: src/protocols/oscar/oscar.c:1529
 msgid "Screen name sent"
 msgstr "���桁��綏峨���"
 
-#: src/protocols/oscar/oscar.c:1553
+#: src/protocols/oscar/oscar.c:1543
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -7470,46 +7513,46 @@
 "��羈��糸��: ��羈�篁� %s �糸�ワ����������桁�����������桁��綽�蕁私札絖�罸�綣�紊器��銀賢���遵��"
 "���罸����医���腥堺�種������������医���"
 
-#: src/protocols/oscar/oscar.c:1581
+#: src/protocols/oscar/oscar.c:1571
 msgid "Unable to login to AIM"
 msgstr "��羈��糸�� AIM"
 
-#: src/protocols/oscar/oscar.c:1682 src/protocols/oscar/oscar.c:2119
+#: src/protocols/oscar/oscar.c:1672 src/protocols/oscar/oscar.c:2109
 msgid "Could Not Connect"
 msgstr "��羈�菴���"
 
-#: src/protocols/oscar/oscar.c:1690
+#: src/protocols/oscar/oscar.c:1680
 msgid "Connection established, cookie sent"
 msgstr "菴��ュ群綮榊�鐚�綏峨��� cookie"
 
-#: src/protocols/oscar/oscar.c:1803 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1793 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 "��羈�綮榊���篁倶�菴亥���"
 
-#: src/protocols/oscar/oscar.c:1808
+#: src/protocols/oscar/oscar.c:1798
 msgid "Unable to create new connection."
 msgstr "��羈���綮堺�域��ャ��"
 
-#: src/protocols/oscar/oscar.c:1879
+#: src/protocols/oscar/oscar.c:1869
 msgid "Unable to establish listener socket."
 msgstr "��羈�綮榊�������ュ���"
 
-#: src/protocols/oscar/oscar.c:2003 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:1993 src/protocols/toc/toc.c:541
 msgid "Incorrect nickname or password."
 msgstr "�窮О��絲���筝�絲鴻��"
 
-#: src/protocols/oscar/oscar.c:2008
+#: src/protocols/oscar/oscar.c:1998
 msgid "Your account is currently suspended."
 msgstr "����茣��決←������"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2012
+#: src/protocols/oscar/oscar.c:2002
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL �恰�狗��莅����≧���銀�������"
 
-#: src/protocols/oscar/oscar.c:2017
+#: src/protocols/oscar/oscar.c:2007
 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."
@@ -7517,21 +7560,21 @@
 "����ュ���㊤�緇�紊��膵���莚欠�������鐚��九����莚�筝�罨<��絋�����薩膸㊨��莚�鐚�������狗�翫�"
 "�恔��顔�帥��"
 
-#: src/protocols/oscar/oscar.c:2022
+#: src/protocols/oscar/oscar.c:2012
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "��戎����絎∽�欠����お����莚桁�� %s ��膾�"
 
-#: src/protocols/oscar/oscar.c:2054
+#: src/protocols/oscar/oscar.c:2044
 msgid "Internal Error"
 msgstr "������莚�"
 
-#: src/protocols/oscar/oscar.c:2126
+#: src/protocols/oscar/oscar.c:2116
 msgid "Received authorization"
 msgstr "�九�亥��莅よ�"
 
-#: src/protocols/oscar/oscar.c:2162 src/protocols/oscar/oscar.c:2192
-#: src/protocols/oscar/oscar.c:2280
+#: src/protocols/oscar/oscar.c:2152 src/protocols/oscar/oscar.c:2182
+#: src/protocols/oscar/oscar.c:2271
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -7539,24 +7582,24 @@
 msgstr ""
 "���喝�茴��㊤�������醇�活�篏睡�� TOC �翫�域�筝����茴�信罩c��莚傑��� %s 筝����贋�違��"
 
-#: src/protocols/oscar/oscar.c:2165 src/protocols/oscar/oscar.c:2195
+#: src/protocols/oscar/oscar.c:2155 src/protocols/oscar/oscar.c:2185
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ��羈��桁������� AIM �糸�����"
 
-#: src/protocols/oscar/oscar.c:2283
+#: src/protocols/oscar/oscar.c:2274
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ��羈��桁��������糸�����"
 
-#: src/protocols/oscar/oscar.c:3113 src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3104 src/protocols/oscar/oscar.c:3126
 msgid "(There was an error receiving this message)"
 msgstr "(�ユ�倶④羔����咲��)"
 
-#: src/protocols/oscar/oscar.c:3321
+#: src/protocols/oscar/oscar.c:3312
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����莚傑��� %s 篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:3324
+#: src/protocols/oscar/oscar.c:3315
 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 "
@@ -7565,42 +7608,42 @@
 "�医����荀���犬�域�膊��坂��翫産腴��贋・菴��ワ�菴�絲剛��恰�銀����上����荀�����篏����絨���"
 "�我���� IP �医��鐚���篁ュ��初����羹�������腱�蕋�����"
 
-#: src/protocols/oscar/oscar.c:3360
+#: src/protocols/oscar/oscar.c:3351
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "莚桁�����鎞������ュソ����"
 
-#: src/protocols/oscar/oscar.c:3368
+#: src/protocols/oscar/oscar.c:3359
 msgid "Authorization Request Message:"
 msgstr "莅よ�莚傑�羔���:"
 
-#: src/protocols/oscar/oscar.c:3369
+#: src/protocols/oscar/oscar.c:3360
 msgid "Please authorize me!"
 msgstr "莚桁�����鎞������ュソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:3399
+#: src/protocols/oscar/oscar.c:3390
 #, 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:3404 src/protocols/oscar/oscar.c:3406
+#: src/protocols/oscar/oscar.c:3395 src/protocols/oscar/oscar.c:3397
 msgid "Request Authorization"
 msgstr "莚傑�莅よ�"
 
-#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3456
-#: src/protocols/oscar/oscar.c:3463 src/protocols/oscar/oscar.c:3545
-#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3919
-#: src/protocols/oscar/oscar.c:3979 src/protocols/oscar/oscar.c:6118
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:3445 src/protocols/oscar/oscar.c:3447
+#: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3536
+#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3908
+#: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:6121 src/protocols/oscar/oscar.c:6167
 msgid "No reason given."
 msgstr "羃≧��膸��榊���宴��"
 
-#: src/protocols/oscar/oscar.c:3462
+#: src/protocols/oscar/oscar.c:3453
 msgid "Authorization Denied Message:"
 msgstr "莅よ���膸�羔���:"
 
-#: src/protocols/oscar/oscar.c:3545
+#: src/protocols/oscar/oscar.c:3536
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -7609,11 +7652,11 @@
 "���� %u �活�絨�����筝坂�/絅合��絅遵�鐚����怨�筝�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3553 src/protocols/oscar/oscar.c:6124
+#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6127
 msgid "Authorization Request"
 msgstr "莅よ�莚傑�"
 
-#: src/protocols/oscar/oscar.c:3565
+#: src/protocols/oscar/oscar.c:3556
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7623,17 +7666,17 @@
 "���� %u ��膸�篋����篁�/絅劫��筝阪ソ����莚傑�鐚�����絋�筝�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3566
+#: src/protocols/oscar/oscar.c:3557
 msgid "ICQ authorization denied."
 msgstr "ICQ 莚傑�莅よ�茴���膸���"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3573
+#: src/protocols/oscar/oscar.c:3564
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "���� %u ������篁�/絅劫��筝阪ソ����"
 
-#: src/protocols/oscar/oscar.c:3581
+#: src/protocols/oscar/oscar.c:3572
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7646,7 +7689,7 @@
 "���坂査: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3589
+#: src/protocols/oscar/oscar.c:3580
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7659,7 +7702,7 @@
 "���坂査: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3597
+#: src/protocols/oscar/oscar.c:3588
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -7672,32 +7715,32 @@
 "��絎号��:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3618
+#: src/protocols/oscar/oscar.c:3609
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ���� %u 膸������篋�筝�筝�ソ��: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:3624
+#: src/protocols/oscar/oscar.c:3615
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "�������活�絨�罩や査��筝阪ソ��鐚�"
 
-#: src/protocols/oscar/oscar.c:3628
+#: src/protocols/oscar/oscar.c:3619
 msgid "Decline"
 msgstr "��膸�"
 
-#: src/protocols/oscar/oscar.c:3713
+#: src/protocols/oscar/oscar.c:3703
 #, 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:3722
+#: src/protocols/oscar/oscar.c:3712
 #, 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:3731
+#: src/protocols/oscar/oscar.c:3721
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -7705,77 +7748,85 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧����������松�遺�膈�膾ч���吟��"
 
-#: src/protocols/oscar/oscar.c:3740
+#: src/protocols/oscar/oscar.c:3730
 #, 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:3749
+#: src/protocols/oscar/oscar.c:3739
 #, 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:3758
+#: src/protocols/oscar/oscar.c:3748
 #, 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:3815 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3802 src/protocols/oscar/oscar.c:4031
 #, c-format
 msgid "Info for %s"
 msgstr "%s ��篆≧��"
 
-#: src/protocols/oscar/oscar.c:3881
+#: src/protocols/oscar/oscar.c:3868
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC ���咲��莚�: %s\n"
 
-#: src/protocols/oscar/oscar.c:3882
+#: src/protocols/oscar/oscar.c:3869
 msgid "Unknown error"
 msgstr "���ラ��莚�"
 
-#. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3917
+#: src/protocols/oscar/oscar.c:3905
+msgid "Your message did not get sent."
+msgstr "���������羔�����"
+
+#: src/protocols/oscar/oscar.c:3906
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "��� %s ��羔��������:"
 
-#: src/protocols/oscar/oscar.c:3976
+#: src/protocols/oscar/oscar.c:3965
+#, c-format
+msgid "User information not available: %s"
+msgstr "���隙拭�������: %s"
+
+#: src/protocols/oscar/oscar.c:3967
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s �����隙拭�������:"
 
-#: src/protocols/oscar/oscar.c:3999
+#: src/protocols/oscar/oscar.c:3991
 msgid "Warning Level"
 msgstr "茘���膾у��"
 
-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:3994
 msgid "Online Since"
 msgstr "筝�膾炊�狗��"
 
-#: src/protocols/oscar/oscar.c:4006 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:3998 src/protocols/yahoo/yahoo_profile.c:1118
 msgid "Member Since"
 msgstr "羈����狗��"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4082
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM 菴��ュ��遵群筝√け��"
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4276
+#: src/protocols/oscar/oscar.c:4268
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr "[��羈��丞ず�ヨ��④���欠��篆≧����������銀賢�����������絖�膃���"
 
-#: src/protocols/oscar/oscar.c:4494
+#: src/protocols/oscar/oscar.c:4486
 msgid "Rate limiting error."
 msgstr "��綺����狗��莚���"
 
-#: src/protocols/oscar/oscar.c:4495
+#: src/protocols/oscar/oscar.c:4487
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7783,111 +7834,111 @@
 "����丞�������罨≧��篏����ц�鐚���������群膸鏅��遺���綺�������莚欠� 10 腱�鐚��九����莚�"
 "筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4558
+#: src/protocols/oscar/oscar.c:4550
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��群膸���篋�菴��ワ������������九�篏�臀���④���桁���糸�ヤ���"
 
-#: src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:4552
 msgid "You have been signed off for an unknown reason."
 msgstr "��群膸�嶃�坂�鐚��������ャ��"
 
-#: src/protocols/oscar/oscar.c:4591
+#: src/protocols/oscar/oscar.c:4583
 msgid "Finalizing connection"
-msgstr "罩e�����菴���"
-
-#: src/protocols/oscar/oscar.c:4861 src/protocols/oscar/oscar.c:4868
+msgstr "絎���菴���"
+
+#: src/protocols/oscar/oscar.c:4854 src/protocols/oscar/oscar.c:4861
 msgid "Email Address"
 msgstr "�球���散�医��"
 
-#: src/protocols/oscar/oscar.c:4873 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4866 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "腱糸���笈�"
 
-#: src/protocols/oscar/oscar.c:4874
+#: src/protocols/oscar/oscar.c:4867
 msgid "Not specified"
 msgstr "����絎�"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:4875 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:4891
+#: src/protocols/oscar/oscar.c:4884
 msgid "Personal Web Page"
 msgstr "筝�査筝脂ゝ"
 
-#: src/protocols/oscar/oscar.c:4895
+#: src/protocols/oscar/oscar.c:4888
 msgid "Additional Information"
 msgstr "蘂�紊�篆≧��"
 
-#: src/protocols/oscar/oscar.c:4900
+#: src/protocols/oscar/oscar.c:4893
 msgid "Home Address"
 msgstr "絎九梱篏��"
 
-#: src/protocols/oscar/oscar.c:4904 src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
 msgid "Zip Code"
 msgstr "���睡���"
 
-#: src/protocols/oscar/oscar.c:4908
+#: src/protocols/oscar/oscar.c:4901
 msgid "Work Address"
 msgstr "�����医��"
 
-#: src/protocols/oscar/oscar.c:4916
+#: src/protocols/oscar/oscar.c:4909
 msgid "Work Information"
 msgstr "綏ヤ�篆≧��"
 
-#: src/protocols/oscar/oscar.c:4917
+#: src/protocols/oscar/oscar.c:4910
 msgid "Company"
 msgstr "���"
 
-#: src/protocols/oscar/oscar.c:4918
+#: src/protocols/oscar/oscar.c:4911
 msgid "Division"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:4919
+#: src/protocols/oscar/oscar.c:4912
 msgid "Position"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:4921
+#: src/protocols/oscar/oscar.c:4914
 msgid "Web Page"
 msgstr "臀�蕁�"
 
-#: src/protocols/oscar/oscar.c:4927
+#: src/protocols/oscar/oscar.c:4924
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s �� ICQ 篆≧��"
 
-#: src/protocols/oscar/oscar.c:4976
+#: src/protocols/oscar/oscar.c:4973
 msgid "Pop-Up Message"
 msgstr "綣劫�堺���"
 
-#: src/protocols/oscar/oscar.c:4997
+#: src/protocols/oscar/oscar.c:4994
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "筝������桁��綏牙��� %s �活��"
 
-#: src/protocols/oscar/oscar.c:5001
+#: src/protocols/oscar/oscar.c:4998
 msgid "Search Results"
 msgstr "��膣∝���"
 
-#: src/protocols/oscar/oscar.c:5018
+#: src/protocols/oscar/oscar.c:5015
 #, c-format
 msgid "No results found for email address %s"
 msgstr "���上�遺��球���散�医�� %s �拷����膸���"
 
-#: src/protocols/oscar/oscar.c:5039
+#: src/protocols/oscar/oscar.c:5036
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "���綵��九�域���`莅� %s ����散��"
 
-#: src/protocols/oscar/oscar.c:5041
+#: src/protocols/oscar/oscar.c:5038
 msgid "Account Confirmation Requested"
 msgstr "莚傑�篋�茣��欠`莅�"
 
@@ -7992,7 +8043,7 @@
 msgid "Profile too long."
 msgstr "��臀���篁九お�帥��"
 
-#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6703
 msgid "Visible"
 msgstr "�乗昆"
 
@@ -8035,16 +8086,16 @@
 "��羈�羞糸��絅遵� %s鐚����������桁�����������桁��綽�蕁私札絖�罸�綣�紊器��銀賢���遵�����罸�����"
 "絖���腥堺�種������������医���莚ュソ��絨�篁�����絅遵���茵�賢���ゃ��"
 
-#: src/protocols/oscar/oscar.c:5537 src/protocols/oscar/oscar.c:5985
-#: src/protocols/oscar/oscar.c:5998
+#: src/protocols/oscar/oscar.c:5538 src/protocols/oscar/oscar.c:5987
+#: src/protocols/oscar/oscar.c:6001
 msgid "Unable To Add"
 msgstr "��羈�羞糸��"
 
-#: src/protocols/oscar/oscar.c:5698
+#: src/protocols/oscar/oscar.c:5699
 msgid "Unable To Retrieve Buddy List"
 msgstr "��羈��桁�絅遵���茵�"
 
-#: src/protocols/oscar/oscar.c:5699
+#: src/protocols/oscar/oscar.c:5700
 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 "
@@ -8053,13 +8104,13 @@
 "Gaim ���倶��羈�篁� AIM ���≦��キ������絅遵���茵�������絅遵���茵�押��筝√け鐚����順�膈���"
 "絨�嚭葦�順�����"
 
-#: src/protocols/oscar/oscar.c:5881 src/protocols/oscar/oscar.c:5882
-#: src/protocols/oscar/oscar.c:5887 src/protocols/oscar/oscar.c:6042
-#: src/protocols/oscar/oscar.c:6043 src/protocols/oscar/oscar.c:6048
+#: src/protocols/oscar/oscar.c:5882 src/protocols/oscar/oscar.c:5883
+#: src/protocols/oscar/oscar.c:5888 src/protocols/oscar/oscar.c:6045
+#: src/protocols/oscar/oscar.c:6046 src/protocols/oscar/oscar.c:6051
 msgid "Orphans"
 msgstr "絖ゅ��"
 
-#: src/protocols/oscar/oscar.c:5984
+#: src/protocols/oscar/oscar.c:5985
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8067,11 +8118,11 @@
 msgstr ""
 "��羈�絨� %s ��筝阪ソ��鐚�����������絅遵�紊����莚桁���ゅ�銀賢筝�筝�ソ��鐚��九����莚�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:5984 src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5985 src/protocols/oscar/oscar.c:5999
 msgid "(no name)"
 msgstr "(����腱�)"
 
-#: src/protocols/oscar/oscar.c:5997
+#: src/protocols/oscar/oscar.c:5999
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8081,18 +8132,18 @@
 "��羈�羞糸��絅遵� %s鐚��������ャ�������順������������絅遵���茵�賢絅遵����亥��群膸颴上�遺���"
 "��莅悟����紊у�若��"
 
-#: src/protocols/oscar/oscar.c:6079
+#: src/protocols/oscar/oscar.c:6082
 #, 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:6085
+#: src/protocols/oscar/oscar.c:6088
 msgid "Authorization Given"
 msgstr "膸��榊��莅よ�"
 
-#: src/protocols/oscar/oscar.c:6118
+#: src/protocols/oscar/oscar.c:6121
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8102,17 +8153,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6160
+#: src/protocols/oscar/oscar.c:6163
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "���� %s ��莅御���篁�/絅劫���ュソ����"
 
-#: src/protocols/oscar/oscar.c:6161
+#: src/protocols/oscar/oscar.c:6164
 msgid "Authorization Granted"
 msgstr "莅よ�茴����"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6164
+#: src/protocols/oscar/oscar.c:6167
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8122,71 +8173,76 @@
 "���� %s ��膸�篋�����九���ュソ����茵���莚傑�鐚�����絋�筝�:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6165
+#: src/protocols/oscar/oscar.c:6168
 msgid "Authorization Denied"
 msgstr "莅よ�茴���膸�"
 
-#: src/protocols/oscar/oscar.c:6202 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6205 src/protocols/toc/toc.c:1272
 msgid "_Exchange:"
 msgstr "篋ゆ��(_E):"
 
-#: src/protocols/oscar/oscar.c:6224
+#: src/protocols/oscar/oscar.c:6227
 msgid "Invalid chat name specified."
 msgstr "��絎�����紊���腱井������"
 
-#: src/protocols/oscar/oscar.c:6314
+#: src/protocols/oscar/oscar.c:6317
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "������紊��上��Ū���冴������遵�� AIM ��紊�賢������紊��上���"
 
-#: src/protocols/oscar/oscar.c:6471
+#: src/protocols/oscar/oscar.c:6475
 msgid "Away Message"
 msgstr "霝糸�羔���"
 
-#: src/protocols/oscar/oscar.c:6756
+#: src/protocols/oscar/oscar.c:6762
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr "%s ��絅遵�羈���"
+
+#: src/protocols/oscar/oscar.c:6763
 msgid "Buddy Comment:"
 msgstr "絅遵�羈���:"
 
-#: src/protocols/oscar/oscar.c:6774
+#: src/protocols/oscar/oscar.c:6782
 msgid "Edit Buddy Comment"
 msgstr "膽�莨�絅遵�羈���"
 
-#: src/protocols/oscar/oscar.c:6780
+#: src/protocols/oscar/oscar.c:6788
 msgid "Get Status Msg"
 msgstr "�桁��倶��羔���"
 
-#: src/protocols/oscar/oscar.c:6792
+#: src/protocols/oscar/oscar.c:6800
 msgid "Direct IM"
 msgstr "篋�篋坂���"
 
-#: src/protocols/oscar/oscar.c:6814
+#: src/protocols/oscar/oscar.c:6817
 msgid "Re-request Authorization"
 msgstr "���域�羆�莅よ�"
 
-#: src/protocols/oscar/oscar.c:6844
+#: src/protocols/oscar/oscar.c:6847
 msgid "The new formatting is invalid."
 msgstr "�井�弱���������"
 
-#: src/protocols/oscar/oscar.c:6845
+#: src/protocols/oscar/oscar.c:6848
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "���桁���弱������贋�劫ぇ����腥堺�若��"
 
-#: src/protocols/oscar/oscar.c:6852
+#: src/protocols/oscar/oscar.c:6855
 msgid "New screen name formatting:"
 msgstr "�亥�����桁���弱���:"
 
-#: src/protocols/oscar/oscar.c:6904
+#: src/protocols/oscar/oscar.c:6907
 msgid "Change Address To:"
 msgstr "絨��医���贋�剛減:"
 
-#: src/protocols/oscar/oscar.c:6949
+#: src/protocols/oscar/oscar.c:6952
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��攻筝������莅よ�</i>"
 
-#: src/protocols/oscar/oscar.c:6952
+#: src/protocols/oscar/oscar.c:6955
 msgid "You are awaiting authorization from the following buddies"
 msgstr "��③���緇�筝���絅遵���莅よ�"
 
-#: src/protocols/oscar/oscar.c:6953
+#: src/protocols/oscar/oscar.c:6956
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8194,75 +8250,75 @@
 "絋������活���菴�篋�絅遵����域�羆�莅よ�鐚�����������渇�����肢�篋�絅遵�鐚��九�����獅�����域�"
 "羆�莅よ�����"
 
-#: src/protocols/oscar/oscar.c:6970
+#: src/protocols/oscar/oscar.c:6973
 msgid "Find Buddy by E-mail"
 msgstr "���球���散�ユ�上ソ��"
 
-#: src/protocols/oscar/oscar.c:6971
+#: src/protocols/oscar/oscar.c:6974
 msgid "Search for a buddy by e-mail address"
 msgstr "���球���散�医����膣√ソ��"
 
-#: src/protocols/oscar/oscar.c:6972
+#: src/protocols/oscar/oscar.c:6975
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "莨��ユ���活���膣∝��絅遵����球���散�医����"
 
-#: src/protocols/oscar/oscar.c:6989
+#: src/protocols/oscar/oscar.c:6992
 msgid "Available Message:"
 msgstr "�������:"
 
-#: src/protocols/oscar/oscar.c:6990
+#: src/protocols/oscar/oscar.c:6993
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "��罩e��轡篏�鐚�羝贋��茴����� - �惹��!"
 
-#: src/protocols/oscar/oscar.c:7072 src/protocols/silc/silc.c:789
+#: src/protocols/oscar/oscar.c:7075 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "莅丞舟���隙拭��..."
 
-#: src/protocols/oscar/oscar.c:7077
+#: src/protocols/oscar/oscar.c:7080
 msgid "Set User Info (URL)..."
 msgstr "莅丞舟���隙拭��(URL)..."
 
-#: src/protocols/oscar/oscar.c:7083
+#: src/protocols/oscar/oscar.c:7086
 msgid "Set Available Message..."
 msgstr "莅丞舟�������..."
 
-#: src/protocols/oscar/oscar.c:7088 src/protocols/silc/silc.c:785
+#: src/protocols/oscar/oscar.c:7091 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "�贋�劫���..."
 
-#: src/protocols/oscar/oscar.c:7093
+#: src/protocols/oscar/oscar.c:7096
 msgid "Change Password (URL)"
 msgstr "�贋�劫���(URL)"
 
-#: src/protocols/oscar/oscar.c:7097
+#: src/protocols/oscar/oscar.c:7100
 msgid "Configure IM Forwarding (URL)"
 msgstr "��臀� IM 莉��(URL)"
 
-#: src/protocols/oscar/oscar.c:7106
+#: src/protocols/oscar/oscar.c:7109
 msgid "Format Screen Name..."
 msgstr "�弱������桁��..."
 
-#: src/protocols/oscar/oscar.c:7110
+#: src/protocols/oscar/oscar.c:7113
 msgid "Confirm Account"
 msgstr "隋��茣���"
 
-#: src/protocols/oscar/oscar.c:7114
+#: src/protocols/oscar/oscar.c:7117
 msgid "Display Currently Registered Address"
 msgstr "�丞ず綵���羈������医��"
 
-#: src/protocols/oscar/oscar.c:7118
+#: src/protocols/oscar/oscar.c:7121
 msgid "Change Currently Registered Address..."
 msgstr "�贋�劫���羈������医��..."
 
-#: src/protocols/oscar/oscar.c:7125
+#: src/protocols/oscar/oscar.c:7128
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�丞ず罩e�����莅よ���絅遵�"
 
-#: src/protocols/oscar/oscar.c:7131
+#: src/protocols/oscar/oscar.c:7134
 msgid "Search for Buddy by Email..."
 msgstr "���球���散��膣√ソ��..."
 
-#: src/protocols/oscar/oscar.c:7136
+#: src/protocols/oscar/oscar.c:7139
 msgid "Search for Buddy by Information"
 msgstr "��篆≧����膣√ソ��"
 
@@ -8277,15 +8333,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7254 src/protocols/oscar/oscar.c:7256
+#: src/protocols/oscar/oscar.c:7257 src/protocols/oscar/oscar.c:7259
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ �顒��篁�"
 
-#: src/protocols/oscar/oscar.c:7275
+#: src/protocols/oscar/oscar.c:7278
 msgid "Auth host"
 msgstr "莅よ�筝紙��"
 
-#: src/protocols/oscar/oscar.c:7280
+#: src/protocols/oscar/oscar.c:7283
 msgid "Auth port"
 msgstr "莅よ�腴��"
 
@@ -8372,12 +8428,12 @@
 msgstr "顒上���紊����"
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1256 src/protocols/silc/ops.c:1267
+#: src/protocols/silc/ops.c:1265 src/protocols/silc/ops.c:1276
 msgid "Get Public Key"
 msgstr "�桁�����"
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1257
-#: src/protocols/silc/ops.c:1268
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1266
+#: src/protocols/silc/ops.c:1277
 msgid "Cannot fetch the public key"
 msgstr "��羈��桁�����"
 
@@ -8390,14 +8446,14 @@
 msgid "Could not load public key"
 msgstr "��羈�茖��ュ����"
 
-#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:853
-#: src/protocols/silc/ops.c:925 src/protocols/silc/ops.c:1060
-#: src/protocols/silc/ops.c:1061 src/protocols/silc/ops.c:1079
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:862
+#: src/protocols/silc/ops.c:934 src/protocols/silc/ops.c:1069
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1088
 msgid "User Information"
 msgstr "���隙拭��"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:926
-#: src/protocols/silc/ops.c:1080
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:935
+#: src/protocols/silc/ops.c:1089
 msgid "Cannot get user information"
 msgstr "��羈��桁����隙拭��"
 
@@ -8530,36 +8586,36 @@
 msgid "Anxious"
 msgstr "薀ユ鹸"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:962
+#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:971
 msgid "User Modes"
 msgstr "���傑─綣�"
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:971
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
 msgid "Mood"
 msgstr "綽���"
 
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:977
+#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:986
 msgid "Status Text"
 msgstr "�倶������"
 
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:983
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:992
 msgid "Preferred Contact"
 msgstr "薤�����膤私査"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:988
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:997
 msgid "Preferred Language"
 msgstr "薤���莚㊧�"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:993
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1002
 msgid "Device"
 msgstr "莅上�"
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:998
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1007
 #: src/protocols/silc/silc.c:678 src/protocols/silc/silc.c:680
 msgid "Timezone"
 msgstr "�九��"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1003
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1012
 msgid "Geolocation"
 msgstr "�亥��篏�臀�"
 
@@ -8579,7 +8635,7 @@
 msgid "Get Public Key..."
 msgstr "�桁�����..."
 
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1389
+#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1398
 msgid "Kill User"
 msgstr "��罩紫����"
 
@@ -8687,7 +8743,7 @@
 msgid "Group Name"
 msgstr "膸���腱�"
 
-#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1669
+#: src/protocols/silc/chat.c:567 src/protocols/silc/ops.c:1678
 msgid "Passphrase"
 msgstr "絲�����"
 
@@ -8760,35 +8816,35 @@
 msgid "Set Secret Channel"
 msgstr "莅上�膸�絲�蘂���"
 
-#: src/protocols/silc/chat.c:989
+#: src/protocols/silc/chat.c:981
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "���� <I>%s</I> ��蘂���綮榊���"
 
-#: src/protocols/silc/chat.c:993
+#: src/protocols/silc/chat.c:985
 #, 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:1046
+#: src/protocols/silc/chat.c:1039
 #, 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:1048
+#: src/protocols/silc/chat.c:1041
 msgid "Join Private Group"
 msgstr "���ョ���膸�"
 
-#: src/protocols/silc/chat.c:1049
+#: src/protocols/silc/chat.c:1042
 msgid "Cannot join private group"
 msgstr "��羈����ョ���膸�"
 
-#: src/protocols/silc/chat.c:1242 src/protocols/silc/silc.c:888
+#: src/protocols/silc/chat.c:1235 src/protocols/silc/silc.c:888
 msgid "Cannot call command"
 msgstr "��羈�莪����巡擦"
 
-#: src/protocols/silc/chat.c:1243 src/protocols/silc/silc.c:889
+#: src/protocols/silc/chat.c:1236 src/protocols/silc/silc.c:889
 msgid "Unknown command"
 msgstr "���ュ�巡擦"
 
@@ -8844,144 +8900,144 @@
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 綏牙�絨� <I>%s</I> ��莚�蘂��剛減: %s"
 
-#: src/protocols/silc/ops.c:413
+#: src/protocols/silc/ops.c:414
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 綏牙�絨�蘂��� <I>%s</I> ��罔≦�莅上�筝�: %s"
 
-#: src/protocols/silc/ops.c:417
+#: src/protocols/silc/ops.c:418
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> ���や�蘂��� <I>%s</I> ������─綣�"
 
-#: src/protocols/silc/ops.c:448
+#: src/protocols/silc/ops.c:451
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 絨� <I>%s</I> ��罔≦�莅上�筝�: %s"
 
-#: src/protocols/silc/ops.c:452
+#: src/protocols/silc/ops.c:459
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> ���や� <I>%s</I> ������─綣�"
 
-#: src/protocols/silc/ops.c:479
+#: src/protocols/silc/ops.c:488
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "��← <I>%2$s</I> (%3$s) 篁� <I>%1$s</I> 荼√�坂�"
 
-#: src/protocols/silc/ops.c:509 src/protocols/silc/ops.c:514
-#: src/protocols/silc/ops.c:519
+#: src/protocols/silc/ops.c:518 src/protocols/silc/ops.c:523
+#: src/protocols/silc/ops.c:528
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "��← %s (%s) ��罩私�"
 
-#: src/protocols/silc/ops.c:540 src/protocols/silc/ops.c:545
-#: src/protocols/silc/ops.c:550
+#: src/protocols/silc/ops.c:549 src/protocols/silc/ops.c:554
+#: src/protocols/silc/ops.c:559
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "茴� %s (%s) ��罩�"
 
-#: src/protocols/silc/ops.c:596
+#: src/protocols/silc/ops.c:605
 msgid "Server signoff"
 msgstr "���≦���糸��"
 
-#: src/protocols/silc/ops.c:783
+#: src/protocols/silc/ops.c:792
 msgid "Personal Information"
 msgstr "筝�査篆≧��"
 
-#: src/protocols/silc/ops.c:806
+#: src/protocols/silc/ops.c:815
 msgid "Birth Day"
 msgstr "����"
 
-#: src/protocols/silc/ops.c:810
+#: src/protocols/silc/ops.c:819
 msgid "Job Title"
 msgstr "��腱�"
 
-#: src/protocols/silc/ops.c:814
+#: src/protocols/silc/ops.c:823
 msgid "Job Role"
 msgstr "��篏�"
 
-#: src/protocols/silc/ops.c:818
+#: src/protocols/silc/ops.c:827
 msgid "Organization"
 msgstr "膸�膸�"
 
-#: src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:831
 msgid "Unit"
 msgstr "����"
 
-#: src/protocols/silc/ops.c:841
+#: src/protocols/silc/ops.c:850
 msgid "EMail"
 msgstr "�球���散"
 
-#: src/protocols/silc/ops.c:846
+#: src/protocols/silc/ops.c:855
 msgid "Note"
 msgstr "紊�羈�"
 
-#: src/protocols/silc/ops.c:894
+#: src/protocols/silc/ops.c:903
 msgid "Join Chat"
 msgstr "���ヨ��紊�"
 
-#: src/protocols/silc/ops.c:1050 src/protocols/silc/ops.c:1120
+#: src/protocols/silc/ops.c:1059 src/protocols/silc/ops.c:1129
 msgid "Public Key Fingerprint"
 msgstr "���ユ��膾�"
 
-#: src/protocols/silc/ops.c:1051 src/protocols/silc/ops.c:1121
+#: src/protocols/silc/ops.c:1060 src/protocols/silc/ops.c:1130
 msgid "Public Key Babbleprint"
 msgstr "���ユ���"
 
-#: src/protocols/silc/ops.c:1064
+#: src/protocols/silc/ops.c:1073
 msgid "More..."
 msgstr "�翫�..."
 
-#: src/protocols/silc/ops.c:1135 src/protocols/silc/silc.c:777
+#: src/protocols/silc/ops.c:1144 src/protocols/silc/silc.c:777
 msgid "Detach From Server"
 msgstr "筝����≦���援�"
 
-#: src/protocols/silc/ops.c:1135
+#: src/protocols/silc/ops.c:1144
 msgid "Cannot detach"
 msgstr "��羈��援�"
 
-#: src/protocols/silc/ops.c:1146
+#: src/protocols/silc/ops.c:1155
 msgid "Cannot set topic"
 msgstr "��羈�莅上�莚�蘂�"
 
-#: src/protocols/silc/ops.c:1184
+#: src/protocols/silc/ops.c:1193
 msgid "Failed to change nickname"
 msgstr "�贋�号�窮О紊沿乾"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Roomlist"
 msgstr "�翠�翫��茵�"
 
-#: src/protocols/silc/ops.c:1221
+#: src/protocols/silc/ops.c:1230
 msgid "Cannot get room list"
 msgstr "��羈��桁��翠�翫��茵�"
 
-#: src/protocols/silc/ops.c:1269
+#: src/protocols/silc/ops.c:1278
 msgid "No public key was received"
 msgstr "羃≧���九�医����"
 
-#: src/protocols/silc/ops.c:1282 src/protocols/silc/ops.c:1296
+#: src/protocols/silc/ops.c:1291 src/protocols/silc/ops.c:1305
 msgid "Server Information"
 msgstr "���≦��拭��"
 
-#: src/protocols/silc/ops.c:1283
+#: src/protocols/silc/ops.c:1292
 msgid "Cannot get server information"
 msgstr "��羈��桁����≦��拭��"
 
-#: src/protocols/silc/ops.c:1314 src/protocols/silc/ops.c:1323
+#: src/protocols/silc/ops.c:1323 src/protocols/silc/ops.c:1332
 msgid "Server Statistics"
 msgstr "���≦���莅�"
 
-#: src/protocols/silc/ops.c:1315
+#: src/protocols/silc/ops.c:1324
 msgid "Cannot get server statistics"
 msgstr "��羈��桁����≦���莅�"
 
-#: src/protocols/silc/ops.c:1324
-msgid "No server statisitics available"
+#: src/protocols/silc/ops.c:1333
+msgid "No server statistics available"
 msgstr "羃≧�����������≦���莅�"
 
-#: src/protocols/silc/ops.c:1346
+#: src/protocols/silc/ops.c:1355
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9016,97 +9072,97 @@
 "�肢����≦���������: %d\n"
 "�肢�莊��怨���������: %d\n"
 
-#: src/protocols/silc/ops.c:1369
+#: src/protocols/silc/ops.c:1378
 msgid "Network Statistics"
 msgstr "臀�膸�膸�莅�"
 
-#: src/protocols/silc/ops.c:1377 src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1386 src/protocols/silc/ops.c:1391
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1377
+#: src/protocols/silc/ops.c:1386
 msgid "Ping failed"
 msgstr "Ping 紊沿乾"
 
-#: src/protocols/silc/ops.c:1382
+#: src/protocols/silc/ops.c:1391
 msgid "Ping reply received from server"
 msgstr "���≦��� ping ����綺�"
 
-#: src/protocols/silc/ops.c:1390
+#: src/protocols/silc/ops.c:1399
 msgid "Could not kill user"
 msgstr "��羈���罩紫����"
 
-#: src/protocols/silc/ops.c:1471
+#: src/protocols/silc/ops.c:1480
 msgid "Error during connecting to SILC Server"
 msgstr "菴��ュ�� SILC ���≦���九�咲��"
 
-#: src/protocols/silc/ops.c:1476
+#: src/protocols/silc/ops.c:1485
 msgid "Key Exchange failed"
 msgstr "絲��ヤ困�√け茣�"
 
-#: src/protocols/silc/ops.c:1485
+#: src/protocols/silc/ops.c:1494
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "�√��援���篌�莚�紊沿乾��莚傑��[���域���]篁ュ��綮堺�域��ャ��"
 
-#: src/protocols/silc/ops.c:1520
+#: src/protocols/silc/ops.c:1529
 msgid "Disconnected by server"
 msgstr "���≦���㊤�菴���"
 
-#: src/protocols/silc/ops.c:1580 src/protocols/silc/ops.c:1627
+#: src/protocols/silc/ops.c:1589 src/protocols/silc/ops.c:1636
 #: src/protocols/silc/silc.c:167
 msgid "Resuming session"
 msgstr "�√�篌�莚�"
 
-#: src/protocols/silc/ops.c:1582
+#: src/protocols/silc/ops.c:1591
 msgid "Authenticating connection"
 msgstr "荳�蚕薨�莚�菴���"
 
-#: src/protocols/silc/ops.c:1629
+#: src/protocols/silc/ops.c:1638
 msgid "Verifying server public key"
 msgstr "�♂����≦������"
 
-#: src/protocols/silc/ops.c:1670
+#: src/protocols/silc/ops.c:1679
 msgid "Passphrase required"
 msgstr "莚傑�絲�����"
 
-#: src/protocols/silc/ops.c:1699
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "紊沿乾: ������拷��鐚�莚桁��膾ф����絎∽�欠�"
-
-#: src/protocols/silc/ops.c:1702
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "紊沿乾: 菴�腮�筝�篆>算��筝�������������"
-
-#: src/protocols/silc/ops.c:1705
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "紊沿乾: 菴�腮�筝�������莅��� KE 膸�"
-
 #: src/protocols/silc/ops.c:1708
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "紊沿乾: 菴�腮�筝�������莅���絲���膊�羈�"
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "紊沿乾: ������拷��鐚�莚桁��膾ф����絎∽�欠�"
 
 #: src/protocols/silc/ops.c:1711
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "紊沿乾: 菴�腮�筝�������莅��� PKCS"
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "紊沿乾: 菴�腮�筝�篆>算��筝�������������"
 
 #: src/protocols/silc/ops.c:1714
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "紊沿乾: 菴�腮�筝�������莅����e���醇��"
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "紊沿乾: 菴�腮�筝�������莅��� KE 膸�"
 
 #: src/protocols/silc/ops.c:1717
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "紊沿乾: 菴�腮�筝�������莅���絲���膊�羈�"
+
+#: src/protocols/silc/ops.c:1720
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "紊沿乾: 菴�腮�筝�������莅��� PKCS"
+
+#: src/protocols/silc/ops.c:1723
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "紊沿乾: 菴�腮�筝�������莅����e���醇��"
+
+#: src/protocols/silc/ops.c:1726
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "紊沿乾: 菴�腮�筝����� HMAC"
 
-#: src/protocols/silc/ops.c:1719
+#: src/protocols/silc/ops.c:1728
 msgid "Failure: Incorrect signature"
 msgstr "紊沿乾: 膈上��筝�罩g`"
 
-#: src/protocols/silc/ops.c:1721
+#: src/protocols/silc/ops.c:1730
 msgid "Failure: Invalid cookie"
 msgstr "紊沿乾: ������ cookie"
 
-#: src/protocols/silc/ops.c:1732
+#: src/protocols/silc/ops.c:1741
 msgid "Failure: Authentication failed"
 msgstr "紊沿乾: 荳�蚕薨�莚�紊沿乾"
 
@@ -9316,7 +9372,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;�窮О&gt;: �ョ���窮О篆≧��"
 
-#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1673
+#: src/protocols/silc/silc.c:1327 src/protocols/zephyr/zephyr.c:1676
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;�窮О&gt; &lt;羔���&gt;: �����桁���腱�篋堺���"
 
@@ -9340,75 +9396,75 @@
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;�巡擦&gt;: 莪���算篏� silc 絎∽�欠��巡擦"
 
-#: src/protocols/silc/silc.c:1352
+#: src/protocols/silc/silc.c:1353
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;�窮О&gt; [-pubkey|&lt;����&gt;]: ��罩紙�窮О"
 
-#: src/protocols/silc/silc.c:1356
+#: src/protocols/silc/silc.c:1357
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;�井�窮О&gt;: �贋�号�����窮О"
 
-#: src/protocols/silc/silc.c:1360
+#: src/protocols/silc/silc.c:1361
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;�窮О&gt;: �ョ���窮О篆≧��"
 
-#: src/protocols/silc/silc.c:1364
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt]; [arguments]:  Change or display "
+#: src/protocols/silc/silc.c:1365
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
-msgstr "cmode &lt;蘂���&gt; [+|-&lt;罔≦�&gt]; [����]: �贋�号���丞ず蘂���罔≦�"
-
-#: src/protocols/silc/silc.c:1368
+msgstr "cmode &lt;蘂���&gt; [+|-&lt;罔≦�&gt] [����]: �贋�号���丞ず蘂���罔≦�"
+
+#: src/protocols/silc/silc.c:1369
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 "cumode &lt;蘂���&gt; +|-&lt;罔≦�&gt; &lt;�窮О&gt;: �贋�号�窮О�����筝���罔≦�"
 
-#: src/protocols/silc/silc.c:1372
+#: src/protocols/silc/silc.c:1373
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;���傑─綣�&gt;: 莅丞舟�����膸�筝㊦��罔≦�"
 
-#: src/protocols/silc/silc.c:1376
+#: src/protocols/silc/silc.c:1377
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;�窮О&gt; [-pubkey]: �桁����≦�����������"
 
-#: src/protocols/silc/silc.c:1380
+#: src/protocols/silc/silc.c:1381
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 "invite &lt;蘂���&gt; [-|+]&lt;�窮О&gt;: ��莚傑�窮О��篁������莚桁��茵�賢羞糸��/����"
 
-#: src/protocols/silc/silc.c:1384
+#: src/protocols/silc/silc.c:1385
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;蘂���&gt; &lt;�窮О&gt; [羈���]: 篁����荼√�阪���"
 
-#: src/protocols/silc/silc.c:1388
+#: src/protocols/silc/silc.c:1389
 msgid "info [server]:  View server administrative details"
 msgstr "info [���≦��]: �ョ�����≦�����膸���"
 
-#: src/protocols/silc/silc.c:1392
+#: src/protocols/silc/silc.c:1393
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;蘂���&gt; +|-&lt;�窮О&gt;]: �����筝�絮�恖���"
 
-#: src/protocols/silc/silc.c:1396
+#: src/protocols/silc/silc.c:1397
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;�窮О|���≦��&gt;: �桁�絎∽�傑�����≦��������"
 
-#: src/protocols/silc/silc.c:1400
+#: src/protocols/silc/silc.c:1401
 msgid "stats:  View server and network statistics"
 msgstr "stat: �ョ�����≦����臀�膸�膸�莅�"
 
-#: src/protocols/silc/silc.c:1404
+#: src/protocols/silc/silc.c:1405
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: ��菴��ョ�����≦����� PING"
 
-#: src/protocols/silc/silc.c:1409
+#: src/protocols/silc/silc.c:1410
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;蘂���&gt;: ���咲���筝㊦����������"
 
-#: src/protocols/silc/silc.c:1413
+#: src/protocols/silc/silc.c:1414
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -9416,39 +9472,39 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;蘂���&gt;: ���咲���筝㊦����絎���"
 "��"
 
-#: src/protocols/silc/silc.c:1425
+#: src/protocols/silc/silc.c:1426
 msgid "Instant Messages"
 msgstr "�恰�倶���"
 
-#: src/protocols/silc/silc.c:1430
+#: src/protocols/silc/silc.c:1431
 msgid "Digitally sign all IM messages"
 msgstr "絲劫������紊�����茵��医�膈上��"
 
-#: src/protocols/silc/silc.c:1435
+#: src/protocols/silc/silc.c:1436
 msgid "Verify all IM message signatures"
 msgstr "�♂�������紊����Ⅹ��"
 
-#: src/protocols/silc/silc.c:1438
+#: src/protocols/silc/silc.c:1439
 msgid "Channel Messages"
 msgstr "蘂���羔���"
 
-#: src/protocols/silc/silc.c:1443
+#: src/protocols/silc/silc.c:1444
 msgid "Digitally sign all channel messages"
 msgstr "絲劫�������羔����茵��医�膈上��"
 
-#: src/protocols/silc/silc.c:1448
+#: src/protocols/silc/silc.c:1449
 msgid "Verify all channel message signatures"
 msgstr "�♂��������羔���Ⅹ��"
 
-#: src/protocols/silc/silc.c:1451
+#: src/protocols/silc/silc.c:1452
 msgid "Default SILC Key Pair"
 msgstr "藥�莅� SILC 絲��ュ�"
 
-#: src/protocols/silc/silc.c:1456
+#: src/protocols/silc/silc.c:1457
 msgid "SILC Public Key"
 msgstr "SILC ����"
 
-#: src/protocols/silc/silc.c:1461
+#: src/protocols/silc/silc.c:1462
 msgid "SILC Private Key"
 msgstr "SILC 腱���"
 
@@ -9462,40 +9518,40 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1547
+#: src/protocols/silc/silc.c:1548
 msgid "SILC Protocol Plugin"
 msgstr "SILC �顒��篁�"
 
 #. *  description
-#: src/protocols/silc/silc.c:1549
+#: src/protocols/silc/silc.c:1550
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "絎������絎��銀�莅�(SILC)�顒�"
 
-#: src/protocols/silc/silc.c:1579
+#: src/protocols/silc/silc.c:1580
 msgid "Public key authentication"
 msgstr "���ヨ�莚�"
 
-#: src/protocols/silc/silc.c:1585
+#: src/protocols/silc/silc.c:1586
 msgid "Public Key File"
 msgstr "���ユ��篁�"
 
-#: src/protocols/silc/silc.c:1589
+#: src/protocols/silc/silc.c:1590
 msgid "Private Key File"
 msgstr "腱��ユ��篁�"
 
-#: src/protocols/silc/silc.c:1594
+#: src/protocols/silc/silc.c:1595
 msgid "Reject watching by other users"
 msgstr "��膸��銀����欠��茹�"
 
-#: src/protocols/silc/silc.c:1597
+#: src/protocols/silc/silc.c:1598
 msgid "Block invites"
 msgstr "絮�恧��莚�"
 
-#: src/protocols/silc/silc.c:1600
+#: src/protocols/silc/silc.c:1601
 msgid "Block IMs without Key Exchange"
 msgstr "絮�恗押��絲��ヤ困�∝����紊�"
 
-#: src/protocols/silc/silc.c:1603
+#: src/protocols/silc/silc.c:1604
 msgid "Reject online status attribute requests"
 msgstr "��膸���鎖�倶��絮��ц�羆�"
 
@@ -9719,15 +9775,15 @@
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 篁�����筝㊥�√�����ー���札��罨≦���羔������"
 
-#: src/protocols/toc/toc.c:890
+#: src/protocols/toc/toc.c:891
 msgid "Password Change Successful"
 msgstr "絲����贋�号����"
 
-#: src/protocols/toc/toc.c:894
+#: src/protocols/toc/toc.c:895
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ����篋� PAUSE �巡擦��"
 
-#: src/protocols/toc/toc.c:895
+#: src/protocols/toc/toc.c:896
 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 "
@@ -9737,43 +9793,43 @@
 "絨���権�阪サ��Gaim 絨�篌������������榊��篁私���絎鴻��菴�篁�篁���鹸�句��鐚���篁ヨ���綽�腮�膈���"
 "�祉��"
 
-#: src/protocols/toc/toc.c:1409
+#: src/protocols/toc/toc.c:1410
 msgid "Get Dir Info"
 msgstr "�桁����篆≧��"
 
-#: src/protocols/toc/toc.c:1545
+#: src/protocols/toc/toc.c:1546
 msgid "Set Dir Info"
 msgstr "莅丞舟���篆≧��"
 
-#: src/protocols/toc/toc.c:1667
+#: src/protocols/toc/toc.c:1668
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "��羈���綣� %s ���ワ�"
 
-#: src/protocols/toc/toc.c:1703
+#: src/protocols/toc/toc.c:1704
 msgid "File transfer failed; other side probably canceled."
 msgstr "��篁銀���紊沿乾鐚����遵�銀賢筝�腴��羔�篋�篌�����"
 
-#: src/protocols/toc/toc.c:1748 src/protocols/toc/toc.c:1788
-#: src/protocols/toc/toc.c:1912 src/protocols/toc/toc.c:2000
+#: src/protocols/toc/toc.c:1749 src/protocols/toc/toc.c:1789
+#: src/protocols/toc/toc.c:1913 src/protocols/toc/toc.c:2001
 msgid "Could not connect for transfer."
 msgstr "��羈�菴��ヨ�茵�篌�����"
 
-#: src/protocols/toc/toc.c:1945
+#: src/protocols/toc/toc.c:1946
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "��羈����ユ��篁九ご����篁九�筝�篌�茴������"
 
-#: src/protocols/toc/toc.c:2045
+#: src/protocols/toc/toc.c:2046
 msgid "Gaim - Save As..."
 msgstr "Gaim - ���筝�..."
 
-#: src/protocols/toc/toc.c:2079
+#: src/protocols/toc/toc.c:2080
 #, 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:2086
+#: src/protocols/toc/toc.c:2087
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 莚傑��������篁�"
@@ -9789,15 +9845,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2169 src/protocols/toc/toc.c:2171
+#: src/protocols/toc/toc.c:2170 src/protocols/toc/toc.c:2172
 msgid "TOC Protocol Plugin"
 msgstr "TOC �顒��篁�"
 
-#: src/protocols/toc/toc.c:2190
+#: src/protocols/toc/toc.c:2191
 msgid "TOC host"
 msgstr "TOC 筝紙��"
 
-#: src/protocols/toc/toc.c:2194
+#: src/protocols/toc/toc.c:2195
 msgid "TOC port"
 msgstr "TOC 腴��"
 
@@ -9983,79 +10039,72 @@
 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:1896
+#: src/protocols/yahoo/yahoo.c:1897
 msgid "Could not add buddy to server list"
 msgstr "��羈�絨�絅遵�羞糸���井���≦����茵�"
 
-#: src/protocols/yahoo/yahoo.c:2088 src/protocols/yahoo/yahoo.c:2216
+#: src/protocols/yahoo/yahoo.c:2131 src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr "��羈�莚糸�"
 
-#: src/protocols/yahoo/yahoo.c:2238 src/protocols/yahoo/yahoo.c:2348
-#: src/protocols/yahoo/yahoo.c:2398 src/protocols/yahoo/yahoo.c:2408
+#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
+#: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
 #: src/protocols/yahoo/yahoochat.c:1397 src/protocols/yahoo/yahoochat.c:1458
+#: src/protocols/yahoo/ycht.c:518
 msgid "Connection problem"
 msgstr "菴��ラ���"
 
-#: src/protocols/yahoo/yahoo.c:2495 src/protocols/yahoo/yahoo.c:2857
-#: src/protocols/yahoo/yahoo.c:2971
+#: src/protocols/yahoo/yahoo.c:2538 src/protocols/yahoo/yahoo.c:2900
+#: src/protocols/yahoo/yahoo.c:3014
 msgid "Not At Home"
 msgstr "筝����"
 
-#: src/protocols/yahoo/yahoo.c:2497 src/protocols/yahoo/yahoo.c:2859
-#: src/protocols/yahoo/yahoo.c:2972
+#: src/protocols/yahoo/yahoo.c:2540 src/protocols/yahoo/yahoo.c:2902
+#: src/protocols/yahoo/yahoo.c:3015
 msgid "Not At Desk"
 msgstr "筝������"
 
-#: src/protocols/yahoo/yahoo.c:2499 src/protocols/yahoo/yahoo.c:2861
-#: src/protocols/yahoo/yahoo.c:2973
+#: src/protocols/yahoo/yahoo.c:2542 src/protocols/yahoo/yahoo.c:2904
+#: src/protocols/yahoo/yahoo.c:3016
 msgid "Not In Office"
 msgstr "筝��������"
 
-#: src/protocols/yahoo/yahoo.c:2503 src/protocols/yahoo/yahoo.c:2865
-#: src/protocols/yahoo/yahoo.c:2975
+#: src/protocols/yahoo/yahoo.c:2546 src/protocols/yahoo/yahoo.c:2908
+#: src/protocols/yahoo/yahoo.c:3018
 msgid "On Vacation"
 msgstr "綺���筝�"
 
-#: src/protocols/yahoo/yahoo.c:2507 src/protocols/yahoo/yahoo.c:2869
-#: src/protocols/yahoo/yahoo.c:2977
+#: src/protocols/yahoo/yahoo.c:2550 src/protocols/yahoo/yahoo.c:2912
+#: src/protocols/yahoo/yahoo.c:3020
 msgid "Stepped Out"
 msgstr "��羝�"
 
-#: src/protocols/yahoo/yahoo.c:2588 src/protocols/yahoo/yahoo.c:2614
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:2657
 msgid "Not on server list"
 msgstr "筝������≦����茵�賢"
 
-#: src/protocols/yahoo/yahoo.c:2634
-#, c-format
-msgid ""
-"\n"
-"<b>%s:</b> %s"
-msgstr ""
-"\n"
-"<b>%s:</b> %s"
-
-#: src/protocols/yahoo/yahoo.c:2693
+#: src/protocols/yahoo/yahoo.c:2736
 msgid "Join in Chat"
 msgstr "���ヨ��紊�"
 
-#: src/protocols/yahoo/yahoo.c:2698
+#: src/protocols/yahoo/yahoo.c:2741
 msgid "Initiate Conference"
 msgstr "��莎隙�莅�"
 
-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2793
 msgid "Active which ID?"
 msgstr "羶�羇糸��肩 ID鐚�"
 
-#: src/protocols/yahoo/yahoo.c:2759
+#: src/protocols/yahoo/yahoo.c:2802
 msgid "Join who in chat?"
 msgstr "絨�莪����ヨ��紊��"
 
-#: src/protocols/yahoo/yahoo.c:2769
+#: src/protocols/yahoo/yahoo.c:2812
 msgid "Activate ID..."
 msgstr "羶�羇� ID..."
 
-#: src/protocols/yahoo/yahoo.c:2773
+#: src/protocols/yahoo/yahoo.c:2816
 msgid "Join user in chat..."
 msgstr "����紊�賢���ョ����..."
 
@@ -10070,47 +10119,47 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3292 src/protocols/yahoo/yahoo.c:3294
+#: src/protocols/yahoo/yahoo.c:3335 src/protocols/yahoo/yahoo.c:3337
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo �顒��篁�"
 
-#: src/protocols/yahoo/yahoo.c:3313
+#: src/protocols/yahoo/yahoo.c:3356
 msgid "Yahoo Japan"
 msgstr "Yahoo �ユ��"
 
-#: src/protocols/yahoo/yahoo.c:3316
+#: src/protocols/yahoo/yahoo.c:3359
 msgid "Pager host"
 msgstr "絲糸�寂源��"
 
-#: src/protocols/yahoo/yahoo.c:3319
+#: src/protocols/yahoo/yahoo.c:3362
 msgid "Japan Pager host"
 msgstr "�ユ����寂源��"
 
-#: src/protocols/yahoo/yahoo.c:3322
+#: src/protocols/yahoo/yahoo.c:3365
 msgid "Pager port"
 msgstr "絲糸�主���"
 
-#: src/protocols/yahoo/yahoo.c:3325
+#: src/protocols/yahoo/yahoo.c:3368
 msgid "File transfer host"
 msgstr "��篁銀���筝紙��"
 
-#: src/protocols/yahoo/yahoo.c:3328
+#: src/protocols/yahoo/yahoo.c:3371
 msgid "Japan File transfer host"
 msgstr "�ユ����篁銀���筝紙��"
 
-#: src/protocols/yahoo/yahoo.c:3331
+#: src/protocols/yahoo/yahoo.c:3374
 msgid "File transfer port"
 msgstr "��篁銀���腴��"
 
-#: src/protocols/yahoo/yahoo.c:3334
+#: src/protocols/yahoo/yahoo.c:3377
 msgid "Chat Room List Url"
 msgstr "��鎀��翠�翫��茵� URL"
 
-#: src/protocols/yahoo/yahoo.c:3337
+#: src/protocols/yahoo/yahoo.c:3380
 msgid "YCHT Host"
 msgstr "YCHT 筝紙��"
 
-#: src/protocols/yahoo/yahoo.c:3340
+#: src/protocols/yahoo/yahoo.c:3383
 msgid "YCHT Port"
 msgstr "YCHT 腴��"
 
@@ -10206,33 +10255,33 @@
 msgid "The user's profile is empty."
 msgstr "���欠����臀���篁銀減腥冴��"
 
-#: src/protocols/yahoo/yahoochat.c:203
+#: src/protocols/yahoo/yahoochat.c:193
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s ��膸������ユ�翠�癌��%s����篌�莅���莚件�����筝財��%s����"
 
-#: src/protocols/yahoo/yahoochat.c:205
+#: src/protocols/yahoo/yahoochat.c:195
 msgid "Invitation Rejected"
 msgstr "��莚桁群��膸�"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Failed to join chat"
 msgstr "���ヨ��紊�け茣�"
 
-#: src/protocols/yahoo/yahoochat.c:355
+#: src/protocols/yahoo/yahoochat.c:347
 msgid "Maybe the room is full?"
 msgstr "���醇�翠�翫群羯¥�"
 
-#: src/protocols/yahoo/yahoochat.c:429
+#: src/protocols/yahoo/yahoochat.c:425
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "��ー��③�� %s 筝㊧��紊���"
 
-#: src/protocols/yahoo/yahoochat.c:583
+#: src/protocols/yahoo/yahoochat.c:579
 msgid "Failed to join buddy in chat"
 msgstr "����紊�賢���ュソ��紊沿乾"
 
-#: src/protocols/yahoo/yahoochat.c:584
+#: src/protocols/yahoo/yahoochat.c:580
 msgid "Maybe they're not in a chat?"
 msgstr "���巡�篁�������紊�賢鐚�"
 
@@ -10260,91 +10309,83 @@
 msgid "User Rooms"
 msgstr "���傑�翠��"
 
-#: src/protocols/zephyr/zephyr.c:589
+#: src/protocols/yahoo/ycht.c:401
+msgid "Connection problem with the YCHT server."
+msgstr "YCHT ���≦����ュ�榊ー�����"
+
+#: src/protocols/zephyr/zephyr.c:598
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr "��羈�����膸���紊� %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:624
+#: src/protocols/zephyr/zephyr.c:633
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>����:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:628
+#: src/protocols/zephyr/zephyr.c:637
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>��荳������糸��"
 
-#: src/protocols/zephyr/zephyr.c:633
+#: src/protocols/zephyr/zephyr.c:642
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>篁� %s鐚��� %s 莎�"
 
-#: src/protocols/zephyr/zephyr.c:983 src/protocols/zephyr/zephyr.c:984
+#: src/protocols/zephyr/zephyr.c:987 src/protocols/zephyr/zephyr.c:988
 msgid "Anyone"
 msgstr "篁私�篋�"
 
-#: src/protocols/zephyr/zephyr.c:1011
-msgid "Already logged in with Zephyr"
-msgstr "綏牙��糸�� Zephyr"
-
-#: src/protocols/zephyr/zephyr.c:1011
-msgid ""
-"Because Zephyr uses your system username, you are unable to have multiple "
-"accounts on it when logged in as the same user."
-msgstr ""
-"�延� Zephyr 絨�篏睡������膤紫����桁��鐚�絋�����群���後�������欠�糸�ワ������羈��ユ��紊�筝�"
-"茣��激��"
-
-#: src/protocols/zephyr/zephyr.c:1386
+#: src/protocols/zephyr/zephyr.c:1389
 msgid "_Class:"
 msgstr "膠�(_C):"
 
-#: src/protocols/zephyr/zephyr.c:1392
+#: src/protocols/zephyr/zephyr.c:1395
 msgid "_Instance:"
 msgstr "絎�箴�(_I):"
 
-#: src/protocols/zephyr/zephyr.c:1398
+#: src/protocols/zephyr/zephyr.c:1401
 msgid "_Recipient:"
 msgstr "�ユ�区��(_R):"
 
-#: src/protocols/zephyr/zephyr.c:1409
+#: src/protocols/zephyr/zephyr.c:1412
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "莚��乗��� %s,%s,%s 紊沿乾��"
 
-#: src/protocols/zephyr/zephyr.c:1678
+#: src/protocols/zephyr/zephyr.c:1681
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;�窮О&gt;: 絎�篏�����"
 
-#: src/protocols/zephyr/zephyr.c:1683
+#: src/protocols/zephyr/zephyr.c:1686
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;�窮О&gt;: 絎�篏�����"
 
-#: src/protocols/zephyr/zephyr.c:1688
+#: src/protocols/zephyr/zephyr.c:1691
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;絎�箴�&gt;: 莅丞舟��④膠私�篏睡����絎�箴�"
 
-#: src/protocols/zephyr/zephyr.c:1693
+#: src/protocols/zephyr/zephyr.c:1696
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;絎�箴�&gt;: 莅丞舟��④膠私�篏睡����絎�箴�"
 
-#: src/protocols/zephyr/zephyr.c:1699
+#: src/protocols/zephyr/zephyr.c:1702
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;膠�&gt; &lt;絎�箴�&gt; &lt;�銀散篋�&gt;: ���ユ�域��紊�"
 
-#: src/protocols/zephyr/zephyr.c:1704
+#: src/protocols/zephyr/zephyr.c:1707
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;絎�箴�&gt;: �� &lt;羔���,<i>絎�箴�</i>,*&gt; ����羔���"
 
-#: src/protocols/zephyr/zephyr.c:1710
+#: src/protocols/zephyr/zephyr.c:1713
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 "zci &lt;膠�&gt; &lt;絎�箴�&gt;: �� &lt;<i>膠�</i>,<i>絎�箴�</i>,*&gt; ����羔���"
 
-#: src/protocols/zephyr/zephyr.c:1716
+#: src/protocols/zephyr/zephyr.c:1719
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -10352,7 +10393,7 @@
 "zcir &lt;膠�&gt; &lt;絎�箴�&gt; &lt;�銀散篋�&gt;: �� &lt;<i>膠�</i>,<i>絎�箴�</i>,<i>"
 "�銀散篋�</i>&gt; ����羔���"
 
-#: src/protocols/zephyr/zephyr.c:1722
+#: src/protocols/zephyr/zephyr.c:1725
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -10360,15 +10401,15 @@
 "zir &lt;絎�箴�&gt; &lt;�銀散篋�&gt;: �� &lt;羔���,<i>絎�箴�</i>,<i>�銀散篋�</i>&gt; ��"
 "��羔���"
 
-#: src/protocols/zephyr/zephyr.c:1727
+#: src/protocols/zephyr/zephyr.c:1730
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;膠�&gt;: �� &lt;<i>膠�</i>,筝�査,*&gt; ����羔���"
 
-#: src/protocols/zephyr/zephyr.c:1802
+#: src/protocols/zephyr/zephyr.c:1806
 msgid "Resubscribe"
 msgstr "��莅�"
 
-#: src/protocols/zephyr/zephyr.c:1805
+#: src/protocols/zephyr/zephyr.c:1809
 msgid "Retrieve subscriptions from server"
 msgstr "篁����≦��キ��莅∫��"
 
@@ -10383,19 +10424,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1885 src/protocols/zephyr/zephyr.c:1887
+#: src/protocols/zephyr/zephyr.c:1889 src/protocols/zephyr/zephyr.c:1891
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr �顒��篁�"
 
-#: src/protocols/zephyr/zephyr.c:1906
+#: src/protocols/zephyr/zephyr.c:1910
 msgid "Export to .anyone"
 msgstr "絲弱�阪�� .anyone"
 
-#: src/protocols/zephyr/zephyr.c:1909
+#: src/protocols/zephyr/zephyr.c:1913
 msgid "Export to .zephyr.subs"
 msgstr "絲弱�阪�� .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:1912
+#: src/protocols/zephyr/zephyr.c:1916
 msgid "Exposure"
 msgstr "�顔��"
 
@@ -10422,7 +10463,7 @@
 msgstr "��減膸�絎�篁g��膠糸������絎���筝紙�阪����腴��垽������"
 
 #. * Custom away message.
-#: src/prpl.h:165
+#: src/prpl.h:171
 msgid "Custom"
 msgstr "���箙�"
 
@@ -10437,62 +10478,62 @@
 msgid "Please enter your password"
 msgstr "莚決��ユ����絲���"
 
-#: src/server.c:528
+#: src/server.c:534
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s �医��û�� %s��\n"
 
-#: src/server.c:938
+#: src/server.c:945
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d �≧���)"
 
-#: src/server.c:952
+#: src/server.c:959
 msgid "(1 message)"
 msgstr "(1 �≧���)"
 
-#: src/server.c:1180 src/server.c:1189
+#: src/server.c:1188 src/server.c:1197
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ヤ���"
 
-#: src/server.c:1201
+#: src/server.c:1209
 #, c-format
 msgid "%s signed on"
 msgstr "%s 綏牙�糸��"
 
-#: src/server.c:1216
+#: src/server.c:1224
 #, c-format
 msgid "%s came back"
 msgstr "%s ���ヤ�"
 
-#: src/server.c:1218
+#: src/server.c:1226
 #, c-format
 msgid "%s went away"
 msgstr "%s 莎遺�"
 
-#: src/server.c:1232
+#: src/server.c:1240
 #, c-format
 msgid "%s became idle"
 msgstr "%s ��莎欠����"
 
-#: src/server.c:1243
+#: src/server.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s �♂��篋�"
 
-#: src/server.c:1253 src/server.c:1260
+#: src/server.c:1261 src/server.c:1268
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�坂���"
 
-#: src/server.c:1273
+#: src/server.c:1281
 #, c-format
 msgid "%s signed off"
 msgstr "%s 綏牙�糸��"
 
-#: src/server.c:1335
+#: src/server.c:1343
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -10501,11 +10542,11 @@
 "%s ����茴� %s 茘�����\n"
 "���亥��茘���膾у���� %d%%"
 
-#: src/server.c:1338
+#: src/server.c:1346
 msgid "an anonymous person"
 msgstr "����羂�"
 
-#: src/server.c:1448
+#: src/server.c:1456
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -10514,12 +10555,12 @@
 "���撃��%s����莚� %s ���ュソ����紊��: ��%s��\n"
 "%s"
 
-#: src/server.c:1452
+#: src/server.c:1460
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "���撃��%s����莚� %s ���ュソ����紊��: ��%s��\n"
 
-#: src/server.c:1458
+#: src/server.c:1466
 msgid "Accept chat invitation?"
 msgstr "�ュ���紊���莚桁��鐚�"
 
@@ -10589,3 +10630,4 @@
 #: src/win32/win32dep.c:278
 msgid "Notification"
 msgstr "��腓�"
+