Mercurial > pidgin

--- a/po/zh_CN.po	Tue Dec 23 14:23:53 2003 +0000
+++ b/po/zh_CN.po	Tue Dec 23 14:27:21 2003 +0000
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2003-12-14 00:00-0500\n"
-"PO-Revision-Date: 2003-12-14 19:36+0800\n"
+"POT-Creation-Date: 2003-12-19 00:00-0500\n"
+"PO-Revision-Date: 2003-12-18 23:30+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -144,12 +144,12 @@
 msgid "New..."
 msgstr "�医産..."

-#: plugins/docklet/docklet.c:153 src/gtkblist.c:2530 src/gtkpounce.c:411
+#: plugins/docklet/docklet.c:153 src/gtkblist.c:2532 src/gtkpounce.c:411
 #: src/gtkprefs.c:1469 src/protocols/gg/gg.c:51 src/protocols/irc/msgs.c:187
 #: src/protocols/jabber/jabber.c:926 src/protocols/jabber/jutil.c:98
 #: src/protocols/jabber/presence.c:84 src/protocols/oscar/oscar.c:2845
-#: src/protocols/oscar/oscar.c:4594 src/protocols/oscar/oscar.c:5552
-#: src/protocols/oscar/oscar.c:6153
+#: src/protocols/oscar/oscar.c:4596 src/protocols/oscar/oscar.c:5562
+#: src/protocols/oscar/oscar.c:6163
 msgid "Away"
 msgstr "胼糸�"

@@ -723,14 +723,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:208
+#: plugins/ssl/ssl-gnutls.c:218
 msgid "GNUTLS"
 msgstr "GNUTLS"

 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:211 plugins/ssl/ssl-gnutls.c:213
+#: plugins/ssl/ssl-gnutls.c:221 plugins/ssl/ssl-gnutls.c:223
 msgid "Provides SSL support through GNUTLS."
 msgstr "��箴���菴� GNUTLS �� SSL ������"

@@ -741,14 +741,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:296
+#: plugins/ssl/ssl-nss.c:306
 msgid "NSS"
 msgstr "NSS"

 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:299 plugins/ssl/ssl-nss.c:301
+#: plugins/ssl/ssl-nss.c:309 plugins/ssl/ssl-nss.c:311
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "��箴���菴� Mozilla NSS �� SSL ������"

@@ -933,7 +933,7 @@
 msgstr "Windows �����九���� Gaim(_S)"

 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2364
+#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:2366
 #: src/gtkprefs.c:2266
 msgid "Buddy List"
 msgstr "絅遵���茵�"
@@ -1021,167 +1021,167 @@
 msgid "Crazy Patch Writers"
 msgstr "����茵ヤ�膽�����"

-#: src/about.c:146
+#: src/about.c:138
 msgid "Retired Developers"
 msgstr "��篌�綣�����"

-#: src/about.c:147
+#: src/about.c:139
 msgid "former libfaim maintainer"
 msgstr "���� libfaim 膸贋�よ��"

-#: src/about.c:148
+#: src/about.c:140
 msgid "former lead developer"
 msgstr "����蘂�絲弱�����"

-#: src/about.c:151
+#: src/about.c:143
 msgid "former maintainer"
 msgstr "����膸贋�よ��"

-#: src/about.c:152
+#: src/about.c:144
 msgid "former Jabber developer"
 msgstr "���� Jabber 綣�����"

-#: src/about.c:153
+#: src/about.c:145
 msgid "original author"
 msgstr "��篏���"

-#: src/about.c:156
+#: src/about.c:148
 msgid "hacker and designated driver [lazy bum]"
 msgstr "薨�絎√��筝�絮�薊怨���綺�[lazy bum]"

-#: src/about.c:164
+#: src/about.c:156
 msgid "Current Translators"
 msgstr "綵���膺肢���"

-#: src/about.c:165 src/about.c:198
+#: src/about.c:157 src/about.c:190
 msgid "Catalan"
 msgstr "��羈亥�絨寂�莚�"

-#: src/about.c:166 src/about.c:199
+#: src/about.c:158 src/about.c:191
 msgid "Czech"
 msgstr "�桁��莚�"

-#: src/about.c:167
+#: src/about.c:159
 msgid "Danish"
 msgstr "筝拷墾莚�"

-#: src/about.c:168
-msgid "Esperanto"
-msgstr "筝���莚�"
-
-#: src/about.c:169 src/about.c:200
+#: src/about.c:160
+msgid "British English"
+msgstr "�怨�処�沿�"
+
+#: src/about.c:161 src/about.c:192
 msgid "German"
 msgstr "緇決�"

-#: src/about.c:170 src/about.c:201
+#: src/about.c:162 src/about.c:193
 msgid "Spanish"
 msgstr "茱睡���莚�"

-#: src/about.c:171 src/about.c:202
+#: src/about.c:163 src/about.c:194
 msgid "Finnish"
 msgstr "���域�"

-#: src/about.c:172 src/about.c:203
+#: src/about.c:164 src/about.c:195
 msgid "French"
 msgstr "羈�莚�"

-#: src/about.c:173
+#: src/about.c:165
 msgid "Hindi"
 msgstr "�医�域�"

-#: src/about.c:174
+#: src/about.c:166
 msgid "Hungarian"
 msgstr "�������"

-#: src/about.c:175 src/about.c:205
+#: src/about.c:167 src/about.c:197
 msgid "Italian"
 msgstr "�鎀у���"

-#: src/about.c:176 src/about.c:207
+#: src/about.c:168 src/about.c:199
 msgid "Korean"
 msgstr "��蕾�莚�"

-#: src/about.c:177
+#: src/about.c:169
 msgid "Dutch; Flemish"
 msgstr "�桁�域�"

-#: src/about.c:178
+#: src/about.c:170
 msgid "Norwegian"
 msgstr "���莚�"

-#: src/about.c:179 src/about.c:208
+#: src/about.c:171 src/about.c:200
 msgid "Polish"
 msgstr "羈√�域�"

-#: src/about.c:180
+#: src/about.c:172
 msgid "Portuguese"
 msgstr "�∴����莚�"

-#: src/about.c:181
+#: src/about.c:173
 msgid "Portuguese-Brazil"
 msgstr "綏頑タ�∴����莚�"

-#: src/about.c:182
+#: src/about.c:174
 msgid "Romanian"
 msgstr "臀�薊�絢篋�莚�"

-#: src/about.c:183 src/about.c:209
+#: src/about.c:175 src/about.c:201
 msgid "Russian"
 msgstr "篆�莚�"

-#: src/about.c:184
+#: src/about.c:176
 msgid "Serbian"
 msgstr "紂�絨�膸岩�莚�"

-#: src/about.c:185 src/about.c:211
+#: src/about.c:177 src/about.c:203
 msgid "Swedish"
 msgstr "���梧�"

-#: src/about.c:186
+#: src/about.c:178
 msgid "Vietnamese"
 msgstr "莇���莚�"

-#: src/about.c:186
+#: src/about.c:178
 msgid "Gnome Vi Team"
 msgstr "Gnome 莇���莚㊤�∫��"

-#: src/about.c:187
+#: src/about.c:179
 msgid "Simplified Chinese"
 msgstr "膊�篏�筝㊥��"

+#: src/about.c:180
+msgid "Traditional Chinese"
+msgstr "膵�篏�筝㊥��"
+
+#: src/about.c:187
+msgid "Past Translators"
+msgstr "����膺肢���"
+
 #: src/about.c:188
-msgid "Traditional Chinese"
-msgstr "膵�篏�筝㊥��"
-
-#: src/about.c:195
-msgid "Past Translators"
-msgstr "����膺肢���"
-
-#: src/about.c:196
 msgid "Amharic"
 msgstr "�水�����莚�"

-#: src/about.c:197
+#: src/about.c:189
 msgid "Bulgarian"
 msgstr "篆������莚�"

-#: src/about.c:204
+#: src/about.c:196
 msgid "Hebrew"
 msgstr "絽�篌�ｱ莚�"

-#: src/about.c:206
+#: src/about.c:198
 msgid "Japanese"
 msgstr "�ヨ�"

-#: src/about.c:210
+#: src/about.c:202
 msgid "Slovak"
 msgstr "���篌���莚�"

-#: src/about.c:212
+#: src/about.c:204
 msgid "Chinese"
 msgstr "筝㊥��"

-#: src/about.c:225 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
+#: src/about.c:217 src/gtkrequest.c:198 src/protocols/msn/msn.c:247
 msgid "Close"
 msgstr "�渇��"

@@ -1217,23 +1217,24 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:336 src/connection.c:193 src/dialogs.c:1491
-#: src/dialogs.c:1508 src/dialogs.c:1527 src/gtkblist.c:1730
+#: src/account.c:336 src/connection.c:193 src/dialogs.c:1492
+#: src/dialogs.c:1509 src/dialogs.c:1528 src/gtkblist.c:1730
 #: src/gtkrequest.c:195 src/protocols/jabber/jabber.c:1023
 #: 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:2456 src/protocols/oscar/oscar.c:2536
-#: src/protocols/oscar/oscar.c:6203 src/protocols/oscar/oscar.c:6299
-#: src/protocols/oscar/oscar.c:6348 src/protocols/oscar/oscar.c:6430
-#: src/protocols/yahoo/yahoo.c:2337 src/request.h:852
+#: src/protocols/oscar/oscar.c:6213 src/protocols/oscar/oscar.c:6309
+#: src/protocols/oscar/oscar.c:6358 src/protocols/oscar/oscar.c:6440
+#: src/protocols/yahoo/yahoo.c:2394 src/protocols/yahoo/yahoo.c:2402
+#: src/request.h:852
 msgid "OK"
 msgstr "隋��"

-#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:352
-#: src/dialogs.c:364 src/dialogs.c:377 src/dialogs.c:398 src/dialogs.c:1333
-#: src/dialogs.c:1492 src/dialogs.c:1509 src/dialogs.c:1528
+#: src/account.c:337 src/account.c:371 src/connection.c:194 src/dialogs.c:353
+#: src/dialogs.c:365 src/dialogs.c:378 src/dialogs.c:399 src/dialogs.c:1334
+#: src/dialogs.c:1493 src/dialogs.c:1510 src/dialogs.c:1529
 #: src/gtkaccount.c:1622 src/gtkaccount.c:2091 src/gtkblist.c:1731
-#: src/gtkblist.c:3666 src/gtkconn.c:148 src/gtkprivacy.c:568
+#: src/gtkblist.c:3681 src/gtkconn.c:148 src/gtkprivacy.c:568
 #: src/gtkprivacy.c:581 src/gtkprivacy.c:606 src/gtkprivacy.c:617
 #: src/gtkrequest.c:196 src/protocols/icq/gaim_icq.c:277
 #: src/protocols/jabber/buddy.c:512 src/protocols/jabber/jabber.c:651
@@ -1242,11 +1243,11 @@
 #: src/protocols/msn/msn.c:215 src/protocols/msn/msn.c:228
 #: 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:6031 src/protocols/oscar/oscar.c:6204
-#: src/protocols/oscar/oscar.c:6300 src/protocols/oscar/oscar.c:6349
-#: src/protocols/oscar/oscar.c:6414 src/protocols/oscar/oscar.c:6431
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2338
-#: src/request.h:852 src/request.h:862
+#: src/protocols/oscar/oscar.c:6041 src/protocols/oscar/oscar.c:6214
+#: src/protocols/oscar/oscar.c:6310 src/protocols/oscar/oscar.c:6359
+#: src/protocols/oscar/oscar.c:6424 src/protocols/oscar/oscar.c:6441
+#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2395
+#: src/protocols/yahoo/yahoo.c:2403 src/request.h:852 src/request.h:862
 msgid "Cancel"
 msgstr "��羔�"

@@ -1255,14 +1256,14 @@
 msgid "Change user information for %s"
 msgstr "�贋�� %s �����隙拭��"

-#: src/account.c:370 src/dialogs.c:1321 src/gtkrequest.c:202
+#: src/account.c:370 src/dialogs.c:1322 src/gtkrequest.c:202
 #: src/protocols/jabber/buddy.c:511 src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "篆�絖�"

 #: src/away.c:208
-msgid "Gaim - Away!"
-msgstr "Gaim - 胼糸�鐚�"
+msgid "Away!"
+msgstr "胼糸�!"

 #: src/away.c:269
 msgid "I'm Back!"
@@ -1284,7 +1285,7 @@
 msgid "Chats"
 msgstr "��紊�"

-#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3146
+#: src/blist.c:661 src/blist.c:848 src/blist.c:2063 src/gtkblist.c:3148
 #: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:1160
 msgid "Buddies"
 msgstr "絅遵�"
@@ -1305,7 +1306,7 @@
 msgid "Group not removed"
 msgstr "膸�������"

-#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:849
+#: src/blist.c:1207 src/gtkaccount.c:159 src/gtkutils.c:847
 #: src/protocols/jabber/auth.c:130 src/protocols/jabber/buddy.c:563
 msgid "Unknown"
 msgstr "����"
@@ -1323,7 +1324,7 @@
 msgid "Buddy List Error"
 msgstr "絅遵���茵��咲��"

-#: src/buddy_chat.c:212 src/gtkblist.c:3558
+#: src/buddy_chat.c:212 src/gtkblist.c:3571
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -1343,7 +1344,7 @@
 "join.\n"
 msgstr "莚決��ユ���活����ョ����紊���絲劫�篆≧����\n"

-#: src/buddy_chat.c:253 src/dialogs.c:588 src/dialogs.c:663
+#: src/buddy_chat.c:253 src/dialogs.c:589 src/dialogs.c:664
 #: src/gtkpounce.c:358
 msgid "_Account:"
 msgstr "茣���(_A):"
@@ -1425,15 +1426,15 @@
 msgid "By account"
 msgstr "��茣���"

-#: src/dialogs.c:200
+#: src/dialogs.c:201
 msgid "Warn User"
 msgstr "茘�������"

-#: src/dialogs.c:203
+#: src/dialogs.c:204
 msgid "_Warn"
 msgstr "茘���(_W)"

-#: src/dialogs.c:219
+#: src/dialogs.c:220
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -1445,47 +1446,47 @@
 "\n"
 "菴�絨�紜��� %s ��茘���膾у���篁�/絅剛�絨�茴�辱�球��翫��筝ユ�主����綺����吟��\n"

-#: src/dialogs.c:228
+#: src/dialogs.c:229
 msgid "Warn _anonymously?"
 msgstr "�水��茘�����(_A)鐚�"

-#: src/dialogs.c:235
+#: src/dialogs.c:236
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�水��茘���莨�筝�絎号��綣�莎傑絵���</b>"

-#: src/dialogs.c:348
+#: src/dialogs.c:349
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "���喝�篁�����絅遵���茵�賢���� %s��������荀�菴�箙�����鐚�"

-#: src/dialogs.c:350 src/dialogs.c:351
+#: src/dialogs.c:351 src/dialogs.c:352
 msgid "Remove Buddy"
 msgstr "���ゅソ��"

-#: src/dialogs.c:360
+#: src/dialogs.c:361
 #, 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:362 src/dialogs.c:363
+#: src/dialogs.c:363 src/dialogs.c:364
 msgid "Remove Chat"
 msgstr "���よ��紊�"

-#: src/dialogs.c:372
+#: src/dialogs.c:373
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "���喝�篁�����絅遵���茵�賢���ょ� %s ���倶����������������荀�菴�箙�����鐚�"

-#: src/dialogs.c:375 src/dialogs.c:376
+#: src/dialogs.c:376 src/dialogs.c:377
 msgid "Remove Group"
 msgstr "���ょ�"

-#: src/dialogs.c:393
+#: src/dialogs.c:394
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddies from "
@@ -1494,122 +1495,122 @@
 "���喝�篁�����絅遵���茵�賢���ゅ���� %s �� %d 筝��九�絅遵�����膤私査��������荀�菴�箙���"
 "��鐚�"

-#: src/dialogs.c:396 src/dialogs.c:397
+#: src/dialogs.c:397 src/dialogs.c:398
 msgid "Remove Contact"
 msgstr "���よ��膤私査"

-#: src/dialogs.c:542
+#: src/dialogs.c:543
 msgid "New Instant Message"
 msgstr "�医�恰�倶���"

-#: src/dialogs.c:560
+#: src/dialogs.c:561
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "���活�莊�莪���鐚�莚決��ヤ�/絅合�����桁����\n"

-#: src/dialogs.c:572 src/dialogs.c:647
+#: src/dialogs.c:573 src/dialogs.c:648
 msgid "_Screenname:"
 msgstr "���桁��(_S):"

-#: src/dialogs.c:617
+#: src/dialogs.c:618
 msgid "Get User Info"
 msgstr "�桁����隙拭��"

-#: src/dialogs.c:635
+#: src/dialogs.c:636
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "���活��ョ��莪���篆≧���莚決��ヤ�/絅合�����桁����\n"

-#: src/dialogs.c:756
+#: src/dialogs.c:757
 msgid "Insert Link"
 msgstr "���ラ�丈･"

-#: src/dialogs.c:758
+#: src/dialogs.c:759
 msgid "_Insert"
 msgstr "����(_I)"

-#: src/dialogs.c:781
+#: src/dialogs.c:782
 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:794
+#: src/dialogs.c:795
 msgid "_URL:"
 msgstr "_URL:"

-#: src/dialogs.c:807
+#: src/dialogs.c:808
 msgid "_Description:"
 msgstr "�颷�(_D):"

-#: src/dialogs.c:936 src/dialogs.c:953
+#: src/dialogs.c:937 src/dialogs.c:954
 msgid "Select Text Color"
 msgstr "������絖�蘂���"

-#: src/dialogs.c:988 src/dialogs.c:1005
+#: src/dialogs.c:989 src/dialogs.c:1006
 msgid "Select Background Color"
 msgstr "�����������"

-#: src/dialogs.c:1090 src/dialogs.c:1116
+#: src/dialogs.c:1091 src/dialogs.c:1117
 msgid "Select Font"
 msgstr "�����篏�"

-#: src/dialogs.c:1182
+#: src/dialogs.c:1183
 msgid "You cannot save an away message with a blank title"
 msgstr "����巡�絖�腥堺��蘂���胼糸�羔���"

-#: src/dialogs.c:1184
+#: src/dialogs.c:1185
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "莚欠�羔�����絎���蘂�鐚�����筝�篆�絖��贋･��篏睡������"

-#: src/dialogs.c:1194
+#: src/dialogs.c:1195
 msgid "You cannot create an empty away message"
 msgstr "����遵��綮榊���胼糸�羔���"

-#: src/dialogs.c:1259 src/dialogs.c:1267
+#: src/dialogs.c:1260 src/dialogs.c:1268
 msgid "New away message"
 msgstr "�医産胼糸�羔���"

-#: src/dialogs.c:1277
+#: src/dialogs.c:1278
 msgid "Away title: "
 msgstr "胼糸���蘂�:"

-#: src/dialogs.c:1325
+#: src/dialogs.c:1326
 msgid "Save & Use"
 msgstr "篆�絖�綛銀戎��"

-#: src/dialogs.c:1329
+#: src/dialogs.c:1330
 msgid "Use"
 msgstr "篏睡��"

 #. show everything
-#: src/dialogs.c:1470
+#: src/dialogs.c:1471
 msgid "Smile!"
 msgstr "膃���"

-#: src/dialogs.c:1488
+#: src/dialogs.c:1489
 msgid "Alias Chat"
 msgstr "膸���紊�儀��"

-#: src/dialogs.c:1489
+#: src/dialogs.c:1490
 msgid "Enter an alias for this chat."
 msgstr "莚決��ユ④��紊���������"

-#: src/dialogs.c:1505
+#: src/dialogs.c:1506
 msgid "Alias Contact"
 msgstr "膸���膤私査莎桁��"

-#: src/dialogs.c:1506
+#: src/dialogs.c:1507
 msgid "Enter an alias for this contact."
 msgstr "莚決��ユ④��膤私査��������"

-#: src/dialogs.c:1523
+#: src/dialogs.c:1524
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "莨��� %s ��������"

-#: src/dialogs.c:1525
+#: src/dialogs.c:1526
 msgid "Alias Buddy"
 msgstr "絅遵�����"

@@ -1723,15 +1724,15 @@
 msgid "boring default"
 msgstr "��Ⅶ��篋�"

-#: src/gaimrc.c:1259 src/gtkblist.c:2326
+#: src/gaimrc.c:1259 src/gtkblist.c:2328
 msgid "Alphabetical"
 msgstr "絖�罸�綺�"

-#: src/gaimrc.c:1261 src/gtkblist.c:2327
+#: src/gaimrc.c:1261 src/gtkblist.c:2329
 msgid "By status"
 msgstr "���倶��"

-#: src/gaimrc.c:1263 src/gtkblist.c:2328
+#: src/gaimrc.c:1263 src/gtkblist.c:2330
 msgid "By log size"
 msgstr "���ュ�紊у�"

@@ -1772,7 +1773,7 @@
 msgid "Password:"
 msgstr "絲���:"

-#: src/gtkaccount.c:469 src/gtkblist.c:3298 src/gtkblist.c:3617
+#: src/gtkaccount.c:469 src/gtkblist.c:3308 src/gtkblist.c:3630
 msgid "Alias:"
 msgstr "����:"

@@ -1857,7 +1858,7 @@
 msgid "_Host:"
 msgstr "筝紙��(_H):"

-#: src/gtkaccount.c:864
+#: src/gtkaccount.c:864 src/gtkprefs.c:1144
 msgid "_Port:"
 msgstr "腴��(_P):"

@@ -1905,8 +1906,8 @@
 msgstr "���桁��"

 #: src/gtkaccount.c:1758 src/protocols/jabber/jabber.c:924
-#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4592
-#: src/protocols/oscar/oscar.c:6152 src/protocols/yahoo/yahoo.c:2132
+#: src/protocols/oscar/oscar.c:2851 src/protocols/oscar/oscar.c:4594
+#: src/protocols/oscar/oscar.c:6162 src/protocols/yahoo/yahoo.c:2189
 #: src/protocols/zephyr/zephyr.c:886 src/protocols/zephyr/zephyr.c:896
 msgid "Online"
 msgstr "��鎖"
@@ -1931,15 +1932,15 @@
 "�������活�絨�篁�/絅号兄��筝堺����絅遵�鐚�"

 #: src/gtkaccount.c:2084
-msgid "Gaim - Information"
-msgstr "Gaim - 篆≧��"
+msgid "Information"
+msgstr "篆≧��"

 #: src/gtkaccount.c:2088
 msgid "Add buddy to your list?"
 msgstr "絨����桁��筝阪ソ����鐚�"

-#: src/gtkaccount.c:2090 src/gtkblist.c:3665 src/gtkconv.c:1256
-#: src/gtkconv.c:3074 src/gtkconv.c:4279 src/gtkrequest.c:200
+#: src/gtkaccount.c:2090 src/gtkblist.c:3680 src/gtkconv.c:1272
+#: src/gtkconv.c:3197 src/gtkconv.c:4402 src/gtkrequest.c:200
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2693
 msgid "Add"
 msgstr "羞糸��"
@@ -1997,7 +1998,7 @@
 msgid "_Expand"
 msgstr "絮�綣�(_E)"

-#: src/gtkblist.c:1389 src/gtkconv.c:3795
+#: src/gtkblist.c:1389 src/gtkconv.c:3918
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "�������糸�ョ���顒�賢羃≧��筝�筝��札羞糸��絅遵�����"
@@ -2008,8 +2009,8 @@
 msgstr "/絅遵�(_B)"

 #: src/gtkblist.c:1681
-msgid "/Buddies/New _Instant Message..."
-msgstr "/絅遵�(B)/�医�恰�倶���(_I)..."
+msgid "/Buddies/New Instant _Message..."
+msgstr "/絅遵�(B)/�医�恰�倶���(_M)..."

 #: src/gtkblist.c:1682
 msgid "/Buddies/Join a _Chat..."
@@ -2073,8 +2074,8 @@
 msgstr "/綏ュ��(T)/��篁銀���(_F)"

 #: src/gtkblist.c:1702
-msgid "/Tools/Preferences"
-msgstr "/綏ュ��(T)/薤���蕁�"
+msgid "/Tools/Pr_eferences"
+msgstr "/綏ュ��(T)/薤���蕁�(_E)"

 #: src/gtkblist.c:1703
 msgid "/Tools/Pr_ivacy"
@@ -2122,16 +2123,16 @@
 "\n"
 "<b>茣���:</b>%s"

-#: src/gtkblist.c:1817 src/protocols/oscar/oscar.c:5532
+#: src/gtkblist.c:1819 src/protocols/oscar/oscar.c:5542
 msgid "<b>Status:</b> Offline"
 msgstr "<b>�倶��:</b> 胼紫鎖"

-#: src/gtkblist.c:1829
+#: src/gtkblist.c:1831
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"

-#: src/gtkblist.c:1844
+#: src/gtkblist.c:1846
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -2139,7 +2140,7 @@
 "\n"
 "<b>茣���:</b>"

-#: src/gtkblist.c:1845
+#: src/gtkblist.c:1847
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
@@ -2147,7 +2148,7 @@
 "\n"
 "<b>��膤私査����:</b>"

-#: src/gtkblist.c:1846
+#: src/gtkblist.c:1848
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -2155,7 +2156,7 @@
 "\n"
 "<b>����:</b>"

-#: src/gtkblist.c:1847
+#: src/gtkblist.c:1849
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -2163,7 +2164,7 @@
 "\n"
 "<b>�窮О:</b>"

-#: src/gtkblist.c:1848
+#: src/gtkblist.c:1850
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -2171,7 +2172,7 @@
 "\n"
 "<b>����:</b>"

-#: src/gtkblist.c:1849
+#: src/gtkblist.c:1851
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -2179,7 +2180,7 @@
 "\n"
 "<b>茘���:</b>"

-#: src/gtkblist.c:1851
+#: src/gtkblist.c:1853
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2187,7 +2188,7 @@
 "\n"
 "<b>�颷�:</b>�ヨ�"

-#: src/gtkblist.c:1852
+#: src/gtkblist.c:1854
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -2195,7 +2196,7 @@
 "\n"
 "<b>�倶��</b>鐚�����"

-#: src/gtkblist.c:1853
+#: src/gtkblist.c:1855
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
@@ -2203,85 +2204,85 @@
 "\n"
 "<b>�倶��</b>鐚�羞隙恒"

-#: src/gtkblist.c:2121
+#: src/gtkblist.c:2123
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "���＞賢 (%d絨��%02d��) "

-#: src/gtkblist.c:2123
+#: src/gtkblist.c:2125
 #, c-format
 msgid "Idle (%dm) "
 msgstr "����賢 (%d��) "

-#: src/gtkblist.c:2128
+#: src/gtkblist.c:2130
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%) "

-#: src/gtkblist.c:2131
+#: src/gtkblist.c:2133
 msgid "Offline "
 msgstr "胼紫鎖 "

-#: src/gtkblist.c:2324 src/gtkprefs.c:841 src/gtkprefs.c:1497
+#: src/gtkblist.c:2326 src/gtkprefs.c:841 src/gtkprefs.c:1497
 msgid "None"
 msgstr "��"

-#: src/gtkblist.c:2391
+#: src/gtkblist.c:2393
 msgid "/Tools/Away"
 msgstr "/綏ュ��(T)/胼糸�(A)"

-#: src/gtkblist.c:2394
+#: src/gtkblist.c:2396
 msgid "/Tools/Buddy Pounce"
 msgstr "/綏ュ��(T)/絅遵�������(P)"

-#: src/gtkblist.c:2397
+#: src/gtkblist.c:2399
 msgid "/Tools/Protocol Actions"
 msgstr "/綏ュ��(T)/�顒���篏�(R)"

 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:2484
+#: src/gtkblist.c:2486
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�(B)/�丞ず胼紫鎖絅遵�(O)"

-#: src/gtkblist.c:2486
+#: src/gtkblist.c:2488
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�(B)/�丞ず腥榊�(E)"

-#: src/gtkblist.c:2504 src/gtkconv.c:1215
+#: src/gtkblist.c:2506 src/gtkconv.c:1231
 msgid "IM"
 msgstr "綣���"

-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2512
 msgid "Send a message to the selected buddy"
 msgstr "����筝㊤ソ������羔���"

-#: src/gtkblist.c:2513 src/protocols/napster/napster.c:529
+#: src/gtkblist.c:2515 src/protocols/napster/napster.c:529
 msgid "Get Info"
 msgstr "篆≧��"

-#: src/gtkblist.c:2519
+#: src/gtkblist.c:2521
 msgid "Get information on the selected buddy"
 msgstr "�桁���筝㊤ソ����篆≧��"

-#: src/gtkblist.c:2522 src/protocols/oscar/oscar.c:3089
+#: src/gtkblist.c:2524 src/protocols/oscar/oscar.c:3089
 msgid "Chat"
 msgstr "��紊�"

-#: src/gtkblist.c:2527
+#: src/gtkblist.c:2529
 msgid "Join a chat room"
 msgstr "���ヨ��紊��"

-#: src/gtkblist.c:2535
+#: src/gtkblist.c:2537
 msgid "Set an away message"
 msgstr "莅丞舟胼糸�羔���"

-#: src/gtkblist.c:3240 src/protocols/yahoo/yahoo.c:2264
+#: src/gtkblist.c:3250 src/protocols/yahoo/yahoo.c:2321
 msgid "Add Buddy"
 msgstr "羞糸��絅遵�"

-#: src/gtkblist.c:3263
+#: src/gtkblist.c:3273
 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. "
@@ -2290,38 +2291,38 @@
 "���活�絨�莪���筝阪ソ��鐚�莚決��ヤ�/絅合�����桁���������減絅遵�莨��ュ�������窮О���������"
 "��莚�鐚�����絨�篌��推撮���桁���丞ず��\n"

-#: src/gtkblist.c:3285 src/main.c:289
+#: src/gtkblist.c:3295 src/main.c:289
 msgid "Screen Name:"
 msgstr "���桁��:"

-#: src/gtkblist.c:3311 src/gtkblist.c:3628
+#: src/gtkblist.c:3321 src/gtkblist.c:3643
 msgid "Group:"
 msgstr "膸�:"

 #. Set up stuff for the account box
-#: src/gtkblist.c:3320 src/gtkblist.c:3598
+#: src/gtkblist.c:3330 src/gtkblist.c:3611
 msgid "Account:"
 msgstr "茣���:"

-#: src/gtkblist.c:3565
+#: src/gtkblist.c:3578
 msgid "Add Chat"
 msgstr "羞糸����紊�"

-#: src/gtkblist.c:3588
+#: src/gtkblist.c:3601
 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:3662
+#: src/gtkblist.c:3677
 msgid "Add Group"
 msgstr "羞糸��膸�"

-#: src/gtkblist.c:3663
+#: src/gtkblist.c:3678
 msgid "Please enter the name of the group to be added."
 msgstr "莚決��ヨ�羞糸����膸���腱違��"

-#: src/gtkblist.c:4180
+#: src/gtkblist.c:4195
 msgid "No actions available"
 msgstr "羃≧����������篏�"

@@ -2341,7 +2342,7 @@
 msgid "Cancel All"
 msgstr "�����羔�"

-#: src/gtkconn.c:425 src/gtkconn.c:460 src/gtkconn.c:527
+#: src/gtkconn.c:425 src/gtkconn.c:460 src/gtkconn.c:526
 msgid "_Reconnect"
 msgstr "���域���(_R)"

@@ -2362,15 +2363,15 @@
 msgid "Reason Unknown."
 msgstr "�������ャ��"

-#: src/gtkconn.c:532
+#: src/gtkconn.c:531
 msgid "Reconnect _All"
 msgstr "�������域���(_A)"

-#: src/gtkconn.c:550
+#: src/gtkconn.c:554
 msgid "Account"
 msgstr "茣���"

-#: src/gtkconn.c:558
+#: src/gtkconn.c:562
 msgid "Time"
 msgstr "�狗��"

@@ -2391,340 +2392,340 @@
 msgid "Insert Image"
 msgstr "���ュ�上��"

-#: src/gtkconv.c:609
-msgid "Gaim - Invite Buddy Into Chat Room"
-msgstr "Gaim - ��莚桁ソ��菴��ヨ��紊��"
+#: src/gtkconv.c:620
+msgid "Invite Buddy Into Chat Room"
+msgstr "��莚桁ソ��菴��ヨ��紊��"

 #. Put our happy label in it.
-#: src/gtkconv.c:637
+#: src/gtkconv.c:648
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "���活���莚決�鐚�莚決��ヤ�/絅合����絖�鐚�篁ュ���������莚傑�����"

-#: src/gtkconv.c:658
+#: src/gtkconv.c:669
 msgid "_Buddy:"
 msgstr "絅遵�(_B):"

-#: src/gtkconv.c:678
+#: src/gtkconv.c:689
 msgid "_Message:"
 msgstr "羔���(_M):"

-#: src/gtkconv.c:764
+#: src/gtkconv.c:775
 msgid "Find"
 msgstr "�ユ��"

-#: src/gtkconv.c:782
+#: src/gtkconv.c:793
 msgid "_Search for:"
 msgstr "��膣∽��絖�(_S):"

-#: src/gtkconv.c:1223
+#: src/gtkconv.c:1239
 msgid "Un-Ignore"
 msgstr "��羔�綽順��"

-#: src/gtkconv.c:1225 src/gtkprefs.c:774
+#: src/gtkconv.c:1241 src/gtkprefs.c:774
 msgid "Ignore"
 msgstr "綽順��"

 #. Info button
-#: src/gtkconv.c:1234 src/gtkconv.c:3097
+#: src/gtkconv.c:1250 src/gtkconv.c:3220
 msgid "Info"
 msgstr "篆≧��"

-#: src/gtkconv.c:1243
+#: src/gtkconv.c:1259
 msgid "Get Away Msg"
 msgstr "�桁�胼糸�羔���"

-#: src/gtkconv.c:1254 src/gtkconv.c:3080 src/gtkconv.c:4264
+#: src/gtkconv.c:1270 src/gtkconv.c:3203 src/gtkconv.c:4387
 #: src/gtkrequest.c:201
 msgid "Remove"
 msgstr "����"

-#: src/gtkconv.c:2331
+#: src/gtkconv.c:2453
 msgid "User is typing..."
 msgstr "���傑③����絖�..."

-#: src/gtkconv.c:2339
+#: src/gtkconv.c:2461
 msgid "User has typed something and paused"
 msgstr "���傑��篋���筝��鐚���篋�筝�筝�"

 #. Build the Send As menu
-#: src/gtkconv.c:2442
+#: src/gtkconv.c:2564
 msgid "_Send As"
 msgstr "����荳�蚕(_S)"

-#: src/gtkconv.c:2864
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - 篆�絖�絲壕�"
+#: src/gtkconv.c:2985
+msgid "Save Conversation"
+msgstr "篆�絖�絲壕�"

 #. Conversation menu
-#: src/gtkconv.c:2881
+#: src/gtkconv.c:3002
 msgid "/_Conversation"
 msgstr "/絲壕�(_C)"

-#: src/gtkconv.c:2883
-msgid "/Conversation/_New Conversation..."
-msgstr "/絲壕�(C)/�医産絲壕�(_N)..."
-
-#: src/gtkconv.c:2888
+#: src/gtkconv.c:3004
+msgid "/Conversation/New Instant _Message..."
+msgstr "/絲壕�(C)/�医�恰�倶���(_M)..."
+
+#: src/gtkconv.c:3009
+msgid "/Conversation/_Find..."
+msgstr "/絲壕�(C)/�ユ��(_F)..."
+
+#: src/gtkconv.c:3010
+msgid "/Conversation/View _Log"
+msgstr "/絲壕�(C)/�ョ���ュ�(_L)"
+
+#: src/gtkconv.c:3011
 msgid "/Conversation/_Save As..."
 msgstr "/絲壕�(C)/���筝�(_S)..."

-#: src/gtkconv.c:2890
-msgid "/Conversation/View _Log"
-msgstr "/絲壕�(C)/�ョ���ュ�(_L)"
-
-#: src/gtkconv.c:2891
-msgid "/Conversation/Find..."
-msgstr "/絲壕�(C)/�ユ��..."
-
-#: src/gtkconv.c:2895
+#: src/gtkconv.c:3016
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/絲壕�(C)/羞糸��絅遵�������(_P)..."

-#: src/gtkconv.c:2897
+#: src/gtkconv.c:3018
+msgid "/Conversation/_Get Info"
+msgstr "/絲壕�(C)/�桁�篆≧��(_G)"
+
+#: src/gtkconv.c:3020
+msgid "/Conversation/_Warn..."
+msgstr "/絲壕�(C)/茘���(_W)..."
+
+#: src/gtkconv.c:3022
+msgid "/Conversation/In_vite..."
+msgstr "/絲壕�(C)/��莚�(_V)..."
+
+#: src/gtkconv.c:3027
 msgid "/Conversation/A_lias..."
 msgstr "/絲壕�(C)/����(_L)..."

-#: src/gtkconv.c:2899
-msgid "/Conversation/_Get Info..."
-msgstr "/絲壕�(C)/�桁�篆≧��(_G)..."
-
-#: src/gtkconv.c:2901
-msgid "/Conversation/In_vite..."
-msgstr "/絲壕�(C)/��莚�(_V)..."
-
-#: src/gtkconv.c:2906
+#: src/gtkconv.c:3029
+msgid "/Conversation/_Block..."
+msgstr "/絲壕�(C)/絮��(_B)..."
+
+#: src/gtkconv.c:3031
+msgid "/Conversation/_Add..."
+msgstr "/鎛壕�(C)/羞糸��(_A)..."
+
+#: src/gtkconv.c:3033
+msgid "/Conversation/_Remove..."
+msgstr "/絲壕�(C)/����(_R)..."
+
+#: src/gtkconv.c:3038
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/絲壕�(C)/���ラ�丈･(_K)..."

-#: src/gtkconv.c:2908
-msgid "/Conversation/Insert _Image..."
-msgstr "/絲壕�(C)/���ュ�上��(_I)..."
-
-#: src/gtkconv.c:2913
-msgid "/Conversation/_Warn..."
-msgstr "/絲壕�(C)/茘���(_W)..."
-
-#: src/gtkconv.c:2915
-msgid "/Conversation/_Block..."
-msgstr "/絲壕�(C)/絮��(_B)..."
-
-#: src/gtkconv.c:2917
-msgid "/Conversation/_Add..."
-msgstr "/鎛壕�(C)/羞糸��(_A)..."
-
-#: src/gtkconv.c:2919
-msgid "/Conversation/_Remove..."
-msgstr "/絲壕�(C)/����(_R)..."
-
-#: src/gtkconv.c:2924
+#: src/gtkconv.c:3040
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/絲壕�(C)/���ュ�上��(_E)..."
+
+#: src/gtkconv.c:3045
 msgid "/Conversation/_Close"
 msgstr "/絲壕�(C)/�渇��(_C)"

 #. Options
-#: src/gtkconv.c:2928
+#: src/gtkconv.c:3049
 msgid "/_Options"
 msgstr "/��蕁�(_O)"

-#: src/gtkconv.c:2929
+#: src/gtkconv.c:3050
 msgid "/Options/Enable _Logging"
 msgstr "/��蕁�(O)/��莅梧�綵��ュ�(_L)"

-#: src/gtkconv.c:2930
+#: src/gtkconv.c:3051
 msgid "/Options/Enable _Sounds"
 msgstr "/��蕁�(O)/��莅後０��(_S)"

-#: src/gtkconv.c:2931
+#: src/gtkconv.c:3052
 msgid "/Options/Show Formatting _Toolbar"
 msgstr "/��蕁�(O)/�丞ず�弱�綏ュ�傑��(_T)"

-#: src/gtkconv.c:2973
+#: src/gtkconv.c:3094
 msgid "/Conversation/View Log"
 msgstr "/絲壕�(C)/�ョ���ュ�(L)"

-#: src/gtkconv.c:2978
+#: src/gtkconv.c:3099
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/絲壕�(C)/羞糸��絅遵�������(P)..."

-#: src/gtkconv.c:2982
-msgid "/Conversation/Alias..."
-msgstr "/絲壕�(C)/����(L)..."
-
-#: src/gtkconv.c:2986
-msgid "/Conversation/Get Info..."
-msgstr "/絲壕�(C)/�桁�篆≧��(G)..."
-
-#: src/gtkconv.c:2990
+#: src/gtkconv.c:3105
+msgid "/Conversation/Get Info"
+msgstr "/絲壕�(C)/�桁�篆≧��(G)"
+
+#: src/gtkconv.c:3109
+msgid "/Conversation/Warn..."
+msgstr "/絲壕�(C)/茘���(W)..."
+
+#: src/gtkconv.c:3113
 msgid "/Conversation/Invite..."
 msgstr "/絲壕�(C)/��莚�(V)..."

-#: src/gtkconv.c:2996
-msgid "/Conversation/Insert URL..."
-msgstr "/絲壕�(C)/���� URL(U)..."
-
-#: src/gtkconv.c:3000
-msgid "/Conversation/Insert Image..."
-msgstr "/絲壕�(C)/���ュ�上��(I)..."
-
-#: src/gtkconv.c:3006
-msgid "/Conversation/Warn..."
-msgstr "/絲壕�(C)/茘���(W)..."
-
-#: src/gtkconv.c:3010
+#: src/gtkconv.c:3119
+msgid "/Conversation/Alias..."
+msgstr "/絲壕�(C)/����(L)..."
+
+#: src/gtkconv.c:3123
 msgid "/Conversation/Block..."
 msgstr "/絲壕�(C)/絮��(B)..."

-#: src/gtkconv.c:3014
+#: src/gtkconv.c:3127
 msgid "/Conversation/Add..."
 msgstr "/鎛壕�(C)/羞糸��(A)..."

-#: src/gtkconv.c:3018
+#: src/gtkconv.c:3131
 msgid "/Conversation/Remove..."
 msgstr "/絲壕�(C)/����(R)..."

-#: src/gtkconv.c:3024
+#: src/gtkconv.c:3137
+msgid "/Conversation/Insert Link..."
+msgstr "/絲壕�(C)/���ラ�丈･(K)..."
+
+#: src/gtkconv.c:3141
+msgid "/Conversation/Insert Image..."
+msgstr "/絲壕�(C)/���ュ�上��(I)..."
+
+#: src/gtkconv.c:3147
 msgid "/Options/Enable Logging"
 msgstr "/��蕁�(O)/��莅梧�綵�(L)"

-#: src/gtkconv.c:3027
+#: src/gtkconv.c:3150
 msgid "/Options/Enable Sounds"
 msgstr "/��蕁�(O)/��莅後０��(S)"

-#: src/gtkconv.c:3030
+#: src/gtkconv.c:3153
 msgid "/Options/Show Formatting Toolbar"
 msgstr "/��蕁�(O)/�丞ず�弱�綏ュ�傑��(T)"

 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3054 src/gtkconv.c:3056 src/gtkconv.c:3154 src/gtkconv.c:3156
-#: src/gtkconv.c:5974
+#: src/gtkconv.c:3177 src/gtkconv.c:3179 src/gtkconv.c:3277 src/gtkconv.c:3279
+#: src/gtkconv.c:6014
 msgid "Send"
 msgstr "����"

-#: src/gtkconv.c:3077 src/gtkconv.c:4282
+#: src/gtkconv.c:3200 src/gtkconv.c:4405
 msgid "Add the user to your buddy list"
 msgstr "絨����桁��筝阪ソ��"

-#: src/gtkconv.c:3083 src/gtkconv.c:4267
+#: src/gtkconv.c:3206 src/gtkconv.c:4390
 msgid "Remove the user from your buddy list"
 msgstr "篁�����絅遵���茵�賢���よ�����"

 #. Warn button
-#: src/gtkconv.c:3090
+#: src/gtkconv.c:3213
 msgid "Warn"
 msgstr "茘���"

-#: src/gtkconv.c:3094
+#: src/gtkconv.c:3217
 msgid "Warn the user"
 msgstr "茘�������"

-#: src/gtkconv.c:3101 src/gtkconv.c:3540
+#: src/gtkconv.c:3224 src/gtkconv.c:3663
 msgid "Get the user's information"
 msgstr "�桁����隙拭��"

 #. Block button
-#: src/gtkconv.c:3104 src/gtkprivacy.c:605 src/gtkprivacy.c:616
+#: src/gtkconv.c:3227 src/gtkprivacy.c:605 src/gtkprivacy.c:616
 msgid "Block"
 msgstr "絮��"

-#: src/gtkconv.c:3108
+#: src/gtkconv.c:3231
 msgid "Block the user"
 msgstr "鎡�恝����"

 #. Invite
-#: src/gtkconv.c:3166 src/gtkconv.c:5977
+#: src/gtkconv.c:3289 src/gtkconv.c:6017
 msgid "Invite"
 msgstr "��莚�"

-#: src/gtkconv.c:3169
+#: src/gtkconv.c:3292
 msgid "Invite a user"
 msgstr "��莚欠����"

-#: src/gtkconv.c:3208
+#: src/gtkconv.c:3331
 msgid "Bold"
 msgstr "膕�篏�"

-#: src/gtkconv.c:3219
+#: src/gtkconv.c:3342
 msgid "Italic"
 msgstr "��篏�"

-#: src/gtkconv.c:3230
+#: src/gtkconv.c:3353
 msgid "Underline"
 msgstr "筝���膾�"

-#: src/gtkconv.c:3246
+#: src/gtkconv.c:3369
 msgid "Larger font size"
 msgstr "莨�紊у�篏�"

-#: src/gtkconv.c:3271
+#: src/gtkconv.c:3394
 msgid "Smaller font size"
 msgstr "莨�絨鎕�篏�"

-#: src/gtkconv.c:3288
+#: src/gtkconv.c:3411
 msgid "Font Face"
 msgstr "絖�篏�"

-#: src/gtkconv.c:3300
+#: src/gtkconv.c:3423
 msgid "Foreground font color"
 msgstr "絖�篏�蘂���"

-#: src/gtkconv.c:3312
+#: src/gtkconv.c:3435
 msgid "Background color"
 msgstr "�������"

-#: src/gtkconv.c:3327
+#: src/gtkconv.c:3450
 msgid "Insert image"
 msgstr "���ュ�上��"

-#: src/gtkconv.c:3338
+#: src/gtkconv.c:3461
 msgid "Insert link"
 msgstr "���ラ�丈･"

-#: src/gtkconv.c:3349
+#: src/gtkconv.c:3472
 msgid "Insert smiley"
 msgstr "���ョ���"

-#: src/gtkconv.c:3409
+#: src/gtkconv.c:3532
 msgid "Topic:"
 msgstr "莚�蘂�:"

 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3460
+#: src/gtkconv.c:3583
 msgid "0 people in room"
 msgstr "��紊����羃≧��篋�"

-#: src/gtkconv.c:3517
+#: src/gtkconv.c:3640
 msgid "IM the user"
 msgstr "膸����桁����恰�倶���"

-#: src/gtkconv.c:3529
+#: src/gtkconv.c:3652
 msgid "Ignore the user"
 msgstr "綽順�ョ����"

-#: src/gtkconv.c:4080
+#: src/gtkconv.c:4203
 msgid "Close conversation"
 msgstr "�渇�㊤�莚�"

-#: src/gtkconv.c:4667 src/gtkconv.c:4699 src/gtkconv.c:4820 src/gtkconv.c:4887
+#: src/gtkconv.c:4790 src/gtkconv.c:4822 src/gtkconv.c:4943 src/gtkconv.c:5010
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "��紊������ %d 筝�査"

-#: src/gtkconv.c:5221
+#: src/gtkconv.c:5344
 msgid "Animate"
 msgstr "����"

-#: src/gtkconv.c:5226
+#: src/gtkconv.c:5349
 msgid "Hide Icon"
 msgstr "����憝��"

-#: src/gtkconv.c:5232
+#: src/gtkconv.c:5355
 msgid "Save Icon As..."
 msgstr "�丈�����筝�..."

-#: src/gtkconv.c:5711 src/gtkconv.c:5714
+#: src/gtkconv.c:5751 src/gtkconv.c:5754
 msgid "<main>/Conversation/Close"
 msgstr "<main>/絲壕�(C)/�渇��(C)"

@@ -2807,7 +2808,7 @@
 msgstr "���鋇�莉順���"

 #. Pause button
-#: src/gtkft.c:672 src/stock.c:86
+#: src/gtkft.c:672 src/stock.c:85
 msgid "_Pause"
 msgstr "����(_P)"

@@ -2837,12 +2838,12 @@
 msgstr "莚ユ��篁銀�絖�����"

 #: src/gtkft.c:1100
-msgid "Gaim - Open..."
-msgstr "Gaim - ��綣�..."
-
-#: src/gtkft.c:1102 src/protocols/toc/toc.c:2042
-msgid "Gaim - Save As..."
-msgstr "Gaim - ���筝�..."
+msgid "Open..."
+msgstr "��綣�..."
+
+#: src/gtkft.c:1102
+msgid "Save As..."
+msgstr "���筝�..."

 #: src/gtkft.c:1149
 #, c-format
@@ -2985,7 +2986,7 @@
 msgstr "����"

 #: src/gtkpounce.c:415 src/gtkprefs.c:1494 src/protocols/msn/state.c:30
-#: src/protocols/yahoo/yahoo.c:2128
+#: src/protocols/yahoo/yahoo.c:2185
 msgid "Idle"
 msgstr "����"

@@ -3409,10 +3410,6 @@
 msgid "Proxy Server"
 msgstr "篁ｇ�����≦��"

-#: src/gtkprefs.c:1144
-msgid "Port:"
-msgstr "腴��:"
-
 #: src/gtkprefs.c:1162
 msgid "_User:"
 msgstr "����(_U):"
@@ -3861,13 +3858,13 @@
 "launched: %s"
 msgstr "��羈��㊥�上０�鰹���������臀���羈�莪�����臀���紕育�喝�巡擦鐚�%s"

-#: src/gtkutils.c:296
+#: src/gtkutils.c:294
 msgid "Can't save icon file to disk."
 msgstr "��羈�篆�絖� 0 絖������丈����篁吟��"

-#: src/gtkutils.c:331
-msgid "Gaim - Save Icon"
-msgstr "Gaim - 篆�絖��丈��"
+#: src/gtkutils.c:329
+msgid "Save Icon"
+msgstr "篆�絖��丈��"

 #: src/log.c:83
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
@@ -3877,12 +3874,12 @@
 msgid "XML"
 msgstr "XML"

-#: src/log.c:484
+#: src/log.c:487
 #, c-format
 msgid "<font color=\"#16569E\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\">(%s) <b>%s <������紊�>:</b></font> %s<br/>\n"

-#: src/log.c:486
+#: src/log.c:489
 #, c-format
 msgid "<font color=\"#A82F2F\">(%s) <b>%s <AUTO-REPLY>:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\">(%s) <b>%s <������紊�>:</b></font> %s<br/>\n"
@@ -3982,8 +3979,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:110
 #: 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:2417
-#: src/protocols/yahoo/yahoo.c:2526
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2488
+#: src/protocols/yahoo/yahoo.c:2597
 msgid "Available"
 msgstr "����"

@@ -3997,9 +3994,9 @@

 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:929
 #: src/protocols/jabber/presence.c:91 src/protocols/oscar/oscar.c:2849
-#: src/protocols/oscar/oscar.c:4582 src/protocols/oscar/oscar.c:4609
-#: src/protocols/oscar/oscar.c:6158 src/protocols/yahoo/yahoo.c:2126
-#: src/protocols/yahoo/yahoo.c:2437 src/protocols/yahoo/yahoo.c:2536
+#: src/protocols/oscar/oscar.c:4584 src/protocols/oscar/oscar.c:4611
+#: src/protocols/oscar/oscar.c:6168 src/protocols/yahoo/yahoo.c:2183
+#: src/protocols/yahoo/yahoo.c:2508 src/protocols/yahoo/yahoo.c:2607
 msgid "Invisible"
 msgstr "��荳�"

@@ -4117,7 +4114,7 @@
 msgid "Active"
 msgstr "羇肢�"

-#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3960
+#: src/protocols/gg/gg.c:664 src/protocols/oscar/oscar.c:3962
 msgid "UIN"
 msgstr "UIN"

@@ -4127,12 +4124,12 @@

 #. Last Name
 #: src/protocols/gg/gg.c:673 src/protocols/jabber/jabber.c:602
-#: src/protocols/oscar/oscar.c:3968 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:3970 src/protocols/trepia/trepia.c:274
 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:3962
+#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:3964
 msgid "Nick"
 msgstr "�窮О"

@@ -4147,7 +4144,7 @@

 #. City
 #: src/protocols/gg/gg.c:701 src/protocols/jabber/jabber.c:612
-#: src/protocols/oscar/oscar.c:4014 src/protocols/oscar/oscar.c:4030
+#: src/protocols/oscar/oscar.c:4016 src/protocols/oscar/oscar.c:4032
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:430
 msgid "City"
 msgstr "���"
@@ -4156,9 +4153,9 @@
 #: src/protocols/gg/gg.c:722 src/protocols/msn/msn.c:1286
 #: src/protocols/msn/msn.c:1530 src/protocols/napster/napster.c:387
 #: src/protocols/oscar/oscar.c:2891 src/protocols/oscar/oscar.c:3203
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2709
-#: src/protocols/yahoo/yahoo.c:2731 src/protocols/yahoo/yahoo.c:2754
-#: src/protocols/yahoo/yahoo.c:2912 src/protocols/zephyr/zephyr.c:355
+#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/yahoo/yahoo.c:2802 src/protocols/yahoo/yahoo.c:2825
+#: src/protocols/yahoo/yahoo.c:2983 src/protocols/zephyr/zephyr.c:355
 msgid "Buddy Information"
 msgstr "絅遵�篆≧��"

@@ -4308,14 +4305,14 @@
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:187
 #: src/protocols/msn/notification.c:949 src/protocols/msn/notification.c:1270
 #: src/protocols/msn/notification.c:1435 src/protocols/oscar/oscar.c:2621
-#: src/protocols/oscar/oscar.c:5140
+#: src/protocols/oscar/oscar.c:5142
 msgid "Authorize"
 msgstr "����"

 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:188
 #: src/protocols/msn/notification.c:950 src/protocols/msn/notification.c:1272
 #: src/protocols/msn/notification.c:1437 src/protocols/oscar/oscar.c:2623
-#: src/protocols/oscar/oscar.c:5141
+#: src/protocols/oscar/oscar.c:5143
 msgid "Deny"
 msgstr "��膸�"

@@ -4392,7 +4389,7 @@
 msgid "_Channel:"
 msgstr "蘂���(_C):"

-#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:163 src/protocols/jabber/chat.c:57
 msgid "_Password:"
 msgstr "絲���(_P):"

@@ -4472,7 +4469,7 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"

-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2812
+#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:2883
 msgid "Realname"
 msgstr "����"

@@ -4521,103 +4518,107 @@
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim ����篋� IRC ���≦����羈���茹ｇ��篆≧����"

+#: src/protocols/irc/msgs.c:370
+msgid "No such channel"
+msgstr "羃≧��菴��欠��蘂���"
+
 #. does this happen?
-#: src/protocols/irc/msgs.c:371
+#: src/protocols/irc/msgs.c:381
 msgid "no such channel"
 msgstr "羃≧��菴��欠��蘂���"

-#: src/protocols/irc/msgs.c:374
+#: src/protocols/irc/msgs.c:384
 msgid "User is not logged in"
 msgstr "���傑���糸��"

-#: src/protocols/irc/msgs.c:379
+#: src/protocols/irc/msgs.c:389
 msgid "No such nick or channel"
 msgstr "羃≧��菴��欠���窮О��蘂���"

-#: src/protocols/irc/msgs.c:399
+#: src/protocols/irc/msgs.c:409
 msgid "Could not send"
 msgstr "��羈�����"

-#: src/protocols/irc/msgs.c:455
+#: src/protocols/irc/msgs.c:465
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "���� %s ��荀���莚激��"

-#: src/protocols/irc/msgs.c:456
+#: src/protocols/irc/msgs.c:466
 msgid "Invitation only"
 msgstr "����莚�"

-#: src/protocols/irc/msgs.c:552
+#: src/protocols/irc/msgs.c:562
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "��← %s鐚�%s 荼√�坂�"

-#: src/protocols/irc/msgs.c:560
+#: src/protocols/irc/msgs.c:570
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "茴� %s (%s) 荼√��"

-#: src/protocols/irc/msgs.c:581
+#: src/protocols/irc/msgs.c:591
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "%3$s 罔≦�(%1$s %2%s)"

-#: src/protocols/irc/msgs.c:660
+#: src/protocols/irc/msgs.c:670
 msgid "Could not change nick"
 msgstr "��羈��贋�号�窮О"

-#: src/protocols/irc/msgs.c:661
+#: src/protocols/irc/msgs.c:671
 msgid "Cannot change nick"
 msgstr "��羈��贋�号�窮О"

-#: src/protocols/irc/msgs.c:682
+#: src/protocols/irc/msgs.c:692
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "��群膸��鋇��蘂���%s%s"

-#: src/protocols/irc/msgs.c:720
+#: src/protocols/irc/msgs.c:730
 msgid "Error: invalid PONG from server"
 msgstr "��莚�����≦���� PONG ����"

-#: src/protocols/irc/msgs.c:722
+#: src/protocols/irc/msgs.c:732
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING ��綺� -- 綮九���%lu 腱�"

-#: src/protocols/irc/msgs.c:792
+#: src/protocols/irc/msgs.c:802
 #, c-format
 msgid "Cannot join %s:"
 msgstr "��羈����� %s:"

-#: src/protocols/irc/msgs.c:793
+#: src/protocols/irc/msgs.c:803
 msgid "Cannot join channel"
 msgstr "��羈����ラ���"

-#: src/protocols/irc/msgs.c:823
+#: src/protocols/irc/msgs.c:833
 #, c-format
 msgid "Wallops from %s"
 msgstr "�ヨ�� %s ���峨��"

-#: src/protocols/irc/parse.c:160
+#: src/protocols/irc/parse.c:161
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "(莉��∽④篆≧���咲����莚傑��ヨ侃�欠�莨���賢����膽�������蕁�)"

-#: src/protocols/irc/parse.c:291
+#: src/protocols/irc/parse.c:292
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s ����紊��狗�器�%lu 腱�"

-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "PONG"
 msgstr "PONG"

-#: src/protocols/irc/parse.c:292
+#: src/protocols/irc/parse.c:293
 msgid "CTCP PING reply"
 msgstr "CTCP PING ��綺�"

-#: src/protocols/irc/parse.c:391
+#: src/protocols/irc/parse.c:392
 msgid "Disconnected"
 msgstr "綏我�㊤�"

@@ -4669,7 +4670,7 @@

 #: src/protocols/jabber/auth.c:444 src/protocols/jabber/jabber.c:147
 #: src/protocols/jabber/jabber.c:864 src/protocols/jabber/jabber.c:914
-#: src/protocols/oscar/oscar.c:5560
+#: src/protocols/oscar/oscar.c:5570
 msgid "Not Authorized"
 msgstr "���莚�"

@@ -4694,7 +4695,7 @@
 msgstr "��"

 #: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:625
-#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2808
+#: src/protocols/jabber/jabber.c:592 src/protocols/yahoo/yahoo.c:2879
 msgid "Nickname"
 msgstr "�窮О"

@@ -4735,7 +4736,7 @@
 msgstr "�笈��欠��"

 #: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:699
-#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2804
+#: src/protocols/jabber/buddy.c:707 src/protocols/yahoo/yahoo.c:2875
 msgid "Email"
 msgstr "�球���散"

@@ -4756,7 +4757,7 @@
 msgstr "����"

 #: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:628
-#: src/protocols/oscar/oscar.c:3994
+#: src/protocols/oscar/oscar.c:3996
 msgid "Birthday"
 msgstr "����"

@@ -4789,7 +4790,7 @@
 msgstr "筝㊤��"

 #: src/protocols/jabber/buddy.c:633 src/protocols/jabber/jabber.c:607
-#: src/protocols/oscar/oscar.c:4011 src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4013 src/protocols/oscar/oscar.c:4029
 msgid "Address"
 msgstr "�医��"

@@ -4829,45 +4830,54 @@
 msgid "Unsubscribe"
 msgstr "��莅�"

-#: src/protocols/jabber/chat.c:37 src/protocols/yahoo/yahoochat.c:937
+#: src/protocols/jabber/chat.c:38 src/protocols/yahoo/yahoochat.c:938
 msgid "_Room:"
 msgstr "�翠��(_R):"

-#: src/protocols/jabber/chat.c:44
+#: src/protocols/jabber/chat.c:45
 msgid "_Server:"
 msgstr "���≦��(_S):"

-#: src/protocols/jabber/chat.c:50
+#: src/protocols/jabber/chat.c:51
 msgid "_Handle:"
 msgstr "�窮О(_H):"

-#: src/protocols/jabber/chat.c:158
+#: src/protocols/jabber/chat.c:159
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 筝����������翠�翫��"

-#: src/protocols/jabber/chat.c:159
+#: src/protocols/jabber/chat.c:160
 msgid "Invalid Room Name"
 msgstr "�������翠�翫��"

-#: src/protocols/jabber/chat.c:164
+#: src/protocols/jabber/chat.c:165
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 筝������������≦����"

-#: src/protocols/jabber/chat.c:165 src/protocols/jabber/chat.c:166
+#: src/protocols/jabber/chat.c:166 src/protocols/jabber/chat.c:167
 msgid "Invalid Server Name"
 msgstr "���������≦����"

-#: src/protocols/jabber/chat.c:170
+#: src/protocols/jabber/chat.c:171
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 筝����������翠�贋�窮О"

-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:172 src/protocols/jabber/chat.c:173
 msgid "Invalid Room Handle"
 msgstr "�������翠�顔���窮О"

+#. XXX: implement me!
+#: src/protocols/jabber/chat.c:271
+msgid "Not Implemented"
+msgstr "�����"
+
+#: src/protocols/jabber/chat.c:272
+msgid "This feature is not yet implemented"
+msgstr "罩ょ�号�у������"
+
 #: src/protocols/jabber/jabber.c:71
 msgid "Error initializing session"
 msgstr "��紮���篌�莚��咲��"
@@ -5043,14 +5053,14 @@
 msgstr "�球���散"

 #. First Name
-#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3965
+#: src/protocols/jabber/jabber.c:597 src/protocols/oscar/oscar.c:3967
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "��"

 #. State
-#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4017
-#: src/protocols/oscar/oscar.c:4033 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:617 src/protocols/oscar/oscar.c:4019
+#: src/protocols/oscar/oscar.c:4035 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:439
 msgid "State"
 msgstr "綏�/��"
@@ -5074,7 +5084,7 @@
 #: src/protocols/jabber/jabber.c:767 src/protocols/msn/dispatch.c:219
 #: src/protocols/msn/msn.c:483 src/protocols/napster/napster.c:487
 #: src/protocols/oscar/oscar.c:694 src/protocols/trepia/trepia.c:1110
-#: src/protocols/yahoo/yahoo.c:2014
+#: src/protocols/yahoo/yahoo.c:2069
 msgid "Connecting"
 msgstr "罩ｅ�����"

@@ -5091,7 +5101,7 @@
 msgstr "���医��紮���羌�"

 #: src/protocols/jabber/jabber.c:909 src/protocols/jabber/jabber.c:962
-#: src/protocols/jabber/presence.c:296
+#: src/protocols/jabber/presence.c:289
 msgid "Error"
 msgstr "�咲��"

@@ -5107,7 +5117,7 @@

 #: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jutil.c:107
 #: src/protocols/jabber/presence.c:89 src/protocols/oscar/oscar.c:2839
-#: src/protocols/oscar/oscar.c:4597 src/protocols/oscar/oscar.c:6154
+#: src/protocols/oscar/oscar.c:4599 src/protocols/oscar/oscar.c:6164
 msgid "Do Not Disturb"
 msgstr "莚桁�炊����"

@@ -5202,11 +5212,29 @@
 msgid "The user %s wants to add you to their buddy list."
 msgstr "���� %s �活�絨���兄��筝阪ソ����"

-#: src/protocols/jabber/presence.c:286 src/protocols/oscar/oscar.c:2950
+#: src/protocols/jabber/presence.c:243 src/protocols/jabber/presence.c:244
+msgid "Create New Room"
+msgstr "��綮堺�井�翠��"
+
+#: src/protocols/jabber/presence.c:245
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr "��③����綮堺�井�翠�眼�������活�菴�茵���臀��菴����活��ュ�藥�莅よ�臀��"
+
+#: src/protocols/jabber/presence.c:247
+msgid "Configure Room"
+msgstr "��臀��翠��"
+
+#: src/protocols/jabber/presence.c:249
+msgid "Accept Defaults"
+msgstr "�ュ�藥�莅ゅ��"
+
+#: src/protocols/jabber/presence.c:279 src/protocols/oscar/oscar.c:2950
 msgid "Unknown error"
 msgstr "���ラ��莚�"

-#: src/protocols/jabber/presence.c:292
+#: src/protocols/jabber/presence.c:285
 msgid "Unable to join chat"
 msgstr "��羈����ヨ��紊�"

@@ -5262,8 +5290,8 @@

 #: src/protocols/msn/dispatch.c:215 src/protocols/msn/msn.c:492
 #: src/protocols/msn/notification.c:2149 src/protocols/napster/napster.c:463
-#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1806
-#: src/protocols/yahoo/yahoo.c:1837 src/protocols/yahoo/yahoo.c:1902
+#: src/protocols/napster/napster.c:494 src/protocols/yahoo/yahoo.c:1849
+#: src/protocols/yahoo/yahoo.c:1880 src/protocols/yahoo/yahoo.c:1945
 msgid "Unable to connect"
 msgstr "��羈�菴���"

@@ -5535,7 +5563,7 @@
 msgid "Page"
 msgstr "絲糸��"

-#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2240
+#: src/protocols/msn/msn.c:332 src/protocols/yahoo/yahoo.c:2297
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>�倶��:</b> %s"
@@ -5546,26 +5574,26 @@
 msgstr "菴�胼紫�笈��"

 #: src/protocols/msn/msn.c:346 src/protocols/msn/msn.c:630
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2108
-#: src/protocols/yahoo/yahoo.c:2419 src/protocols/yahoo/yahoo.c:2527
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2165
+#: src/protocols/yahoo/yahoo.c:2490 src/protocols/yahoo/yahoo.c:2598
 msgid "Be Right Back"
 msgstr "薊������"

 #: src/protocols/msn/msn.c:347 src/protocols/msn/msn.c:632
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2110
-#: src/protocols/yahoo/yahoo.c:2421 src/protocols/yahoo/yahoo.c:2528
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:2167
+#: src/protocols/yahoo/yahoo.c:2492 src/protocols/yahoo/yahoo.c:2599
 msgid "Busy"
 msgstr "綽�腆�"

 #: src/protocols/msn/msn.c:348 src/protocols/msn/msn.c:634
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2118
-#: src/protocols/yahoo/yahoo.c:2429 src/protocols/yahoo/yahoo.c:2532
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2175
+#: src/protocols/yahoo/yahoo.c:2500 src/protocols/yahoo/yahoo.c:2603
 msgid "On The Phone"
 msgstr "�ュ���笈�"

 #: src/protocols/msn/msn.c:349 src/protocols/msn/msn.c:636
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2122
-#: src/protocols/yahoo/yahoo.c:2433 src/protocols/yahoo/yahoo.c:2534
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2179
+#: src/protocols/yahoo/yahoo.c:2504 src/protocols/yahoo/yahoo.c:2605
 msgid "Out To Lunch"
 msgstr "紊��阪葦蕕�"

@@ -5632,33 +5660,33 @@
 "MSN ���桁�����弱�綽�蕁紙����user@server.com�������醇��������� %s@hotmail.com������"
 "絮�恖��茵����篁私��贋�鴻��"

-#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2710
+#: src/protocols/msn/msn.c:1287 src/protocols/yahoo/yahoo.c:2781
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>�桁�筝�査莎����咲��</b></body></html>"

 #. Age
-#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:3999
+#: src/protocols/msn/msn.c:1357 src/protocols/oscar/oscar.c:4001
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:413
-#: src/protocols/yahoo/yahoo.c:2820
+#: src/protocols/yahoo/yahoo.c:2891
 msgid "Age"
 msgstr "綛顔�"

 #. Gender
-#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3985
+#: src/protocols/msn/msn.c:1364 src/protocols/oscar/oscar.c:3987
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:421
-#: src/protocols/yahoo/yahoo.c:2828
+#: src/protocols/yahoo/yahoo.c:2899
 msgid "Gender"
 msgstr "�у��"

-#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2824
+#: src/protocols/msn/msn.c:1372 src/protocols/yahoo/yahoo.c:2895
 msgid "Marital Status"
 msgstr "紿�紮紫�九��"

-#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2816
+#: src/protocols/msn/msn.c:1379 src/protocols/yahoo/yahoo.c:2887
 msgid "Location"
 msgstr "篏�臀�"

-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2832
+#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo.c:2903
 msgid "Occupation"
 msgstr "��筝�"

@@ -5679,11 +5707,11 @@
 msgstr "��絅遵���頑僑"

 #: src/protocols/msn/msn.c:1491 src/protocols/msn/msn.c:1497
-#: src/protocols/yahoo/yahoo.c:2867
+#: src/protocols/yahoo/yahoo.c:2938
 msgid "Favorite Quote"
 msgstr "�取�"

-#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2903
+#: src/protocols/msn/msn.c:1505 src/protocols/yahoo/yahoo.c:2974
 msgid "Last Updated"
 msgstr "筝�罨≧�贋��"

@@ -5693,12 +5721,12 @@
 msgid "Homepage"
 msgstr "筝脂ゝ"

-#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2918
+#: src/protocols/msn/msn.c:1538 src/protocols/yahoo/yahoo.c:2989
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s �����隙拭�������"

-#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/msn/msn.c:1540 src/protocols/yahoo/yahoo.c:2991
 msgid "The user's profile is empty."
 msgstr "���欠����臀���篁銀減腥冴��"

@@ -5877,7 +5905,7 @@
 msgid "%s requested a PING"
 msgstr "%s 莚傑� PING"

-#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5211
+#: src/protocols/napster/napster.c:543 src/protocols/oscar/oscar.c:5213
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "膸�(_G):"
@@ -6107,7 +6135,7 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ��羈��桁��������糸�����"

-#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5661
+#: src/protocols/oscar/oscar.c:1913 src/protocols/oscar/oscar.c:5671
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "筝� %s ��篋�篋坂���綏峨産腴�"
@@ -6130,7 +6158,7 @@
 "�医����荀���犬�域�膊��坂��翫産腴��贋･菴��ワ�菴�絲剛��恰�銀����上����荀�����篏����絨���"
 "�我���� IP �医��鐚���篁ュ��初����羹�������腱�蕋�����"

-#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6030
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:6040
 msgid "Connect"
 msgstr "菴���"

@@ -6160,8 +6188,8 @@
 #: src/protocols/oscar/oscar.c:2526 src/protocols/oscar/oscar.c:2528
 #: src/protocols/oscar/oscar.c:2535 src/protocols/oscar/oscar.c:2611
 #: src/protocols/oscar/oscar.c:2631 src/protocols/oscar/oscar.c:2987
-#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5132
-#: src/protocols/oscar/oscar.c:5178
+#: src/protocols/oscar/oscar.c:3047 src/protocols/oscar/oscar.c:5134
+#: src/protocols/oscar/oscar.c:5180
 msgid "No reason given."
 msgstr "羃≧��膸��榊���宴��"

@@ -6178,7 +6206,7 @@
 "���� %u �活�絨�����筝坂�/絅合��絅遵�鐚����怨�筝�鐚�\n"
 "%s"

-#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5138
+#: src/protocols/oscar/oscar.c:2619 src/protocols/oscar/oscar.c:5140
 msgid "Authorization Request"
 msgstr "莅よ�莚傑�"

@@ -6292,18 +6320,18 @@
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "����菴�篋� %2$s �� %1$hu �≧�����������ャ��"

-#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4606
-#: src/protocols/oscar/oscar.c:6157
+#: src/protocols/oscar/oscar.c:2837 src/protocols/oscar/oscar.c:4608
+#: src/protocols/oscar/oscar.c:6167
 msgid "Free For Chat"
 msgstr "��篋��画��"

-#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:6155
+#: src/protocols/oscar/oscar.c:2841 src/protocols/oscar/oscar.c:4602
+#: src/protocols/oscar/oscar.c:6165
 msgid "Not Available"
 msgstr "筝�����"

-#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4603
-#: src/protocols/oscar/oscar.c:6156
+#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:4605
+#: src/protocols/oscar/oscar.c:6166
 msgid "Occupied"
 msgstr "��篋�膽�荳�"

@@ -6340,12 +6368,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM 篋�篋坂���"

-#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6256
+#: src/protocols/oscar/oscar.c:3092 src/protocols/oscar/oscar.c:6266
 msgid "Get File"
 msgstr "�桁���篁�"

-#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6248
-#: src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/oscar/oscar.c:3095 src/protocols/oscar/oscar.c:6258
+#: src/protocols/yahoo/yahoo.c:2346
 msgid "Send File"
 msgstr "������篁�"

@@ -6450,162 +6478,162 @@
 "����丞�������罨≧��篏����ц�鐚���������群膸鏅��遺���綺�������莚欠� 10 腱�鐚��九����莚�"
 "筝�罨＜��"

-#: src/protocols/oscar/oscar.c:3678
+#: src/protocols/oscar/oscar.c:3680
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��群膸���篋�菴��ワ������������九�篏�臀���④���桁���糸�ヤ���"

-#: src/protocols/oscar/oscar.c:3680
+#: src/protocols/oscar/oscar.c:3682
 msgid "You have been signed off for an unknown reason."
 msgstr "��群膸�嶃�坂�鐚��������ャ��"

-#: src/protocols/oscar/oscar.c:3711
+#: src/protocols/oscar/oscar.c:3713
 msgid "Finalizing connection"
 msgstr "罩ｅ�����菴���"

-#: src/protocols/oscar/oscar.c:3971 src/protocols/oscar/oscar.c:3977
+#: src/protocols/oscar/oscar.c:3973 src/protocols/oscar/oscar.c:3979
 msgid "Email Address"
 msgstr "�球���散�医��"

-#: src/protocols/oscar/oscar.c:3982
+#: src/protocols/oscar/oscar.c:3984
 msgid "Mobile Phone"
 msgstr "腱糸���笈�"

-#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:422
 msgid "Female"
 msgstr "絅�"

-#: src/protocols/oscar/oscar.c:3985 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:3987 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:422
 msgid "Male"
 msgstr "��"

-#: src/protocols/oscar/oscar.c:4002
+#: src/protocols/oscar/oscar.c:4004
 msgid "Personal Web Page"
 msgstr "筝�査筝脂ゝ"

-#: src/protocols/oscar/oscar.c:4005
+#: src/protocols/oscar/oscar.c:4007
 msgid "Additional Information"
 msgstr "蘂�紊�篆≧��"

-#: src/protocols/oscar/oscar.c:4009
+#: src/protocols/oscar/oscar.c:4011
 msgid "Home Address"
 msgstr "絎九梱篏��"

-#: src/protocols/oscar/oscar.c:4020 src/protocols/oscar/oscar.c:4036
+#: src/protocols/oscar/oscar.c:4022 src/protocols/oscar/oscar.c:4038
 msgid "Zip Code"
 msgstr "���睡���"

-#: src/protocols/oscar/oscar.c:4025
+#: src/protocols/oscar/oscar.c:4027
 msgid "Work Address"
 msgstr "�����医��"

-#: src/protocols/oscar/oscar.c:4041
+#: src/protocols/oscar/oscar.c:4043
 msgid "Work Information"
 msgstr "綏ヤ�篆≧��"

-#: src/protocols/oscar/oscar.c:4043
+#: src/protocols/oscar/oscar.c:4045
 msgid "Company"
 msgstr "���"

-#: src/protocols/oscar/oscar.c:4046
+#: src/protocols/oscar/oscar.c:4048
 msgid "Division"
 msgstr "����"

-#: src/protocols/oscar/oscar.c:4049
+#: src/protocols/oscar/oscar.c:4051
 msgid "Position"
 msgstr "����"

-#: src/protocols/oscar/oscar.c:4052
+#: src/protocols/oscar/oscar.c:4054
 msgid "Web Page"
 msgstr "臀�蕁�"

-#: src/protocols/oscar/oscar.c:4058
+#: src/protocols/oscar/oscar.c:4060
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s �� ICQ 篆≧��"

-#: src/protocols/oscar/oscar.c:4108
+#: src/protocols/oscar/oscar.c:4110
 msgid "Pop-Up Message"
 msgstr "綣劫�堺���"

-#: src/protocols/oscar/oscar.c:4129
+#: src/protocols/oscar/oscar.c:4131
 #, c-format
 msgid "The following screennames are associated with %s"
 msgstr "筝������桁��綏牙��� %s �活��"

-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4135
 msgid "Search Results"
 msgstr "��膣∝���"

-#: src/protocols/oscar/oscar.c:4150
+#: src/protocols/oscar/oscar.c:4152
 #, c-format
 msgid "No results found for email address %s"
 msgstr "���上�遺��球���散�医�� %s �拷����膸���"

-#: src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4173
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "���綵��九�域���｀莅� %s ����散��"

-#: src/protocols/oscar/oscar.c:4173
+#: src/protocols/oscar/oscar.c:4175
 msgid "Account Confirmation Requested"
 msgstr "莚傑�篋�茣��欠｀莅�"

-#: src/protocols/oscar/oscar.c:4201
+#: src/protocols/oscar/oscar.c:4203
 msgid "Error Changing Account Info"
 msgstr "�贋�壕侃�隙拭���咲��"

-#: src/protocols/oscar/oscar.c:4204
+#: src/protocols/oscar/oscar.c:4206
 #, 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:4207
+#: src/protocols/oscar/oscar.c:4209
 #, 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:4210
+#: src/protocols/oscar/oscar.c:4212
 #, 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:4213
+#: src/protocols/oscar/oscar.c:4215
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr "��莚� 0x%04x鐚���羈��贋�合�球���散�医��鐚�������④���桁��綏牙���茴�ｨ����莚傑���"

-#: src/protocols/oscar/oscar.c:4216
+#: src/protocols/oscar/oscar.c:4218
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr "��莚� 0x%04x鐚���羈��贋�合�球���散�医��鐚��������絎����医���活�������桁��紊����"

-#: src/protocols/oscar/oscar.c:4219
+#: src/protocols/oscar/oscar.c:4221
 #, 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:4222
+#: src/protocols/oscar/oscar.c:4224
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��莚� 0x%04x鐚����ラ��莚���"

-#: src/protocols/oscar/oscar.c:4232
+#: src/protocols/oscar/oscar.c:4234
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -6614,20 +6642,20 @@
 "�������桁���弱������筝�鐚�\n"
 "%s"

-#: src/protocols/oscar/oscar.c:4233 src/protocols/oscar/oscar.c:4240
+#: src/protocols/oscar/oscar.c:4235 src/protocols/oscar/oscar.c:4242
 msgid "Account Info"
 msgstr "茣��隙拭��"

-#: src/protocols/oscar/oscar.c:4238
+#: src/protocols/oscar/oscar.c:4240
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���球���散�医��筝� %s"

-#: src/protocols/oscar/oscar.c:4470
+#: src/protocols/oscar/oscar.c:4472
 msgid "Unable to set AIM profile."
 msgstr "��羈�莅丞舟 AIM ��臀���篁吟��"

-#: src/protocols/oscar/oscar.c:4471
+#: src/protocols/oscar/oscar.c:4473
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -6636,7 +6664,7 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上���臀���篁吟��������臀���篁九����絎�鐚�莚桁���������ュ��"
 "��莚�筝�罨＜��"

-#: src/protocols/oscar/oscar.c:4498
+#: src/protocols/oscar/oscar.c:4500
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -6646,15 +6674,15 @@
 "truncated it for you."
 msgstr[0] "綏牙�莇�菴�篋���臀���篁句����紊ч�水墾 %d 絖�����Gaim 筝堺���������℡���"

-#: src/protocols/oscar/oscar.c:4503
+#: src/protocols/oscar/oscar.c:4505
 msgid "Profile too long."
 msgstr "��臀���篁九お�帥��"

-#: src/protocols/oscar/oscar.c:4520
+#: src/protocols/oscar/oscar.c:4522
 msgid "Unable to set AIM away message."
 msgstr "��羈�莅丞舟 AIM 胼糸�羔�����"

-#: src/protocols/oscar/oscar.c:4521
+#: src/protocols/oscar/oscar.c:4523
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -6663,7 +6691,7 @@
 "�����糸�菴�腮�絎���箙���莚傑�莅上�胼糸�羔��������絨�紊�篋��������倶��鐚�莚桁���������ュ��"
 "��莚�筝�罨＜��"

-#: src/protocols/oscar/oscar.c:4561
+#: src/protocols/oscar/oscar.c:4563
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -6675,15 +6703,15 @@
 "綏牙�莇�菴�篋�胼糸�羔�������紊ч�水墾 %d 絖�����Gaim ����減�����℡�羔����綛九����筝榊�"
 "綣���"

-#: src/protocols/oscar/oscar.c:4566
+#: src/protocols/oscar/oscar.c:4568
 msgid "Away message too long."
 msgstr "胼糸�羔���お�帥��"

-#: src/protocols/oscar/oscar.c:4780
+#: src/protocols/oscar/oscar.c:4782
 msgid "Unable To Retrieve Buddy List"
 msgstr "��羈��桁�絅遵���茵�"

-#: src/protocols/oscar/oscar.c:4781
+#: src/protocols/oscar/oscar.c:4783
 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 "
@@ -6692,12 +6720,12 @@
 "Gaim ���倶��羈�篁� AIM ���≦��ｷ������絅遵���茵�������絅遵���茵�押��筝√け鐚����順�膈���"
 "絨�嚭葦�順�����"

-#: src/protocols/oscar/oscar.c:4873 src/protocols/oscar/oscar.c:4874
-#: src/protocols/oscar/oscar.c:4879
+#: src/protocols/oscar/oscar.c:4875 src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4881
 msgid "Orphans"
 msgstr "絖ゅ��"

-#: src/protocols/oscar/oscar.c:5045
+#: src/protocols/oscar/oscar.c:5047
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -6705,15 +6733,15 @@
 msgstr ""
 "��羈�絨� %s ��筝阪ソ��鐚�����������絅遵�紊����莚桁���ゅ�銀賢筝�筝�ソ��鐚��九����莚�筝�罨＜��"

-#: src/protocols/oscar/oscar.c:5045 src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5047 src/protocols/oscar/oscar.c:5060
 msgid "(no name)"
 msgstr "(����腱�)"

-#: src/protocols/oscar/oscar.c:5046 src/protocols/oscar/oscar.c:5059
+#: src/protocols/oscar/oscar.c:5048 src/protocols/oscar/oscar.c:5061
 msgid "Unable To Add"
 msgstr "��羈�羞糸��"

-#: src/protocols/oscar/oscar.c:5058
+#: src/protocols/oscar/oscar.c:5060
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -6723,18 +6751,18 @@
 "��羈�羞糸��絅遵� %s鐚��������ャ�������順������������絅遵���茵�賢絅遵����亥��群膸颴上�遺���"
 "��莅悟����紊у�若��"

-#: src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5095
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr "���� %s ��莅御���篁�/絅劫��筝阪ソ�����������活�羞糸��鐚�"

-#: src/protocols/oscar/oscar.c:5099
+#: src/protocols/oscar/oscar.c:5101
 msgid "Authorization Given"
 msgstr "膸��榊��莅よ�"

-#: src/protocols/oscar/oscar.c:5132
+#: src/protocols/oscar/oscar.c:5134
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -6744,17 +6772,17 @@
 "%s"

 #. Granted
-#: src/protocols/oscar/oscar.c:5174
+#: src/protocols/oscar/oscar.c:5176
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "���� %s ��莅御���篁�/絅劫���ュソ����"

-#: src/protocols/oscar/oscar.c:5175
+#: src/protocols/oscar/oscar.c:5177
 msgid "Authorization Granted"
 msgstr "莅よ�茴����"

 #. Denied
-#: src/protocols/oscar/oscar.c:5178
+#: src/protocols/oscar/oscar.c:5180
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -6764,111 +6792,111 @@
 "���� %s ��膸�篋�����九���ュソ����茵���莚傑�鐚�����絋�筝�鐚�\n"
 "%s"

-#: src/protocols/oscar/oscar.c:5179
+#: src/protocols/oscar/oscar.c:5181
 msgid "Authorization Denied"
 msgstr "莅よ�茴���膸�"

-#: src/protocols/oscar/oscar.c:5216 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5218 src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "篋ゆ��(_E):"

-#: src/protocols/oscar/oscar.c:5454
+#: src/protocols/oscar/oscar.c:5456
 msgid "<b>Status:</b> "
 msgstr "<b>�倶��:</b>"

-#: src/protocols/oscar/oscar.c:5463
+#: src/protocols/oscar/oscar.c:5473
 msgid "<b>Logged In:</b> "
 msgstr "<b>�糸��:</b>"

-#: src/protocols/oscar/oscar.c:5475
+#: src/protocols/oscar/oscar.c:5485
 msgid "<b>IP Address:</b> "
 msgstr "<b>IP �医��:</b> "

-#: src/protocols/oscar/oscar.c:5483
+#: src/protocols/oscar/oscar.c:5493
 msgid "<b>Capabilities:</b> "
 msgstr "<b>�遵��:</b>"

-#: src/protocols/oscar/oscar.c:5492
+#: src/protocols/oscar/oscar.c:5502
 msgid "<b>Buddy Comment:</b> "
 msgstr "<b>絅遵�羈���:</b>"

-#: src/protocols/oscar/oscar.c:5501
+#: src/protocols/oscar/oscar.c:5511
 msgid "<b>Available:</b> "
 msgstr "<b>����:</b>"

-#: src/protocols/oscar/oscar.c:5519
+#: src/protocols/oscar/oscar.c:5529
 msgid "<b>Away Message:</b> "
 msgstr "<b>胼糸�羔���:</b>"

-#: src/protocols/oscar/oscar.c:5528
+#: src/protocols/oscar/oscar.c:5538
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>�倶��:</b>���莚�"

-#: src/protocols/oscar/oscar.c:5562 src/protocols/yahoo/yahoo.c:2130
+#: src/protocols/oscar/oscar.c:5572 src/protocols/yahoo/yahoo.c:2187
 msgid "Offline"
 msgstr "胼紫鎖"

-#: src/protocols/oscar/oscar.c:6010
+#: src/protocols/oscar/oscar.c:6020
 msgid "Unable to open Direct IM"
 msgstr "��羈�綣�紮�篋�篋坂���"

-#: src/protocols/oscar/oscar.c:6023
+#: src/protocols/oscar/oscar.c:6033
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�������筝� %s 菴�茵�篋�篋坂���菴��ャ��"

-#: src/protocols/oscar/oscar.c:6026
+#: src/protocols/oscar/oscar.c:6036
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 "�延�菴��桁��顔�我���� IP �医��鐚���篁ュ��遵研�ユ�������腱�蕋������������活�膸х鮫鐚�"

-#: src/protocols/oscar/oscar.c:6201
+#: src/protocols/oscar/oscar.c:6211
 msgid "Buddy Comment:"
 msgstr "絅遵�羈���:"

-#: src/protocols/oscar/oscar.c:6217
+#: src/protocols/oscar/oscar.c:6227
 msgid "Edit Buddy Comment"
 msgstr "膽�莨�絅遵�羈���"

-#: src/protocols/oscar/oscar.c:6225
+#: src/protocols/oscar/oscar.c:6235
 msgid "Get Status Msg"
 msgstr "�桁��倶��羔���"

-#: src/protocols/oscar/oscar.c:6240
+#: src/protocols/oscar/oscar.c:6250
 msgid "Direct IM"
 msgstr "篋�篋坂���"

-#: src/protocols/oscar/oscar.c:6269
+#: src/protocols/oscar/oscar.c:6279
 msgid "Re-request Authorization"
 msgstr "���域�羆�莅よ�"

-#: src/protocols/oscar/oscar.c:6290
+#: src/protocols/oscar/oscar.c:6300
 msgid "The new formatting is invalid."
 msgstr "�井�弱���������"

-#: src/protocols/oscar/oscar.c:6291
+#: src/protocols/oscar/oscar.c:6301
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "���桁���弱������贋�劫ぇ����腥堺�若��"

-#: src/protocols/oscar/oscar.c:6297
+#: src/protocols/oscar/oscar.c:6307
 msgid "New screenname formatting:"
 msgstr "�亥�����桁���弱���:"

-#: src/protocols/oscar/oscar.c:6346
+#: src/protocols/oscar/oscar.c:6356
 msgid "Change Address To:"
 msgstr "絨��医���贋�剛減:"

-#: src/protocols/oscar/oscar.c:6390
+#: src/protocols/oscar/oscar.c:6400
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��攻筝������莅よ�</i>"

-#: src/protocols/oscar/oscar.c:6393
+#: src/protocols/oscar/oscar.c:6403
 msgid "You are awaiting authorization from the following buddies"
 msgstr "��③���緇�筝���絅遵���莅よ�"

-#: src/protocols/oscar/oscar.c:6394
+#: src/protocols/oscar/oscar.c:6404
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -6876,71 +6904,71 @@
 "絋������活���菴�篋�絅遵����域�羆�莅よ�鐚�����������渇�����肢�篋�絅遵�鐚��九�����獅�����域�"
 "羆�莅よ�����"

-#: src/protocols/oscar/oscar.c:6408
+#: src/protocols/oscar/oscar.c:6418
 msgid "Find Buddy by E-mail"
 msgstr "���球���散�ユ�上ソ��"

-#: src/protocols/oscar/oscar.c:6409
+#: src/protocols/oscar/oscar.c:6419
 msgid "Search for a buddy by e-mail address"
 msgstr "���球���散�医����膣√ソ��"

-#: src/protocols/oscar/oscar.c:6410
+#: src/protocols/oscar/oscar.c:6420
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "莨��ユ���活���膣∝��絅遵����球���散�医����"

-#: src/protocols/oscar/oscar.c:6413
+#: src/protocols/oscar/oscar.c:6423
 msgid "Search"
 msgstr "��膣�"

-#: src/protocols/oscar/oscar.c:6427
+#: src/protocols/oscar/oscar.c:6437
 msgid "Available Message:"
 msgstr "�������:"

-#: src/protocols/oscar/oscar.c:6428
+#: src/protocols/oscar/oscar.c:6438
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "��罩ｅ��轡篏�鐚�羝贋��茴����� - �惹��!"

-#: src/protocols/oscar/oscar.c:6499
+#: src/protocols/oscar/oscar.c:6509
 msgid "Set User Info..."
 msgstr "莅丞舟���隙拭��..."

-#: src/protocols/oscar/oscar.c:6506
+#: src/protocols/oscar/oscar.c:6516
 msgid "Set Available Message..."
 msgstr "莅丞舟�������..."

-#: src/protocols/oscar/oscar.c:6513
+#: src/protocols/oscar/oscar.c:6523
 msgid "Change Password..."
 msgstr "�贋�劫���..."

-#: src/protocols/oscar/oscar.c:6520
+#: src/protocols/oscar/oscar.c:6530
 msgid "Change Password (URL)"
 msgstr "�贋�劫���(URL)"

-#: src/protocols/oscar/oscar.c:6528
+#: src/protocols/oscar/oscar.c:6538
 msgid "Configure IM Forwarding (URL)"
 msgstr "��臀� IM 莉��(URL)"

-#: src/protocols/oscar/oscar.c:6539
+#: src/protocols/oscar/oscar.c:6549
 msgid "Format Screenname..."
 msgstr "�弱������桁��..."

-#: src/protocols/oscar/oscar.c:6545
+#: src/protocols/oscar/oscar.c:6555
 msgid "Confirm Account"
 msgstr "隋��茣���"

-#: src/protocols/oscar/oscar.c:6551
-msgid "Display Current Registered Address"
+#: src/protocols/oscar/oscar.c:6561
+msgid "Display Currently Registered Address"
 msgstr "�丞ず綵���羈������医��"

-#: src/protocols/oscar/oscar.c:6557
-msgid "Change Current Registered Address..."
+#: src/protocols/oscar/oscar.c:6567
+msgid "Change Currently Registered Address..."
 msgstr "�贋�劫���羈������医��..."

-#: src/protocols/oscar/oscar.c:6566
+#: src/protocols/oscar/oscar.c:6576
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�丞ず罩ｅ�����莅よ���絅遵�"

-#: src/protocols/oscar/oscar.c:6574
+#: src/protocols/oscar/oscar.c:6584
 msgid "Search for Buddy by Email..."
 msgstr "���球���散��膣√ソ��..."

@@ -6954,15 +6982,15 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6695 src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:6705 src/protocols/oscar/oscar.c:6707
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ �顒��篁�"

-#: src/protocols/oscar/oscar.c:6714
+#: src/protocols/oscar/oscar.c:6724
 msgid "Auth host"
 msgstr "莅よ�筝紙��"

-#: src/protocols/oscar/oscar.c:6719
+#: src/protocols/oscar/oscar.c:6729
 msgid "Auth port"
 msgstr "莅よ�腴��"

@@ -7147,6 +7175,10 @@
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "��閿����ユ��篁九ご����篁九�筝�篌�茴������"

+#: src/protocols/toc/toc.c:2042
+msgid "Gaim - Save As..."
+msgstr "Gaim - ���筝�..."
+
 #: src/protocols/toc/toc.c:2076
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
@@ -7267,23 +7299,28 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "��������� Yahoo! 羔�����"

-#: src/protocols/yahoo/yahoo.c:809
+#: src/protocols/yahoo/yahoo.c:768
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "%s �� Yahoo! 膤紫�羔���:"
+
+#: src/protocols/yahoo/yahoo.c:834
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "%s ��膸����篁�/絅劫���ュソ����"

-#: src/protocols/yahoo/yahoo.c:812
+#: src/protocols/yahoo/yahoo.c:837
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr "%s ��膸�篋�����九��筝阪ソ����莚傑�鐚�����絋�筝�:%s��"

-#: src/protocols/yahoo/yahoo.c:815
+#: src/protocols/yahoo/yahoo.c:840
 msgid "Add buddy rejected"
 msgstr "羞糸����膸���絅遵�"

-#: src/protocols/yahoo/yahoo.c:1465
+#: src/protocols/yahoo/yahoo.c:1490
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -7293,11 +7330,11 @@
 "Yahoo ���≦���羆�篏睡���������莅よ��劫���罩ょ������ Gaim ���醇��羈������糸�� Yahoo��"
 "莚傑��� %s 筝����贋�違��"

-#: src/protocols/yahoo/yahoo.c:1468
+#: src/protocols/yahoo/yahoo.c:1493
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 莅よ�紊沿乾"

-#: src/protocols/yahoo/yahoo.c:1541
+#: src/protocols/yahoo/yahoo.c:1566
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -7305,132 +7342,145 @@
 msgstr ""
 "����上申�� %s鐚�篏�������隙�篋�����絅遵���茵�賢�����獅������絨����ゅ攻綽順�ュソ����"

-#: src/protocols/yahoo/yahoo.c:1544
+#: src/protocols/yahoo/yahoo.c:1569
 msgid "Ignore buddy?"
-msgstr "綽順�ュソ��?"
-
-#: src/protocols/yahoo/yahoo.c:1573
+msgstr "綽順�ュソ��鐚�"
+
+#: src/protocols/yahoo/yahoo.c:1602
 msgid "Invalid username."
 msgstr "���桁��������"

-#: src/protocols/yahoo/yahoo.c:1576
+#: src/protocols/yahoo/yahoo.c:1605
 msgid "Incorrect password."
 msgstr "絲���筝�絲鴻��"

-#: src/protocols/yahoo/yahoo.c:1579
-msgid "Unknown error."
-msgstr "���ラ��莚���"
-
-#: src/protocols/yahoo/yahoo.c:1628
+#: src/protocols/yahoo/yahoo.c:1608
+msgid "Your account is locked, please log in to the yahoo website."
+msgstr "����茣��桁群��絎�鐚�莚欠�糸��� Yahoo 臀�腴���"
+
+#: src/protocols/yahoo/yahoo.c:1611
+#, c-format
+msgid "Unknown error number %d."
+msgstr "���ョ����莚�撮�� %d��"
+
+#: src/protocols/yahoo/yahoo.c:1668
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "��羈�絨�絅遵� %s 羞糸���域侃�� %s 篏�篋����≦����茵����膸� %s��"

-#: src/protocols/yahoo/yahoo.c:1630
+#: src/protocols/yahoo/yahoo.c:1670
 msgid "Could not add buddy to server list"
 msgstr "��羈�絨�絅遵�羞糸���井���≦����茵�"

-#: src/protocols/yahoo/yahoo.c:1737 src/protocols/yahoo/yahoo.c:1867
+#: src/protocols/yahoo/yahoo.c:1780 src/protocols/yahoo/yahoo.c:1910
 msgid "Unable to read"
 msgstr "��羈�莚糸�"

-#: src/protocols/yahoo/yahoo.c:1892 src/protocols/yahoo/yahoo.c:2001
-#: src/protocols/yahoo/yahoo.c:2028
+#: src/protocols/yahoo/yahoo.c:1935 src/protocols/yahoo/yahoo.c:2044
+#: src/protocols/yahoo/yahoo.c:2085
 msgid "Connection problem"
 msgstr "菴��ラ���"

-#: src/protocols/yahoo/yahoo.c:2112 src/protocols/yahoo/yahoo.c:2423
-#: src/protocols/yahoo/yahoo.c:2529
+#: src/protocols/yahoo/yahoo.c:2169 src/protocols/yahoo/yahoo.c:2494
+#: src/protocols/yahoo/yahoo.c:2600
 msgid "Not At Home"
 msgstr "筝����"

-#: src/protocols/yahoo/yahoo.c:2114 src/protocols/yahoo/yahoo.c:2425
-#: src/protocols/yahoo/yahoo.c:2530
+#: src/protocols/yahoo/yahoo.c:2171 src/protocols/yahoo/yahoo.c:2496
+#: src/protocols/yahoo/yahoo.c:2601
 msgid "Not At Desk"
 msgstr "筝������"

-#: src/protocols/yahoo/yahoo.c:2116 src/protocols/yahoo/yahoo.c:2427
-#: src/protocols/yahoo/yahoo.c:2531
+#: src/protocols/yahoo/yahoo.c:2173 src/protocols/yahoo/yahoo.c:2498
+#: src/protocols/yahoo/yahoo.c:2602
 msgid "Not In Office"
 msgstr "筝��������"

-#: src/protocols/yahoo/yahoo.c:2120 src/protocols/yahoo/yahoo.c:2431
-#: src/protocols/yahoo/yahoo.c:2533
+#: src/protocols/yahoo/yahoo.c:2177 src/protocols/yahoo/yahoo.c:2502
+#: src/protocols/yahoo/yahoo.c:2604
 msgid "On Vacation"
 msgstr "綺���筝�"

-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2435
-#: src/protocols/yahoo/yahoo.c:2535
+#: src/protocols/yahoo/yahoo.c:2181 src/protocols/yahoo/yahoo.c:2506
+#: src/protocols/yahoo/yahoo.c:2606
 msgid "Stepped Out"
 msgstr "��羝�"

-#: src/protocols/yahoo/yahoo.c:2188 src/protocols/yahoo/yahoo.c:2220
+#: src/protocols/yahoo/yahoo.c:2245 src/protocols/yahoo/yahoo.c:2277
 msgid "Not on server list"
 msgstr "筝������≦����茵�賢"

-#: src/protocols/yahoo/yahoo.c:2276
+#: src/protocols/yahoo/yahoo.c:2333
 msgid "Join in Chat"
 msgstr "���ヨ��紊�"

-#: src/protocols/yahoo/yahoo.c:2282
+#: src/protocols/yahoo/yahoo.c:2339
 msgid "Initiate Conference"
 msgstr "��莎隙�莅�"

-#: src/protocols/yahoo/yahoo.c:2335
+#: src/protocols/yahoo/yahoo.c:2392
 msgid "Active which ID?"
 msgstr "羶�羇糸��肩 ID鐚�"

-#: src/protocols/yahoo/yahoo.c:2346
-msgid "Activate ID"
-msgstr "羶�羇� ID"
-
-#: src/protocols/yahoo/yahoo.c:2727
+#: src/protocols/yahoo/yahoo.c:2400
+msgid "Join who in chat?"
+msgstr "絨�莪����ヨ��紊��"
+
+#: src/protocols/yahoo/yahoo.c:2411
+msgid "Activate ID..."
+msgstr "羶�羇� ID..."
+
+#: src/protocols/yahoo/yahoo.c:2417
+msgid "Join user in chat..."
+msgstr "����紊�賢���ョ����..."
+
+#: src/protocols/yahoo/yahoo.c:2798
 msgid ""
 "<b>Sorry, profiles marked as containing adult content are not supported at "
 "this time.</b><br><br>\n"
 msgstr "<b>�掩�鐚���筝阪������篋阪��絎合��筝�査莎�������筝�茴�������</b><br><br>\n"

-#: src/protocols/yahoo/yahoo.c:2728 src/protocols/yahoo/yahoo.c:2751
+#: src/protocols/yahoo/yahoo.c:2799 src/protocols/yahoo/yahoo.c:2822
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser<br>"
 msgstr "絋������活��ョ��罩よ���鐚�����荀������� Web 羌頵���賢羌頵�罩ら�丈･<br>"

-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2821
 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:2798 src/protocols/yahoo/yahoo.c:2799
+#: src/protocols/yahoo/yahoo.c:2869 src/protocols/yahoo/yahoo.c:2870
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"

-#: src/protocols/yahoo/yahoo.c:2843 src/protocols/yahoo/yahoo.c:2846
-#: src/protocols/yahoo/yahoo.c:2849
+#: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:2917
+#: src/protocols/yahoo/yahoo.c:2920
 msgid "Hobbies"
 msgstr "��絅�"

-#: src/protocols/yahoo/yahoo.c:2858 src/protocols/yahoo/yahoo.c:2861
+#: src/protocols/yahoo/yahoo.c:2929 src/protocols/yahoo/yahoo.c:2932
 msgid "Latest News"
 msgstr "���井�育��"

-#: src/protocols/yahoo/yahoo.c:2875
+#: src/protocols/yahoo/yahoo.c:2946
 msgid "Home Page"
 msgstr "筝脂ゝ"

-#: src/protocols/yahoo/yahoo.c:2887
+#: src/protocols/yahoo/yahoo.c:2958
 msgid "Cool Link 1"
 msgstr "�潔�丈･ 1"

-#: src/protocols/yahoo/yahoo.c:2891
+#: src/protocols/yahoo/yahoo.c:2962
 msgid "Cool Link 2"
 msgstr "�潔�丈･ 2"

-#: src/protocols/yahoo/yahoo.c:2893
+#: src/protocols/yahoo/yahoo.c:2964
 msgid "Cool Link 3"
 msgstr "�潔�丈･ 3"

-#: src/protocols/yahoo/yahoo.c:2899
+#: src/protocols/yahoo/yahoo.c:2970
 msgid "Member Since"
 msgstr "羈����狗��"

@@ -7444,23 +7494,23 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3100 src/protocols/yahoo/yahoo.c:3102
+#: src/protocols/yahoo/yahoo.c:3171 src/protocols/yahoo/yahoo.c:3173
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo �顒��篁�"

-#: src/protocols/yahoo/yahoo.c:3119
+#: src/protocols/yahoo/yahoo.c:3190
 msgid "Pager host"
 msgstr "絲糸�寂源��"

-#: src/protocols/yahoo/yahoo.c:3122
+#: src/protocols/yahoo/yahoo.c:3193
 msgid "Pager port"
 msgstr "絲糸�主���"

-#: src/protocols/yahoo/yahoo.c:3125
+#: src/protocols/yahoo/yahoo.c:3196
 msgid "File transfer host"
 msgstr "��篁銀���筝紙��"

-#: src/protocols/yahoo/yahoo.c:3128
+#: src/protocols/yahoo/yahoo.c:3199
 msgid "File transfer port"
 msgstr "��篁銀���腴��"

@@ -7479,7 +7529,7 @@

 #: src/protocols/yahoo/yahoochat.c:346
 msgid "Maybe the room is full?"
-msgstr "���醇�翠�翫群羯�?"
+msgstr "���醇�翠�翫群羯￥�"

 #: src/protocols/yahoo/yahoochat.c:558
 msgid "Failed to join buddy in chat"
@@ -7487,7 +7537,7 @@

 #: src/protocols/yahoo/yahoochat.c:559
 msgid "Maybe they're not in a chat?"
-msgstr "���巡�篁�������紊�賢?"
+msgstr "���巡�篁�������紊�賢鐚�"

 #: src/protocols/zephyr/zephyr.c:344
 #, c-format
@@ -7648,38 +7698,38 @@
 msgid "Sorry, I ran out for a bit!"
 msgstr "�������������"

-#: src/stock.c:84
+#: src/stock.c:83
 msgid "_Modify"
 msgstr "篆���(_M)"

-#: src/stock.c:85
+#: src/stock.c:84
 msgid "_Open Mail"
 msgstr "��綣���散(_O)"

-#: src/util.c:1790
+#: src/util.c:1893
 msgid "Calculating..."
 msgstr "罩ｅ���膊�..."

-#: src/util.c:1793
+#: src/util.c:1896
 msgid "Unknown."
 msgstr "���ャ��"

-#: src/util.c:1824 src/util.c:1829 src/util.c:1834 src/util.c:1837
+#: src/util.c:1927 src/util.c:1932 src/util.c:1937 src/util.c:1940
 msgid "day"
 msgid_plural "days"
 msgstr[0] "紊�"

-#: src/util.c:1825 src/util.c:1829 src/util.c:1843 src/util.c:1845
+#: src/util.c:1928 src/util.c:1932 src/util.c:1946 src/util.c:1948
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "絨��"

-#: src/util.c:1825 src/util.c:1834 src/util.c:1843 src/util.c:1848
+#: src/util.c:1928 src/util.c:1937 src/util.c:1946 src/util.c:1951
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "��"

-#: src/util.c:2180
+#: src/util.c:2283
 msgid "g003: Error opening connection.\n"
 msgstr "g003����綣�菴��ュ�咲����\n"

@@ -7694,4 +7744,3 @@
 #: src/win32/win32dep.c:276
 msgid "Notification"
 msgstr "��腓�"
-