changeset 9685:11baa684c23d

[gaim-migrate @ 10537] Update zh_TW.po translation from wing committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 05 Aug 2004 21:48:36 +0000 (2004-08-05)
parents fab73de5e494
children 882e7e423457
files po/zh_TW.po
diffstat 1 files changed, 233 insertions(+), 234 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_TW.po	Thu Aug 05 21:45:57 2004 +0000
+++ b/po/zh_TW.po	Thu Aug 05 21:48:36 2004 +0000
@@ -42,7 +42,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.81cvs\n"
-"POT-Creation-Date: 2004-08-03 00:00-0400\n"
+"POT-Creation-Date: 2004-08-05 00:00-0400\n"
 "PO-Revision-Date: 2004-04-22 11:18+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -223,10 +223,10 @@
 #: plugins/docklet/docklet.c:153 src/gtkprefs.c:1802 src/protocols/gg/gg.c:51
 #: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
 #: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2722
-#: src/protocols/novell/novell.c:2839 src/protocols/novell/novell.c:2891
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5484
-#: src/protocols/oscar/oscar.c:6494 src/protocols/oscar/oscar.c:6694
+#: src/protocols/jabber/presence.c:121 src/protocols/novell/novell.c:2771
+#: src/protocols/novell/novell.c:2888 src/protocols/novell/novell.c:2940
+#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:5486
+#: src/protocols/oscar/oscar.c:6492 src/protocols/oscar/oscar.c:6692
 #: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
 #: src/protocols/silc/silc.c:76
 msgid "Away"
@@ -234,7 +234,7 @@
 
 #. else...
 #: plugins/docklet/docklet.c:159 src/away.c:565
-#: src/protocols/oscar/oscar.c:5402 src/protocols/oscar/oscar.c:6702
+#: src/protocols/oscar/oscar.c:5404 src/protocols/oscar/oscar.c:6700
 msgid "Back"
 msgstr "菴���"
 
@@ -542,13 +542,13 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:492
-#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6978
+#: plugins/gevolution/assoc-buddy.c:380 src/protocols/oscar/oscar.c:6976
 msgid "Search"
 msgstr "��絨�"
 
 #: plugins/gevolution/add_buddy_dialog.c:563
-#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4044
-#: src/gtkblist.c:4372
+#: plugins/gevolution/new_person_dialog.c:307 src/gtkblist.c:4046
+#: src/gtkblist.c:4374
 msgid "Group:"
 msgstr "臂ょ�鐚�"
 
@@ -938,7 +938,6 @@
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "�������� Gaim ��� %s ��鐚����亥�������� %s��<hr>"
 
-# XXX ��⑮
 #: plugins/relnot.c:68
 #, c-format
 msgid ""
@@ -948,7 +947,6 @@
 "<b>���処����</b>\n"
 "%s<br><br>"
 
-# XXX ��⑮
 #: plugins/relnot.c:73
 #, c-format
 msgid ""
@@ -958,12 +956,10 @@
 "筝�莠�膃� %s ��鐚�茫��逸�<br><a href=\"http://gaim.sourceforge.net/\">http://gaim."
 "sourceforge.net</a>."
 
-# XXX ��⑮
 #: plugins/relnot.c:77 plugins/relnot.c:78
 msgid "New Version Available"
 msgstr "���亥����"
 
-# XXX ��⑮
 #. *< api_version
 #. *< type
 #. *< ui_requirement
@@ -975,7 +971,6 @@
 msgid "Release Notification"
 msgstr "�亥��������"
 
-# XXX ��⑮
 #. *< name
 #. *< version
 #. *  summary
@@ -983,7 +978,6 @@
 msgid "Checks periodically for new releases."
 msgstr "筝����ョ����羃����亥������"
 
-# XXX ��⑮
 #. *  description
 #: plugins/relnot.c:139
 msgid ""
@@ -1633,8 +1627,8 @@
 #: src/protocols/msn/msn.c:226 src/protocols/msn/msn.c:241
 #: src/protocols/msn/msn.c:256 src/protocols/msn/msn.c:271
 #: src/protocols/oscar/oscar.c:3361 src/protocols/oscar/oscar.c:3455
-#: src/protocols/oscar/oscar.c:6765 src/protocols/oscar/oscar.c:6857
-#: src/protocols/oscar/oscar.c:6909 src/protocols/oscar/oscar.c:6995
+#: src/protocols/oscar/oscar.c:6763 src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6907 src/protocols/oscar/oscar.c:6993
 #: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
 #: src/protocols/silc/chat.c:409 src/protocols/silc/chat.c:447
 #: src/protocols/silc/chat.c:710 src/protocols/silc/ops.c:1072
@@ -1648,7 +1642,7 @@
 #: src/dialogs.c:299 src/dialogs.c:311 src/dialogs.c:324 src/dialogs.c:345
 #: src/dialogs.c:474 src/dialogs.c:530 src/dialogs.c:583 src/dialogs.c:830
 #: src/dialogs.c:846 src/dialogs.c:864 src/gtkaccount.c:2005
-#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4410
+#: src/gtkaccount.c:2501 src/gtkblist.c:2381 src/gtkblist.c:4412
 #: src/gtkconn.c:168 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:585
 #: src/gtkprivacy.c:598 src/gtkprivacy.c:623 src/gtkprivacy.c:634
 #: src/gtkrequest.c:243 src/protocols/icq/gaim_icq.c:277
@@ -1659,9 +1653,9 @@
 #: src/protocols/msn/msn.c:272 src/protocols/msn/msn.c:289
 #: src/protocols/oscar/oscar.c:1363 src/protocols/oscar/oscar.c:3321
 #: src/protocols/oscar/oscar.c:3362 src/protocols/oscar/oscar.c:3399
-#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6766
-#: src/protocols/oscar/oscar.c:6858 src/protocols/oscar/oscar.c:6910
-#: src/protocols/oscar/oscar.c:6979 src/protocols/oscar/oscar.c:6996
+#: src/protocols/oscar/oscar.c:3456 src/protocols/oscar/oscar.c:6764
+#: src/protocols/oscar/oscar.c:6856 src/protocols/oscar/oscar.c:6908
+#: src/protocols/oscar/oscar.c:6977 src/protocols/oscar/oscar.c:6994
 #: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
 #: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:582
 #: src/protocols/silc/chat.c:711 src/protocols/silc/ops.c:1681
@@ -2154,7 +2148,7 @@
 "����罩e���決��� Gaim\n"
 
 #: src/gtkaccount.c:169 src/gtkft.c:154 src/gtkutils.c:627
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2734
+#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2783
 msgid "Unknown"
 msgstr "����"
 
@@ -2178,7 +2172,7 @@
 msgid "Protocol:"
 msgstr "��荐���絎�鐚�"
 
-#: src/gtkaccount.c:643 src/gtkblist.c:4016
+#: src/gtkaccount.c:643 src/gtkblist.c:4018
 msgid "Screen Name:"
 msgstr "絽活��鐚�"
 
@@ -2186,7 +2180,7 @@
 msgid "Password:"
 msgstr "絲�腆種�"
 
-#: src/gtkaccount.c:721 src/gtkblist.c:4030 src/gtkblist.c:4358
+#: src/gtkaccount.c:721 src/gtkblist.c:4032 src/gtkblist.c:4360
 msgid "Alias:"
 msgstr "�ュ��鐚�"
 
@@ -2315,8 +2309,8 @@
 msgstr "絽活��"
 
 #: src/gtkaccount.c:2142 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5482
-#: src/protocols/oscar/oscar.c:6693 src/protocols/silc/silc.c:44
+#: src/protocols/oscar/oscar.c:522 src/protocols/oscar/oscar.c:5484
+#: src/protocols/oscar/oscar.c:6691 src/protocols/silc/silc.c:44
 #: src/protocols/yahoo/yahoo.c:2558 src/protocols/zephyr/zephyr.c:1363
 #: src/protocols/zephyr/zephyr.c:1375
 msgid "Online"
@@ -2350,7 +2344,7 @@
 msgstr "絨�篏睡�������ユ����絅遵�羝����"
 
 #. Add button
-#: src/gtkaccount.c:2500 src/gtkblist.c:4409 src/gtkconv.c:1380
+#: src/gtkaccount.c:2500 src/gtkblist.c:4411 src/gtkconv.c:1380
 #: src/gtkconv.c:3711 src/gtkconv.c:3815 src/gtkrequest.c:247
 #: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3618
 #: src/protocols/silc/chat.c:581
@@ -2763,13 +2757,13 @@
 msgid "Set an away message"
 msgstr "荐㊤�筝����∫��荐���"
 
-#: src/gtkblist.c:3970 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3972 src/protocols/silc/buddy.c:731
 #: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
 #: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2725
 msgid "Add Buddy"
 msgstr "�医�絅遵�"
 
-#: src/gtkblist.c:3994
+#: src/gtkblist.c:3996
 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. "
@@ -2779,37 +2773,37 @@
 "��ソ��羝���賢蕁�ず��\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4054 src/gtkblist.c:4338
+#: src/gtkblist.c:4056 src/gtkblist.c:4340
 msgid "Account:"
 msgstr "絽活��鐚�"
 
-#: src/gtkblist.c:4297
+#: src/gtkblist.c:4299
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "��研���糸�ヤ算篏�筝�����������ヨ��紊������荐���絎���"
 
-#: src/gtkblist.c:4304
+#: src/gtkblist.c:4306
 msgid "Add Chat"
 msgstr "�医���紊��"
 
-#: src/gtkblist.c:4328
+#: src/gtkblist.c:4330
 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:4406
+#: src/gtkblist.c:4408
 msgid "Add Group"
 msgstr "���ョ召腟�"
 
-#: src/gtkblist.c:4407
+#: src/gtkblist.c:4409
 msgid "Please enter the name of the group to be added."
 msgstr "茫�腟����医���臂ょ�莠後�ュ��腮宴��"
 
 #  NOTE ��筝�����筝���荐宴��������羃�����鐚�絨ゅ�倶�����亥����罔∞��檎����篁ゃ��羝����
 #  NOTE 茘�����筝���荐宴������絽御��
-#: src/gtkblist.c:4974 src/gtkblist.c:5071
+#: src/gtkblist.c:4976 src/gtkblist.c:5073
 msgid "No actions available"
 msgstr "羃����檎����篁�"
 
@@ -3992,7 +3986,7 @@
 msgstr "�遺困茫�������(_P)鐚�"
 
 #: src/gtkprefs.c:1117 src/protocols/oscar/oscar.c:580
-#: src/protocols/oscar/oscar.c:4848
+#: src/protocols/oscar/oscar.c:4850
 msgid "IP Address"
 msgstr "IP 篏���"
 
@@ -4227,16 +4221,18 @@
 msgid "Never"
 msgstr "緇�筝�"
 
+#  NOTE ��紮�腆� (src/server.c) 茵�ず��������∫��������絨演���肴��������
+#  NOTE �頑⑮�������∫�����������������
 #: src/gtkprefs.c:1809
 msgid "Only when away"
-msgstr "�����∫������"
+msgstr "�∫������"
 
 #: src/gtkprefs.c:1810
 msgid "Only when away and idle"
 msgstr "���������∫������臀�����"
 
 #: src/gtkprefs.c:1813 src/protocols/msn/msn.c:1179
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2728
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2777
 #: src/protocols/oscar/oscar.c:4003 src/protocols/yahoo/yahoo.c:2554
 #: src/protocols/yahoo/yahoo_profile.c:664
 msgid "Idle"
@@ -4452,13 +4448,13 @@
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
 #: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1845 src/protocols/silc/buddy.c:307
+#: src/protocols/novell/novell.c:1865 src/protocols/silc/buddy.c:307
 #: src/protocols/silc/pk.c:116 src/request.h:1234
 msgid "Yes"
 msgstr "��"
 
 #: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1846 src/protocols/silc/buddy.c:308
+#: src/protocols/novell/novell.c:1866 src/protocols/silc/buddy.c:308
 #: src/protocols/silc/pk.c:117 src/request.h:1234
 msgid "No"
 msgstr "��"
@@ -4711,8 +4707,8 @@
 #: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
 #: src/protocols/msn/msn.c:462 src/protocols/msn/state.c:29
 #: src/protocols/msn/state.c:30 src/protocols/msn/state.c:37
-#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2719
-#: src/protocols/novell/novell.c:2838 src/protocols/novell/novell.c:2889
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2768
+#: src/protocols/novell/novell.c:2887 src/protocols/novell/novell.c:2938
 #: src/protocols/oscar/oscar.c:602 src/protocols/yahoo/yahoo.c:2894
 #: src/protocols/yahoo/yahoo.c:3010
 msgid "Available"
@@ -4728,9 +4724,9 @@
 
 #: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
 #: src/protocols/jabber/presence.c:128 src/protocols/oscar/oscar.c:520
-#: src/protocols/oscar/oscar.c:5397 src/protocols/oscar/oscar.c:5475
-#: src/protocols/oscar/oscar.c:5499 src/protocols/oscar/oscar.c:6699
-#: src/protocols/oscar/oscar.c:6704 src/protocols/yahoo/yahoo.c:2552
+#: src/protocols/oscar/oscar.c:5399 src/protocols/oscar/oscar.c:5477
+#: src/protocols/oscar/oscar.c:5501 src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:6702 src/protocols/yahoo/yahoo.c:2552
 #: src/protocols/yahoo/yahoo.c:2914 src/protocols/yahoo/yahoo.c:3022
 msgid "Invisible"
 msgstr "�沿昆"
@@ -4748,7 +4744,7 @@
 msgid "Unable to resolve hostname."
 msgstr "�≧�茹f��筝紙���腮宴��"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1665
+#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1685
 msgid "Unable to connect to server."
 msgstr "�≧��g��遺失������"
 
@@ -4872,25 +4868,25 @@
 msgid "Active"
 msgstr "����"
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4840
+#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4842
 msgid "UIN"
 msgstr "絽活��"
 
 #. First Name
 #: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4851 src/protocols/silc/ops.c:799
+#: src/protocols/oscar/oscar.c:4853 src/protocols/silc/ops.c:799
 #: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "��"
 
 #. Last Name
 #: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4852 src/protocols/trepia/trepia.c:274
+#: src/protocols/oscar/oscar.c:4854 src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "紮�"
 
 #: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1707
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4841
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4843
 #: src/protocols/silc/ops.c:1193
 msgid "Nick"
 msgstr "�援┗"
@@ -4906,7 +4902,7 @@
 
 #. City
 #: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:4895 src/protocols/oscar/oscar.c:4903
+#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
 #: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "���"
@@ -5062,13 +5058,13 @@
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:235
 #: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3546
-#: src/protocols/oscar/oscar.c:6129
+#: src/protocols/oscar/oscar.c:6131
 msgid "Authorize"
 msgstr "腟��茯�茘�"
 
 #: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:236
 #: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3548
-#: src/protocols/oscar/oscar.c:6130
+#: src/protocols/oscar/oscar.c:6132
 msgid "Deny"
 msgstr "��腟�"
 
@@ -5711,7 +5707,7 @@
 msgstr "�決岡"
 
 #: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:4876
+#: src/protocols/oscar/oscar.c:4878
 msgid "Birthday"
 msgstr "����"
 
@@ -5731,8 +5727,8 @@
 
 #: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
 #: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2741
-#: src/protocols/novell/novell.c:2745 src/protocols/oscar/oscar.c:562
+#: src/protocols/msn/msn.c:450 src/protocols/novell/novell.c:2790
+#: src/protocols/novell/novell.c:2794 src/protocols/oscar/oscar.c:562
 #: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:570
 #: src/protocols/yahoo/yahoo.c:2677
 msgid "Status"
@@ -5754,7 +5750,7 @@
 msgstr "�掩���ュ��"
 
 #: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:4894 src/protocols/oscar/oscar.c:4902
+#: src/protocols/oscar/oscar.c:4896 src/protocols/oscar/oscar.c:4904
 #: src/protocols/silc/ops.c:839
 msgid "Address"
 msgstr "�医��"
@@ -5968,8 +5964,8 @@
 msgstr "�糸��灸散"
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4896
-#: src/protocols/oscar/oscar.c:4904 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:4898
+#: src/protocols/oscar/oscar.c:4906 src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "��鐚鎴�"
@@ -5997,7 +5993,7 @@
 
 #. connect to the server
 #: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:608
-#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2103
+#: src/protocols/napster/napster.c:499 src/protocols/novell/novell.c:2123
 #: src/protocols/oscar/oscar.c:1587 src/protocols/trepia/trepia.c:1064
 #: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1018
 msgid "Connecting"
@@ -6017,7 +6013,7 @@
 
 #: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
 #: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6502
+#: src/protocols/oscar/oscar.c:568 src/protocols/oscar/oscar.c:6500
 msgid "Not Authorized"
 msgstr "���茘�"
 
@@ -6071,8 +6067,8 @@
 
 #: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
 #: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:126
-#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5487
-#: src/protocols/oscar/oscar.c:6695
+#: src/protocols/oscar/oscar.c:510 src/protocols/oscar/oscar.c:5489
+#: src/protocols/oscar/oscar.c:6693
 msgid "Do Not Disturb"
 msgstr "茫��炊����"
 
@@ -6758,9 +6754,12 @@
 msgid "Passport account not yet verified"
 msgstr "茘欠�у験��絨�������茘�"
 
+#  FIXME��ticket�����∴⑮��鐚�箙�荐怨�⑮����茵�茘�������荐怨����鐚�
+#  NOTE MSN ���篁h�� 928
+#  NOTE 荅活� http://www.hypothetic.org/docs/msn/notification/authentication.php
 #: src/protocols/msn/error.c:220
 msgid "Bad ticket"
-msgstr ""
+msgstr "�≧���� ticket"
 
 #: src/protocols/msn/error.c:224
 #, c-format
@@ -6848,8 +6847,8 @@
 msgstr "薤����箴�"
 
 #: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:760
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2725
-#: src/protocols/novell/novell.c:2840 src/protocols/novell/novell.c:2894
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2774
+#: src/protocols/novell/novell.c:2889 src/protocols/novell/novell.c:2943
 #: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
 #: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2536
 #: src/protocols/yahoo/yahoo.c:2898 src/protocols/yahoo/yahoo.c:3013
@@ -6934,7 +6933,7 @@
 #: src/protocols/msn/msn.c:1173
 #, c-format
 msgid "<font sml=\"msn\">%s</font><br>"
-msgstr ""
+msgstr "<font sml=\"msn\">%s</font><br>"
 
 #: src/protocols/msn/msn.c:1242
 msgid "MSN Profile"
@@ -6946,14 +6945,14 @@
 msgstr "��緇���篋肴�荐����主�����"
 
 #. Age
-#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4881
+#: src/protocols/msn/msn.c:1318 src/protocols/oscar/oscar.c:4883
 #: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo_profile.c:1015
 msgid "Age"
 msgstr "綛顔宗"
 
 #. Gender
-#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4867
+#: src/protocols/msn/msn.c:1325 src/protocols/oscar/oscar.c:4869
 #: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo_profile.c:1025
 msgid "Gender"
@@ -7203,7 +7202,7 @@
 msgid "%s requested a PING"
 msgstr "%s 荀�羆�筝��� PING"
 
-#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6200
+#: src/protocols/napster/napster.c:541 src/protocols/oscar/oscar.c:6202
 #: src/protocols/toc/toc.c:1267
 msgid "_Group:"
 msgstr "臂ょ�(_G)鐚�"
@@ -7351,98 +7350,98 @@
 msgid "Unknown error: 0x%X"
 msgstr "���ラ���鐚�0x%X"
 
-#: src/protocols/novell/novell.c:116
+#: src/protocols/novell/novell.c:117
 #, c-format
 msgid "Login failed (%s)."
 msgstr "�糸�ュけ�� (%s)��"
 
 #  XXX ��⑮
-#: src/protocols/novell/novell.c:229
+#: src/protocols/novell/novell.c:230
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "�≧����肴������≧���緇�篏睡������膣亥� (%s)��"
 
-#: src/protocols/novell/novell.c:375
+#: src/protocols/novell/novell.c:379
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "�≧��� %s ���恰����絅遵�羝��� (%s)��"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:401
+#: src/protocols/novell/novell.c:405
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "�≧����肴��� (%s)��"
 
-#: src/protocols/novell/novell.c:472 src/protocols/novell/novell.c:965
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:969
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "�≧���茫�篏睡���� (%s)��"
 
-#: src/protocols/novell/novell.c:511
+#: src/protocols/novell/novell.c:515
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "�≧����肴����� %s���≧�綮榊���茘� (%s)��"
 
-#: src/protocols/novell/novell.c:516
+#: src/protocols/novell/novell.c:520
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "�≧����肴������≧�綮榊���茘� (%s)��"
 
-#: src/protocols/novell/novell.c:563
+#: src/protocols/novell/novell.c:567
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr "�≧���失�������羝�����篏睡���� %s 腱肢�括���� %s��綮榊��������主����� (%s)��"
 
-#: src/protocols/novell/novell.c:611
+#: src/protocols/novell/novell.c:615
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr "�≧��医� %s �喝ソ��羝�������失�������羝���産腴��������主����� (%s)��"
 
-#: src/protocols/novell/novell.c:683
+#: src/protocols/novell/novell.c:687
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "�≧���緇�篏睡���� %s ��膣亥� (%s)��"
 
 #  FIXME 茘�����緇��拷��
-#: src/protocols/novell/novell.c:729 src/protocols/novell/novell.c:875
+#: src/protocols/novell/novell.c:733 src/protocols/novell/novell.c:879
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "�≧���篏睡�������恰�����援�羝��� (%s)��"
 
-#: src/protocols/novell/novell.c:776
+#: src/protocols/novell/novell.c:780
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "�≧��� %s ���恰������腟�羝��� (%s)��"
 
-#: src/protocols/novell/novell.c:829
+#: src/protocols/novell/novell.c:833
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "�≧��� %s ���恰������荐掩��� (%s)��"
 
-#: src/protocols/novell/novell.c:897
+#: src/protocols/novell/novell.c:901
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "�≧��� %s 腱脂�よ�������援�羝��� (%s)��"
 
-#: src/protocols/novell/novell.c:920 src/protocols/novell/novell.c:1574
+#: src/protocols/novell/novell.c:924 src/protocols/novell/novell.c:1594
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "�≧���失�����篆��拷�援�荐㊤� (%s)��"
 
-#: src/protocols/novell/novell.c:992
+#: src/protocols/novell/novell.c:996
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "�≧�綮榊���茘� (%s)��"
 
-#: src/protocols/novell/novell.c:1103 src/protocols/novell/novell.c:1613
+#: src/protocols/novell/novell.c:1107 src/protocols/novell/novell.c:1633
 msgid "Error communicating with server. Closing connection."
 msgstr "��篌堺����������荐��主������������g���"
 
-#: src/protocols/novell/novell.c:1426
+#: src/protocols/novell/novell.c:1446
 msgid "Userid"
 msgstr "篏睡���� ID"
 
@@ -7453,49 +7452,49 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1440
+#: src/protocols/novell/novell.c:1460
 msgid "Full name"
 msgstr "����"
 
 #  NOTE��User Properties��篆�����篏睡����莖�荐���鐚���茗�KingAnt��LSchiere茹i��
-#: src/protocols/novell/novell.c:1460
+#: src/protocols/novell/novell.c:1480
 msgid "User Properties"
 msgstr "篏睡����莖�荐�"
 
 #  NOTE��GroupWise�����篁九��腮縁�罩e�筝㊥����紊ф�筝�������臂ょ���...
-#: src/protocols/novell/novell.c:1564
+#: src/protocols/novell/novell.c:1584
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise ��茘� %d"
 
-#: src/protocols/novell/novell.c:1589
+#: src/protocols/novell/novell.c:1609
 msgid "Unable to make SSL connection to server."
 msgstr "�≧�篏睡�� SSL ��絎��g��遺失������"
 
-#: src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:1639
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr "����篋�篁倶����荀����主����� (%s)��"
 
-#: src/protocols/novell/novell.c:1653
+#: src/protocols/novell/novell.c:1673
 msgid "Authenticating..."
 msgstr "茯�茘�筝�..."
 
-#: src/protocols/novell/novell.c:1668
+#: src/protocols/novell/novell.c:1688
 msgid "Waiting for response..."
 msgstr "膈�緇���荀�筝�..."
 
-#: src/protocols/novell/novell.c:1803
+#: src/protocols/novell/novell.c:1823
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "��茫�篋� %s ���ラ����篋よ���"
 
-#: src/protocols/novell/novell.c:1830
+#: src/protocols/novell/novell.c:1850
 msgid "Invitation to Conversation"
 msgstr "��茫����ヤ困茫�"
 
 #  NOTE��Sent��篆����弱�咲��茫���������
-#: src/protocols/novell/novell.c:1831
+#: src/protocols/novell/novell.c:1851
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7506,16 +7505,16 @@
 "\n"
 "����鐚�%s"
 
-#: src/protocols/novell/novell.c:1833
+#: src/protocols/novell/novell.c:1853
 msgid "Would you like to join the conversation?"
 msgstr "������ュ����篋よ����"
 
 # XXX ��⑮
-#: src/protocols/novell/novell.c:1936
+#: src/protocols/novell/novell.c:1956
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "��群膓�茴��糸�削����堺��群���銀��肢����糸�ャ��"
 
-#: src/protocols/novell/novell.c:1990
+#: src/protocols/novell/novell.c:2010
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7525,35 +7524,35 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2088
+#: src/protocols/novell/novell.c:2108
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr "�≧��g��割失������茫�莠後�ユ������g��括��篌堺������篏�����"
 
-#: src/protocols/novell/novell.c:2110
+#: src/protocols/novell/novell.c:2130
 msgid "Error. SSL support is not installed."
 msgstr "���鐚�羃���絎�茖� SSL ��叵��"
 
-#: src/protocols/novell/novell.c:2419
+#: src/protocols/novell/novell.c:2434
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "������茘医群膓��������≧�膵主����坂算篏�荐�����"
 
-#: src/protocols/novell/novell.c:2731 src/protocols/oscar/oscar.c:570
-#: src/protocols/oscar/oscar.c:6504 src/protocols/yahoo/yahoo.c:2556
+#: src/protocols/novell/novell.c:2780 src/protocols/oscar/oscar.c:570
+#: src/protocols/oscar/oscar.c:6502 src/protocols/yahoo/yahoo.c:2556
 msgid "Offline"
 msgstr "�∝�"
 
-#: src/protocols/novell/novell.c:2742
+#: src/protocols/novell/novell.c:2791
 msgid "Message"
 msgstr "荐���"
 
 #  NOTE ��������箴����∝������銀���絎������∝�������箙�筝�筝�絎��������∝�鐚����喝Ű⑮���∝���箙�筝�紊��∵�
-#: src/protocols/novell/novell.c:2841 src/protocols/novell/novell.c:2897
+#: src/protocols/novell/novell.c:2890 src/protocols/novell/novell.c:2946
 msgid "Appear Offline"
 msgstr "�∝�"
 
-#: src/protocols/novell/novell.c:3291
+#: src/protocols/novell/novell.c:3340
 msgid "Initiate _Chat"
 msgstr "������紊��(_C)"
 
@@ -7568,15 +7567,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3387 src/protocols/novell/novell.c:3389
+#: src/protocols/novell/novell.c:3436 src/protocols/novell/novell.c:3438
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger ��絎�罔∞�"
 
-#: src/protocols/novell/novell.c:3408
+#: src/protocols/novell/novell.c:3457
 msgid "Server address"
 msgstr "篌堺�������"
 
-#: src/protocols/novell/novell.c:3412
+#: src/protocols/novell/novell.c:3461
 msgid "Server port"
 msgstr "篌堺������荐���"
 
@@ -7703,7 +7702,7 @@
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6806
+#: src/protocols/oscar/oscar.c:434 src/protocols/oscar/oscar.c:6804
 msgid "Get File"
 msgstr "�ユ�倶�罅�"
 
@@ -7786,18 +7785,18 @@
 msgid "Camera"
 msgstr "�х�御�"
 
-#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5496
-#: src/protocols/oscar/oscar.c:6698
+#: src/protocols/oscar/oscar.c:508 src/protocols/oscar/oscar.c:5498
+#: src/protocols/oscar/oscar.c:6696
 msgid "Free For Chat"
 msgstr "����腥肴��紊�"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5490
-#: src/protocols/oscar/oscar.c:6696
+#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:5492
+#: src/protocols/oscar/oscar.c:6694
 msgid "Not Available"
 msgstr "�傑�����∫��"
 
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5493
-#: src/protocols/oscar/oscar.c:6697
+#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:5495
+#: src/protocols/oscar/oscar.c:6695
 msgid "Occupied"
 msgstr "綽�腆�"
 
@@ -8010,7 +8009,7 @@
 #: src/protocols/oscar/oscar.c:3454 src/protocols/oscar/oscar.c:3536
 #: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3908
 #: src/protocols/oscar/oscar.c:3965 src/protocols/oscar/oscar.c:3969
-#: src/protocols/oscar/oscar.c:6121 src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:6123 src/protocols/oscar/oscar.c:6169
 msgid "No reason given."
 msgstr "羃���腟��������"
 
@@ -8027,7 +8026,7 @@
 "篏睡���� %u ���坂�������鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���賢鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6127
+#: src/protocols/oscar/oscar.c:3544 src/protocols/oscar/oscar.c:6129
 msgid "Authorization Request"
 msgstr "茯�茘�荀�羆�"
 
@@ -8208,11 +8207,11 @@
 "characters.]"
 msgstr "���≧�蕁�ず箴�������篏睡������荐�������阪�������≧��絖�������"
 
-#: src/protocols/oscar/oscar.c:4486
+#: src/protocols/oscar/oscar.c:4488
 msgid "Rate limiting error."
 msgstr "�������狗�����"
 
-#: src/protocols/oscar/oscar.c:4487
+#: src/protocols/oscar/oscar.c:4489
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8220,142 +8219,142 @@
 "����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���"
 "荅��罨<��"
 
-#: src/protocols/oscar/oscar.c:4550
+#: src/protocols/oscar/oscar.c:4552
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ラ����絽活����"
 
-#: src/protocols/oscar/oscar.c:4552
+#: src/protocols/oscar/oscar.c:4554
 msgid "You have been signed off for an unknown reason."
 msgstr "�����坂���������糸�冴��"
 
-#: src/protocols/oscar/oscar.c:4583
+#: src/protocols/oscar/oscar.c:4585
 msgid "Finalizing connection"
 msgstr "絎����g�"
 
-#: src/protocols/oscar/oscar.c:4854 src/protocols/oscar/oscar.c:4861
+#: src/protocols/oscar/oscar.c:4856 src/protocols/oscar/oscar.c:4863
 msgid "Email Address"
 msgstr "�糸��灸散"
 
-#: src/protocols/oscar/oscar.c:4866 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:4868 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr "茵����肢�"
 
-#: src/protocols/oscar/oscar.c:4867
+#: src/protocols/oscar/oscar.c:4869
 msgid "Not specified"
 msgstr "羃���紂��"
 
-#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:4868 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4870 src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:4884
+#: src/protocols/oscar/oscar.c:4886
 msgid "Personal Web Page"
 msgstr "��篋榊恐��"
 
-#: src/protocols/oscar/oscar.c:4888
+#: src/protocols/oscar/oscar.c:4890
 msgid "Additional Information"
 msgstr "�銀�莖�荐�"
 
-#: src/protocols/oscar/oscar.c:4893
+#: src/protocols/oscar/oscar.c:4895
 msgid "Home Address"
 msgstr "篏鎘九�医��"
 
-#: src/protocols/oscar/oscar.c:4897 src/protocols/oscar/oscar.c:4905
+#: src/protocols/oscar/oscar.c:4899 src/protocols/oscar/oscar.c:4907
 msgid "Zip Code"
 msgstr "�級������"
 
-#: src/protocols/oscar/oscar.c:4901
+#: src/protocols/oscar/oscar.c:4903
 msgid "Work Address"
 msgstr "綏ヤ��医��"
 
-#: src/protocols/oscar/oscar.c:4909
+#: src/protocols/oscar/oscar.c:4911
 msgid "Work Information"
 msgstr "綏ヤ�莖�荐�"
 
-#: src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4912
 msgid "Company"
 msgstr "��夔��腮�"
 
-#: src/protocols/oscar/oscar.c:4911
+#: src/protocols/oscar/oscar.c:4913
 msgid "Division"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:4912
+#: src/protocols/oscar/oscar.c:4914
 msgid "Position"
 msgstr "�隙�"
 
-#: src/protocols/oscar/oscar.c:4914
+#: src/protocols/oscar/oscar.c:4916
 msgid "Web Page"
 msgstr "膓臥��"
 
-#: src/protocols/oscar/oscar.c:4924
+#: src/protocols/oscar/oscar.c:4926
 #, c-format
 msgid "ICQ Info for %s"
 msgstr "%s �� ICQ 莖�荐�"
 
 # XXX �����藝� (��綵≫��榊憟��)鐚� (絅遵���札��茘���荐��������e��??)
-#: src/protocols/oscar/oscar.c:4973
+#: src/protocols/oscar/oscar.c:4975
 msgid "Pop-Up Message"
 msgstr "綵��肴���"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:4994
+#: src/protocols/oscar/oscar.c:4996
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr "筝����� %s ��絽活��"
 
-#: src/protocols/oscar/oscar.c:4998
+#: src/protocols/oscar/oscar.c:5000
 msgid "Search Results"
 msgstr "��絨�腟���"
 
-#: src/protocols/oscar/oscar.c:5015
+#: src/protocols/oscar/oscar.c:5017
 #, c-format
 msgid "No results found for email address %s"
 msgstr "�鞘��医���糸��灸散�医�� %s �檎����腟���"
 
-#: src/protocols/oscar/oscar.c:5036
+#: src/protocols/oscar/oscar.c:5038
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "����荅我���九�遺�絨�荀�羆�絨� %s �画�茯�茘����糸��灸散��"
 
-#: src/protocols/oscar/oscar.c:5038
+#: src/protocols/oscar/oscar.c:5040
 msgid "Account Confirmation Requested"
 msgstr "絽活��腆肴�"
 
-#: src/protocols/oscar/oscar.c:5069
+#: src/protocols/oscar/oscar.c:5071
 msgid "Error Changing Account Info"
 msgstr "�贋�劫験��莖�荐����"
 
-#: src/protocols/oscar/oscar.c:5072
+#: src/protocols/oscar/oscar.c:5074
 #, 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:5075
+#: src/protocols/oscar/oscar.c:5077
 #, 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:5078
+#: src/protocols/oscar/oscar.c:5080
 #, 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:5081
+#: src/protocols/oscar/oscar.c:5083
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -8363,7 +8362,7 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����堺��群膓����榊���銀�荀�羆���������絅純��"
 
-#: src/protocols/oscar/oscar.c:5084
+#: src/protocols/oscar/oscar.c:5086
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -8371,19 +8370,19 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
 
-#: src/protocols/oscar/oscar.c:5087
+#: src/protocols/oscar/oscar.c:5089
 #, 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:5090
+#: src/protocols/oscar/oscar.c:5092
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��� 0x%04x鐚����ラ�����"
 
-#: src/protocols/oscar/oscar.c:5100
+#: src/protocols/oscar/oscar.c:5102
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8392,25 +8391,25 @@
 "����絽活������茴��弱���絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5101 src/protocols/oscar/oscar.c:5108
+#: src/protocols/oscar/oscar.c:5103 src/protocols/oscar/oscar.c:5110
 msgid "Account Info"
 msgstr "絽活��莖�荐�"
 
-#: src/protocols/oscar/oscar.c:5106
+#: src/protocols/oscar/oscar.c:5108
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���糸��灸散�医���� %s"
 
-#: src/protocols/oscar/oscar.c:5171
+#: src/protocols/oscar/oscar.c:5173
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "�≧��渇���恰��荐���襲���荀��渇���恰��荐���襲���綽�����絨��合�贋・�g���"
 
-#: src/protocols/oscar/oscar.c:5345
+#: src/protocols/oscar/oscar.c:5347
 msgid "Unable to set AIM profile."
 msgstr "�≧�荐㊤� AIM ��篋肴�����"
 
-#: src/protocols/oscar/oscar.c:5346
+#: src/protocols/oscar/oscar.c:5348
 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 "
@@ -8419,7 +8418,7 @@
 "�������糸�ュ�����荀�羆�篆��号������篋肴�荐�鐚���篁ラ��篋�莖�荐�筝���←篆��鴻��茫�������糸�ュ�"
 "�����育�画�荐㊤���"
 
-#: src/protocols/oscar/oscar.c:5373
+#: src/protocols/oscar/oscar.c:5375
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8430,19 +8429,19 @@
 msgstr[0] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 msgstr[1] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 
-#: src/protocols/oscar/oscar.c:5378
+#: src/protocols/oscar/oscar.c:5380
 msgid "Profile too long."
 msgstr "��篋肴�荐����激��"
 
-#: src/protocols/oscar/oscar.c:5394 src/protocols/oscar/oscar.c:6703
+#: src/protocols/oscar/oscar.c:5396 src/protocols/oscar/oscar.c:6701
 msgid "Visible"
 msgstr "�乗昆"
 
-#: src/protocols/oscar/oscar.c:5412
+#: src/protocols/oscar/oscar.c:5414
 msgid "Unable to set AIM away message."
 msgstr "�≧�荐㊤� AIM �∫��荐�����"
 
-#: src/protocols/oscar/oscar.c:5413
+#: src/protocols/oscar/oscar.c:5415
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -8451,7 +8450,7 @@
 "��������糸�ョ�綺鎘�����篆��号�����∫��荐������������絨�膓㊥��������荐㊤���������茫���"
 "絎����糸�ュ���荐㊤�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:5453
+#: src/protocols/oscar/oscar.c:5455
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8462,11 +8461,11 @@
 msgstr[0] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 msgstr[1] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
 
-#: src/protocols/oscar/oscar.c:5458
+#: src/protocols/oscar/oscar.c:5460
 msgid "Away message too long."
 msgstr "�∫��荐������激��"
 
-#: src/protocols/oscar/oscar.c:5536
+#: src/protocols/oscar/oscar.c:5538
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8477,16 +8476,16 @@
 "��絖�罸��咲���㍼������宴���掩��絖�罸��������後�������腥榊�純����腟���鐚��������篁ャ����"
 "絖���腟�����"
 
-#: src/protocols/oscar/oscar.c:5538 src/protocols/oscar/oscar.c:5987
-#: src/protocols/oscar/oscar.c:6001
+#: src/protocols/oscar/oscar.c:5540 src/protocols/oscar/oscar.c:5989
+#: src/protocols/oscar/oscar.c:6003
 msgid "Unable To Add"
 msgstr "�≧�����"
 
-#: src/protocols/oscar/oscar.c:5699
+#: src/protocols/oscar/oscar.c:5701
 msgid "Unable To Retrieve Buddy List"
 msgstr "�≧�莅���絅遵�羝���"
 
-#: src/protocols/oscar/oscar.c:5700
+#: src/protocols/oscar/oscar.c:5702
 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 "
@@ -8495,13 +8494,13 @@
 "Gaim ����羃���莨���� AIM 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃�����"
 "紊縁����遵�札��江��絨��鏅���緇���"
 
-#: src/protocols/oscar/oscar.c:5882 src/protocols/oscar/oscar.c:5883
-#: src/protocols/oscar/oscar.c:5888 src/protocols/oscar/oscar.c:6045
-#: src/protocols/oscar/oscar.c:6046 src/protocols/oscar/oscar.c:6051
+#: src/protocols/oscar/oscar.c:5884 src/protocols/oscar/oscar.c:5885
+#: src/protocols/oscar/oscar.c:5890 src/protocols/oscar/oscar.c:6047
+#: src/protocols/oscar/oscar.c:6048 src/protocols/oscar/oscar.c:6053
 msgid "Orphans"
 msgstr "絖ゅ����"
 
-#: src/protocols/oscar/oscar.c:5985
+#: src/protocols/oscar/oscar.c:5987
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8510,11 +8509,11 @@
 "���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���"
 "荅���"
 
-#: src/protocols/oscar/oscar.c:5985 src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:5987 src/protocols/oscar/oscar.c:6001
 msgid "(no name)"
 msgstr "(羃�����絖�)"
 
-#: src/protocols/oscar/oscar.c:5999
+#: src/protocols/oscar/oscar.c:6001
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8524,7 +8523,7 @@
 "���坂���������≧�絨�絅遵� %s ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟���"
 "����膤紫輝��荐援��筝�����"
 
-#: src/protocols/oscar/oscar.c:6082
+#: src/protocols/oscar/oscar.c:6084
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8534,11 +8533,11 @@
 "���"
 
 # NOTE ����������荐怨�ヤ査�弱�榊��茯�茘�荀�羆�緇�蕁�ず腟�������訓����
-#: src/protocols/oscar/oscar.c:6088
+#: src/protocols/oscar/oscar.c:6090
 msgid "Authorization Given"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/oscar/oscar.c:6121
+#: src/protocols/oscar/oscar.c:6123
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8548,18 +8547,18 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6163
+#: src/protocols/oscar/oscar.c:6165
 #, 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:6164
+#: src/protocols/oscar/oscar.c:6166
 msgid "Authorization Granted"
 msgstr "茯�茘��峨��"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6167
+#: src/protocols/oscar/oscar.c:6169
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8569,79 +8568,79 @@
 "篏睡���� %s ���坂�������鐚���腟�篋����篁�鐚�絅刻����ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6168
+#: src/protocols/oscar/oscar.c:6170
 msgid "Authorization Denied"
 msgstr "茯�茘�茴���"
 
 # NOTE: ��茖∞��絖�臂���� #gaim �� MrHappy �� deryni ��箴���
 # NOTE: KingAnt ��箴���絖�臂���篋�筝���鐚�����筝�篋�����
-#: src/protocols/oscar/oscar.c:6205 src/protocols/toc/toc.c:1272
+#: src/protocols/oscar/oscar.c:6207 src/protocols/toc/toc.c:1272
 msgid "_Exchange:"
 msgstr "�脂����腆�(_E)鐚�"
 
-#: src/protocols/oscar/oscar.c:6227
+#: src/protocols/oscar/oscar.c:6229
 msgid "Invalid chat name specified."
 msgstr "腟��篋��≧������紊����腮宴��"
 
-#: src/protocols/oscar/oscar.c:6317
+#: src/protocols/oscar/oscar.c:6319
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "�≧��渇���恰��荐���襲���AIM ��紊�研筝���吓�恰��荐���襲����勌����"
 
-#: src/protocols/oscar/oscar.c:6475
+#: src/protocols/oscar/oscar.c:6474
 msgid "Away Message"
 msgstr "�∫��荐���"
 
-#: src/protocols/oscar/oscar.c:6762
+#: src/protocols/oscar/oscar.c:6760
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s ��絅遵�茯���"
 
-#: src/protocols/oscar/oscar.c:6763
+#: src/protocols/oscar/oscar.c:6761
 msgid "Buddy Comment:"
 msgstr "絅遵�茯����"
 
-#: src/protocols/oscar/oscar.c:6782
+#: src/protocols/oscar/oscar.c:6780
 msgid "Edit Buddy Comment"
 msgstr "膩�鹿絅遵�茯���"
 
-#: src/protocols/oscar/oscar.c:6788
+#: src/protocols/oscar/oscar.c:6786
 msgid "Get Status Msg"
 msgstr "��緇�����荐���"
 
 # NOTE 絨����贋・羔������壕⑮�冴���恰��荐�����
-#: src/protocols/oscar/oscar.c:6800
+#: src/protocols/oscar/oscar.c:6798
 msgid "Direct IM"
 msgstr "�恰��荐���"
 
-#: src/protocols/oscar/oscar.c:6817
+#: src/protocols/oscar/oscar.c:6815
 msgid "Re-request Authorization"
 msgstr "���域�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:6847
+#: src/protocols/oscar/oscar.c:6845
 msgid "The new formatting is invalid."
 msgstr "�亥���弱����≧������"
 
-#: src/protocols/oscar/oscar.c:6848
+#: src/protocols/oscar/oscar.c:6846
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "絽活���弱������醇�壕�紊у�篁ュ�腥榊�純��"
 
-#: src/protocols/oscar/oscar.c:6855
+#: src/protocols/oscar/oscar.c:6853
 msgid "New screen name formatting:"
 msgstr "�亥��絽活���弱�鐚�"
 
-#: src/protocols/oscar/oscar.c:6907
+#: src/protocols/oscar/oscar.c:6905
 msgid "Change Address To:"
 msgstr "莅��翫�医���削�"
 
-#: src/protocols/oscar/oscar.c:6952
+#: src/protocols/oscar/oscar.c:6950
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��研羃������緇�薊�茘�</i>"
 
-#: src/protocols/oscar/oscar.c:6955
+#: src/protocols/oscar/oscar.c:6953
 msgid "You are awaiting authorization from the following buddies"
 msgstr "������罩e���緇�筝���絅遵���茯�茘�"
 
-#: src/protocols/oscar/oscar.c:6956
+#: src/protocols/oscar/oscar.c:6954
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8649,76 +8648,76 @@
 "���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��"
 "��荀�羆����域�茘�����"
 
-#: src/protocols/oscar/oscar.c:6973
+#: src/protocols/oscar/oscar.c:6971
 msgid "Find Buddy by E-mail"
 msgstr "篁ラ�糸��灸散�医��箴��上�絅遵�"
 
-#: src/protocols/oscar/oscar.c:6974
+#: src/protocols/oscar/oscar.c:6972
 msgid "Search for a buddy by e-mail address"
 msgstr "篏睡���糸��灸散�医����絨�絅遵�"
 
-#: src/protocols/oscar/oscar.c:6975
+#: src/protocols/oscar/oscar.c:6973
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "茫�莠後�ュ��合���糸��灸散�医����"
 
-#: src/protocols/oscar/oscar.c:6992
+#: src/protocols/oscar/oscar.c:6990
 msgid "Available Message:"
 msgstr "筝�膩�荐����"
 
 # XXX 茫�荀���
-#: src/protocols/oscar/oscar.c:6993
+#: src/protocols/oscar/oscar.c:6991
 msgid "I'm doing work and hoping for a distraction--IM me!"
 msgstr "����轡篏�鐚�篏�荀阪�緇��駈���������紊��э�"
 
-#: src/protocols/oscar/oscar.c:7075 src/protocols/silc/silc.c:789
+#: src/protocols/oscar/oscar.c:7073 src/protocols/silc/silc.c:789
 msgid "Set User Info..."
 msgstr "荐㊤�篏睡����莖�荐�..."
 
-#: src/protocols/oscar/oscar.c:7080
+#: src/protocols/oscar/oscar.c:7078
 msgid "Set User Info (URL)..."
 msgstr "荐㊤�篏睡����莖�荐� (URL)..."
 
-#: src/protocols/oscar/oscar.c:7086
+#: src/protocols/oscar/oscar.c:7084
 msgid "Set Available Message..."
 msgstr "荐㊤�筝�膩�荐���..."
 
-#: src/protocols/oscar/oscar.c:7091 src/protocols/silc/silc.c:785
+#: src/protocols/oscar/oscar.c:7089 src/protocols/silc/silc.c:785
 msgid "Change Password..."
 msgstr "篆��劫�腆�..."
 
-#: src/protocols/oscar/oscar.c:7096
+#: src/protocols/oscar/oscar.c:7094
 msgid "Change Password (URL)"
 msgstr "篆��劫�腆� (���嘒��)"
 
-#: src/protocols/oscar/oscar.c:7100
+#: src/protocols/oscar/oscar.c:7098
 msgid "Configure IM Forwarding (URL)"
 msgstr "荐㊤��恰��荐�����莉��� (���嘒��)"
 
-#: src/protocols/oscar/oscar.c:7109
+#: src/protocols/oscar/oscar.c:7107
 msgid "Format Screen Name..."
 msgstr "�弱���絽活��..."
 
-#: src/protocols/oscar/oscar.c:7113
+#: src/protocols/oscar/oscar.c:7111
 msgid "Confirm Account"
 msgstr "腆肴�絽活��"
 
-#: src/protocols/oscar/oscar.c:7117
+#: src/protocols/oscar/oscar.c:7115
 msgid "Display Currently Registered Address"
 msgstr "蕁�ず������荐糸�����医��"
 
-#: src/protocols/oscar/oscar.c:7121
+#: src/protocols/oscar/oscar.c:7119
 msgid "Change Currently Registered Address..."
 msgstr "篆��合������荐糸�����医��..."
 
-#: src/protocols/oscar/oscar.c:7128
+#: src/protocols/oscar/oscar.c:7126
 msgid "Show Buddies Awaiting Authorization"
 msgstr "蕁�ず膈�緇�茯�茘���絅遵�"
 
-#: src/protocols/oscar/oscar.c:7134
+#: src/protocols/oscar/oscar.c:7132
 msgid "Search for Buddy by Email..."
 msgstr "篏睡���糸��灸散�医����絨�絅遵�..."
 
-#: src/protocols/oscar/oscar.c:7139
+#: src/protocols/oscar/oscar.c:7137
 msgid "Search for Buddy by Information"
 msgstr "箴��ц�荐�絨��上ソ��"
 
@@ -8733,15 +8732,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7257 src/protocols/oscar/oscar.c:7259
+#: src/protocols/oscar/oscar.c:7255 src/protocols/oscar/oscar.c:7257
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ ��絎�罔∞�"
 
-#: src/protocols/oscar/oscar.c:7278
+#: src/protocols/oscar/oscar.c:7276
 msgid "Auth host"
 msgstr "茯�茘�篌堺����"
 
-#: src/protocols/oscar/oscar.c:7283
+#: src/protocols/oscar/oscar.c:7281
 msgid "Auth port"
 msgstr "茯�茘���荐���"
 
@@ -8934,7 +8933,7 @@
 
 #: src/protocols/silc/buddy.c:1389
 msgid "Robot"
-msgstr ""
+msgstr "罘�罌遺査"
 
 #: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:610
 #: src/protocols/silc/util.c:469
@@ -9671,14 +9670,14 @@
 msgid "Your Current Status"
 msgstr "��������"
 
+#  XXX ��⑮
 #: src/protocols/silc/silc.c:657
-#, fuzzy
 msgid "Online Services"
-msgstr "筝�膩���"
+msgstr "�����膩�筝�����"
 
 #: src/protocols/silc/silc.c:660
 msgid "Let others see what services you are using"
-msgstr "莅��銀�篋榊���井������罩e��戎���藝惹����"
+msgstr "莅�篁�篋阪�札緇��ユ��戎���d�膩�筝�����"
 
 #  NOTE XXX ��紮�腆守¨腓咲�����九�筝����肢�����鐚�������篏�膤紫輝���� :-/
 #: src/protocols/silc/silc.c:666
@@ -10923,21 +10922,21 @@
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:845
+#: src/proxy.c:870
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "��腟�絖���鐚�Proxy 篌堺�����罩∫��荐��� %d ��莖����渇����"
 
-#: src/proxy.c:849
+#: src/proxy.c:874
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "篁g��篌堺�����g���� %d"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid "Invalid proxy settings"
 msgstr "�≧����篁g��篌堺����┃絎�"
 
-#: src/proxy.c:1495
+#: src/proxy.c:1520
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."