changeset 7205:ffabb88c9013

[gaim-migrate @ 7774] yet another committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 09 Oct 2003 12:03:23 +0000 (2003-10-09)
parents b4b92004334c
children 0b4428f327b5
files po/zh_TW.po
diffstat 1 files changed, 2199 insertions(+), 1773 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_TW.po	Thu Oct 09 12:01:58 2003 +0000
+++ b/po/zh_TW.po	Thu Oct 09 12:03:23 2003 +0000
@@ -1,6 +1,6 @@
 # Gaim Traditional Chinese translation
-# Copyright (C) 2002-August 2003, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) May-August 2003, Ambrose C. Li <acli@ada.dhs.org>
+# Copyright (C) 2002-October 2003, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C)  May-October 2003, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the Gaim package.
 #
@@ -12,7 +12,7 @@
 # XXX   茵�ず���醇���馹�鐚�荀�茲��ワ����馹���荐��
 # ANS   茵�ず絨� XXX ����羈���荀� (�馹�茹f浦緇� XXX �� ANS 筝�网�����)
 # ----------------------------------------------------------
-# FIXME ����腟延�茘����絖�荅�鐚�Postal code��Profile��match��connect
+# FIXME ����腟延�茘����絖�荅�鐚�Postal code��Profile��match��connect��user info
 # FIXME��such�����冴������鐚��潟��������鐚�篏�����茘���羃���腟延�
 # XXX  ��email address�����冴���糸��灸散�医����鐚�篏���罔e�紊��隙�鐚�
 #       �����⑮�����脂�球�医����鐚�
@@ -25,8 +25,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim 0.69\n"
-"POT-Creation-Date: 2003-09-27 10:51-0400\n"
+"Project-Id-Version: Gaim 0.71\n"
+"POT-Creation-Date: 2003-10-08 05:50-0400\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -43,14 +43,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:104
+#: plugins/autorecon.c:105
 msgid "Auto-Reconnect"
 msgstr "�������育�g�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:107 plugins/autorecon.c:109
+#: plugins/autorecon.c:108 plugins/autorecon.c:110
 msgid "When you are kicked offline, this reconnects you."
 msgstr "�銀��欠���鐚�膤紫輝������綛�����育�g���"
 
@@ -86,7 +86,7 @@
 msgid "Gaim - Away"
 msgstr "Gaim - �∫��"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:463 src/gtkaccount.c:1658
+#: plugins/docklet/docklet.c:114 src/gtkaccount.c:482 src/gtkaccount.c:1758
 msgid "Auto-login"
 msgstr "�����糸��"
 
@@ -102,12 +102,12 @@
 msgid "New..."
 msgstr "�医�..."
 
-#: plugins/docklet/docklet.c:153 src/gtkblist.c:1797 src/gtkpounce.c:461
-#: src/gtkprefs.c:1468 src/protocols/gg/gg.c:54 src/protocols/irc/msgs.c:189
-#: src/protocols/jabber/jabber.c:1268 src/protocols/jabber/jabber.c:3533
-#: src/protocols/jabber/jabber.c:3587 src/protocols/oscar/oscar.c:2841
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:5518
-#: src/protocols/oscar/oscar.c:5912
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:1916 src/gtkpounce.c:461
+#: src/gtkprefs.c:1473 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:868 src/protocols/jabber/jutil.c:97
+#: src/protocols/jabber/presence.c:81 src/protocols/oscar/oscar.c:2833
+#: src/protocols/oscar/oscar.c:4529 src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:6064
 msgid "Away"
 msgstr "�∫��"
 
@@ -124,11 +124,11 @@
 msgstr "罟�罅��活叱"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1816 src/main.c:315
+#: plugins/docklet/docklet.c:173 src/gtkaccount.c:1917 src/main.c:326
 msgid "Accounts"
 msgstr "絽活��羝���"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2335 src/main.c:325
+#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2337 src/main.c:336
 msgid "Preferences"
 msgstr "�鎁処┃絎�"
 
@@ -663,6 +663,61 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "箴��т戎������絎�臂���荀��鋐���篁i���肴���賢����絖���"
 
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:190
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-gnutls.c:193 plugins/ssl/ssl-gnutls.c:195
+msgid "Provides SSL support through GNUTLS."
+msgstr "��� GNUTLS ��鋐� SSL ����叵��"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:287
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl-nss.c:290 plugins/ssl/ssl-nss.c:292
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "��� Mozilla �� NSS ��鋐� SSL ����叵��"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:91
+msgid "SSL"
+msgstr "SSL"
+
+# TODO Untranslated
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "�堺��� SSL ���恖�綺��箴�筝��� Wrapper��"
+
 #: plugins/statenotify.c:30 src/gtkpounce.c:843
 #, c-format
 msgid "%s has gone away."
@@ -779,7 +834,7 @@
 msgstr "���恰��荐����腦�筝㊨¨腓� Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:844
+#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "絅遵�羝����腦�"
 
@@ -826,8 +881,8 @@
 msgstr "�� Windows �����������決� Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1638
-#: src/gtkprefs.c:2268
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:1756
+#: src/gtkprefs.c:2270
 msgid "Buddy List"
 msgstr "絅遵�羝���"
 
@@ -846,8 +901,8 @@
 msgstr "絨�絅遵�羝����腦�篆�������∝����筝�絮�(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:893
-#: src/gtkprefs.c:2269
+#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:894
+#: src/gtkprefs.c:2271
 msgid "Conversations"
 msgstr "篋よ�"
 
@@ -1074,11 +1129,89 @@
 msgid "Chinese"
 msgstr "筝㊥��"
 
-#: src/about.c:219 src/dialogs.c:3509 src/gtkrequest.c:191
-#: src/protocols/msn/msn.c:240 src/server.c:1567
+#: src/about.c:219 src/dialogs.c:2290 src/gtkrequest.c:205
+#: src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "����"
 
+#: src/account.c:265 src/protocols/jabber/jabber.c:918
+msgid "New passwords do not match."
+msgstr "�医�腆寂研筝��悟���"
+
+# NOTE 茘����翫�� by Ambrose
+#: src/account.c:273
+msgid "Fill out all fields completely."
+msgstr "茫�紂�Ε�岩蚕茵��主������罨�篏���"
+
+#: src/account.c:298
+msgid "Original password"
+msgstr "��絲�腆�"
+
+#: src/account.c:304
+msgid "New password"
+msgstr "�医�腆�"
+
+#: src/account.c:310
+msgid "New password (again)"
+msgstr "�医�腆種���罨∞∈茯�鐚�"
+
+#: src/account.c:315
+#, c-format
+msgid "Change password for %s"
+msgstr "篆��� %s ��絲�腆�"
+
+#: src/account.c:321
+msgid "Please enter your current password and your new password."
+msgstr "茫�莠後�ユ��������絲�腆寂札��絽���篏睡�����医�腆若��"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#.
+#: src/account.c:324 src/connection.c:193 src/dialogs.c:1812
+#: src/dialogs.c:1855 src/dialogs.c:1986 src/gtkblist.c:1138
+#: src/gtkrequest.c:202 src/protocols/jabber/jabber.c:963
+#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/msn/msn.c:214
+#: src/protocols/oscar/oscar.c:2448 src/protocols/oscar/oscar.c:2528
+#: src/protocols/oscar/oscar.c:6114 src/protocols/oscar/oscar.c:6210
+#: src/protocols/oscar/oscar.c:6259 src/protocols/oscar/oscar.c:6339
+#: src/protocols/yahoo/yahoo.c:2234 src/request.h:852
+msgid "OK"
+msgstr "腆阪�"
+
+#. Cancel button.
+#: src/account.c:325 src/account.c:359 src/buddy_chat.c:375
+#: src/connection.c:194 src/dialogs.c:466 src/dialogs.c:478 src/dialogs.c:491
+#: src/dialogs.c:512 src/dialogs.c:897 src/dialogs.c:1646 src/dialogs.c:1813
+#: src/dialogs.c:1856 src/dialogs.c:1993 src/gtkaccount.c:1612
+#: src/gtkaccount.c:2080 src/gtkblist.c:1139 src/gtkblist.c:3038
+#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
+#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:203
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:520
+#: src/protocols/jabber/jabber.c:613 src/protocols/jabber/jabber.c:964
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2412
+#: src/protocols/oscar/oscar.c:2449 src/protocols/oscar/oscar.c:2484
+#: src/protocols/oscar/oscar.c:2529 src/protocols/oscar/oscar.c:5942
+#: src/protocols/oscar/oscar.c:6115 src/protocols/oscar/oscar.c:6211
+#: src/protocols/oscar/oscar.c:6260 src/protocols/oscar/oscar.c:6325
+#: src/protocols/oscar/oscar.c:6340 src/protocols/trepia/trepia.c:338
+#: src/protocols/yahoo/yahoo.c:2235 src/request.h:852 src/request.h:862
+msgid "Cancel"
+msgstr "��羔�"
+
+#: src/account.c:351
+#, c-format
+msgid "Change user information for %s"
+msgstr "�贋�� %s ����篋肴�荐�"
+
+#: src/account.c:358 src/dialogs.c:893 src/dialogs.c:1634 src/dialogs.c:2299
+#: src/gtkrequest.c:209 src/protocols/jabber/buddy.c:519
+#: src/protocols/trepia/trepia.c:337
+msgid "Save"
+msgstr "�峨�"
+
 #: src/away.c:208
 msgid "Gaim - Away!"
 msgstr "Gaim - �∫��鐚�"
@@ -1099,16 +1232,16 @@
 msgid "Set All Away"
 msgstr "����┃�咲�∫��"
 
-#: src/blist.c:547 src/gtkprefs.c:2271
+#: src/blist.c:548 src/gtkprefs.c:2273
 msgid "Chats"
 msgstr "��紊�"
 
-#: src/blist.c:642 src/blist.c:811 src/dialogs.c:872
-#: src/protocols/jabber/jabber.c:1919 src/protocols/msn/notification.c:1135
+#: src/blist.c:643 src/blist.c:816 src/blist.c:2018 src/gtkblist.c:2528
+#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1136
 msgid "Buddies"
 msgstr "絅遵�"
 
-#: src/blist.c:1097
+#: src/blist.c:1103
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1120,54 +1253,30 @@
 "%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�����絨�����絽活��筝�����糸�ャ����篋�絅遵���"
 "臂ょ�羃���茴�Щ�ゃ��\n"
 
-#: src/blist.c:1106
+#: src/blist.c:1112
 msgid "Group not removed"
 msgstr "臂ょ���←腱脂��"
 
-#: src/blist.c:1157 src/gtkaccount.c:140 src/gtkpounce.c:307
-#: src/gtkutils.c:842 src/protocols/jabber/jabber.c:1261
+#: src/blist.c:1163 src/gtkaccount.c:159 src/gtkpounce.c:307
+#: src/gtkutils.c:839 src/protocols/jabber/auth.c:97
+#: src/protocols/jabber/buddy.c:571
 msgid "Unknown"
 msgstr "����"
 
-#: src/blist.c:1475
+#: src/blist.c:1491
 msgid "Invalid Groupname"
 msgstr "�≧����臂ょ���腮�"
 
-#: src/blist.c:2255
+#: src/blist.c:2135
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "��В������絅遵�羝������主�������絅遵�羝������茴���ャ��"
 
-#: src/blist.c:2257
+#: src/blist.c:2137
 msgid "Buddy List Error"
 msgstr "絅遵�羝������"
 
-#: src/browser.c:407 src/browser.c:435
-msgid ""
-"Communication with the browser failed. Please close all windows and try "
-"again."
-msgstr "���頳遵����羣���紊掩����茫�����������荀�腦�緇���荅���"
-
-#: src/browser.c:570 src/browser.c:590 src/browser.c:598
-msgid "Unable to open URL"
-msgstr "�≧�����膓臥��"
-
-#: src/browser.c:571
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "���悟�����篏睡��������頳遵����鐚��紙����荐㊤���篁ゃ��"
-
-#: src/browser.c:588
-#, c-format
-msgid "The browser \"%s\" is invalid."
-msgstr "�頳遵����%s�����≧������"
-
-#: src/browser.c:595
-#, c-format
-msgid "Error launching \"command\": %s"
-msgstr "�決�����篁ゃ�����主��篋����鐚�%s"
-
-#: src/buddy_chat.c:316 src/dialogs.c:1318
+#: src/buddy_chat.c:316 src/gtkblist.c:2931
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1192,27 +1301,6 @@
 msgid "Join"
 msgstr "����"
 
-#. Cancel button.
-#: src/buddy_chat.c:375 src/connection.c:194 src/dialogs.c:487
-#: src/dialogs.c:499 src/dialogs.c:512 src/dialogs.c:533 src/dialogs.c:910
-#: src/dialogs.c:1602 src/dialogs.c:1717 src/dialogs.c:1783 src/dialogs.c:2045
-#: src/dialogs.c:2194 src/dialogs.c:2866 src/dialogs.c:3033 src/dialogs.c:3075
-#: src/dialogs.c:3212 src/dialogs.c:3556 src/gtkaccount.c:1547
-#: src/gtkconn.c:147 src/gtkprivacy.c:568 src/gtkprivacy.c:581
-#: src/gtkprivacy.c:606 src/gtkprivacy.c:617 src/gtkrequest.c:189
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/jabber.c:4202
-#: src/protocols/msn/msn.c:175 src/protocols/msn/msn.c:186
-#: src/protocols/msn/msn.c:197 src/protocols/msn/msn.c:208
-#: src/protocols/msn/msn.c:221 src/protocols/oscar/oscar.c:2420
-#: src/protocols/oscar/oscar.c:2457 src/protocols/oscar/oscar.c:2492
-#: src/protocols/oscar/oscar.c:2537 src/protocols/oscar/oscar.c:5790
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6054
-#: src/protocols/oscar/oscar.c:6118 src/protocols/trepia/trepia.c:379
-#: src/protocols/yahoo/yahoo.c:1632 src/prpl.c:164 src/request.h:813
-#: src/request.h:823
-msgid "Cancel"
-msgstr "��羔�"
-
 #: src/connection.c:117 src/connection.c:165
 #, c-format
 msgid "Missing protocol plugin for %s"
@@ -1231,24 +1319,11 @@
 msgid "Enter password for %s"
 msgstr "莠後�� %s ��絲�腆�"
 
-#. Build OK Button
-#: src/connection.c:193 src/dialogs.c:1713 src/dialogs.c:1853
-#: src/dialogs.c:2044 src/dialogs.c:2190 src/dialogs.c:3032 src/dialogs.c:3074
-#: src/dialogs.c:3205 src/dialogs.c:3555 src/gtkrequest.c:188
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:185
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/oscar/oscar.c:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6004 src/protocols/oscar/oscar.c:6053
-#: src/protocols/oscar/oscar.c:6117 src/protocols/yahoo/yahoo.c:1631
-#: src/request.h:813
-msgid "OK"
-msgstr "腆阪�"
-
-#: src/conversation.c:424
+#: src/conversation.c:324
 msgid "Unable to send message. The message is too large."
 msgstr "�≧����肴���������荐���お紊т���"
 
-#: src/conversation.c:432
+#: src/conversation.c:332
 msgid "Unable to send message."
 msgstr "�≧����肴�����"
 
@@ -1257,7 +1332,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1983
+#: src/conversation.c:1888
 #, c-format
 msgid "%s entered the room."
 msgstr "%s �峨�ヨ��紊����"
@@ -1267,61 +1342,61 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1986
+#: src/conversation.c:1891
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] �峨�ヨ��紊����"
 
-#: src/conversation.c:2071
+#: src/conversation.c:1976
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �壕��援┗�� %s"
 
-#: src/conversation.c:2113
+#: src/conversation.c:2018
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s �∫����紊�� (%s)��"
 
-#: src/conversation.c:2115
+#: src/conversation.c:2020
 #, c-format
 msgid "%s left the room."
 msgstr "%s �∫����紊����"
 
-#: src/conversation.c:2188
+#: src/conversation.c:2093
 #, c-format
 msgid "(+%d more)"
 msgstr "鐚�篁ュ���� %d ��鐚�"
 
-#: src/conversation.c:2190
+#: src/conversation.c:2095
 #, c-format
 msgid " left the room (%s)."
 msgstr " �∫����紊�� (%s)��"
 
-#: src/conversation.c:2472
+#: src/conversation.c:2377
 msgid "Last created window"
 msgstr "筝�筝���������荀�腦�"
 
-#: src/conversation.c:2474
+#: src/conversation.c:2379
 msgid "New window"
 msgstr "�域�腦�"
 
-#: src/conversation.c:2476
+#: src/conversation.c:2381
 msgid "By group"
 msgstr "箴�臂ょ�"
 
-#: src/conversation.c:2478
+#: src/conversation.c:2383
 msgid "By account"
 msgstr "箴�絽活��"
 
-#: src/dialogs.c:335
+#: src/dialogs.c:314
 msgid "Warn User"
 msgstr "茘���篏睡����"
 
-#: src/dialogs.c:338
+#: src/dialogs.c:317
 msgid "_Warn"
 msgstr "茘���(_W)"
 
-#: src/dialogs.c:354
+#: src/dialogs.c:333
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1333,37 +1408,37 @@
 "\n"
 "������篏�絨���紜��� %s ��茘���膈�膣�鐚�����篁� / 絅劫�茴����銀札�翫�贋�主���������吟��\n"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:342
 msgid "Warn _anonymously?"
 msgstr "篁ュ�水����荳�蚕�弱�肴⑥��鐚�(_A)"
 
-#: src/dialogs.c:370
+#: src/dialogs.c:349
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�水����茘���罸�莠�筝�羃����i瑳�顔����</b>"
 
-#: src/dialogs.c:483
+#: src/dialogs.c:462
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "��③荅���絨� %s  緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
 # XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
-#: src/dialogs.c:485 src/dialogs.c:486
+#: src/dialogs.c:464 src/dialogs.c:465
 msgid "Remove Buddy"
 msgstr "腱脂�ゅソ��"
 
-#: src/dialogs.c:495
+#: src/dialogs.c:474
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "��③荅���絨� %s 緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
-#: src/dialogs.c:497 src/dialogs.c:498
+#: src/dialogs.c:476 src/dialogs.c:477
 msgid "Remove Chat"
 msgstr "腱脂�よ��紊��"
 
-#: src/dialogs.c:507
+#: src/dialogs.c:486
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -1371,11 +1446,11 @@
 msgstr ""
 "��③荅���絨�臂ょ� %s ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
-#: src/dialogs.c:510 src/dialogs.c:511
+#: src/dialogs.c:489 src/dialogs.c:490
 msgid "Remove Group"
 msgstr "腱脂�ょ召腟�"
 
-#: src/dialogs.c:528
+#: src/dialogs.c:507
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1385,405 +1460,204 @@
 "篏����"
 
 # XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
-#: src/dialogs.c:531 src/dialogs.c:532
+#: src/dialogs.c:510 src/dialogs.c:511
 msgid "Remove Contact"
 msgstr "腱脂�ゅソ��"
 
-#: src/dialogs.c:680
+#: src/dialogs.c:659
 msgid "New Message"
 msgstr "�域���"
 
-#: src/dialogs.c:698
+#: src/dialogs.c:677
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "茫�莠後�ユ�����活��守���恰��荐����莟∞��絽活����\n"
 
-#: src/dialogs.c:714 src/dialogs.c:791
+#: src/dialogs.c:693 src/dialogs.c:770
 msgid "_Screenname:"
 msgstr "絽活��(_S)鐚�"
 
-#: src/dialogs.c:729 src/dialogs.c:807 src/gtkpounce.c:408
+#: src/dialogs.c:708 src/dialogs.c:786 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "絽活��(_A)鐚�"
 
-#: src/dialogs.c:760
+#: src/dialogs.c:739
 msgid "Get User Info"
 msgstr "��緇�篏睡����莖�荐�"
 
-#: src/dialogs.c:779
+#: src/dialogs.c:758
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "茫�莠後�ユ�����活��ヨ�絨�莟∞��絽活����\n"
 
-#: src/dialogs.c:906
-msgid "Add Group"
-msgstr "���ョ召腟�"
-
-#: src/dialogs.c:906
-msgid "Add a new group"
-msgstr "�医�臂ょ�"
-
-#: src/dialogs.c:907
-msgid "Please enter the name of the group to be added."
-msgstr "茫�腟����医���臂ょ�莠後�ュ��腮宴��"
-
-#: src/dialogs.c:909 src/gtkconv.c:1114 src/gtkconv.c:2955 src/gtkconv.c:4138
-#: src/gtkrequest.c:193 src/protocols/icq/gaim_icq.c:277
-#: src/protocols/oscar/oscar.c:2689 src/prpl.c:163
-msgid "Add"
-msgstr "����"
-
-#: src/dialogs.c:935 src/protocols/yahoo/yahoo.c:1565
-msgid "Add Buddy"
-msgstr "�医�絅遵�"
-
-#: src/dialogs.c:954
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�������荐㊤�絨���"
-"��ソ��羝���賢蕁�ず��\n"
-
-#: src/dialogs.c:973 src/gtkaccount.c:1624
-msgid "Screen Name"
-msgstr "絽活��"
-
-#: src/dialogs.c:986
-msgid "Alias"
-msgstr "�ュ��"
-
-#: src/dialogs.c:996
-msgid "Group"
-msgstr "臂ょ�"
-
-#. Set up stuff for the account box
-#: src/dialogs.c:1005
-msgid "Add To"
-msgstr "紜�����"
-
-#: src/dialogs.c:1325
-msgid "Add Chat"
-msgstr "�医���紊��"
-
-#: src/dialogs.c:1348
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr "茫�莠後�ュ�ュ��鐚��������惹�����喝���ュソ��羝�������紊�������区�荐���\n"
-
-#: src/dialogs.c:1357
-msgid "Account:"
-msgstr "絽活��鐚�"
-
-#: src/dialogs.c:1376 src/gtkaccount.c:450
-msgid "Alias:"
-msgstr "�ュ��鐚�"
-
-#: src/dialogs.c:1387
-msgid "Group:"
-msgstr "臂ょ�鐚�"
-
-#: src/dialogs.c:1466
-msgid "Set Directory Info"
-msgstr "荐㊤�篏睡����莖�荐�"
-
-#: src/dialogs.c:1474
-msgid "Directory Info"
-msgstr "����莖�荐�"
-
-#: src/dialogs.c:1484
-#, c-format
-msgid "Setting Dir Info for %s:"
-msgstr "荐㊤� %s ��篏睡����莖�荐�鐚�"
-
-#: src/dialogs.c:1497
-msgid "Allow Web Searches To Find Your Info"
-msgstr "��荐怨�� Web ��絨�箴�罟∵�������篋肴�荐�"
-
-#. Line 1
-#: src/dialogs.c:1500 src/dialogs.c:2063 src/protocols/oscar/oscar.c:3968
-#: src/protocols/trepia/trepia.c:299
-msgid "First Name"
-msgstr "��"
-
-# TODO: Untranslated
-# NOTE: ���㊥��茘����銀�����鐚�篏�筝㊥����罔h⑮篁��倶��お���
-#. Line 2
-#: src/dialogs.c:1511 src/dialogs.c:2073
-msgid "Middle Name"
-msgstr ""
-
-#. Line 3
-#: src/dialogs.c:1523 src/dialogs.c:2083 src/protocols/gg/gg.c:676
-#: src/protocols/oscar/oscar.c:3971 src/protocols/trepia/trepia.c:306
-msgid "Last Name"
-msgstr "紮�"
-
-# NOTE��絨����鎀ф�箙���札鐚�篏���Maiden Name����絽娯�����������������
-#. Line 4
-#: src/dialogs.c:1534 src/dialogs.c:2093
-msgid "Maiden Name"
-msgstr "���"
-
-#. Line 5
-#: src/dialogs.c:1545 src/dialogs.c:2103 src/protocols/gg/gg.c:704
-#: src/protocols/oscar/oscar.c:4017 src/protocols/oscar/oscar.c:4033
-#: src/protocols/trepia/trepia.c:363 src/protocols/trepia/trepia.c:462
-msgid "City"
-msgstr "���"
-
-#. Line 6
-#: src/dialogs.c:1556 src/dialogs.c:2112 src/protocols/oscar/oscar.c:4020
-#: src/protocols/oscar/oscar.c:4036 src/protocols/trepia/trepia.c:367
-#: src/protocols/trepia/trepia.c:471
-msgid "State"
-msgstr "���怨�"
-
-#. Line 7
-#: src/dialogs.c:1567 src/dialogs.c:2121 src/protocols/jabber/jabber.c:3731
-#: src/protocols/trepia/trepia.c:371 src/protocols/trepia/trepia.c:480
-msgid "Country"
-msgstr "��絎�"
-
-#: src/dialogs.c:1598 src/dialogs.c:1779 src/dialogs.c:2854 src/dialogs.c:3518
-#: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:4201
-#: src/protocols/trepia/trepia.c:378
-msgid "Save"
-msgstr "�峨�"
-
-#: src/dialogs.c:1621
-msgid "New passwords do not match."
-msgstr "�医�腆寂研筝��悟���"
-
-#: src/dialogs.c:1627
-msgid "Fill out all fields completely."
-msgstr "茫�絎�������茵��主��紂����"
-
-#: src/dialogs.c:1656 src/dialogs.c:1665 src/protocols/gg/gg.c:1198
-#: src/protocols/jabber/jabber.c:4420 src/protocols/oscar/oscar.c:6185
-#: src/protocols/toc/toc.c:1534
-msgid "Change Password"
-msgstr "篆��劫�腆�"
-
-#: src/dialogs.c:1672
-#, c-format
-msgid "Changing password for %s:"
-msgstr "篆��� %s ��絲�腆種�"
-
-#: src/dialogs.c:1680
-msgid "Original Password"
-msgstr "��絲�腆�"
-
-#: src/dialogs.c:1691
-msgid "New Password"
-msgstr "�医�腆�"
-
-#: src/dialogs.c:1702
-msgid "New Password (again)"
-msgstr "�医�腆種���罨∞∈茯�鐚�"
-
-#: src/dialogs.c:1742 src/protocols/jabber/jabber.c:4406
-#: src/protocols/oscar/oscar.c:6171 src/protocols/toc/toc.c:1522
+#: src/dialogs.c:852 src/protocols/jabber/jabber.c:974
+#: src/protocols/oscar/oscar.c:6408 src/protocols/toc/toc.c:1531
 msgid "Set User Info"
 msgstr "荐㊤�篏睡����莖�荐�"
 
-#: src/dialogs.c:1751
+#: src/dialogs.c:861
 #, c-format
 msgid "Changing info for %s:"
 msgstr "篆��� %s ��莖�荐�鐚�"
 
-#: src/dialogs.c:1839
-msgid "Below are the results of your search: "
-msgstr "篁ヤ����������ヨ���腟���鐚�"
-
-#: src/dialogs.c:1958
+#: src/dialogs.c:963
 msgid "Log Conversation"
 msgstr "荐���篋よ�"
 
-#: src/dialogs.c:2039 src/dialogs.c:2172
-msgid "Search for Buddy"
-msgstr "�上�絅遵�"
-
-#: src/dialogs.c:2139
-msgid "Find Buddy By Info"
-msgstr "篁ヨ�荐��上�絅遵�"
-
-#: src/dialogs.c:2166
-msgid "Find Buddy By Email"
-msgstr "篁ラ�糸��灸散�医��箴��上�絅遵�"
-
-#: src/dialogs.c:2179 src/protocols/jabber/jabber.c:3733
-#: src/protocols/yahoo/yahoo.c:2041
-msgid "Email"
-msgstr "�糸��灸散"
-
-#: src/dialogs.c:2270
+#: src/dialogs.c:1059
 msgid "Insert Link"
 msgstr "���ラ�g�"
 
-#: src/dialogs.c:2272
+#: src/dialogs.c:1061
 msgid "Insert"
 msgstr "����"
 
-#: src/dialogs.c:2291
+#: src/dialogs.c:1083
 msgid ""
 "Please enter the URL and description of the link that you want to insert.  "
 "The description is optional.\n"
 msgstr "茫�莠後�ユ����荀����ョ�� URL ��絎����颷逸��颷井���御���х��鐚������叱�ャ��\n"
 
-#: src/dialogs.c:2315 src/protocols/jabber/jabber.c:3725
+#: src/dialogs.c:1101 src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/jabber.c:594
 msgid "URL"
 msgstr "URL"
 
-#: src/dialogs.c:2325 src/gtkprefs.c:600 src/gtkprefs.c:1807
-#: src/protocols/jabber/jabber.c:3739
+#: src/dialogs.c:1111 src/gtkprefs.c:601 src/gtkprefs.c:1809
+#: src/protocols/jabber/buddy.c:271 src/protocols/jabber/buddy.c:744
 msgid "Description"
 msgstr "�颷�"
 
-#: src/dialogs.c:2460 src/dialogs.c:2477
+#: src/dialogs.c:1247 src/dialogs.c:1264
 msgid "Select Text Color"
 msgstr "荐㊤���絖�蕁��"
 
-#: src/dialogs.c:2512 src/dialogs.c:2529
+#: src/dialogs.c:1299 src/dialogs.c:1316
 msgid "Select Background Color"
 msgstr "頥㊤��������"
 
-#: src/dialogs.c:2626 src/dialogs.c:2652
+#: src/dialogs.c:1401 src/dialogs.c:1427
 msgid "Select Font"
 msgstr "�御��絖���"
 
-#: src/dialogs.c:2718
+#: src/dialogs.c:1493
 msgid "You cannot save an away message with a blank title"
 msgstr "����遵�峨�筝���羃����������∫��荐���"
 
-#: src/dialogs.c:2720
+#: src/dialogs.c:1495
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "茫�腟��荐������罔�蕁�鐚�������篏睡����箴�篏睡�������筝��峨�絎���"
 
-#: src/dialogs.c:2730
+#: src/dialogs.c:1505
 msgid "You cannot create an empty away message"
 msgstr "���≧�綮榊�筝���腥榊�順���∫��荐���"
 
-#: src/dialogs.c:2795 src/dialogs.c:2803
+#: src/dialogs.c:1570 src/dialogs.c:1578
 msgid "New away message"
 msgstr "�亥���∫��荐���"
 
-#: src/dialogs.c:2813
+#: src/dialogs.c:1588
 msgid "Away title: "
 msgstr "�∫������鐚�"
 
-#: src/dialogs.c:2858
+#: src/dialogs.c:1638
 msgid "Save & Use"
 msgstr "�峨�筝�戎��"
 
-#: src/dialogs.c:2862
+#: src/dialogs.c:1642
 msgid "Use"
 msgstr "篏睡��"
 
 #. show everything
-#: src/dialogs.c:3011
+#: src/dialogs.c:1791
 msgid "Smile!"
 msgstr "膃�筝���鐚�"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias Chat"
 msgstr "腟���紊���劫�ュ��"
 
-#: src/dialogs.c:3029
+#: src/dialogs.c:1809
 msgid "Alias chat"
 msgstr "腟���紊���劫�ュ��"
 
-#: src/dialogs.c:3030
+#: src/dialogs.c:1810
 msgid "Please enter an aliased name for this chat."
 msgstr "茫��咲������紊��莠後�ヤ����ュ����"
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:1841
 msgid "_Screenname"
 msgstr "絽活��(_S)"
 
-#: src/dialogs.c:3065 src/gtkblist.c:477 src/gtkblist.c:536
+#: src/dialogs.c:1846 src/gtkblist.c:523 src/gtkblist.c:616
 msgid "_Alias"
 msgstr "�ュ��(_A)"
 
-#: src/dialogs.c:3069
+#: src/dialogs.c:1850
 msgid "Alias Buddy"
 msgstr "�阪ソ����筝��ュ��"
 
-#: src/dialogs.c:3070
+#: src/dialogs.c:1851
 msgid "Alias buddy"
 msgstr "�阪ソ����筝��ュ��"
 
 # NOTE ����茘����荅我����馹���鐚��決����ュ����箴���絲���篏睡����羈�鐚�
 # NOTE 篏�������筝���篋阪��...���合�堺�亥��茘��...��
-#: src/dialogs.c:3071
+#: src/dialogs.c:1852
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list."
 msgstr "顇��咲����絅遵�荐㊤��ュ��鐚������贋�剛�鐚�絅刻���ソ��羝���賢��荐�����絽活����"
 
-#: src/dialogs.c:3107 src/dialogs.c:3114
+#: src/dialogs.c:1888 src/dialogs.c:1895
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "�≧�絲��ュ�� %s��"
 
-#: src/dialogs.c:3138
+#: src/dialogs.c:1919
 msgid "Save Log File"
 msgstr "�峨��ヨ�罟�"
 
-#: src/dialogs.c:3168
+#: src/dialogs.c:1949
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "�≧����ゆ�罅� %s��"
 
-#: src/dialogs.c:3187
+#: src/dialogs.c:1968
 msgid "Clear Log"
 msgstr "羝��ゆ�ヨ�"
 
-#: src/dialogs.c:3196
+#: src/dialogs.c:1977
 msgid "Really clear log?"
 msgstr "����荀�羝��ゆ�ヨ����"
 
-#: src/dialogs.c:3241 src/dialogs.c:3412
+#: src/dialogs.c:2022 src/dialogs.c:2193
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "�≧������ヨ�罟� %s��"
 
-#: src/dialogs.c:3389
+#: src/dialogs.c:2170
 #, c-format
 msgid "Conversations with %s"
 msgstr "�� %s ��篋よ�"
 
-#: src/dialogs.c:3391
+#: src/dialogs.c:2172
 msgid "System Log"
 msgstr "膤紫輝�ヨ�"
 
-#: src/dialogs.c:3433
+#: src/dialogs.c:2214 src/protocols/jabber/jabber.c:599
 msgid "Date"
 msgstr "�ユ��"
 
-#: src/dialogs.c:3490
+#: src/dialogs.c:2271
 msgid "Log"
 msgstr "�ヨ�"
 
-#: src/dialogs.c:3513
+#: src/dialogs.c:2294
 msgid "Clear"
 msgstr "羝���"
 
-#: src/dialogs.c:3552
-msgid "Rename Group"
-msgstr "篆��合召腟���腮�"
-
-#: src/dialogs.c:3552
-msgid "New group name"
-msgstr "�医��絖�"
-
-#: src/dialogs.c:3553
-msgid "Please enter a new name for the selected group."
-msgstr "茫��咲�後���臂ょ�莠後�ヤ����亥����腮宴��"
-
 #: src/ft.c:123
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -1895,15 +1769,15 @@
 msgid "boring default"
 msgstr "�∴��鐚���荐㍼�"
 
-#: src/gaimrc.c:1267 src/gtkblist.c:1600
+#: src/gaimrc.c:1267 src/gtkblist.c:1717
 msgid "Alphabetical"
 msgstr "箴��у�罸�"
 
-#: src/gaimrc.c:1269 src/gtkblist.c:1601
+#: src/gaimrc.c:1269 src/gtkblist.c:1718
 msgid "By status"
 msgstr "箴��х����"
 
-#: src/gaimrc.c:1271 src/gtkblist.c:1602
+#: src/gaimrc.c:1271 src/gtkblist.c:1719
 msgid "By log size"
 msgstr "箴��ф�ヨ�紊у�"
 
@@ -1912,7 +1786,7 @@
 msgid "Could not open config file %s."
 msgstr "�≧�����荐㊤�罟� %s��"
 
-#: src/gtkaccount.c:268
+#: src/gtkaccount.c:287
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1923,318 +1797,366 @@
 "<b>罟�罅�紊у�鐚�</b> %s\n"
 "<b>���鎞阪�鐚�</b> %d�%d"
 
-#: src/gtkaccount.c:299 src/protocols/oscar/oscar.c:3086
+#: src/gtkaccount.c:318 src/protocols/oscar/oscar.c:3067
 msgid "Buddy Icon"
 msgstr "絅遵���腓�"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:350
+#: src/gtkaccount.c:369
 msgid "Login Options"
 msgstr "�糸�ラ�檎��"
 
-#: src/gtkaccount.c:367
+#: src/gtkaccount.c:386
 msgid "Protocol:"
 msgstr "��荐���絎�鐚�"
 
-#: src/gtkaccount.c:372
+#: src/gtkaccount.c:391
 msgid "Screenname:"
 msgstr "絽活��鐚�"
 
-#: src/gtkaccount.c:445 src/main.c:299 src/protocols/irc/irc.c:126
+#: src/gtkaccount.c:464 src/main.c:310 src/protocols/irc/irc.c:161
+#: src/protocols/jabber/chat.c:55
 msgid "Password:"
 msgstr "絲�腆種�"
 
-#: src/gtkaccount.c:454
+#: src/gtkaccount.c:469 src/gtkblist.c:2680 src/gtkblist.c:2989
+msgid "Alias:"
+msgstr "�ュ��鐚�"
+
+#: src/gtkaccount.c:473
 msgid "Remember password"
 msgstr "荐�篏鎛�腆�"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:508
+#: src/gtkaccount.c:527
 msgid "User Options"
 msgstr "篏睡��������檎��"
 
-#: src/gtkaccount.c:521
+#: src/gtkaccount.c:540
 msgid "New mail notifications"
 msgstr "�育�灸散����"
 
-#: src/gtkaccount.c:530
+#: src/gtkaccount.c:549
 msgid "Buddy icon file:"
 msgstr "絅遵���腓堺�罅�鐚�"
 
-#: src/gtkaccount.c:539
+#: src/gtkaccount.c:558
 msgid "_Browse"
 msgstr "�頳�(_B)"
 
-#: src/gtkaccount.c:545
+#: src/gtkaccount.c:564
 msgid "_Reset"
 msgstr "��臀�(_R)"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:606
+#: src/gtkaccount.c:625
 #, c-format
 msgid "%s Options"
 msgstr "%s �檎��"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:727
+#: src/gtkaccount.c:746
 msgid "Use Global Proxy Settings"
 msgstr "篏睡��������篁g��篌堺����┃絎�"
 
 # NOTE ��札��篁g��篌堺�����罸�����
 # NOTE 薤�羝���������罸�����鐚�篏�茗���茯���罸�������筝�����鐚���筝�篏睡����莠�絅�
 #. No Proxy
-#: src/gtkaccount.c:734
+#: src/gtkaccount.c:753
 msgid "No Proxy"
 msgstr "筝�篏睡��撮��篌堺����"
 
 #. HTTP
-#: src/gtkaccount.c:741
+#: src/gtkaccount.c:760
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:748
+#: src/gtkaccount.c:767
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:755
+#: src/gtkaccount.c:774
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:762 src/gtkprefs.c:1107
+#: src/gtkaccount.c:781 src/gtkprefs.c:1112
 msgid "Use Environmental Settings"
 msgstr "篏睡���医�莅��梧┃絎�"
 
-#: src/gtkaccount.c:795
+#: src/gtkaccount.c:814
 msgid "you can see the butterflies mating"
 msgstr "藉�藉��頑�銀���緇�荀���"
 
-#: src/gtkaccount.c:799
+#: src/gtkaccount.c:818
 msgid "If you look real closely"
 msgstr "絋�������緇�紊�篁�膣�"
 
-#: src/gtkaccount.c:815
+#: src/gtkaccount.c:834
 msgid "Proxy Options"
 msgstr "篁g��篌堺�����檎��"
 
-#: src/gtkaccount.c:831 src/gtkprefs.c:1101
+#: src/gtkaccount.c:850 src/gtkprefs.c:1106
 msgid "Proxy _type:"
 msgstr "篁g��篌堺��������(_T)鐚�"
 
-#: src/gtkaccount.c:840
+#: src/gtkaccount.c:859
 msgid "_Host:"
 msgstr "筝紙�篏���(_H)鐚�"
 
-#: src/gtkaccount.c:844
+#: src/gtkaccount.c:863
 msgid "_Port:"
 msgstr "��荐���(_P)鐚�"
 
-#: src/gtkaccount.c:852
+#: src/gtkaccount.c:871
 msgid "_Username:"
 msgstr "篏睡����(_U)鐚�"
 
-#: src/gtkaccount.c:857
+#: src/gtkaccount.c:876
 msgid "Pa_ssword:"
 msgstr "絲�腆�(_S)鐚�"
 
-#: src/gtkaccount.c:1190
+#: src/gtkaccount.c:1208
 msgid "Add Account"
 msgstr "�医�絽活��"
 
-#: src/gtkaccount.c:1192
+#: src/gtkaccount.c:1210
 msgid "Modify Account"
 msgstr "篆��劫験��"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1216
+#: src/gtkaccount.c:1234
 msgid "Show more options"
 msgstr "蕁�ず莠�紊����檎��"
 
-#: src/gtkaccount.c:1217
+#: src/gtkaccount.c:1235
 msgid "Show fewer options"
 msgstr "蕁�ず莠�絨����檎��"
 
 #. Register button
-#: src/gtkaccount.c:1244
+#: src/gtkaccount.c:1262 src/protocols/jabber/jabber.c:612
 msgid "Register"
 msgstr "荐糸��"
 
-#: src/gtkaccount.c:1542
+#: src/gtkaccount.c:1607
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "��∈絎�荀����� %s鐚�"
 
-#: src/gtkaccount.c:1546 src/gtkrequest.c:192
+#: src/gtkaccount.c:1611 src/gtkrequest.c:206
 msgid "Delete"
 msgstr "����"
 
-#. state is one of our own strings. it won't be NULL.
-#: src/gtkaccount.c:1647 src/protocols/jabber/jabber.c:3531
-#: src/protocols/jabber/jabber.c:3581 src/protocols/oscar/oscar.c:2847
-#: src/protocols/oscar/oscar.c:4598 src/protocols/oscar/oscar.c:5911
-#: src/protocols/yahoo/yahoo.c:1431 src/protocols/zephyr/zephyr.c:873
-#: src/protocols/zephyr/zephyr.c:883
+#: src/gtkaccount.c:1724
+msgid "Screen Name"
+msgstr "絽活��"
+
+#: src/gtkaccount.c:1747 src/protocols/jabber/jabber.c:866
+#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:6063 src/protocols/yahoo/yahoo.c:2034
+#: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "筝�膩�"
 
-#: src/gtkaccount.c:1665
+#: src/gtkaccount.c:1765
 msgid "Protocol"
 msgstr "��荐���絎�"
 
-#: src/gtkblist.c:450
+#: src/gtkaccount.c:2055
+#, 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:2069
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
+
+#: src/gtkaccount.c:2073
+msgid "Gaim - Information"
+msgstr "Gaim - 莖�荐�"
+
+#: src/gtkaccount.c:2077
+msgid "Add buddy to your list?"
+msgstr "絨�篏睡�������ユ����絅遵�羝����"
+
+#: src/gtkaccount.c:2079 src/gtkblist.c:3037 src/gtkconv.c:1137
+#: src/gtkconv.c:3016 src/gtkconv.c:4190 src/gtkrequest.c:207
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2681
+msgid "Add"
+msgstr "����"
+
+#: src/gtkblist.c:496
 msgid "_Get Info"
 msgstr "��緇�莖�荐�(_G)"
 
-#: src/gtkblist.c:453
+#: src/gtkblist.c:499
 msgid "_IM"
 msgstr "�恰��荐���(_I)"
 
-#: src/gtkblist.c:455
+#: src/gtkblist.c:501
 msgid "Add Buddy _Pounce"
 msgstr "���ュソ����������(_P)"
 
-#: src/gtkblist.c:457
+#: src/gtkblist.c:503
 msgid "View _Log"
 msgstr "茹����ヨ�(_L)"
 
-#: src/gtkblist.c:479 src/gtkblist.c:538 src/gtkblist.c:548
+#: src/gtkblist.c:525 src/gtkblist.c:618 src/gtkblist.c:626
 msgid "_Remove"
 msgstr "腱脂��(_R)"
 
-#: src/gtkblist.c:517
+#: src/gtkblist.c:597
 msgid "Add a _Buddy"
 msgstr "�医�筝���絅遵�(_B)"
 
-#: src/gtkblist.c:519
+#: src/gtkblist.c:599
 msgid "Add a C_hat"
 msgstr "�医�筝�����紊��(_H)"
 
-#: src/gtkblist.c:521
+#: src/gtkblist.c:601
 msgid "_Delete Group"
 msgstr "���ょ召腟�(_D)"
 
-#: src/gtkblist.c:523
+#: src/gtkblist.c:603
 msgid "_Rename"
 msgstr "���遵��(_R)"
 
-#: src/gtkblist.c:531
+#: src/gtkblist.c:611
 msgid "_Join"
 msgstr "����(_J)"
 
-#: src/gtkblist.c:533
+#: src/gtkblist.c:613
 msgid "Auto-Join"
 msgstr "��������"
 
-#: src/gtkblist.c:544 src/gtkblist.c:575
+#: src/gtkblist.c:622 src/gtkblist.c:653
 msgid "_Collapse"
 msgstr "�区儀(_C)"
 
-#: src/gtkblist.c:580
+#: src/gtkblist.c:658
 msgid "_Expand"
 msgstr "絮���(_E)"
 
 #. Buddies menu
-#: src/gtkblist.c:1010
+#: src/gtkblist.c:1088
 msgid "/_Buddies"
 msgstr "/絅遵�(_B)"
 
-#: src/gtkblist.c:1011
+#: src/gtkblist.c:1089
 msgid "/Buddies/New _Instant Message..."
 msgstr "/絅遵�/�医�恰��荐���(_I)"
 
-#: src/gtkblist.c:1012
+#: src/gtkblist.c:1090
 msgid "/Buddies/Join a _Chat..."
 msgstr "/絅遵�/���ヨ��紊��(_C)"
 
-#: src/gtkblist.c:1013
+#: src/gtkblist.c:1091
 msgid "/Buddies/Get _User Info..."
 msgstr "/絅遵�/��緇�篏睡����莖�荐�(_U)"
 
-#: src/gtkblist.c:1015
+#: src/gtkblist.c:1093
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�(_O)"
 
-#: src/gtkblist.c:1016
+#: src/gtkblist.c:1094
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊�順��臂ょ�(_E)"
 
-#: src/gtkblist.c:1017
+#: src/gtkblist.c:1095
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/絅遵�/�医�筝���絅遵�(_A)"
 
-#: src/gtkblist.c:1018
+#: src/gtkblist.c:1096
 msgid "/Buddies/Add a C_hat..."
 msgstr "/絅遵�/�医�筝�����紊��(_H)"
 
-#: src/gtkblist.c:1019
+#: src/gtkblist.c:1097
 msgid "/Buddies/Add a _Group..."
 msgstr "/絅遵�/�医�筝���臂ょ�(_G)"
 
-#: src/gtkblist.c:1021
+#: src/gtkblist.c:1099
 msgid "/Buddies/_Signoff"
 msgstr "/絅遵�/�糸��(_S)"
 
-#: src/gtkblist.c:1022
+#: src/gtkblist.c:1100
 msgid "/Buddies/_Quit"
 msgstr "/絅遵�/腟���腮�綣�(_Q)"
 
 #. Tools
-#: src/gtkblist.c:1025
+#: src/gtkblist.c:1103
 msgid "/_Tools"
 msgstr "綏ュ��(_T)"
 
-#: src/gtkblist.c:1026
+#: src/gtkblist.c:1104
 msgid "/Tools/_Away"
 msgstr "/綏ュ��/�∫��(_A)"
 
-#: src/gtkblist.c:1027
+#: src/gtkblist.c:1105
 msgid "/Tools/Buddy _Pounce"
 msgstr "/綏ュ��/絅遵���������(_P)"
 
-#: src/gtkblist.c:1028
+#: src/gtkblist.c:1106
 msgid "/Tools/P_rotocol Actions"
 msgstr "/綏ュ��/��荐���絎��檎��荐㊤�(_R)"
 
-#: src/gtkblist.c:1030
+#: src/gtkblist.c:1108
 msgid "/Tools/A_ccounts"
 msgstr "/綏ュ��/絽活��羝���(_C)"
 
-#: src/gtkblist.c:1031
+#: src/gtkblist.c:1109
 msgid "/Tools/_File Transfers..."
 msgstr "/綏ュ��/罟�罅��活叱(_F)"
 
-#: src/gtkblist.c:1032
+#: src/gtkblist.c:1110
 msgid "/Tools/Preferences"
 msgstr "/綏ュ��/�鎁処┃絎�"
 
-#: src/gtkblist.c:1033
+#: src/gtkblist.c:1111
 msgid "/Tools/Pr_ivacy"
 msgstr "/綏ュ��/�援�荐㊤�(_I)"
 
-#: src/gtkblist.c:1035
+#: src/gtkblist.c:1113
 msgid "/Tools/View System _Log"
 msgstr "茹���膤紫輝�ヨ�(_L)"
 
 #. Help
-#: src/gtkblist.c:1038
+#: src/gtkblist.c:1116
 msgid "/_Help"
 msgstr "茯���(_H)"
 
-#: src/gtkblist.c:1039
+#: src/gtkblist.c:1117
 msgid "/Help/Online _Help"
 msgstr "膩�筝�茯���(_H)"
 
-#: src/gtkblist.c:1040
+#: src/gtkblist.c:1118
 msgid "/Help/_Debug Window"
 msgstr "/茯���/�ら���腦�(_D)"
 
-#: src/gtkblist.c:1041
+#: src/gtkblist.c:1119
 msgid "/Help/_About"
 msgstr "/茯���/����(_A)"
 
-#: src/gtkblist.c:1071
+#: src/gtkblist.c:1135
+msgid "Rename Group"
+msgstr "篆��合召腟���腮�"
+
+#: src/gtkblist.c:1135
+msgid "New group name"
+msgstr "�医��絖�"
+
+#: src/gtkblist.c:1136
+msgid "Please enter a new name for the selected group."
+msgstr "茫��咲�後���臂ょ�莠後�ヤ����亥����腮宴��"
+
+#: src/gtkblist.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -2243,16 +2165,16 @@
 "\n"
 "<b>絽活��鐚�</b>%s"
 
-#: src/gtkblist.c:1130 src/protocols/oscar/oscar.c:5498
+#: src/gtkblist.c:1224 src/protocols/oscar/oscar.c:5444
 msgid "<b>Status:</b> Offline"
 msgstr "<b>����鐚�</b>�∝�"
 
-#: src/gtkblist.c:1142
+#: src/gtkblist.c:1236
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:1156
+#: src/gtkblist.c:1250
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2260,7 +2182,7 @@
 "\n"
 "<b>絽活��鐚�</b>"
 
-#: src/gtkblist.c:1157
+#: src/gtkblist.c:1251
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2268,7 +2190,7 @@
 "\n"
 "<b>�ュ��鐚�</b>"
 
-#: src/gtkblist.c:1158
+#: src/gtkblist.c:1252
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2276,7 +2198,7 @@
 "\n"
 "<b>�援┗鐚�</b>"
 
-#: src/gtkblist.c:1159
+#: src/gtkblist.c:1253
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2284,7 +2206,7 @@
 "\n"
 "<b>��臀��</b>"
 
-#: src/gtkblist.c:1160
+#: src/gtkblist.c:1254
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2292,7 +2214,7 @@
 "\n"
 "<b>茘���鐚�<b>"
 
-#: src/gtkblist.c:1162
+#: src/gtkblist.c:1256
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2300,7 +2222,7 @@
 "\n"
 "<b>篁�膣刻�</b>綛初��篌主��"
 
-#: src/gtkblist.c:1163
+#: src/gtkblist.c:1257
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2308,7 +2230,7 @@
 "\n"
 "<b>����鐚�</b>���怨��"
 
-#: src/gtkblist.c:1164
+#: src/gtkblist.c:1258
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2316,81 +2238,129 @@
 "\n"
 "<b>����鐚�</b>���怨��"
 
-#: src/gtkblist.c:1418
+#: src/gtkblist.c:1514
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "��臀��%d 絨�� %d ����"
 
-#: src/gtkblist.c:1420
+#: src/gtkblist.c:1516
 #, c-format
 msgid "Idle (%dm) "
 msgstr "��臀��%d ��鐚�"
 
-#: src/gtkblist.c:1424
+#: src/gtkblist.c:1520
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%)"
 
-#: src/gtkblist.c:1427
+#: src/gtkblist.c:1523
 msgid "Offline "
 msgstr "�∝�"
 
-#: src/gtkblist.c:1599 src/gtkprefs.c:841 src/gtkprefs.c:1499
+#: src/gtkblist.c:1715 src/gtkprefs.c:842 src/gtkprefs.c:1501
 msgid "None"
 msgstr "��"
 
-#: src/gtkblist.c:1662
+#: src/gtkblist.c:1780
 msgid "/Tools/Away"
 msgstr "/綏ュ��/�∫��"
 
-#: src/gtkblist.c:1665
+#: src/gtkblist.c:1783
 msgid "/Tools/Buddy Pounce"
 msgstr "/綏ュ��/絅遵���������"
 
-#: src/gtkblist.c:1668
+#: src/gtkblist.c:1786
 msgid "/Tools/Protocol Actions"
 msgstr "/綏ュ��/��荐���絎��檎��荐㊤�"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1751
+#: src/gtkblist.c:1870
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�"
 
-#: src/gtkblist.c:1753
+#: src/gtkblist.c:1872
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊��絅順��臂ょ�"
 
-#: src/gtkblist.c:1771 src/gtkconv.c:1073
+#: src/gtkblist.c:1890 src/gtkconv.c:1096
 msgid "IM"
 msgstr "�恰��荐���"
 
-#: src/gtkblist.c:1777
+#: src/gtkblist.c:1896
 msgid "Send a message to the selected buddy"
 msgstr "�渇��荐���畿茴��後���絅遵�"
 
-#: src/gtkblist.c:1780 src/protocols/napster/napster.c:531
+#: src/gtkblist.c:1899 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "��緇�莖�荐�"
 
-#: src/gtkblist.c:1786
+#: src/gtkblist.c:1905
 msgid "Get information on the selected buddy"
 msgstr "��緇�茴��後�絅遵���莖�荐�"
 
-#: src/gtkblist.c:1789 src/protocols/oscar/oscar.c:3095
+#: src/gtkblist.c:1908 src/protocols/oscar/oscar.c:3076
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/gtkblist.c:1794
+#: src/gtkblist.c:1913
 msgid "Join a chat room"
 msgstr "���ヤ�����紊��"
 
-#: src/gtkblist.c:1802
+#: src/gtkblist.c:1921
 msgid "Set an away message"
 msgstr "荐㊤�筝����∫��荐���"
 
-#: src/gtkblist.c:2871
+#: src/gtkblist.c:2622 src/protocols/yahoo/yahoo.c:2168
+msgid "Add Buddy"
+msgstr "�医�絅遵�"
+
+#: src/gtkblist.c:2645
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�������荐㊤�絨���"
+"��ソ��羝���賢蕁�ず��\n"
+
+#: src/gtkblist.c:2667 src/main.c:292
+msgid "Screen Name:"
+msgstr "絽活��鐚�"
+
+#: src/gtkblist.c:2693 src/gtkblist.c:3000
+msgid "Group:"
+msgstr "臂ょ�鐚�"
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:2702 src/gtkblist.c:2971
+msgid "Account:"
+msgstr "絽活��鐚�"
+
+#: src/gtkblist.c:2938
+msgid "Add Chat"
+msgstr "�医���紊��"
+
+#: src/gtkblist.c:2961
+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:3034
+msgid "Add Group"
+msgstr "���ョ召腟�"
+
+#: src/gtkblist.c:3034
+msgid "Add a new group"
+msgstr "�医�臂ょ�"
+
+#: src/gtkblist.c:3035
+msgid "Please enter the name of the group to be added."
+msgstr "茫�腟����医���臂ょ�莠後�ュ��腮宴��"
+
+#: src/gtkblist.c:3547
 msgid "No actions available"
 msgstr "筝���荐延算篏���篏�"
 
@@ -2419,348 +2389,353 @@
 msgid "Reason Unknown."
 msgstr "���延�����"
 
-#: src/gtkconv.c:184
+#: src/gtkconv.c:185
 msgid "That file already exists"
 msgstr "�e��罟�罅�綏牙�絖���"
 
-#: src/gtkconv.c:185 src/gtkft.c:1034
+#: src/gtkconv.c:186 src/gtkft.c:1034
 msgid "Would you like to overwrite it?"
 msgstr "���荀���絎����"
 
-#: src/gtkconv.c:280
+#: src/gtkconv.c:241
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "�≧��峨�綵怨���%s\n"
+
+#: src/gtkconv.c:303
 msgid "Gaim - Insert Image"
 msgstr "Gaim - ���ュ襲��"
 
-#: src/gtkconv.c:584
+#: src/gtkconv.c:607
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - ��茫�絅遵��峨�ヨ��紊��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:612
+#: src/gtkconv.c:635
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "茫�莠後�ユ���渇��茫���篏睡������腮縁�篁ュ���茫���荐�����"
 
-#: src/gtkconv.c:633
+#: src/gtkconv.c:656
 msgid "_Buddy:"
 msgstr "絅遵�(_B)鐚�"
 
-#: src/gtkconv.c:653
+#: src/gtkconv.c:676
 msgid "_Message:"
 msgstr "荐���(_M)鐚�"
 
-#: src/gtkconv.c:1081
+#: src/gtkconv.c:1104
 msgid "Un-Ignore"
 msgstr "��羔�綽順�ヤ戎����"
 
-#: src/gtkconv.c:1083 src/gtkprefs.c:773
+#: src/gtkconv.c:1106 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "綽順�ヤ戎����"
 
 # XXX��Info����篏���室箙����緇�篏睡����莖�荐�鐚�篏�筝����鐚���篋��銀�po罟�篁������������藝�
 # XXX javajsp (Ka-Hing CHEUNG) 荀�������Info����膣����醇������緇�篏睡����莖�荐���
 #. Info button
-#: src/gtkconv.c:1092 src/gtkconv.c:2978
+#: src/gtkconv.c:1115 src/gtkconv.c:3039
 msgid "Info"
 msgstr "��緇�莖�荐�"
 
-#: src/gtkconv.c:1101 src/protocols/jabber/jabber.c:3493
+#: src/gtkconv.c:1124
 msgid "Get Away Msg"
 msgstr "��緇��∝�荐���"
 
-#: src/gtkconv.c:1112 src/gtkconv.c:2961 src/gtkconv.c:4123
-#: src/gtkrequest.c:194
+#: src/gtkconv.c:1135 src/gtkconv.c:3022 src/gtkconv.c:4175
+#: src/gtkrequest.c:208
 msgid "Remove"
 msgstr "腱脂��"
 
-#: src/gtkconv.c:2187
+#: src/gtkconv.c:2247
 msgid "User is typing..."
 msgstr "篏睡����罩e��叱��..."
 
-#: src/gtkconv.c:2195
+#: src/gtkconv.c:2255
 msgid "User has typed something and paused"
 msgstr "篏睡����莠後�ヤ�篋��沿タ鐚�筝�����������莠後��"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2297
+#: src/gtkconv.c:2358
 msgid "_Send As"
 msgstr "篏睡��験��(_S)"
 
-#: src/gtkconv.c:2757
+#: src/gtkconv.c:2818
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - �峨���紊��у�"
 
 #. Conversation menu
-#: src/gtkconv.c:2774
+#: src/gtkconv.c:2835
 msgid "/_Conversation"
 msgstr "/篋よ�(_C)"
 
-#: src/gtkconv.c:2776
+#: src/gtkconv.c:2837
 msgid "/Conversation/_Save As..."
 msgstr "/篋よ�/����井�(_S)..."
 
-#: src/gtkconv.c:2778
+#: src/gtkconv.c:2839
 msgid "/Conversation/View _Log..."
 msgstr "/篋よ�/茹���罩桁兓���(_L)"
 
-#: src/gtkconv.c:2782
+#: src/gtkconv.c:2843
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/篋よ�/�医�絅遵���������(_P)..."
 
-#: src/gtkconv.c:2784
+#: src/gtkconv.c:2845
 msgid "/Conversation/A_lias..."
 msgstr "/篋よ�/�ュ��(_L)..."
 
-#: src/gtkconv.c:2786
+#: src/gtkconv.c:2847
 msgid "/Conversation/_Get Info..."
 msgstr "/篋よ�/��緇�莖�荐�(_G)..."
 
-#: src/gtkconv.c:2788
+#: src/gtkconv.c:2849
 msgid "/Conversation/In_vite..."
 msgstr "/篋よ�/��茫�(_V)..."
 
-#: src/gtkconv.c:2793
+#: src/gtkconv.c:2854
 msgid "/Conversation/Insert _URL..."
 msgstr "/篋よ�/���� URL(_U)"
 
-#: src/gtkconv.c:2795
+#: src/gtkconv.c:2856
 msgid "/Conversation/Insert _Image..."
 msgstr "/篋よ�/���ュ襲��(_I)"
 
-#: src/gtkconv.c:2800
+#: src/gtkconv.c:2861
 msgid "/Conversation/_Warn..."
 msgstr "/篋よ�/茘���(_W)..."
 
-#: src/gtkconv.c:2802
+#: src/gtkconv.c:2863
 msgid "/Conversation/_Block..."
 msgstr "/篋よ�/絨���(_B)..."
 
-#: src/gtkconv.c:2804
+#: src/gtkconv.c:2865
 msgid "/Conversation/_Add..."
 msgstr "/篋よ�/�医�(_A)..."
 
-#: src/gtkconv.c:2806
+#: src/gtkconv.c:2867
 msgid "/Conversation/_Remove..."
 msgstr "/篋よ�/腱脂��(_R)..."
 
-#: src/gtkconv.c:2811
+#: src/gtkconv.c:2872
 msgid "/Conversation/_Close"
 msgstr "/篋よ�/����(_C)"
 
 #. Options
-#: src/gtkconv.c:2815
+#: src/gtkconv.c:2876
 msgid "/_Options"
 msgstr "/�檎��(_O)"
 
-#: src/gtkconv.c:2816
+#: src/gtkconv.c:2877
 msgid "/Options/Enable _Logging"
 msgstr "/�檎��/��紮�荐����ヨ�(_L)"
 
-#: src/gtkconv.c:2817
+#: src/gtkconv.c:2878
 msgid "/Options/Enable _Sounds"
 msgstr "/�檎��/�����恰��(_S)"
 
-#: src/gtkconv.c:2857
+#: src/gtkconv.c:2918
 msgid "/Conversation/View Log..."
 msgstr "/篋よ�/茹���罩桁兓���"
 
-#: src/gtkconv.c:2862
+#: src/gtkconv.c:2923
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/篋よ�/�医�絅遵���������..."
 
-#: src/gtkconv.c:2866
+#: src/gtkconv.c:2927
 msgid "/Conversation/Alias..."
 msgstr "/篋よ�/�ュ��..."
 
-#: src/gtkconv.c:2870
+#: src/gtkconv.c:2931
 msgid "/Conversation/Get Info..."
 msgstr "/篋よ�/��緇�莖�荐�..."
 
-#: src/gtkconv.c:2874
+#: src/gtkconv.c:2935
 msgid "/Conversation/Invite..."
 msgstr "/篋よ�/��茫�..."
 
-#: src/gtkconv.c:2880
+#: src/gtkconv.c:2941
 msgid "/Conversation/Insert URL..."
 msgstr "/篋よ�/���� URL..."
 
-#: src/gtkconv.c:2884
+#: src/gtkconv.c:2945
 msgid "/Conversation/Insert Image..."
 msgstr "/篋よ�/���ュ襲��..."
 
-#: src/gtkconv.c:2890
+#: src/gtkconv.c:2951
 msgid "/Conversation/Warn..."
 msgstr "/篋よ�/茘���..."
 
-#: src/gtkconv.c:2894
+#: src/gtkconv.c:2955
 msgid "/Conversation/Block..."
 msgstr "/篋よ�/絨���..."
 
-#: src/gtkconv.c:2898
+#: src/gtkconv.c:2959
 msgid "/Conversation/Add..."
 msgstr "/篋よ�/�医�..."
 
-#: src/gtkconv.c:2902
+#: src/gtkconv.c:2963
 msgid "/Conversation/Remove..."
 msgstr "/篋よ�/腱脂��..."
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:2969
 msgid "/Options/Enable Logging"
 msgstr "/�檎��/��紮�荐����ヨ�"
 
-#: src/gtkconv.c:2911
+#: src/gtkconv.c:2972
 msgid "/Options/Enable Sounds"
 msgstr "/�檎��/�����恰��"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2935 src/gtkconv.c:2937 src/gtkconv.c:3035 src/gtkconv.c:3037
-#: src/gtkconv.c:5918
+#: src/gtkconv.c:2996 src/gtkconv.c:2998 src/gtkconv.c:3096 src/gtkconv.c:3098
+#: src/gtkconv.c:5957
 msgid "Send"
 msgstr "����"
 
-#: src/gtkconv.c:2958 src/gtkconv.c:4141
+#: src/gtkconv.c:3019 src/gtkconv.c:4193
 msgid "Add the user to your buddy list"
 msgstr "絨�篏睡�������ユ����絅遵�羝���"
 
-#: src/gtkconv.c:2964 src/gtkconv.c:4126
+#: src/gtkconv.c:3025 src/gtkconv.c:4178
 msgid "Remove the user from your buddy list"
 msgstr "絨�篏睡����������絅遵�羝���賢腱脂��"
 
 #. Warn button
-#: src/gtkconv.c:2971
+#: src/gtkconv.c:3032
 msgid "Warn"
 msgstr "茘���"
 
-#: src/gtkconv.c:2975
+#: src/gtkconv.c:3036
 msgid "Warn the user"
 msgstr "茘���篏睡����"
 
-#: src/gtkconv.c:2982 src/gtkconv.c:3417
+#: src/gtkconv.c:3043 src/gtkconv.c:3478
 msgid "Get the user's information"
 msgstr "��緇�篏睡����莖�荐�"
 
 #. Block button
-#: src/gtkconv.c:2985 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3046 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "絨���"
 
-#: src/gtkconv.c:2989
+#: src/gtkconv.c:3050
 msgid "Block the user"
 msgstr "絨���篏睡����"
 
 #. Invite
-#: src/gtkconv.c:3047 src/gtkconv.c:5921
+#: src/gtkconv.c:3108 src/gtkconv.c:5960
 msgid "Invite"
 msgstr "��茫�"
 
-#: src/gtkconv.c:3050
+#: src/gtkconv.c:3111
 msgid "Invite a user"
 msgstr "��茫�篏睡����"
 
-#: src/gtkconv.c:3089
+#: src/gtkconv.c:3150
 msgid "Bold"
 msgstr "膕�蕭�"
 
-#: src/gtkconv.c:3100
+#: src/gtkconv.c:3161
 msgid "Italic"
 msgstr "��蕭�"
 
-#: src/gtkconv.c:3111
+#: src/gtkconv.c:3172
 msgid "Underline"
 msgstr "綺�膩�"
 
-#: src/gtkconv.c:3127
+#: src/gtkconv.c:3188
 msgid "Larger font size"
 msgstr "�上ぇ絖�蕭�"
 
-#: src/gtkconv.c:3139
+#: src/gtkconv.c:3200
 msgid "Normal font size"
 msgstr "罩e幻絖�蕭�"
 
-#: src/gtkconv.c:3151
+#: src/gtkconv.c:3212
 msgid "Smaller font size"
 msgstr "膰��絖�蕭�"
 
-#: src/gtkconv.c:3168
+#: src/gtkconv.c:3229
 msgid "Font Face"
 msgstr "絖���"
 
-#: src/gtkconv.c:3180
+#: src/gtkconv.c:3241
 msgid "Foreground font color"
 msgstr "�������"
 
-#: src/gtkconv.c:3192
+#: src/gtkconv.c:3253
 msgid "Background color"
 msgstr "�������"
 
-#: src/gtkconv.c:3207
+#: src/gtkconv.c:3268
 msgid "Insert image"
 msgstr "���ュ襲��"
 
-#: src/gtkconv.c:3218
+#: src/gtkconv.c:3279
 msgid "Insert link"
 msgstr "���ラ�g�"
 
-#: src/gtkconv.c:3229
+#: src/gtkconv.c:3290
 msgid "Insert smiley"
 msgstr "���ヨ;��"
 
-#: src/gtkconv.c:3286
+#: src/gtkconv.c:3347
 msgid "Topic:"
 msgstr "筝脂�鐚�"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3337
+#: src/gtkconv.c:3398
 msgid "0 people in room"
 msgstr "羃���篋阪�������翠��"
 
-#: src/gtkconv.c:3394
+#: src/gtkconv.c:3455
 msgid "IM the user"
 msgstr "���阪�恰��荐���畿篏睡����"
 
-#: src/gtkconv.c:3406
+#: src/gtkconv.c:3467
 msgid "Ignore the user"
 msgstr "綽順�ヤ戎����"
 
-#: src/gtkconv.c:3908 src/server.c:1393
+#: src/gtkconv.c:3961 src/server.c:1380
 #, c-format
 msgid "<HR><BR><H3 Align=Center> ---- New Conversation @ %s ----</H3><BR>\n"
 msgstr "<HR><BR><H3 Align=Center> ---- �� %s ���遺困茫� ----</H3><BR>\n"
 
-#: src/gtkconv.c:3912 src/server.c:1396
+#: src/gtkconv.c:3965 src/server.c:1383
 #, c-format
 msgid "---- New Conversation @ %s ----\n"
 msgstr "---- �� %s ���遺困茫� ----\n"
 
-#: src/gtkconv.c:3945
+#: src/gtkconv.c:3998
 msgid "Close conversation"
 msgstr "����篋よ�"
 
-#: src/gtkconv.c:4619 src/gtkconv.c:4651 src/gtkconv.c:4772 src/gtkconv.c:4839
+#: src/gtkconv.c:4682 src/gtkconv.c:4714 src/gtkconv.c:4835 src/gtkconv.c:4902
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ��篋阪�������翠��"
 
-#: src/gtkconv.c:5188
+#: src/gtkconv.c:5224
 msgid "Disable Animation"
 msgstr "��������"
 
-#: src/gtkconv.c:5197
+#: src/gtkconv.c:5233
 msgid "Enable Animation"
 msgstr "��������"
 
-#: src/gtkconv.c:5204
+#: src/gtkconv.c:5240
 msgid "Hide Icon"
 msgstr "�沿���霚�"
 
-#: src/gtkconv.c:5210
+#: src/gtkconv.c:5246
 msgid "Save Icon As..."
 msgstr "�峨���腓榊��..."
 
-#: src/gtkconv.c:5688 src/gtkconv.c:5691
+#: src/gtkconv.c:5727 src/gtkconv.c:5730
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/篋よ�/����"
 
@@ -2868,7 +2843,7 @@
 msgid "Gaim - Open..."
 msgstr "Gaim - ����..."
 
-#: src/gtkft.c:1060 src/protocols/toc/toc.c:2030
+#: src/gtkft.c:1060 src/protocols/toc/toc.c:2041
 msgid "Gaim - Save As..."
 msgstr "Gaim - �峨���..."
 
@@ -2877,51 +2852,56 @@
 msgid "%s wants to send you %s (%s)"
 msgstr "%s �活��� %s (%s) 腟���"
 
-#: src/gtkimhtml.c:529
+# XXX
+#: src/gtkimhtml.c:535
+msgid "_Copy E-Mail Address"
+msgstr "茲�茖初�脂�球�医��(_C)"
+
+#: src/gtkimhtml.c:547
 msgid "_Copy Link Location"
 msgstr "茲�茖初�g�篏���(_C)"
 
-#: src/gtkimhtml.c:536
+#: src/gtkimhtml.c:557
 msgid "_Open Link in Browser"
 msgstr "���頳遵��賢�����g�(_O)"
 
 # NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
-#: src/gtkimhtml.c:1652
+#: src/gtkimhtml.c:1639
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr "Gaim �≧�箴��у�����箴��ゅ�ュ襲��弢�鐚�����倶�� PNG 罟�������"
 
-#: src/gtkimhtml.c:1660
+#: src/gtkimhtml.c:1647
 #, c-format
 msgid "Error saving image: %s"
 msgstr "�峨�綵怨����鐚�%s"
 
-#: src/gtkimhtml.c:1669
+#: src/gtkimhtml.c:1656
 msgid "Save Image"
 msgstr "�峨�綵怨��"
 
-#: src/gtkimhtml.c:1691
+#: src/gtkimhtml.c:1679
 msgid "_Save Image..."
 msgstr "�峨�綵怨��(_S)..."
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:209
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s �� %d 絨��育�灸散��"
 
-#: src/gtknotify.c:211
+#: src/gtknotify.c:217
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">箴����</span> %s\n"
 
-#: src/gtknotify.c:216
+#: src/gtknotify.c:222
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">筝脂�鐚�</span> %s\n"
 
-#: src/gtknotify.c:220
+#: src/gtknotify.c:226
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2932,7 +2912,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:235
+#: src/gtknotify.c:241
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -2943,6 +2923,25 @@
 "\n"
 "%s"
 
+#: src/gtknotify.c:412 src/gtknotify.c:432 src/gtknotify.c:440
+msgid "Unable to open URL"
+msgstr "�≧�����膓臥��"
+
+#: src/gtknotify.c:413
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "���悟�����篏睡��������頳遵����鐚��紙����荐㊤���篁ゃ��"
+
+#: src/gtknotify.c:430
+#, c-format
+msgid "The browser \"%s\" is invalid."
+msgstr "�頳遵����%s�����≧������"
+
+#: src/gtknotify.c:437
+#, c-format
+msgid "Error launching \"command\": %s"
+msgstr "�決�����篁ゃ�����主��篋����鐚�%s"
+
 #: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "�御��罟�罅�"
@@ -2974,7 +2973,7 @@
 msgid "Pounce When"
 msgstr "����篁�藝惹┌������"
 
-#: src/gtkpounce.c:457 src/main.c:331
+#: src/gtkpounce.c:457 src/main.c:342
 msgid "Sign on"
 msgstr "�糸��"
 
@@ -2986,8 +2985,8 @@
 msgid "Return from away"
 msgstr "�演�∫��菴���"
 
-#: src/gtkpounce.c:465 src/gtkprefs.c:1496 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:1427
+#: src/gtkpounce.c:465 src/gtkprefs.c:1498 src/protocols/msn/state.c:30
+#: src/protocols/yahoo/yahoo.c:2030
 msgid "Idle"
 msgstr "��臀�"
 
@@ -3032,7 +3031,7 @@
 msgid "Browse"
 msgstr "�頳�"
 
-#: src/gtkpounce.c:518 src/gtkprefs.c:2085
+#: src/gtkpounce.c:518 src/gtkprefs.c:2087
 msgid "Test"
 msgstr "羝��"
 
@@ -3084,15 +3083,15 @@
 msgid "Unknown pounce event. Please report this!"
 msgstr "���ョ������篋�篁吟��茫����演�����馹�鐚�"
 
-#: src/gtkprefs.c:377
+#: src/gtkprefs.c:373
 msgid "Interface Options"
 msgstr "篁��∫�檎��"
 
-#: src/gtkprefs.c:379
+#: src/gtkprefs.c:375
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "�九�ュ��羃���荐㊤���鐚�篁ュ��号��荐㊤����援┗蕁�ず(_I)"
 
-#: src/gtkprefs.c:560
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3100,155 +3099,154 @@
 "����∝��羝���賢�後�筝��������喝��罩∞��茵���筝脂������札�����括���劫�絨��亥��茵���筝脂�"
 "絎�茖��井���賢��"
 
-#: src/gtkprefs.c:593
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "��腓�"
 
-#: src/gtkprefs.c:667
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "蘂���"
 
-#: src/gtkprefs.c:668
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "膕�蕭�(_B)"
 
-#: src/gtkprefs.c:670
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "��蕭�(_I)"
 
-#: src/gtkprefs.c:672
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "綺�膩�(_U)"
 
-#: src/gtkprefs.c:674
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "���ょ����絖�(_S)"
 
-#: src/gtkprefs.c:677
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "絖�蕭�"
 
-#: src/gtkprefs.c:680
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "篏睡�������絖�蕭�(_M)"
 
-#: src/gtkprefs.c:697
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "篏睡�������絖�蕭�紊у�(_Z)"
 
-#: src/gtkprefs.c:710
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "蕁��"
 
-#: src/gtkprefs.c:714
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "��鎕�蕁��(_T)"
 
-#: src/gtkprefs.c:733
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "�������(_K)"
 
-#: src/gtkprefs.c:761 src/gtkprefs.c:998 src/gtkprefs.c:1051
+#: src/gtkprefs.c:762 src/gtkprefs.c:1003 src/gtkprefs.c:1056
 msgid "Display"
 msgstr "蕁�ず"
 
-#: src/gtkprefs.c:762
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "蕁�ず茵���(_S)"
 
-#: src/gtkprefs.c:764
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "蕁�ず荐�������(_T)"
 
-#: src/gtkprefs.c:766
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "蕁�ず URL �肴��g�(_U)"
 
-#: src/gtkprefs.c:770
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "罔�腓阪�堺�守����絖�(_H)"
 
-#: src/gtkprefs.c:774
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "綽順�ラ���(_O)"
 
-#: src/gtkprefs.c:776
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "綽順�ュ�蕭�(_F)"
 
-#: src/gtkprefs.c:778
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "綽順�ュ�蕭�紊у�(_Z)"
 
-#: src/gtkprefs.c:791
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "���肴���"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:793
 msgid "Enter _sends message"
 msgstr "��筝� Enter ���肴���(_S)"
 
-#: src/gtkprefs.c:794
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr "��筝� Ctrl-Enter ���肴���(_O)"
 
-#: src/gtkprefs.c:797
+#: src/gtkprefs.c:798
 msgid "Window Closing"
 msgstr "荀�腦�����"
 
-#: src/gtkprefs.c:798
+#: src/gtkprefs.c:799
 msgid "_Escape closes window"
 msgstr "��筝� Escape ����荀�腦�(_E)"
 
-#: src/gtkprefs.c:801
+#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "���ラ�檎��"
 
-#: src/gtkprefs.c:802
+#: src/gtkprefs.c:803
 msgid "Control-{B/I/U} inserts _HTML tags"
 msgstr "��筝� Ctrl-{B/I/U} ���� HTML 罔�膠�(_H)"
 
-#: src/gtkprefs.c:804
+#: src/gtkprefs.c:805
 msgid "Control-(number) _inserts smileys"
 msgstr "��筝� CTRL-(�後���) ���ヨ;��(_I)"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:822
 msgid "Buddy List Sorting"
 msgstr "絅遵�羝����綺�"
 
-#: src/gtkprefs.c:830
+#: src/gtkprefs.c:831
 msgid "Sorting:"
 msgstr "������綺�婧�鐚�"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr "絅遵�羝���轡�桁��"
 
-#: src/gtkprefs.c:836 src/gtkprefs.c:968 src/gtkprefs.c:1024
+#: src/gtkprefs.c:837 src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "Show _buttons as:"
 msgstr "蕁�ず���窮��(_B)鐚�"
 
-#: src/gtkprefs.c:838 src/gtkprefs.c:970 src/gtkprefs.c:1026
+#: src/gtkprefs.c:839 src/gtkprefs.c:975 src/gtkprefs.c:1031
 msgid "Pictures"
 msgstr "��綵�"
 
-#: src/gtkprefs.c:839 src/gtkprefs.c:971 src/gtkprefs.c:1027
+#: src/gtkprefs.c:840 src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "Text"
 msgstr "��絖�"
 
-#: src/gtkprefs.c:840 src/gtkprefs.c:972 src/gtkprefs.c:1028
+#: src/gtkprefs.c:841 src/gtkprefs.c:977 src/gtkprefs.c:1033
 msgid "Pictures and text"
 msgstr "��綵∵����絖�"
 
-#: src/gtkprefs.c:845 src/gtkprefs.c:986 src/gtkprefs.c:1042
+#: src/gtkprefs.c:846 src/gtkprefs.c:991 src/gtkprefs.c:1047
 msgid "_Raise window on events"
 msgstr "�銀�篁句�主����鐚�絨�荀�腦����井��筝���(_R)"
 
-#: src/gtkprefs.c:848
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr "臂ょ�蕁�ず"
 
-#. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
 #: src/gtkprefs.c:850
 msgid "Show _numbers in groups"
 msgstr "蕁�ず臂ょ�茖∞��絅遵�/��紊���悟��(_N)"
@@ -3257,7 +3255,7 @@
 msgid "Buddy Display"
 msgstr "絅遵�蕁�ず"
 
-#: src/gtkprefs.c:854 src/gtkprefs.c:993
+#: src/gtkprefs.c:854 src/gtkprefs.c:998
 msgid "Show buddy _icons"
 msgstr "蕁�ず絅遵���腓�(_I)"
 
@@ -3273,187 +3271,186 @@
 msgid "Dim i_dle buddies"
 msgstr "����臀���絅遵�荐㊦�榊�域��(_D)"
 
-#: src/gtkprefs.c:897
+#: src/gtkprefs.c:898
 msgid "_Placement:"
 msgstr "篏�臀�(_P)鐚�"
 
-#: src/gtkprefs.c:906
+#: src/gtkprefs.c:905
 msgid "Send _URLs as Links"
 msgstr "���� URL �肴��g�(_U)"
 
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:908
 msgid "Tab Options"
 msgstr "罔�膠ら�檎��"
 
-#: src/gtkprefs.c:911
+#: src/gtkprefs.c:910
 msgid "_Tab Placement:"
 msgstr "罔�膠や�臀�(_T)鐚�"
 
-#: src/gtkprefs.c:913
+#: src/gtkprefs.c:912
 msgid "Top"
 msgstr "荀�腦�筝���"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:913
 msgid "Bottom"
 msgstr "荀�腦�筝���"
 
-#: src/gtkprefs.c:915
+#: src/gtkprefs.c:914
 msgid "Left"
 msgstr "荀�腦�綏���"
 
-#: src/gtkprefs.c:916
+#: src/gtkprefs.c:915
 msgid "Right"
 msgstr "荀�腦��喝��"
 
-#: src/gtkprefs.c:922
+#: src/gtkprefs.c:921
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "篏睡���膠よ�腦�蕁�ず�恰��荐�������紊�(_T)"
 
-#. XXX: grey this out when the above is unchecked
-#: src/gtkprefs.c:926
+#: src/gtkprefs.c:924
 msgid "Show IMs and chats in _same tabbed window"
 msgstr "篏睡����筝���罔�膠よ�腦�蕁�ず�恰��荐�������紊�(_S)"
 
-#: src/gtkprefs.c:929
+#: src/gtkprefs.c:934
 msgid "Show _close button on tabs"
 msgstr "���膠や�蕁�ず������(_C)"
 
-#: src/gtkprefs.c:940
+#: src/gtkprefs.c:945
 msgid "Show status _icons on tabs"
 msgstr "���膠や�蕁�ず絅遵�����(_I)"
 
-#: src/gtkprefs.c:967 src/gtkprefs.c:1023
+#: src/gtkprefs.c:972 src/gtkprefs.c:1028
 msgid "Window"
 msgstr "荀�腦�"
 
-#: src/gtkprefs.c:977 src/gtkprefs.c:1033
+#: src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "New window _width:"
 msgstr "�域�腦�絲�墾(_W)鐚�"
 
-#: src/gtkprefs.c:980 src/gtkprefs.c:1036
+#: src/gtkprefs.c:985 src/gtkprefs.c:1041
 msgid "New window _height:"
 msgstr "�域�腦�蕭�綺�(_H)鐚�"
 
-#: src/gtkprefs.c:983 src/gtkprefs.c:1039
+#: src/gtkprefs.c:988 src/gtkprefs.c:1044
 msgid "_Entry field height:"
 msgstr "莠後�ユ�蕭�綺�(_E)鐚�"
 
-#: src/gtkprefs.c:988
+#: src/gtkprefs.c:993
 msgid "Hide window on _send"
 msgstr "���肴��������荀�腦�(_S)"
 
-#: src/gtkprefs.c:992
+#: src/gtkprefs.c:997
 msgid "Buddy Icons"
 msgstr "絅遵���腓�"
 
-#: src/gtkprefs.c:995
+#: src/gtkprefs.c:1000
 msgid "Enable buddy icon a_nimation"
 msgstr "����絅遵���腓阪����(_N)"
 
-#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1004
 msgid "Show _logins in window"
 msgstr "���腦�筝㊨¨腓榊�糸�ヨ���(_L)"
 
-#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:1006
 msgid "Show a_liases in tabs/titles"
 msgstr "���蕁���罔�膠や�蕁�ず�ュ��(_L)"
 
-#: src/gtkprefs.c:1004
+#: src/gtkprefs.c:1009
 msgid "Typing Notification"
 msgstr "莠後�ラ����"
 
-#: src/gtkprefs.c:1005
+#: src/gtkprefs.c:1010
 msgid "Notify buddies that you are _typing to them"
 msgstr "���ユ����絅遵���③���取���畿篁���(_T)"
 
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:1050
 msgid "Tab Completion"
 msgstr "Tab Completion"
 
-#: src/gtkprefs.c:1046
+#: src/gtkprefs.c:1051
 msgid "_Tab-complete nicks"
 msgstr "篏睡�� Tab �球巷��叱�ユ�援┗(_T)"
 
-#: src/gtkprefs.c:1048
+#: src/gtkprefs.c:1053
 msgid "_Old-style tab completion"
 msgstr "��綣� Tab Completion (_O)"
 
-#: src/gtkprefs.c:1052
+#: src/gtkprefs.c:1057
 msgid "_Show people joining in window"
 msgstr "���腦�筝㊨¨腓阪�銀�篋咲�峨�ョ��篋�篁�(_S)"
 
-#: src/gtkprefs.c:1054
+#: src/gtkprefs.c:1059
 msgid "_Show people leaving in window"
 msgstr "���腦�筝㊨¨腓阪�銀�篋咲�∫����篋�篁�(_S)"
 
-#: src/gtkprefs.c:1056
+#: src/gtkprefs.c:1061
 msgid "Co_lorize screennames"
 msgstr "絨�絽活��篁ラ��峨����(_L)"
 
-#: src/gtkprefs.c:1100
+#: src/gtkprefs.c:1105
 msgid "Proxy Type"
 msgstr "篁g��篌堺��������"
 
 # NOTE ���怨����鐚�筝�����罸�����鐚��合�冴��筝�篏睡����
-#: src/gtkprefs.c:1103
+#: src/gtkprefs.c:1108
 msgid "No proxy"
 msgstr "筝�篏睡��撮��篌堺����"
 
-#: src/gtkprefs.c:1110
+#: src/gtkprefs.c:1115
 msgid "Proxy Server"
 msgstr "篁g��篌堺����"
 
-#: src/gtkprefs.c:1131
+#: src/gtkprefs.c:1136
 msgid "_Host"
 msgstr "筝紙�篏���(_H)"
 
-#: src/gtkprefs.c:1148 src/protocols/irc/irc.c:516
-#: src/protocols/jabber/jabber.c:4530 src/protocols/msn/msn.c:1529
-#: src/protocols/napster/napster.c:644 src/protocols/trepia/trepia.c:1376
+#: src/gtkprefs.c:1153 src/protocols/irc/irc.c:551
+#: src/protocols/jabber/jabber.c:1087 src/protocols/msn/msn.c:1616
+#: src/protocols/napster/napster.c:642 src/protocols/trepia/trepia.c:1335
 msgid "Port"
 msgstr "��荐���"
 
-#: src/gtkprefs.c:1166
+#: src/gtkprefs.c:1171
 msgid "_User"
 msgstr "篏睡����(_U)"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1188
 msgid "Pa_ssword"
 msgstr "絲�腆�(_S)"
 
-#: src/gtkprefs.c:1220
+#: src/gtkprefs.c:1225
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1221
+#: src/gtkprefs.c:1226
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1227
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1223
+#: src/gtkprefs.c:1228
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1224
+#: src/gtkprefs.c:1229
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1233
+#: src/gtkprefs.c:1238
 msgid "Manual"
 msgstr "篏睡�������"
 
-#: src/gtkprefs.c:1274
+#: src/gtkprefs.c:1279
 msgid "Browser Selection"
 msgstr "�御���頳遵��"
 
-#: src/gtkprefs.c:1278
+#: src/gtkprefs.c:1283
 msgid "_Browser:"
 msgstr "�頳遵��(_B)鐚�"
 
-#: src/gtkprefs.c:1288
+#: src/gtkprefs.c:1293
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -3462,87 +3459,87 @@
 "篏睡�������(_M)鐚�\n"
 "(茫�篁� %s 篁h;膓峨��)"
 
-#: src/gtkprefs.c:1309
+#: src/gtkprefs.c:1314
 msgid "Browser Options"
 msgstr "�頳遵���檎��"
 
-#: src/gtkprefs.c:1310
+#: src/gtkprefs.c:1315
 msgid "Open new _window by default"
 msgstr "��荐㊦�阪��坂����亥��荀�腦�(_W)"
 
-#: src/gtkprefs.c:1325
+#: src/gtkprefs.c:1330
 msgid "Message Logs"
 msgstr "荐����ヨ�"
 
-#: src/gtkprefs.c:1326
+#: src/gtkprefs.c:1331
 msgid "_Log all instant messages"
 msgstr "荐��������恰��荐���(_L)"
 
-#: src/gtkprefs.c:1328
+#: src/gtkprefs.c:1333
 msgid "Log all c_hats"
 msgstr "荐���������紊��у�(_H)"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1335
 msgid "Strip _HTML from logs"
 msgstr "絨�篋よ�荐���筝㊦�� HTML 罔�膠ゅサ��(_H)"
 
-#: src/gtkprefs.c:1333
+#: src/gtkprefs.c:1338
 msgid "System Logs"
 msgstr "膤紫輝�ヨ�"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1339
 msgid "Log when buddies _sign on/sign off"
 msgstr "荐���絅遵����糸�ワ��糸��(_S)"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1341
 msgid "Log when buddies become _idle/un-idle"
 msgstr "荐���絅遵�����臀����羔���臀�(_I)"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1343
 msgid "Log when buddies go away/come _back"
 msgstr "荐���絅遵��∫��鐚��鋐�(_B)"
 
-#: src/gtkprefs.c:1340
+#: src/gtkprefs.c:1345
 msgid "Log your _own signons/idleness/awayness"
 msgstr "荐�������群�糸�ワ���臀���∫��膈�����(_O)"
 
-#: src/gtkprefs.c:1342
+#: src/gtkprefs.c:1347
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "篏睡�����ョ��罟�罅�箴�荐���筝���絅遵����糸��(_N)"
 
-#: src/gtkprefs.c:1385
+#: src/gtkprefs.c:1390
 msgid "Sound Options"
 msgstr "�恰���檎��"
 
-#: src/gtkprefs.c:1386
+#: src/gtkprefs.c:1391
 msgid "_No sounds when you log in"
 msgstr "�糸�ユ����筝������恰��(_N)"
 
-#: src/gtkprefs.c:1388
+#: src/gtkprefs.c:1393
 msgid "_Sounds while away"
 msgstr "�∫����篁��弱�咲�恰��(_S)"
 
-#: src/gtkprefs.c:1392
+#: src/gtkprefs.c:1397
 msgid "Sound Method"
 msgstr "�恰���㊥�丈�劫�"
 
-#: src/gtkprefs.c:1393
+#: src/gtkprefs.c:1398
 msgid "_Method:"
 msgstr "�㊥�丈�劫�(_M)鐚�"
 
-#: src/gtkprefs.c:1395
+#: src/gtkprefs.c:1400
 msgid "Console beep"
 msgstr "�銀���"
 
-#: src/gtkprefs.c:1397
+#: src/gtkprefs.c:1402
 msgid "Automatic"
 msgstr "����"
 
-#: src/gtkprefs.c:1404
+#: src/gtkprefs.c:1409
 msgid "Command"
 msgstr "��篁�"
 
-#: src/gtkprefs.c:1414
+#: src/gtkprefs.c:1419
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -3551,67 +3548,67 @@
 "�恰����篁�(_C)鐚�\n"
 "(茫�篁� %s 篁h;罟���)"
 
-#: src/gtkprefs.c:1469
+#: src/gtkprefs.c:1474
 msgid "_Sending messages removes away status"
 msgstr "���肴�������羔��∫������(_S)"
 
-#: src/gtkprefs.c:1471
+#: src/gtkprefs.c:1476
 msgid "_Queue new messages when away"
 msgstr "���∫����鐚�絨��������域���舟�ヤ���筝�(_Q)"
 
-#: src/gtkprefs.c:1474
+#: src/gtkprefs.c:1479
 msgid "Auto-response"
 msgstr "��������"
 
-#: src/gtkprefs.c:1477
+#: src/gtkprefs.c:1482
 msgid "Seconds before _resending:"
 msgstr "���阪��荀�����膈�緇�腱���(_R)鐚�"
 
-#: src/gtkprefs.c:1480
+#: src/gtkprefs.c:1485
 msgid "_Send auto-response"
 msgstr "���肴��������(_S)"
 
-#: src/gtkprefs.c:1482
+#: src/gtkprefs.c:1487
 msgid "_Only send auto-response when idle"
 msgstr "������臀����������肴��������(_O)"
 
-#: src/gtkprefs.c:1484
-msgid "Send auto-response in active conversations"
-msgstr "�����画���篋よ�箙�荀����肴��������"
-
-#: src/gtkprefs.c:1497
+#: src/gtkprefs.c:1489
+msgid "Send auto-response in _active conversations"
+msgstr "�����画���篋よ�箙�荀����肴��������(_A)"
+
+#: src/gtkprefs.c:1499
 msgid "Idle _time reporting:"
 msgstr "��臀������怨��(_T)鐚�"
 
-#: src/gtkprefs.c:1500
+#: src/gtkprefs.c:1502
 msgid "Gaim usage"
 msgstr "Gaim 篏睡����羈�"
 
-#: src/gtkprefs.c:1503
+#: src/gtkprefs.c:1505
 msgid "X usage"
 msgstr "X Window 篏睡����羈�"
 
-#: src/gtkprefs.c:1505
+#: src/gtkprefs.c:1507
 msgid "Windows usage"
 msgstr "Windows 篏睡����羈�"
 
-#: src/gtkprefs.c:1513
+#: src/gtkprefs.c:1515
 msgid "Auto-away"
 msgstr "�����∫��"
 
-#: src/gtkprefs.c:1514
+#: src/gtkprefs.c:1516
 msgid "Set away _when idle"
 msgstr "��臀�������荐㊦�咲�∫��(_W)"
 
-#: src/gtkprefs.c:1516
+#: src/gtkprefs.c:1518
 msgid "_Minutes before setting away:"
 msgstr "��臀��箙�荐㊦�咲�∫��(_M)鐚�"
 
-#: src/gtkprefs.c:1523
+#: src/gtkprefs.c:1525
 msgid "Away m_essage:"
 msgstr "�∫��荐���(_M)鐚�"
 
-#: src/gtkprefs.c:1585
+#: src/gtkprefs.c:1587
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3626,7 +3623,7 @@
 "<span weight=\"bold\">膓牙�鐚�</span>\t\t%s\n"
 "<span weight=\"bold\">罟���鐚�</span>\t%s"
 
-#: src/gtkprefs.c:1590
+#: src/gtkprefs.c:1592
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -3641,98 +3638,98 @@
 "<span weight=\"bold\">膓牙�鐚�</span>  %s\n"
 "<span weight=\"bold\">罟���鐚�</span>  %s"
 
-#: src/gtkprefs.c:1771
+#: src/gtkprefs.c:1773
 msgid "Load"
 msgstr "莠���"
 
 # NOTE ���処⑮����腮宴��鐚����阪����茹d���篋阪��������罔∞���腮宴��
-#: src/gtkprefs.c:1778 src/protocols/msn/msn.c:1284
-#: src/protocols/trepia/trepia.c:433
+#: src/gtkprefs.c:1780 src/protocols/jabber/jabber.c:544
+#: src/protocols/msn/msn.c:1302 src/protocols/trepia/trepia.c:392
 msgid "Name"
 msgstr "��腮�"
 
-#: src/gtkprefs.c:1825
+#: src/gtkprefs.c:1827
 msgid "Details"
 msgstr "荅括完莖���"
 
-#: src/gtkprefs.c:1952
+#: src/gtkprefs.c:1954
 msgid "Sound Selection"
 msgstr "�後��恰��"
 
-#: src/gtkprefs.c:2059
+#: src/gtkprefs.c:2061
 msgid "Play"
 msgstr "�㊥��"
 
-#: src/gtkprefs.c:2066
+#: src/gtkprefs.c:2068
 msgid "Event"
 msgstr "篋�篁�"
 
-#: src/gtkprefs.c:2089
+#: src/gtkprefs.c:2091
 msgid "Reset"
 msgstr "��臀�"
 
-#: src/gtkprefs.c:2093
+#: src/gtkprefs.c:2095
 msgid "Choose..."
 msgstr "�御��..."
 
-#: src/gtkprefs.c:2227
+#: src/gtkprefs.c:2229
 msgid "_Edit"
 msgstr "膩�鹿(_E)"
 
-#: src/gtkprefs.c:2263
+#: src/gtkprefs.c:2265
 msgid "Interface"
 msgstr "篁���"
 
-#: src/gtkprefs.c:2264
+#: src/gtkprefs.c:2266
 msgid "Smiley Themes"
 msgstr "茵���筝脂�"
 
-#: src/gtkprefs.c:2265
+#: src/gtkprefs.c:2267
 msgid "Fonts"
 msgstr "絖���"
 
-#: src/gtkprefs.c:2266
+#: src/gtkprefs.c:2268
 msgid "Message Text"
 msgstr "荐�����絖�"
 
-#: src/gtkprefs.c:2267
+#: src/gtkprefs.c:2269
 msgid "Shortcuts"
 msgstr "綽��潔��"
 
-#: src/gtkprefs.c:2270
+#: src/gtkprefs.c:2272
 msgid "IMs"
 msgstr "�恰��荐���"
 
-#: src/gtkprefs.c:2272
+#: src/gtkprefs.c:2274
 msgid "Proxy"
 msgstr "篁g��篌堺����"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2275
+#: src/gtkprefs.c:2277
 msgid "Browser"
 msgstr "�頳遵��"
 
-#: src/gtkprefs.c:2277
-msgid "Logging"
-msgstr "�ヨ�"
-
-#: src/gtkprefs.c:2278
-msgid "Sounds"
-msgstr "�恰��"
-
 #: src/gtkprefs.c:2279
+msgid "Logging"
+msgstr "�ヨ�"
+
+#: src/gtkprefs.c:2280
+msgid "Sounds"
+msgstr "�恰��"
+
+#: src/gtkprefs.c:2281
 msgid "Sound Events"
 msgstr "篋�篁狗�恰��"
 
-#: src/gtkprefs.c:2280
+#: src/gtkprefs.c:2282
 msgid "Away / Idle"
 msgstr "�∫�� / ��臀�"
 
-#: src/gtkprefs.c:2281
+#: src/gtkprefs.c:2283
 msgid "Away Messages"
 msgstr "�∫��荐���"
 
-#: src/gtkprefs.c:2284
+#: src/gtkprefs.c:2286
 msgid "Plugins"
 msgstr "罔∞�羝���"
 
@@ -3820,15 +3817,15 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:186 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:200 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "Yes"
 msgstr "��"
 
-#: src/gtkrequest.c:187 src/protocols/gg/gg.c:663 src/request.h:804
+#: src/gtkrequest.c:201 src/protocols/gg/gg.c:660 src/request.h:843
 msgid "No"
 msgstr "��"
 
-#: src/gtkrequest.c:190
+#: src/gtkrequest.c:204
 msgid "Apply"
 msgstr "絅���"
 
@@ -3890,58 +3887,14 @@
 "launched: %s"
 msgstr "�≧��㊥�冗�恰��鐚����榊�≧��決���荐㊤����恰����篁わ�%s"
 
-#: src/gtkutils.c:289
+#: src/gtkutils.c:286
 msgid "Can't save icon file to disk."
 msgstr "�≧��峨���腓堺�罅�脾�腆�筝���"
 
-#: src/gtkutils.c:324
+#: src/gtkutils.c:321
 msgid "Gaim - Save Icon"
 msgstr "Gaim - �峨���腓�"
 
-#. full help text
-#: src/gtkutils.c:1037
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-"Gaim %s\n"
-"篏睡���劫�: %s [�檎��]...\n"
-"\n"
-"  -a, --acct          蕁�ず絽活��羝���\n"
-"  -w, --away[=MESG]   �糸�ュ�蕁�ず�咲�∫�� (�御���у��� MESG �����絎���荀�\n"
-"                      篏睡�����∫��荐�����腮�)\n"
-"  -l, --login[=NAME]  �����糸�� (�御���у��� NAME �����絎���荀��糸�ョ��絽�\n"
-"                      ��鐚�����篁ラ����篏��阪����)\n"
-"  -n, --loginwin      筝������糸�ワ�蕁�ず�糸�ヨ�腦�\n"
-"  -u, --user=NAME     篏睡��験�� NAME\n"
-"  -f, --file=FILE     篏睡�� FILE �肴┃絎�罟�\n"
-"  -d, --debug         絨��ら�����叱�阪�井�羣�莠後�坂�\n"
-"  -v, --version       蕁�ず�������研�∫��\n"
-"  -h, --help          蕁�ず����茯������研�∫��\n"
-
-#. short message
-#: src/gtkutils.c:1052
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s���決���%s -h��篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
-
-#: src/html.c:345
-msgid "g003: Error opening connection.\n"
-msgstr "g003: �g����������\n"
-
 #: src/log.c:30
 msgid "Error in specifying buddy conversation."
 msgstr "����絎�絅遵�篋よ����主�������"
@@ -4060,34 +4013,70 @@
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) �怨�� %s �演��臀���� @ %s"
 
-#: src/main.c:140
+#: src/main.c:151
 msgid "Please enter your login."
 msgstr "茫����糸�ャ��"
 
-#: src/main.c:223
+#: src/main.c:234
 msgid "<New User>"
 msgstr "<�遺戎����>"
 
-#: src/main.c:265
+#: src/main.c:276
 msgid "Login"
 msgstr "�糸��"
 
-#: src/main.c:281
-msgid "Screen Name:"
-msgstr "絽活��鐚�"
-
-#: src/plugin.c:258
+#. full help text
+#: src/main.c:553
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"篏睡���劫�: %s [�檎��]...\n"
+"\n"
+"  -a, --acct          蕁�ず絽活��羝���\n"
+"  -w, --away[=MESG]   �糸�ュ�蕁�ず�咲�∫�� (�御���у��� MESG �����絎���荀�\n"
+"                      篏睡�����∫��荐�����腮�)\n"
+"  -l, --login[=NAME]  �����糸�� (�御���у��� NAME �����絎���荀��糸�ョ��絽�\n"
+"                      ��鐚�����篁ラ����篏��阪����)\n"
+"  -n, --loginwin      筝������糸�ワ�蕁�ず�糸�ヨ�腦�\n"
+"  -u, --user=NAME     篏睡��験�� NAME\n"
+"  -f, --file=FILE     篏睡�� FILE �肴┃絎�罟�\n"
+"  -d, --debug         絨��ら�����叱�阪�井�羣�莠後�坂�\n"
+"  -v, --version       蕁�ず�������研�∫��\n"
+"  -h, --help          蕁�ず����茯������研�∫��\n"
+
+#. short message
+#: src/main.c:568
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s���決���%s -h��篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
+
+#: src/plugin.c:260
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr "�鞘��育��荀���罔∞���%s����茫����医�茖�����罔∞�箙�緇���荅���"
 
-#: src/plugin.c:263 src/plugin.c:291
+#: src/plugin.c:265 src/plugin.c:293
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim �≧�莅��ユ������箴���罔∞���"
 
-#: src/plugin.c:287
+#: src/plugin.c:289
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "�≧�莠��ラ��荀���罔∞���%s����"
@@ -4096,204 +4085,227 @@
 msgid "Slightly less boring default"
 msgstr "莠��堺��i瑳�∴������荐�"
 
-#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1276
-#: src/protocols/msn/msn.c:337 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:109
+#: src/protocols/msn/msn.c:344 src/protocols/msn/state.c:27
 #: src/protocols/msn/state.c:28 src/protocols/msn/state.c:35
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1703
-#: src/protocols/yahoo/yahoo.c:1804
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2306
+#: src/protocols/yahoo/yahoo.c:2407
 msgid "Available"
 msgstr "筝�膩�"
 
-#: src/protocols/gg/gg.c:53
+#: src/protocols/gg/gg.c:50
 msgid "Available for friends only"
 msgstr "����絅遵���札���井��筝�膩�"
 
-#: src/protocols/gg/gg.c:55
+#: src/protocols/gg/gg.c:52
 msgid "Away for friends only"
 msgstr "�∫��鐚�����絅遵���札���井��鐚�"
 
-#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3536
-#: src/protocols/jabber/jabber.c:3599 src/protocols/oscar/oscar.c:2845
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4615
-#: src/protocols/oscar/oscar.c:5917 src/protocols/yahoo/yahoo.c:1425
-#: src/protocols/yahoo/yahoo.c:1723 src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:871
+#: src/protocols/jabber/presence.c:88 src/protocols/oscar/oscar.c:2837
+#: src/protocols/oscar/oscar.c:4517 src/protocols/oscar/oscar.c:4544
+#: src/protocols/oscar/oscar.c:6069 src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:2326 src/protocols/yahoo/yahoo.c:2417
 msgid "Invisible"
 msgstr "�沿昆"
 
 # XXX
-#: src/protocols/gg/gg.c:57
+#: src/protocols/gg/gg.c:54
 msgid "Invisible for friends only"
 msgstr "�沿昆鐚�����絅遵���札���井��鐚�"
 
-#: src/protocols/gg/gg.c:58
+#: src/protocols/gg/gg.c:55
 msgid "Unavailable"
 msgstr "�∝�"
 
+#: src/protocols/gg/gg.c:136
+msgid "Unable to resolve hostname."
+msgstr "�≧�茹f��筝紙���腮宴��"
+
 #: src/protocols/gg/gg.c:139
-msgid "Unable to resolve hostname."
-msgstr "�≧�茹f��筝紙���腮宴��"
+msgid "Unable to connect to server."
+msgstr "�≧��g��遺失������"
 
 #: src/protocols/gg/gg.c:142
-msgid "Unable to connect to server."
-msgstr "�≧��g��遺失������"
-
-#: src/protocols/gg/gg.c:145
 msgid "Invalid response from server."
 msgstr "�≧����篌堺����������"
 
-#: src/protocols/gg/gg.c:148
+#: src/protocols/gg/gg.c:145
 msgid "Error while reading from socket."
 msgstr "莅��� Socket ���主�������"
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:148
 msgid "Error while writing to socket."
 msgstr "絲��� Socket ���主�������"
 
+#: src/protocols/gg/gg.c:151
+msgid "Authentication failed."
+msgstr "茯�茘�紊掩����"
+
 #: src/protocols/gg/gg.c:154
-msgid "Authentication failed."
-msgstr "茯�茘�紊掩����"
-
-#: src/protocols/gg/gg.c:157
 msgid "Unknown Error Code."
 msgstr "���ョ�����篁g⊆��"
 
-#: src/protocols/gg/gg.c:262
+#: src/protocols/gg/gg.c:259
 #, c-format
 msgid "Status: %s"
 msgstr "����鐚�%s"
 
-#: src/protocols/gg/gg.c:283
+#: src/protocols/gg/gg.c:280
 msgid "Could not connect"
 msgstr "�≧��g�"
 
-#: src/protocols/gg/gg.c:290
+#: src/protocols/gg/gg.c:287
 msgid "Unable to read socket"
 msgstr "�≧�莅��� Socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/toc/toc.c:204
+#: src/protocols/gg/gg.c:399 src/protocols/icq/gaim_icq.c:344
+#: src/protocols/toc/toc.c:200
 msgid "Unable to connect."
 msgstr "�≧��g���"
 
+#: src/protocols/gg/gg.c:415
+msgid "Reading data"
+msgstr "莅���莖���筝�"
+
 #: src/protocols/gg/gg.c:418
-msgid "Reading data"
-msgstr "莅���莖���筝�"
+msgid "Balancer handshake"
+msgstr "��莢�莠�綛活 ��困茫�筝�"
 
 #: src/protocols/gg/gg.c:421
-msgid "Balancer handshake"
-msgstr "��莢�莠�綛活 ��困茫�筝�"
+msgid "Reading server key"
+msgstr "莅��� Server Key 筝�"
 
 #: src/protocols/gg/gg.c:424
-msgid "Reading server key"
-msgstr "莅��� Server Key 筝�"
-
-#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "篋ゆ�絲��遺賢"
 
-#: src/protocols/gg/gg.c:437
+#: src/protocols/gg/gg.c:434
 msgid "Critical error in GG library\n"
 msgstr "�� GG Library 筝㊦����紊ч���\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
-#: src/protocols/toc/toc.c:180
+#: src/protocols/gg/gg.c:452 src/protocols/gg/gg.c:543
+#: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
 msgstr "�g��� %s 紊掩��"
 
-#: src/protocols/gg/gg.c:503
+#: src/protocols/gg/gg.c:500
 msgid "Unable to ping server"
 msgstr "�≧���緇�篌堺��������"
 
 # XXX
-#: src/protocols/gg/gg.c:515
+#: src/protocols/gg/gg.c:512
 msgid "Send as message"
 msgstr "篁ヨ�������"
 
-#: src/protocols/gg/gg.c:520
+#: src/protocols/gg/gg.c:517
 msgid "Looking up GG server"
 msgstr "��絨� GG 篌堺����"
 
-#: src/protocols/gg/gg.c:523
+#: src/protocols/gg/gg.c:520
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "腟��篋��≧���� Gadu-Gadu UIN"
 
-#: src/protocols/gg/gg.c:570
+#: src/protocols/gg/gg.c:567
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "�����絨��≧���� Gadu-Gadu UIN ���坂���荐�����"
 
-#: src/protocols/gg/gg.c:632
+#: src/protocols/gg/gg.c:629
 msgid "Couldn't get search results"
 msgstr "�≧���緇���絨�腟���"
 
-#: src/protocols/gg/gg.c:637
+#: src/protocols/gg/gg.c:634
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu ��絨�綣���"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:659
 msgid "Active"
 msgstr "����"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:3963
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3892
 msgid "UIN"
 msgstr "絽活��"
 
-#: src/protocols/gg/gg.c:671
+#: src/protocols/gg/gg.c:668
 msgid "First name"
 msgstr "��"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1383
-#: src/protocols/irc/msgs.c:185 src/protocols/oscar/oscar.c:3965
+#. Last Name
+#: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:564
+#: src/protocols/oscar/oscar.c:3900 src/protocols/trepia/trepia.c:265
+msgid "Last Name"
+msgstr "紮�"
+
+#: src/protocols/gg/gg.c:677 src/protocols/gg/gg.c:1389
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3894
 msgid "Nick"
 msgstr "�援┗"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:684 src/protocols/gg/gg.c:687
 msgid "Birth year"
 msgstr "�榊��綛�"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:700
+#: src/protocols/gg/gg.c:693 src/protocols/gg/gg.c:695
+#: src/protocols/gg/gg.c:697
 msgid "Sex"
 msgstr "�у��"
 
-#: src/protocols/gg/gg.c:737
+#. City
+#: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:574
+#: src/protocols/oscar/oscar.c:3946 src/protocols/oscar/oscar.c:3962
+#: src/protocols/trepia/trepia.c:322 src/protocols/trepia/trepia.c:421
+msgid "City"
+msgstr "���"
+
+#. res[0] == username
+#: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1240
+#: src/protocols/msn/msn.c:1482 src/protocols/napster/napster.c:387
+#: src/protocols/oscar/oscar.c:2879 src/protocols/oscar/oscar.c:3187
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2583
+#: src/protocols/yahoo/yahoo.c:2605 src/protocols/yahoo/yahoo.c:2625
+#: src/protocols/yahoo/yahoo.c:2812 src/protocols/zephyr/zephyr.c:355
+msgid "Buddy Information"
+msgstr "絅遵�莖�荐�"
+
+#: src/protocols/gg/gg.c:741
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 篌堺�����筝�����峨�篁私���絅遵�羝�����"
 
-#: src/protocols/gg/gg.c:745
+#: src/protocols/gg/gg.c:749
 msgid "Couldn't Import Buddy List from Server"
 msgstr "�≧���失�������緇�絅遵�����"
 
-#: src/protocols/gg/gg.c:808
+#: src/protocols/gg/gg.c:812
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "������絨�絅遵�羝����渇���� Gadu-Gadu 篌堺�����"
 
-#: src/protocols/gg/gg.c:816
+#: src/protocols/gg/gg.c:820
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "�≧��渇��絅遵�羝����� Gadu-Gadu 篌堺�����"
 
-#: src/protocols/gg/gg.c:824
+#: src/protocols/gg/gg.c:828
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "������絨�絅遵�羝����� Gadu-Gadu 篌堺���������"
 
-#: src/protocols/gg/gg.c:832
+#: src/protocols/gg/gg.c:836
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "�≧����ゅ�� Gadu-Gadu 篌堺�������絅遵�羝���"
 
-#: src/protocols/gg/gg.c:840
+#: src/protocols/gg/gg.c:844
 msgid "Password changed successfully"
 msgstr "絲�腆寂信�号����"
 
-#: src/protocols/gg/gg.c:847
+#: src/protocols/gg/gg.c:851
 msgid "Password couldn't be changed"
 msgstr "絲�腆主�≧�篆���"
 
-#: src/protocols/gg/gg.c:964
+#: src/protocols/gg/gg.c:968
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "�� Gadu-Gadu 篌堺����������主�����"
 
-#: src/protocols/gg/gg.c:965
+#: src/protocols/gg/gg.c:969
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -4301,34 +4313,34 @@
 "���阪�� Gadu-Gadu HTTP 篌堺����������主���馹�鐚���篁� Gaim 羃���莨��絎���������絎���"
 "綏ヤ���茫�緇�������荅���"
 
-#: src/protocols/gg/gg.c:993
+#: src/protocols/gg/gg.c:997
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "�≧����� Gadu-Gadu ��絅遵�羝���"
 
-#: src/protocols/gg/gg.c:994
+#: src/protocols/gg/gg.c:998
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim �≧��d� Gadu-Gadu 絅遵�羝���失������茫���藥���荅��罨<��"
 
-#: src/protocols/gg/gg.c:1067
+#: src/protocols/gg/gg.c:1071
 msgid "Couldn't export buddy list"
 msgstr "�≧����阪ソ��羝���"
 
-#: src/protocols/gg/gg.c:1068 src/protocols/gg/gg.c:1091
+#: src/protocols/gg/gg.c:1072 src/protocols/gg/gg.c:1095
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim �≧��d�絅遵�羝���失������茫���藥���荅��罨<��"
 
-#: src/protocols/gg/gg.c:1090
+#: src/protocols/gg/gg.c:1094
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "�≧����� Gadu-Gadu 絅遵�羝���"
 
-#: src/protocols/gg/gg.c:1139
+#: src/protocols/gg/gg.c:1143
 msgid "Unable to access directory"
 msgstr "�≧�絖�������"
 
-#: src/protocols/gg/gg.c:1140
+#: src/protocols/gg/gg.c:1144
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -4336,11 +4348,11 @@
 "���� Gaim 羃���莨���d�����篌堺�������篁ョ�≧���絨�����筝���莖�����茫�緇�������荅��"
 "罨<��"
 
-#: src/protocols/gg/gg.c:1173
+#: src/protocols/gg/gg.c:1177
 msgid "Unable to change Gadu-Gadu password"
 msgstr "�≧�篆��� Gadu-Gadu 絲�腆�"
 
-#: src/protocols/gg/gg.c:1174
+#: src/protocols/gg/gg.c:1178
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -4348,27 +4360,32 @@
 "���� Gaim 羃���莨���d� Gadu-Gadu 篌堺�������篁ョ�≧�篆��号����絲�腆若��茫�緇�������荅��"
 "罨<��"
 
-#: src/protocols/gg/gg.c:1190
+#: src/protocols/gg/gg.c:1195
 msgid "Directory Search"
 msgstr "������絨�"
 
-#: src/protocols/gg/gg.c:1206
+#: src/protocols/gg/gg.c:1204 src/protocols/jabber/jabber.c:981
+#: src/protocols/oscar/oscar.c:6422 src/protocols/toc/toc.c:1545
+msgid "Change Password"
+msgstr "篆��劫�腆�"
+
+#: src/protocols/gg/gg.c:1212
 msgid "Import Buddy List from Server"
 msgstr "��失��������ュソ������"
 
-#: src/protocols/gg/gg.c:1212
+#: src/protocols/gg/gg.c:1218
 msgid "Export Buddy List to Server"
 msgstr "���阪ソ�������遺失�����"
 
-#: src/protocols/gg/gg.c:1218
+#: src/protocols/gg/gg.c:1224
 msgid "Delete Buddy List from Server"
 msgstr "絨�篌堺�������絅遵���������"
 
-#: src/protocols/gg/gg.c:1251
+#: src/protocols/gg/gg.c:1257
 msgid "Unable to access user profile."
 msgstr "�≧�莅���篏睡����膂>�罟���"
 
-#: src/protocols/gg/gg.c:1252
+#: src/protocols/gg/gg.c:1258
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -4386,7 +4403,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1364 src/protocols/gg/gg.c:1366
+#: src/protocols/gg/gg.c:1370 src/protocols/gg/gg.c:1372
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu ��絎�罔∞�"
 
@@ -4399,17 +4416,17 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "篏睡���� %s (%s%s%s%s%s) 荀�羆�����茯�茘���"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1808
-#: src/protocols/msn/notification.c:924 src/protocols/msn/notification.c:1245
-#: src/protocols/msn/notification.c:1411 src/protocols/oscar/oscar.c:2617
-#: src/protocols/oscar/oscar.c:5152
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:181
+#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1246
+#: src/protocols/msn/notification.c:1412 src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:5080
 msgid "Authorize"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1809
-#: src/protocols/msn/notification.c:925 src/protocols/msn/notification.c:1247
-#: src/protocols/msn/notification.c:1413 src/protocols/oscar/oscar.c:2619
-#: src/protocols/oscar/oscar.c:5153
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:182
+#: src/protocols/msn/notification.c:926 src/protocols/msn/notification.c:1248
+#: src/protocols/msn/notification.c:1414 src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:5081
 msgid "Deny"
 msgstr "��腟�"
 
@@ -4461,21 +4478,47 @@
 msgid "No topic is set"
 msgstr "羃���荐㊤�筝脂�"
 
-#: src/protocols/irc/irc.c:121
+# XXX ��⑮
+#: src/protocols/irc/irc.c:64
+msgid "Error displaying MOTD"
+msgstr "蕁�ず���ヨ������主��篋����"
+
+# XXX ��⑮
+#: src/protocols/irc/irc.c:64
+msgid "No MOTD available"
+msgstr "羃������ヨ���"
+
+# XXX ��⑮
+#: src/protocols/irc/irc.c:65
+msgid "There is no MOTD associated with this connection."
+msgstr "�����g�羃����檎�������ヨ�����"
+
+# XXX ��⑮
+#: src/protocols/irc/irc.c:68
+#, c-format
+msgid "MOTD for %s"
+msgstr "%s �����ヨ���"
+
+# XXX ��⑮
+#: src/protocols/irc/irc.c:137
+msgid "View MOTD"
+msgstr "蕁�ず���ヨ��� (MOTD)"
+
+#: src/protocols/irc/irc.c:156
 msgid "Channel:"
 msgstr "�脂��鐚�"
 
-#: src/protocols/irc/irc.c:145
+#: src/protocols/irc/irc.c:180
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC �援┗筝�������腥榊�遵���"
 
-#: src/protocols/irc/irc.c:164 src/protocols/oscar/oscar.c:686
-#: src/protocols/toc/toc.c:232
+#: src/protocols/irc/irc.c:199 src/protocols/oscar/oscar.c:679
+#: src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "�糸�ワ�%s"
 
-#: src/protocols/irc/irc.c:173
+#: src/protocols/irc/irc.c:208
 msgid "Couldn't create socket"
 msgstr "�≧�綮榊� Socket"
 
@@ -4488,171 +4531,176 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:495
+#: src/protocols/irc/irc.c:530
 msgid "IRC Protocol Plugin"
 msgstr "IRC ��絎�罔∞�"
 
 #. *  summary
-#: src/protocols/irc/irc.c:496
+#: src/protocols/irc/irc.c:531
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "莠�絅順�� IRC ��絎�罔∞�"
 
-#. Splits
-#: src/protocols/irc/irc.c:513 src/protocols/irc/msgs.c:199
-#: src/protocols/jabber/jabber.c:4516 src/protocols/napster/napster.c:639
+#: src/protocols/irc/irc.c:548 src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1077 src/protocols/napster/napster.c:637
 msgid "Server"
 msgstr "篌堺����"
 
-#: src/protocols/irc/irc.c:519
+#: src/protocols/irc/irc.c:554
 msgid "Encoding"
 msgstr "膩�⊆"
 
-#: src/protocols/irc/msgs.c:101
+#: src/protocols/irc/msgs.c:98
 msgid "Bad mode"
 msgstr "罔≦��≧��"
 
 # FIXME ������⑮
-#: src/protocols/irc/msgs.c:112
+#: src/protocols/irc/msgs.c:109
 #, c-format
 msgid "You are banned from %s."
 msgstr "��←胼��� %s 篋���"
 
 # FIXME ������⑮
 # NOTE 茘����翫�� by Paladin
-#: src/protocols/irc/msgs.c:113
+#: src/protocols/irc/msgs.c:110
 msgid "Banned"
 msgstr "茴��罩�"
 
-#: src/protocols/irc/msgs.c:186
+#: src/protocols/irc/msgs.c:184
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC ��篏���)</i>"
 
-#: src/protocols/irc/msgs.c:187
+#: src/protocols/irc/msgs.c:185
 msgid " <i>(identified)</i>"
 msgstr " <i>(綏臥�茘�)</i>"
 
-#: src/protocols/irc/msgs.c:193
+#: src/protocols/irc/msgs.c:191 src/protocols/jabber/jabber.c:534
 msgid "Username"
 msgstr "篏睡����"
 
-#: src/protocols/irc/msgs.c:194 src/protocols/yahoo/yahoo.c:2049
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2683
 msgid "Realname"
 msgstr "紮���"
 
-#: src/protocols/irc/msgs.c:204
+#: src/protocols/irc/msgs.c:202
 msgid "Currently on"
 msgstr "�����脂��"
 
-#: src/protocols/irc/msgs.c:209
+#: src/protocols/irc/msgs.c:207
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>��臀��鐚�</b>%s<br>"
 
-#: src/protocols/irc/msgs.c:211
+#: src/protocols/irc/msgs.c:209
 msgid "Online since"
 msgstr "筝�膩���"
 
-#: src/protocols/irc/msgs.c:214
+#: src/protocols/irc/msgs.c:212
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>�颷逸�</b>��絎���腑�<br>"
 
+# XXX ����⑮����絅遵� %s ��莖�荐���罸�莠�����鐚�
+#: src/protocols/irc/msgs.c:219
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "%s ��絅遵�莖�荐�"
+
 # NOTE �亥����IRC prpl莎桁����筝�蕁�ず����鐚��頑⑮��篆��鴻��羃����馹�
-#: src/protocols/irc/msgs.c:245
+#: src/protocols/irc/msgs.c:247
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ����紊�源蕁�篆��合�削�%s"
 
-#: src/protocols/irc/msgs.c:250
+#: src/protocols/irc/msgs.c:252
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s ��筝脂��削�%s"
 
-#: src/protocols/irc/msgs.c:264
+#: src/protocols/irc/msgs.c:266
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "筝�����荐�����%s��"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Unknown message"
 msgstr "筝�����荐���"
 
-#: src/protocols/irc/msgs.c:265
+#: src/protocols/irc/msgs.c:267
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim �渇��篋�筝��� IRC 篌堺��������順��荐�����"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:369
+#: src/protocols/irc/msgs.c:371
 msgid "no such channel"
 msgstr "羃����e���脂��"
 
-#: src/protocols/irc/msgs.c:372
+#: src/protocols/irc/msgs.c:374
 msgid "User is not logged in"
 msgstr "篏睡����羃����糸��"
 
-#: src/protocols/irc/msgs.c:377
+#: src/protocols/irc/msgs.c:379
 msgid "No such nick or channel"
 msgstr "羃����e���援┗���脂��"
 
-#: src/protocols/irc/msgs.c:397
+#: src/protocols/irc/msgs.c:399
 msgid "Could not send"
 msgstr "�≧�����"
 
-#: src/protocols/irc/msgs.c:453
+#: src/protocols/irc/msgs.c:455
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "����茴���茫����������� %s��"
 
-#: src/protocols/irc/msgs.c:454
+#: src/protocols/irc/msgs.c:456
 msgid "Invitation only"
 msgstr "����茴���茫���"
 
-#: src/protocols/irc/msgs.c:550
+#: src/protocols/irc/msgs.c:552
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "��← %s 荼√�削�(%s)"
 
-#: src/protocols/irc/msgs.c:558
+#: src/protocols/irc/msgs.c:560
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "茴� %s 荼√�� (%s)"
 
-#: src/protocols/irc/msgs.c:579
+#: src/protocols/irc/msgs.c:581
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "罔≦� (%s %s) 茴� %s 荐㊤�"
 
-#: src/protocols/irc/msgs.c:658
+#: src/protocols/irc/msgs.c:660
 msgid "Could not change nick"
 msgstr "�≧��贋�号�援┗"
 
-#: src/protocols/irc/msgs.c:659
+#: src/protocols/irc/msgs.c:661
 msgid "Cannot change nick"
 msgstr "�≧��贋�号�援┗"
 
-#: src/protocols/irc/msgs.c:680
+#: src/protocols/irc/msgs.c:682
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "���∫��篋��脂��%s%s"
 
-#: src/protocols/irc/msgs.c:718
+#: src/protocols/irc/msgs.c:720
 msgid "Error: invalid PONG from server"
 msgstr "���鐚�箴���失������ PONG �≧��"
 
-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:722
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING ��膈�����綮狗�駕�%lu腱�"
 
-#: src/protocols/irc/msgs.c:790
+#: src/protocols/irc/msgs.c:792
 #, c-format
 msgid "Cannot join %s:"
 msgstr "�≧����� %s鐚�"
 
-#: src/protocols/irc/msgs.c:791
+#: src/protocols/irc/msgs.c:793
 msgid "Cannot join channel"
 msgstr "�≧����ラ�脂��"
 
-#: src/protocols/irc/msgs.c:821
+#: src/protocols/irc/msgs.c:823
 #, c-format
 msgid "Wallops from %s"
 msgstr "箴��� %s �� Wallops"
@@ -4680,281 +4728,498 @@
 msgid "Disconnected"
 msgstr "綏峨��罩∫�g�"
 
-#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:574
-#: src/protocols/jabber/jabber.c:591 src/protocols/jabber/jabber.c:601
-#: src/protocols/msn/msn.c:75 src/protocols/msn/msn.c:95
-#: src/protocols/msn/msn.c:153 src/protocols/msn/msn.c:253
-#: src/protocols/msn/msn.c:509 src/protocols/msn/msn.c:620
-#: src/protocols/msn/msn.c:636 src/protocols/msn/msn.c:684
-#: src/protocols/msn/msn.c:707 src/protocols/msn/msn.c:739
-#: src/protocols/msn/msn.c:747 src/protocols/msn/msn.c:780
-#: src/protocols/msn/msn.c:788 src/protocols/msn/msn.c:802
-#: src/protocols/msn/msn.c:811 src/protocols/msn/msn.c:825
-#: src/protocols/msn/msn.c:849 src/protocols/msn/msn.c:899
-#: src/protocols/msn/msn.c:937 src/protocols/msn/msn.c:1034
-#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1087
-#: src/protocols/msn/msn.c:1098 src/protocols/msn/msn.c:1109
-#: src/protocols/msn/msn.c:1133 src/protocols/msn/msn.c:1145
-#: src/protocols/msn/msn.c:1210 src/protocols/msn/notification.c:179
-#: src/protocols/msn/notification.c:206 src/protocols/msn/notification.c:1643
-#: src/protocols/msn/notification.c:1663 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:781 src/protocols/trepia/trepia.c:1064
-#: src/protocols/trepia/trepia.c:1108 src/protocols/trepia/trepia.c:1207
-#: src/protocols/trepia/trepia.c:1263
-msgid "Write error"
-msgstr "絲��ラ���"
-
-#: src/protocols/jabber/jabber.c:1069 src/protocols/jabber/jabber.c:1076
-msgid "Unable to change password."
-msgstr "�≧��贋�劫�腆若��"
-
-#: src/protocols/jabber/jabber.c:1070
-msgid ""
-"The current password you entered is incorrect.  Your password has not been "
-"changed."
-msgstr "����莠後�ョ����絲�腆惹������������絲�腆惹����贋�鴻��"
-
-#: src/protocols/jabber/jabber.c:1077
-msgid ""
-"The new password you entered is the same as your current password.  Your "
-"password remains the same."
-msgstr "����莠後�ョ���医�腆弱����絲�腆惹���罔g������篁ュ�腆惹���茴��壕���"
-
-#. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1270 src/protocols/jabber/jabber.c:3532
-#: src/protocols/jabber/jabber.c:3583
-msgid "Chatty"
-msgstr "�活��紊�"
-
-#: src/protocols/jabber/jabber.c:1272 src/protocols/jabber/jabber.c:3534
-#: src/protocols/jabber/jabber.c:3591
-msgid "Extended Away"
-msgstr "�傑�����∫��"
-
-#: src/protocols/jabber/jabber.c:1274 src/protocols/jabber/jabber.c:3535
-#: src/protocols/jabber/jabber.c:3595 src/protocols/oscar/oscar.c:2835
-#: src/protocols/oscar/oscar.c:4603 src/protocols/oscar/oscar.c:5913
-msgid "Do Not Disturb"
-msgstr "茫��炊����"
-
-#: src/protocols/jabber/jabber.c:1514
-#, c-format
-msgid "Jabber Error %s"
-msgstr "Jabber ��� %s"
-
-#: src/protocols/jabber/jabber.c:1620
-#, c-format
-msgid "Error %s: %s"
-msgstr "��� %s鐚�%s"
-
-#: src/protocols/jabber/jabber.c:1623
-msgid "Unknown Error in presence"
-msgstr "��∈絎�絅遵����g�������鐚��主��篋����ョ�����"
-
-#: src/protocols/jabber/jabber.c:1801
-#, c-format
-msgid "The user %s wants to add you to their buddy list."
-msgstr "篏睡���� %s �活�絨������ヤ�鐚�絅刻���絅遵�羝���賢��"
-
-#: src/protocols/jabber/jabber.c:1829
-#, c-format
-msgid ""
-"The Jabber user %s does not exist and was therefore not added to your roster."
-msgstr "Jabber 篏睡���� %s 筝��絖������篁ュ�筝������ュ�井��������賢��"
-
-#: src/protocols/jabber/jabber.c:1832
-msgid "No such user."
-msgstr "羃�������篏睡������"
-
-#: src/protocols/jabber/jabber.c:1996
-msgid "Authenticating"
-msgstr "茯�茘�筝�"
-
-#: src/protocols/jabber/jabber.c:2030
-msgid "Unknown login error"
-msgstr "���ョ���糸�ラ���"
-
-#: src/protocols/jabber/jabber.c:2380
-msgid "Password successfully changed."
-msgstr "絲�腆寂信�号������"
-
-#: src/protocols/jabber/jabber.c:2425 src/protocols/jabber/jabber.c:4334
-msgid "Connection lost"
-msgstr "紊怨サ�g�"
-
-#: src/protocols/jabber/jabber.c:2427 src/protocols/jabber/jabber.c:2461
-#: src/protocols/jabber/jabber.c:4336 src/protocols/jabber/jabber.c:4385
-#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:463
-#: src/protocols/msn/notification.c:2100 src/protocols/napster/napster.c:465
-#: src/protocols/napster/napster.c:496 src/protocols/yahoo/yahoo.c:1304
-msgid "Unable to connect"
-msgstr "�≧��g�"
-
-#: src/protocols/jabber/jabber.c:2432
-msgid "Connected"
-msgstr "�g�����"
-
-#: src/protocols/jabber/jabber.c:2435
-msgid "Requesting Authentication Method"
-msgstr "荀�羆�茯�茘����劫�筝�"
-
-#. we have no chats yet
-#: src/protocols/jabber/jabber.c:2455 src/protocols/msn/dispatch.c:219
-#: src/protocols/msn/msn.c:454 src/protocols/napster/napster.c:489
-#: src/protocols/trepia/trepia.c:1141 src/protocols/yahoo/yahoo.c:1327
-msgid "Connecting"
-msgstr "�g�筝�"
-
-#: src/protocols/jabber/jabber.c:2781
-#, c-format
-msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-msgstr "篏睡���� %s ������≧���� Jabber 絽活��鐚���篁ヤ���茴����ュ�医����賢��"
-
-#: src/protocols/jabber/jabber.c:2783
-msgid "Unable to add buddy."
-msgstr "�≧����ュソ����"
-
-#: src/protocols/jabber/jabber.c:2784
-msgid "Jabber Error"
-msgstr "Jabber ���"
-
-#: src/protocols/jabber/jabber.c:3043 src/protocols/yahoo/yahoochat.c:833
-msgid "Room:"
-msgstr "��紊��鐚�"
-
-#: src/protocols/jabber/jabber.c:3048
-msgid "Server:"
-msgstr "篌堺�����"
-
-#: src/protocols/jabber/jabber.c:3054
-msgid "Handle:"
-msgstr "�援┗鐚�"
-
-#: src/protocols/jabber/jabber.c:3084
-msgid "Unable to join chat"
-msgstr "�≧����ヨ��紊��"
-
-#: src/protocols/jabber/jabber.c:3320 src/protocols/jabber/jabber.c:3371
-#: src/protocols/jabber/jabber.c:3793
-msgid "Jabber ID"
-msgstr "Jabber 絽活��"
-
-#: src/protocols/jabber/jabber.c:3321
-msgid "Error"
-msgstr "���"
-
-#: src/protocols/jabber/jabber.c:3372 src/protocols/jabber/jabber.c:3431
-#: src/protocols/jabber/jabber.c:3442 src/protocols/jabber/jabber.c:3819
-msgid "Status"
-msgstr "����"
-
-#: src/protocols/jabber/jabber.c:3442 src/protocols/jabber/jabber.c:3464
-#: src/protocols/oscar/oscar.c:5526
+#: src/protocols/jabber/auth.c:50
+msgid "Server requires SSL for login"
+msgstr "�糸�ラ����篌堺������荀�篏睡�� SSL"
+
+#: src/protocols/jabber/auth.c:58 src/protocols/jabber/auth.c:342
+#: src/protocols/jabber/auth.c:354
+msgid "Invalid response from server"
+msgstr "�≧����篌堺��������"
+
+#: src/protocols/jabber/auth.c:77 src/protocols/jabber/auth.c:124
+msgid "Server does not use any supported authentication method"
+msgstr "篌堺����研筝���箴�篁私�筝�腮�←��吡��茯�茘��劫�"
+
+# XXX 絅遵���鋋����茘�����緇��拷��
+#: src/protocols/jabber/auth.c:327
+msgid "Invalid challenge from server"
+msgstr "篌堺������箴�篋��≧��������"
+
+#: src/protocols/jabber/auth.c:357
+msgid "Bad Protocol"
+msgstr "�≧������絎�"
+
+#: src/protocols/jabber/auth.c:360
+msgid "Encryption Required"
+msgstr "綽�����絲�"
+
+#: src/protocols/jabber/auth.c:363
+msgid "Invalid authzid"
+msgstr "�≧���� authzid"
+
+# XXX 荀�荀��ヨ⑮��
+#: src/protocols/jabber/auth.c:366
+msgid "Invalid Mechanism"
+msgstr "罘��句�≧��"
+
+# XXX 荀�荀��ヨ⑮��
+#: src/protocols/jabber/auth.c:368
+msgid "Invalid Realm"
+msgstr "�����≧��"
+
+# XXX 荀�荀��ヨ⑮��
+#: src/protocols/jabber/auth.c:371
+msgid "Mechanism Too Weak"
+msgstr "罘��九お綣�"
+
+#: src/protocols/jabber/auth.c:374 src/protocols/jabber/jabber.c:130
+#: src/protocols/jabber/jabber.c:806 src/protocols/jabber/jabber.c:856
+#: src/protocols/oscar/oscar.c:5472
 msgid "Not Authorized"
 msgstr "���茘�"
 
-#: src/protocols/jabber/jabber.c:3481
-msgid "View Error Msg"
-msgstr "茹������荐���"
-
-#: src/protocols/jabber/jabber.c:3500
-msgid "Un-hide From"
-msgstr "�乗昆腟�"
-
-#: src/protocols/jabber/jabber.c:3503
-msgid "Temporarily Hide From"
-msgstr "�����沿昆��"
-
-#: src/protocols/jabber/jabber.c:3510
-msgid "Cancel Presence Notification"
-msgstr "��羔��榊憥����"
-
-#: src/protocols/jabber/jabber.c:3518
-msgid "Re-request authorization"
-msgstr "���域�羆�茯�茘�"
-
-#: src/protocols/jabber/jabber.c:3721
+#: src/protocols/jabber/auth.c:377
+msgid "Temporary Authentication Failure"
+msgstr "茯�茘�����紊掩��"
+
+#: src/protocols/jabber/auth.c:379
+msgid "Authentication Failure"
+msgstr "茯�茘�紊掩��"
+
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:3722
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "紮�"
 
-#: src/protocols/jabber/jabber.c:3723
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "��"
 
-#: src/protocols/jabber/jabber.c:3724 src/protocols/yahoo/yahoo.c:2045
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:631
+#: src/protocols/jabber/jabber.c:554 src/protocols/yahoo/yahoo.c:2677
 msgid "Nickname"
 msgstr "�援┗"
 
-#: src/protocols/jabber/jabber.c:3726
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:659
 msgid "Street Address"
 msgstr "茵����医��"
 
-#: src/protocols/jabber/jabber.c:3727
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:655
 msgid "Extended Address"
 msgstr "�医��(膾�)"
 
-#: src/protocols/jabber/jabber.c:3728
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:663
 msgid "Locality"
 msgstr "絽��掩��"
 
-#: src/protocols/jabber/jabber.c:3729
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:667
 msgid "Region"
 msgstr "���怨�"
 
-#: src/protocols/jabber/jabber.c:3730
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/jabber.c:584
 msgid "Postal Code"
 msgstr "�級������"
 
-#: src/protocols/jabber/jabber.c:3732
+#. Country
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:676
+#: src/protocols/trepia/trepia.c:330 src/protocols/trepia/trepia.c:439
+msgid "Country"
+msgstr "��絎�"
+
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:687
+#: src/protocols/jabber/buddy.c:694
 msgid "Telephone"
 msgstr "�肢�"
 
-#: src/protocols/jabber/jabber.c:3734
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:705
+#: src/protocols/jabber/buddy.c:713 src/protocols/yahoo/yahoo.c:2671
+msgid "Email"
+msgstr "�糸��灸散"
+
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:728
 msgid "Organization Name"
 msgstr "��絮��罕�"
 
-#: src/protocols/jabber/jabber.c:3735
+#: src/protocols/jabber/buddy.c:267 src/protocols/jabber/buddy.c:732
 msgid "Organization Unit"
 msgstr "��絮�����"
 
-#: src/protocols/jabber/jabber.c:3736
+#: src/protocols/jabber/buddy.c:268 src/protocols/jabber/buddy.c:738
 msgid "Title"
 msgstr "�潔��"
 
-#: src/protocols/jabber/jabber.c:3737
+#: src/protocols/jabber/buddy.c:269 src/protocols/jabber/buddy.c:741
 msgid "Role"
 msgstr "�決岡"
 
-#: src/protocols/jabber/jabber.c:3738 src/protocols/oscar/oscar.c:3997
+#: src/protocols/jabber/buddy.c:270 src/protocols/jabber/buddy.c:634
+#: src/protocols/oscar/oscar.c:3926
 msgid "Birthday"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:4196 src/protocols/jabber/jabber.c:4197
+#: src/protocols/jabber/buddy.c:514 src/protocols/jabber/buddy.c:515
 msgid "Edit Jabber vCard"
 msgstr "膩�鹿 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4198
+#: src/protocols/jabber/buddy.c:516
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "篁ヤ�������罨�篏��醇���御���х������Ű�莠後�ユ���活叱�ユ���喝゛�ョ��荐����喝���"
 
-#: src/protocols/jabber/jabber.c:4271
-msgid "Server Registration successful!"
-msgstr "篌堺����┿������鐚�"
-
-#: src/protocols/jabber/jabber.c:4287
-#, c-format
-msgid "Error %d: %s"
-msgstr "��� %d鐚�%s"
-
-#: src/protocols/jabber/jabber.c:4292
-msgid "Unknown registration error"
-msgstr "���ョ��荐糸�����"
+#: src/protocols/jabber/buddy.c:554
+msgid "Jabber ID"
+msgstr "Jabber 絽活��"
+
+#: src/protocols/jabber/buddy.c:564 src/protocols/jabber/buddy.c:571
+#: src/protocols/jabber/buddy.c:582 src/protocols/jabber/jabber.c:843
+#: src/protocols/jabber/jabber.c:856
+msgid "Status"
+msgstr "����"
+
+# XXX
+#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:1080
+msgid "Resource"
+msgstr "莖�羣�"
+
+# TODO: Untranslated
+# NOTE: ���㊥��茘����銀�����鐚�篏�筝㊥����罔h⑮篁��倶��お���
+#: src/protocols/jabber/buddy.c:624
+msgid "Middle Name"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:639 src/protocols/jabber/jabber.c:569
+#: src/protocols/oscar/oscar.c:3943 src/protocols/oscar/oscar.c:3959
+msgid "Address"
+msgstr "�医��"
+
+#: src/protocols/jabber/buddy.c:651
+msgid "P.O. Box"
+msgstr "�究�推拭膊�"
+
+#: src/protocols/jabber/buddy.c:757
+msgid "Photo"
+msgstr "�х��"
+
+# TODO Untranslated <- ����筝㊥��腮�綺�����緇�綏�
+#: src/protocols/jabber/buddy.c:757
+msgid "Logo"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:771
+msgid "Jabber Profile"
+msgstr "Jabber ��篋肴���"
+
+#: src/protocols/jabber/buddy.c:866
+msgid "Un-hide From"
+msgstr "�乗昆腟�"
+
+#: src/protocols/jabber/buddy.c:869
+msgid "Temporarily Hide From"
+msgstr "�����沿昆��"
+
+#: src/protocols/jabber/buddy.c:877
+msgid "Cancel Presence Notification"
+msgstr "��羔��榊憥����"
+
+#: src/protocols/jabber/buddy.c:885
+msgid "Re-request authorization"
+msgstr "���域�羆�茯�茘�"
+
+#: src/protocols/jabber/chat.c:36 src/protocols/yahoo/yahoochat.c:870
+msgid "Room:"
+msgstr "��紊��鐚�"
+
+#: src/protocols/jabber/chat.c:43
+msgid "Server:"
+msgstr "篌堺�����"
+
+#: src/protocols/jabber/chat.c:49
+msgid "Handle:"
+msgstr "�援┗鐚�"
+
+# XXX 茘�����緇��拷��
+#: src/protocols/jabber/jabber.c:80
+msgid "Error initializing session"
+msgstr "絨�綏ヤ�����画���紮������主��篋����"
+
+#: src/protocols/jabber/jabber.c:105
+msgid "Bad Format"
+msgstr "�≧�����弱�"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:107
+msgid "Bad Namespace Prefix"
+msgstr "�≧���� Namespace Prefix"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:110
+msgid "Resource Conflict"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:112
+msgid "Connection Timeout"
+msgstr "�g�綏臥�丈��"
+
+#: src/protocols/jabber/jabber.c:114
+msgid "Host Gone"
+msgstr "篌堺�����紊延�"
+
+#: src/protocols/jabber/jabber.c:116
+msgid "Host Unknown"
+msgstr "筝�����篌堺����"
+
+#: src/protocols/jabber/jabber.c:118
+msgid "Improper Addressing"
+msgstr "�����絎���"
+
+#: src/protocols/jabber/jabber.c:120
+msgid "Internal Server Error"
+msgstr "篌堺�����ч�����"
+
+#: src/protocols/jabber/jabber.c:122
+msgid "Invalid ID"
+msgstr "絽活���≧��"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:124
+#, fuzzy
+msgid "Invalid Namespace"
+msgstr "�遵��腥咲���≧��"
+
+#: src/protocols/jabber/jabber.c:126
+msgid "Invalid XML"
+msgstr "�≧���� XML"
+
+# TODO Untranslated ���坂��ュ���茯��藝�
+#: src/protocols/jabber/jabber.c:128
+msgid "Non-matching Hosts"
+msgstr ""
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:132
+msgid "Policy Violation"
+msgstr ""
+
+# XXX ��綽�荀�荀��ヨ⑮��
+#: src/protocols/jabber/jabber.c:134
+msgid "Remote Connection Failed"
+msgstr "��腴��g�紊掩��"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:136
+msgid "Resource Constraint"
+msgstr ""
+
+# TODO Untranslated ���坂��ュ���茯��藝�
+#: src/protocols/jabber/jabber.c:138
+msgid "Restricted XML"
+msgstr ""
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:140
+msgid "See Other Host"
+msgstr ""
+
+# XXX 荀�荀��ヨ⑮��
+#: src/protocols/jabber/jabber.c:142
+msgid "System Shutdown"
+msgstr "膤紫輝荀���罘�"
+
+# TODO Untranslated ���坂��ラ������茯��藝�
+#: src/protocols/jabber/jabber.c:144
+msgid "Undefined Condition"
+msgstr ""
+
+# TODO Untranslated ���坂��ラ������茯��藝�
+#: src/protocols/jabber/jabber.c:146
+msgid "Unsupported Condition"
+msgstr ""
+
+# TODO ���坂��ラ������茯��藝�
+#: src/protocols/jabber/jabber.c:148
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:150
+msgid "Unsupported Version"
+msgstr "筝���吡������"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:152
+msgid "XML Not Well Formed"
+msgstr ""
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:154
+msgid "Stream Error"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:232 src/protocols/msn/msn.c:82
+#: src/protocols/msn/msn.c:102 src/protocols/msn/msn.c:160
+#: src/protocols/msn/msn.c:260 src/protocols/msn/msn.c:516
+#: src/protocols/msn/msn.c:627 src/protocols/msn/msn.c:643
+#: src/protocols/msn/msn.c:691 src/protocols/msn/msn.c:714
+#: src/protocols/msn/msn.c:746 src/protocols/msn/msn.c:754
+#: src/protocols/msn/msn.c:787 src/protocols/msn/msn.c:795
+#: src/protocols/msn/msn.c:809 src/protocols/msn/msn.c:818
+#: src/protocols/msn/msn.c:832 src/protocols/msn/msn.c:856
+#: src/protocols/msn/msn.c:906 src/protocols/msn/msn.c:944
+#: src/protocols/msn/msn.c:1041 src/protocols/msn/msn.c:1073
+#: src/protocols/msn/msn.c:1094 src/protocols/msn/msn.c:1105
+#: src/protocols/msn/msn.c:1116 src/protocols/msn/msn.c:1140
+#: src/protocols/msn/msn.c:1152 src/protocols/msn/msn.c:1217
+#: src/protocols/msn/notification.c:179 src/protocols/msn/notification.c:207
+#: src/protocols/msn/notification.c:1645 src/protocols/msn/notification.c:1665
+#: src/protocols/trepia/trepia.c:239 src/protocols/trepia/trepia.c:740
+#: src/protocols/trepia/trepia.c:1023 src/protocols/trepia/trepia.c:1067
+#: src/protocols/trepia/trepia.c:1166 src/protocols/trepia/trepia.c:1222
+msgid "Write error"
+msgstr "絲��ラ���"
+
+# NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
+#: src/protocols/jabber/jabber.c:269 src/protocols/jabber/jabber.c:289
+msgid "Read Error"
+msgstr "莅������"
+
+#: src/protocols/jabber/jabber.c:394 src/protocols/jabber/jabber.c:671
+#: src/protocols/trepia/trepia.c:1106
+msgid "Unable to create socket"
+msgstr "�≧�綮榊� Socket"
+
+#: src/protocols/jabber/jabber.c:419
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "����荐糸�� %s@%s"
+
+#: src/protocols/jabber/jabber.c:421 src/protocols/jabber/jabber.c:422
+msgid "Registration Successful"
+msgstr "荐糸������"
+
+#: src/protocols/jabber/jabber.c:431
+msgid "Unknown Error"
+msgstr "���ラ���"
+
+#: src/protocols/jabber/jabber.c:434
+#, c-format
+msgid "Registration of %s@%s failed: %s"
+msgstr "%s@%s 荐糸��紊掩��鐚�%s"
+
+#: src/protocols/jabber/jabber.c:436 src/protocols/jabber/jabber.c:437
+msgid "Registration Failed"
+msgstr "荐糸��紊掩��"
+
+#: src/protocols/jabber/jabber.c:524 src/protocols/jabber/jabber.c:525
+msgid "Already Registered"
+msgstr "綏牙�荐糸��"
+
+#: src/protocols/jabber/jabber.c:538 src/protocols/jabber/jabber.c:951
+msgid "Password"
+msgstr "絲�腆�"
+
+#: src/protocols/jabber/jabber.c:549
+msgid "E-Mail"
+msgstr "�糸��灸散"
+
+#. First Name
+#: src/protocols/jabber/jabber.c:559 src/protocols/oscar/oscar.c:3897
+#: src/protocols/trepia/trepia.c:258
+msgid "First Name"
+msgstr "��"
+
+#. State
+#: src/protocols/jabber/jabber.c:579 src/protocols/oscar/oscar.c:3949
+#: src/protocols/oscar/oscar.c:3965 src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:430
+msgid "State"
+msgstr "���怨�"
+
+#: src/protocols/jabber/jabber.c:589
+msgid "Phone"
+msgstr "�肢�"
+
+#: src/protocols/jabber/jabber.c:607
+msgid "Please fill out the information below to register your new account."
+msgstr "�堺�����医験�区┿��鐚�茫�紂��筝���莖���鐚�"
+
+#: src/protocols/jabber/jabber.c:610 src/protocols/jabber/jabber.c:611
+msgid "Register New Jabber Account"
+msgstr "荐糸���亥�� Jabber 絽恰��"
+
+#: src/protocols/jabber/jabber.c:710 src/protocols/msn/dispatch.c:219
+#: src/protocols/msn/msn.c:461 src/protocols/napster/napster.c:487
+#: src/protocols/trepia/trepia.c:1100 src/protocols/yahoo/yahoo.c:1925
+msgid "Connecting"
+msgstr "�g�筝�"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:714
+msgid "Initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:720
+msgid "Authenticating"
+msgstr "茯�茘�筝�"
+
+# TODO Untranslated
+#: src/protocols/jabber/jabber.c:728
+msgid "Re-initializing Stream"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:851 src/protocols/jabber/jabber.c:902
+#: src/protocols/jabber/presence.c:257
+msgid "Error"
+msgstr "���"
+
+#: src/protocols/jabber/jabber.c:867 src/protocols/jabber/jutil.c:100
+#: src/protocols/jabber/presence.c:79
+msgid "Chatty"
+msgstr "�活��紊�"
+
+#: src/protocols/jabber/jabber.c:869 src/protocols/jabber/jutil.c:103
+#: src/protocols/jabber/presence.c:84
+msgid "Extended Away"
+msgstr "�傑�����∫��"
+
+#: src/protocols/jabber/jabber.c:870 src/protocols/jabber/jutil.c:106
+#: src/protocols/jabber/presence.c:86 src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:4532 src/protocols/oscar/oscar.c:6065
+msgid "Do Not Disturb"
+msgstr "茫��炊����"
+
+#: src/protocols/jabber/jabber.c:884
+msgid "Password Changed"
+msgstr "絲�腆寂信�号����"
+
+#: src/protocols/jabber/jabber.c:885
+msgid "Your password has been changed."
+msgstr "����篆��剛�����絲�腆若��"
+
+#: src/protocols/jabber/jabber.c:895
+#, c-format
+msgid "Error changing password: %s"
+msgstr "篆��劫�腆惹�����榊憘����鐚�%s"
+
+#: src/protocols/jabber/jabber.c:899
+msgid "Unknown error occurred changing password"
+msgstr "篆��劫�腆惹�����榊憘�筝��������"
+
+#: src/protocols/jabber/jabber.c:956
+msgid "Password (again)"
+msgstr "��絲�腆種���罨∞∈茯�鐚�"
+
+#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jabber.c:962
+msgid "Change Jabber Password"
+msgstr "篆��� Jabber 絲�腆�"
+
+#: src/protocols/jabber/jabber.c:962
+msgid "Please enter your new password"
+msgstr "茫�莠後�ユ�����医�腆�"
 
 #. *< api_version
 #. *< type
@@ -4966,37 +5231,74 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4495 src/protocols/jabber/jabber.c:4497
+#: src/protocols/jabber/jabber.c:1057 src/protocols/jabber/jabber.c:1059
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber ��絎�罔∞�"
 
-# XXX
-#: src/protocols/jabber/jabber.c:4519
-msgid "Resource"
-msgstr "莖�羣�"
-
-#: src/protocols/jabber/jabber.c:4525
-msgid "Use SSL"
-msgstr "篏睡�� SSL"
-
-#: src/protocols/jabber/jabber.c:4534
+#: src/protocols/jabber/jabber.c:1083
+msgid "Force Old SSL"
+msgstr "綣決辱篏睡����綣� SSL"
+
+#: src/protocols/jabber/jabber.c:1091
 msgid "Connect server"
 msgstr "�g�篌堺����"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:277
-#: src/protocols/msn/notification.c:498
+#: src/protocols/jabber/message.c:95
+#, c-format
+msgid "Message from %s"
+msgstr "�� %s �弱�榊��荐���"
+
+# TODO Untranslated
+#: src/protocols/jabber/message.c:178
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "�≧��渇��荐����� %s鐚�%s"
+
+#: src/protocols/jabber/message.c:181
+msgid "Jabber Message Error"
+msgstr "Jabber 荐������"
+
+#: src/protocols/jabber/message.c:244
+#, c-format
+msgid " (Code %s)"
+msgstr " (篁g⊆ %s)"
+
+#: src/protocols/jabber/parser.c:129
+msgid "XML Parse error"
+msgstr "XML �������"
+
+#: src/protocols/jabber/presence.c:167
+#, c-format
+msgid "%s (Code %s)"
+msgstr "%s (篁g⊆ %s)"
+
+#: src/protocols/jabber/presence.c:172
+msgid "Unknown Error in presence"
+msgstr "��∈絎�絅遵����g�������鐚��主��篋����ョ�����"
+
+#: src/protocols/jabber/presence.c:176
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "篏睡���� %s �活�絨������ヤ�鐚�絅刻���絅遵�羝���賢��"
+
+#: src/protocols/jabber/presence.c:253
+msgid "Unable to join chat"
+msgstr "�≧����ヨ��紊��"
+
+#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:278
+#: src/protocols/msn/notification.c:499
 msgid "Unable to request USR\n"
 msgstr "�≧���緇� USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:294
+#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:295
 msgid "Unable to login using MD5"
 msgstr "�≧�篏睡�� MD5 �糸��"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:303
+#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:304
 msgid "Unable to send USR"
 msgstr "�≧����� USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:308
+#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:309
 msgid "Requesting to send password"
 msgstr "���阪�腆寂賢"
 
@@ -5004,15 +5306,15 @@
 msgid "Protocol version not supported"
 msgstr "筝���吨������������荐���絎�"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:760
+#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:761
 msgid "Unable to request CVR\n"
 msgstr "�≧���緇� CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:769
+#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:770
 msgid "Unable to request INF\n"
 msgstr "�≧���緇� INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1877
+#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1879
 msgid "Got invalid XFR"
 msgstr "��緇��≧���� XFR"
 
@@ -5024,16 +5326,23 @@
 msgid "Unable to parse message."
 msgstr "�≧�茹f��荐�����"
 
-#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:865
-#: src/protocols/msn/notification.c:2122
+#: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:470
+#: src/protocols/msn/notification.c:2102 src/protocols/napster/napster.c:463
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1717
+#: src/protocols/yahoo/yahoo.c:1748 src/protocols/yahoo/yahoo.c:1813
+msgid "Unable to connect"
+msgstr "�≧��g�"
+
+#: src/protocols/msn/dispatch.c:239 src/protocols/msn/notification.c:866
+#: src/protocols/msn/notification.c:2124
 msgid "Unable to write to server"
 msgstr "�≧�絲��ュ�遺失����"
 
-#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2129
+#: src/protocols/msn/dispatch.c:243 src/protocols/msn/notification.c:2131
 msgid "Syncing with server"
 msgstr "��篌堺������罩ヤ賢"
 
-#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2143
+#: src/protocols/msn/dispatch.c:257 src/protocols/msn/notification.c:2145
 msgid "Error reading from server"
 msgstr "�延失����������主�����"
 
@@ -5055,9 +5364,8 @@
 msgid "Fully Qualified Domain Name missing"
 msgstr "羃�腟��絎��顔������腮� (FQDN)"
 
-# XXX ��������羈�筝������
 #: src/protocols/msn/error.c:47
-msgid "Already Login"
+msgid "Already Logged In"
 msgstr "綏牙��糸��"
 
 #: src/protocols/msn/error.c:50
@@ -5132,14 +5440,15 @@
 msgid "Too many hits to a FND"
 msgstr "FND ��腟�����紊���拷��"
 
-#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:185
+#: src/protocols/msn/error.c:107 src/protocols/oscar/oscar.c:179
 msgid "Not logged in"
 msgstr "絨����糸��"
 
 # XXX ���延���膓牙� (www.hypothetic.org) 膃�500�����
+# NOTE 茘����翫�� by Ambrose
 #: src/protocols/msn/error.c:111
 msgid "Internal server error"
-msgstr "�ч��失�������"
+msgstr "篌堺�����ч�����"
 
 #: src/protocols/msn/error.c:114
 msgid "Database server error"
@@ -5186,8 +5495,8 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR ���御�����ユ�������荐援��"
 
-#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:612
-#: src/protocols/msn/notification.c:1258 src/protocols/msn/notification.c:1426
+#: src/protocols/msn/error.c:154 src/protocols/msn/notification.c:613
+#: src/protocols/msn/notification.c:1259 src/protocols/msn/notification.c:1427
 msgid "Unable to write"
 msgstr "�≧�絲���"
 
@@ -5220,8 +5529,8 @@
 msgid "Server too busy"
 msgstr "篌堺����お綽�腆�"
 
-#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1085
-#: src/protocols/toc/toc.c:662
+#: src/protocols/msn/error.c:190 src/protocols/oscar/oscar.c:1074
+#: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "茯�茘�紊掩��"
 
@@ -5246,38 +5555,38 @@
 msgid "Unknown Error Code %d"
 msgstr "���ョ�����篁g⊆ %d"
 
-#: src/protocols/msn/msn.c:63
+#: src/protocols/msn/msn.c:70
 msgid "Your new MSN friendly name is too long."
 msgstr "������ MSN �援┗紊��激��"
 
-#: src/protocols/msn/msn.c:170
+#: src/protocols/msn/msn.c:177
 msgid "Set your friendly name."
 msgstr "荐㊤������援┗��"
 
 # NOTE MSN���援┗筝���Yahoo鐚�篏睡������札莠後�ヤ算篏����井�援┗鐚�
 # NOTE �割戎��篏睡������絽活��罸��♂��篆�鐚�篌寂�箙���������
 # XXX ����箴��������菴医��篋�絲�����篏睡�����弱�榊��茫�羆��怨�馹�
-#: src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:178
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "�ヤ査�� MSN �ラ�掩������篋肴�����蕁�ず�����援┗��"
 
-#: src/protocols/msn/msn.c:183
+#: src/protocols/msn/msn.c:190
 msgid "Set your home phone number."
 msgstr "荐㊤�����篏鎘狗�肢���腆若��"
 
-#: src/protocols/msn/msn.c:194
+#: src/protocols/msn/msn.c:201
 msgid "Set your work phone number."
 msgstr "荐㊤�����莨�����肢���腆若��"
 
-#: src/protocols/msn/msn.c:205
+#: src/protocols/msn/msn.c:212
 msgid "Set your mobile phone number."
 msgstr "荐㊤�����茵����肢���腆若��"
 
-#: src/protocols/msn/msn.c:214
+#: src/protocols/msn/msn.c:221
 msgid "Allow MSN Mobile pages?"
 msgstr "��荐� MSN �喝�種�"
 
-#: src/protocols/msn/msn.c:215
+#: src/protocols/msn/msn.c:222
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -5285,95 +5594,95 @@
 "��������荐怨����ソ��羝���賢��絅遵��渇�� Mobile Page �井����茵����肢�鐚������銀���茵���"
 "茖�臀�����"
 
-#: src/protocols/msn/msn.c:219
+#: src/protocols/msn/msn.c:226
 msgid "Allow"
 msgstr "��荐�"
 
-#: src/protocols/msn/msn.c:220
+#: src/protocols/msn/msn.c:227
 msgid "Disallow"
 msgstr "筝���荐�"
 
-#: src/protocols/msn/msn.c:237
+#: src/protocols/msn/msn.c:244
 msgid "Send a mobile message."
 msgstr "���肴���荐�����"
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:246
 msgid "Page"
 msgstr "�喝��"
 
-#: src/protocols/msn/msn.c:325 src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2144
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>����鐚�</b>%s"
 
-#: src/protocols/msn/msn.c:338 src/protocols/msn/msn.c:596
+#: src/protocols/msn/msn.c:345 src/protocols/msn/msn.c:603
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "筝����肢����"
 
-#: src/protocols/msn/msn.c:339 src/protocols/msn/msn.c:598
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1407
-#: src/protocols/yahoo/yahoo.c:1705 src/protocols/yahoo/yahoo.c:1805
+#: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:605
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2010
+#: src/protocols/yahoo/yahoo.c:2308 src/protocols/yahoo/yahoo.c:2408
 msgid "Be Right Back"
 msgstr "薤����箴�"
 
-#: src/protocols/msn/msn.c:340 src/protocols/msn/msn.c:600
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1409
-#: src/protocols/yahoo/yahoo.c:1707 src/protocols/yahoo/yahoo.c:1806
+#: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:607
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2012
+#: src/protocols/yahoo/yahoo.c:2310 src/protocols/yahoo/yahoo.c:2409
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: src/protocols/msn/msn.c:341 src/protocols/msn/msn.c:602
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1417
-#: src/protocols/yahoo/yahoo.c:1715 src/protocols/yahoo/yahoo.c:1810
+#: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:609
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:2318 src/protocols/yahoo/yahoo.c:2413
 msgid "On The Phone"
 msgstr "�肢�筝�"
 
-#: src/protocols/msn/msn.c:342 src/protocols/msn/msn.c:604
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1421
-#: src/protocols/yahoo/yahoo.c:1719 src/protocols/yahoo/yahoo.c:1812
+#: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:611
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2024
+#: src/protocols/yahoo/yahoo.c:2322 src/protocols/yahoo/yahoo.c:2415
 msgid "Out To Lunch"
 msgstr "紊��榊���"
 
-#: src/protocols/msn/msn.c:343 src/protocols/msn/msn.c:606
-#: src/protocols/zephyr/zephyr.c:870 src/protocols/zephyr/zephyr.c:885
+#: src/protocols/msn/msn.c:350 src/protocols/msn/msn.c:613
+#: src/protocols/zephyr/zephyr.c:883 src/protocols/zephyr/zephyr.c:898
 msgid "Hidden"
 msgstr "�沿��"
 
-#: src/protocols/msn/msn.c:355
+#: src/protocols/msn/msn.c:362
 msgid "Set Friendly Name"
 msgstr "荐㊤��援┗"
 
-#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:370
 msgid "Set Home Phone Number"
 msgstr "荐㊤�篏鎘狗�肢���腆�"
 
-#: src/protocols/msn/msn.c:369
+#: src/protocols/msn/msn.c:376
 msgid "Set Work Phone Number"
 msgstr "荐㊤�綏ヤ��肢���腆�"
 
-#: src/protocols/msn/msn.c:375
+#: src/protocols/msn/msn.c:382
 msgid "Set Mobile Phone Number"
 msgstr "荐㊤�茵����肢���腆�"
 
-#: src/protocols/msn/msn.c:384
+#: src/protocols/msn/msn.c:391
 msgid "Enable/Disable Mobile Devices"
 msgstr "���� / ����茵���茖�臀�"
 
-#: src/protocols/msn/msn.c:391
+#: src/protocols/msn/msn.c:398
 msgid "Allow/Disallow Mobile Pages"
 msgstr "��荐� / 筝���荐� Mobile Page"
 
-#: src/protocols/msn/msn.c:417
+#: src/protocols/msn/msn.c:424
 msgid "Send to Mobile"
 msgstr "�渇���活����肢�"
 
 # NOTE: ��茘�����茯�
-#: src/protocols/msn/msn.c:426
+#: src/protocols/msn/msn.c:433
 msgid "Initiate Chat"
 msgstr "������紊��"
 
-#: src/protocols/msn/msn.c:720
+#: src/protocols/msn/msn.c:727
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5382,11 +5691,11 @@
 "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com����"
 "��絨�筝���莅��贋������荐掩�����"
 
-#: src/protocols/msn/msn.c:724 src/protocols/msn/msn.c:764
+#: src/protocols/msn/msn.c:731 src/protocols/msn/msn.c:771
 msgid "Invalid MSN screenname"
 msgstr "�≧���� MSN 篏睡����絽活��"
 
-#: src/protocols/msn/msn.c:760
+#: src/protocols/msn/msn.c:767
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -5395,67 +5704,77 @@
 "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com����"
 "��絨�筝���莅��贋������腟�羝�����"
 
-#: src/protocols/msn/msn.c:1228 src/protocols/yahoo/yahoo.c:1975
+#: src/protocols/msn/msn.c:1241 src/protocols/yahoo/yahoo.c:2584
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>莅�����篋肴�荐����主�����</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1288 src/protocols/oscar/oscar.c:4002
-#: src/protocols/trepia/trepia.c:317 src/protocols/trepia/trepia.c:445
-#: src/protocols/yahoo/yahoo.c:2057
+#: src/protocols/msn/msn.c:1309 src/protocols/oscar/oscar.c:3931
+#: src/protocols/trepia/trepia.c:276 src/protocols/trepia/trepia.c:404
+#: src/protocols/yahoo/yahoo.c:2695
 msgid "Age"
 msgstr "綛顔宗"
 
 #. Gender
-#: src/protocols/msn/msn.c:1292 src/protocols/oscar/oscar.c:3988
-#: src/protocols/trepia/trepia.c:311 src/protocols/trepia/trepia.c:453
-#: src/protocols/yahoo/yahoo.c:2065
+#: src/protocols/msn/msn.c:1316 src/protocols/oscar/oscar.c:3917
+#: src/protocols/trepia/trepia.c:270 src/protocols/trepia/trepia.c:412
+#: src/protocols/yahoo/yahoo.c:2707
 msgid "Gender"
 msgstr "�у��"
 
-#: src/protocols/msn/msn.c:1296 src/protocols/yahoo/yahoo.c:2061
+#: src/protocols/msn/msn.c:1324 src/protocols/yahoo/yahoo.c:2701
 msgid "Marital Status"
 msgstr "紿�紮紫��羈�"
 
-#: src/protocols/msn/msn.c:1300 src/protocols/yahoo/yahoo.c:2053
+#: src/protocols/msn/msn.c:1331 src/protocols/yahoo/yahoo.c:2689
 msgid "Location"
 msgstr "�����臀�"
 
-#: src/protocols/msn/msn.c:1304 src/protocols/yahoo/yahoo.c:2069
+#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo.c:2713
 msgid "Occupation"
 msgstr "�傑キ"
 
-#: src/protocols/msn/msn.c:1317 src/protocols/msn/msn.c:1324
-#: src/protocols/msn/msn.c:1332 src/protocols/msn/msn.c:1340
-#: src/protocols/msn/msn.c:1347
+#: src/protocols/msn/msn.c:1356 src/protocols/msn/msn.c:1362
+#: src/protocols/msn/msn.c:1369 src/protocols/msn/msn.c:1376
+#: src/protocols/msn/msn.c:1383
 msgid "A Little About Me"
 msgstr "����膂>�"
 
-#: src/protocols/msn/msn.c:1353 src/protocols/msn/msn.c:1366
-#: src/protocols/msn/msn.c:1373
+#: src/protocols/msn/msn.c:1392 src/protocols/msn/msn.c:1405
+#: src/protocols/msn/msn.c:1412
 msgid "Favorite Things"
 msgstr "����篋���"
 
-#: src/protocols/msn/msn.c:1379 src/protocols/msn/msn.c:1386
-#: src/protocols/msn/msn.c:1393
+#: src/protocols/msn/msn.c:1421 src/protocols/msn/msn.c:1427
+#: src/protocols/msn/msn.c:1434
 msgid "Hobbies and Interests"
 msgstr "��絅�/��莇�"
 
-#: src/protocols/msn/msn.c:1399 src/protocols/msn/msn.c:1405
-#: src/protocols/yahoo/yahoo.c:2089
+#: src/protocols/msn/msn.c:1443 src/protocols/msn/msn.c:1449
+#: src/protocols/yahoo/yahoo.c:2757
 msgid "Favorite Quote"
 msgstr "�恰����荐�"
 
-#: src/protocols/msn/msn.c:1410 src/protocols/yahoo/yahoo.c:2118
+#: src/protocols/msn/msn.c:1457 src/protocols/yahoo/yahoo.c:2801
 msgid "Last Updated"
 msgstr "�贋�井�ユ��"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1417 src/protocols/trepia/trepia.c:321
-#: src/protocols/trepia/trepia.c:489
+#: src/protocols/msn/msn.c:1468 src/protocols/trepia/trepia.c:280
+#: src/protocols/trepia/trepia.c:448
 msgid "Homepage"
 msgstr "膓臥��"
 
+# NOTE 茘����翫�� by Ambrose
+#: src/protocols/msn/msn.c:1490 src/protocols/yahoo/yahoo.c:2819
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "�≧���緇�篏睡���� %s ����篋肴�荐�"
+
+#: src/protocols/msn/msn.c:1492 src/protocols/yahoo/yahoo.c:2821
+msgid "The user's profile is empty."
+msgstr "����篏睡������莖�荐�����順����"
+
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -5466,82 +5785,82 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1505 src/protocols/msn/msn.c:1507
+#: src/protocols/msn/msn.c:1590 src/protocols/msn/msn.c:1592
 msgid "MSN Protocol Plugin"
 msgstr "MSN ��絎�罔∞�"
 
-#: src/protocols/msn/msn.c:1524 src/protocols/trepia/trepia.c:1371
+#: src/protocols/msn/msn.c:1611 src/protocols/trepia/trepia.c:1330
 msgid "Login server"
 msgstr "�糸�ヤ失����"
 
-#: src/protocols/msn/notification.c:246
+#: src/protocols/msn/notification.c:247
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN ���鐚�%s\n"
 
-#: src/protocols/msn/notification.c:362 src/protocols/msn/notification.c:523
+#: src/protocols/msn/notification.c:363 src/protocols/msn/notification.c:524
 msgid "Unable to write to MSN Nexus server."
 msgstr "�≧�絲��ュ�� MSN �� Nexus 篌堺������"
 
-#: src/protocols/msn/notification.c:371 src/protocols/msn/notification.c:538
+#: src/protocols/msn/notification.c:372 src/protocols/msn/notification.c:539
 msgid "Unable to read from MSN Nexus server."
 msgstr "�≧��� MSN �� Nexus 篌堺���������"
 
-#: src/protocols/msn/notification.c:391
+#: src/protocols/msn/notification.c:392
 msgid "MSN Nexus server returned invalid redirect information."
 msgstr "MSN Nexus 篌堺�����喝���≧�������医���莖�荐���"
 
-#: src/protocols/msn/notification.c:437
+#: src/protocols/msn/notification.c:438
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "��荅���� MSN ���糸�ヤ失�����画�茯�茘�����鐚��主��篋�筝����������"
 
-#: src/protocols/msn/notification.c:549
+#: src/protocols/msn/notification.c:550
 msgid "MSN Nexus server returned invalid information."
 msgstr "MSN �� Nexus 篌堺�����喝��篋��≧����莖�荐���"
 
-#: src/protocols/msn/notification.c:617 src/protocols/trepia/trepia.c:718
+#: src/protocols/msn/notification.c:618 src/protocols/trepia/trepia.c:677
 msgid "Retrieving buddy list"
 msgstr "莅���絅遵�羝���賢"
 
-#: src/protocols/msn/notification.c:679
+#: src/protocols/msn/notification.c:680
 msgid "Unable to connect to passport server"
 msgstr "�≧��g��� Passport 篌堺������"
 
-#: src/protocols/msn/notification.c:684 src/protocols/msn/notification.c:716
+#: src/protocols/msn/notification.c:685 src/protocols/msn/notification.c:717
 msgid "Password sent"
 msgstr "絲�腆守����"
 
-#: src/protocols/msn/notification.c:711
+#: src/protocols/msn/notification.c:712
 msgid "Unable to send password"
 msgstr "�≧����阪�腆�"
 
-#: src/protocols/msn/notification.c:747
+#: src/protocols/msn/notification.c:748
 msgid "Protocol not supported"
 msgstr "筝���吨������荐���絎�"
 
-#: src/protocols/msn/notification.c:789
+#: src/protocols/msn/notification.c:790
 msgid "You have been disconnected. You have signed on from another location."
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ャ��"
 
-#: src/protocols/msn/notification.c:794
+#: src/protocols/msn/notification.c:795
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "��群筝㊥�潔�g�鐚�MSN 篌堺���������������"
 
-#: src/protocols/msn/notification.c:920
+#: src/protocols/msn/notification.c:921
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "篏睡���� %s鐚�%s鐚��活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝�����"
 
-#: src/protocols/msn/notification.c:1239 src/protocols/msn/notification.c:1405
+#: src/protocols/msn/notification.c:1240 src/protocols/msn/notification.c:1406
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "篏睡���� %s鐚�%s鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���"
 
-#: src/protocols/msn/notification.c:1919
+#: src/protocols/msn/notification.c:1921
 msgid "Unable to transfer to notification server"
 msgstr "�≧��渇���渇���ヤ失����"
 
-#: src/protocols/msn/notification.c:2063
+#: src/protocols/msn/notification.c:2065
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5576,50 +5895,50 @@
 msgid "An MSN message may not have been received."
 msgstr "���� MSN 荐�����醇�茴��九�違��"
 
-#: src/protocols/napster/napster.c:232
+#: src/protocols/napster/napster.c:228
 msgid "Unable to read header from server"
 msgstr "�≧��延失�������罔��㊧�荐�"
 
-#: src/protocols/napster/napster.c:246
+#: src/protocols/napster/napster.c:242
 #, c-format
 msgid "Unable to read message from server.  Command is %hd, length is %hd."
 msgstr "�≧��延失�������莖�荐�����篁ょ�� %hd鐚��桁墾�� %hd��"
 
-#: src/protocols/napster/napster.c:307
+#: src/protocols/napster/napster.c:303
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "篏睡����鐚�%s鐚�罟�罅�鐚�%s鐚�紊у�鐚�%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:318
+#: src/protocols/napster/napster.c:314
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "�≧�絨���%s�����ユ���� Napster �演��羝���賢"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:322
 msgid "You were disconnected from the server."
 msgstr "��群膓���罩∵��篌堺�������g���"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:382
+#: src/protocols/napster/napster.c:378
 #, c-format
 msgid "%s requested your information"
 msgstr "%s �ヨ�����篏睡����莖�荐�"
 
-#: src/protocols/napster/napster.c:412
+#: src/protocols/napster/napster.c:410
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ャ��"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:418
+#: src/protocols/napster/napster.c:416
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 荀�羆�筝��� PING"
 
-#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5223
-#: src/protocols/toc/toc.c:1261
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5151
+#: src/protocols/toc/toc.c:1258
 msgid "Join what group:"
 msgstr "���ュ����臂ょ�鐚�"
 
@@ -5633,182 +5952,182 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
+#: src/protocols/napster/napster.c:619 src/protocols/napster/napster.c:621
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER ��絎�罔∞�"
 
 # NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
-#: src/protocols/oscar/oscar.c:181
+#: src/protocols/oscar/oscar.c:175
 msgid "Invalid error"
 msgstr "�≧�����"
 
-#: src/protocols/oscar/oscar.c:182
+#: src/protocols/oscar/oscar.c:176
 msgid "Invalid SNAC"
 msgstr "�≧���� SNAC"
 
-#: src/protocols/oscar/oscar.c:183
+#: src/protocols/oscar/oscar.c:177
 msgid "Rate to host"
 msgstr "�遺失��������"
 
-#: src/protocols/oscar/oscar.c:184
+#: src/protocols/oscar/oscar.c:178
 msgid "Rate to client"
 msgstr "�医��句�����"
 
+#: src/protocols/oscar/oscar.c:180
+msgid "Service unavailable"
+msgstr "篌堺�����絖���"
+
+#: src/protocols/oscar/oscar.c:181
+msgid "Service not defined"
+msgstr "羃�����絎�����"
+
+#: src/protocols/oscar/oscar.c:182
+msgid "Obsolete SNAC"
+msgstr "������ SNAC"
+
+#: src/protocols/oscar/oscar.c:183
+msgid "Not supported by host"
+msgstr "篌堺��������"
+
+#: src/protocols/oscar/oscar.c:184
+msgid "Not supported by client"
+msgstr "鎘∽�句�筝����"
+
+#: src/protocols/oscar/oscar.c:185
+msgid "Refused by client"
+msgstr "頮���句���腟�"
+
 #: src/protocols/oscar/oscar.c:186
-msgid "Service unavailable"
-msgstr "篌堺�����絖���"
+msgid "Reply too big"
+msgstr "��荀�紊�ぇ篋�"
 
 #: src/protocols/oscar/oscar.c:187
-msgid "Service not defined"
-msgstr "羃�����絎�����"
+msgid "Responses lost"
+msgstr "�阪け����"
 
 #: src/protocols/oscar/oscar.c:188
-msgid "Obsolete SNAC"
-msgstr "������ SNAC"
-
-#: src/protocols/oscar/oscar.c:189
-msgid "Not supported by host"
-msgstr "篌堺��������"
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Not supported by client"
-msgstr "鎘∽�句�筝����"
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Refused by client"
-msgstr "頮���句���腟�"
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Reply too big"
-msgstr "��荀�紊�ぇ篋�"
-
-#: src/protocols/oscar/oscar.c:193
-msgid "Responses lost"
-msgstr "�阪け����"
-
-#: src/protocols/oscar/oscar.c:194
 msgid "Request denied"
 msgstr "荀�羆�茴���"
 
 # NOTE��Busted������SNAC payload����茯�����Luke Schierer��#gaim��箴�
 # NOTE �翫�������嚭�篆������罨♂���渇��紊��莖�荐�篋���
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:189
 msgid "Busted SNAC payload"
 msgstr "SNAC莢�莠���ぇ"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:190
 msgid "Insufficient rights"
 msgstr "罨���筝�紊�"
 
 # NOTE Debian 茘���local���冴�����亥���(Windows ��茘������違��鐚��域⑮�������)
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:191
 msgid "In local permit/deny"
 msgstr "���亥�����荐奄�掩��腟�羝���"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:192
 msgid "Too evil (sender)"
 msgstr "紊����>�鐚�絲�篁銀査鐚�"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:193
 msgid "Too evil (receiver)"
 msgstr "紊����>�鐚��銀散篋削�"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:194
 msgid "User temporarily unavailable"
 msgstr "篏睡��������筝���"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:195
 msgid "No match"
 msgstr "羃����悟�����"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:196
 msgid "List overflow"
 msgstr "羝���頃��"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:197
 msgid "Request ambiguous"
 msgstr "荀�羆�筝���∈"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:198
 msgid "Queue full"
 msgstr "篏���羯推�"
 
-#: src/protocols/oscar/oscar.c:205
+#: src/protocols/oscar/oscar.c:199
 msgid "Not while on AOL"
 msgstr "�� AOL ��筝���荐�"
 
-#: src/protocols/oscar/oscar.c:477
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "�� %s ���恰��荐�������"
 
-#: src/protocols/oscar/oscar.c:479
+#: src/protocols/oscar/oscar.c:472
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "�� %s ���恰��荐���け��"
 
-#: src/protocols/oscar/oscar.c:538 src/protocols/toc/toc.c:222
-#: src/protocols/toc/toc.c:628 src/protocols/toc/toc.c:644
-#: src/protocols/toc/toc.c:712
+#: src/protocols/oscar/oscar.c:531 src/protocols/toc/toc.c:218
+#: src/protocols/toc/toc.c:625 src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "��罩∫�g���"
 
-#: src/protocols/oscar/oscar.c:550 src/protocols/toc/toc.c:888
+#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
 
-#: src/protocols/oscar/oscar.c:566
+#: src/protocols/oscar/oscar.c:559
 msgid "Chat is currently unavailable"
 msgstr "�����≧�篏睡����紊��"
 
-#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:697
+#: src/protocols/oscar/oscar.c:633 src/protocols/oscar/oscar.c:690
 msgid "Couldn't connect to host"
 msgstr "�≧��e�遺失����"
 
-#: src/protocols/oscar/oscar.c:682
+#: src/protocols/oscar/oscar.c:675
 msgid "Unable to login to AIM"
 msgstr "�≧��糸�ュ�� AIM"
 
-#: src/protocols/oscar/oscar.c:789 src/protocols/oscar/oscar.c:1176
+#: src/protocols/oscar/oscar.c:778 src/protocols/oscar/oscar.c:1165
 msgid "Could Not Connect"
 msgstr "�≧��g�"
 
-#: src/protocols/oscar/oscar.c:796
+#: src/protocols/oscar/oscar.c:785
 msgid "Connection established, cookie sent"
 msgstr "�g�綏峨産腴�鐚�筝�群���� Cookie"
 
-#: src/protocols/oscar/oscar.c:863 src/protocols/oscar/oscar.c:876
-#: src/protocols/oscar/oscar.c:881
+#: src/protocols/oscar/oscar.c:852 src/protocols/oscar/oscar.c:865
+#: src/protocols/oscar/oscar.c:870
 msgid "File Transfer Aborted"
 msgstr "��羔�罟�罅��活叱"
 
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:853
 msgid "Unable to establish listener socket."
 msgstr "�≧�綮榊��h�遵�� Socket��"
 
-#: src/protocols/oscar/oscar.c:877
+#: src/protocols/oscar/oscar.c:866
 msgid "Unable to establish file descriptor."
 msgstr "�≧�綮榊�罟�罅�篁�膣鴻��"
 
-#: src/protocols/oscar/oscar.c:882
+#: src/protocols/oscar/oscar.c:871
 msgid "Unable to create new connection."
 msgstr "�≧������育�g���"
 
-#: src/protocols/oscar/oscar.c:1062 src/protocols/toc/toc.c:574
+#: src/protocols/oscar/oscar.c:1051 src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "������援┗��絲�腆�"
 
-#: src/protocols/oscar/oscar.c:1067
+#: src/protocols/oscar/oscar.c:1056
 msgid "Your account is currently suspended."
 msgstr "����絽活����������賢��"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1071
+#: src/protocols/oscar/oscar.c:1060
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL �恰��荐�����������筝�絖�����"
 
-#: src/protocols/oscar/oscar.c:1076
+#: src/protocols/oscar/oscar.c:1065
 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."
@@ -5816,17 +6135,17 @@
 "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
 "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1070
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "����篏睡����絎∽�句�腮�綣鎀���������茫��� %s �贋��"
 
-#: src/protocols/oscar/oscar.c:1113
+#: src/protocols/oscar/oscar.c:1102
 msgid "Internal Error"
 msgstr "�ч�����"
 
-#: src/protocols/oscar/oscar.c:1215 src/protocols/oscar/oscar.c:1245
-#: src/protocols/oscar/oscar.c:1333
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:1234
+#: src/protocols/oscar/oscar.c:1322
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -5835,29 +6154,29 @@
 "����醇���㊥����筝㊥�潔�g�������醇���喝�������馹�茴�信罩e�篏睡�� TOC��茫��� %s ������"
 "羃����贋�違��"
 
-#: src/protocols/oscar/oscar.c:1218 src/protocols/oscar/oscar.c:1248
+#: src/protocols/oscar/oscar.c:1207 src/protocols/oscar/oscar.c:1237
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim �≧���緇������� AIM �糸�ョ⊆��"
 
-#: src/protocols/oscar/oscar.c:1336
+#: src/protocols/oscar/oscar.c:1325
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim �≧���緇��������糸�ユ�罨�腆若��"
 
-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5626
+#: src/protocols/oscar/oscar.c:1905 src/protocols/oscar/oscar.c:5572
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "�� %s ���恰��荐���群膓�茴�産腴�"
 
-#: src/protocols/oscar/oscar.c:2242 src/protocols/oscar/oscar.c:2264
+#: src/protocols/oscar/oscar.c:2234 src/protocols/oscar/oscar.c:2256
 msgid "(There was an error receiving this message)"
 msgstr "鐚��九�����荐������主�����鐚�"
 
-#: src/protocols/oscar/oscar.c:2411
+#: src/protocols/oscar/oscar.c:2403
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����荀�羆��贋・�g��� %s"
 
-#: src/protocols/oscar/oscar.c:2414
+#: src/protocols/oscar/oscar.c:2406
 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 "
@@ -5866,46 +6185,45 @@
 "����荀�羆�絨����������肢����綮榊�莎欠�贋・�g�鐚����������渇���恰��荐���襲�����鏆�������"
 "��罔e������我���� IP 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
 
-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:5789
+#: src/protocols/oscar/oscar.c:2411 src/protocols/oscar/oscar.c:5941
 msgid "Connect"
 msgstr "�g�"
 
-#: src/protocols/oscar/oscar.c:2446
+#: src/protocols/oscar/oscar.c:2438
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨������ユ����絅遵�羝���賢��"
 
-#: src/protocols/oscar/oscar.c:2454
+#: src/protocols/oscar/oscar.c:2446
 msgid "Authorization Request Message:"
 msgstr "茯�茘�荀�羆�荐����"
 
-#: src/protocols/oscar/oscar.c:2455
+#: src/protocols/oscar/oscar.c:2447
 msgid "Please authorize me!"
 msgstr "茫���������茯�茘�鐚�"
 
-#: src/protocols/oscar/oscar.c:2483
+#: src/protocols/oscar/oscar.c:2475
 #, 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:2488 src/protocols/oscar/oscar.c:2490
+#: src/protocols/oscar/oscar.c:2480 src/protocols/oscar/oscar.c:2482
 msgid "Request Authorization"
 msgstr "荀�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
-#: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2607
-#: src/protocols/oscar/oscar.c:2627 src/protocols/oscar/oscar.c:3002
-#: src/protocols/oscar/oscar.c:3054 src/protocols/oscar/oscar.c:5144
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:2520
+#: src/protocols/oscar/oscar.c:2527 src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:2975
+#: src/protocols/oscar/oscar.c:5072 src/protocols/oscar/oscar.c:5118
 msgid "No reason given."
 msgstr "羃���腟��������"
 
-#: src/protocols/oscar/oscar.c:2534
+#: src/protocols/oscar/oscar.c:2526
 msgid "Authorization Denied Message:"
 msgstr "��腟�茯�茘�荐����"
 
-#: src/protocols/oscar/oscar.c:2607
+#: src/protocols/oscar/oscar.c:2599
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -5914,32 +6232,32 @@
 "篏睡���� %u ���坂�������鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���賢鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2615 src/protocols/oscar/oscar.c:5150
+#: src/protocols/oscar/oscar.c:2607 src/protocols/oscar/oscar.c:5078
 msgid "Authorization Request"
 msgstr "茯�茘�荀�羆�"
 
-#: src/protocols/oscar/oscar.c:2627
+#: src/protocols/oscar/oscar.c:2619
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your contact list for the "
+"The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
 "篏睡���� %u ���坂�������鐚���腟�篋�����九���ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2620
 msgid "ICQ authorization denied."
 msgstr "ICQ 茯�茘���腟���"
 
 #. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:2627
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "篏睡���� %u ���鋋�����九���ュソ��羝�����荀�羆���"
+
 #: src/protocols/oscar/oscar.c:2635
 #, c-format
-msgid "The user %u has granted your request to add them to your contact list."
-msgstr "篏睡���� %u ���鋋�����九���ュソ��羝�����荀�羆���"
-
-#: src/protocols/oscar/oscar.c:2643
-#, c-format
 msgid ""
 "You have received a special message\n"
 "\n"
@@ -5951,7 +6269,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2651
+#: src/protocols/oscar/oscar.c:2643
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -5964,7 +6282,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2659
+#: src/protocols/oscar/oscar.c:2651
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -5982,34 +6300,35 @@
 # NOTE 茘����翫�� by Paladin
 # ANS ������絖�筝駕����亥��Meta-Contact���醇�����篆�
 # NOTE 茘����翫�� by Ambrose
-#: src/protocols/oscar/oscar.c:2680
-#, c-format
-msgid "ICQ user %u has sent you a contact: %s (%s)"
+# NOTE 綏牙����� Gaim Team �贋�剛���絖�筝�
+#: src/protocols/oscar/oscar.c:2672
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 篏睡���� %u ��箴�筝���絅遵�莖�荐�鐚�%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2686
-msgid "Do you want to add this contact to your Buddy List?"
+#: src/protocols/oscar/oscar.c:2678
+msgid "Do you want to add this buddy to your buddy list?"
 msgstr "���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
 
-#: src/protocols/oscar/oscar.c:2690
+#: src/protocols/oscar/oscar.c:2682
 msgid "Decline"
 msgstr "紿���"
 
-#: src/protocols/oscar/oscar.c:2772
+#: src/protocols/oscar/oscar.c:2764
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪����≧������"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����醇���≧������"
 
-#: src/protocols/oscar/oscar.c:2781
+#: src/protocols/oscar/oscar.c:2773
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪�紊�ぇ篋���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����遵お紊т���"
 
-#: src/protocols/oscar/oscar.c:2790
+#: src/protocols/oscar/oscar.c:2782
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6017,112 +6336,102 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪��渇������綺�お綽���"
 
-#: src/protocols/oscar/oscar.c:2799
+#: src/protocols/oscar/oscar.c:2791
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������坂� / 絅劫お���>���"
 
-#: src/protocols/oscar/oscar.c:2808
+#: src/protocols/oscar/oscar.c:2800
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���>���"
 
-#: src/protocols/oscar/oscar.c:2817
+#: src/protocols/oscar/oscar.c:2809
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "�����坂���������阪け篋� %hu ���� %s ��箴���荐�����"
 
-#: src/protocols/oscar/oscar.c:2833 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:5916
+#: src/protocols/oscar/oscar.c:2825 src/protocols/oscar/oscar.c:4541
+#: src/protocols/oscar/oscar.c:6068
 msgid "Free For Chat"
 msgstr "����腥肴��紊�"
 
-#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:5914
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4535
+#: src/protocols/oscar/oscar.c:6066
 msgid "Not Available"
 msgstr "�傑�����∫��"
 
-#: src/protocols/oscar/oscar.c:2839 src/protocols/oscar/oscar.c:4609
-#: src/protocols/oscar/oscar.c:5915
+#: src/protocols/oscar/oscar.c:2831 src/protocols/oscar/oscar.c:4538
+#: src/protocols/oscar/oscar.c:6067
 msgid "Occupied"
 msgstr "綽�腆�"
 
 # NOTE ���� http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2843
+#: src/protocols/oscar/oscar.c:2835
 msgid "Web Aware"
 msgstr "��荐怨�銀�篏睡������恐莊���ョ��������������"
 
-#: src/protocols/oscar/oscar.c:2903
+#: src/protocols/oscar/oscar.c:2878
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>絽活��鐚�</B> %s<BR><B>����鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2905
-#, c-format
-msgid "<B>Status:</B> %s<HR>%s"
-msgstr "<B>����鐚�</B> %s<HR>%s"
-
-#: src/protocols/oscar/oscar.c:2964
+#: src/protocols/oscar/oscar.c:2937
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 筝��咲���鐚�%s\n"
 
-#: src/protocols/oscar/oscar.c:2965
+#: src/protocols/oscar/oscar.c:2938
 msgid "Unknown error"
 msgstr "���ラ���"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:3000
+#: src/protocols/oscar/oscar.c:2973
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "�����腟� %s ��荐����≧����削�"
 
-#: src/protocols/oscar/oscar.c:3052
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "篏睡���� %s ����篋肴�荐�筝��絖����"
-
-#: src/protocols/oscar/oscar.c:3089
+#: src/protocols/oscar/oscar.c:3070
 msgid "Voice"
 msgstr "�臥��"
 
 # NOTE 絨����贋・羔������壕⑮�冴���恰��荐�����
-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:5945
-msgid "Direct IM"
-msgstr "�恰��荐���"
-
-#: src/protocols/oscar/oscar.c:3098 src/protocols/oscar/oscar.c:5961
+#: src/protocols/oscar/oscar.c:3073
+msgid "AIM Direct IM"
+msgstr "AIM 綣�勄��荐���"
+
+#: src/protocols/oscar/oscar.c:3079 src/protocols/oscar/oscar.c:6167
 msgid "Get File"
 msgstr "�ユ�倶�罅�"
 
-#: src/protocols/oscar/oscar.c:3101 src/protocols/oscar/oscar.c:5953
+#: src/protocols/oscar/oscar.c:3082 src/protocols/oscar/oscar.c:6159
 msgid "Send File"
 msgstr "�渇��罟�罅�"
 
-#: src/protocols/oscar/oscar.c:3105
+#: src/protocols/oscar/oscar.c:3086
 msgid "Games"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:3108
+#: src/protocols/oscar/oscar.c:3089
 msgid "Add-Ins"
 msgstr "罔∞�"
 
-#: src/protocols/oscar/oscar.c:3111
+#: src/protocols/oscar/oscar.c:3092
 msgid "Send Buddy List"
 msgstr "���阪ソ��羝���"
 
-#: src/protocols/oscar/oscar.c:3114
-msgid "EveryBuddy Bug"
-msgstr "EveryBuddy ���"
-
-#: src/protocols/oscar/oscar.c:3117
+#: src/protocols/oscar/oscar.c:3095
+msgid "ICQ Direct Connect"
+msgstr "ICQ 綣�吚・�g�"
+
+#: src/protocols/oscar/oscar.c:3098
 msgid "AP User"
 msgstr "�����綣鋎睡����"
 
-#: src/protocols/oscar/oscar.c:3120
+#: src/protocols/oscar/oscar.c:3101
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -6133,94 +6442,73 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: src/protocols/oscar/oscar.c:3123
+#: src/protocols/oscar/oscar.c:3104
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3126
+#: src/protocols/oscar/oscar.c:3107
 msgid "ICQ Server Relay"
 msgstr "ICQ 篌堺�������"
 
-#: src/protocols/oscar/oscar.c:3129
+#: src/protocols/oscar/oscar.c:3110
 msgid "Old ICQ UTF8"
 msgstr "��綣� ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:3132
+#: src/protocols/oscar/oscar.c:3113
 msgid "Trillian Encryption"
 msgstr "Trillian ��絲�"
 
-#: src/protocols/oscar/oscar.c:3135
+#: src/protocols/oscar/oscar.c:3116
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE ��篌寂����腮��筝��肢������絖�
-#: src/protocols/oscar/oscar.c:3138
+#: src/protocols/oscar/oscar.c:3119
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:3141
+#: src/protocols/oscar/oscar.c:3122
 msgid "Secure IM"
 msgstr "��絲��恰��荐���"
 
-#: src/protocols/oscar/oscar.c:3181
-msgid ""
-"<i>Unable to display information because it was sent in an unknown encoding."
-"</i>"
-msgstr "<I>���坂戎������ョ��膩�⊆鐚���篁ョ�≧�蕁�ず荐�����</i>"
-
-#: src/protocols/oscar/oscar.c:3188
-#, c-format
-msgid "Online Since : <b>%s</b><br>\n"
+#: src/protocols/oscar/oscar.c:3151
+#, c-format
+msgid "Username: <b>%s</b><br>\n"
+msgstr "篏睡������腮縁�<b>%s</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3152
+#, c-format
+msgid "Warning Level: <b>%d%%</b><br>\n"
+msgstr "茘���膈�膣�鐚�<b>%d%%</b><br>\n"
+
+#: src/protocols/oscar/oscar.c:3155
+#, c-format
+msgid "Online Since: <b>%s</b><br>\n"
 msgstr "筝�膩�����鐚�<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3193
-#, c-format
-msgid "Member Since : <b>%s</b><br>\n"
+#: src/protocols/oscar/oscar.c:3159
+#, c-format
+msgid "Member Since: <b>%s</b><br>\n"
 msgstr "���堺���∞������鐚�<b>%s</b><br>\n"
 
-#: src/protocols/oscar/oscar.c:3199
-#, c-format
-msgid "Idle : <b>%s</b>"
+#: src/protocols/oscar/oscar.c:3164
+#, c-format
+msgid "Idle: <b>%s</b>"
 msgstr "��臀��<b>%s</b>"
 
-#: src/protocols/oscar/oscar.c:3202
+#: src/protocols/oscar/oscar.c:3167
 msgid "Idle: <b>Active</b>"
 msgstr "��臀��<b>羃���臀�</b>"
 
-#: src/protocols/oscar/oscar.c:3204
-#, c-format
-msgid ""
-"Username : <b>%s</b>  %s <br>\n"
-"Warning Level : <b>%d %%</b><br>\n"
-"%s%s%s\n"
-"<hr>\n"
-msgstr ""
-"篏睡������腮縁�<B>%s</B>  %s <BR>\n"
-"茘���膈�膣�鐚�<B>%d %%</B><BR>\n"
-"%s%s%s<BR>\n"
-"<HR>\n"
-
-#: src/protocols/oscar/oscar.c:3236
-msgid "<i>User has no away message</i>"
-msgstr "<i>篏睡����羃����∫��荐���</i>"
-
-#: src/protocols/oscar/oscar.c:3247
-msgid "Client Capabilities: "
-msgstr "絎∽�句��後��э�"
-
-#: src/protocols/oscar/oscar.c:3253
-msgid "<i>No Information Provided</i>"
-msgstr "<i>���箴�篁私�篆≧��</i>"
-
-#: src/protocols/oscar/oscar.c:3277
+#: src/protocols/oscar/oscar.c:3206
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM ���醇�欠�篋���"
 
-#: src/protocols/oscar/oscar.c:3665
+#: src/protocols/oscar/oscar.c:3594
 msgid "Rate limiting error."
 msgstr "�������狗�����"
 
-#: src/protocols/oscar/oscar.c:3666
+#: src/protocols/oscar/oscar.c:3595
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -6228,133 +6516,134 @@
 "����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���"
 "荅��罨<��"
 
-#: src/protocols/oscar/oscar.c:3727
+#: src/protocols/oscar/oscar.c:3656
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ラ����絽活����"
 
-#: src/protocols/oscar/oscar.c:3729
+#: src/protocols/oscar/oscar.c:3658
 msgid "You have been signed off for an unknown reason."
 msgstr "�����坂���������糸�冴��"
 
-#: src/protocols/oscar/oscar.c:3974 src/protocols/oscar/oscar.c:3980
+#: src/protocols/oscar/oscar.c:3903 src/protocols/oscar/oscar.c:3909
 msgid "Email Address"
 msgstr "�糸��灸散"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:3914
 msgid "Mobile Phone"
 msgstr "茵����肢�"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:313
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:272
+#: src/protocols/trepia/trepia.c:413
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:3988 src/protocols/trepia/trepia.c:312
-#: src/protocols/trepia/trepia.c:454
+#: src/protocols/oscar/oscar.c:3917 src/protocols/trepia/trepia.c:271
+#: src/protocols/trepia/trepia.c:413
 msgid "Male"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:3934
 msgid "Personal Web Page"
 msgstr "��篋榊恐��"
 
-#: src/protocols/oscar/oscar.c:4008
+#: src/protocols/oscar/oscar.c:3937
 msgid "Additional Information"
 msgstr "�銀�莖�荐�"
 
-#: src/protocols/oscar/oscar.c:4012
+#: src/protocols/oscar/oscar.c:3941
 msgid "Home Address"
 msgstr "篏鎘九�医��"
 
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
-msgid "Address"
-msgstr "�医��"
-
-#: src/protocols/oscar/oscar.c:4023 src/protocols/oscar/oscar.c:4039
+#: src/protocols/oscar/oscar.c:3952 src/protocols/oscar/oscar.c:3968
 msgid "Zip Code"
 msgstr "�級������"
 
-#: src/protocols/oscar/oscar.c:4028
+#: src/protocols/oscar/oscar.c:3957
 msgid "Work Address"
 msgstr "綏ヤ��医��"
 
-#: src/protocols/oscar/oscar.c:4044
+#: src/protocols/oscar/oscar.c:3973
 msgid "Work Information"
 msgstr "綏ヤ�莖�荐�"
 
-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:3975
 msgid "Company"
 msgstr "��夔��腮�"
 
-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:3978
 msgid "Division"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:3981
 msgid "Position"
 msgstr "�隙�"
 
-#: src/protocols/oscar/oscar.c:4055
+#: src/protocols/oscar/oscar.c:3984
 msgid "Web Page"
 msgstr "膓臥��"
 
-#: src/protocols/oscar/oscar.c:4061
+#: src/protocols/oscar/oscar.c:3990
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s �� ICQ 莖�荐�"
 
+# XXX �����藝� (��綵≫��榊憟��)鐚� (絅遵���札��茘���荐��������e��??)
+#: src/protocols/oscar/oscar.c:4040
+msgid "Pop-Up Message"
+msgstr "綵��肴���"
+
 # XXX ���処⑮��
-#: src/protocols/oscar/oscar.c:4127
+#: src/protocols/oscar/oscar.c:4061
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "筝���絽活���� %s ����"
 
-#: src/protocols/oscar/oscar.c:4131
+#: src/protocols/oscar/oscar.c:4065
 msgid "Search Results"
 msgstr "��絨�腟���"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4082
 #, c-format
 msgid "No results found for email address %s"
 msgstr "�鞘��医���糸��灸散�医�� %s �檎����腟���"
 
-#: src/protocols/oscar/oscar.c:4169
+#: src/protocols/oscar/oscar.c:4103
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "����荅我���九�遺�絨�荀�羆�絨� %s �画�茯�茘����糸��灸散��"
 
-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4105
 msgid "Account Confirmation Requested"
 msgstr "絽活��腆肴�"
 
-#: src/protocols/oscar/oscar.c:4199
+#: src/protocols/oscar/oscar.c:4133
 msgid "Error Changing Account Info"
 msgstr "�贋�劫験��莖�荐����"
 
-#: src/protocols/oscar/oscar.c:4202
+#: src/protocols/oscar/oscar.c:4136
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����肴�羆���絽活����������筝�����"
 
-#: src/protocols/oscar/oscar.c:4205
+#: src/protocols/oscar/oscar.c:4139
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����肴�羆���絽活��篁ョ��順�����"
 
-#: src/protocols/oscar/oscar.c:4208
+#: src/protocols/oscar/oscar.c:4142
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����肴�羆���絽活��紊��激��"
 
-#: src/protocols/oscar/oscar.c:4211
+#: src/protocols/oscar/oscar.c:4145
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -6362,7 +6651,7 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����堺��群膓����榊���銀�荀�羆���������絅純��"
 
-#: src/protocols/oscar/oscar.c:4214
+#: src/protocols/oscar/oscar.c:4148
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -6370,19 +6659,19 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
 
-#: src/protocols/oscar/oscar.c:4217
+#: src/protocols/oscar/oscar.c:4151
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医�����≧������"
 
-#: src/protocols/oscar/oscar.c:4220
+#: src/protocols/oscar/oscar.c:4154
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��� 0x%04x鐚����ラ�����"
 
-#: src/protocols/oscar/oscar.c:4230
+#: src/protocols/oscar/oscar.c:4164
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6391,20 +6680,20 @@
 "����絽活������茴��弱���絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4231 src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4172
 msgid "Account Info"
 msgstr "絽活��莖�荐�"
 
-#: src/protocols/oscar/oscar.c:4236
+#: src/protocols/oscar/oscar.c:4170
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���糸��灸散�医���� %s"
 
-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4400
 msgid "Unable to set AIM profile."
 msgstr "�≧�荐㊤� AIM ��篋肴�����"
 
-#: src/protocols/oscar/oscar.c:4472
+#: src/protocols/oscar/oscar.c:4401
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -6413,7 +6702,7 @@
 "�������糸�ュ�����荀�羆�篆��号������篋肴�荐�鐚���篁ラ��篋�莖�荐�筝���←篆��鴻��茫�������糸�ュ�"
 "�����育�画�荐㊤���"
 
-#: src/protocols/oscar/oscar.c:4502
+#: src/protocols/oscar/oscar.c:4431
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6423,15 +6712,15 @@
 "truncated it for you."
 msgstr[0] "莇��阪��篋肴�荐����桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
 
-#: src/protocols/oscar/oscar.c:4507
+#: src/protocols/oscar/oscar.c:4436
 msgid "Profile too long."
 msgstr "��篋肴�荐����激��"
 
-#: src/protocols/oscar/oscar.c:4526
+#: src/protocols/oscar/oscar.c:4455
 msgid "Unable to set AIM away message."
 msgstr "�≧�荐㊤� AIM �∫��荐�����"
 
-#: src/protocols/oscar/oscar.c:4527
+#: src/protocols/oscar/oscar.c:4456
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6440,7 +6729,7 @@
 "��������糸�ョ�綺鎘�����篆��号�����∫��荐������������絨�膓㊥��������荐㊤���������茫���"
 "絎����糸�ュ���荐㊤�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4567
+#: src/protocols/oscar/oscar.c:4496
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6450,15 +6739,15 @@
 "truncated it for you."
 msgstr[0] "莇��咲�∫��荐������桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
 
-#: src/protocols/oscar/oscar.c:4572
+#: src/protocols/oscar/oscar.c:4501
 msgid "Away message too long."
 msgstr "�∫��荐������激��"
 
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4721
 msgid "Unable To Retrieve Buddy List"
 msgstr "�≧�莅���絅遵�羝���"
 
-#: src/protocols/oscar/oscar.c:4793
+#: src/protocols/oscar/oscar.c:4722
 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 "
@@ -6467,12 +6756,12 @@
 "Gaim ����羃���莨���� AIM 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃�����"
 "紊縁����遵�札��江��絨��鏅���緇���"
 
-#: src/protocols/oscar/oscar.c:4884 src/protocols/oscar/oscar.c:4885
-#: src/protocols/oscar/oscar.c:4890
+#: src/protocols/oscar/oscar.c:4813 src/protocols/oscar/oscar.c:4814
+#: src/protocols/oscar/oscar.c:4819
 msgid "Orphans"
 msgstr "絖ゅ����"
 
-#: src/protocols/oscar/oscar.c:5057
+#: src/protocols/oscar/oscar.c:4985
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6481,15 +6770,15 @@
 "���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���"
 "荅���"
 
-#: src/protocols/oscar/oscar.c:5057 src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4985 src/protocols/oscar/oscar.c:4998
 msgid "(no name)"
 msgstr "(羃�����絖�)"
 
-#: src/protocols/oscar/oscar.c:5058 src/protocols/oscar/oscar.c:5071
+#: src/protocols/oscar/oscar.c:4986 src/protocols/oscar/oscar.c:4999
 msgid "Unable To Add"
 msgstr "�≧�����"
 
-#: src/protocols/oscar/oscar.c:5070
+#: src/protocols/oscar/oscar.c:4998
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6499,7 +6788,7 @@
 "���坂���������≧�絨�絅遵� %s ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟���"
 "����膤紫輝��荐援��筝�����"
 
-#: src/protocols/oscar/oscar.c:5105
+#: src/protocols/oscar/oscar.c:5033
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -6509,11 +6798,11 @@
 "���"
 
 # NOTE ����������荐怨�ヤ査�弱�榊��茯�茘�荀�羆�緇�蕁�ず腟�������訓����
-#: src/protocols/oscar/oscar.c:5111
+#: src/protocols/oscar/oscar.c:5039
 msgid "Authorization Given"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/oscar/oscar.c:5144
+#: src/protocols/oscar/oscar.c:5072
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6523,112 +6812,129 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5186
-#, c-format
-msgid "The user %s has granted your request to add them to your contact list."
+#: src/protocols/oscar/oscar.c:5114
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "篏睡���� %s ��荐延����篁�鐚�絅刻����ュソ��羝�����荀�羆���"
 
 # NOTE ���������弱�榊��茯�茘�荀�羆�茴���劫��荐掩��蕁�ず��
-#: src/protocols/oscar/oscar.c:5187
+#: src/protocols/oscar/oscar.c:5115
 msgid "Authorization Granted"
 msgstr "茯�茘��峨��"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5190
+#: src/protocols/oscar/oscar.c:5118
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your contact list for the "
+"The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
 "篏睡���� %s ���坂�������鐚���腟�篋����篁�鐚�絅刻����ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5191
+#: src/protocols/oscar/oscar.c:5119
 msgid "Authorization Denied"
 msgstr "茯�茘�茴���"
 
 # NOTE: ��茖∞��絖�臂���� #gaim �� MrHappy �� deryni ��箴���
-#: src/protocols/oscar/oscar.c:5228 src/protocols/toc/toc.c:1266
+#: src/protocols/oscar/oscar.c:5156 src/protocols/toc/toc.c:1263
 msgid "Exchange:"
 msgstr "��紊����腆種�"
 
-#: src/protocols/oscar/oscar.c:5450
+#: src/protocols/oscar/oscar.c:5379
 msgid "<b>Status:</b> "
 msgstr "<b>����鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5459
+#: src/protocols/oscar/oscar.c:5388
 msgid "<b>Logged In:</b> "
 msgstr "<b>�糸�ユ����鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5470
+#: src/protocols/oscar/oscar.c:5400
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP 篏���鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5478
+#: src/protocols/oscar/oscar.c:5408
 msgid "<b>Capabilities:</b> "
 msgstr "<b>�後��э�</b>"
 
-#: src/protocols/oscar/oscar.c:5485
+#: src/protocols/oscar/oscar.c:5415
 msgid "<b>Available:</b> "
 msgstr "<b>筝�膩�鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5494
+#: src/protocols/oscar/oscar.c:5431
+msgid "<b>Away Message:</b> "
+msgstr "<b>�∫��荐����</b>"
+
+#: src/protocols/oscar/oscar.c:5440
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>����鐚�</b>���茘�"
 
-#: src/protocols/oscar/oscar.c:5528 src/protocols/yahoo/yahoo.c:1429
+#: src/protocols/oscar/oscar.c:5474 src/protocols/yahoo/yahoo.c:2032
 msgid "Offline"
 msgstr "�∝�"
 
-#: src/protocols/oscar/oscar.c:5769
+#: src/protocols/oscar/oscar.c:5921
 msgid "Unable to open Direct IM"
 msgstr "�≧������贋・���恰��荐���"
 
-#: src/protocols/oscar/oscar.c:5782
+#: src/protocols/oscar/oscar.c:5934
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "���御��篋��� %s ����筝����贋・�恰��荐�����"
 
-#: src/protocols/oscar/oscar.c:5785
+#: src/protocols/oscar/oscar.c:5937
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr "��罔e������峨�堺���� IP 篏���鐚���罩ゅ��醇�����援�筝���蘂��������活�膵主����"
 
-#: src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:6112
+msgid "Buddy Comment:"
+msgstr "絅遵�茯����"
+
+#: src/protocols/oscar/oscar.c:6128
+msgid "Edit Buddy Comment"
+msgstr "膩�鹿絅遵�茯���"
+
+#: src/protocols/oscar/oscar.c:6136
 msgid "Get Status Msg"
 msgstr "��緇�����荐���"
 
-#: src/protocols/oscar/oscar.c:5974
+# NOTE 絨����贋・羔������壕⑮�冴���恰��荐�����
+#: src/protocols/oscar/oscar.c:6151
+msgid "Direct IM"
+msgstr "�恰��荐���"
+
+#: src/protocols/oscar/oscar.c:6180
 msgid "Re-request Authorization"
 msgstr "���域�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:5995
+#: src/protocols/oscar/oscar.c:6201
 msgid "The new formatting is invalid."
 msgstr "�亥���弱����≧������"
 
-#: src/protocols/oscar/oscar.c:5996
+#: src/protocols/oscar/oscar.c:6202
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "絽活���弱������醇�壕�紊у�篁ュ�腥榊�純��"
 
-#: src/protocols/oscar/oscar.c:6002
+#: src/protocols/oscar/oscar.c:6208
 msgid "New screenname formatting:"
 msgstr "�亥��絽活���弱�鐚�"
 
-#: src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:6257
 msgid "Change Address To:"
 msgstr "莅��翫�医���削�"
 
-#: src/protocols/oscar/oscar.c:6095
+#: src/protocols/oscar/oscar.c:6301
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��研羃������緇�薊�茘�</i>"
 
-#: src/protocols/oscar/oscar.c:6098
+#: src/protocols/oscar/oscar.c:6304
 msgid "You are awaiting authorization from the following buddies"
 msgstr "������罩e���緇�筝���絅遵���茯�茘�"
 
-#: src/protocols/oscar/oscar.c:6099
+#: src/protocols/oscar/oscar.c:6305
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -6636,43 +6942,59 @@
 "���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��"
 "��荀�羆����域�茘�����"
 
-#: src/protocols/oscar/oscar.c:6115
+#: src/protocols/oscar/oscar.c:6319
+msgid "Find Buddy by E-mail"
+msgstr "篁ラ�糸��灸散�医��箴��上�絅遵�"
+
+#: src/protocols/oscar/oscar.c:6320
+msgid "Search for a buddy by e-mail address"
+msgstr "篏睡���糸��灸散�医����絨�絅遵�"
+
+#: src/protocols/oscar/oscar.c:6321
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "茫�莠後�ュ��合���糸��灸散�医����"
+
+#: src/protocols/oscar/oscar.c:6324
+msgid "Search"
+msgstr "��絨�"
+
+#: src/protocols/oscar/oscar.c:6337
 msgid "Available Message:"
 msgstr "筝�膩�荐����"
 
-#: src/protocols/oscar/oscar.c:6116
-msgid "Please talk to me, I'm lonely! (and single)"
-msgstr "茫����������э���荀阪�絅遵�絲�鐚�"
-
-#: src/protocols/oscar/oscar.c:6178
+#: src/protocols/oscar/oscar.c:6415
 msgid "Set Available Message"
 msgstr "荐㊤�筝�膩�荐���"
 
-#: src/protocols/oscar/oscar.c:6192
+#: src/protocols/oscar/oscar.c:6429
 msgid "Change Password (URL)"
 msgstr "篆��劫�腆� (���嘒��)"
 
-#: src/protocols/oscar/oscar.c:6203
+#: src/protocols/oscar/oscar.c:6437
+msgid "Configure IM Forwarding (URL)"
+msgstr "荐㊤��恰��荐�����莉��� (���嘒��)"
+
+#: src/protocols/oscar/oscar.c:6448
 msgid "Format Screenname"
 msgstr "�弱���絽活��"
 
-#: src/protocols/oscar/oscar.c:6209
+#: src/protocols/oscar/oscar.c:6454
 msgid "Confirm Account"
 msgstr "腆肴�絽活��"
 
-#: src/protocols/oscar/oscar.c:6215
+#: src/protocols/oscar/oscar.c:6460
 msgid "Display Current Registered Address"
 msgstr "蕁�ず������荐糸�����医��"
 
-#: src/protocols/oscar/oscar.c:6221
+#: src/protocols/oscar/oscar.c:6466
 msgid "Change Current Registered Address"
 msgstr "篆��合������荐糸�����医��"
 
-#: src/protocols/oscar/oscar.c:6230
+#: src/protocols/oscar/oscar.c:6475
 msgid "Show Buddies Awaiting Authorization"
 msgstr "蕁�ず膈�緇�茯�茘���絅遵�"
 
-#: src/protocols/oscar/oscar.c:6238
+#: src/protocols/oscar/oscar.c:6483
 msgid "Search for Buddy by Email"
 msgstr "篏睡���糸��灸散�医����絨�絅遵�"
 
@@ -6686,122 +7008,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6359 src/protocols/oscar/oscar.c:6361
+#: src/protocols/oscar/oscar.c:6604 src/protocols/oscar/oscar.c:6606
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ ��絎�罔∞�"
 
-#: src/protocols/oscar/oscar.c:6378
+#: src/protocols/oscar/oscar.c:6623
 msgid "Auth host"
 msgstr "茯�茘�篌堺����"
 
-#: src/protocols/oscar/oscar.c:6383
+#: src/protocols/oscar/oscar.c:6628
 msgid "Auth port"
 msgstr "茯�茘���荐���"
 
-#: src/protocols/toc/toc.c:171
+#: src/protocols/toc/toc.c:167
 #, c-format
 msgid "Looking up %s"
 msgstr "�上� %s 筝�"
 
-#: src/protocols/toc/toc.c:513
+#: src/protocols/toc/toc.c:510
 #, c-format
 msgid "Unable to write file %s."
 msgstr "�≧�絲��ユ�罅� %s��"
 
-#: src/protocols/toc/toc.c:516
+#: src/protocols/toc/toc.c:513
 #, c-format
 msgid "Unable to read file %s."
 msgstr "�≧�莅���罟�罅� %s��"
 
-#: src/protocols/toc/toc.c:519
+#: src/protocols/toc/toc.c:516
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "荐���お�件���緇��� %s 篏���腟�茴���サ��"
 
-#: src/protocols/toc/toc.c:522
+#: src/protocols/toc/toc.c:519
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ����筝����糸�ャ��"
 
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:522
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "茘���鐚�%s ���茴���荐援����"
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:525
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "荐���←筝�罍�鐚����堺�����遺�篌堺���������句���守����綺���"
 
-#: src/protocols/toc/toc.c:531
+#: src/protocols/toc/toc.c:528
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "�� %s 筝���札��紊���"
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:531
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "����荐���畿 %s ����綺�お綽����"
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:534
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "���阪け篋�筝����� %s ��箴���荐�������阪�紊�ぇ篋���"
 
-#: src/protocols/toc/toc.c:540
+#: src/protocols/toc/toc.c:537
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "���阪け篋�筝����� %s ��箴���荐�������阪��渇������綺�お綽���"
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:540
 msgid "Failure."
 msgstr "紊掩����"
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:543
 msgid "Too many matches."
 msgstr "�拷��紊����"
 
+#: src/protocols/toc/toc.c:546
+msgid "Need more qualifiers."
+msgstr "��莠後�ユ�翫�罟∝刈罌�篁吟��"
+
 #: src/protocols/toc/toc.c:549
-msgid "Need more qualifiers."
-msgstr "��莠後�ユ�翫�罟∝刈罌�篁吟��"
+msgid "Dir service temporarily unavailable."
+msgstr "������������筝�絖�����"
 
 #: src/protocols/toc/toc.c:552
-msgid "Dir service temporarily unavailable."
-msgstr "������������筝�絖�����"
-
-#: src/protocols/toc/toc.c:555
 msgid "Email lookup restricted."
 msgstr "胼�罩� eMail 罟∽�ャ��"
 
-#: src/protocols/toc/toc.c:558
+#: src/protocols/toc/toc.c:555
 msgid "Keyword ignored."
 msgstr "���球�綏画←綽順�ャ��"
 
-#: src/protocols/toc/toc.c:561
+#: src/protocols/toc/toc.c:558
 msgid "No keywords."
 msgstr "羃������球���"
 
-#: src/protocols/toc/toc.c:564
+#: src/protocols/toc/toc.c:561
 msgid "User has no directory information."
 msgstr "����篏睡����羃���篁����檎��莖�荐���"
 
+#: src/protocols/toc/toc.c:565
+msgid "Country not supported."
+msgstr "������絎銀�茴���叵��"
+
 #: src/protocols/toc/toc.c:568
-msgid "Country not supported."
-msgstr "������絎銀�茴���叵��"
-
-#: src/protocols/toc/toc.c:571
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "���ョ��紊掩������鐚�%s��"
 
-#: src/protocols/toc/toc.c:577
+#: src/protocols/toc/toc.c:574
 msgid "The service is temporarily unavailable."
 msgstr "��������筝�絖�����"
 
+#: src/protocols/toc/toc.c:577
+msgid "Your warning level is currently too high to log in."
+msgstr "�������糸�ョ鎧腟援��茘���膈�膣�紊��鐚�篁ヨ�雁�≧��糸�ャ��"
+
 #: src/protocols/toc/toc.c:580
-msgid "Your warning level is currently too high to log in."
-msgstr "�������糸�ョ鎧腟援��茘���膈�膣�紊��鐚�篁ヨ�雁�≧��糸�ャ��"
-
-#: src/protocols/toc/toc.c:583
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -6809,37 +7131,37 @@
 "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
 "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
-#: src/protocols/toc/toc.c:585
+#: src/protocols/toc/toc.c:582
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "�主��篋�筝������ョ���糸�ラ���鐚�%s��"
 
-#: src/protocols/toc/toc.c:588
+#: src/protocols/toc/toc.c:585
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "筝������ョ����� %d �主����莖�荐�鐚�%s"
 
-#: src/protocols/toc/toc.c:608
+#: src/protocols/toc/toc.c:605
 msgid "Connection Closed"
 msgstr "�g�����"
 
-#: src/protocols/toc/toc.c:648
+#: src/protocols/toc/toc.c:645
 msgid "Waiting for reply..."
 msgstr "膈�緇���荀�筝�..."
 
-#: src/protocols/toc/toc.c:718
+#: src/protocols/toc/toc.c:715
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 腟���篋�������������憜���札膵主����渇������荐�����"
 
-#: src/protocols/toc/toc.c:906
+#: src/protocols/toc/toc.c:903
 msgid "Password Change Successful"
 msgstr "絲�腆寂信�号����"
 
-#: src/protocols/toc/toc.c:910
+#: src/protocols/toc/toc.c:907
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ���坂�筝������� (PAUSE) ��篁ゃ��"
 
-#: src/protocols/toc/toc.c:911
+#: src/protocols/toc/toc.c:908
 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 "
@@ -6848,43 +7170,43 @@
 "�狗�����主����鐚�TOC ��綽順�ユ������箴���荐�����������遵�������肴�����鐚�絨���権�榊鎧"
 "腟宴��Gaim 絨��水���主����罔g��篋�����������������х������鐚�茫����茫���"
 
-#: src/protocols/toc/toc.c:1404
+#: src/protocols/toc/toc.c:1401
 msgid "Get Dir Info"
 msgstr "��緇�篏睡������篋肴�荐�"
 
-#: src/protocols/toc/toc.c:1528
+#: src/protocols/toc/toc.c:1538
 msgid "Set Dir Info"
 msgstr "荐㊤�篏睡������篋肴�荐�"
 
-#: src/protocols/toc/toc.c:1652
+#: src/protocols/toc/toc.c:1663
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "�≧����� %s 篁ヤ�絲��ワ�"
 
-#: src/protocols/toc/toc.c:1688
+#: src/protocols/toc/toc.c:1699
 msgid "File transfer failed; other side probably canceled."
 msgstr "罟�罅��活叱紊掩��鐚����醇����劫�羔��活叱��"
 
-#: src/protocols/toc/toc.c:1733 src/protocols/toc/toc.c:1773
-#: src/protocols/toc/toc.c:1985
+#: src/protocols/toc/toc.c:1744 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1996
 msgid "Could not connect for transfer."
 msgstr "�≧������g�篁ヤ��活叱��"
 
-#: src/protocols/toc/toc.c:1897
+#: src/protocols/toc/toc.c:1908
 msgid "Could not connect for transfer!"
 msgstr "�≧������活叱���g�鐚�"
 
-#: src/protocols/toc/toc.c:1930
+#: src/protocols/toc/toc.c:1941
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "�≧�絲��ユ��㊧�荐�������罟�罅�絨�筝���茴��渇����"
 
-#: src/protocols/toc/toc.c:2064
+#: src/protocols/toc/toc.c:2075
 #, 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:2071
+#: src/protocols/toc/toc.c:2082
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 荀�羆����渇��罟�罅�腟��鐚�絅刻���"
@@ -6899,101 +7221,97 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2147 src/protocols/toc/toc.c:2149
+#: src/protocols/toc/toc.c:2158 src/protocols/toc/toc.c:2160
 msgid "TOC Protocol Plugin"
 msgstr "TOC ��絎�罔∞�"
 
-#: src/protocols/toc/toc.c:2166
+#: src/protocols/toc/toc.c:2177
 msgid "TOC host"
 msgstr "TOC 篌堺����"
 
-#: src/protocols/toc/toc.c:2170
+#: src/protocols/toc/toc.c:2181
 msgid "TOC port"
 msgstr "TOC ��荐���"
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:295
+#: src/protocols/trepia/trepia.c:254
 msgid "Basic Profile"
 msgstr "�堺�����"
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:326
+#: src/protocols/trepia/trepia.c:285
 msgid "E-Mail Address"
 msgstr "�糸��灸散"
 
-#: src/protocols/trepia/trepia.c:332
+#: src/protocols/trepia/trepia.c:291
 msgid "Profile Information"
 msgstr "��篋肴�荐�"
 
 # XXX ��篋���紮�腆種�篏�筝����茘��絨�
 # NOTE SimGuy: probably "Other IM services" if you can do that one :)
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:338
+#: src/protocols/trepia/trepia.c:297
 msgid "Instant Messagers"
 msgstr "�銀��恰���活�絽活��"
 
 #. AIM
-#: src/protocols/trepia/trepia.c:342
+#: src/protocols/trepia/trepia.c:301
 msgid "AIM"
 msgstr "AIM"
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:346
+#: src/protocols/trepia/trepia.c:305
 msgid "ICQ UIN"
 msgstr "ICQ 絽活��"
 
 #. MSN
-#: src/protocols/trepia/trepia.c:350
+#: src/protocols/trepia/trepia.c:309
 msgid "MSN"
 msgstr "MSN"
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:354
+#: src/protocols/trepia/trepia.c:313
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:359
+#: src/protocols/trepia/trepia.c:318
 msgid "I'm From"
 msgstr "��箴���"
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:376
+#: src/protocols/trepia/trepia.c:335
 msgid "Set your Trepia profile data."
 msgstr "荐㊤����� Trepia ��篋肴�����"
 
-#: src/protocols/trepia/trepia.c:500
+#: src/protocols/trepia/trepia.c:459
 msgid "Profile"
 msgstr "��篋肴���"
 
-#: src/protocols/trepia/trepia.c:522
+#: src/protocols/trepia/trepia.c:481
 msgid "Set Profile"
 msgstr "荐㊤���篋肴���"
 
 # XXX 絅遵�鋇�紊��
 # NOTE 茘����翫�� by Paladin
-#: src/protocols/trepia/trepia.c:558
+#: src/protocols/trepia/trepia.c:517
 msgid "Visit Homepage"
 msgstr "��茹�膓臥��"
 
 # NOTE Debian 茘���local���冴�����亥���
-#: src/protocols/trepia/trepia.c:904 src/protocols/trepia/trepia.c:907
+#: src/protocols/trepia/trepia.c:863 src/protocols/trepia/trepia.c:866
 msgid "Local Users"
 msgstr "���亥���篏睡����"
 
 # NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
-#: src/protocols/trepia/trepia.c:1003
+#: src/protocols/trepia/trepia.c:962
 msgid "Read error"
 msgstr "莅������"
 
-#: src/protocols/trepia/trepia.c:1104
+#: src/protocols/trepia/trepia.c:1063
 msgid "Logging in"
 msgstr "�糸�ヤ賢"
 
-#: src/protocols/trepia/trepia.c:1147
-msgid "Unable to create socket"
-msgstr "�≧�綮榊� Socket"
-
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -7004,20 +7322,20 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1352 src/protocols/trepia/trepia.c:1354
+#: src/protocols/trepia/trepia.c:1311 src/protocols/trepia/trepia.c:1313
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia ��絎�罔∞�"
 
-#: src/protocols/yahoo/yahoo.c:694
+#: src/protocols/yahoo/yahoo.c:702
 msgid "Your Yahoo! message did not get sent."
 msgstr "���� Yahoo! 荐���研羃���茴����冴��"
 
-#: src/protocols/yahoo/yahoo.c:752
+#: src/protocols/yahoo/yahoo.c:760
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "篏睡���� %s ������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆���"
 
-#: src/protocols/yahoo/yahoo.c:754
+#: src/protocols/yahoo/yahoo.c:762
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -7026,11 +7344,25 @@
 "篏睡���� %s ���坂�������鐚�������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆�鐚�%"
 "s"
 
-#: src/protocols/yahoo/yahoo.c:755
+#: src/protocols/yahoo/yahoo.c:763
 msgid "Add buddy rejected"
 msgstr "�医�絅遵�茴���"
 
-#: src/protocols/yahoo/yahoo.c:1046
+#: src/protocols/yahoo/yahoo.c:1383
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be able to successfully sign "
+"on to Yahoo.  Check %s for updates."
+msgstr ""
+"Yahoo 篌堺�����羆�篋�篏睡���腮������茯�茘��劫�鐚���罩ら���������� Gaim 緇����巡�������"
+"�糸�� Yahoo��茫��� %s 罟∽�ユ��羃����贋�亥��������"
+
+#: src/protocols/yahoo/yahoo.c:1386
+msgid "Failed Yahoo! Authentication"
+msgstr "Yahoo! 茯�茘�紊掩��"
+
+#: src/protocols/yahoo/yahoo.c:1459
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7039,61 +7371,62 @@
 "����荅�申�ュ������絅遵������х�� %s��絋�������膊���篁�鐚�絅刻�緇�����絅遵�羝���賢腱脂�わ�筝�"
 "���喝申�ヤ�鐚�絅刻�鐚�茫���筝�筝���������"
 
-#: src/protocols/yahoo/yahoo.c:1049
+#: src/protocols/yahoo/yahoo.c:1462
 msgid "Ignore buddy?"
 msgstr "綽順�ヤ戎����鐚�"
 
-#: src/protocols/yahoo/yahoo.c:1078
+#: src/protocols/yahoo/yahoo.c:1491
 msgid "Invalid username."
 msgstr "篏睡������腮援�≧����"
 
-#: src/protocols/yahoo/yahoo.c:1081
+#: src/protocols/yahoo/yahoo.c:1494
 msgid "Incorrect password."
 msgstr "�����絲�腆若��"
 
-#: src/protocols/yahoo/yahoo.c:1084
+#: src/protocols/yahoo/yahoo.c:1497
 msgid "Unknown error."
 msgstr "���ラ�����"
 
-#: src/protocols/yahoo/yahoo.c:1132
+#: src/protocols/yahoo/yahoo.c:1544
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "�≧�絨�絅遵���%1$s���医��喝験����%3$s����失�������羝����х��臂ょ���%2$s����"
 
-#: src/protocols/yahoo/yahoo.c:1134
+#: src/protocols/yahoo/yahoo.c:1546
 msgid "Could not add buddy to server list"
 msgstr "�≧�絨�絅遵��医��割失�������羝�����"
 
-#: src/protocols/yahoo/yahoo.c:1236
+#: src/protocols/yahoo/yahoo.c:1648 src/protocols/yahoo/yahoo.c:1778
 msgid "Unable to read"
 msgstr "�≧�莅���"
 
-#: src/protocols/yahoo/yahoo.c:1337
+#: src/protocols/yahoo/yahoo.c:1803 src/protocols/yahoo/yahoo.c:1912
+#: src/protocols/yahoo/yahoo.c:1936
 msgid "Connection problem"
 msgstr "�g����"
 
-#: src/protocols/yahoo/yahoo.c:1411 src/protocols/yahoo/yahoo.c:1709
-#: src/protocols/yahoo/yahoo.c:1807
+#: src/protocols/yahoo/yahoo.c:2014 src/protocols/yahoo/yahoo.c:2312
+#: src/protocols/yahoo/yahoo.c:2410
 msgid "Not At Home"
 msgstr "筝����"
 
-#: src/protocols/yahoo/yahoo.c:1413 src/protocols/yahoo/yahoo.c:1711
-#: src/protocols/yahoo/yahoo.c:1808
+#: src/protocols/yahoo/yahoo.c:2016 src/protocols/yahoo/yahoo.c:2314
+#: src/protocols/yahoo/yahoo.c:2411
 msgid "Not At Desk"
 msgstr "筝���婚篏�"
 
-#: src/protocols/yahoo/yahoo.c:1415 src/protocols/yahoo/yahoo.c:1713
-#: src/protocols/yahoo/yahoo.c:1809
+#: src/protocols/yahoo/yahoo.c:2018 src/protocols/yahoo/yahoo.c:2316
+#: src/protocols/yahoo/yahoo.c:2412
 msgid "Not In Office"
 msgstr "筝���商���"
 
-#: src/protocols/yahoo/yahoo.c:1419 src/protocols/yahoo/yahoo.c:1717
-#: src/protocols/yahoo/yahoo.c:1811
+#: src/protocols/yahoo/yahoo.c:2022 src/protocols/yahoo/yahoo.c:2320
+#: src/protocols/yahoo/yahoo.c:2414
 msgid "On Vacation"
 msgstr "羝≦���私�"
 
-#: src/protocols/yahoo/yahoo.c:1423 src/protocols/yahoo/yahoo.c:1721
-#: src/protocols/yahoo/yahoo.c:1813
+#: src/protocols/yahoo/yahoo.c:2026 src/protocols/yahoo/yahoo.c:2324
+#: src/protocols/yahoo/yahoo.c:2416
 msgid "Stepped Out"
 msgstr "莎医�阪サ篋�"
 
@@ -7101,78 +7434,78 @@
 # NOTE ��箙�茵�ず篏�筝�����荀�����絅遵��糸�ョ�膈�����(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:1487 src/protocols/yahoo/yahoo.c:1521
+#: src/protocols/yahoo/yahoo.c:2090 src/protocols/yahoo/yahoo.c:2124
 msgid "Not on server list"
 msgstr "筝���失�������羝���賢"
 
 # NOTE #gaim �� Vann �� LSchiere 茹o�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
 # NOTE Yahoo ����Chat��罩e�茘����冴��������違��
-#: src/protocols/yahoo/yahoo.c:1577
+#: src/protocols/yahoo/yahoo.c:2180
 msgid "Join in Chat"
 msgstr "���ュソ��������������紊��"
 
 # NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
-#: src/protocols/yahoo/yahoo.c:1583
+#: src/protocols/yahoo/yahoo.c:2186
 msgid "Initiate Conference"
 msgstr "������茘医�"
 
-#: src/protocols/yahoo/yahoo.c:1629
+#: src/protocols/yahoo/yahoo.c:2232
 msgid "Active which ID?"
 msgstr "��������� ID鐚�"
 
-#: src/protocols/yahoo/yahoo.c:1640
+#: src/protocols/yahoo/yahoo.c:2243
 msgid "Activate ID"
 msgstr "���� ID"
 
-#: src/protocols/yahoo/yahoo.c:1987
+#: src/protocols/yahoo/yahoo.c:2601
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>絨�筝�莎件�����筝����吓�у�茴����阪��腴ヤ�絎�����篋肴�荐���</b><br><br>\n"
 
 # NOTE 羈������腟���⑮��箙�筝�蕁�ず鐚���茘�����篁ヤ���
-#: src/protocols/yahoo/yahoo.c:1989 src/protocols/yahoo/yahoo.c:2005
+#: src/protocols/yahoo/yahoo.c:2602 src/protocols/yahoo/yahoo.c:2622
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
-"web browser"
-msgstr "������括��������篋肴�荐�鐚�茫��������頳遵������篁ヤ��g�"
-
-#: src/protocols/yahoo/yahoo.c:2003
+"web browser<br>"
+msgstr "������括��������篋肴�荐�鐚�茫��������頳遵������篁ヤ��g�<br>"
+
+#: src/protocols/yahoo/yahoo.c:2621
 msgid ""
 "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>絨�筝�莎件���������吧�掩������篋肴�荐���</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2037
+#: src/protocols/yahoo/yahoo.c:2666
 msgid "Yahoo! ID"
 msgstr "Yahoo! 絽活��"
 
-#: src/protocols/yahoo/yahoo.c:2079 src/protocols/yahoo/yahoo.c:2081
-#: src/protocols/yahoo/yahoo.c:2083
+#: src/protocols/yahoo/yahoo.c:2726 src/protocols/yahoo/yahoo.c:2730
+#: src/protocols/yahoo/yahoo.c:2734
 msgid "Hobbies"
 msgstr "��絅�"
 
-#: src/protocols/yahoo/yahoo.c:2085 src/protocols/yahoo/yahoo.c:2087
+#: src/protocols/yahoo/yahoo.c:2745 src/protocols/yahoo/yahoo.c:2749
 msgid "Latest News"
 msgstr "���井���"
 
-#: src/protocols/yahoo/yahoo.c:2096
+#: src/protocols/yahoo/yahoo.c:2767
 msgid "Home Page"
 msgstr "膓臥��"
 
-#: src/protocols/yahoo/yahoo.c:2106
+#: src/protocols/yahoo/yahoo.c:2781
 msgid "Cool Link 1"
 msgstr "�潔�g�(筝�)"
 
-#: src/protocols/yahoo/yahoo.c:2108
+#: src/protocols/yahoo/yahoo.c:2786
 msgid "Cool Link 2"
 msgstr "�潔�g�(篋�)"
 
-#: src/protocols/yahoo/yahoo.c:2110
+#: src/protocols/yahoo/yahoo.c:2789
 msgid "Cool Link 3"
 msgstr "�潔�g�(筝�)"
 
 # TODO 茘�����緇��拷��
-#: src/protocols/yahoo/yahoo.c:2114
+#: src/protocols/yahoo/yahoo.c:2795
 msgid "Member Since"
 msgstr "��勀���ユ��莎欠�堺����"
 
@@ -7186,92 +7519,92 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:2250 src/protocols/yahoo/yahoo.c:2252
+#: src/protocols/yahoo/yahoo.c:2960 src/protocols/yahoo/yahoo.c:2962
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo ��絎�罔∞�"
 
-#: src/protocols/yahoo/yahoo.c:2269
+#: src/protocols/yahoo/yahoo.c:2979
 msgid "Pager host"
 msgstr "�喝�主鎧腟延失����"
 
-#: src/protocols/yahoo/yahoo.c:2274
+#: src/protocols/yahoo/yahoo.c:2984
 msgid "Pager port"
 msgstr "�喝�主鎧腟演��荐���"
 
-#: src/protocols/yahoo/yahoochat.c:191
+#: src/protocols/yahoo/yahoochat.c:194
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 紿���篋�篏�荅√�鋌�鐚�絅刻��井��茘医���%s������茫�鐚����掩����%s����"
 
-#: src/protocols/yahoo/yahoochat.c:193
+#: src/protocols/yahoo/yahoochat.c:196
 msgid "Invitation Rejected"
 msgstr "��茫�茴����篋�"
 
-#: src/protocols/yahoo/yahoochat.c:317
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Failed to join chat"
 msgstr "�≧����ヨ��紊��"
 
-#: src/protocols/yahoo/yahoochat.c:317
+#: src/protocols/yahoo/yahoochat.c:333
 msgid "Maybe the room is full?"
 msgstr "��荐怨�����紊��篏睡����綏牙��育��筝���鐚�"
 
-#: src/protocols/yahoo/yahoochat.c:509
+#: src/protocols/yahoo/yahoochat.c:531
 msgid "Failed to join buddy in chat"
 msgstr "�≧����ュソ��������������紊��"
 
-#: src/protocols/yahoo/yahoochat.c:510
+#: src/protocols/yahoo/yahoochat.c:532
 msgid "Maybe they're not in a chat?"
 msgstr "���巡�鐚�絅刻�筝������紊���э�"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/zephyr/zephyr.c:344
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>篏睡����鐚�</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:346
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>�ュ��鐚�</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:348
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>�沿����Ǔ�糸��"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:352
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>緇� %2$s 莎桁群�� %1$s"
 
-#: src/protocols/zephyr/zephyr.c:575 src/protocols/zephyr/zephyr.c:576
+#: src/protocols/zephyr/zephyr.c:584 src/protocols/zephyr/zephyr.c:585
 msgid "Anyone"
 msgstr "篁私�篋�"
 
-#: src/protocols/zephyr/zephyr.c:600
+#: src/protocols/zephyr/zephyr.c:609
 msgid "Already logged in with Zephyr"
 msgstr "綏牙��糸�� Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:601
+#: src/protocols/zephyr/zephyr.c:610
 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 �����糸�ョ鎧腟援��絽活��鐚���������醇����紊��� Zephyr 絽恰�句����"
 
 # TODO: �� Google �上�亥��莖���茯� Zephyr �� ZLocate ���腮���������鐚�筝�������茖>��ユ���藝惹���
-#: src/protocols/zephyr/zephyr.c:855
+#: src/protocols/zephyr/zephyr.c:868
 msgid "ZLocate"
 msgstr ""
 
 # TODO: �� Google �憜�亥��莖���茯� Zephyr �� Class 筝�����ワ������腮���腱�篋榊����紊��
-#: src/protocols/zephyr/zephyr.c:895
+#: src/protocols/zephyr/zephyr.c:908
 msgid "Class:"
 msgstr ""
 
 # TODO: �� Google �上�亥��莖���茯� Zephyr �� Instance ���腮����援����紊��
-#: src/protocols/zephyr/zephyr.c:900
+#: src/protocols/zephyr/zephyr.c:913
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:905
+#: src/protocols/zephyr/zephyr.c:918
 msgid "Recipient:"
 msgstr "�ュ���鐚�"
 
@@ -7285,7 +7618,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1037 src/protocols/zephyr/zephyr.c:1039
+#: src/protocols/zephyr/zephyr.c:1050 src/protocols/zephyr/zephyr.c:1052
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr ��絎�罔∞�"
 
@@ -7300,38 +7633,15 @@
 msgstr ""
 "絨��惹��������荐㊤���篁g��篌堺��������箴�茯������腟����篌堺������腮怨���荐������≧����"
 
-#: src/prpl.c:143
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s ���ヤ� %s �坂� / 絅合��絅遵� %s%s%s"
-
-#: src/prpl.c:155
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
-
-#: src/prpl.c:158
-msgid "Gaim - Information"
-msgstr "Gaim - 莖�荐�"
-
-#: src/prpl.c:161
-msgid "Add buddy to your list?"
-msgstr "絨�篏睡�������ユ����絅遵�羝����"
-
 #. * Custom away message.
-#: src/prpl.h:186
+#: src/prpl.h:187
 msgid "Custom"
 msgstr "篏睡�������"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:823
+#: src/request.h:862
 msgid "Accept"
 msgstr "�ュ�"
 
@@ -7339,27 +7649,27 @@
 msgid "Please enter your password"
 msgstr "茫�莠後�ユ����絲�腆�"
 
-#: src/server.c:956
+#: src/server.c:949
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "鐚�%d ��荐����"
 
-#: src/server.c:969
+#: src/server.c:962
 msgid "(1 message)"
 msgstr "鐚�筝���荐����"
 
-#: src/server.c:1156 src/server.c:1166
+#: src/server.c:1145 src/server.c:1155
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ャ��"
 
-#: src/server.c:1184 src/server.c:1192
+#: src/server.c:1172 src/server.c:1180
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�冴��"
 
-#: src/server.c:1240
+#: src/server.c:1227
 #, c-format
 msgid ""
 "%s has just been warned by %s.\n"
@@ -7368,11 +7678,11 @@
 "%s ����茴� %s 茘���篋���\n"
 "�����域⑥��膈�膣��� %d%%"
 
-#: src/server.c:1243
+#: src/server.c:1230
 msgid "an anonymous person"
 msgstr "筝����水����"
 
-#: src/server.c:1346
+#: src/server.c:1333
 #, c-format
 msgid ""
 "User '%s' invites %s to buddy chat room: '%s'\n"
@@ -7381,23 +7691,15 @@
 "篏睡������%s����茫� %s �医ソ����紊��鐚���%s��\n"
 "%s"
 
-#: src/server.c:1350
+#: src/server.c:1337
 #, c-format
 msgid "User '%s' invites %s to buddy chat room: '%s'\n"
 msgstr "篏睡������%s����茫� %s �医ソ����紊��鐚���%s��\n"
 
-#: src/server.c:1356
+#: src/server.c:1343
 msgid "Accept chat invitation?"
 msgstr "�ュ���茫����"
 
-#: src/server.c:1545
-msgid "Gaim - Popup"
-msgstr "Gaim - 荐���"
-
-#: src/server.c:1572
-msgid "More Info"
-msgstr "�翫�莖�荐�"
-
 #. for people like myself who are too lazy to add an away msg :)
 #. I don't know who "myself" is in this context.  The exclamation point
 #. * makes it slightly less boring ;)
@@ -7413,28 +7715,32 @@
 msgid "_Open Mail"
 msgstr "�����灸散(_O)"
 
-#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
+#: src/util.c:1527
+msgid "Calculating..."
+msgstr "荐�膊�筝�..."
+
+#: src/util.c:1530
+msgid "Unknown."
+msgstr "���ャ��"
+
+#: src/util.c:1561 src/util.c:1566 src/util.c:1571 src/util.c:1574
 msgid "day"
 msgid_plural "days"
 msgstr[0] "紊�"
 
-#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
+#: src/util.c:1562 src/util.c:1566 src/util.c:1580 src/util.c:1582
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "絨��"
 
-#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
+#: src/util.c:1562 src/util.c:1571 src/util.c:1580 src/util.c:1585
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "��"
 
-#: src/util.c:950
-msgid "Calculating..."
-msgstr "頥�膊�筝�..."
-
-#: src/util.c:953
-msgid "Unknown."
-msgstr "���ャ��"
+#: src/util.c:1917
+msgid "g003: Error opening connection.\n"
+msgstr "g003: �g����������\n"
 
 # TODO need to check context
 #: src/win32/win32dep.c:474
@@ -7446,6 +7752,142 @@
 msgid "Moving Gaim user settings directory to:"
 msgstr "���� Gaim ��篏睡����荐㊤��������上��Щ�鰹�"
 
+#~ msgid ""
+#~ "Communication with the browser failed. Please close all windows and try "
+#~ "again."
+#~ msgstr "���頳遵����羣���紊掩����茫�����������荀�腦�緇���荅���"
+
+#~ msgid "Alias"
+#~ msgstr "�ュ��"
+
+#~ msgid "Group"
+#~ msgstr "臂ょ�"
+
+#~ msgid "Add To"
+#~ msgstr "紜�����"
+
+#~ msgid "EveryBuddy Bug"
+#~ msgstr "EveryBuddy ���"
+
+#~ msgid "<hr>%s"
+#~ msgstr "<hr>%s"
+
+#~ msgid "Set Directory Info"
+#~ msgstr "荐㊤�篏睡����莖�荐�"
+
+#~ msgid "Directory Info"
+#~ msgstr "����莖�荐�"
+
+#~ msgid "Setting Dir Info for %s:"
+#~ msgstr "荐㊤� %s ��篏睡����莖�荐�鐚�"
+
+#~ msgid "Allow Web Searches To Find Your Info"
+#~ msgstr "��荐怨�� Web ��絨�箴�罟∵�������篋肴�荐�"
+
+# NOTE��絨����鎀ф�箙���札鐚�篏���Maiden Name����絽娯�����������������
+#~ msgid "Maiden Name"
+#~ msgstr "���"
+
+#~ msgid "Below are the results of your search: "
+#~ msgstr "篁ヤ����������ヨ���腟���鐚�"
+
+#~ msgid "Search for Buddy"
+#~ msgstr "�上�絅遵�"
+
+#~ msgid "Find Buddy By Info"
+#~ msgstr "篁ヨ�荐��上�絅遵�"
+
+#~ msgid "Unable to change password."
+#~ msgstr "�≧��贋�劫�腆若��"
+
+#~ msgid ""
+#~ "The current password you entered is incorrect.  Your password has not "
+#~ "been changed."
+#~ msgstr "����莠後�ョ����絲�腆惹������������絲�腆惹����贋�鴻��"
+
+#~ msgid ""
+#~ "The new password you entered is the same as your current password.  Your "
+#~ "password remains the same."
+#~ msgstr "����莠後�ョ���医�腆弱����絲�腆惹���罔g������篁ュ�腆惹���茴��壕���"
+
+#~ msgid "Jabber Error %s"
+#~ msgstr "Jabber ��� %s"
+
+#~ msgid "Error %s: %s"
+#~ msgstr "��� %s鐚�%s"
+
+#~ msgid ""
+#~ "The Jabber user %s does not exist and was therefore not added to your "
+#~ "roster."
+#~ msgstr "Jabber 篏睡���� %s 筝��絖������篁ュ�筝������ュ�井��������賢��"
+
+#~ msgid "No such user."
+#~ msgstr "羃�������篏睡������"
+
+#~ msgid "Unknown login error"
+#~ msgstr "���ョ���糸�ラ���"
+
+#~ msgid "Password successfully changed."
+#~ msgstr "絲�腆寂信�号������"
+
+#~ msgid "Connected"
+#~ msgstr "�g�����"
+
+#~ msgid "Requesting Authentication Method"
+#~ msgstr "荀�羆�茯�茘����劫�筝�"
+
+#~ msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+#~ msgstr "篏睡���� %s ������≧���� Jabber 絽活��鐚���篁ヤ���茴����ュ�医����賢��"
+
+#~ msgid "Unable to add buddy."
+#~ msgstr "�≧����ュソ����"
+
+#~ msgid "View Error Msg"
+#~ msgstr "茹������荐���"
+
+#~ msgid "Error %d: %s"
+#~ msgstr "��� %d鐚�%s"
+
+#~ msgid "Unknown registration error"
+#~ msgstr "���ョ��荐糸�����"
+
+#~ msgid "<B>Status:</B> %s<HR>%s"
+#~ msgstr "<B>����鐚�</B> %s<HR>%s"
+
+#~ msgid ""
+#~ "<i>Unable to display information because it was sent in an unknown "
+#~ "encoding.</i>"
+#~ msgstr "<I>���坂戎������ョ��膩�⊆鐚���篁ョ�≧�蕁�ず荐�����</i>"
+
+#~ msgid ""
+#~ "Username : <b>%s</b>  %s <br>\n"
+#~ "Warning Level : <b>%d %%</b><br>\n"
+#~ "%s%s%s\n"
+#~ "<hr>\n"
+#~ msgstr ""
+#~ "篏睡������腮縁�<B>%s</B>  %s <BR>\n"
+#~ "茘���膈�膣�鐚�<B>%d %%</B><BR>\n"
+#~ "%s%s%s<BR>\n"
+#~ "<HR>\n"
+
+#~ msgid "<i>User has no away message</i>"
+#~ msgstr "<i>篏睡����羃����∫��荐���</i>"
+
+#~ msgid "Client Capabilities: "
+#~ msgstr "絎∽�句��後��э�"
+
+#~ msgid "<i>No Information Provided</i>"
+#~ msgstr "<i>���箴�篁私�篆≧��</i>"
+
+#~ msgid "Please talk to me, I'm lonely! (and single)"
+#~ msgstr "茫����������э���荀阪�絅遵�絲�鐚�"
+
+#~ msgid "Gaim - Popup"
+#~ msgstr "Gaim - 荐���"
+
+#~ msgid "More Info"
+#~ msgstr "�翫�莖�荐�"
+
 #~ msgid "_Quote window title"
 #~ msgstr "荀�腦�罔�蕁���緇���筝�綣���(_Q)"
 
@@ -7484,18 +7926,12 @@
 #~ msgid "Sign On"
 #~ msgstr "�糸��"
 
-#~ msgid "Unable to change password"
-#~ msgstr "�≧��贋�劫�腆�"
-
 #~ msgid "Unable to send USR\n"
 #~ msgstr "�≧����� USR\n"
 
 #~ msgid "Got invalid XFR\n"
 #~ msgstr "��緇��≧���� XFR\n"
 
-#~ msgid "Authentication Failed"
-#~ msgstr "茯�茘�紊掩��"
-
 #~ msgid ""
 #~ "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 #~ msgstr "GAIM::register �弱ŭ��筝������箴����句�����吾��茫����� PERL-HOWTO��"
@@ -7727,16 +8163,6 @@
 #~ msgid "_Login"
 #~ msgstr "�糸��(_L)"
 
-#~ msgid ""
-#~ "Please enter your password for %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "茫�莠後�ユ���� %s ��絲�腆若��\n"
-#~ "\n"
-
-#~ msgid "_Password"
-#~ msgstr "絲�腆�(_P)"
-
 #~ msgid "TOC not found."
 #~ msgstr "�鞘��� TOC��"