changeset 6091:9b09fec41257

[gaim-migrate @ 6550] Ambrose C. LI (acli) updated the zh_TW.po committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 11 Jul 2003 17:23:58 +0000 (2003-07-11)
parents 44930abebe0d
children 35560e017fa1
files po/zh_TW.po
diffstat 1 files changed, 2154 insertions(+), 1789 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_TW.po	Fri Jul 11 16:13:26 2003 +0000
+++ b/po/zh_TW.po	Fri Jul 11 17:23:58 2003 +0000
@@ -12,80 +12,88 @@
 # XXX   茵�ず���醇���馹�鐚�荀�茲��ワ����馹���荐��
 # ANS   茵�ず絨� XXX ����羈���荀� (�馹�茹f浦緇� XXX �� ANS 筝�网�����)
 # ----------------------------------------------------------
-# FIXME ����腟延�茘����絖�荅�鐚�Postal code��Profile��match
+# FIXME ����腟延�茘����絖�荅�鐚�Postal code��Profile��match��connect
+# FIXME��such�����冴������鐚��潟��������鐚�篏�����茘���羃���腟延�
 # NOTE  筝㊥��腟延�������綣���鐚�URL����篁ょ�荅牙��'/"���ゅ�
+# XXX   #gaim筝�javabsp��茘亥亜����Custom���冴�������(筝�����篏睡������)
+# ANS   �合�冴�������筝��>����������篏睡���������筝�荅��榊����������茘��鐚�
+#   	紊у��悟��膵�蕭�筝㊥��荵�蕭����≧④腮�⑮����
 # ----------------------------------------------------------
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.64cvs\n"
-"POT-Creation-Date: 2003-05-30 19:10-0400\n"
+"POT-Creation-Date: 2003-07-09 01:13-0400\n"
 "PO-Revision-Date: 2003-05-29 12:04+0800\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "\n"
 
-#: plugins/docklet/docklet.c:89 src/win32/systray.c:359
+#: plugins/docklet/docklet.c:105 src/gtkaccount.c:468 src/gtkaccount.c:1623
+#: src/win32/systray.c:365
 msgid "Auto-login"
 msgstr "�����糸��"
 
-#: plugins/docklet/docklet.c:92
+#: plugins/docklet/docklet.c:108
 msgid "New Message.."
 msgstr "�域���"
 
-#: plugins/docklet/docklet.c:93
+#: plugins/docklet/docklet.c:109
 msgid "Join A Chat..."
 msgstr "���ヨ��紊��"
 
-#: plugins/docklet/docklet.c:124
+#: plugins/docklet/docklet.c:140
 msgid "New..."
 msgstr "�医�"
 
-#: plugins/docklet/docklet.c:128 src/protocols/gg/gg.c:71
-#: src/protocols/irc/irc.c:1048 src/protocols/jabber/jabber.c:1184
-#: src/protocols/jabber/jabber.c:3448 src/protocols/jabber/jabber.c:3502
-#: src/protocols/oscar/oscar.c:2824 src/protocols/oscar/oscar.c:4509
-#: src/protocols/oscar/oscar.c:5395 src/protocols/oscar/oscar.c:5724
-#: src/gtkblist.c:1541 src/gtkpounce.c:566 src/gtkprefs.c:1441
+#: plugins/docklet/docklet.c:144 src/protocols/gg/gg.c:54
+#: src/protocols/irc/irc.c:1033 src/protocols/jabber/jabber.c:1172
+#: src/protocols/jabber/jabber.c:3433 src/protocols/jabber/jabber.c:3487
+#: src/protocols/oscar/oscar.c:2823 src/protocols/oscar/oscar.c:4545
+#: src/protocols/oscar/oscar.c:5444 src/protocols/oscar/oscar.c:5838
+#: src/gtkblist.c:1589 src/gtkpounce.c:460 src/gtkprefs.c:1491
 msgid "Away"
 msgstr "�∫��"
 
-#: plugins/docklet/docklet.c:134 src/away.c:535
+#: plugins/docklet/docklet.c:150 src/away.c:531
 msgid "Back"
 msgstr "菴���"
 
-#: plugins/docklet/docklet.c:142
+#: plugins/docklet/docklet.c:158
 msgid "Mute Sounds"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:147
-msgid "File Transfers..."
+#: plugins/docklet/docklet.c:163 src/gtkft.c:557
+msgid "File Transfers"
 msgstr "罟�罅��活叱"
 
-#: plugins/docklet/docklet.c:148
-msgid "Accounts..."
+#. And now for the buttons
+#: plugins/docklet/docklet.c:164 src/gtkaccount.c:1774 src/main.c:418
+msgid "Accounts"
 msgstr "絽活��羝���"
 
-#: plugins/docklet/docklet.c:149
-msgid "Preferences..."
+#: plugins/docklet/docklet.c:165 src/gtkprefs.c:2337 src/main.c:428
+#: src/win32/systray.c:361
+msgid "Preferences"
 msgstr "�鎁処┃絎�"
 
-#: plugins/docklet/docklet.c:158 src/win32/systray.c:159
+#: plugins/docklet/docklet.c:174 src/win32/systray.c:165
 msgid "Signoff"
 msgstr "�糸��"
 
-#: plugins/docklet/docklet.c:162
+#: plugins/docklet/docklet.c:178
 msgid "Quit"
 msgstr "腟���腮�綣�"
 
-#: plugins/docklet/docklet.c:450
+#: plugins/docklet/docklet.c:477
 msgid "Tray Icon Configuration"
 msgstr "綏ヤ��e��腓肴┃絎�"
 
-#: plugins/docklet/docklet.c:454
+#: plugins/docklet/docklet.c:481
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "�沿��佈����翫�医轡篏��e��腓肴←藥���(_H)"
 
@@ -96,19 +104,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:478
+#: plugins/docklet/docklet.c:505
 msgid "System Tray Icon"
 msgstr "膤紫輝綏ヤ��e��腓�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:481
+#: plugins/docklet/docklet.c:508
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "��鎧腟怨轡篏��d賢蕁�ず Gaim ����腓冴��"
 
 #. *  description
-#: plugins/docklet/docklet.c:483
+#: plugins/docklet/docklet.c:510
 msgid ""
 "Interacts with a Notification Area applet (in GNOME or KDE, for example) to "
 "display the current status of Gaim, allow fast access to commonly used "
@@ -126,14 +134,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:85
+#: plugins/autorecon.c:80
 msgid "Auto-Reconnect"
 msgstr "�������育�g�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:88 plugins/autorecon.c:90
+#: plugins/autorecon.c:83 plugins/autorecon.c:85
 msgid "When you are kicked offline, this reconnects you."
 msgstr "�銀��欠���鐚�膤紫輝������綛�����育�g���"
 
@@ -161,14 +169,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/events.c:225
+#: plugins/events.c:236
 msgid "Event Test"
 msgstr "篋�篁倶謙荅�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/events.c:228 plugins/events.c:230
+#: plugins/events.c:239 plugins/events.c:241
 msgid "Test to see that all events are working properly."
 msgstr "罟∽�ュ��腮��篁倶�����処�醇③絽檎��篏���"
 
@@ -236,7 +244,7 @@
 #. OUTPUT FORMAT and SCROLL DIRECTION
 #: plugins/gtik.c:757
 msgid "Check this box to display only symbols and price:"
-msgstr "�後������檎��鐚�絨�����蕁�ず膃������号�種�"
+msgstr "��¨腓榊������号�種�"
 
 #: plugins/gtik.c:758
 msgid "Check this box to scroll left to right:"
@@ -245,21 +253,21 @@
 # TODO 莠��ユ─腟�鐚�������腥句����藝�
 #: plugins/gtik.c:994
 msgid "(No"
-msgstr "(No"
+msgstr "(��"
 
 #: plugins/gtik.c:995
 msgid "Change"
 msgstr "莅���"
 
-#: plugins/history.c:79
+#: plugins/history.c:87
 msgid "History"
 msgstr "罩桁兓���"
 
-#: plugins/history.c:81
+#: plugins/history.c:89
 msgid "Shows recently logged conversations in new conversations."
 msgstr "蕁�ず��菴���荐�����篋よ��井�亥��篋よ�荀�腦�筝�"
 
-#: plugins/history.c:82
+#: plugins/history.c:90
 msgid ""
 "When a new conversation is opened this plugin will insert the last XXX of "
 "the last conversation into the current conversation."
@@ -272,42 +280,42 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:75
+#: plugins/iconaway.c:74
 msgid "Iconify on Away"
 msgstr "�∫������絨��"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/iconaway.c:78 plugins/iconaway.c:80
-msgid "Iconifies the away box and the buddy list when you go away."
-msgstr "�����∫����鐚���絨������荐����腦���絅遵�羝�����"
-
-#: plugins/idle.c:78 src/protocols/irc/irc.c:952
+#: plugins/iconaway.c:77 plugins/iconaway.c:79
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "�����∫����鐚���絨��鎁遵�羝������篋よ�荀�腦���"
+
+#: plugins/idle.c:70 src/protocols/irc/irc.c:936
 msgid "Idle Time"
 msgstr "��臀�����"
 
-#: plugins/idle.c:86
+#: plugins/idle.c:78
 msgid "Set"
 msgstr "荐㊤�絽活��"
 
-#: plugins/idle.c:91
+#: plugins/idle.c:83
 msgid "idle for"
 msgstr "��臀�����"
 
-#: plugins/idle.c:98 plugins/timestamp.c:86
+#: plugins/idle.c:90 plugins/timestamp.c:88
 msgid "minutes."
 msgstr "������"
 
-#: plugins/idle.c:104
+#: plugins/idle.c:96
 msgid "_Set"
 msgstr "荐㊤�(_S)"
 
-#: plugins/idle.c:127
+#: plugins/idle.c:119
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: plugins/idle.c:129 plugins/idle.c:130
+#: plugins/idle.c:121 plugins/idle.c:122
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "��荐掩�������峨�ラ��臀�����鐚�筝�┃絎���臀��箙�����"
 
@@ -327,7 +335,7 @@
 #. *  summary
 #: plugins/mailchk.c:152 plugins/mailchk.c:154
 msgid "Checks for new local mail."
-msgstr "罟∽�ユ���亥���育�灸散��"
+msgstr "罟∽�ユ���亥����育�灸散��"
 
 #: plugins/notify.c:442
 msgid "Unable to write to config file"
@@ -447,47 +455,47 @@
 msgid "Tests to see that most things are working."
 msgstr "���羝������ぇ��蚕���沿タ�処�醇③絽檎��篏���"
 
-#: plugins/spellchk.c:411
+#: plugins/spellchk.c:403
 msgid "Text Replacements"
 msgstr "��絖���篁�"
 
-#: plugins/spellchk.c:435
+#: plugins/spellchk.c:427
 msgid "You type"
 msgstr "�倶��叱��"
 
-#: plugins/spellchk.c:447
+#: plugins/spellchk.c:439
 msgid "You send"
 msgstr "絨�������"
 
-#: plugins/spellchk.c:473
+#: plugins/spellchk.c:465
 msgid "Add a new text replacement"
 msgstr "���ヤ����亥����絖���篁h���"
 
-#: plugins/spellchk.c:480
+#: plugins/spellchk.c:472
 msgid "You _type:"
 msgstr "�倶��叱��(_T)鐚�"
 
-#: plugins/spellchk.c:494
+#: plugins/spellchk.c:486
 msgid "You _send:"
 msgstr "絨�������(_S)鐚�"
 
-#: plugins/spellchk.c:534
+#: plugins/spellchk.c:526
 msgid "Text replacement"
 msgstr "��絖���篁�"
 
-#: plugins/spellchk.c:536 plugins/spellchk.c:537
+#: plugins/spellchk.c:528 plugins/spellchk.c:529
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "箴��т戎������絎�臂���荀��鋐���篁i���肴���賢����絖���"
 
-#: plugins/timestamp.c:72
+#: plugins/timestamp.c:74
 msgid "iChat Timestamp"
 msgstr "iChat �����活�"
 
-#: plugins/timestamp.c:79
+#: plugins/timestamp.c:81
 msgid "Delay"
 msgstr "綮狗��"
 
-#: plugins/timestamp.c:92
+#: plugins/timestamp.c:94
 msgid "_Apply"
 msgstr "絅���(_A)"
 
@@ -498,32 +506,74 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:145
+#: plugins/timestamp.c:148
 msgid "Timestamp"
 msgstr "�����活�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:148 plugins/timestamp.c:150
+#: plugins/timestamp.c:151 plugins/timestamp.c:153
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "罸�� N �������� iChat 馺��主�������活��遺困茫�筝㏍��"
 
+#: plugins/gaim-remote/remote.c:85
+msgid "Not connected to AIM"
+msgstr "羃����e�� AIM"
+
+#: plugins/gaim-remote/remote.c:94 plugins/gaim-remote/remote.c:133
+msgid "No screenname given."
+msgstr "羃���腟��絽活����"
+
+#: plugins/gaim-remote/remote.c:170
+msgid "No roomname given."
+msgstr "羃���腟����紊����腮宴��"
+
+#: plugins/gaim-remote/remote.c:189
+msgid "Invalid AIM URI"
+msgstr "�≧���� AIM URI"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaim-remote/remote.c:733
+msgid "Remote Control"
+msgstr "��腴�ァ��"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaim-remote/remote.c:736
+msgid "Provides remote control for gaim applications."
+msgstr "��箴�絨� Gaim �����綣�兓���腴�ァ�吟��"
+
+#. *  description
+#: plugins/gaim-remote/remote.c:738
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
+msgstr ""
+"��� Third-Party �����綣�� gaim-remote 鎴ュ�件���箴� Gaim�画���腴�ァ�句���遵����"
+
 #. Configuration frame
-#: plugins/gestures/gestures.c:210
+#: plugins/gestures/gestures.c:222
 msgid "Mouse Gestures Configuration"
 msgstr "羯�藜���篏�荐㊤�"
 
-#: plugins/gestures/gestures.c:217
+#: plugins/gestures/gestures.c:229
 msgid "Middle mouse button"
 msgstr "羯�藜�筝㊨��"
 
-#: plugins/gestures/gestures.c:222
+#: plugins/gestures/gestures.c:234
 msgid "Right mouse button"
 msgstr "羯�藜��渇��"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:234
+#: plugins/gestures/gestures.c:246
 msgid "_Visual gesture display"
 msgstr "蕁�ず��篏�莊��(_V)"
 
@@ -534,19 +584,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:261
+#: plugins/gestures/gestures.c:273
 msgid "Mouse Gestures"
 msgstr "羯�藜���篏�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:264
+#: plugins/gestures/gestures.c:276
 msgid "Provides support for mouse gestures"
 msgstr "��箴�羯�藜���篏������"
 
 #. *  description
-#: plugins/gestures/gestures.c:266
+#: plugins/gestures/gestures.c:278
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -569,46 +619,46 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:283
+#: plugins/ticker/ticker.c:68 plugins/ticker/ticker.c:280
 msgid "Buddy Ticker"
 msgstr "鎁遵�莊�薤���"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:286 plugins/ticker/ticker.c:288
+#: plugins/ticker/ticker.c:283 plugins/ticker/ticker.c:285
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "羂翫抗�峨��������絅遵�羝���"
-
-#: plugins/win32/transparency/win2ktrans.c:123
-#: plugins/win32/transparency/win2ktrans.c:412
-#: plugins/win32/transparency/win2ktrans.c:446
+msgstr "絅遵�羝�����羂翫抗�峨������"
+
+#: plugins/win32/transparency/win2ktrans.c:133
+#: plugins/win32/transparency/win2ktrans.c:359
+#: plugins/win32/transparency/win2ktrans.c:393
 msgid "Opacity:"
 msgstr "筝����嫜鐚�"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:393
+#: plugins/win32/transparency/win2ktrans.c:340
 msgid "IM Conversation Windows"
 msgstr "�恰��荐���困茫�荀�腦�"
 
-#: plugins/win32/transparency/win2ktrans.c:394
+#: plugins/win32/transparency/win2ktrans.c:341
 msgid "_IM window transparency"
 msgstr "�恰��荐����腦����嫜(_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:404
+#: plugins/win32/transparency/win2ktrans.c:351
 msgid "_Show slider bar in IM window"
 msgstr "���恰��荐����腦�筝㊨¨腓� Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:429 src/gtkprefs.c:905
+#: plugins/win32/transparency/win2ktrans.c:376 src/gtkprefs.c:845
 msgid "Buddy List Window"
 msgstr "絅遵�羝����腦�"
 
-#: plugins/win32/transparency/win2ktrans.c:430
+#: plugins/win32/transparency/win2ktrans.c:377
 msgid "_Keep Buddy List window on top"
 msgstr "絨�絅遵�羝����腦�篆�������∝����筝�絮�(_K)"
 
-#: plugins/win32/transparency/win2ktrans.c:433
+#: plugins/win32/transparency/win2ktrans.c:380
 msgid "_Buddy List window transparency"
 msgstr "絅遵�羝����腦����嫜(_B)"
 
@@ -619,15 +669,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:489
+#: plugins/win32/transparency/win2ktrans.c:436
 msgid "Transparency"
 msgstr "���嫜"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:492
-#: plugins/win32/transparency/win2ktrans.c:494
+#: plugins/win32/transparency/win2ktrans.c:439
+#: plugins/win32/transparency/win2ktrans.c:441
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows.\n"
 "\n"
@@ -638,23 +688,23 @@
 "* 茫�羈��������罔∞���荀� Win2000 �� WinXP ���順�∝��������"
 
 #. IM Convo trans options
-#: plugins/win32/winprefs/winprefs.c:141
+#: plugins/win32/winprefs/winprefs.c:124
 msgid "Startup"
 msgstr "����"
 
-#: plugins/win32/winprefs/winprefs.c:142
+#: plugins/win32/winprefs/winprefs.c:125
 msgid "_Start Gaim on Windows startup"
 msgstr "�� Windows �����������決� Gaim(_S)"
 
-#: plugins/win32/winprefs/winprefs.c:170
+#: plugins/win32/winprefs/winprefs.c:152
 msgid "WinGaim Options"
 msgstr "WinGaim �檎��"
 
-#: plugins/win32/winprefs/winprefs.c:172 plugins/win32/winprefs/winprefs.c:173
+#: plugins/win32/winprefs/winprefs.c:154 plugins/win32/winprefs/winprefs.c:155
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim ���檎���檎����"
 
-#: plugins/perl/perl.c:396
+#: plugins/perl/perl.c:405
 msgid "GAIM::register not called with proper arguments.  Consult PERL-HOWTO."
 msgstr "GAIM::register �弱ŭ��筝������箴����句�����吾��茫����� PERL-HOWTO��"
 
@@ -665,13 +715,13 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:1376
+#: plugins/perl/perl.c:1391
 msgid "Perl Plugin Loader"
 msgstr "Perl 罔∞�莠��ュ��"
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:1378 plugins/perl/perl.c:1379
+#: plugins/perl/perl.c:1393 plugins/perl/perl.c:1394
 msgid "Provides support for loading perl plugins."
 msgstr "��箴�莅��� Perl 罔∞�����叵��"
 
@@ -682,230 +732,234 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:68
+#: plugins/statenotify.c:72
 msgid "Buddy State Notification"
 msgstr "絅遵���������"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/statenotify.c:71 plugins/statenotify.c:74
+#: plugins/statenotify.c:75 plugins/statenotify.c:78
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "��困茫�荀�腦�筝㊨¨腓阪ソ���∫�������演�∫��鐚���臀��菴��������ヨ�����"
 
-#: src/protocols/gg/gg.c:69 src/protocols/jabber/jabber.c:1192
-#: src/protocols/msn/msn.c:308 src/protocols/msn/state.c:27
+#: src/protocols/gg/gg.c:52 src/protocols/jabber/jabber.c:1180
+#: src/protocols/msn/msn.c:311 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:1283
-#: src/protocols/yahoo/yahoo.c:1362
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:1252
+#: src/protocols/yahoo/yahoo.c:1331
 msgid "Available"
 msgstr "筝�膩�"
 
-#: src/protocols/gg/gg.c:70
+#: src/protocols/gg/gg.c:53
 msgid "Available for friends only"
 msgstr "����絅遵���札���井��筝�膩�"
 
-#: src/protocols/gg/gg.c:72
+#: src/protocols/gg/gg.c:55
 msgid "Away for friends only"
 msgstr "�∫��鐚�����絅遵���札���井��鐚�"
 
-#: src/protocols/gg/gg.c:73 src/protocols/jabber/jabber.c:3451
-#: src/protocols/jabber/jabber.c:3514 src/protocols/oscar/oscar.c:2828
-#: src/protocols/oscar/oscar.c:4497 src/protocols/oscar/oscar.c:4524
-#: src/protocols/oscar/oscar.c:5729 src/protocols/yahoo/yahoo.c:1098
-#: src/protocols/yahoo/yahoo.c:1305 src/protocols/yahoo/yahoo.c:1372
+#: src/protocols/gg/gg.c:56 src/protocols/jabber/jabber.c:3436
+#: src/protocols/jabber/jabber.c:3499 src/protocols/oscar/oscar.c:2827
+#: src/protocols/oscar/oscar.c:4533 src/protocols/oscar/oscar.c:4560
+#: src/protocols/oscar/oscar.c:5843 src/protocols/yahoo/yahoo.c:1066
+#: src/protocols/yahoo/yahoo.c:1274 src/protocols/yahoo/yahoo.c:1341
 msgid "Invisible"
 msgstr "�沿昆"
 
 # XXX
-#: src/protocols/gg/gg.c:74
+#: src/protocols/gg/gg.c:57
 msgid "Invisible for friends only"
 msgstr "�沿昆鐚�����絅遵���札���井��鐚�"
 
-#: src/protocols/gg/gg.c:75
+#: src/protocols/gg/gg.c:58
 msgid "Unavailable"
 msgstr "�∝�"
 
-#: src/protocols/gg/gg.c:159
+#: src/protocols/gg/gg.c:139
 msgid "Unable to resolve hostname."
 msgstr "�≧�茹f��筝紙���腮宴��"
 
-#: src/protocols/gg/gg.c:162
+#: src/protocols/gg/gg.c:142
 msgid "Unable to connect to server."
 msgstr "�≧��g��遺失������"
 
-#: src/protocols/gg/gg.c:165
+#: src/protocols/gg/gg.c:145
 msgid "Invalid response from server."
 msgstr "�≧����篌堺����������"
 
-#: src/protocols/gg/gg.c:168
+#: src/protocols/gg/gg.c:148
 msgid "Error while reading from socket."
 msgstr "莅��� Socket ���主�������"
 
-#: src/protocols/gg/gg.c:171
+#: src/protocols/gg/gg.c:151
 msgid "Error while writing to socket."
 msgstr "絲��� Socket ���主�������"
 
-#: src/protocols/gg/gg.c:174
+#: src/protocols/gg/gg.c:154
 msgid "Authentication failed."
 msgstr "茯�茘�紊掩����"
 
-#: src/protocols/gg/gg.c:177
+#: src/protocols/gg/gg.c:157
 msgid "Unknown Error Code."
 msgstr "���ョ�����篁g⊆��"
 
-#: src/protocols/gg/gg.c:282
+#: src/protocols/gg/gg.c:262
 #, c-format
 msgid "Status: %s"
 msgstr "����鐚�%s"
 
-#: src/protocols/gg/gg.c:303
+#: src/protocols/gg/gg.c:283
 msgid "Could not connect"
 msgstr "�≧��g�"
 
-#: src/protocols/gg/gg.c:310
+#: src/protocols/gg/gg.c:290
 msgid "Unable to read socket"
 msgstr "�≧�莅��� Socket"
 
-#: src/protocols/gg/gg.c:420
+#: src/protocols/gg/gg.c:402
 msgid "Unable to connect."
 msgstr "�≧��g���"
 
-#: src/protocols/gg/gg.c:436
+#: src/protocols/gg/gg.c:418
 msgid "Reading data"
 msgstr "莅���莖���筝�"
 
-#: src/protocols/gg/gg.c:439
+#: src/protocols/gg/gg.c:421
 msgid "Balancer handshake"
 msgstr "��莢�莠�綛活 ��困茫�筝�"
 
-#: src/protocols/gg/gg.c:442
+#: src/protocols/gg/gg.c:424
 msgid "Reading server key"
 msgstr "莅��� Server Key 筝�"
 
-#: src/protocols/gg/gg.c:445
+#: src/protocols/gg/gg.c:427
 msgid "Exchanging key hash"
 msgstr "篋ゆ�絲��遺賢"
 
-#: src/protocols/gg/gg.c:454
+#: src/protocols/gg/gg.c:437
 msgid "Critical error in GG library\n"
 msgstr "�� GG Library 筝㊦����紊ч���\n"
 
-#: src/protocols/gg/gg.c:473 src/protocols/gg/gg.c:569
+#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
 #, c-format
 msgid "Connect to %s failed"
 msgstr "�g��� %s 紊掩��"
 
-#: src/protocols/gg/gg.c:522
+#: src/protocols/gg/gg.c:503
 msgid "Unable to ping server"
 msgstr "�≧���緇�篌堺��������"
 
 # XXX
-#: src/protocols/gg/gg.c:535
+#: src/protocols/gg/gg.c:515
 msgid "Send as message"
 msgstr "篁ヨ�������"
 
-#: src/protocols/gg/gg.c:542
+#: src/protocols/gg/gg.c:520
 msgid "Looking up GG server"
 msgstr "��絨� GG 篌堺����"
 
-#: src/protocols/gg/gg.c:545
+#: src/protocols/gg/gg.c:523
 msgid "Invalid Gadu-Gadu UIN specified"
-msgstr "�≧���� Gadu-Gadu UIN 絎�臂�"
-
-#: src/protocols/gg/gg.c:594
+msgstr "腟��篋��≧���� Gadu-Gadu UIN"
+
+#: src/protocols/gg/gg.c:570
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr "�����絨��≧���� Gadu-Gadu UIN ���坂���荐�����"
 
-#: src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:633
 msgid "Couldn't get search results"
 msgstr "�≧���緇���絨�腟���"
 
-#: src/protocols/gg/gg.c:662
+#: src/protocols/gg/gg.c:638
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu ��絨�綣���"
 
-#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:663
 msgid "Active"
 msgstr "����"
 
-#: src/protocols/gg/gg.c:688
+#. *
+#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
+#.
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:166 src/request.h:804
 msgid "Yes"
 msgstr "��"
 
-#: src/protocols/gg/gg.c:688
+#: src/protocols/gg/gg.c:664 src/gtkrequest.c:167 src/request.h:804
 msgid "No"
 msgstr "��"
 
-#: src/protocols/gg/gg.c:692
+#: src/protocols/gg/gg.c:668
 msgid "UIN"
 msgstr "絽活��"
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:672
 msgid "First name"
 msgstr "��"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:677
 msgid "Second Name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:705
+#: src/protocols/gg/gg.c:681 src/protocols/gg/gg.c:1380
 msgid "Nick"
 msgstr "�援┗"
 
-#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+#: src/protocols/gg/gg.c:688 src/protocols/gg/gg.c:691
 msgid "Birth year"
 msgstr "�榊��綛�"
 
-#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
-#: src/protocols/gg/gg.c:725
+#: src/protocols/gg/gg.c:697 src/protocols/gg/gg.c:699
+#: src/protocols/gg/gg.c:701
 msgid "Sex"
 msgstr "�у��"
 
-#. Line 5
-#: src/protocols/gg/gg.c:729 src/dialogs.c:2067 src/dialogs.c:2713
+#. City
+#: src/protocols/gg/gg.c:705 src/protocols/trepia/trepia.c:364
+#: src/dialogs.c:2027 src/dialogs.c:2676
 msgid "City"
 msgstr "���"
 
-#: src/protocols/gg/gg.c:762
+#: src/protocols/gg/gg.c:738
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr "Gadu-Gadu 篌堺�����筝�����峨�篁私���絅遵�羝�����"
 
-#: src/protocols/gg/gg.c:770
+#: src/protocols/gg/gg.c:746
 msgid "Couldn't Import Buddy List from Server"
 msgstr "�≧���失�������緇�絅遵�����"
 
-#: src/protocols/gg/gg.c:831
+#: src/protocols/gg/gg.c:809
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr "������絨�絅遵�羝����渇���� Gadu-Gadu 篌堺�����"
 
-#: src/protocols/gg/gg.c:838
+#: src/protocols/gg/gg.c:817
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr "�≧��渇��絅遵�羝����� Gadu-Gadu 篌堺�����"
 
-#: src/protocols/gg/gg.c:846
+#: src/protocols/gg/gg.c:825
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr "������絨�絅遵�羝����� Gadu-Gadu 篌堺���������"
 
-#: src/protocols/gg/gg.c:853
+#: src/protocols/gg/gg.c:833
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr "�≧����ゅ�� Gadu-Gadu 篌堺�������絅遵�羝���"
 
-#: src/protocols/gg/gg.c:861
+#: src/protocols/gg/gg.c:841
 msgid "Password changed successfully"
 msgstr "絲�腆寂信�号����"
 
-#: src/protocols/gg/gg.c:867
+#: src/protocols/gg/gg.c:848
 msgid "Password couldn't be changed"
 msgstr "絲�腆主�≧�篆���"
 
-#: src/protocols/gg/gg.c:979
+#: src/protocols/gg/gg.c:965
 msgid "Error communicating with Gadu-Gadu server"
 msgstr "�� Gadu-Gadu 篌堺����������主�����"
 
-#: src/protocols/gg/gg.c:980
+#: src/protocols/gg/gg.c:966
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
@@ -913,34 +967,34 @@
 "���阪�� Gadu-Gadu HTTP 篌堺����������主���馹�鐚���篁� Gaim 羃���莨��絎���������絎���"
 "綏ヤ���茫�緇�������荅���"
 
-#: src/protocols/gg/gg.c:1008
+#: src/protocols/gg/gg.c:994
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "�≧����� Gadu-Gadu ��絅遵�羝���"
 
-#: src/protocols/gg/gg.c:1009
+#: src/protocols/gg/gg.c:995
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr "Gaim �≧��d� Gadu-Gadu 絅遵�羝���失������茫���藥���荅��罨<��"
 
-#: src/protocols/gg/gg.c:1078
+#: src/protocols/gg/gg.c:1064
 msgid "Couldn't export buddy list"
 msgstr "�≧����阪ソ��羝���"
 
-#: src/protocols/gg/gg.c:1079 src/protocols/gg/gg.c:1102
+#: src/protocols/gg/gg.c:1065 src/protocols/gg/gg.c:1088
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim �≧��d�絅遵�羝���失������茫���藥���荅��罨<��"
 
-#: src/protocols/gg/gg.c:1101
+#: src/protocols/gg/gg.c:1087
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr "�≧����� Gadu-Gadu 絅遵�羝���"
 
-#: src/protocols/gg/gg.c:1150
+#: src/protocols/gg/gg.c:1136
 msgid "Unable to access directory"
 msgstr "�≧�絖�������"
 
-#: src/protocols/gg/gg.c:1151
+#: src/protocols/gg/gg.c:1137
 msgid ""
 "Gaim was unable to search the Directory because it was unable to connect to "
 "the directory server.  Please try again later."
@@ -948,11 +1002,11 @@
 "���� Gaim 羃���莨���d�����篌堺�������篁ョ�≧���絨�����筝���莖�����茫�緇�������荅��"
 "罨<��"
 
-#: src/protocols/gg/gg.c:1184
+#: src/protocols/gg/gg.c:1170
 msgid "Unable to change Gadu-Gadu password"
 msgstr "�≧�篆��� Gadu-Gadu 絲�腆�"
 
-#: src/protocols/gg/gg.c:1185
+#: src/protocols/gg/gg.c:1171
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
@@ -960,33 +1014,33 @@
 "���� Gaim 羃���莨���d� Gadu-Gadu 篌堺�������篁ョ�≧�篆��号����絲�腆若��茫�緇�������荅��"
 "罨<��"
 
-#: src/protocols/gg/gg.c:1201
+#: src/protocols/gg/gg.c:1187
 msgid "Directory Search"
 msgstr "������絨�"
 
-#: src/protocols/gg/gg.c:1209 src/protocols/jabber/jabber.c:4337
-#: src/protocols/oscar/oscar.c:5924 src/protocols/toc/toc.c:1453
-#: src/dialogs.c:2179 src/dialogs.c:2188
+#: src/protocols/gg/gg.c:1195 src/protocols/jabber/jabber.c:4315
+#: src/protocols/oscar/oscar.c:6107 src/protocols/toc/toc.c:1473
+#: src/dialogs.c:2138 src/dialogs.c:2147
 msgid "Change Password"
 msgstr "篆��劫�腆�"
 
-#: src/protocols/gg/gg.c:1217
+#: src/protocols/gg/gg.c:1203
 msgid "Import Buddy List from Server"
 msgstr "��失��������ュソ������"
 
-#: src/protocols/gg/gg.c:1223
+#: src/protocols/gg/gg.c:1209
 msgid "Export Buddy List to Server"
 msgstr "���阪ソ�������遺失�����"
 
-#: src/protocols/gg/gg.c:1229
+#: src/protocols/gg/gg.c:1215
 msgid "Delete Buddy List from Server"
 msgstr "絨�篌堺�������絅遵���������"
 
-#: src/protocols/gg/gg.c:1262
+#: src/protocols/gg/gg.c:1248
 msgid "Unable to access user profile."
 msgstr "�≧�莅���篏睡����膂>�罟���"
 
-#: src/protocols/gg/gg.c:1263
+#: src/protocols/gg/gg.c:1249
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
@@ -1004,7 +1058,7 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1375 src/protocols/gg/gg.c:1377
+#: src/protocols/gg/gg.c:1361 src/protocols/gg/gg.c:1363
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu ��絎�罔∞�"
 
@@ -1012,25 +1066,28 @@
 msgid "Gaim encountered an error communicating with the ICQ server."
 msgstr "Gaim ���g� ICQ 篌堺�������主�������"
 
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2672
-#: src/dialogs.c:2480 src/gtkconv.c:813 src/gtkconv.c:2656 src/gtkconv.c:3798
-#: src/prpl.c:416
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:2671
+#: src/dialogs.c:2444 src/gtkconv.c:1112 src/gtkconv.c:2994 src/gtkconv.c:4159
+#: src/gtkrequest.c:173 src/prpl.c:312
 msgid "Add"
 msgstr "����"
 
 #. Cancel button.
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1131
-#: src/protocols/irc/irc.c:1460 src/protocols/msn/msn.c:168
-#: src/protocols/msn/msn.c:179 src/protocols/msn/msn.c:190
-#: src/protocols/msn/msn.c:201 src/protocols/msn/msn.c:214
-#: src/protocols/oscar/oscar.c:2404 src/protocols/oscar/oscar.c:2441
-#: src/protocols/oscar/oscar.c:2476 src/protocols/oscar/oscar.c:2521
-#: src/protocols/oscar/oscar.c:5603 src/protocols/oscar/oscar.c:5807
-#: src/protocols/oscar/oscar.c:5855 src/protocols/yahoo/yahoo.c:1215
-#: src/buddy_chat.c:312 src/dialogs.c:470 src/dialogs.c:481 src/dialogs.c:493
-#: src/dialogs.c:2124 src/dialogs.c:2240 src/dialogs.c:2301 src/dialogs.c:2469
-#: src/dialogs.c:2655 src/dialogs.c:2804 src/dialogs.c:3474 src/dialogs.c:3966
-#: src/dialogs.c:4447 src/dialogs.c:5020 src/multi.c:177 src/prpl.c:417
+#: src/protocols/icq/gaim_icq.c:277 src/protocols/irc/irc.c:1117
+#: src/protocols/irc/irc.c:1446 src/protocols/msn/msn.c:171
+#: src/protocols/msn/msn.c:182 src/protocols/msn/msn.c:193
+#: src/protocols/msn/msn.c:204 src/protocols/msn/msn.c:217
+#: src/protocols/oscar/oscar.c:2402 src/protocols/oscar/oscar.c:2439
+#: src/protocols/oscar/oscar.c:2474 src/protocols/oscar/oscar.c:2519
+#: src/protocols/oscar/oscar.c:5716 src/protocols/oscar/oscar.c:5931
+#: src/protocols/oscar/oscar.c:5980 src/protocols/oscar/oscar.c:6040
+#: src/protocols/trepia/trepia.c:380 src/protocols/yahoo/yahoo.c:1183
+#: src/buddy_chat.c:375 src/dialogs.c:451 src/dialogs.c:463 src/dialogs.c:476
+#: src/dialogs.c:2084 src/dialogs.c:2199 src/dialogs.c:2265 src/dialogs.c:2433
+#: src/dialogs.c:2618 src/dialogs.c:2767 src/dialogs.c:3439 src/dialogs.c:3933
+#: src/dialogs.c:4875 src/gtkaccount.c:1512 src/gtkconn.c:144
+#: src/gtkconn.c:261 src/gtkrequest.c:169 src/multi.c:177 src/prpl.c:313
+#: src/request.h:813 src/request.h:823
 msgid "Cancel"
 msgstr "��羔�"
 
@@ -1039,16 +1096,16 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "篏睡���� %s (%s%s%s%s%s) 荀�羆�����茯�茘���"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1724
-#: src/protocols/msn/notification.c:461 src/protocols/msn/notification.c:721
-#: src/protocols/oscar/oscar.c:2600 src/protocols/oscar/oscar.c:5051
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1712
+#: src/protocols/msn/notification.c:466 src/protocols/msn/notification.c:747
+#: src/protocols/oscar/oscar.c:2599 src/protocols/oscar/oscar.c:5094
 msgid "Authorize"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1725
-#: src/protocols/msn/notification.c:462 src/protocols/msn/notification.c:723
-#: src/protocols/oscar/oscar.c:2602 src/protocols/oscar/oscar.c:5052
-#: src/dialogs.c:2468
+#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/jabber.c:1713
+#: src/protocols/msn/notification.c:467 src/protocols/msn/notification.c:749
+#: src/protocols/oscar/oscar.c:2601 src/protocols/oscar/oscar.c:5095
+#: src/dialogs.c:2432
 msgid "Deny"
 msgstr "��腟�"
 
@@ -1056,11 +1113,11 @@
 msgid "Send message through server"
 msgstr "���幞�����渇��荐���"
 
-#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2344
-#: src/protocols/jabber/jabber.c:2379 src/protocols/jabber/jabber.c:4254
-#: src/protocols/jabber/jabber.c:4301 src/protocols/msn/dispatch.c:160
-#: src/protocols/msn/msn.c:422 src/protocols/msn/notification.c:1333
-#: src/protocols/napster/napster.c:515
+#: src/protocols/icq/gaim_icq.c:344 src/protocols/jabber/jabber.c:2331
+#: src/protocols/jabber/jabber.c:2365 src/protocols/jabber/jabber.c:4234
+#: src/protocols/jabber/jabber.c:4280 src/protocols/msn/dispatch.c:160
+#: src/protocols/msn/msn.c:425 src/protocols/msn/notification.c:1376
+#: src/protocols/napster/napster.c:496
 msgid "Unable to connect"
 msgstr "�≧��g�"
 
@@ -1068,7 +1125,7 @@
 msgid "Connecting..."
 msgstr "�g�筝�..."
 
-#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3906
+#: src/protocols/icq/gaim_icq.c:497 src/protocols/oscar/oscar.c:3933
 msgid "Nick:"
 msgstr "�援┗鐚�"
 
@@ -1076,199 +1133,206 @@
 msgid "Gaim User"
 msgstr "Gaim 篏睡����"
 
-#: src/protocols/irc/irc.c:202
+#: src/protocols/irc/irc.c:186
 msgid ""
 "(There was an error converting this message.  Check the 'Encoding' option in "
 "the Account Editor)"
 msgstr "鐚��咲����荐������膩�⊆���主��篋������茫�罟∽�ュ験��羝���賢����膩�⊆���檎��鐚�"
 
-#: src/protocols/irc/irc.c:503 src/protocols/irc/irc.c:2643
+#: src/protocols/irc/irc.c:487 src/protocols/irc/irc.c:2620
 #, c-format
 msgid "DCC Chat with %s closed"
 msgstr "�� %s �� DCC ��紊�群����"
 
-#: src/protocols/irc/irc.c:556 src/protocols/irc/irc.c:2652
+#: src/protocols/irc/irc.c:540 src/protocols/irc/irc.c:2629
 #, c-format
 msgid "DCC Chat with %s established"
 msgstr "�� %s �� DCC ��紊�群膓�茴�産腴�"
 
-#: src/protocols/irc/irc.c:691
+#: src/protocols/irc/irc.c:675
 msgid "No topic is set"
 msgstr "羃���荐㊤�筝脂�"
 
 # NOTE ���峨�ヨ��紊������蕁�ず����鐚�絋�����changed���頑⑮��篆��鴻����緇�絅���
-#: src/protocols/irc/irc.c:712 src/protocols/irc/irc.c:1782
+#: src/protocols/irc/irc.c:696 src/protocols/irc/irc.c:1767
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s ����紊�源蕁�荐㊤��削�%s</B>"
 
-#: src/protocols/irc/irc.c:757
+#: src/protocols/irc/irc.c:741
 #, c-format
 msgid "-:- mode/%s [%c%c %s] by %s"
 msgstr "-:- 罔≦�/%s [%c%c %s] 茴� %s 荐㊤�"
 
-#: src/protocols/irc/irc.c:935 src/protocols/irc/irc.c:948
+#: src/protocols/irc/irc.c:919 src/protocols/irc/irc.c:932
 msgid "User"
 msgstr "篏睡����"
 
-#: src/protocols/irc/irc.c:939
+#. Splits
+#: src/protocols/irc/irc.c:923 src/protocols/irc/irc.c:3043
+#: src/protocols/jabber/jabber.c:4411 src/protocols/napster/napster.c:639
 msgid "Server"
 msgstr "篌堺����"
 
-#: src/protocols/irc/irc.c:943 src/protocols/irc/irc.c:1109
-#: src/protocols/irc/irc.c:1674
+#: src/protocols/irc/irc.c:927 src/protocols/irc/irc.c:1094
+#: src/protocols/irc/irc.c:1659
 msgid "IRC Operator"
 msgstr "IRC ��篏���"
 
-#: src/protocols/irc/irc.c:956
+#: src/protocols/irc/irc.c:940
 msgid "Channels"
 msgstr "�脂��"
 
-#: src/protocols/irc/irc.c:962
+#: src/protocols/irc/irc.c:946
 #, c-format
 msgid "%s is an Identified User"
 msgstr "%s �����綏臥�茘���篏睡����"
 
-#: src/protocols/irc/irc.c:989
+#: src/protocols/irc/irc.c:973
 #, c-format
 msgid "%ld seconds [signon: %s]"
 msgstr "%ld 腱� [�糸�ワ�%s]"
 
 #. RPL_REHASHING
-#: src/protocols/irc/irc.c:1109
+#: src/protocols/irc/irc.c:1094
 msgid "Rehashing server"
 msgstr "���域┃絎�篌堺����賢"
 
 #. ERR_NOSUCHNICK
-#: src/protocols/irc/irc.c:1112
+#: src/protocols/irc/irc.c:1097
 msgid "No such nick/channel"
 msgstr "羃����e���援┗���脂��"
 
-#: src/protocols/irc/irc.c:1112 src/protocols/irc/irc.c:1115
-#: src/protocols/irc/irc.c:1120 src/protocols/irc/irc.c:1124
-#: src/protocols/irc/irc.c:1489 src/protocols/irc/irc.c:1632
+#: src/protocols/irc/irc.c:1097 src/protocols/irc/irc.c:1100
+#: src/protocols/irc/irc.c:1105 src/protocols/irc/irc.c:1109
+#: src/protocols/irc/irc.c:1475 src/protocols/irc/irc.c:1617
 msgid "IRC Error"
 msgstr "IRC ���"
 
 #. ERR_NOSUCHSERVER
-#: src/protocols/irc/irc.c:1115
+#: src/protocols/irc/irc.c:1100
 msgid "No such server"
 msgstr "羃����i��失����"
 
 #. ERR_NOMOTD
 #. drop it - bringing up dialog for NOMOTD is annoying
 #. ERR_NONICKNAMEGIVEN
-#: src/protocols/irc/irc.c:1120
+#: src/protocols/irc/irc.c:1105
 msgid "No nickname given"
 msgstr "羃���腟���援┗"
 
 #. ERR_NOPRIVILEGES
-#: src/protocols/irc/irc.c:1123
+#: src/protocols/irc/irc.c:1108
 msgid "You're not an IRC operator!"
 msgstr "�������� IRC ��篏���鐚�"
 
-#: src/protocols/irc/irc.c:1127
+#: src/protocols/irc/irc.c:1112
 msgid "That nick is already in use.  Please enter a new nick"
 msgstr "�����援┗綏牙���戎��賢��茫�莠後�ヤ����亥���援┗"
 
 #. Build OK Button
-#: src/protocols/irc/irc.c:1130 src/protocols/msn/msn.c:167
-#: src/protocols/msn/msn.c:178 src/protocols/msn/msn.c:189
-#: src/protocols/msn/msn.c:200 src/protocols/oscar/oscar.c:2440
-#: src/protocols/oscar/oscar.c:2520 src/protocols/oscar/oscar.c:5806
-#: src/protocols/oscar/oscar.c:5854 src/protocols/yahoo/yahoo.c:1214
-#: src/dialogs.c:2236 src/dialogs.c:2369 src/dialogs.c:2654 src/dialogs.c:2800
-#: src/dialogs.c:3959 src/dialogs.c:4441
+#: src/protocols/irc/irc.c:1116 src/protocols/msn/msn.c:170
+#: src/protocols/msn/msn.c:181 src/protocols/msn/msn.c:192
+#: src/protocols/msn/msn.c:203 src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2518 src/protocols/oscar/oscar.c:5930
+#: src/protocols/oscar/oscar.c:5979 src/protocols/oscar/oscar.c:6039
+#: src/protocols/yahoo/yahoo.c:1182 src/dialogs.c:2195 src/dialogs.c:2333
+#: src/dialogs.c:2617 src/dialogs.c:2763 src/dialogs.c:3926 src/gtkconn.c:260
+#: src/gtkrequest.c:168 src/request.h:813
 msgid "OK"
 msgstr "腆阪�"
 
-#: src/protocols/irc/irc.c:1416 src/protocols/irc/irc.c:1422
-#: src/protocols/irc/irc.c:1428 src/protocols/irc/irc.c:1442
+#: src/protocols/irc/irc.c:1402 src/protocols/irc/irc.c:1408
+#: src/protocols/irc/irc.c:1414 src/protocols/irc/irc.c:1428
 msgid "IRC CTCP info"
 msgstr "IRC CTCP 莖�荐�"
 
-#: src/protocols/irc/irc.c:1452
+#: src/protocols/irc/irc.c:1438
 #, c-format
 msgid "%s would like to establish a DCC chat"
 msgstr "%s �活�綮榊�筝��� DCC ��紊�"
 
-#: src/protocols/irc/irc.c:1455
+#: src/protocols/irc/irc.c:1441
 msgid ""
 "This requires a direct connection to be established between the two "
 "computers.  Messages sent will not pass through the IRC server"
 msgstr ""
 "����荀�羆�絨���綮榊�莎桁�����肢�������g�鐚���荐����筝������ IRC 鋍堺������画��渇��"
 
-#: src/protocols/irc/irc.c:1459 src/protocols/oscar/oscar.c:2403
-#: src/protocols/oscar/oscar.c:5602
+#: src/protocols/irc/irc.c:1445 src/protocols/oscar/oscar.c:2401
+#: src/protocols/oscar/oscar.c:5715
 msgid "Connect"
 msgstr "�g�"
 
-#: src/protocols/irc/irc.c:1486
+#: src/protocols/irc/irc.c:1472
 #, c-format
 msgid "Received an invalid file send request from %s."
 msgstr "�九�遺���箴����� %s �≧����罟�罅����咲��羆���"
 
-#: src/protocols/irc/irc.c:1567 src/protocols/msn/error.c:133
-#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:734
+#: src/protocols/irc/irc.c:1553 src/protocols/msn/error.c:133
+#: src/protocols/msn/notification.c:292 src/protocols/msn/notification.c:760
 msgid "Unable to write"
 msgstr "�≧�絲���"
 
-#: src/protocols/irc/irc.c:1630
+#: src/protocols/irc/irc.c:1615
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "��←荼√�� %s: %s"
 
-#: src/protocols/irc/irc.c:1635
+#: src/protocols/irc/irc.c:1620
 #, c-format
 msgid "Kicked by %s: %s"
 msgstr "茴� %s 荼√�削�%s"
 
-#: src/protocols/irc/irc.c:1691 src/protocols/irc/irc.c:2953
+#: src/protocols/irc/irc.c:1676 src/protocols/irc/irc.c:2930
 msgid "CTCP ClientInfo"
 msgstr "CTCP 絎∽�句�莖�荐�"
 
-#: src/protocols/irc/irc.c:1697 src/protocols/irc/irc.c:2959
+#: src/protocols/irc/irc.c:1682 src/protocols/irc/irc.c:2936
 msgid "CTCP UserInfo"
 msgstr "CTCP 篏睡����莖�荐�"
 
-#: src/protocols/irc/irc.c:1703 src/protocols/irc/irc.c:2965
+#: src/protocols/irc/irc.c:1688 src/protocols/irc/irc.c:2942
 msgid "CTCP Version"
 msgstr "CTCP ����"
 
-#: src/protocols/irc/irc.c:1731 src/protocols/irc/irc.c:2971
+#: src/protocols/irc/irc.c:1716 src/protocols/irc/irc.c:2948
 msgid "CTCP Ping"
 msgstr "CTCP Ping"
 
-#: src/protocols/irc/irc.c:1984 src/protocols/oscar/oscar.c:695
-#: src/protocols/toc/toc.c:255
+#: src/protocols/irc/irc.c:1961 src/protocols/oscar/oscar.c:676
+#: src/protocols/toc/toc.c:233
 #, c-format
 msgid "Signon: %s"
 msgstr "�糸�ワ�%s"
 
-#: src/protocols/irc/irc.c:2240
+#: src/protocols/irc/irc.c:1975 src/protocols/trepia/trepia.c:1148
+msgid "Unable to create socket"
+msgstr "�≧�綮榊� Socket"
+
+#: src/protocols/irc/irc.c:2216
 #, c-format
 msgid "Topic for %s is %s"
 msgstr "%s ��筝脂��� %s"
 
-#: src/protocols/irc/irc.c:2336
+#: src/protocols/irc/irc.c:2312
 #, c-format
 msgid "You have left %s"
 msgstr "���∫��篋� %s"
 
-#: src/protocols/irc/irc.c:2337
+#: src/protocols/irc/irc.c:2313
 msgid "IRC Part"
 msgstr "IRC �∫��"
 
-#: src/protocols/irc/irc.c:2392
+#: src/protocols/irc/irc.c:2368
 msgid "<I>Requesting DCC CHAT</I>"
-msgstr "<I>荀�羆� DCC ��紊�</I>"
-
-#: src/protocols/irc/irc.c:2409
+msgstr "<I>荀�羆� DCC ��紊�賢</I>"
+
+#: src/protocols/irc/irc.c:2385
 msgid "<B>Operator commands:<BR>REHASH RESTART</B>"
 msgstr "<B>IRC ��篏�����篁わ�<BR>REHASH RESTART</B>"
 
-#: src/protocols/irc/irc.c:2414
+#: src/protocols/irc/irc.c:2390
 msgid ""
 "<B>CTCP commands:<BR>CLIENTINFO <nick><BR>USERINFO <nick><BR>VERSION "
 "<nick><BR>PING <nick></B><BR>"
@@ -1276,11 +1340,11 @@
 "<B>CTCP ��篁わ�<BR>CLIENTINFO <�援┗><BR>USERINFO <�援┗><BR>VERSION <�援┗"
 "><BR>PING <�援┗></B><BR>"
 
-#: src/protocols/irc/irc.c:2422
+#: src/protocols/irc/irc.c:2398
 msgid "<B>DCC commands:<BR>CHAT <nick></B>"
 msgstr "<B>DCC ��篁わ�<BR>CHAT <�援┗></B>"
 
-#: src/protocols/irc/irc.c:2427
+#: src/protocols/irc/irc.c:2403
 msgid ""
 "<B>Currently supported commands:<BR>WHOIS INVITE NICK LIST<BR>JOIN PART "
 "TOPIC KICK<BR>OP DEOP VOICE DEVOICE<BR>ME MSG QUOTE SAY QUIT<BR>MODE VERSION "
@@ -1292,19 +1356,19 @@
 "�� /HELP OPER 蕁�ず��篏�����篁�<BR>莠後�� /HELP CTCP 蕁�ず CTCP ��篁�<BR>莠後�� /HELP "
 "DCC 蕁�ず DCC ��篁�"
 
-#: src/protocols/irc/irc.c:2450
+#: src/protocols/irc/irc.c:2426
 msgid "<B>Unknown command</B>"
 msgstr "<B>���ョ����篁�</B>"
 
-#: src/protocols/irc/irc.c:2510
+#: src/protocols/irc/irc.c:2486
 msgid "Channel:"
 msgstr "�脂��:"
 
-#: src/protocols/irc/irc.c:2515 src/main.c:357
+#: src/protocols/irc/irc.c:2491 src/gtkaccount.c:450 src/main.c:402
 msgid "Password:"
 msgstr "絲�腆種�"
 
-#: src/protocols/irc/irc.c:2940
+#: src/protocols/irc/irc.c:2917
 msgid "DCC Chat"
 msgstr "DCC ��紊�"
 
@@ -1318,311 +1382,315 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/irc/irc.c:3046 src/protocols/irc/irc.c:3048
+#: src/protocols/irc/irc.c:3023 src/protocols/irc/irc.c:3025
 msgid "IRC Protocol Plugin"
 msgstr "IRC ��絎�罔∞�"
 
-#: src/protocols/irc/irc.c:3068 src/protocols/jabber/jabber.c:2967
-#: src/protocols/jabber/jabber.c:4434 src/protocols/napster/napster.c:660
-msgid "Server:"
-msgstr "篌堺�����"
-
-#: src/protocols/irc/irc.c:3073 src/protocols/jabber/jabber.c:4445
-#: src/protocols/msn/msn.c:1220 src/protocols/napster/napster.c:666
-msgid "Port:"
-msgstr "��荐���鐚�"
-
-#: src/protocols/irc/irc.c:3079
-msgid "Encoding:"
-msgstr "膩�⊆鐚�"
-
-#: src/protocols/jabber/jabber.c:992
+#. Account Options
+#: src/protocols/irc/irc.c:3047 src/protocols/jabber/jabber.c:4418
+#: src/protocols/msn/msn.c:1223 src/protocols/napster/napster.c:644
+#: src/protocols/trepia/trepia.c:1377 src/gtkprefs.c:1142
+msgid "Port"
+msgstr "��荐���"
+
+#: src/protocols/irc/irc.c:3051
+msgid "Encoding"
+msgstr "膩�⊆"
+
+#: src/protocols/jabber/jabber.c:977
 msgid "Unable to change password."
 msgstr "�≧��贋�劫�腆若��"
 
-#: src/protocols/jabber/jabber.c:993
+#: src/protocols/jabber/jabber.c:978
 msgid ""
 "The current password you entered is incorrect.  Your password has not been "
 "changed."
 msgstr "����莠後�ョ����絲�腆惹������������絲�腆惹����贋�鴻��"
 
-#: src/protocols/jabber/jabber.c:999
+#: src/protocols/jabber/jabber.c:984
 msgid "Unable to change password"
 msgstr "�≧��贋�劫�腆�"
 
-#: src/protocols/jabber/jabber.c:1000
+#: src/protocols/jabber/jabber.c:985
 msgid ""
 "The new password you entered is the same as your current password.  Your "
 "password remains the same."
 msgstr "����莠後�ョ���医�腆弱����絲�腆惹���罔g������篁ュ�腆惹���茴��壕���"
 
-#: src/protocols/jabber/jabber.c:1177 src/blist.c:721 src/gtkpounce.c:298
+#: src/protocols/jabber/jabber.c:1165 src/blist.c:795 src/gtkaccount.c:148
+#: src/gtkpounce.c:307
 msgid "Unknown"
 msgstr "����"
 
 #. once again, we don't have to put anything here
-#: src/protocols/jabber/jabber.c:1186 src/protocols/jabber/jabber.c:3447
-#: src/protocols/jabber/jabber.c:3498
+#: src/protocols/jabber/jabber.c:1174 src/protocols/jabber/jabber.c:3432
+#: src/protocols/jabber/jabber.c:3483
 msgid "Chatty"
 msgstr "�活��紊�"
 
-#: src/protocols/jabber/jabber.c:1188 src/protocols/jabber/jabber.c:3449
-#: src/protocols/jabber/jabber.c:3506
+#: src/protocols/jabber/jabber.c:1176 src/protocols/jabber/jabber.c:3434
+#: src/protocols/jabber/jabber.c:3491
 msgid "Extended Away"
 msgstr "�傑�����∫��"
 
-#: src/protocols/jabber/jabber.c:1190 src/protocols/jabber/jabber.c:3450
-#: src/protocols/jabber/jabber.c:3510 src/protocols/oscar/oscar.c:2818
-#: src/protocols/oscar/oscar.c:4512 src/protocols/oscar/oscar.c:5725
+#: src/protocols/jabber/jabber.c:1178 src/protocols/jabber/jabber.c:3435
+#: src/protocols/jabber/jabber.c:3495 src/protocols/oscar/oscar.c:2817
+#: src/protocols/oscar/oscar.c:4548 src/protocols/oscar/oscar.c:5839
 msgid "Do Not Disturb"
 msgstr "茫��炊����"
 
-#: src/protocols/jabber/jabber.c:1429
+#: src/protocols/jabber/jabber.c:1417
 #, c-format
 msgid "Jabber Error %s"
 msgstr "Jabber ��� %s"
 
-#: src/protocols/jabber/jabber.c:1536
+#: src/protocols/jabber/jabber.c:1524
 #, c-format
 msgid "Error %s: %s"
 msgstr "��� %s鐚�%s"
 
 # XXX check with Paladin
-#: src/protocols/jabber/jabber.c:1539
+#: src/protocols/jabber/jabber.c:1527
 msgid "Unknown Error in presence"
 msgstr "���ョ���榊憥�����"
 
-#: src/protocols/jabber/jabber.c:1717
+#: src/protocols/jabber/jabber.c:1705
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr "篏睡���� %s �活�絨������ヤ�鐚�絅刻���絅遵�羝���賢��"
 
-#: src/protocols/jabber/jabber.c:1745
+#: src/protocols/jabber/jabber.c:1733
 #, c-format
 msgid ""
 "The Jabber user %s does not exist and was therefore not added to your roster."
 msgstr "Jabber 篏睡���� %s 筝��絖������篁ュ�筝������ュ�井��������賢��"
 
-#: src/protocols/jabber/jabber.c:1748
+#: src/protocols/jabber/jabber.c:1736
 msgid "No such user."
 msgstr "羃�������篏睡������"
 
 #. Should never happen.
-#: src/protocols/jabber/jabber.c:1839 src/protocols/msn/notification.c:87
-#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:620
-#: src/blist.c:439 src/dialogs.c:922
+#: src/protocols/jabber/jabber.c:1827 src/protocols/msn/notification.c:87
+#: src/protocols/msn/notification.c:88 src/protocols/msn/notification.c:644
+#: src/blist.c:503 src/dialogs.c:847
 msgid "Buddies"
 msgstr "絅遵�"
 
-#: src/protocols/jabber/jabber.c:1912
+#: src/protocols/jabber/jabber.c:1900
 msgid "Authenticating"
 msgstr "茯�茘�筝�"
 
-#: src/protocols/jabber/jabber.c:1947
+#: src/protocols/jabber/jabber.c:1934
 msgid "Unknown login error"
 msgstr "���ョ���糸�ラ���"
 
-#: src/protocols/jabber/jabber.c:2297
+#: src/protocols/jabber/jabber.c:2284
 msgid "Password successfully changed."
 msgstr "絲�腆寂信�号������"
 
-#: src/protocols/jabber/jabber.c:2342 src/protocols/jabber/jabber.c:4252
+#: src/protocols/jabber/jabber.c:2329 src/protocols/jabber/jabber.c:4232
 msgid "Connection lost"
 msgstr "紊怨サ�g�"
 
-#: src/protocols/jabber/jabber.c:2350
+#: src/protocols/jabber/jabber.c:2336
 msgid "Connected"
 msgstr "�g�����"
 
-#: src/protocols/jabber/jabber.c:2353
+#: src/protocols/jabber/jabber.c:2339
 msgid "Requesting Authentication Method"
 msgstr "荀�羆�茯�茘����劫�筝�"
 
 #. we have no chats yet
-#: src/protocols/jabber/jabber.c:2373 src/protocols/msn/dispatch.c:164
-#: src/protocols/msn/msn.c:413 src/protocols/napster/napster.c:507
-#: src/protocols/yahoo/yahoo.c:999
+#: src/protocols/jabber/jabber.c:2359 src/protocols/msn/dispatch.c:164
+#: src/protocols/msn/msn.c:416 src/protocols/napster/napster.c:489
+#: src/protocols/trepia/trepia.c:1142 src/protocols/yahoo/yahoo.c:981
 msgid "Connecting"
 msgstr "�g�筝�"
 
-#: src/protocols/jabber/jabber.c:2700
+#: src/protocols/jabber/jabber.c:2685
 #, c-format
 msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
 msgstr "篏睡���� %s ������≧���� Jabber 絽活��鐚���篁ヤ���茴����ュ�医����賢��"
 
-#: src/protocols/jabber/jabber.c:2702
+#: src/protocols/jabber/jabber.c:2687
 msgid "Unable to add buddy."
 msgstr "�≧����ュソ����"
 
-#: src/protocols/jabber/jabber.c:2703
+#: src/protocols/jabber/jabber.c:2688
 msgid "Jabber Error"
 msgstr "Jabber ���"
 
-#: src/protocols/jabber/jabber.c:2962
+#: src/protocols/jabber/jabber.c:2947
 msgid "Room:"
 msgstr "��紊��鐚�"
 
-#: src/protocols/jabber/jabber.c:2973
+#: src/protocols/jabber/jabber.c:2952
+msgid "Server:"
+msgstr "篌堺�����"
+
+#: src/protocols/jabber/jabber.c:2958
 msgid "Handle:"
 msgstr "�援┗鐚�"
 
-#: src/protocols/jabber/jabber.c:3003
+#: src/protocols/jabber/jabber.c:2988
 msgid "Unable to join chat"
 msgstr "�≧����ヨ��紊��"
 
-#: src/protocols/jabber/jabber.c:3239 src/protocols/jabber/jabber.c:3290
-#: src/protocols/jabber/jabber.c:3715
+#: src/protocols/jabber/jabber.c:3224 src/protocols/jabber/jabber.c:3275
+#: src/protocols/jabber/jabber.c:3700
 msgid "Jabber ID"
 msgstr "Jabber 絽活��"
 
-#: src/protocols/jabber/jabber.c:3240
+#: src/protocols/jabber/jabber.c:3225
 msgid "Error"
 msgstr "���"
 
-#: src/protocols/jabber/jabber.c:3291 src/protocols/jabber/jabber.c:3350
-#: src/protocols/jabber/jabber.c:3361 src/protocols/jabber/jabber.c:3741
+#: src/protocols/jabber/jabber.c:3276 src/protocols/jabber/jabber.c:3335
+#: src/protocols/jabber/jabber.c:3346 src/protocols/jabber/jabber.c:3726
 msgid "Status"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:3361 src/protocols/jabber/jabber.c:3383
-#: src/protocols/oscar/oscar.c:5399
+#: src/protocols/jabber/jabber.c:3346 src/protocols/jabber/jabber.c:3368
+#: src/protocols/oscar/oscar.c:5452
 msgid "Not Authorized"
 msgstr "���茘�"
 
-#: src/protocols/jabber/jabber.c:3396
+#: src/protocols/jabber/jabber.c:3381
 msgid "View Error Msg"
 msgstr "茹������荐���"
 
-#: src/protocols/jabber/jabber.c:3408 src/gtkconv.c:800
+#: src/protocols/jabber/jabber.c:3393 src/gtkconv.c:1099
 msgid "Get Away Msg"
 msgstr "��緇��∝�荐���"
 
-#: src/protocols/jabber/jabber.c:3415
+#: src/protocols/jabber/jabber.c:3400
 msgid "Un-hide From"
 msgstr "�乗昆腟�"
 
+#: src/protocols/jabber/jabber.c:3403
+msgid "Temporarily Hide From"
+msgstr "�����沿昆��"
+
+#: src/protocols/jabber/jabber.c:3410
+msgid "Cancel Presence Notification"
+msgstr "��羔��榊憥����"
+
 #: src/protocols/jabber/jabber.c:3418
-msgid "Temporarily Hide From"
-msgstr "�����沿昆��"
-
-#: src/protocols/jabber/jabber.c:3425
-msgid "Cancel Presence Notification"
-msgstr "��羔��榊憥����"
-
-#: src/protocols/jabber/jabber.c:3433
 msgid "Re-request authorization"
 msgstr "���域�羆�茯�茘�"
 
 #. state is one of our own strings. it won't be NULL.
-#: src/protocols/jabber/jabber.c:3446 src/protocols/jabber/jabber.c:3496
-#: src/protocols/oscar/oscar.c:2830 src/protocols/oscar/oscar.c:4507
-#: src/protocols/oscar/oscar.c:5723 src/protocols/yahoo/yahoo.c:1102
-#: src/protocols/zephyr/zephyr.c:865 src/protocols/zephyr/zephyr.c:875
+#: src/protocols/jabber/jabber.c:3431 src/protocols/jabber/jabber.c:3481
+#: src/protocols/oscar/oscar.c:2829 src/protocols/oscar/oscar.c:4543
+#: src/protocols/oscar/oscar.c:5837 src/protocols/yahoo/yahoo.c:1070
+#: src/protocols/zephyr/zephyr.c:866 src/protocols/zephyr/zephyr.c:876
+#: src/gtkaccount.c:1612
 msgid "Online"
 msgstr "筝�膩�"
 
-#: src/protocols/jabber/jabber.c:3636
+#: src/protocols/jabber/jabber.c:3621
 msgid "Full Name"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:3637
+#: src/protocols/jabber/jabber.c:3622
 msgid "Family Name"
 msgstr "紮�"
 
-#: src/protocols/jabber/jabber.c:3638
+#: src/protocols/jabber/jabber.c:3623
 msgid "Given Name"
 msgstr "��"
 
-#: src/protocols/jabber/jabber.c:3639
+#: src/protocols/jabber/jabber.c:3624
 msgid "Nickname"
 msgstr "�援┗"
 
-#: src/protocols/jabber/jabber.c:3640 src/dialogs.c:2925
+#: src/protocols/jabber/jabber.c:3625 src/dialogs.c:2888
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/jabber.c:3641
+#: src/protocols/jabber/jabber.c:3626
 msgid "Street Address"
 msgstr "茵����医��"
 
-#: src/protocols/jabber/jabber.c:3642
+#: src/protocols/jabber/jabber.c:3627
 msgid "Extended Address"
 msgstr "�医��(膾�)"
 
-#: src/protocols/jabber/jabber.c:3643
+#: src/protocols/jabber/jabber.c:3628
 msgid "Locality"
 msgstr "絽��掩��"
 
-#: src/protocols/jabber/jabber.c:3644
+#: src/protocols/jabber/jabber.c:3629
 msgid "Region"
 msgstr "���怨�"
 
-#: src/protocols/jabber/jabber.c:3645
+#: src/protocols/jabber/jabber.c:3630
 msgid "Postal Code"
 msgstr "�級������"
 
-#. Line 7
-#: src/protocols/jabber/jabber.c:3646 src/dialogs.c:2089 src/dialogs.c:2731
+#. Country
+#: src/protocols/jabber/jabber.c:3631 src/protocols/trepia/trepia.c:372
+#: src/dialogs.c:2049 src/dialogs.c:2694
 msgid "Country"
 msgstr "��絎�"
 
-#: src/protocols/jabber/jabber.c:3647
+#: src/protocols/jabber/jabber.c:3632
 msgid "Telephone"
 msgstr "�肢�"
 
-#: src/protocols/jabber/jabber.c:3648 src/dialogs.c:2789
+#: src/protocols/jabber/jabber.c:3633 src/dialogs.c:2752
 msgid "Email"
 msgstr "�糸��灸散"
 
-#: src/protocols/jabber/jabber.c:3649
+#: src/protocols/jabber/jabber.c:3634
 msgid "Organization Name"
 msgstr "��絮��罕�"
 
-#: src/protocols/jabber/jabber.c:3650
+#: src/protocols/jabber/jabber.c:3635
 msgid "Organization Unit"
 msgstr "��絮�����"
 
-#: src/protocols/jabber/jabber.c:3651
+#: src/protocols/jabber/jabber.c:3636
 msgid "Title"
 msgstr "�潔��"
 
-#: src/protocols/jabber/jabber.c:3652
+#: src/protocols/jabber/jabber.c:3637
 msgid "Role"
 msgstr "�決岡"
 
-#: src/protocols/jabber/jabber.c:3653
+#: src/protocols/jabber/jabber.c:3638
 msgid "Birthday"
 msgstr "����"
 
-#: src/protocols/jabber/jabber.c:3654 src/dialogs.c:2935 src/gtkprefs.c:660
-#: src/gtkprefs.c:1768
+#: src/protocols/jabber/jabber.c:3639 src/dialogs.c:2898 src/gtkprefs.c:601
+#: src/gtkprefs.c:1821
 msgid "Description"
 msgstr "�颷�"
 
-#: src/protocols/jabber/jabber.c:3679
+#: src/protocols/jabber/jabber.c:3664
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable"
 msgstr "篁ヤ�������罨�篏��醇���御���х������Ű�莠後�ユ���活叱�ユ���喝゛�ョ��荐����喝�"
 
-#: src/protocols/jabber/jabber.c:3680
+#: src/protocols/jabber/jabber.c:3665
 msgid "User Identity"
 msgstr "鋎睡����茘���"
 
-#: src/protocols/jabber/jabber.c:4106
+#: src/protocols/jabber/jabber.c:4094
 msgid "Gaim - Edit Jabber vCard"
 msgstr "Gaim - 膩�鹿 Jabber vCard"
 
-#: src/protocols/jabber/jabber.c:4181
+#: src/protocols/jabber/jabber.c:4169
 msgid "Server Registration successful!"
 msgstr "篌堺����┿������鐚�"
 
-#: src/protocols/jabber/jabber.c:4208
+#: src/protocols/jabber/jabber.c:4190
 msgid "Unknown registration error"
 msgstr "���ョ��荐糸�����"
 
-#: src/protocols/jabber/jabber.c:4323 src/protocols/oscar/oscar.c:5918
-#: src/protocols/toc/toc.c:1441 src/dialogs.c:2264
+#: src/protocols/jabber/jabber.c:4301 src/protocols/oscar/oscar.c:6093
+#: src/protocols/toc/toc.c:1461 src/dialogs.c:2224
 msgid "Set User Info"
 msgstr "荐㊤�篏睡����莖�荐�"
 
@@ -1636,18 +1704,42 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:4412 src/protocols/jabber/jabber.c:4414
+#: src/protocols/jabber/jabber.c:4390 src/protocols/jabber/jabber.c:4392
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber ��絎�罔∞�"
 
 # XXX
-#: src/protocols/jabber/jabber.c:4440
-msgid "Resource:"
-msgstr "莖�羣�鐚�"
-
-#: src/protocols/jabber/jabber.c:4451
-msgid "Connect Server:"
-msgstr "�g�篌堺�����"
+#: src/protocols/jabber/jabber.c:4414
+msgid "Resource"
+msgstr "莖�羣�"
+
+#: src/protocols/jabber/jabber.c:4422
+msgid "Connect server"
+msgstr "�g�篌堺����"
+
+#: src/protocols/msn/buddyicon.c:172 src/protocols/msn/buddyicon.c:282
+#: src/protocols/msn/buddyicon.c:330 src/protocols/msn/buddyicon.c:435
+#: src/protocols/msn/buddyicon.c:521 src/protocols/msn/msn.c:72
+#: src/protocols/msn/msn.c:91 src/protocols/msn/msn.c:149
+#: src/protocols/msn/msn.c:471 src/protocols/msn/msn.c:582
+#: src/protocols/msn/msn.c:598 src/protocols/msn/msn.c:633
+#: src/protocols/msn/msn.c:649 src/protocols/msn/msn.c:681
+#: src/protocols/msn/msn.c:689 src/protocols/msn/msn.c:722
+#: src/protocols/msn/msn.c:730 src/protocols/msn/msn.c:744
+#: src/protocols/msn/msn.c:753 src/protocols/msn/msn.c:767
+#: src/protocols/msn/msn.c:776 src/protocols/msn/msn.c:798
+#: src/protocols/msn/msn.c:848 src/protocols/msn/msn.c:886
+#: src/protocols/msn/msn.c:981 src/protocols/msn/msn.c:1005
+#: src/protocols/msn/msn.c:1025 src/protocols/msn/msn.c:1036
+#: src/protocols/msn/msn.c:1047 src/protocols/msn/msn.c:1071
+#: src/protocols/msn/msn.c:1083 src/protocols/msn/notification.c:127
+#: src/protocols/msn/notification.c:156 src/protocols/msn/notification.c:949
+#: src/protocols/msn/notification.c:969 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:782 src/protocols/trepia/trepia.c:1065
+#: src/protocols/trepia/trepia.c:1109 src/protocols/trepia/trepia.c:1208
+#: src/protocols/trepia/trepia.c:1264
+msgid "Write error"
+msgstr "絲��ラ���"
 
 #: src/protocols/msn/dispatch.c:45 src/protocols/msn/notification.c:229
 msgid "Protocol not supported"
@@ -1681,16 +1773,16 @@
 msgid "Unable to parse message."
 msgstr "�≧�茹f��荐�����"
 
-#: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:405
-#: src/protocols/msn/notification.c:1342
+#: src/protocols/msn/dispatch.c:171 src/protocols/msn/notification.c:407
+#: src/protocols/msn/notification.c:1385
 msgid "Unable to write to server"
 msgstr "�≧�絲��ュ�遺失����"
 
-#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1349
+#: src/protocols/msn/dispatch.c:175 src/protocols/msn/notification.c:1392
 msgid "Syncing with server"
 msgstr "罩e����篌堺������罩ヤ賢"
 
-#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1363
+#: src/protocols/msn/dispatch.c:189 src/protocols/msn/notification.c:1406
 msgid "Error reading from server"
 msgstr "�延失����������主�����"
 
@@ -1706,7 +1798,7 @@
 
 #: src/protocols/msn/error.c:40
 msgid "Invalid User"
-msgstr "�≧����篏睡����"
+msgstr "篏睡�����≧��"
 
 #: src/protocols/msn/error.c:44
 msgid "Fully Qualified Domain Name missing"
@@ -1719,11 +1811,11 @@
 
 #: src/protocols/msn/error.c:50
 msgid "Invalid Username"
-msgstr "�≧����篏睡������腮�"
+msgstr "篏睡������腮援�≧��"
 
 #: src/protocols/msn/error.c:53
 msgid "Invalid Friendly Name"
-msgstr "�≧�����援┗"
+msgstr "�援┗�≧��"
 
 #: src/protocols/msn/error.c:56
 msgid "List Full"
@@ -1765,7 +1857,7 @@
 msgid "Required fields missing"
 msgstr "�鞘��井����荀���罨�篏�"
 
-#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:194
+#: src/protocols/msn/error.c:89 src/protocols/oscar/oscar.c:176
 msgid "Not logged in"
 msgstr "絨����糸��"
 
@@ -1839,7 +1931,7 @@
 
 #: src/protocols/msn/error.c:148
 msgid "Bad friend file"
-msgstr "�≧����絅遵�罟�罅�"
+msgstr "絅遵�罟�罅��≧��"
 
 #: src/protocols/msn/error.c:152
 msgid "Authentication failed"
@@ -1862,53 +1954,38 @@
 msgid "Unknown Error Code %d"
 msgstr "���ョ�����篁g⊆ %d"
 
-#: src/protocols/msn/msn.c:57
+#: src/protocols/msn/msn.c:60
 msgid "Your new MSN friendly name is too long."
 msgstr "������ MSN �援┗紊��激��"
 
-#: src/protocols/msn/msn.c:69 src/protocols/msn/msn.c:88
-#: src/protocols/msn/msn.c:146 src/protocols/msn/msn.c:468
-#: src/protocols/msn/msn.c:579 src/protocols/msn/msn.c:595
-#: src/protocols/msn/msn.c:630 src/protocols/msn/msn.c:646
-#: src/protocols/msn/msn.c:678 src/protocols/msn/msn.c:686
-#: src/protocols/msn/msn.c:719 src/protocols/msn/msn.c:727
-#: src/protocols/msn/msn.c:741 src/protocols/msn/msn.c:750
-#: src/protocols/msn/msn.c:764 src/protocols/msn/msn.c:773
-#: src/protocols/msn/msn.c:795 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:883 src/protocols/msn/msn.c:976
-#: src/protocols/msn/msn.c:1000 src/protocols/msn/msn.c:1020
-#: src/protocols/msn/msn.c:1031 src/protocols/msn/msn.c:1042
-#: src/protocols/msn/msn.c:1066 src/protocols/msn/msn.c:1078
-#: src/protocols/msn/notification.c:127 src/protocols/msn/notification.c:156
-#: src/protocols/msn/notification.c:907 src/protocols/msn/notification.c:927
-msgid "Write error"
-msgstr "絲��ラ���"
-
-#: src/protocols/msn/msn.c:163
+#: src/protocols/msn/msn.c:166
 msgid "Set your friendly name."
 msgstr "荐㊤������援┗��"
 
-#: src/protocols/msn/msn.c:164
+# NOTE MSN���援┗筝���Yahoo鐚�篏睡������札莠後�ヤ算篏����井�援┗鐚�
+# NOTE �割戎��篏睡������絽活��罸��♂��篆�鐚�篌寂�箙���������
+# XXX ����箴��������菴医��篋�絲�����篏睡�����弱�榊��茫�羆��怨�馹�
+#: src/protocols/msn/msn.c:167
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "���� MSN ���援┗絨���絋�罩ら¨腓冴��"
-
-#: src/protocols/msn/msn.c:176
+msgstr "�ヤ査�� MSN �ラ�掩������篋肴�����蕁�ず�����援┗��"
+
+#: src/protocols/msn/msn.c:179
 msgid "Set your home phone number."
 msgstr "荐㊤�����篏鎘狗�肢���腆若��"
 
-#: src/protocols/msn/msn.c:187
+#: src/protocols/msn/msn.c:190
 msgid "Set your work phone number."
 msgstr "荐㊤�����莨�����肢���腆若��"
 
-#: src/protocols/msn/msn.c:198
+#: src/protocols/msn/msn.c:201
 msgid "Set your mobile phone number."
 msgstr "荐㊤�����茵����肢���腆若��"
 
-#: src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:210
 msgid "Allow MSN Mobile pages?"
 msgstr "��荐� MSN �喝�種�"
 
-#: src/protocols/msn/msn.c:208
+#: src/protocols/msn/msn.c:211
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -1916,95 +1993,95 @@
 "��������荐怨����ソ��羝���賢��絅遵��渇�� Mobile Page �井����茵����肢�鐚������銀���茵���"
 "茖�臀�����"
 
-#: src/protocols/msn/msn.c:212
+#: src/protocols/msn/msn.c:215
 msgid "Allow"
 msgstr "��荐�"
 
-#: src/protocols/msn/msn.c:213
+#: src/protocols/msn/msn.c:216
 msgid "Disallow"
 msgstr "筝���荐�"
 
-#: src/protocols/msn/msn.c:230
+#: src/protocols/msn/msn.c:233
 msgid "Send a mobile message."
 msgstr "���肴���荐�����"
 
-#: src/protocols/msn/msn.c:232
+#: src/protocols/msn/msn.c:235
 msgid "Page"
 msgstr "�喝��"
 
-#: src/protocols/msn/msn.c:233 src/about.c:169 src/dialogs.c:4256
-#: src/prpl.c:517 src/server.c:1464
+#: src/protocols/msn/msn.c:236 src/about.c:151 src/dialogs.c:4223
+#: src/gtkrequest.c:171 src/server.c:1463
 msgid "Close"
 msgstr "����"
 
-#: src/protocols/msn/msn.c:296 src/protocols/yahoo/yahoo.c:1153
+#: src/protocols/msn/msn.c:299 src/protocols/yahoo/yahoo.c:1121
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>����鐚�</b>%s"
 
-#: src/protocols/msn/msn.c:309 src/protocols/msn/msn.c:555
+#: src/protocols/msn/msn.c:312 src/protocols/msn/msn.c:558
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "筝����肢����"
 
-#: src/protocols/msn/msn.c:310 src/protocols/msn/msn.c:557
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1080
-#: src/protocols/yahoo/yahoo.c:1287 src/protocols/yahoo/yahoo.c:1363
+#: src/protocols/msn/msn.c:313 src/protocols/msn/msn.c:560
+#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:1048
+#: src/protocols/yahoo/yahoo.c:1256 src/protocols/yahoo/yahoo.c:1332
 msgid "Be Right Back"
 msgstr "薤����箴�"
 
-#: src/protocols/msn/msn.c:311 src/protocols/msn/msn.c:559
-#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1082
-#: src/protocols/yahoo/yahoo.c:1289 src/protocols/yahoo/yahoo.c:1364
+#: src/protocols/msn/msn.c:314 src/protocols/msn/msn.c:562
+#: src/protocols/msn/state.c:29 src/protocols/yahoo/yahoo.c:1050
+#: src/protocols/yahoo/yahoo.c:1258 src/protocols/yahoo/yahoo.c:1333
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: src/protocols/msn/msn.c:312 src/protocols/msn/msn.c:561
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1090
-#: src/protocols/yahoo/yahoo.c:1297 src/protocols/yahoo/yahoo.c:1368
+#: src/protocols/msn/msn.c:315 src/protocols/msn/msn.c:564
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:1058
+#: src/protocols/yahoo/yahoo.c:1266 src/protocols/yahoo/yahoo.c:1337
 msgid "On The Phone"
 msgstr "�肢�筝�"
 
-#: src/protocols/msn/msn.c:313 src/protocols/msn/msn.c:563
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1094
-#: src/protocols/yahoo/yahoo.c:1301 src/protocols/yahoo/yahoo.c:1370
+#: src/protocols/msn/msn.c:316 src/protocols/msn/msn.c:566
+#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:1062
+#: src/protocols/yahoo/yahoo.c:1270 src/protocols/yahoo/yahoo.c:1339
 msgid "Out To Lunch"
 msgstr "紊��榊���"
 
-#: src/protocols/msn/msn.c:314 src/protocols/msn/msn.c:565
-#: src/protocols/zephyr/zephyr.c:862 src/protocols/zephyr/zephyr.c:877
+#: src/protocols/msn/msn.c:317 src/protocols/msn/msn.c:568
+#: src/protocols/zephyr/zephyr.c:863 src/protocols/zephyr/zephyr.c:878
 msgid "Hidden"
 msgstr "�沿��"
 
-#: src/protocols/msn/msn.c:326
+#: src/protocols/msn/msn.c:329
 msgid "Set Friendly Name"
 msgstr "荐㊤��援┗"
 
-#: src/protocols/msn/msn.c:334
+#: src/protocols/msn/msn.c:337
 msgid "Set Home Phone Number"
 msgstr "荐㊤�篏鎘狗�肢���腆�"
 
-#: src/protocols/msn/msn.c:340
+#: src/protocols/msn/msn.c:343
 msgid "Set Work Phone Number"
 msgstr "荐㊤�綏ヤ��肢���腆�"
 
-#: src/protocols/msn/msn.c:346
+#: src/protocols/msn/msn.c:349
 msgid "Set Mobile Phone Number"
 msgstr "荐㊤�茵����肢���腆�"
 
-#: src/protocols/msn/msn.c:355
+#: src/protocols/msn/msn.c:358
 msgid "Enable/Disable Mobile Devices"
 msgstr "���� / ����茵���茖�臀�"
 
-#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:365
 msgid "Allow/Disallow Mobile Pages"
 msgstr "��荐� / 筝���荐� Mobile Page"
 
-#: src/protocols/msn/msn.c:384
+#: src/protocols/msn/msn.c:387
 msgid "Send to Mobile"
 msgstr "�渇���活����肢�"
 
-#: src/protocols/msn/msn.c:659
+#: src/protocols/msn/msn.c:662
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2013,11 +2090,11 @@
 "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com����"
 "��絨�筝���莅��贋������荐掩�����"
 
-#: src/protocols/msn/msn.c:663 src/protocols/msn/msn.c:703
+#: src/protocols/msn/msn.c:666 src/protocols/msn/msn.c:706
 msgid "Invalid MSN screenname"
 msgstr "�≧���� MSN 篏睡����絽活��"
 
-#: src/protocols/msn/msn.c:699
+#: src/protocols/msn/msn.c:702
 #, c-format
 msgid ""
 "An MSN screenname must be in the form \"user@server.com\". Perhaps you meant "
@@ -2036,13 +2113,13 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1194 src/protocols/msn/msn.c:1196
+#: src/protocols/msn/msn.c:1199 src/protocols/msn/msn.c:1201
 msgid "MSN Protocol Plugin"
 msgstr "MSN ��絎�罔∞�"
 
-#: src/protocols/msn/msn.c:1214
-msgid "Login Server:"
-msgstr "�糸�ヤ失�����"
+#: src/protocols/msn/msn.c:1218 src/protocols/trepia/trepia.c:1372
+msgid "Login server"
+msgstr "�糸�ヤ失����"
 
 #: src/protocols/msn/notification.c:235
 msgid "Unable to request INF"
@@ -2052,7 +2129,7 @@
 msgid "Unable to send USR"
 msgstr "�≧����� USR"
 
-#: src/protocols/msn/notification.c:297
+#: src/protocols/msn/notification.c:297 src/protocols/trepia/trepia.c:719
 msgid "Retrieving buddy list"
 msgstr "莅���絅遵�羝���賢"
 
@@ -2072,25 +2149,25 @@
 msgid "You have been disconnected. The MSN servers are going down temporarily."
 msgstr "��群筝㊥�潔�g�鐚�MSN 篌堺���������������"
 
-#: src/protocols/msn/notification.c:457
+#: src/protocols/msn/notification.c:462
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "篏睡���� %s鐚�%s鐚��活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝�����"
 
-#: src/protocols/msn/notification.c:715
+#: src/protocols/msn/notification.c:741
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
-msgstr "篏睡���� %s鐚�%s鐚��活�絨������ヤ�����絅遵�羝���"
-
-#: src/protocols/msn/notification.c:1126
+msgstr "篏睡���� %s鐚�%s鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���"
+
+#: src/protocols/msn/notification.c:1168
 msgid "Got invalid XFR"
 msgstr "��緇��≧���� XFR"
 
-#: src/protocols/msn/notification.c:1168
+#: src/protocols/msn/notification.c:1210
 msgid "Unable to transfer to notification server"
 msgstr "�≧��渇���渇���ヤ失����"
 
-#: src/protocols/msn/notification.c:1304
+#: src/protocols/msn/notification.c:1346
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute(s). You will "
@@ -2105,67 +2182,67 @@
 "\n"
 "�句境茘桁轡篏�腟���鐚������札��綺��糸�ヤ失������"
 
-#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1100
-#: src/gtkpounce.c:570 src/gtkprefs.c:1463
+#: src/protocols/msn/state.c:30 src/protocols/yahoo/yahoo.c:1068
+#: src/gtkpounce.c:464 src/gtkprefs.c:1513
 msgid "Idle"
 msgstr "��臀�"
 
-#: src/protocols/msn/switchboard.c:122
+#: src/protocols/msn/switchboard.c:121
 msgid "The conversation has become inactive and timed out."
 msgstr "������篋よ���臀�お箙�鐚�筝��綏牙��丈����"
 
-#: src/protocols/msn/switchboard.c:126
+#: src/protocols/msn/switchboard.c:128
 #, c-format
 msgid "%s has closed the conversation window."
 msgstr "%s ����篋�篋よ�荀�腦���"
 
-#: src/protocols/msn/switchboard.c:230
+#: src/protocols/msn/switchboard.c:250
 msgid "An MSN message may not have been received."
 msgstr "���� MSN 荐�����醇�茴��九�違��"
 
-#: src/protocols/napster/napster.c:249
+#: src/protocols/napster/napster.c:232
 msgid "Unable to read header from server"
 msgstr "�≧��延失�������罔��㊧�荐�"
 
-#: src/protocols/napster/napster.c:326
+#: src/protocols/napster/napster.c:307
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "篏睡����鐚�%s鐚�罟�罅�鐚�%s鐚�紊у�鐚�%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:337
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "�≧�絨���%s�����ユ���� Napster �演��羝���賢"
 
-#: src/protocols/napster/napster.c:345
+#: src/protocols/napster/napster.c:326
 msgid "You were disconnected from the server."
 msgstr "��群膓���罩∵��篌堺�������g���"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:401
+#: src/protocols/napster/napster.c:382
 #, c-format
 msgid "%s requested your information"
 msgstr "%s �ヨ�����篏睡����莖�荐�"
 
-#: src/protocols/napster/napster.c:431
+#: src/protocols/napster/napster.c:412
 msgid ""
 "You were disconnected from the server, because you logged on from a "
 "different location"
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ャ��"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:437
+#: src/protocols/napster/napster.c:418
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 荀�羆�筝��� PING"
 
-#: src/protocols/napster/napster.c:551 src/gtkblist.c:1524
+#: src/protocols/napster/napster.c:531 src/gtkblist.c:1572
 msgid "Get Info"
 msgstr "��緇�莖�荐�"
 
-#: src/protocols/napster/napster.c:565 src/protocols/oscar/oscar.c:5122
-#: src/protocols/toc/toc.c:1195
+#: src/protocols/napster/napster.c:545 src/protocols/oscar/oscar.c:5165
+#: src/protocols/toc/toc.c:1200
 msgid "Join what group:"
 msgstr "���ュ����臂ょ�鐚�"
 
@@ -2179,185 +2256,185 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:641 src/protocols/napster/napster.c:643
+#: src/protocols/napster/napster.c:621 src/protocols/napster/napster.c:623
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER ��絎�罔∞�"
 
 # NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
-#: src/protocols/oscar/oscar.c:190
+#: src/protocols/oscar/oscar.c:172
 msgid "Invalid error"
 msgstr "�≧�����"
 
-#: src/protocols/oscar/oscar.c:191
+#: src/protocols/oscar/oscar.c:173
 msgid "Invalid SNAC"
 msgstr "�≧���� SNAC"
 
-#: src/protocols/oscar/oscar.c:192
+#: src/protocols/oscar/oscar.c:174
 msgid "Rate to host"
 msgstr "�遺失��������"
 
-#: src/protocols/oscar/oscar.c:193
+#: src/protocols/oscar/oscar.c:175
 msgid "Rate to client"
 msgstr "�医��句�����"
 
-#: src/protocols/oscar/oscar.c:195
+#: src/protocols/oscar/oscar.c:177
 msgid "Service unavailable"
 msgstr "篌堺�����絖���"
 
-#: src/protocols/oscar/oscar.c:196
+#: src/protocols/oscar/oscar.c:178
 msgid "Service not defined"
 msgstr "羃�����絎�����"
 
-#: src/protocols/oscar/oscar.c:197
+#: src/protocols/oscar/oscar.c:179
 msgid "Obsolete SNAC"
 msgstr "������ SNAC"
 
-#: src/protocols/oscar/oscar.c:198
+#: src/protocols/oscar/oscar.c:180
 msgid "Not supported by host"
 msgstr "篌堺��������"
 
-#: src/protocols/oscar/oscar.c:199
+#: src/protocols/oscar/oscar.c:181
 msgid "Not supported by client"
 msgstr "鎘∽�句�筝����"
 
-#: src/protocols/oscar/oscar.c:200
+#: src/protocols/oscar/oscar.c:182
 msgid "Refused by client"
 msgstr "頮���句���腟�"
 
-#: src/protocols/oscar/oscar.c:201
+#: src/protocols/oscar/oscar.c:183
 msgid "Reply too big"
 msgstr "��荀�紊�ぇ篋�"
 
-#: src/protocols/oscar/oscar.c:202
+#: src/protocols/oscar/oscar.c:184
 msgid "Responses lost"
 msgstr "�阪け����"
 
-#: src/protocols/oscar/oscar.c:203
+#: src/protocols/oscar/oscar.c:185
 msgid "Request denied"
 msgstr "荀�羆�茴���"
 
-#: src/protocols/oscar/oscar.c:204
+#: src/protocols/oscar/oscar.c:186
+#, fuzzy
 msgid "Busted SNAC payload"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:205
+msgstr "��紕�篋��� SNAC 莢�莠�"
+
+#: src/protocols/oscar/oscar.c:187
 msgid "Insufficient rights"
 msgstr "罨���筝�紊�"
 
-# XXX "local"��⑮�����違����
-# ANS ��絽御����頑⑮��鐚�筝���⑮�冴�����違�����札��
-#: src/protocols/oscar/oscar.c:206
+# NOTE Debian 茘���local���冴�����亥���
+#: src/protocols/oscar/oscar.c:188
 msgid "In local permit/deny"
-msgstr "�����亥����荐奄�掩��腟�羝���"
-
-#: src/protocols/oscar/oscar.c:207
+msgstr "���亥�����荐奄�掩��腟�羝���"
+
+#: src/protocols/oscar/oscar.c:189
 msgid "Too evil (sender)"
 msgstr "紊����>�鐚�絲�篁銀査鐚�"
 
-#: src/protocols/oscar/oscar.c:208
+#: src/protocols/oscar/oscar.c:190
 msgid "Too evil (receiver)"
 msgstr "紊����>�鐚��銀散篋削�"
 
-#: src/protocols/oscar/oscar.c:209
+#: src/protocols/oscar/oscar.c:191
 msgid "User temporarily unavailable"
 msgstr "篏睡��������筝���"
 
-#: src/protocols/oscar/oscar.c:210
+#: src/protocols/oscar/oscar.c:192
 msgid "No match"
 msgstr "羃����悟�����"
 
-#: src/protocols/oscar/oscar.c:211
+#: src/protocols/oscar/oscar.c:193
 msgid "List overflow"
 msgstr "羝���頃��"
 
-#: src/protocols/oscar/oscar.c:212
+#: src/protocols/oscar/oscar.c:194
 msgid "Request ambiguous"
 msgstr "荀�羆�筝���∈"
 
-#: src/protocols/oscar/oscar.c:213
+#: src/protocols/oscar/oscar.c:195
 msgid "Queue full"
 msgstr "篏���羯推�"
 
-#: src/protocols/oscar/oscar.c:214
+#: src/protocols/oscar/oscar.c:196
 msgid "Not while on AOL"
 msgstr "�� AOL ��筝���荐�"
 
-#: src/protocols/oscar/oscar.c:485
+#: src/protocols/oscar/oscar.c:468
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "�� %s ���恰��荐�������"
 
-#: src/protocols/oscar/oscar.c:487
+#: src/protocols/oscar/oscar.c:470
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "�� %s ���恰��荐���け��"
 
-#: src/protocols/oscar/oscar.c:543 src/protocols/toc/toc.c:602
-#: src/protocols/toc/toc.c:615 src/protocols/toc/toc.c:678
+#: src/protocols/oscar/oscar.c:528 src/protocols/toc/toc.c:607
+#: src/protocols/toc/toc.c:622 src/protocols/toc/toc.c:685
 msgid "Disconnected."
 msgstr "��罩∫�g���"
 
-#: src/protocols/oscar/oscar.c:556 src/protocols/toc/toc.c:855
+#: src/protocols/oscar/oscar.c:540 src/protocols/toc/toc.c:861
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
 
 # XXX TODO �у��∝���域⑮羈�罸�莠������緒�篏�Paladin������茘��篋���羃����順��鐚���絅処�醇�ヨ�筝�筝�
 # ANS ��罧笈⑮�����醇�莠�罩g∈鐚���荅���戎�� ICQ ���ヨ��紊��鐚����榊憥��罧笈�����
-#: src/protocols/oscar/oscar.c:572
+#: src/protocols/oscar/oscar.c:556
 msgid "Chat is currently unavailable"
 msgstr "�����≧�篏睡����紊��"
 
-#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:708
+#: src/protocols/oscar/oscar.c:630 src/protocols/oscar/oscar.c:687
 msgid "Couldn't connect to host"
 msgstr "�≧��e�遺失����"
 
-#: src/protocols/oscar/oscar.c:690
+#: src/protocols/oscar/oscar.c:672
 msgid "Unable to login to AIM"
 msgstr "�≧��糸�ュ�� AIM"
 
-#: src/protocols/oscar/oscar.c:801 src/protocols/oscar/oscar.c:1187
+#: src/protocols/oscar/oscar.c:781 src/protocols/oscar/oscar.c:1167
 msgid "Could Not Connect"
 msgstr "�≧��g�"
 
-#: src/protocols/oscar/oscar.c:808
+#: src/protocols/oscar/oscar.c:788
 msgid "Connection established, cookie sent"
 msgstr "�g�綏峨産腴�鐚�筝�群���� Cookie"
 
-#: src/protocols/oscar/oscar.c:875 src/protocols/oscar/oscar.c:887
-#: src/protocols/oscar/oscar.c:892
+#: src/protocols/oscar/oscar.c:855 src/protocols/oscar/oscar.c:868
+#: src/protocols/oscar/oscar.c:873
 msgid "File Transfer Aborted"
 msgstr "��羔�罟�罅��活叱"
 
-#: src/protocols/oscar/oscar.c:876
+#: src/protocols/oscar/oscar.c:856
 msgid "Unable to establish listener socket."
 msgstr "�≧�綮榊��h�遵�� Socket��"
 
-#: src/protocols/oscar/oscar.c:888
+#: src/protocols/oscar/oscar.c:869
 msgid "Unable to establish file descriptor."
 msgstr "�≧�綮榊�罟�罅�篁�膣鴻��"
 
-#: src/protocols/oscar/oscar.c:893
+#: src/protocols/oscar/oscar.c:874
 msgid "Unable to create new connection."
 msgstr "�≧������育�g���"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:1077 src/protocols/toc/toc.c:551
+#: src/protocols/oscar/oscar.c:1056 src/protocols/toc/toc.c:554
 msgid "Incorrect nickname or password."
 msgstr "������援┗��絲�腆�"
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:1081
+#: src/protocols/oscar/oscar.c:1060
 msgid "Your account is currently suspended."
 msgstr "����絽活����������賢��"
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:1085
+#: src/protocols/oscar/oscar.c:1064
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL �恰��荐�����������筝�絖�����"
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:1089
+#: src/protocols/oscar/oscar.c:1068
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
@@ -2366,21 +2443,21 @@
 "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
 #. client too old
-#: src/protocols/oscar/oscar.c:1093
+#: src/protocols/oscar/oscar.c:1072
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "����篏睡����絎∽�句�腮�綣鎀���������茫��� %s �贋��"
 
-#: src/protocols/oscar/oscar.c:1097 src/protocols/toc/toc.c:633
+#: src/protocols/oscar/oscar.c:1076 src/protocols/toc/toc.c:639
 msgid "Authentication Failed"
 msgstr "茯�茘�紊掩��"
 
-#: src/protocols/oscar/oscar.c:1125
+#: src/protocols/oscar/oscar.c:1104
 msgid "Internal Error"
 msgstr "�ч�����"
 
-#: src/protocols/oscar/oscar.c:1226 src/protocols/oscar/oscar.c:1256
-#: src/protocols/oscar/oscar.c:1344
+#: src/protocols/oscar/oscar.c:1206 src/protocols/oscar/oscar.c:1236
+#: src/protocols/oscar/oscar.c:1324
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -2389,29 +2466,29 @@
 "����醇���㊥����筝㊥�潔�g�������醇���喝�������馹�茴�信罩e�篏睡�� TOC��茫��� %s ������"
 "羃����贋�違��"
 
-#: src/protocols/oscar/oscar.c:1229 src/protocols/oscar/oscar.c:1259
+#: src/protocols/oscar/oscar.c:1209 src/protocols/oscar/oscar.c:1239
 msgid "Gaim was Unable to get a valid AIM login hash."
 msgstr "Gaim �≧���緇������� AIM �糸�ョ⊆��"
 
-#: src/protocols/oscar/oscar.c:1347
+#: src/protocols/oscar/oscar.c:1327
 msgid "Gaim was Unable to get a valid login hash."
 msgstr "Gaim �≧���緇��������糸�ユ�罨�腆若��"
 
-#: src/protocols/oscar/oscar.c:1901 src/protocols/oscar/oscar.c:5440
+#: src/protocols/oscar/oscar.c:1896 src/protocols/oscar/oscar.c:5553
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "�� %s ���恰��荐���群膓�茴�産腴�"
 
-#: src/protocols/oscar/oscar.c:2228 src/protocols/oscar/oscar.c:2250
+#: src/protocols/oscar/oscar.c:2225 src/protocols/oscar/oscar.c:2247
 msgid "(There was an error receiving this message)"
 msgstr "鐚��九�����荐������主�����鐚�"
 
-#: src/protocols/oscar/oscar.c:2395
+#: src/protocols/oscar/oscar.c:2393
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ����荀�羆��贋・�g��� %s"
 
-#: src/protocols/oscar/oscar.c:2398
+#: src/protocols/oscar/oscar.c:2396
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -2420,42 +2497,42 @@
 "����荀�羆�絨����������肢����綮榊�莎欠�贋・�g�鐚����������渇���恰��荐���襲�����鏆�������"
 "��罔e������我���� IP 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
 
-#: src/protocols/oscar/oscar.c:2430
+#: src/protocols/oscar/oscar.c:2428
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨������ユ����絅遵�羝���賢��"
 
-#: src/protocols/oscar/oscar.c:2438
+#: src/protocols/oscar/oscar.c:2436
 msgid "Authorization Request Message:"
 msgstr "茯�茘�荀�羆�荐����"
 
-#: src/protocols/oscar/oscar.c:2439
+#: src/protocols/oscar/oscar.c:2437
 msgid "Please authorize me!"
 msgstr "茫���������茯�茘�鐚�"
 
-#: src/protocols/oscar/oscar.c:2467
+#: src/protocols/oscar/oscar.c:2465
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr "篏睡���� %s 荀�羆������ュソ��羝���������緇�篁���茯�茘���������堺����茯�茘�荀�羆����"
 
-#: src/protocols/oscar/oscar.c:2472 src/protocols/oscar/oscar.c:2474
+#: src/protocols/oscar/oscar.c:2470 src/protocols/oscar/oscar.c:2472
 msgid "Request Authorization"
 msgstr "荀�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:2510 src/protocols/oscar/oscar.c:2512
-#: src/protocols/oscar/oscar.c:2519 src/protocols/oscar/oscar.c:2590
-#: src/protocols/oscar/oscar.c:2610 src/protocols/oscar/oscar.c:2985
-#: src/protocols/oscar/oscar.c:3037 src/protocols/oscar/oscar.c:5043
-#: src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:2508 src/protocols/oscar/oscar.c:2510
+#: src/protocols/oscar/oscar.c:2517 src/protocols/oscar/oscar.c:2589
+#: src/protocols/oscar/oscar.c:2609 src/protocols/oscar/oscar.c:2984
+#: src/protocols/oscar/oscar.c:3036 src/protocols/oscar/oscar.c:5086
+#: src/protocols/oscar/oscar.c:5132
 msgid "No reason given."
 msgstr "羃���腟��������"
 
-#: src/protocols/oscar/oscar.c:2518
+#: src/protocols/oscar/oscar.c:2516
 msgid "Authorization Denied Message:"
 msgstr "��腟�茯�茘�荐����"
 
-#: src/protocols/oscar/oscar.c:2590
+#: src/protocols/oscar/oscar.c:2589
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
@@ -2464,11 +2541,11 @@
 "篏睡���� %u ���坂�������鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���賢鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2598 src/protocols/oscar/oscar.c:5049
+#: src/protocols/oscar/oscar.c:2597 src/protocols/oscar/oscar.c:5092
 msgid "Authorization Request"
 msgstr "茯�茘�荀�羆�"
 
-#: src/protocols/oscar/oscar.c:2610
+#: src/protocols/oscar/oscar.c:2609
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your contact list for the "
@@ -2478,17 +2555,17 @@
 "篏睡���� %u ���坂�������鐚���腟�篋�����九���ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2611
+#: src/protocols/oscar/oscar.c:2610
 msgid "ICQ authorization denied."
 msgstr "ICQ 茯�茘���腟���"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:2618
+#: src/protocols/oscar/oscar.c:2617
 #, c-format
 msgid "The user %u has granted your request to add them to your contact list."
 msgstr "篏睡���� %u ���鋋�����九���ュソ��羝�����荀�羆���"
 
-#: src/protocols/oscar/oscar.c:2626
+#: src/protocols/oscar/oscar.c:2625
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -2501,7 +2578,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2634
+#: src/protocols/oscar/oscar.c:2633
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -2514,7 +2591,7 @@
 "箴����%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2642
+#: src/protocols/oscar/oscar.c:2641
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -2528,34 +2605,34 @@
 "%s"
 
 # XXX ��荅我�� contact 箙�腟延�茘��冴��絅遵������
-#: src/protocols/oscar/oscar.c:2663
+#: src/protocols/oscar/oscar.c:2662
 #, c-format
 msgid "ICQ user %u has sent you a contact: %s (%s)"
 msgstr "ICQ 篏睡���� %u ��箴�筝�����機篋削�%s (%s)"
 
-#: src/protocols/oscar/oscar.c:2669
+#: src/protocols/oscar/oscar.c:2668
 msgid "Do you want to add this contact to your Buddy List?"
 msgstr "���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
 
-#: src/protocols/oscar/oscar.c:2673
+#: src/protocols/oscar/oscar.c:2672
 msgid "Decline"
 msgstr "紿���"
 
-#: src/protocols/oscar/oscar.c:2755
+#: src/protocols/oscar/oscar.c:2754
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪����≧������"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����醇���≧������"
 
-#: src/protocols/oscar/oscar.c:2764
+#: src/protocols/oscar/oscar.c:2763
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪�紊�ぇ篋���"
 msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����遵お紊т���"
 
-#: src/protocols/oscar/oscar.c:2773
+#: src/protocols/oscar/oscar.c:2772
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -2563,142 +2640,143 @@
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪��渇������綺�お綽���"
 
-#: src/protocols/oscar/oscar.c:2782
+#: src/protocols/oscar/oscar.c:2781
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������坂� / 絅劫お���>���"
 
-#: src/protocols/oscar/oscar.c:2791
+#: src/protocols/oscar/oscar.c:2790
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���>���"
 
-#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:2799
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "�����坂���������阪け篋� %hu ���� %s ��箴���荐�����"
 
-#: src/protocols/oscar/oscar.c:2816 src/protocols/oscar/oscar.c:4521
-#: src/protocols/oscar/oscar.c:5728
+#: src/protocols/oscar/oscar.c:2815 src/protocols/oscar/oscar.c:4557
+#: src/protocols/oscar/oscar.c:5842
 msgid "Free For Chat"
 msgstr "����腥肴��紊�"
 
-#: src/protocols/oscar/oscar.c:2820 src/protocols/oscar/oscar.c:4515
-#: src/protocols/oscar/oscar.c:5726
+#: src/protocols/oscar/oscar.c:2819 src/protocols/oscar/oscar.c:4551
+#: src/protocols/oscar/oscar.c:5840
 msgid "Not Available"
 msgstr "�傑�����∫��"
 
-#: src/protocols/oscar/oscar.c:2822 src/protocols/oscar/oscar.c:4518
-#: src/protocols/oscar/oscar.c:5727
+#: src/protocols/oscar/oscar.c:2821 src/protocols/oscar/oscar.c:4554
+#: src/protocols/oscar/oscar.c:5841
 msgid "Occupied"
 msgstr "綽�腆�"
 
 # TODO ���� http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:2826
+#: src/protocols/oscar/oscar.c:2825
+#, fuzzy
 msgid "Web Aware"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2886
+msgstr "絎壕┗篁�篋阪��恐筝��ョ����������"
+
+#: src/protocols/oscar/oscar.c:2885
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>絽活��鐚�</B> %s<BR><B>����鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2888
+#: src/protocols/oscar/oscar.c:2887
 #, c-format
 msgid "<B>Status:</B> %s<HR>%s"
 msgstr "<B>����鐚�</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:2947
+#: src/protocols/oscar/oscar.c:2946
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC 筝��咲���鐚�%s\n"
 
-#: src/protocols/oscar/oscar.c:2948
+#: src/protocols/oscar/oscar.c:2947
 msgid "Unknown error"
 msgstr "���ラ���"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:2983
+#: src/protocols/oscar/oscar.c:2982
 #, c-format
 msgid "Your message to %s did not get sent:"
 msgstr "�����腟� %s ��荐����≧����削�"
 
-#: src/protocols/oscar/oscar.c:3035
+#: src/protocols/oscar/oscar.c:3034
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "篏睡���� %s ����篋肴�荐�筝��絖����"
 
-#: src/protocols/oscar/oscar.c:3069
+#: src/protocols/oscar/oscar.c:3068 src/gtkaccount.c:305
 msgid "Buddy Icon"
 msgstr "絅遵���腓�"
 
-#: src/protocols/oscar/oscar.c:3072
+#: src/protocols/oscar/oscar.c:3071
 msgid "Voice"
 msgstr "�臥��"
 
 # NOTE 絨����贋・羔������壕⑮�冴���恰��荐�����
-#: src/protocols/oscar/oscar.c:3075 src/protocols/oscar/oscar.c:5752
+#: src/protocols/oscar/oscar.c:3074 src/protocols/oscar/oscar.c:5871
 msgid "Direct IM"
 msgstr "�恰��荐���"
 
-#: src/protocols/oscar/oscar.c:3078 src/gtkblist.c:1533
+#: src/protocols/oscar/oscar.c:3077 src/gtkblist.c:1581
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:3081 src/protocols/oscar/oscar.c:5764
+#: src/protocols/oscar/oscar.c:3080 src/protocols/oscar/oscar.c:5887
 msgid "Get File"
 msgstr "�ユ�倶�罅�"
 
-#: src/protocols/oscar/oscar.c:3084 src/protocols/oscar/oscar.c:5758
+#: src/protocols/oscar/oscar.c:3083 src/protocols/oscar/oscar.c:5879
 msgid "Send File"
 msgstr "�渇��罟�罅�"
 
-#: src/protocols/oscar/oscar.c:3088
+#: src/protocols/oscar/oscar.c:3087
 msgid "Games"
 msgstr "����"
 
-#: src/protocols/oscar/oscar.c:3091
+#: src/protocols/oscar/oscar.c:3090
 msgid "Add-Ins"
 msgstr "罔∞�"
 
-#: src/protocols/oscar/oscar.c:3094
+#: src/protocols/oscar/oscar.c:3093
 msgid "Send Buddy List"
 msgstr "���阪ソ��羝���"
 
-#: src/protocols/oscar/oscar.c:3097
+#: src/protocols/oscar/oscar.c:3096
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy ���"
 
 # XXX 緇�紊�PO�醇���茘�AP筝�荅�鐚���膺紫���醇����筝�����茯���鐚�筝��ユ��羃���茘���
 # ANS ��荐�緇��� ICQ 筝㍼�����筝�腮�戎����鐚���AP User���阪�銀賢筝�腮���
-#: src/protocols/oscar/oscar.c:3100
+#: src/protocols/oscar/oscar.c:3099
 msgid "AP User"
 msgstr "�����綣鋎睡����"
 
-#: src/protocols/oscar/oscar.c:3103
+#: src/protocols/oscar/oscar.c:3102
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:3106
+#: src/protocols/oscar/oscar.c:3105
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:3109
+#: src/protocols/oscar/oscar.c:3108
 msgid "ICQ Server Relay"
 msgstr "ICQ 篌堺�������"
 
-#: src/protocols/oscar/oscar.c:3112
+#: src/protocols/oscar/oscar.c:3111
 msgid "ICQ Unknown"
 msgstr "ICQ ����"
 
-#: src/protocols/oscar/oscar.c:3115
+#: src/protocols/oscar/oscar.c:3114
 msgid "Trillian Encryption"
 msgstr "Trillian ��絲�"
 
-#: src/protocols/oscar/oscar.c:3118
+#: src/protocols/oscar/oscar.c:3117
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
@@ -2756,166 +2834,166 @@
 msgid "Your AIM connection may be lost."
 msgstr "���� AIM ���醇�欠�篋���"
 
-#: src/protocols/oscar/oscar.c:3613
+#: src/protocols/oscar/oscar.c:3640
 msgid "Rate limiting error."
 msgstr "�������狗�����"
 
-#: src/protocols/oscar/oscar.c:3614
+#: src/protocols/oscar/oscar.c:3641
 msgid ""
-"The last message was not sent because you are over the rate limit.  Please "
-"wait 10 seconds and try again."
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-"��菴�筝���荐���研�����削����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���荅��"
-"罨<��"
-
-#: src/protocols/oscar/oscar.c:3674
+"����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���"
+"荅��罨<��"
+
+#: src/protocols/oscar/oscar.c:3701
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ラ����絽活����"
 
-#: src/protocols/oscar/oscar.c:3676
+#: src/protocols/oscar/oscar.c:3703
 msgid "You have been signed off for an unknown reason."
 msgstr "�����坂���������糸�冴��"
 
-#: src/protocols/oscar/oscar.c:3904
+#: src/protocols/oscar/oscar.c:3931
 msgid "UIN:"
 msgstr "篏睡����絽活��鐚�"
 
-#: src/protocols/oscar/oscar.c:3909
+#: src/protocols/oscar/oscar.c:3936
 msgid "First Name:"
 msgstr "��鐚�"
 
-#: src/protocols/oscar/oscar.c:3912
+#: src/protocols/oscar/oscar.c:3939
 msgid "Last Name:"
 msgstr "紮�鐚�"
 
-#: src/protocols/oscar/oscar.c:3915 src/protocols/oscar/oscar.c:3921
+#: src/protocols/oscar/oscar.c:3942 src/protocols/oscar/oscar.c:3948
 msgid "Email Address:"
 msgstr "�糸��灸散鐚�"
 
-#: src/protocols/oscar/oscar.c:3926
+#: src/protocols/oscar/oscar.c:3953
 msgid "Mobile Phone:"
 msgstr "茵����肢�鐚�"
 
-#: src/protocols/oscar/oscar.c:3929
+#: src/protocols/oscar/oscar.c:3956
 msgid "Gender:"
 msgstr "�у�ワ�"
 
-#: src/protocols/oscar/oscar.c:3929
+#: src/protocols/oscar/oscar.c:3956 src/protocols/trepia/trepia.c:314
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:3929
+#: src/protocols/oscar/oscar.c:3956 src/protocols/trepia/trepia.c:313
 msgid "Male"
 msgstr "��"
 
-#: src/protocols/oscar/oscar.c:3938
+#: src/protocols/oscar/oscar.c:3965
 msgid "Birthday:"
 msgstr "���ワ�"
 
-#: src/protocols/oscar/oscar.c:3943
+#: src/protocols/oscar/oscar.c:3970
 msgid "Age:"
 msgstr "綛顔宗鐚�"
 
-#: src/protocols/oscar/oscar.c:3946
+#: src/protocols/oscar/oscar.c:3973
 msgid "Personal Web Page:"
 msgstr "��篋榊恐��鐚�"
 
-#: src/protocols/oscar/oscar.c:3949
+#: src/protocols/oscar/oscar.c:3976
 msgid "Additional Information:"
 msgstr "�銀�莖�荐�鐚�"
 
-#: src/protocols/oscar/oscar.c:3953
+#: src/protocols/oscar/oscar.c:3980
 msgid "Home Address:"
 msgstr "篏鎘九�医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3955 src/protocols/oscar/oscar.c:3971
+#: src/protocols/oscar/oscar.c:3982 src/protocols/oscar/oscar.c:3998
 msgid "Address:"
 msgstr "�医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3958 src/protocols/oscar/oscar.c:3974
+#: src/protocols/oscar/oscar.c:3985 src/protocols/oscar/oscar.c:4001
 msgid "City:"
 msgstr "���鐚�"
 
 # NOTE 筝��順浸����綏�篁純��鐚��紙��������筝����銀���筝���
-#: src/protocols/oscar/oscar.c:3961 src/protocols/oscar/oscar.c:3977
+#: src/protocols/oscar/oscar.c:3988 src/protocols/oscar/oscar.c:4004
 msgid "State:"
 msgstr "���怨�鐚�"
 
-#: src/protocols/oscar/oscar.c:3964 src/protocols/oscar/oscar.c:3980
+#: src/protocols/oscar/oscar.c:3991 src/protocols/oscar/oscar.c:4007
 msgid "Zip Code:"
 msgstr "�級������鐚�"
 
-#: src/protocols/oscar/oscar.c:3969
+#: src/protocols/oscar/oscar.c:3996
 msgid "Work Address:"
 msgstr "綏ヤ��医��鐚�"
 
-#: src/protocols/oscar/oscar.c:3985
+#: src/protocols/oscar/oscar.c:4012
 msgid "Work Information:"
 msgstr "綏ヤ�莖�荐�鐚�"
 
-#: src/protocols/oscar/oscar.c:3987
+#: src/protocols/oscar/oscar.c:4014
 msgid "Company:"
 msgstr "��夔��腮縁�"
 
-#: src/protocols/oscar/oscar.c:3990
+#: src/protocols/oscar/oscar.c:4017
 msgid "Division:"
 msgstr "����鐚�"
 
-#: src/protocols/oscar/oscar.c:3993
+#: src/protocols/oscar/oscar.c:4020
 msgid "Position:"
 msgstr "�隙�鐚�"
 
-#: src/protocols/oscar/oscar.c:3996
+#: src/protocols/oscar/oscar.c:4023
 msgid "Web Page:"
 msgstr "膓臥��鐚�"
 
-#: src/protocols/oscar/oscar.c:4064
+#: src/protocols/oscar/oscar.c:4091
 #, c-format
 msgid "<B>%s has the following screen names:</B><BR>"
 msgstr "<B>%s ����筝�����絽活��鐚�</B><BR>"
 
-#: src/protocols/oscar/oscar.c:4082
+#: src/protocols/oscar/oscar.c:4109
 #, c-format
 msgid "No results found for email address %s"
 msgstr "�鞘��医���糸��灸散 %s �檎����腟���"
 
-#: src/protocols/oscar/oscar.c:4103
+#: src/protocols/oscar/oscar.c:4130
 #, c-format
 msgid "You should receive an email asking to confirm %s."
 msgstr "����荅我���九�遺�絨�荀�羆�絨� %s �画�茯�茘����糸��灸散��"
 
-#: src/protocols/oscar/oscar.c:4105
+#: src/protocols/oscar/oscar.c:4132
 msgid "Account Confirmation Requested"
 msgstr "絽活��腆肴�"
 
-#: src/protocols/oscar/oscar.c:4133
+#: src/protocols/oscar/oscar.c:4160
 msgid "Error Changing Account Info"
 msgstr "�贋�劫験��莖�荐����"
 
-#: src/protocols/oscar/oscar.c:4136
+#: src/protocols/oscar/oscar.c:4163
 #, 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:4139
+#: src/protocols/oscar/oscar.c:4166
 #, 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:4142
+#: src/protocols/oscar/oscar.c:4169
 #, 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:4145
+#: src/protocols/oscar/oscar.c:4172
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
@@ -2923,7 +3001,7 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����堺��群膓����榊���銀�荀�羆���������絅純��"
 
-#: src/protocols/oscar/oscar.c:4148
+#: src/protocols/oscar/oscar.c:4175
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
@@ -2931,19 +3009,19 @@
 msgstr ""
 "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
 
-#: src/protocols/oscar/oscar.c:4151
+#: src/protocols/oscar/oscar.c:4178
 #, 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:4154
+#: src/protocols/oscar/oscar.c:4181
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��� 0x%04x鐚����ラ�����"
 
-#: src/protocols/oscar/oscar.c:4164
+#: src/protocols/oscar/oscar.c:4191
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -2952,20 +3030,20 @@
 "����絽活������茴��弱���絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4165 src/protocols/oscar/oscar.c:4171
+#: src/protocols/oscar/oscar.c:4192 src/protocols/oscar/oscar.c:4199
 msgid "Account Info"
 msgstr "絽活��莖�荐�"
 
-#: src/protocols/oscar/oscar.c:4170
+#: src/protocols/oscar/oscar.c:4197
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "%s ���糸��灸散�� %s"
 
-#: src/protocols/oscar/oscar.c:4392
+#: src/protocols/oscar/oscar.c:4422
 msgid "Unable to set AIM profile."
 msgstr "�≧�荐㊤� AIM ��篋肴�����"
 
-#: src/protocols/oscar/oscar.c:4393
+#: src/protocols/oscar/oscar.c:4423
 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 "
@@ -2974,22 +3052,22 @@
 "�������糸�ュ�����荀�羆�篆��号������篋肴�荐�鐚���篁ラ��篋�莖�荐�筝���←篆��鴻��茫�������糸�ュ�"
 "�����育�画�荐㊤���"
 
-#: src/protocols/oscar/oscar.c:4422
+#: src/protocols/oscar/oscar.c:4453
 #, c-format
 msgid ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr "莇��阪��篋肴�荐����桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
 
-#: src/protocols/oscar/oscar.c:4424
+#: src/protocols/oscar/oscar.c:4455
 msgid "Profile too long."
 msgstr "��篋肴�荐����激��"
 
-#: src/protocols/oscar/oscar.c:4440
+#: src/protocols/oscar/oscar.c:4474
 msgid "Unable to set AIM away message."
 msgstr "�≧�荐㊤� AIM �∫��荐�����"
 
-#: src/protocols/oscar/oscar.c:4441
+#: src/protocols/oscar/oscar.c:4475
 msgid ""
 "You have probably requested to set your away message before the login "
 "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -2998,36 +3076,36 @@
 "��������糸�ョ�綺鎘�����篆��号�����∫��荐������������絨�膓㊥��������荐㊤���������茫���"
 "絎����糸�ュ���荐㊤�筝�罨<��"
 
-#: src/protocols/oscar/oscar.c:4480
+#: src/protocols/oscar/oscar.c:4515
 #, c-format
 msgid ""
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it and set you away."
 msgstr "莇��咲�∫��荐������桁墾筝��� %d 篏���腟���Gaim 絨������㊤�у�緇��画�荐㊤���"
 
-#: src/protocols/oscar/oscar.c:4482
+#: src/protocols/oscar/oscar.c:4517
 msgid "Away message too long."
 msgstr "�∫��荐������激��"
 
-#: src/protocols/oscar/oscar.c:4695
-msgid "Unable To Retrive Buddy List"
+#: src/protocols/oscar/oscar.c:4737
+msgid "Unable To Retrieve Buddy List"
 msgstr "�≧�莅���絅遵�羝���"
 
-#: src/protocols/oscar/oscar.c:4696
+#: src/protocols/oscar/oscar.c:4738
 msgid ""
-"Gaim was temporarily unable to retrive your buddy list from the AIM "
+"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 "
 "a few hours."
 msgstr ""
 "Gaim ����羃���莨���� AIM 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃�����"
 "紊縁����遵�札��江��絨��鏅���緇���"
 
-#: src/protocols/oscar/oscar.c:4786 src/protocols/oscar/oscar.c:4787
-#: src/protocols/oscar/oscar.c:4792
+#: src/protocols/oscar/oscar.c:4829 src/protocols/oscar/oscar.c:4830
+#: src/protocols/oscar/oscar.c:4835
 msgid "Orphans"
 msgstr "絖ゅ����"
 
-#: src/protocols/oscar/oscar.c:4956
+#: src/protocols/oscar/oscar.c:4999
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -3036,15 +3114,15 @@
 "���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���"
 "荅���"
 
-#: src/protocols/oscar/oscar.c:4956 src/protocols/oscar/oscar.c:4969
+#: src/protocols/oscar/oscar.c:4999 src/protocols/oscar/oscar.c:5012
 msgid "(no name)"
 msgstr "(羃�����絖�)"
 
-#: src/protocols/oscar/oscar.c:4957 src/protocols/oscar/oscar.c:4970
+#: src/protocols/oscar/oscar.c:5000 src/protocols/oscar/oscar.c:5013
 msgid "Unable To Add"
 msgstr "�≧�����"
 
-#: src/protocols/oscar/oscar.c:4969
+#: src/protocols/oscar/oscar.c:5012
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -3054,18 +3132,18 @@
 "���坂���������≧�絨�絅遵� %s ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟���"
 "����膤紫輝��荐援��筝�����"
 
-#: src/protocols/oscar/oscar.c:5004
+#: src/protocols/oscar/oscar.c:5047
 #, 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:5010
+#: src/protocols/oscar/oscar.c:5053
 msgid "Authorization Given"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/oscar/oscar.c:5043
+#: src/protocols/oscar/oscar.c:5086
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -3075,17 +3153,17 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:5085
+#: src/protocols/oscar/oscar.c:5128
 #, c-format
 msgid "The user %s has granted your request to add them to your contact list."
 msgstr "篏睡���� %s ��荐延����篁������ュソ��羝�����荀�羆���"
 
-#: src/protocols/oscar/oscar.c:5086
+#: src/protocols/oscar/oscar.c:5129
 msgid "Authorization Granted"
 msgstr "腟��茯�茘�"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:5089
+#: src/protocols/oscar/oscar.c:5132
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your contact list for the "
@@ -3095,87 +3173,91 @@
 "篏睡���� %s ���坂�������鐚���腟�篋����篁������ュソ��羝�����荀�羆�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:5090
+#: src/protocols/oscar/oscar.c:5133
 msgid "Authorization Denied"
 msgstr "茯�茘���腟�"
 
 # NOTE: ��茖∞��絖�臂���� #gaim �� MrHappy �� deryni ��箴���
-#: src/protocols/oscar/oscar.c:5127 src/protocols/toc/toc.c:1200
+#: src/protocols/oscar/oscar.c:5170 src/protocols/toc/toc.c:1205
 msgid "Exchange:"
 msgstr "��紊����腆種�"
 
-#: src/protocols/oscar/oscar.c:5347
+#: src/protocols/oscar/oscar.c:5390
 msgid "<b>Status:</b> "
 msgstr "<b>����鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5356
+#: src/protocols/oscar/oscar.c:5399
 msgid "<b>Logged In:</b> "
 msgstr "<b>�糸�ユ����鐚�</b>"
 
-#: src/protocols/oscar/oscar.c:5363
+#: src/protocols/oscar/oscar.c:5406
 msgid "<b>Capabilities:</b> "
 msgstr "<b>�後��э�</b>"
 
-#: src/protocols/oscar/oscar.c:5371
+#: src/protocols/oscar/oscar.c:5412
+msgid "<b>Available:</b> "
+msgstr "<b>筝�膩�鐚�</b>"
+
+#: src/protocols/oscar/oscar.c:5420
 msgid "<b>Status:</b> Not Authorized"
 msgstr "<b>����鐚�</b>���茘�"
 
-#: src/protocols/oscar/oscar.c:5375 src/gtkblist.c:869
+#: src/protocols/oscar/oscar.c:5424 src/gtkblist.c:895
 msgid "<b>Status:</b> Offline"
 msgstr "<b>����鐚�</b>�∝�"
 
-#: src/protocols/oscar/oscar.c:5401
+#: src/protocols/oscar/oscar.c:5454
 msgid "Offline"
 msgstr "�∝�"
 
-#: src/protocols/oscar/oscar.c:5582
+#: src/protocols/oscar/oscar.c:5695
 msgid "Unable to open Direct IM"
 msgstr "�≧������贋・���恰��荐���"
 
-#: src/protocols/oscar/oscar.c:5595
+#: src/protocols/oscar/oscar.c:5708
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "���御��篋��� %s ����筝����贋・�恰��荐�����"
 
-#: src/protocols/oscar/oscar.c:5598
+#: src/protocols/oscar/oscar.c:5711
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr "��罔e������峨�堺���� IP 篏���鐚���罩ゅ��醇�����援�筝���蘂��������活�膵主����"
 
-#: src/protocols/oscar/oscar.c:5742
+#: src/protocols/oscar/oscar.c:5856
 msgid "Get Status Msg"
 msgstr "��緇�����荐���"
 
-#: src/protocols/oscar/oscar.c:5776
+#: src/protocols/oscar/oscar.c:5900
 msgid "Re-request Authorization"
 msgstr "���域�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:5797
+#: src/protocols/oscar/oscar.c:5921
 msgid "The new formatting is invalid."
 msgstr "�亥���弱����≧������"
 
-#: src/protocols/oscar/oscar.c:5798
+#: src/protocols/oscar/oscar.c:5922
 msgid "Screenname formatting can change only capitalization and whitespace."
 msgstr "絽活���弱������醇�壕�紊у�篁ュ�腥榊�純��"
 
-#: src/protocols/oscar/oscar.c:5804
+#: src/protocols/oscar/oscar.c:5928
 msgid "New screenname formatting:"
 msgstr "�亥��絽活���弱�鐚�"
 
-#: src/protocols/oscar/oscar.c:5853
+#: src/protocols/oscar/oscar.c:5977
 msgid "Change Address To:"
 msgstr "莅��翫�医���削�"
 
-#: src/protocols/oscar/oscar.c:5866
+#: src/protocols/oscar/oscar.c:5991
 msgid "You are awaiting authorization from the following buddies:<BR>"
 msgstr "������罩e���緇�筝���絅遵���茯�茘�鐚�<BR>"
 
-#: src/protocols/oscar/oscar.c:5891
+#: src/protocols/oscar/oscar.c:6016
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>��研羃������緇�薊�茘�</i>"
 
-#: src/protocols/oscar/oscar.c:5896
+#: src/protocols/oscar/oscar.c:6021
 #, c-format
 msgid ""
 "%s<BR><BR>You can re-request authorization from these buddies by right-"
@@ -3184,31 +3266,43 @@
 "%s<BR><BR>���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚�"
 "�九��御����荀�羆����域�茘�����"
 
-#: src/protocols/oscar/oscar.c:5931
+#: src/protocols/oscar/oscar.c:6037
+msgid "Available Message:"
+msgstr "筝�膩�荐����"
+
+#: src/protocols/oscar/oscar.c:6038
+msgid "Please talk to me, I'm lonely! (and single)"
+msgstr "茫����������э���荀阪�絅遵�絲�鐚�"
+
+#: src/protocols/oscar/oscar.c:6100
+msgid "Set Available Message"
+msgstr "荐㊤�筝�膩�荐���"
+
+#: src/protocols/oscar/oscar.c:6114
 msgid "Change Password (URL)"
 msgstr "篆��劫�腆�(URL)"
 
-#: src/protocols/oscar/oscar.c:5942
+#: src/protocols/oscar/oscar.c:6125
 msgid "Format Screenname"
 msgstr "�弱���絽活��"
 
-#: src/protocols/oscar/oscar.c:5948
+#: src/protocols/oscar/oscar.c:6131
 msgid "Confirm Account"
 msgstr "腆肴�絽活��"
 
-#: src/protocols/oscar/oscar.c:5954
+#: src/protocols/oscar/oscar.c:6137
 msgid "Display Current Registered Address"
 msgstr "蕁�ず������荐糸�����医��"
 
-#: src/protocols/oscar/oscar.c:5960
+#: src/protocols/oscar/oscar.c:6143
 msgid "Change Current Registered Address"
 msgstr "篆��合������荐糸�����医��"
 
-#: src/protocols/oscar/oscar.c:5969
+#: src/protocols/oscar/oscar.c:6152
 msgid "Show Buddies Awaiting Authorization"
 msgstr "蕁�ず膈�緇�茯�茘���絅遵�"
 
-#: src/protocols/oscar/oscar.c:5977
+#: src/protocols/oscar/oscar.c:6160
 msgid "Search for Buddy by Email"
 msgstr "篏睡���糸��灸散��絨�絅遵�"
 
@@ -3222,122 +3316,122 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6097 src/protocols/oscar/oscar.c:6099
+#: src/protocols/oscar/oscar.c:6281 src/protocols/oscar/oscar.c:6283
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ ��絎�罔∞�"
 
-#: src/protocols/oscar/oscar.c:6117
-msgid "Auth Host:"
-msgstr "茯�茘�篌堺�����"
-
-#: src/protocols/oscar/oscar.c:6123
-msgid "Auth Port:"
-msgstr "茯�茘���荐���鐚�"
-
-#: src/protocols/toc/toc.c:190
+#: src/protocols/oscar/oscar.c:6300
+msgid "Auth host"
+msgstr "茯�茘�篌堺����"
+
+#: src/protocols/oscar/oscar.c:6305
+msgid "Auth port"
+msgstr "茯�茘���荐���"
+
+#: src/protocols/toc/toc.c:173
 #, c-format
 msgid "Looking up %s"
 msgstr "�上� %s 筝�"
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:493
 #, c-format
 msgid "Unable to write file %s."
 msgstr "�≧�絲��ユ�罅� %s��"
 
-#: src/protocols/toc/toc.c:493
+#: src/protocols/toc/toc.c:496
 #, c-format
 msgid "Unable to read file %s."
 msgstr "�≧�莅���罟�罅� %s��"
 
-#: src/protocols/toc/toc.c:496
+#: src/protocols/toc/toc.c:499
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "荐���お�件���緇��� %s 篏���腟�茴���サ��"
 
-#: src/protocols/toc/toc.c:499
+#: src/protocols/toc/toc.c:502
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ����筝����糸�ャ��"
 
-#: src/protocols/toc/toc.c:502
+#: src/protocols/toc/toc.c:505
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "茘���鐚�%s ���茴���荐援����"
 
-#: src/protocols/toc/toc.c:505
+#: src/protocols/toc/toc.c:508
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "荐���←筝�罍�鐚����堺�����遺�篌堺���������句���守����綺���"
 
-#: src/protocols/toc/toc.c:508
+#: src/protocols/toc/toc.c:511
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "�� %s 筝���札��紊���"
 
-#: src/protocols/toc/toc.c:511
+#: src/protocols/toc/toc.c:514
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "����荐���畿 %s ����綺�お綽����"
 
-#: src/protocols/toc/toc.c:514
+#: src/protocols/toc/toc.c:517
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "���阪け篋�筝����� %s ��箴���荐�������阪�紊�ぇ篋���"
 
-#: src/protocols/toc/toc.c:517
+#: src/protocols/toc/toc.c:520
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "���阪け篋�筝����� %s ��箴���荐�������阪��渇������綺�お綽���"
 
-#: src/protocols/toc/toc.c:520
+#: src/protocols/toc/toc.c:523
 msgid "Failure."
 msgstr "紊掩����"
 
-#: src/protocols/toc/toc.c:523
-msgid "Too many matches."
-msgstr "�拷��紊����"
-
 #: src/protocols/toc/toc.c:526
-msgid "Need more qualifiers."
-msgstr "��莠後�ユ�翫�罟∝刈罌�篁吟��"
+msgid "Too many matches."
+msgstr "�拷��紊����"
 
 #: src/protocols/toc/toc.c:529
+msgid "Need more qualifiers."
+msgstr "��莠後�ユ�翫�罟∝刈罌�篁吟��"
+
+#: src/protocols/toc/toc.c:532
 msgid "Dir service temporarily unavailable."
 msgstr "������������筝�絖�����"
 
-#: src/protocols/toc/toc.c:532
+#: src/protocols/toc/toc.c:535
 msgid "Email lookup restricted."
 msgstr "胼�罩� eMail 罟∽�ャ��"
 
-#: src/protocols/toc/toc.c:535
+#: src/protocols/toc/toc.c:538
 msgid "Keyword ignored."
 msgstr "���球�綏画←綽順�ャ��"
 
-#: src/protocols/toc/toc.c:538
-msgid "No keywords."
-msgstr "羃������球���"
-
 #: src/protocols/toc/toc.c:541
+msgid "No keywords."
+msgstr "羃������球���"
+
+#: src/protocols/toc/toc.c:544
 msgid "User has no directory information."
 msgstr "����篏睡����羃���篁����檎��莖�荐���"
 
-#: src/protocols/toc/toc.c:545
+#: src/protocols/toc/toc.c:548
 msgid "Country not supported."
 msgstr "������絎銀�茴���叵��"
 
-#: src/protocols/toc/toc.c:548
+#: src/protocols/toc/toc.c:551
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "���ョ��紊掩������鐚�%s��"
 
-#: src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:557
 msgid "The service is temporarily unavailable."
 msgstr "��������筝�絖�����"
 
-#: src/protocols/toc/toc.c:557
+#: src/protocols/toc/toc.c:560
 msgid "Your warning level is currently too high to log in."
 msgstr "�������糸�ョ鎧腟援��茘���膈�膣�紊��鐚�篁ヨ�雁�≧��糸�ャ��"
 
-#: src/protocols/toc/toc.c:560
+#: src/protocols/toc/toc.c:563
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
@@ -3345,37 +3439,37 @@
 "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
 "膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
-#: src/protocols/toc/toc.c:562
+#: src/protocols/toc/toc.c:565
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "�主��篋�筝������ョ���糸�ラ���鐚�%s��"
 
-#: src/protocols/toc/toc.c:565
+#: src/protocols/toc/toc.c:568
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "筝������ョ����� %d �主����莖�荐�鐚�%s"
 
-#: src/protocols/toc/toc.c:582
+#: src/protocols/toc/toc.c:588
 msgid "Connection Closed"
 msgstr "�g�����"
 
-#: src/protocols/toc/toc.c:620
+#: src/protocols/toc/toc.c:626
 msgid "Waiting for reply..."
 msgstr "膈�緇���荀�筝�..."
 
-#: src/protocols/toc/toc.c:685
+#: src/protocols/toc/toc.c:691
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 腟���篋�������������憜���札膵主����渇������荐�����"
 
-#: src/protocols/toc/toc.c:874
+#: src/protocols/toc/toc.c:879
 msgid "Password Change Successful"
 msgstr "絲�腆寂信�号����"
 
-#: src/protocols/toc/toc.c:878
+#: src/protocols/toc/toc.c:883
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ���坂�筝������� (PAUSE) ��篁ゃ��"
 
-#: src/protocols/toc/toc.c:879
+#: src/protocols/toc/toc.c:884
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -3384,47 +3478,47 @@
 "�狗�����主����鐚�TOC ��綽順�ユ������箴���荐�����������遵�������肴�����鐚�絨���権�榊鎧"
 "腟宴��Gaim 絨��水���主����罔g��篋�����������������х������鐚�茫����茫���"
 
-#: src/protocols/toc/toc.c:1323
+#: src/protocols/toc/toc.c:1343
 msgid "Get Dir Info"
 msgstr "��緇�篏睡������篋肴�荐�"
 
-#: src/protocols/toc/toc.c:1447
+#: src/protocols/toc/toc.c:1467
 msgid "Set Dir Info"
 msgstr "荐㊤�篏睡������篋肴�荐�"
 
-#: src/protocols/toc/toc.c:1570
+#: src/protocols/toc/toc.c:1590
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "�≧����� %s 篁ヤ�絲��ワ�"
 
-#: src/protocols/toc/toc.c:1606
+#: src/protocols/toc/toc.c:1626
 msgid "File transfer failed; other side probably canceled."
 msgstr "罟�罅��活叱紊掩��鐚����醇����劫�羔��活叱��"
 
-#: src/protocols/toc/toc.c:1651 src/protocols/toc/toc.c:1691
-#: src/protocols/toc/toc.c:1903
+#: src/protocols/toc/toc.c:1671 src/protocols/toc/toc.c:1711
+#: src/protocols/toc/toc.c:1923
 msgid "Could not connect for transfer."
 msgstr "�≧������g�篁ヤ��活叱��"
 
-#: src/protocols/toc/toc.c:1815
+#: src/protocols/toc/toc.c:1835
 msgid "Could not connect for transfer!"
 msgstr "�≧������活叱���g�鐚�"
 
-#: src/protocols/toc/toc.c:1848
+#: src/protocols/toc/toc.c:1868
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "�≧�絲��ユ��㊧�荐�������罟�罅�絨�筝���茴��渇����"
 
-#: src/protocols/toc/toc.c:1948 src/gtkft.c:1059
+#: src/protocols/toc/toc.c:1968 src/gtkft.c:1060
 msgid "Gaim - Save As..."
 msgstr "Gaim - �峨���..."
 
-#: src/protocols/toc/toc.c:1982
+#: src/protocols/toc/toc.c:2002
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 荀�羆� %s �ユ�� %d ��罟�罅�鐚�%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1989
+#: src/protocols/toc/toc.c:2009
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 荀�羆����渇��罟�罅�腟��鐚�絅刻���"
@@ -3439,62 +3533,127 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2064 src/protocols/toc/toc.c:2066
+#: src/protocols/toc/toc.c:2084 src/protocols/toc/toc.c:2086
 msgid "TOC Protocol Plugin"
 msgstr "TOC ��絎�罔∞�"
 
-#: src/protocols/toc/toc.c:2084
-msgid "TOC Host:"
-msgstr "TOC 篌堺�����"
-
-#: src/protocols/toc/toc.c:2090
-msgid "TOC Port:"
-msgstr "TOC ��荐���鐚�"
-
-#: src/protocols/yahoo/yahoo.c:605
-msgid "Your Yahoo! message did not get sent."
-msgstr "���� Yahoo! 荐���研羃���茴����冴��"
-
-#: src/protocols/yahoo/yahoo.c:1084 src/protocols/yahoo/yahoo.c:1291
-#: src/protocols/yahoo/yahoo.c:1365
-msgid "Not At Home"
-msgstr "筝����"
-
-#: src/protocols/yahoo/yahoo.c:1086 src/protocols/yahoo/yahoo.c:1293
-#: src/protocols/yahoo/yahoo.c:1366
-msgid "Not At Desk"
-msgstr "筝���婚篏�"
-
-#: src/protocols/yahoo/yahoo.c:1088 src/protocols/yahoo/yahoo.c:1295
-#: src/protocols/yahoo/yahoo.c:1367
-msgid "Not In Office"
-msgstr "筝���商���"
-
-#: src/protocols/yahoo/yahoo.c:1092 src/protocols/yahoo/yahoo.c:1299
-#: src/protocols/yahoo/yahoo.c:1369
-msgid "On Vacation"
-msgstr "羝≦���私�"
-
-#: src/protocols/yahoo/yahoo.c:1096 src/protocols/yahoo/yahoo.c:1303
-#: src/protocols/yahoo/yahoo.c:1371
-msgid "Stepped Out"
-msgstr "莎医�阪サ篋�"
-
-#: src/protocols/yahoo/yahoo.c:1212
-msgid "Active which ID?"
-msgstr "��������� ID鐚�"
-
-#: src/protocols/yahoo/yahoo.c:1223
-msgid "Activate ID"
-msgstr "���� ID"
-
-#: src/protocols/yahoo/yahoo.c:1448
-msgid "Pager Host:"
-msgstr "�喝�主鎧腟延失�����"
-
-#: src/protocols/yahoo/yahoo.c:1454
-msgid "Pager Port:"
-msgstr "�喝�主鎧腟演��荐���鐚�"
+#: src/protocols/toc/toc.c:2103
+msgid "TOC host"
+msgstr "TOC 篌堺����"
+
+#: src/protocols/toc/toc.c:2107
+msgid "TOC port"
+msgstr "TOC ��荐���"
+
+#. Basic Profile group.
+#: src/protocols/trepia/trepia.c:296
+msgid "Basic Profile"
+msgstr "�堺�����"
+
+#. First Name
+#: src/protocols/trepia/trepia.c:300 src/dialogs.c:1982 src/dialogs.c:2636
+msgid "First Name"
+msgstr "��"
+
+#. Last Name
+#: src/protocols/trepia/trepia.c:307 src/dialogs.c:2005 src/dialogs.c:2656
+msgid "Last Name"
+msgstr "紮�"
+
+#. Gender
+#: src/protocols/trepia/trepia.c:312
+msgid "Gender"
+msgstr "�у��"
+
+#. Age
+#: src/protocols/trepia/trepia.c:318
+msgid "Age"
+msgstr "綛顔宗"
+
+#. Homepage
+#: src/protocols/trepia/trepia.c:322
+msgid "Homepage"
+msgstr "膓臥��"
+
+#. E-Mail Address
+#: src/protocols/trepia/trepia.c:327
+msgid "E-Mail Address"
+msgstr "�糸��灸散"
+
+#: src/protocols/trepia/trepia.c:333
+msgid "Profile Information"
+msgstr "��篋肴�荐�"
+
+# XXX ��篋���紮�腆種�篏�筝����茘��絨�
+# NOTE SimGuy: probably "Other IM services" if you can do that one :)
+#. Instant Messagers
+#: src/protocols/trepia/trepia.c:339
+msgid "Instant Messagers"
+msgstr "�銀��恰���活�絽活��"
+
+#. AIM
+#: src/protocols/trepia/trepia.c:343
+msgid "AIM"
+msgstr "AIM"
+
+#. ICQ
+#: src/protocols/trepia/trepia.c:347
+msgid "ICQ UIN"
+msgstr "ICQ 絽活��"
+
+#. MSN
+#: src/protocols/trepia/trepia.c:351
+msgid "MSN"
+msgstr "MSN"
+
+#. Yahoo
+#: src/protocols/trepia/trepia.c:355
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#. I'm From
+#: src/protocols/trepia/trepia.c:360
+msgid "I'm From"
+msgstr "��箴���"
+
+#. State
+#: src/protocols/trepia/trepia.c:368 src/dialogs.c:2038 src/dialogs.c:2685
+msgid "State"
+msgstr "���怨�"
+
+#. Call the dialog.
+#: src/protocols/trepia/trepia.c:377
+msgid "Set your Trepia profile data."
+msgstr "荐㊤����� Trepia ��篋肴�����"
+
+#: src/protocols/trepia/trepia.c:379 src/dialogs.c:2080 src/dialogs.c:2261
+#: src/dialogs.c:3427 src/dialogs.c:4232 src/dialogs.c:4870
+#: src/gtkrequest.c:175
+msgid "Save"
+msgstr "�峨�"
+
+#: src/protocols/trepia/trepia.c:523
+msgid "Set Profile"
+msgstr "荐㊤���篋肴���"
+
+# XXX 絅遵�鋇�紊��
+#: src/protocols/trepia/trepia.c:559
+msgid "Visit Homepage"
+msgstr "�頳順恐��"
+
+# NOTE Debian 茘���local���冴�����亥���
+#: src/protocols/trepia/trepia.c:905 src/protocols/trepia/trepia.c:908
+msgid "Local Users"
+msgstr "���亥���篏睡����"
+
+# NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
+#: src/protocols/trepia/trepia.c:1004
+msgid "Read error"
+msgstr "莅������"
+
+#: src/protocols/trepia/trepia.c:1105
+msgid "Logging in"
+msgstr "�糸�ヤ賢"
 
 #. *< api_version
 #. *< type
@@ -3506,59 +3665,118 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:1540 src/protocols/yahoo/yahoo.c:1542
+#: src/protocols/trepia/trepia.c:1353 src/protocols/trepia/trepia.c:1355
+msgid "Trepia Protocol Plugin"
+msgstr "Trepia ��絎�罔∞�"
+
+#: src/protocols/yahoo/yahoo.c:587
+msgid "Your Yahoo! message did not get sent."
+msgstr "���� Yahoo! 荐���研羃���茴����冴��"
+
+#: src/protocols/yahoo/yahoo.c:1052 src/protocols/yahoo/yahoo.c:1260
+#: src/protocols/yahoo/yahoo.c:1334
+msgid "Not At Home"
+msgstr "筝����"
+
+#: src/protocols/yahoo/yahoo.c:1054 src/protocols/yahoo/yahoo.c:1262
+#: src/protocols/yahoo/yahoo.c:1335
+msgid "Not At Desk"
+msgstr "筝���婚篏�"
+
+#: src/protocols/yahoo/yahoo.c:1056 src/protocols/yahoo/yahoo.c:1264
+#: src/protocols/yahoo/yahoo.c:1336
+msgid "Not In Office"
+msgstr "筝���商���"
+
+#: src/protocols/yahoo/yahoo.c:1060 src/protocols/yahoo/yahoo.c:1268
+#: src/protocols/yahoo/yahoo.c:1338
+msgid "On Vacation"
+msgstr "羝≦���私�"
+
+#: src/protocols/yahoo/yahoo.c:1064 src/protocols/yahoo/yahoo.c:1272
+#: src/protocols/yahoo/yahoo.c:1340
+msgid "Stepped Out"
+msgstr "莎医�阪サ篋�"
+
+#: src/protocols/yahoo/yahoo.c:1180
+msgid "Active which ID?"
+msgstr "��������� ID鐚�"
+
+#: src/protocols/yahoo/yahoo.c:1191
+msgid "Activate ID"
+msgstr "���� ID"
+
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/yahoo/yahoo.c:1460 src/protocols/yahoo/yahoo.c:1462
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo ��絎�罔∞�"
 
-#: src/protocols/zephyr/zephyr.c:336
+#: src/protocols/yahoo/yahoo.c:1479
+msgid "Pager host"
+msgstr "�喝�主鎧腟延失����"
+
+#: src/protocols/yahoo/yahoo.c:1484
+msgid "Pager port"
+msgstr "�喝�主鎧腟演��荐���"
+
+#: src/protocols/zephyr/zephyr.c:337
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>篏睡����鐚�</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:338
+#: src/protocols/zephyr/zephyr.c:339
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>�ュ��鐚�</b>%s<br>"
 
-#: src/protocols/zephyr/zephyr.c:340
+#: src/protocols/zephyr/zephyr.c:341
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>�沿����Ǔ�糸��"
 
-#: src/protocols/zephyr/zephyr.c:344
+#: src/protocols/zephyr/zephyr.c:345
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>緇� %2$s 莎桁群�� %1$s"
 
-#: src/protocols/zephyr/zephyr.c:573 src/protocols/zephyr/zephyr.c:574
+#: src/protocols/zephyr/zephyr.c:574 src/protocols/zephyr/zephyr.c:575
 msgid "Anyone"
 msgstr "篁私�篋�"
 
-#: src/protocols/zephyr/zephyr.c:598
+#: src/protocols/zephyr/zephyr.c:599
 msgid "Already logged in with Zephyr"
 msgstr "綏牙��糸�� Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:599
+#: src/protocols/zephyr/zephyr.c:600
 msgid ""
 "Because Zephyr uses your system username, you are unable to have multiple "
 "accounts on it when logged in as the same user."
 msgstr "���� Zephyr �����糸�ョ鎧腟援��絽活��鐚���������醇����紊��� Zephyr 絽恰�句����"
 
 # TODO: �� Google �上�亥��莖���茯� Zephyr �� ZLocate ���腮���������鐚�筝�������茖>��ユ���藝惹���
-#: src/protocols/zephyr/zephyr.c:847
+#: src/protocols/zephyr/zephyr.c:848
 msgid "ZLocate"
 msgstr ""
 
 # TODO: �� Google �憜�亥��莖���茯� Zephyr �� Class 筝�����ワ������腮���腱�篋榊����紊��
-#: src/protocols/zephyr/zephyr.c:887
+#: src/protocols/zephyr/zephyr.c:888
 msgid "Class:"
 msgstr ""
 
 # TODO: �� Google �上�亥��莖���茯� Zephyr �� Instance ���腮����援����紊��
-#: src/protocols/zephyr/zephyr.c:892
+#: src/protocols/zephyr/zephyr.c:893
 msgid "Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:897
+#: src/protocols/zephyr/zephyr.c:898
 msgid "Recipient:"
 msgstr "�ュ���鐚�"
 
@@ -3572,16 +3790,16 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1029 src/protocols/zephyr/zephyr.c:1031
+#: src/protocols/zephyr/zephyr.c:1030 src/protocols/zephyr/zephyr.c:1032
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr ��絎�罔∞�"
 
-#: src/about.c:74
+#: src/about.c:56
 #, c-format
 msgid "About Gaim v%s"
 msgstr "���� Gaim v%s"
 
-#: src/about.c:106
+#: src/about.c:88
 msgid ""
 "Gaim is a modular Instant Messaging client capable of using AIM, ICQ, "
 "Yahoo!, MSN, IRC, Jabber, Napster, Zephyr, and Gadu-Gadu all at once.  It is "
@@ -3591,15 +3809,15 @@
 "Jabber��Napster��Zephyr鐚�篁ュ� Gadu-Gadu 膈����純��絎�篏睡�� GTK+ 箴����種�����篁� "
 "GPL ���劫��寂���<BR><BR>"
 
-#: src/about.c:116
+#: src/about.c:98
 msgid "<FONT SIZE=\"3\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> irc.freenode.net 筝��� #gaim �脂��<BR><BR>"
 
-#: src/about.c:120
+#: src/about.c:102
 msgid "<FONT SIZE=\"3\">Active Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">�鞘算���取��鐚�</FONT><BR>"
 
-#: src/about.c:122
+#: src/about.c:104
 msgid ""
 "  Rob Flynn (maintainer) &lt;<A HREF=\"mailto:rob@marko.net\">rob@marko.net</"
 "A>&gt;<BR>  Sean Egan (lead developer) &lt;<A HREF=\"mailto:"
@@ -3618,17 +3836,17 @@
 "'LSchiere' Schierer (���)<BR><BR>"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
-# NOTE Luke Schiere 顄�:����篋�篋坂�������篋�鐚�����筝����� gaim 莖e����
+# NOTE Luke Schierer 茯�:����篋�篋坂�������篋�鐚�����筝����� gaim 莖e����
 # NOTE 筝����膺紙�������援��罔∞�篏�������罸�莠�絅�
-#: src/about.c:137
+#: src/about.c:119
 msgid "<FONT SIZE=\"3\">Crazy Patch Writers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">���援��罔∞�篏���鐚�</FONT><BR>"
 
-#: src/about.c:147
+#: src/about.c:129
 msgid "<FONT SIZE=\"3\">Retired Developers:</FONT><BR>"
 msgstr "<FONT SIZE=\"3\">��篁脂���取��鐚�</FONT><BR>"
 
-#: src/about.c:149
+#: src/about.c:131
 msgid ""
 "  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
 "lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
@@ -3655,23 +3873,23 @@
 msgid "I'm Back!"
 msgstr "����箴�篋�鐚�"
 
-#: src/away.c:388
+#: src/away.c:384
 msgid "New Away Message"
 msgstr "�亥���∫��荐���"
 
-#: src/away.c:408
+#: src/away.c:404
 msgid "Remove Away Message"
 msgstr "腱脂�ら�∫��荐���"
 
-#: src/away.c:603
+#: src/away.c:599
 msgid "Set All Away"
 msgstr "����┃�咲�∫��"
 
-#: src/blist.c:367 src/gtkprefs.c:2194
+#: src/blist.c:428 src/gtkprefs.c:2273
 msgid "Chats"
 msgstr "��紊�"
 
-#: src/blist.c:679
+#: src/blist.c:752
 #, c-format
 msgid ""
 "%d buddies from group %s were not removed because their accounts were not "
@@ -3680,43 +3898,43 @@
 "%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�����絨�����絽活��筝�����糸�ャ����篋�絅遵���"
 "臂ょ�羃���茴�Щ�ゃ��\n"
 
-#: src/blist.c:684
+#: src/blist.c:757
 msgid "Group not removed"
 msgstr "臂ょ���←腱脂��"
 
-#: src/blist.c:857
+#: src/blist.c:948
 msgid "Invalid Groupname"
 msgstr "�≧����臂ょ���腮�"
 
-#: src/blist.c:1579
+#: src/blist.c:1704
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "��В������絅遵�羝������主�������絅遵�羝������茴���ャ��"
 
-#: src/blist.c:1581
+#: src/blist.c:1706
 msgid "Buddy List Error"
 msgstr "絅遵�羝������"
 
 #. rob wants to inform the user that their buddy lists are
 #. * being converted
-#: src/blist.c:1587
+#: src/blist.c:1714
 #, c-format
 msgid ""
 "Gaim is converting your old buddy lists to a new format, which will now be "
 "located at %s"
 msgstr "Gaim 罩e�����������絅遵�羝����堺�井�弱�鐚�����絨�絎�絖��丈�� %s"
 
-#: src/blist.c:1590
+#: src/blist.c:1717
 msgid "Converting Buddy List"
 msgstr "莉���絅遵�羝���賢"
 
-#: src/browser.c:430 src/browser.c:458
+#: src/browser.c:407 src/browser.c:435
 msgid ""
 "Communication with the browser failed. Please close all windows and try "
 "again."
 msgstr "���頳遵����羣���紊掩����茫�����������荀�腦�緇���荅���"
 
-#: src/browser.c:592
+#: src/browser.c:569
 msgid ""
 "Unable to launch your browser because the 'Manual' browser command has been "
 "chosen, but no command has been set."
@@ -3724,31 +3942,31 @@
 "���堺��戎�����篏睡��������頳遵�������檎��鐚����頳遵��研羃���茴�┃絎�鐚���罩ょ�頳遵�����"
 "莨��茴�������"
 
-#: src/browser.c:609
+#: src/browser.c:586
 #, c-format
 msgid "There was an error launching your chosen browser: %s"
 msgstr "���������御�����頳遵�����主�����鐚�%s"
 
-#: src/buddy_chat.c:253 src/dialogs.c:1376
+#: src/buddy_chat.c:316 src/dialogs.c:1325
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "��研���糸�ヤ算篏�筝�����������ヨ��紊������荐���絎���"
 
-#: src/buddy_chat.c:267
+#: src/buddy_chat.c:330
 msgid "Join Chat"
 msgstr "���ヨ��紊�"
 
-#: src/buddy_chat.c:273
+#: src/buddy_chat.c:336
 msgid "Buddy Chat"
 msgstr "��絅遵���紊�"
 
-#: src/buddy_chat.c:283
+#: src/buddy_chat.c:346
 msgid "Join Chat As:"
 msgstr "���ヨ��紊��削�"
 
 #. Join button.
-#: src/buddy_chat.c:306
+#: src/buddy_chat.c:369
 msgid "Join"
 msgstr "����"
 
@@ -3765,7 +3983,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1967
+#: src/conversation.c:1926
 #, c-format
 msgid "%s entered the room."
 msgstr "%s �峨�ヨ��紊����"
@@ -3775,51 +3993,51 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "��紊���� %d 絎銀�"
-#: src/conversation.c:1970
+#: src/conversation.c:1929
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] �峨�ヨ��紊����"
 
-#: src/conversation.c:2019
+#: src/conversation.c:1979
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �壕��援┗�� %s"
 
-#: src/conversation.c:2062
+#: src/conversation.c:2021
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s �∫����紊�� (%s)��"
 
-#: src/conversation.c:2064
+#: src/conversation.c:2023
 #, c-format
 msgid "%s left the room."
 msgstr "%s �∫����紊����"
 
-#: src/conversation.c:2250
+#: src/conversation.c:2224
 msgid "Last created window"
 msgstr "筝�筝���������荀�腦�"
 
-#: src/conversation.c:2252
+#: src/conversation.c:2226
 msgid "New window"
 msgstr "�域�腦�"
 
-#: src/conversation.c:2254
+#: src/conversation.c:2228
 msgid "By group"
 msgstr "箴�臂ょ�"
 
-#: src/conversation.c:2256
+#: src/conversation.c:2230
 msgid "By account"
 msgstr "箴�絽活��"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:345
 msgid "Warn User"
 msgstr "茘���篏睡����"
 
-#: src/dialogs.c:363
+#: src/dialogs.c:345
 msgid "_Warn"
 msgstr "茘���(_W)"
 
-#: src/dialogs.c:379
+#: src/dialogs.c:361
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3831,36 +4049,36 @@
 "\n"
 "������篏�絨���紜��� %s ��茘���膈�膣�鐚�����篁� / 絅劫�茴����銀札�翫�贋�主���������吟��\n"
 
-#: src/dialogs.c:388
+#: src/dialogs.c:370
 msgid "Warn _anonymously?"
 msgstr "篁ュ�水����荳�蚕�弱�肴⑥��鐚�(_A)"
 
-#: src/dialogs.c:395
+#: src/dialogs.c:377
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr "<b>�水����茘���罸�莠�筝�羃����i瑳�顔����</b>"
 
-#: src/dialogs.c:466
+#: src/dialogs.c:447
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "��③荅���絨� %s  緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
-#: src/dialogs.c:468 src/dialogs.c:469
+#: src/dialogs.c:449 src/dialogs.c:450
 msgid "Remove Buddy"
 msgstr "腱脂�ゅソ��"
 
-#: src/dialogs.c:477
+#: src/dialogs.c:459
 #, 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:479 src/dialogs.c:480
+#: src/dialogs.c:461 src/dialogs.c:462
 msgid "Remove Chat"
 msgstr "腱脂�よ��紊��"
 
-#: src/dialogs.c:488
+#: src/dialogs.c:471
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3868,53 +4086,53 @@
 msgstr ""
 "��③荅���絨�臂ょ� %s ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
-#: src/dialogs.c:491 src/dialogs.c:492
+#: src/dialogs.c:474 src/dialogs.c:475
 msgid "Remove Group"
 msgstr "腱脂�ょ召腟�"
 
-#: src/dialogs.c:645
+#: src/dialogs.c:624
 msgid "New Message"
 msgstr "�域���"
 
-#: src/dialogs.c:663
+#: src/dialogs.c:642
 msgid "Please enter the screenname of the person you would like to IM.\n"
 msgstr "茫�莠後�ユ�����活��守���恰��荐����莟∞��絽活����\n"
 
-#: src/dialogs.c:679 src/dialogs.c:785 src/dialogs.c:3793
+#: src/dialogs.c:658 src/dialogs.c:735 src/dialogs.c:3759
 msgid "_Screenname:"
 msgstr "絽活��(_S)鐚�"
 
-#: src/dialogs.c:694 src/dialogs.c:801 src/gtkpounce.c:520
+#: src/dialogs.c:673 src/dialogs.c:751 src/gtkpounce.c:408
 msgid "_Account:"
 msgstr "絽活��(_A)鐚�"
 
-#: src/dialogs.c:754
+#: src/dialogs.c:704
 msgid "Get User Info"
 msgstr "��緇�篏睡����莖�荐�"
 
-#: src/dialogs.c:773
+#: src/dialogs.c:723
 msgid ""
 "Please enter the screenname of the person whose info you would like to "
 "view.\n"
 msgstr "茫�莠後�ユ�����活��ヨ�絨�莟∞��絽活����\n"
 
-#: src/dialogs.c:956
+#: src/dialogs.c:881
 msgid "Add Group"
 msgstr "���ョ召腟�"
 
-#: src/dialogs.c:973
+#: src/dialogs.c:898
 msgid "Please enter the name of the group to be added.\n"
 msgstr "茫�莠後�ョ召腟���腮延札�画��医���\n"
 
-#: src/dialogs.c:982 src/dialogs.c:4344
+#: src/dialogs.c:907 src/dialogs.c:4311
 msgid "_Group:"
 msgstr "臂ょ�(_G)鐚�"
 
-#: src/dialogs.c:1069
+#: src/dialogs.c:943
 msgid "Add Buddy"
 msgstr "�医�絅遵�"
 
-#: src/dialogs.c:1088
+#: src/dialogs.c:962
 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. "
@@ -3923,355 +4141,330 @@
 "茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�������荐㊤�絨���"
 "��ソ��羝���賢蕁�ず��\n"
 
-#: src/dialogs.c:1107
+#: src/dialogs.c:981
 msgid "Screen Name"
 msgstr "絽活��"
 
-#: src/dialogs.c:1120
+#: src/dialogs.c:994
 msgid "Alias"
 msgstr "�ュ��"
 
-#: src/dialogs.c:1130
+#: src/dialogs.c:1004
 msgid "Group"
 msgstr "臂ょ�"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:1139
+#: src/dialogs.c:1013
 msgid "Add To"
 msgstr "紜�����"
 
-#: src/dialogs.c:1383
+#: src/dialogs.c:1332
 msgid "Add Chat"
 msgstr "���ヨ��紊��"
 
-#: src/dialogs.c:1406
+#: src/dialogs.c:1355
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr "茫�莠後�ュ�ュ��鐚��������惹�����喝���ュソ��羝�������紊�������区�荐���\n"
 
-#: src/dialogs.c:1415
+#: src/dialogs.c:1364
 msgid "Account:"
 msgstr "絽活��鐚�"
 
-#: src/dialogs.c:1434
+#: src/dialogs.c:1383 src/gtkaccount.c:455
 msgid "Alias:"
 msgstr "�ュ��鐚�"
 
-#: src/dialogs.c:1445
+#: src/dialogs.c:1394
 msgid "Group:"
 msgstr "臂ょ�鐚�"
 
+#: src/dialogs.c:1740
+msgid "Privacy"
+msgstr "�援�荐㊤�"
+
+#: src/dialogs.c:1756
+msgid "Changes to privacy settings take effect immediately."
+msgstr "�援�荐㊤�絨�腴��紫������"
+
+#: src/dialogs.c:1765
+msgid "Set privacy for:"
+msgstr "絽活��鐚�"
+
 #: src/dialogs.c:1782
-msgid "Privacy"
-msgstr "�援�荐㊤�"
-
-#: src/dialogs.c:1793
-msgid "Changes to privacy settings take effect immediately."
-msgstr "�援�荐㊤�絨�腴��紫������"
-
-#: src/dialogs.c:1802
-msgid "Set privacy for:"
-msgstr "絽活��鐚�"
-
-#: src/dialogs.c:1819
 msgid "Allow all users to contact me"
 msgstr "��荐掩������篏睡����������機"
 
-#: src/dialogs.c:1823
+#: src/dialogs.c:1786
 msgid "Allow only users on my buddy list"
 msgstr "����荐怨ソ��羝���賢��篏睡����"
 
-#: src/dialogs.c:1827
+#: src/dialogs.c:1790
 msgid "Allow only the users below"
 msgstr "��荐延�����篏睡����������機"
 
-#: src/dialogs.c:1865
+#: src/dialogs.c:1828
 msgid "Deny all users"
 msgstr "��腟�����篏睡����"
 
-#: src/dialogs.c:1869
+#: src/dialogs.c:1832
 msgid "Block the users below"
 msgstr "��腟�篁ヤ���篏睡����"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:1948
 msgid "Set Directory Info"
 msgstr "荐㊤�篏睡����莖�荐�"
 
-#: src/dialogs.c:1996
+#: src/dialogs.c:1956
 msgid "Directory Info"
 msgstr "����莖�荐�"
 
-#: src/dialogs.c:2006
+#: src/dialogs.c:1966
 #, c-format
 msgid "Setting Dir Info for %s:"
 msgstr "荐㊤� %s ��篏睡����莖�荐�鐚�"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:1979
 msgid "Allow Web Searches To Find Your Info"
 msgstr "��荐怨�� Web ��絨�箴�罟∵�������篋肴�荐�"
 
-#. Line 1
-#: src/dialogs.c:2022 src/dialogs.c:2673
-msgid "First Name"
-msgstr "��"
-
 #. Line 2
-#: src/dialogs.c:2033 src/dialogs.c:2683
+#: src/dialogs.c:1993 src/dialogs.c:2646
 msgid "Middle Name"
 msgstr ""
 
-#. Line 3
-#: src/dialogs.c:2045 src/dialogs.c:2693
-msgid "Last Name"
-msgstr "紮�"
-
 # NOTE��絨����鎀ф�箙���札鐚�篏���Maiden Name����絽娯�����������������
 #. Line 4
-#: src/dialogs.c:2056 src/dialogs.c:2703
+#: src/dialogs.c:2016 src/dialogs.c:2666
 msgid "Maiden Name"
 msgstr "���"
 
-#. Line 6
-#: src/dialogs.c:2078 src/dialogs.c:2722
-msgid "State"
-msgstr "���怨�"
-
-#: src/dialogs.c:2120 src/dialogs.c:2297 src/dialogs.c:3462 src/dialogs.c:4265
-#: src/dialogs.c:5015
-msgid "Save"
-msgstr "�峨�"
-
-#: src/dialogs.c:2143
+#: src/dialogs.c:2103
 msgid "New passwords do not match."
 msgstr "�医�腆寂研筝��悟���"
 
-#: src/dialogs.c:2149
+#: src/dialogs.c:2109
 msgid "Fill out all fields completely."
 msgstr "茫�絎�������茵��主��紂����"
 
-#: src/dialogs.c:2195
+#: src/dialogs.c:2154
 #, c-format
 msgid "Changing password for %s:"
 msgstr "篆��� %s ��絲�腆種�"
 
-#: src/dialogs.c:2203
+#: src/dialogs.c:2162
 msgid "Original Password"
 msgstr "��絲�腆�"
 
-#: src/dialogs.c:2214
+#: src/dialogs.c:2173
 msgid "New Password"
 msgstr "�医�腆�"
 
-#: src/dialogs.c:2225
+#: src/dialogs.c:2184
 msgid "New Password (again)"
 msgstr "�医�腆種���罨∞∈茯�鐚�"
 
-#: src/dialogs.c:2273
+#: src/dialogs.c:2233
 #, c-format
 msgid "Changing info for %s:"
 msgstr "篆��� %s ��莖�荐�鐚�"
 
-#: src/dialogs.c:2355
+#: src/dialogs.c:2319
 msgid "Below are the results of your search: "
 msgstr "篁ヤ����������ヨ���腟���鐚�"
 
-#: src/dialogs.c:2466
+#: src/dialogs.c:2430
 msgid "Permit"
 msgstr "荐怨�"
 
-#: src/dialogs.c:2498
+#: src/dialogs.c:2462
 msgid "Add Permit"
 msgstr "����┗��"
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2464
 msgid "Add Deny"
 msgstr "���ユ��腟�"
 
-#: src/dialogs.c:2568
+#: src/dialogs.c:2531
 msgid "Log Conversation"
 msgstr "荐���篋よ�"
 
-#: src/dialogs.c:2649 src/dialogs.c:2782
+#: src/dialogs.c:2612 src/dialogs.c:2745
 msgid "Search for Buddy"
 msgstr "�上�絅遵�"
 
-#: src/dialogs.c:2749
+#: src/dialogs.c:2712
 msgid "Find Buddy By Info"
 msgstr "篁ヨ�荐��上�絅遵�"
 
-#: src/dialogs.c:2776
+#: src/dialogs.c:2739
 msgid "Find Buddy By Email"
 msgstr "篁ラ�糸��灸散箴��上�絅遵�"
 
-#: src/dialogs.c:2880
+#: src/dialogs.c:2843
 msgid "Insert Link"
 msgstr "���ラ�g�"
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:2845
 msgid "Insert"
 msgstr "����"
 
-#: src/dialogs.c:2901
+#: src/dialogs.c:2864
 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:3070 src/dialogs.c:3087
+#: src/dialogs.c:3033 src/dialogs.c:3050
 msgid "Select Text Color"
 msgstr "荐㊤���絖�蕁��"
 
-#: src/dialogs.c:3122 src/dialogs.c:3139
+#: src/dialogs.c:3085 src/dialogs.c:3102
 msgid "Select Background Color"
 msgstr "頥㊤��������"
 
-#: src/dialogs.c:3234 src/dialogs.c:3260
+#: src/dialogs.c:3199 src/dialogs.c:3225
 msgid "Select Font"
 msgstr "�御��絖���"
 
-#: src/dialogs.c:3326
+#: src/dialogs.c:3291
 msgid "You cannot save an away message with a blank title"
 msgstr "����遵�峨�筝���羃����������∫��荐���"
 
-#: src/dialogs.c:3328
+#: src/dialogs.c:3293
 msgid ""
 "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "茫�腟��荐������罔�蕁�鐚�������篏睡����箴�篏睡�������筝��峨�絎���"
 
-#: src/dialogs.c:3338
+#: src/dialogs.c:3303
 msgid "You cannot create an empty away message"
 msgstr "���≧�綮榊�筝���腥榊�順���∫��荐���"
 
-#: src/dialogs.c:3403 src/dialogs.c:3411
+#: src/dialogs.c:3368 src/dialogs.c:3376
 msgid "New away message"
 msgstr "�亥���∫��荐���"
 
-#: src/dialogs.c:3421
+#: src/dialogs.c:3386
 msgid "Away title: "
 msgstr "�∫������鐚�"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3431
 msgid "Save & Use"
 msgstr "�峨�筝�戎��"
 
-#: src/dialogs.c:3470
+#: src/dialogs.c:3435
 msgid "Use"
 msgstr "篏睡��"
 
 #. show everything
-#: src/dialogs.c:3618
+#: src/dialogs.c:3584
 msgid "Smile!"
 msgstr "膃�筝���鐚�"
 
-#: src/dialogs.c:3664 src/dialogs.c:3742
-msgid "Alias Buddy"
-msgstr "�阪ソ����筝��ュ��"
+#: src/dialogs.c:3630
+msgid "Alias Chat"
+msgstr "腟���紊���劫�ュ��"
 
 #. Setup the label containing the description.
-#: src/dialogs.c:3693
+#: src/dialogs.c:3659
 msgid "Please enter an aliased name for this chat.\n"
 msgstr "茫��咲������紊��莠後�ヤ����ュ����\n"
 
-#: src/dialogs.c:3705 src/dialogs.c:3807
+#: src/dialogs.c:3671 src/dialogs.c:3774
 msgid "_Alias:"
 msgstr "�ュ��(_A)鐚�"
 
-# XXX 筝����ュソ�鋇�緇�����鐚�����������筝㊥��筝�絅�
-# ANS ����茘����荅我����馹���鐚��決����ュ����箴���絲���篏睡����羈�鐚�
-#     篏�������筝���篋阪��...���合�堺�亥��茘��...��
+#: src/dialogs.c:3708
+msgid "Alias Buddy"
+msgstr "�寯ソ����筝��ュ��"
+
+# NOTE ����茘����荅我����馹���鐚��決����ュ����箴���絲���篏睡����羈�鐚�
+# NOTE 篏�������筝���篋阪��...���合�堺�亥��茘��...��
 #. Setup the label containing the description.
-#: src/dialogs.c:3772
+#: src/dialogs.c:3738
 msgid ""
 "Please enter an aliased name for the person below, or rename this contact in "
 "your buddy list.\n"
 msgstr "顇��咲����絅遵�荐㊤��ュ��鐚������贋�剛���ソ��羝���賢��荐�����絽活����\n"
 
-#: src/dialogs.c:3861 src/dialogs.c:3868
+#: src/dialogs.c:3828 src/dialogs.c:3835
 #, c-format
 msgid "Couldn't write to %s."
 msgstr "�≧�絲��ュ�� %s��"
 
-#: src/dialogs.c:3892
+#: src/dialogs.c:3859
 msgid "Save Log File"
 msgstr "�峨��ヨ�罟�"
 
-#: src/dialogs.c:3922
+#: src/dialogs.c:3889
 #, c-format
 msgid "Couldn't remove file %s."
 msgstr "�≧����ゆ�罅� %s��"
 
-#: src/dialogs.c:3941
+#: src/dialogs.c:3908
 msgid "Clear Log"
 msgstr "羝��ゆ�ヨ�"
 
-#: src/dialogs.c:3950
+#: src/dialogs.c:3917
 msgid "Really clear log?"
 msgstr "����荀�羝��ゆ�ヨ����"
 
-#: src/dialogs.c:3995
+#: src/dialogs.c:3962
 #, c-format
 msgid "Couldn't open log file %s."
 msgstr "�≧������ヨ�罟� %s��"
 
-#: src/dialogs.c:4137
+#: src/dialogs.c:4104
 #, c-format
 msgid "Conversations with %s"
 msgstr "�� %s ��篋よ�"
 
-#: src/dialogs.c:4139
+#: src/dialogs.c:4106
 msgid "System Log"
 msgstr "膤紫輝�ヨ�"
 
-#: src/dialogs.c:4160
+#: src/dialogs.c:4127
 #, c-format
 msgid "Couldn't open log file %s"
 msgstr "�≧������ヨ�罟� %s"
 
-#: src/dialogs.c:4181
+#: src/dialogs.c:4148
 msgid "Date"
 msgstr "�ユ��"
 
-#: src/dialogs.c:4238
+#: src/dialogs.c:4205
 msgid "Log"
 msgstr "�ヨ�"
 
-#: src/dialogs.c:4260
+#: src/dialogs.c:4227
 msgid "Clear"
 msgstr "羝���"
 
-#: src/dialogs.c:4318
+#: src/dialogs.c:4285
 msgid "Rename Group"
 msgstr "篆��合召腟���腮�"
 
-#: src/dialogs.c:4335
+#: src/dialogs.c:4302
 msgid "Please enter a new name for the selected group.\n"
 msgstr "茫��咲�後���臂ょ�莠後�ヤ����亥����腮宴��\n"
 
-#: src/dialogs.c:4411 src/dialogs.c:4420
-msgid "Rename Buddy"
-msgstr "篆��劫ソ����腮�"
-
-#: src/dialogs.c:4427
-msgid "New name:"
-msgstr "�医��絖�鐚�"
-
-#: src/ft.c:135
+#: src/ft.c:121
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 筝������������罟�罅���腮宴��\n"
 
-#: src/ft.c:149
+#: src/ft.c:135
 #, c-format
 msgid "%s was not found.\n"
 msgstr "%s �鞘��違��\n"
 
-#: src/ft.c:741
+#: src/ft.c:727
 #, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "�渇��罟�罅��� %s 茴��羔���\n"
 
-#: src/ft.c:743
+#: src/ft.c:729
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr "�� %s �渇��罟�罅�茴��羔���\n"
@@ -4359,163 +4552,320 @@
 "����罩e���決��� Gaim\n"
 
 #. for people like myself, who are too lazy to add an away msg :)
-#: src/gaimrc.c:52
+#: src/gaimrc.c:41
 msgid "sorry, i ran out for a while. bbl"
 msgstr "筝�絅醇��������∫��筝�筝�筝���"
 
-#: src/gaimrc.c:368 src/gaimrc.c:1228
+#: src/gaimrc.c:362 src/gaimrc.c:1505
 msgid "boring default"
 msgstr "�∴��鐚���荐㍼�"
 
-#: src/gaimrc.c:1326
+#: src/gaimrc.c:1603
 #, c-format
 msgid "Could not open config file %s."
 msgstr "�≧�����荐㊤�罟� %s��"
 
-#: src/gtkblist.c:416
+# XXX 荀�茲��ヨ⑮��
+#: src/gtkaccount.c:280
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>罟���鐚�</b> %s\n"
+"<b>罟�罅�紊у�鐚�</b> %s\n"
+"<b>���鎞阪�鐚�</b> %d�%d"
+
+#. Build the login options frame.
+#: src/gtkaccount.c:355
+msgid "Login Options"
+msgstr "�糸�ラ�檎��"
+
+#: src/gtkaccount.c:372
+msgid "Protocol:"
+msgstr "��荐���絎�鐚�"
+
+#: src/gtkaccount.c:377
+msgid "Screenname:"
+msgstr "絽活��鐚�"
+
+#: src/gtkaccount.c:459
+msgid "Remember password"
+msgstr "荐�篏鎛�腆�"
+
+#. Build the user options frame.
+#: src/gtkaccount.c:513
+msgid "User Options"
+msgstr "篏睡��������檎��"
+
+#: src/gtkaccount.c:526
+msgid "New mail notifications"
+msgstr "�育�灸散����"
+
+#: src/gtkaccount.c:535
+msgid "Buddy icon file:"
+msgstr "絅遵���腓堺�罅�鐚�"
+
+#: src/gtkaccount.c:544
+msgid "_Browse"
+msgstr "�頳�(_B)"
+
+#: src/gtkaccount.c:550
+msgid "_Reset"
+msgstr "��臀�(_R)"
+
+#. Build the protocol options frame.
+#: src/gtkaccount.c:611
+#, c-format
+msgid "%s Options"
+msgstr "%s �檎��"
+
+#. Use Global Proxy Settings
+#: src/gtkaccount.c:732
+msgid "Use Global Proxy Settings"
+msgstr "篏睡��������篁g��篌堺����┃絎�"
+
+# NOTE ���怨����鐚�筝�����罸�����鐚��合�冴��筝�篏睡����
+#. No Proxy
+#: src/gtkaccount.c:739
+msgid "No Proxy"
+msgstr "筝�篏睡��撮��篌堺����"
+
+#. SOCKS 4
+#: src/gtkaccount.c:746
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#. SOCKS 5
+#: src/gtkaccount.c:753
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#. HTTP
+#: src/gtkaccount.c:760
+msgid "HTTP"
+msgstr "HTTP"
+
+#: src/gtkaccount.c:792
+msgid "you can see the butterflies mating"
+msgstr "藉�藉��頑�銀���緇�荀���"
+
+#: src/gtkaccount.c:796
+msgid "If you look real closely"
+msgstr "絋�������緇�紊�篁�膣�"
+
+#: src/gtkaccount.c:812
+msgid "Proxy Options"
+msgstr "篁g��篌堺�����檎��"
+
+#: src/gtkaccount.c:828 src/gtkprefs.c:1097
+msgid "Proxy _type:"
+msgstr "篁g��篌堺��������(_T)鐚�"
+
+#: src/gtkaccount.c:837
+msgid "_Host:"
+msgstr "筝紙�篏���(_H)鐚�"
+
+#: src/gtkaccount.c:841
+msgid "_Port:"
+msgstr "��荐���(_P)鐚�"
+
+#: src/gtkaccount.c:849
+msgid "_Username:"
+msgstr "篏睡����(_U)鐚�"
+
+#: src/gtkaccount.c:854
+msgid "Pa_ssword:"
+msgstr "絲�腆�(_S)鐚�"
+
+#: src/gtkaccount.c:1165
+msgid "Add Account"
+msgstr "�医�絽活��"
+
+#: src/gtkaccount.c:1167
+msgid "Modify Account"
+msgstr "篆��劫験��"
+
+#. Add the disclosure
+#: src/gtkaccount.c:1191
+msgid "Show more options"
+msgstr "蕁�ず莠�紊����檎��"
+
+#: src/gtkaccount.c:1192
+msgid "Show fewer options"
+msgstr "蕁�ず莠�絨����檎��"
+
+#. Register button
+#: src/gtkaccount.c:1220
+msgid "Register"
+msgstr "荐糸��"
+
+#: src/gtkaccount.c:1507
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "��∈絎�荀����� %s鐚�"
+
+#: src/gtkaccount.c:1511 src/gtkrequest.c:172
+msgid "Delete"
+msgstr "����"
+
+#: src/gtkaccount.c:1589
+msgid "Screenname"
+msgstr "絽活��"
+
+#: src/gtkaccount.c:1630
+msgid "Protocol"
+msgstr "��荐���絎�"
+
+#: src/gtkblist.c:409
 msgid "Add a _Buddy"
 msgstr "�医�筝���絅遵�(_B)"
 
-#: src/gtkblist.c:417
+#: src/gtkblist.c:411
 msgid "Add a C_hat"
 msgstr "�医�筝�����紊��(_H)"
 
-#: src/gtkblist.c:418
+#: src/gtkblist.c:413
 msgid "_Delete Group"
 msgstr "���ょ召腟�(_D)"
 
-#: src/gtkblist.c:419
+#: src/gtkblist.c:415
 msgid "_Rename"
 msgstr "���遵��(_R)"
 
-#: src/gtkblist.c:421
+#: src/gtkblist.c:423
 msgid "_Join"
 msgstr "����(_J)"
 
-#: src/gtkblist.c:422 src/gtkblist.c:453
+#: src/gtkblist.c:425
+msgid "Auto-Join"
+msgstr "��������"
+
+#: src/gtkblist.c:428 src/gtkblist.c:474
 msgid "_Alias"
 msgstr "�ュ��(_A)"
 
-#: src/gtkblist.c:423 src/gtkblist.c:454
+#: src/gtkblist.c:430 src/gtkblist.c:476
 msgid "_Remove"
 msgstr "腱脂��(_R)"
 
-#: src/gtkblist.c:432
+#: src/gtkblist.c:448
 msgid "_Get Info"
 msgstr "��緇�莖�荐�(_G)"
 
-#: src/gtkblist.c:434
+#: src/gtkblist.c:451
 msgid "_IM"
 msgstr "�恰��荐���(_I)"
 
-#: src/gtkblist.c:435
+#: src/gtkblist.c:453
 msgid "Add Buddy _Pounce"
 msgstr "���ュソ����������(_P)"
 
-#: src/gtkblist.c:436
+#: src/gtkblist.c:455
 msgid "View _Log"
 msgstr "茹����ヨ�(_L)"
 
 #. Buddies menu
-#: src/gtkblist.c:757
+#: src/gtkblist.c:780
 msgid "/_Buddies"
 msgstr "/絅遵�(_B)"
 
-#: src/gtkblist.c:758
+#: src/gtkblist.c:781
 msgid "/Buddies/New _Instant Message..."
 msgstr "/絅遵�/�医�恰��荐���(_I)"
 
-#: src/gtkblist.c:759
+#: src/gtkblist.c:782
 msgid "/Buddies/Join a _Chat..."
 msgstr "/絅遵�/���ヨ��紊��(_C)"
 
-#: src/gtkblist.c:760
+#: src/gtkblist.c:783
 msgid "/Buddies/Get _User Info..."
 msgstr "/絅遵�/��緇�篏睡����莖�荐�(_U)"
 
-#: src/gtkblist.c:762
+#: src/gtkblist.c:785
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�(_O)"
 
-#: src/gtkblist.c:763
+#: src/gtkblist.c:786
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊�順��臂ょ�(_E)"
 
-#: src/gtkblist.c:764
+#: src/gtkblist.c:787
 msgid "/Buddies/_Add a Buddy..."
 msgstr "/絅遵�/�医�筝���絅遵�(_A)"
 
-#: src/gtkblist.c:765
+#: src/gtkblist.c:788
 msgid "/Buddies/Add a C_hat..."
 msgstr "/絅遵�/�医�筝�����紊��(_H)"
 
-#: src/gtkblist.c:766
+#: src/gtkblist.c:789
 msgid "/Buddies/Add a _Group..."
 msgstr "/絅遵�/�医�筝���臂ょ�(_G)"
 
-#: src/gtkblist.c:768
+#: src/gtkblist.c:791
 msgid "/Buddies/_Signoff"
 msgstr "/絅遵�/�糸��(_S)"
 
-#: src/gtkblist.c:769
+#: src/gtkblist.c:792
 msgid "/Buddies/_Quit"
 msgstr "/絅遵�/腟���腮�綣�(_Q)"
 
 #. Tools
-#: src/gtkblist.c:772
+#: src/gtkblist.c:795
 msgid "/_Tools"
 msgstr "綏ュ��(_T)"
 
-#: src/gtkblist.c:773
+#: src/gtkblist.c:796
 msgid "/Tools/_Away"
 msgstr "/綏ュ��/�∫��(_A)"
 
-#: src/gtkblist.c:774
+#: src/gtkblist.c:797
 msgid "/Tools/Buddy _Pounce"
 msgstr "/綏ュ��/絅遵���������(_P)"
 
-#: src/gtkblist.c:775
+#: src/gtkblist.c:798
 msgid "/Tools/P_rotocol Actions"
 msgstr "/綏ュ��/��荐���絎��檎��荐㊤�(_R)"
 
-#: src/gtkblist.c:777
-msgid "/Tools/A_ccounts..."
+#: src/gtkblist.c:800
+msgid "/Tools/A_ccounts"
 msgstr "/綏ュ��/絽活��羝���(_C)"
 
-#: src/gtkblist.c:778
+#: src/gtkblist.c:801
 msgid "/Tools/_File Transfers..."
 msgstr "/綏ュ��/罟�罅��活叱(_F)"
 
-#: src/gtkblist.c:779
-msgid "/Tools/Preferences..."
+#: src/gtkblist.c:802
+msgid "/Tools/Preferences"
 msgstr "/綏ュ��/�鎁処┃絎�"
 
-#: src/gtkblist.c:780
-msgid "/Tools/Pr_ivacy..."
+#: src/gtkblist.c:803
+msgid "/Tools/Pr_ivacy"
 msgstr "/綏ュ��/�援�荐㊤�(_I)"
 
-#: src/gtkblist.c:782
-msgid "/Tools/View System _Log..."
+#: src/gtkblist.c:805
+msgid "/Tools/View System _Log"
 msgstr "茹���膤紫輝�ヨ�(_L)"
 
 #. Help
-#: src/gtkblist.c:785
+#: src/gtkblist.c:808
 msgid "/_Help"
 msgstr "茯���(_H)"
 
-#: src/gtkblist.c:786
+#: src/gtkblist.c:809
 msgid "/Help/Online _Help"
 msgstr "膩�筝�茯���(_H)"
 
-#: src/gtkblist.c:787
-msgid "/Help/_Debug Window..."
+#: src/gtkblist.c:810
+msgid "/Help/_Debug Window"
 msgstr "/茯���/�ら���腦�(_D)"
 
-#: src/gtkblist.c:788
-msgid "/Help/_About..."
+#: src/gtkblist.c:811
+msgid "/Help/_About"
 msgstr "/茯���/����(_A)"
 
-#: src/gtkblist.c:822
+#: src/gtkblist.c:845
 #, c-format
 msgid ""
 "\n"
@@ -4524,12 +4874,12 @@
 "\n"
 "<b>絽活��鐚�</b>%s"
 
-#: src/gtkblist.c:881
+#: src/gtkblist.c:907
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/gtkblist.c:895
+#: src/gtkblist.c:921
 msgid ""
 "\n"
 "<b>Account:</b>"
@@ -4537,7 +4887,7 @@
 "\n"
 "<b>絽活��鐚�</b>"
 
-#: src/gtkblist.c:896
+#: src/gtkblist.c:922
 msgid ""
 "\n"
 "<b>Alias:</b>"
@@ -4545,7 +4895,7 @@
 "\n"
 "<b>�ュ��鐚�</b>"
 
-#: src/gtkblist.c:897
+#: src/gtkblist.c:923
 msgid ""
 "\n"
 "<b>Nickname:</b>"
@@ -4553,7 +4903,7 @@
 "\n"
 "<b>�援┗鐚�</b>"
 
-#: src/gtkblist.c:898
+#: src/gtkblist.c:924
 msgid ""
 "\n"
 "<b>Idle:</b>"
@@ -4561,7 +4911,7 @@
 "\n"
 "<b>��臀��</b>"
 
-#: src/gtkblist.c:899
+#: src/gtkblist.c:925
 msgid ""
 "\n"
 "<b>Warned:</b>"
@@ -4569,15 +4919,15 @@
 "\n"
 "<b>茘���鐚�<b>"
 
-#: src/gtkblist.c:901
+#: src/gtkblist.c:927
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 "\n"
-"<b>篁�膣刻�</b>綛初��"
-
-#: src/gtkblist.c:902
+"<b>篁�膣刻�</b>綛初��篌主��"
+
+#: src/gtkblist.c:928
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
@@ -4585,497 +4935,622 @@
 "\n"
 "<b>����鐚�</b>緇�絅�"
 
-#: src/gtkblist.c:1198
+# XXX �h�絖�鐚�紊ф���荅画⑮���h�?!
+#: src/gtkblist.c:929
+msgid ""
+"\n"
+"<b>Status</b>: Rockin'"
+msgstr ""
+"\n"
+"<b>����鐚�</b>緇�絅�"
+
+#: src/gtkblist.c:1226
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr "��臀��%d 絨�� %d ����"
 
-#: src/gtkblist.c:1200
+#: src/gtkblist.c:1228
 #, c-format
 msgid "Idle (%dm) "
 msgstr "��臀��%d ��鐚�"
 
-#: src/gtkblist.c:1204
+#: src/gtkblist.c:1232
 #, c-format
 msgid "Warned (%d%%) "
 msgstr "茘��� (%d%%)"
 
-#: src/gtkblist.c:1207
+#: src/gtkblist.c:1235
 msgid "Offline "
 msgstr "�∝�"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1357 src/gtkblist.c:2181
-#: src/gtkprefs.c:902 src/gtkprefs.c:1466
+#: src/gtkblist.c:1391 src/gtkprefs.c:842 src/gtkprefs.c:1516
 msgid "None"
 msgstr "��"
 
-#: src/gtkblist.c:1354
+#: src/gtkblist.c:1392
 msgid "Alphabetical"
 msgstr "箴��у�罸�"
 
-#: src/gtkblist.c:1355
+#: src/gtkblist.c:1393
 msgid "By status"
 msgstr "箴��х����"
 
-#: src/gtkblist.c:1356
+#: src/gtkblist.c:1394
 msgid "By log size"
 msgstr "箴��ф�ヨ�紊у�"
 
-#: src/gtkblist.c:1382 src/gtkprefs.c:2191
+#: src/gtkblist.c:1430 src/gtkprefs.c:2270
 msgid "Buddy List"
 msgstr "絅遵�羝���"
 
-#: src/gtkblist.c:1406
+#: src/gtkblist.c:1454
 msgid "/Tools/Away"
 msgstr "/綏ュ��/�∫��"
 
-#: src/gtkblist.c:1409
+#: src/gtkblist.c:1457
 msgid "/Tools/Buddy Pounce"
 msgstr "/綏ュ��/絅遵���������"
 
-#: src/gtkblist.c:1412
+#: src/gtkblist.c:1460
 msgid "/Tools/Protocol Actions"
 msgstr "/綏ュ��/��荐���絎��檎��荐㊤�"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:1495
+#: src/gtkblist.c:1543
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/絅遵�/蕁�ず�∝�絅遵�"
 
-#: src/gtkblist.c:1497
+#: src/gtkblist.c:1545
 msgid "/Buddies/Show Empty Groups"
 msgstr "/絅遵�/蕁�ず腥榊��絅順��臂ょ�"
 
-#: src/gtkblist.c:1515 src/gtkconv.c:772
+#: src/gtkblist.c:1563 src/gtkconv.c:1071
 msgid "IM"
 msgstr "�恰��荐���"
 
-#: src/gtkblist.c:1521
+#: src/gtkblist.c:1569
 msgid "Send a message to the selected buddy"
 msgstr "�渇��荐���畿茴��後���絅遵�"
 
-#: src/gtkblist.c:1530
+#: src/gtkblist.c:1578
 msgid "Get information on the selected buddy"
 msgstr "��緇�茴��後�絅遵���莖�荐�"
 
-#: src/gtkblist.c:1538
+#: src/gtkblist.c:1586
 msgid "Join a chat room"
 msgstr "���ヤ�����紊��"
 
-#: src/gtkblist.c:1546
+#: src/gtkblist.c:1594
 msgid "Set an away message"
 msgstr "荐㊤�筝����∫��荐���"
 
-#: src/gtkconv.c:220
+#: src/gtkblist.c:2584
+msgid "No actions available"
+msgstr "筝���荐延算篏���篏�"
+
+#: src/gtkconn.c:58 src/gtkconn.c:239 src/gtkconn.c:274 src/gtkconn.c:383
+#: src/multi.c:91
+msgid "Done."
+msgstr "絎�����"
+
+#: src/gtkconn.c:133 src/multi.c:167
+msgid "Signon: "
+msgstr "�糸�ワ�"
+
+#: src/gtkconn.c:191 src/multi.c:225
+msgid "Signon"
+msgstr "�糸��"
+
+#: src/gtkconn.c:204 src/multi.c:237
+msgid "Cancel All"
+msgstr "�����羔�"
+
+#: src/gtkconn.c:258
+msgid "Enter your password."
+msgstr "茫�莠後�ユ����絲�腆若��"
+
+#: src/gtkconn.c:374 src/multi.c:292
+#, c-format
+msgid ""
+"%s\n"
+"%s: %s"
+msgstr ""
+"%s\n"
+"%s: %s"
+
+#: src/gtkconn.c:396 src/multi.c:314
+#, c-format
+msgid "%s was unable to sign on"
+msgstr "%s �≧��糸��"
+
+#: src/gtkconn.c:398 src/multi.c:316
+msgid "Signon Error"
+msgstr "�糸�ラ���"
+
+#: src/gtkconn.c:411 src/multi.c:329
+msgid "Notice"
+msgstr "����"
+
+#: src/gtkconn.c:425 src/multi.c:343
+#, c-format
+msgid "%s has been signed off"
+msgstr "%s 綏牙��糸��"
+
+#: src/gtkconn.c:427 src/multi.c:345
+msgid "Connection Error"
+msgstr "�g����"
+
+#: src/gtkconv.c:182
+msgid "That file already exists"
+msgstr "�e��罟�罅�綏牙�絖���"
+
+#: src/gtkconv.c:183 src/gtkft.c:1034
+msgid "Would you like to overwrite it?"
+msgstr "���荀���絎����"
+
+#: src/gtkconv.c:278
 msgid "Gaim - Insert Image"
 msgstr "Gaim - ���ュ襲��"
 
-#: src/gtkconv.c:780
-msgid "Un-Ignore"
-msgstr "��羔�綽順�ヤ戎����"
-
-#: src/gtkconv.c:782 src/gtkprefs.c:832
-msgid "Ignore"
-msgstr "綽順�ヤ戎����"
-
-#. Info button
-#: src/gtkconv.c:791 src/gtkconv.c:2679
-msgid "Info"
-msgstr "荐����у�"
-
-#: src/gtkconv.c:811 src/gtkconv.c:2662 src/gtkconv.c:3789
-msgid "Remove"
-msgstr "腱脂��"
-
-#: src/gtkconv.c:885
+#: src/gtkconv.c:580
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - ��茫�絅遵��峨�ヨ��紊��"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:913
+#: src/gtkconv.c:608
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "茫�莠後�ユ���渇��茫���篏睡������腮縁�篁ュ���茫���荐�����"
 
-#: src/gtkconv.c:934
+#: src/gtkconv.c:629
 msgid "_Buddy:"
 msgstr "絅遵�(_B)鐚�"
 
-#: src/gtkconv.c:954
+#: src/gtkconv.c:649
 msgid "_Message:"
 msgstr "荐���(_M)鐚�"
 
-#: src/gtkconv.c:1983
+#: src/gtkconv.c:1079
+msgid "Un-Ignore"
+msgstr "��羔�綽順�ヤ戎����"
+
+#: src/gtkconv.c:1081 src/gtkprefs.c:774
+msgid "Ignore"
+msgstr "綽順�ヤ戎����"
+
+# XXX��Info����篏���室箙����緇�篏睡����莖�荐�鐚�篏�筝����鐚���篋��銀�po罟�篁������������藝�
+# XXX javajsp (Ka-Hing CHEUNG) 荀�������Info����膣����醇������緇�篏睡����莖�荐���
+#. Info button
+#: src/gtkconv.c:1090 src/gtkconv.c:3017
+msgid "Info"
+msgstr "��緇�篏睡����莖�荐�"
+
+#: src/gtkconv.c:1110 src/gtkconv.c:3000 src/gtkconv.c:4144
+#: src/gtkrequest.c:174
+msgid "Remove"
+msgstr "腱脂��"
+
+#: src/gtkconv.c:2228
 msgid "User is typing..."
 msgstr "篏睡����罩e��叱��..."
 
-#: src/gtkconv.c:1991
+#: src/gtkconv.c:2236
 msgid "User has typed something and paused"
 msgstr "篏睡����莠後�ヤ�篋��沿タ鐚�筝�����������莠後��"
 
 #. Build the Send As menu
-#: src/gtkconv.c:2098
+#: src/gtkconv.c:2340
 msgid "_Send As"
 msgstr "篏睡��験��(_S)"
 
+#: src/gtkconv.c:2796
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - �峨���紊��у�"
+
 #. Conversation menu
-#: src/gtkconv.c:2552
+#: src/gtkconv.c:2813
 msgid "/_Conversation"
 msgstr "/篋よ�(_C)"
 
-#: src/gtkconv.c:2553
+#: src/gtkconv.c:2815
 msgid "/Conversation/_Save As..."
 msgstr "/篋よ�/����井�(_S)..."
 
-#: src/gtkconv.c:2555
+#: src/gtkconv.c:2817
 msgid "/Conversation/View _Log..."
 msgstr "/篋よ�/茹���罩桁兓���(_L)"
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2821
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/篋よ�/�医�絅遵���������(_P)..."
+
+#: src/gtkconv.c:2823
+msgid "/Conversation/A_lias..."
+msgstr "/篋よ�/�ュ��(_L)..."
+
+#: src/gtkconv.c:2825
+msgid "/Conversation/_Get Info..."
+msgstr "/篋よ�/��緇�莖�荐�(_G)..."
+
+#: src/gtkconv.c:2827
+msgid "/Conversation/In_vite..."
+msgstr "/篋よ�/��茫�(_V)..."
+
+#: src/gtkconv.c:2832
 msgid "/Conversation/Insert _URL..."
 msgstr "/篋よ�/���� URL(_U)"
 
-#: src/gtkconv.c:2559
+#: src/gtkconv.c:2834
 msgid "/Conversation/Insert _Image..."
 msgstr "/篋よ�/���ュ襲��(_I)"
 
-#: src/gtkconv.c:2562
+#: src/gtkconv.c:2839
+msgid "/Conversation/_Warn..."
+msgstr "/篋よ�/茘���(_W)..."
+
+#: src/gtkconv.c:2841
+msgid "/Conversation/_Block..."
+msgstr "/篋よ�/絨���(_B)..."
+
+#: src/gtkconv.c:2843
+msgid "/Conversation/_Add..."
+msgstr "/篋よ�/�医�(_A)..."
+
+#: src/gtkconv.c:2845
+msgid "/Conversation/_Remove..."
+msgstr "/篋よ�/腱脂��(_R)..."
+
+#: src/gtkconv.c:2850
 msgid "/Conversation/_Close"
 msgstr "/篋よ�/����(_C)"
 
 #. Options
-#: src/gtkconv.c:2566
+#: src/gtkconv.c:2854
 msgid "/_Options"
 msgstr "/�檎��(_O)"
 
-#: src/gtkconv.c:2567
+#: src/gtkconv.c:2855
 msgid "/Options/Enable _Logging"
 msgstr "/�檎��/��紮�荐����ヨ�(_L)"
 
-#: src/gtkconv.c:2568
+#: src/gtkconv.c:2856
 msgid "/Options/Enable _Sounds"
 msgstr "/�檎��/�����恰��(_S)"
 
-#: src/gtkconv.c:2604
+#: src/gtkconv.c:2896
 msgid "/Conversation/View Log..."
 msgstr "/篋よ�/茹���罩桁兓���"
 
-#: src/gtkconv.c:2606
+#: src/gtkconv.c:2901
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/篋よ�/�医�絅遵���������..."
+
+#: src/gtkconv.c:2905
+msgid "/Conversation/Alias..."
+msgstr "/篋よ�/�ュ��..."
+
+#: src/gtkconv.c:2909
+msgid "/Conversation/Get Info..."
+msgstr "/篋よ�/��緇�莖�荐�..."
+
+#: src/gtkconv.c:2913
+msgid "/Conversation/Invite..."
+msgstr "/篋よ�/��茫�..."
+
+#: src/gtkconv.c:2919
 msgid "/Conversation/Insert URL..."
 msgstr "/篋よ�/���� URL..."
 
-#: src/gtkconv.c:2608
+#: src/gtkconv.c:2923
 msgid "/Conversation/Insert Image..."
 msgstr "/篋よ�/���ュ襲��..."
 
-#: src/gtkconv.c:2610
+#: src/gtkconv.c:2929
+msgid "/Conversation/Warn..."
+msgstr "/篋よ�/茘���..."
+
+#: src/gtkconv.c:2933
+msgid "/Conversation/Block..."
+msgstr "/篋よ�/絨���..."
+
+#: src/gtkconv.c:2937
+msgid "/Conversation/Add..."
+msgstr "/篋よ�/�医�..."
+
+#: src/gtkconv.c:2941
+msgid "/Conversation/Remove..."
+msgstr "/篋よ�/腱脂��..."
+
+#: src/gtkconv.c:2947
 msgid "/Options/Enable Logging"
 msgstr "/�檎��/��紮�荐����ヨ�"
 
-#: src/gtkconv.c:2612
+#: src/gtkconv.c:2950
 msgid "/Options/Enable Sounds"
 msgstr "/�檎��/�����恰��"
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:2636 src/gtkconv.c:2638 src/gtkconv.c:2736 src/gtkconv.c:2738
-#: src/gtkconv.c:5065
+#: src/gtkconv.c:2974 src/gtkconv.c:2976 src/gtkconv.c:3074 src/gtkconv.c:3076
+#: src/gtkconv.c:5718
 msgid "Send"
 msgstr "����"
 
-#: src/gtkconv.c:2659 src/gtkconv.c:3801
+#: src/gtkconv.c:2997 src/gtkconv.c:4162
 msgid "Add the user to your buddy list"
 msgstr "絨�篏睡�������ユ����絅遵�羝���"
 
-#: src/gtkconv.c:2665 src/gtkconv.c:3792
+#: src/gtkconv.c:3003 src/gtkconv.c:4147
 msgid "Remove the user from your buddy list"
 msgstr "絨�篏睡����������絅遵�羝���賢腱脂��"
 
 #. Warn button
-#: src/gtkconv.c:2672
+#: src/gtkconv.c:3010
 msgid "Warn"
 msgstr "茘���"
 
-#: src/gtkconv.c:2676
+#: src/gtkconv.c:3014
 msgid "Warn the user"
 msgstr "茘���篏睡����"
 
-#: src/gtkconv.c:2683 src/gtkconv.c:3116
+#: src/gtkconv.c:3021 src/gtkconv.c:3456
 msgid "Get the user's information"
 msgstr "��緇�篏睡����莖�荐�"
 
 #. Block button
-#: src/gtkconv.c:2686
+#: src/gtkconv.c:3024
 msgid "Block"
 msgstr "絨���"
 
-#: src/gtkconv.c:2690
+#: src/gtkconv.c:3028
 msgid "Block the user"
 msgstr "絨���篏睡����"
 
 #. Invite
-#: src/gtkconv.c:2748 src/gtkconv.c:5068
+#: src/gtkconv.c:3086 src/gtkconv.c:5721
 msgid "Invite"
 msgstr "��茫�"
 
-#: src/gtkconv.c:2751
+#: src/gtkconv.c:3089
 msgid "Invite a user"
 msgstr "��茫�篏睡����"
 
-#: src/gtkconv.c:2790
+#: src/gtkconv.c:3128
 msgid "Bold"
 msgstr "膕�蕭�"
 
-#: src/gtkconv.c:2801
+#: src/gtkconv.c:3139
 msgid "Italic"
 msgstr "��蕭�"
 
-#: src/gtkconv.c:2812
+#: src/gtkconv.c:3150
 msgid "Underline"
 msgstr "綺�膩�"
 
-#: src/gtkconv.c:2828
+#: src/gtkconv.c:3166
 msgid "Larger font size"
 msgstr "�上ぇ絖�蕭�"
 
-#: src/gtkconv.c:2840
+#: src/gtkconv.c:3178
 msgid "Normal font size"
 msgstr "罩e幻絖�蕭�"
 
-#: src/gtkconv.c:2852
+#: src/gtkconv.c:3190
 msgid "Smaller font size"
 msgstr "膰��絖�蕭�"
 
-#: src/gtkconv.c:2869
+#: src/gtkconv.c:3207
 msgid "Font Face"
 msgstr "絖���"
 
-#: src/gtkconv.c:2881
+#: src/gtkconv.c:3219
 msgid "Foreground font color"
 msgstr "�������"
 
-#: src/gtkconv.c:2893
+#: src/gtkconv.c:3231
 msgid "Background color"
 msgstr "�������"
 
-#: src/gtkconv.c:2908
+#: src/gtkconv.c:3246
 msgid "Insert image"
 msgstr "���ュ襲��"
 
-#: src/gtkconv.c:2919
+#: src/gtkconv.c:3257
 msgid "Insert link"
 msgstr "���ラ�g�"
 
-#: src/gtkconv.c:2930
+#: src/gtkconv.c:3268
 msgid "Insert smiley"
 msgstr "���ヨ;��"
 
-#: src/gtkconv.c:2987
+#: src/gtkconv.c:3325
 msgid "Topic:"
 msgstr "筝脂�鐚�"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3036
+#: src/gtkconv.c:3376
 msgid "0 people in room"
 msgstr "羃���篋阪�������翠��"
 
-#: src/gtkconv.c:3093
+#: src/gtkconv.c:3433
 msgid "IM the user"
 msgstr "���阪�恰��荐���畿篏睡����"
 
-#: src/gtkconv.c:3105
+#: src/gtkconv.c:3445
 msgid "Ignore the user"
 msgstr "綽順�ヤ戎����"
 
-#: src/gtkconv.c:3636
+#: src/gtkconv.c:3982
 msgid "Close conversation"
 msgstr "����篋よ�"
 
-#: src/gtkconv.c:4269 src/gtkconv.c:4391
+#: src/gtkconv.c:4640 src/gtkconv.c:4762
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ��篋阪�������翠��"
 
-#: src/gtkconv.c:4751
+#: src/gtkconv.c:5036
 msgid "Disable Animation"
 msgstr "��������"
 
-#: src/gtkconv.c:4760
+#: src/gtkconv.c:5045
 msgid "Enable Animation"
 msgstr "��������"
 
-#: src/gtkconv.c:4767
+#: src/gtkconv.c:5052
 msgid "Hide Icon"
 msgstr "�沿���霚�"
 
-#: src/gtkconv.c:4773
+#: src/gtkconv.c:5058
 msgid "Save Icon As..."
 msgstr "�峨���腓榊��..."
 
-#: src/gtkft.c:105
-msgid "Calculating..."
-msgstr "荐�膊�筝�..."
-
-#: src/gtkft.c:108
-msgid "Unknown."
-msgstr "���ャ��"
-
-#: src/gtkft.c:145
+#: src/gtkft.c:126
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:220
+#: src/gtkft.c:201
 msgid "<b>Receiving From:</b>"
 msgstr "<b>�ユ�区���</b>"
 
-#: src/gtkft.c:223
+#: src/gtkft.c:204
 msgid "<b>Sending To:</b>"
 msgstr "<b>�渇���逸�</b>"
 
-#: src/gtkft.c:447
+#: src/gtkft.c:436
 msgid "Progress"
 msgstr "�峨墾"
 
-#: src/gtkft.c:454
+#: src/gtkft.c:443
 msgid "Filename"
 msgstr "罟���"
 
-#: src/gtkft.c:461
+#: src/gtkft.c:450
 msgid "Size"
 msgstr "紊у�"
 
-#: src/gtkft.c:468
+#: src/gtkft.c:457
 msgid "Remaining"
 msgstr "���"
 
-#: src/gtkft.c:498
+#: src/gtkft.c:487
 msgid "Filename:"
 msgstr "罟���鐚�"
 
-#: src/gtkft.c:499
+#: src/gtkft.c:488
 msgid "Status:"
 msgstr "����鐚�"
 
-#: src/gtkft.c:500
+#: src/gtkft.c:489
 msgid "Speed:"
 msgstr "��綺��"
 
-#: src/gtkft.c:501
+#: src/gtkft.c:490
 msgid "Time Elapsed:"
 msgstr "膓�������鐚�"
 
-#: src/gtkft.c:502
+#: src/gtkft.c:491
 msgid "Time Remaining:"
 msgstr "絨�������鐚�"
 
-#: src/gtkft.c:568
-msgid "File Transfers"
-msgstr "罟�罅��活叱"
-
-#: src/gtkft.c:597
+#: src/gtkft.c:586
 msgid "_Keep the dialog open"
 msgstr "篆���絨�荅掩�����(_K)"
 
-#: src/gtkft.c:607
+#: src/gtkft.c:596
 msgid "_Clear finished transfers"
 msgstr "羝��ゅ群絎������活叱(_C)"
 
 #. "Download Details" arrow
-#: src/gtkft.c:616
+#: src/gtkft.c:605
 msgid "Show download details"
 msgstr "蕁�ず筝�莠�膣亥�"
 
-#: src/gtkft.c:617
+#: src/gtkft.c:606
 msgid "Hide download details"
 msgstr "�沿�鋇�莠�膣亥�"
 
 #. Pause button
-#: src/gtkft.c:659
+#: src/gtkft.c:648 src/stock.c:86
 msgid "_Pause"
 msgstr "����(_P)"
 
 #. Resume button
-#: src/gtkft.c:669
+#: src/gtkft.c:658
 msgid "_Resume"
 msgstr "�√奨(_R)"
 
-#: src/gtkft.c:1012
+#: src/gtkft.c:1013
 msgid "That file does not exist."
 msgstr "罟�罅�筝�絖�����"
 
-#: src/gtkft.c:1019
+#: src/gtkft.c:1020
 msgid "Cannot send a file of 0 bytes."
 msgstr "�≧��渇��腥榊��罟�罅���"
 
-#: src/gtkft.c:1032
+#: src/gtkft.c:1033
 msgid "That file already exists."
 msgstr "�e��罟�罅�綏牙�絖�����"
 
-#: src/gtkft.c:1033
-msgid "Would you like to overwrite it?"
-msgstr "���荀���絎����"
-
-#: src/gtkft.c:1057
+#: src/gtkft.c:1058
 msgid "Gaim - Open..."
 msgstr "Gaim - ����..."
 
-#: src/gtkft.c:1106
+#: src/gtkft.c:1107
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s �活��� %s (%s) 腟���"
 
-#: src/gtkimhtml.c:342
+#: src/gtkimhtml.c:498
 msgid "_Copy Link Location"
 msgstr "茲�茖初�g�篏���(_C)"
 
-#: src/gtkimhtml.c:349
+#: src/gtkimhtml.c:505
 msgid "_Open Link in Browser"
 msgstr "���頳遵��賢�����g�(_O)"
 
-# TODO report spelling mistake ("base" ���� "based")
-# FIXME "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
-# ANS ���恰����罔f���
-#: src/gtkimhtml.c:1664
+# NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
+#: src/gtkimhtml.c:1601
 msgid ""
-"Gaim was unable to guess the image type base on the file extension "
-"supplied.  Defaulting to PNG."
-msgstr "Gaim �≧�箴��у�����箴��ゅ�ュ襲��弢�鐚�篏睡�� PNG �咲��荐㊤�若��"
-
-#: src/gtkimhtml.c:1672
+"Unable to guess the image type based on the file extension supplied.  "
+"Defaulting to PNG."
+msgstr "Gaim �≧�箴��у�����箴��ゅ�ュ襲��弢�鐚�����倶�� PNG 罟�������"
+
+#: src/gtkimhtml.c:1609
 #, c-format
 msgid "Error saving image: %s"
 msgstr "�峨�綵怨����鐚�%s"
 
-#: src/gtkimhtml.c:1681
-msgid "Gaim - Save Image"
-msgstr "Gaim - �峨�綵怨��"
-
-#: src/gtkimhtml.c:1703
+#: src/gtkimhtml.c:1618
+msgid "Save Image"
+msgstr "�峨�綵怨��"
+
+#: src/gtkimhtml.c:1640
 msgid "_Save Image..."
 msgstr "�峨�綵怨��(_S)..."
 
-#: src/gtknotify.c:190
+#: src/gtknotify.c:193
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s �� %d 絨��育�灸散��"
 
-#: src/gtknotify.c:198
+#: src/gtknotify.c:201
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr "<span weight=\"bold\">箴����</span> %s\n"
 
-#: src/gtknotify.c:203
+#: src/gtknotify.c:206
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr "<span weight=\"bold\">筝脂�鐚�</span> %s\n"
 
-#: src/gtknotify.c:207
+#: src/gtknotify.c:210
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -5086,7 +5561,7 @@
 "\n"
 "%s%s%s%s"
 
-#: src/gtknotify.c:222
+#: src/gtknotify.c:225
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -5097,156 +5572,156 @@
 "\n"
 "%s"
 
-#: src/gtkpounce.c:122
+#: src/gtkpounce.c:140
 msgid "Select a file"
 msgstr "�御��罟�罅�"
 
-#: src/gtkpounce.c:172
+#: src/gtkpounce.c:189
 msgid "Please enter a buddy to pounce."
 msgstr "茫�莠後�ヤ���絅遵�篁ラ�画�������"
 
-#: src/gtkpounce.c:344
-#, c-format
-msgid "%s has started typing to you"
-msgstr "%s ��紮�莠後�ヨ���畿��"
-
-#: src/gtkpounce.c:345
-#, c-format
-msgid "%s has signed on"
-msgstr "%s 綏牙��糸��"
-
-#: src/gtkpounce.c:346
-#, c-format
-msgid "%s has returned from being idle"
-msgstr "%s �演��臀����"
-
-#: src/gtkpounce.c:347
-#, c-format
-msgid "%s has returned from being away"
-msgstr "%s �演�∫��菴���"
-
-#: src/gtkpounce.c:348
-#, c-format
-msgid "%s has stopped typing to you"
-msgstr "%s ��罩∵叱�ヨ���畿��"
-
-#: src/gtkpounce.c:349
-#, c-format
-msgid "%s has signed off"
-msgstr "%s 綏牙��糸��"
-
-#: src/gtkpounce.c:350
-#, c-format
-msgid "%s has become idle"
-msgstr "%s 莅��雁�����咲��臀�"
-
-#: src/gtkpounce.c:351
-#, c-format
-msgid "%s has gone away."
-msgstr "%s 綏牙��∫����"
-
-#: src/gtkpounce.c:352
-msgid "Unknown pounce event. Please report this!"
-msgstr "���ョ������篋�篁吟��茫����演�����馹�鐚�"
-
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:495 src/gtkpounce.c:885
+#: src/gtkpounce.c:383 src/gtkpounce.c:787
 msgid "New Buddy Pounce"
 msgstr "�医�絅遵���������"
 
-#: src/gtkpounce.c:495
+#: src/gtkpounce.c:383
 msgid "Edit Buddy Pounce"
 msgstr "膩�鹿絅遵���������"
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:513
+#: src/gtkpounce.c:401
 msgid "Pounce Who"
 msgstr "荀�����茯亥������"
 
-#: src/gtkpounce.c:535
+#: src/gtkpounce.c:426
 msgid "_Buddy Name:"
 msgstr "絅遵���腮�(_B)鐚�"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:554
+#: src/gtkpounce.c:448
 msgid "Pounce When"
 msgstr "����篁�藝惹┌������"
 
-#: src/gtkpounce.c:562
+#: src/gtkpounce.c:456
 msgid "Sign on"
 msgstr "�糸��"
 
-#: src/gtkpounce.c:564
+#: src/gtkpounce.c:458
 msgid "Sign off"
 msgstr "�糸��"
 
-#: src/gtkpounce.c:568
+#: src/gtkpounce.c:462
 msgid "Return from away"
 msgstr "�演�∫��菴���"
 
-#: src/gtkpounce.c:572
+#: src/gtkpounce.c:466
 msgid "Return from idle"
 msgstr "�演��臀����"
 
-#: src/gtkpounce.c:574
+#: src/gtkpounce.c:468
 msgid "Buddy starts typing"
 msgstr "絅遵���紮�莠後��"
 
-#: src/gtkpounce.c:576
+#: src/gtkpounce.c:470
 msgid "Buddy stops typing"
 msgstr "絅遵���罩∵叱��"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:605
+#: src/gtkpounce.c:499
 msgid "Pounce Action"
 msgstr "������篏�"
 
-#: src/gtkpounce.c:612
+#: src/gtkpounce.c:506
 msgid "Open an IM window"
 msgstr "�����恰��荐����腦�"
 
-#: src/gtkpounce.c:613
+#: src/gtkpounce.c:507
 msgid "Popup notification"
 msgstr "綵��咲����"
 
-#: src/gtkpounce.c:614
+#: src/gtkpounce.c:508
 msgid "Send a message"
 msgstr "���肴���"
 
-#: src/gtkpounce.c:615
+#: src/gtkpounce.c:509
 msgid "Execute a command"
 msgstr "�決���篁�"
 
-#: src/gtkpounce.c:616
+#: src/gtkpounce.c:510
 msgid "Play a sound"
 msgstr "�㊥�冗�恰��"
 
-#: src/gtkpounce.c:620 src/gtkpounce.c:622
+#: src/gtkpounce.c:514 src/gtkpounce.c:516
 msgid "Browse"
 msgstr "�頳�"
 
-#: src/gtkpounce.c:623 src/gtkprefs.c:2018
+#: src/gtkpounce.c:517 src/gtkprefs.c:2097
 msgid "Test"
 msgstr "羝��"
 
-#: src/gtkpounce.c:706
+#: src/gtkpounce.c:600
 msgid "_Save this pounce after activation"
 msgstr "�峨�荐㊤�筝�����(_S)"
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:892
+#: src/gtkpounce.c:794
 msgid "Remove Buddy Pounce"
 msgstr "腱脂�ゅソ����������"
 
-#: src/gtkprefs.c:436
+#: src/gtkpounce.c:835
+#, c-format
+msgid "%s has started typing to you"
+msgstr "%s ��紮�莠後�ヨ���畿��"
+
+#: src/gtkpounce.c:836
+#, c-format
+msgid "%s has signed on"
+msgstr "%s 綏牙��糸��"
+
+#: src/gtkpounce.c:837
+#, c-format
+msgid "%s has returned from being idle"
+msgstr "%s �演��臀����"
+
+#: src/gtkpounce.c:838
+#, c-format
+msgid "%s has returned from being away"
+msgstr "%s �演�∫��菴���"
+
+#: src/gtkpounce.c:839
+#, c-format
+msgid "%s has stopped typing to you"
+msgstr "%s ��罩∵叱�ヨ���畿��"
+
+#: src/gtkpounce.c:840
+#, c-format
+msgid "%s has signed off"
+msgstr "%s 綏牙��糸��"
+
+#: src/gtkpounce.c:841
+#, c-format
+msgid "%s has become idle"
+msgstr "%s 莅��雁�����咲��臀�"
+
+#: src/gtkpounce.c:842
+#, c-format
+msgid "%s has gone away."
+msgstr "%s 綏牙��∫����"
+
+#: src/gtkpounce.c:843
+msgid "Unknown pounce event. Please report this!"
+msgstr "���ョ������篋�篁吟��茫����演�����馹�鐚�"
+
+#: src/gtkprefs.c:378
 msgid "Interface Options"
 msgstr "篁��∫�檎��"
 
-#: src/gtkprefs.c:438
+#: src/gtkprefs.c:380
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr "�九�ュ��羃���荐㊤���鐚�篁ュ��号��荐㊤����援┗蕁�ず(_I)"
 
-#: src/gtkprefs.c:620
+#: src/gtkprefs.c:561
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -5254,506 +5729,520 @@
 "����∝��羝���賢�後�筝��������喝��罩∞��茵���筝脂������札�����括���劫�絨��亥��茵���筝脂�"
 "絎�茖��井���賢��"
 
-#: src/gtkprefs.c:653
+#: src/gtkprefs.c:594
 msgid "Icon"
 msgstr "��腓�"
 
-#: src/gtkprefs.c:726
+#: src/gtkprefs.c:668
 msgid "Style"
 msgstr "蘂���"
 
-#: src/gtkprefs.c:727
+#: src/gtkprefs.c:669
 msgid "_Bold"
 msgstr "膕�蕭�(_B)"
 
-#: src/gtkprefs.c:729
+#: src/gtkprefs.c:671
 msgid "_Italics"
 msgstr "��蕭�(_I)"
 
-#: src/gtkprefs.c:731
+#: src/gtkprefs.c:673
 msgid "_Underline"
 msgstr "綺�膩�(_U)"
 
-#: src/gtkprefs.c:733
+#: src/gtkprefs.c:675
 msgid "_Strikethrough"
 msgstr "���ょ����絖�(_S)"
 
-#: src/gtkprefs.c:736
+#: src/gtkprefs.c:678
 msgid "Face"
 msgstr "絖�蕭�"
 
-#: src/gtkprefs.c:739
+#: src/gtkprefs.c:681
 msgid "Use custo_m face"
 msgstr "篏睡�������絖�蕭�(_M)"
 
-#: src/gtkprefs.c:756
+#: src/gtkprefs.c:698
 msgid "Use custom si_ze"
 msgstr "篏睡�������絖�蕭�紊у�(_Z)"
 
-#: src/gtkprefs.c:769
+#: src/gtkprefs.c:711
 msgid "Color"
 msgstr "蕁��"
 
-#: src/gtkprefs.c:773
+#: src/gtkprefs.c:715
 msgid "_Text color"
 msgstr "��鎕�蕁��(_T)"
 
-#: src/gtkprefs.c:792
+#: src/gtkprefs.c:734
 msgid "Bac_kground color"
 msgstr "�������(_K)"
 
-#: src/gtkprefs.c:820 src/gtkprefs.c:1038 src/gtkprefs.c:1091
+#: src/gtkprefs.c:762 src/gtkprefs.c:994 src/gtkprefs.c:1047
 msgid "Display"
 msgstr "蕁�ず"
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:763
 msgid "Show graphical _smileys"
 msgstr "蕁�ず茵���(_S)"
 
-#: src/gtkprefs.c:823
+#: src/gtkprefs.c:765
 msgid "Show _timestamp on messages"
 msgstr "蕁�ず荐�������(_T)"
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:767
 msgid "Show _URLs as links"
 msgstr "蕁�ず URL �肴��g�(_U)"
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:771
 msgid "_Highlight misspelled words"
 msgstr "罔�腓阪�堺�守����絖�(_H)"
 
-#: src/gtkprefs.c:833
+#: src/gtkprefs.c:775
 msgid "Ignore c_olors"
 msgstr "綽順�ラ���(_O)"
 
-#: src/gtkprefs.c:835
+#: src/gtkprefs.c:777
 msgid "Ignore font _faces"
 msgstr "綽順�ュ�蕭�(_F)"
 
-#: src/gtkprefs.c:837
+#: src/gtkprefs.c:779
 msgid "Ignore font si_zes"
 msgstr "綽順�ュ�蕭�紊у�(_Z)"
 
-#: src/gtkprefs.c:850
+#: src/gtkprefs.c:792
 msgid "Send Message"
 msgstr "���肴���"
 
-#: src/gtkprefs.c:851
-msgid "_Enter sends message"
-msgstr "��筝� Enter ���肴���(_E)"
-
-#: src/gtkprefs.c:853
+#: src/gtkprefs.c:793
+msgid "Enter _sends message"
+msgstr "��筝� Enter ���肴���(_S)"
+
+#: src/gtkprefs.c:795
 msgid "C_ontrol-Enter sends message"
 msgstr "��筝� Ctrl-Enter ���肴���(_O)"
 
-#: src/gtkprefs.c:856
+#: src/gtkprefs.c:798
 msgid "Window Closing"
 msgstr "荀�腦�����"
 
-#: src/gtkprefs.c:857
-msgid "E_scape closes window"
-msgstr "��筝� Escape ����荀�腦�(_S)"
-
-#: src/gtkprefs.c:859
-msgid "Control-_W closes window"
-msgstr "��筝� Ctrl-W ����荀�腦�(_W)"
-
-#: src/gtkprefs.c:862
+#: src/gtkprefs.c:799
+msgid "_Escape closes window"
+msgstr "��筝� Escape ����荀�腦�(_E)"
+
+#: src/gtkprefs.c:802
 msgid "Insertions"
 msgstr "���ラ�檎��"
 
-#: src/gtkprefs.c:863
-msgid "Control-{B/I/U/S} inserts _HTML tags"
-msgstr "��筝� Ctrl-{B/I/U/S} ���� HTML 罔�膠�(_H)"
-
-#: src/gtkprefs.c:865
-msgid "Control-(number) inserts _smileys"
-msgstr "��筝� CTRL-(�後���) 箴����ヨ;��(_S)"
-
-#: src/gtkprefs.c:882
+#: src/gtkprefs.c:803
+msgid "Control-{B/I/U} inserts _HTML tags"
+msgstr "��筝� Ctrl-{B/I/U} ���� HTML 罔�膠�(_H)"
+
+#: src/gtkprefs.c:805
+msgid "Control-(number) _inserts smileys"
+msgstr "��筝� CTRL-(�後���) ���ヨ;��(_I)"
+
+#: src/gtkprefs.c:822
 msgid "Buddy List Sorting"
 msgstr "絅遵�羝����綺�"
 
-#: src/gtkprefs.c:891
+#: src/gtkprefs.c:831
 msgid "Sorting:"
 msgstr "������綺�婧�鐚�"
 
-#: src/gtkprefs.c:896
+#: src/gtkprefs.c:836
 msgid "Buddy List Toolbar"
 msgstr "絅遵�羝���轡�桁��"
 
-#: src/gtkprefs.c:897 src/gtkprefs.c:1008 src/gtkprefs.c:1064
+#: src/gtkprefs.c:837 src/gtkprefs.c:964 src/gtkprefs.c:1020
 msgid "Show _buttons as:"
 msgstr "蕁�ず���窮��(_B)鐚�"
 
-#: src/gtkprefs.c:899 src/gtkprefs.c:1010 src/gtkprefs.c:1066
+#: src/gtkprefs.c:839 src/gtkprefs.c:966 src/gtkprefs.c:1022
 msgid "Pictures"
 msgstr "��綵�"
 
-#: src/gtkprefs.c:900 src/gtkprefs.c:1011 src/gtkprefs.c:1067
+#: src/gtkprefs.c:840 src/gtkprefs.c:967 src/gtkprefs.c:1023
 msgid "Text"
 msgstr "��絖�"
 
-#: src/gtkprefs.c:901 src/gtkprefs.c:1012 src/gtkprefs.c:1068
+#: src/gtkprefs.c:841 src/gtkprefs.c:968 src/gtkprefs.c:1024
 msgid "Pictures and text"
 msgstr "��綵∵����絖�"
 
-#: src/gtkprefs.c:906
+#: src/gtkprefs.c:846
 msgid "_Raise window on events"
 msgstr "�銀�篁句�主����鐚�絨�荀�腦����井��筝���(_R)"
 
-#: src/gtkprefs.c:909
+#: src/gtkprefs.c:849
 msgid "Group Display"
 msgstr "臂ょ�蕁�ず"
 
 #. prefs_checkbox(_("Show _groups with no online buddies"), "/gaim/gtk/blist/show_empty_groups", vbox);
-#: src/gtkprefs.c:911
+#: src/gtkprefs.c:851
 msgid "Show _numbers in groups"
 msgstr "蕁�ず臂ょ�茖∞��絅遵��悟��(_N)"
 
-#: src/gtkprefs.c:914
+#: src/gtkprefs.c:854
 msgid "Buddy Display"
 msgstr "絅遵�蕁�ず"
 
-#: src/gtkprefs.c:915 src/gtkprefs.c:1033
+#: src/gtkprefs.c:855 src/gtkprefs.c:989
 msgid "Show buddy _icons"
 msgstr "蕁�ず絅遵���腓�(_I)"
 
-#: src/gtkprefs.c:917
+#: src/gtkprefs.c:857
 msgid "Show _warning levels"
 msgstr "蕁�ず茘���膈�膣�(_W)"
 
-#: src/gtkprefs.c:920
+#: src/gtkprefs.c:860
 msgid "Show idle _times"
 msgstr "蕁�ず��臀�����(_T)"
 
-#: src/gtkprefs.c:934
+#: src/gtkprefs.c:874
 msgid "Dim i_dle buddies"
 msgstr "����臀���絅遵�荐㊦�榊�域��(_D)"
 
-#: src/gtkprefs.c:955 src/gtkprefs.c:2192
+#: src/gtkprefs.c:894 src/gtkprefs.c:2271
 msgid "Conversations"
 msgstr "篋よ�"
 
-#: src/gtkprefs.c:963
+#: src/gtkprefs.c:898
 msgid "_Placement:"
 msgstr "篏�臀�(_P)鐚�"
 
-#: src/gtkprefs.c:972
+#: src/gtkprefs.c:907
 msgid "Send _URLs as Links"
 msgstr "���� URL �肴��g�(_U)"
 
-#: src/gtkprefs.c:975
+#: src/gtkprefs.c:910
 msgid "Tab Options"
 msgstr "罔�膠ら�檎��"
 
+#: src/gtkprefs.c:913 src/gtkprefs.c:924
+msgid "Top"
+msgstr "荀�腦�筝���"
+
+#: src/gtkprefs.c:915 src/gtkprefs.c:925
+msgid "Bottom"
+msgstr "荀�腦�筝���"
+
+#: src/gtkprefs.c:917 src/gtkprefs.c:926
+msgid "Left"
+msgstr "荀�腦�綏���"
+
+#: src/gtkprefs.c:919 src/gtkprefs.c:927
+msgid "Right"
+msgstr "荀�腦��喝��"
+
+#: src/gtkprefs.c:922
+msgid "_Tab Placement:"
+msgstr "罔�膠や�臀�(_T)鐚�"
+
 # XXX 荀�茲��ユ���♂��⑮
-#: src/gtkprefs.c:977
+#: src/gtkprefs.c:933
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "�恰��荐�������紊���篁ユ�膠よ�腦�蕁�ず(_T)"
 
-#: src/gtkprefs.c:980
+#: src/gtkprefs.c:936
 msgid "Show _close button on tabs."
 msgstr "���膠や�蕁�ず������(_C)��"
 
-#: src/gtkprefs.c:1007 src/gtkprefs.c:1063
+#: src/gtkprefs.c:963 src/gtkprefs.c:1019
 msgid "Window"
 msgstr "荀�腦�"
 
-#: src/gtkprefs.c:1017 src/gtkprefs.c:1073
+#: src/gtkprefs.c:973 src/gtkprefs.c:1029
 msgid "New window _width:"
 msgstr "�域�腦�絲�墾(_W)鐚�"
 
-#: src/gtkprefs.c:1020 src/gtkprefs.c:1076
+#: src/gtkprefs.c:976 src/gtkprefs.c:1032
 msgid "New window _height:"
 msgstr "�域�腦�蕭�綺�(_H)鐚�"
 
-#: src/gtkprefs.c:1023 src/gtkprefs.c:1079
+#: src/gtkprefs.c:979 src/gtkprefs.c:1035
 msgid "_Entry field height:"
 msgstr "莠後�ユ�蕭�綺�(_E)鐚�"
 
-#: src/gtkprefs.c:1026 src/gtkprefs.c:1082
+#: src/gtkprefs.c:982 src/gtkprefs.c:1038
 msgid "_Raise windows on events"
 msgstr "�銀�篁句�主����鐚�絨�荀�腦����井��筝���(_R)"
 
-#: src/gtkprefs.c:1028
+#: src/gtkprefs.c:984
 msgid "Hide window on _send"
 msgstr "���肴��������荀�腦�(_S)"
 
-#: src/gtkprefs.c:1032
+#: src/gtkprefs.c:988
 msgid "Buddy Icons"
 msgstr "絅遵���腓�"
 
 # XXX Enable 茘���������絅遵���騌�絅���
-#: src/gtkprefs.c:1035
+#: src/gtkprefs.c:991
 msgid "Enable buddy icon a_nimation"
 msgstr "����絅遵���腓阪����(_N)"
 
-#: src/gtkprefs.c:1039
+#: src/gtkprefs.c:995
 msgid "Show _logins in window"
 msgstr "���腦�筝㊨¨腓榊�糸�ヨ���(_L)"
 
-#: src/gtkprefs.c:1041
+#: src/gtkprefs.c:997
 msgid "Show a_liases in tabs/titles"
 msgstr "���蕁���罔�膠や�蕁�ず�ュ��(_L)"
 
-#: src/gtkprefs.c:1044
+#: src/gtkprefs.c:1000
 msgid "Typing Notification"
 msgstr "莠後�ラ����"
 
-#: src/gtkprefs.c:1045
+#: src/gtkprefs.c:1001
 msgid "Notify buddies that you are _typing to them"
 msgstr "���ユ����絅遵���③���取���畿篁���(_T)"
 
-#: src/gtkprefs.c:1085
+#: src/gtkprefs.c:1041
 msgid "Tab Completion"
 msgstr "Tab Completion"
 
-#: src/gtkprefs.c:1086
+#: src/gtkprefs.c:1042
 msgid "_Tab-complete nicks"
 msgstr "篏睡�� Tab �球巷��叱�ユ�援┗(_T)"
 
-#: src/gtkprefs.c:1088
+#: src/gtkprefs.c:1044
 msgid "_Old-style tab completion"
 msgstr "��綣� Tab Completion (_O)"
 
-#: src/gtkprefs.c:1092
+#: src/gtkprefs.c:1048
 msgid "_Show people joining in window"
 msgstr "���腦�筝㊨¨腓阪�銀�篋咲�峨�ョ��篋�篁�(_S)"
 
-#: src/gtkprefs.c:1094
+#: src/gtkprefs.c:1050
 msgid "_Show people leaving in window"
 msgstr "���腦�筝㊨¨腓阪�銀�篋咲�∫����篋�篁�(_S)"
 
-#: src/gtkprefs.c:1096
+#: src/gtkprefs.c:1052
 msgid "Co_lorize screennames"
 msgstr "絨�絽活��篁ラ��峨����(_L)"
 
-#: src/gtkprefs.c:1114
+#: src/gtkprefs.c:1096
 msgid "Proxy Type"
 msgstr "篁g��篌堺��������"
 
-#: src/gtkprefs.c:1115
-msgid "Proxy _type:"
-msgstr "篁g��篌堺��������(_T)鐚�"
-
 # NOTE ��札��篁g��篌堺�����罸�����
 # NOTE 薤�羝���������罸�����鐚�篏�茗���茯���罸�������筝�����鐚���筝�篏睡����莠�絅�
-#: src/gtkprefs.c:1117
+#: src/gtkprefs.c:1099
 msgid "No proxy"
 msgstr "筝�篏睡��撮��篌堺����"
 
-#: src/gtkprefs.c:1123
+#: src/gtkprefs.c:1105
 msgid "Proxy Server"
 msgstr "篁g��篌堺����"
 
-#: src/gtkprefs.c:1136
+#: src/gtkprefs.c:1125
 msgid "_Host"
 msgstr "筝紙�篏���(_H)"
 
-#: src/gtkprefs.c:1150
-msgid "Port"
-msgstr "��荐���"
-
-#: src/gtkprefs.c:1166
+#: src/gtkprefs.c:1160
 msgid "_User"
 msgstr "篏睡����(_U)"
 
-#: src/gtkprefs.c:1180
+#: src/gtkprefs.c:1177
 msgid "Pa_ssword"
 msgstr "絲�腆�(_S)"
 
-#: src/gtkprefs.c:1201
+#: src/gtkprefs.c:1233
 #, c-format
 msgid "The entered manual browser '%s' is not valid. Hyperlinks will not work."
 msgstr "��荐㊤���篏睡��������頳遵����%s�����≧������莇��g�絨�筝���茴��決���"
 
-#: src/gtkprefs.c:1222
+#: src/gtkprefs.c:1253
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1223
+#: src/gtkprefs.c:1254
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1224
+#: src/gtkprefs.c:1255
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1225
+#: src/gtkprefs.c:1256
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1226
+#: src/gtkprefs.c:1257
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1234
+#: src/gtkprefs.c:1266
 msgid "Manual"
 msgstr "篏睡�������"
 
-#: src/gtkprefs.c:1269
+#: src/gtkprefs.c:1307
 msgid "Browser Selection"
 msgstr "�御���頳遵��"
 
-#: src/gtkprefs.c:1273
-msgid "_Browser"
-msgstr "�頳遵��(_B)"
-
-#: src/gtkprefs.c:1283
-msgid "_Manual: "
-msgstr "篏睡�������(_M)鐚�"
-
-#: src/gtkprefs.c:1305
-msgid "Browser Options"
-msgstr "�頳遵���檎��"
-
-#: src/gtkprefs.c:1306
-msgid "Open new _window by default"
-msgstr "��荐㊦�阪��坂����亥��荀�腦�(_W)"
+#: src/gtkprefs.c:1311
+msgid "_Browser:"
+msgstr "�頳遵��(_B)鐚�"
 
 #: src/gtkprefs.c:1321
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"篏睡�������(_M)鐚�\n"
+"(茫�篁� %s 篁h;膓峨��)"
+
+#: src/gtkprefs.c:1342
+msgid "Browser Options"
+msgstr "�頳遵���檎��"
+
+#: src/gtkprefs.c:1343
+msgid "Open new _window by default"
+msgstr "��荐㊦�阪��坂����亥��荀�腦�(_W)"
+
+#: src/gtkprefs.c:1358
 msgid "Message Logs"
 msgstr "荐����ヨ�"
 
-#: src/gtkprefs.c:1322
+#: src/gtkprefs.c:1359
 msgid "_Log all instant messages"
 msgstr "荐��������恰��荐���(_L)"
 
-#: src/gtkprefs.c:1324
+#: src/gtkprefs.c:1361
 msgid "Log all c_hats"
 msgstr "荐���������紊��у�(_H)"
 
-#: src/gtkprefs.c:1326
+#: src/gtkprefs.c:1363
 msgid "Strip _HTML from logs"
 msgstr "絨�篋よ�荐���筝㊦�� HTML 罔�膠ゅサ��(_H)"
 
-#: src/gtkprefs.c:1329
+#: src/gtkprefs.c:1366
 msgid "System Logs"
 msgstr "膤紫輝�ヨ�"
 
-#: src/gtkprefs.c:1330
+#: src/gtkprefs.c:1367
 msgid "Log when buddies _sign on/sign off"
 msgstr "荐���絅遵����糸�ワ��糸��(_S)"
 
-#: src/gtkprefs.c:1332
+#: src/gtkprefs.c:1369
 msgid "Log when buddies become _idle/un-idle"
 msgstr "荐���絅遵�����臀����羔���臀�(_I)"
 
-#: src/gtkprefs.c:1334
+#: src/gtkprefs.c:1371
 msgid "Log when buddies go away/come _back"
 msgstr "荐���絅遵��∫��鐚��鋐�(_B)"
 
-#: src/gtkprefs.c:1336
+#: src/gtkprefs.c:1373
 msgid "Log your _own signons/idleness/awayness"
 msgstr "荐�������群�糸�ワ���臀���∫��膈�����(_O)"
 
-#: src/gtkprefs.c:1338
+#: src/gtkprefs.c:1375
 msgid "I_ndividual log file for each buddy's signons"
 msgstr "篏睡�����ョ��罟�罅�箴�荐���罸鋇���絅遵����糸��(_N)"
 
-#: src/gtkprefs.c:1371
+#: src/gtkprefs.c:1418
 msgid "Sound Options"
 msgstr "�恰���檎��"
 
-#: src/gtkprefs.c:1372
+#: src/gtkprefs.c:1419
 msgid "_No sounds when you log in"
 msgstr "�糸�ユ����筝������恰��(_N)"
 
-#: src/gtkprefs.c:1374
+#: src/gtkprefs.c:1421
 msgid "_Sounds while away"
 msgstr "�∫����篁��弱�咲�恰��(_S)"
 
-#: src/gtkprefs.c:1378
+# XXX ��罔≦�����罔g��������藥�絅����
+#: src/gtkprefs.c:1425
 msgid "Sound Method"
 msgstr "�臥�恰─綣�"
 
-#: src/gtkprefs.c:1379
-msgid "_Method"
-msgstr "罔≦�(_M)"
-
-#: src/gtkprefs.c:1381
+#: src/gtkprefs.c:1426
+msgid "_Method:"
+msgstr "罔≦�(_M)鐚�"
+
+#: src/gtkprefs.c:1428
 msgid "Console beep"
 msgstr "�銀���"
 
-#: src/gtkprefs.c:1383
+#: src/gtkprefs.c:1430
 msgid "Automatic"
 msgstr "����"
 
-#: src/gtkprefs.c:1390
+#: src/gtkprefs.c:1437
 msgid "Command"
 msgstr "��篁�"
 
-#: src/gtkprefs.c:1400
+#: src/gtkprefs.c:1447
 #, c-format
 msgid ""
-"Sound c_ommand\n"
+"Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"�恰����篁�\n"
-"(%s 篁h;莠後�ユ���)(_C)"
-
-#: src/gtkprefs.c:1442
+"�恰����篁�(_C)鐚�\n"
+"(茫�篁� %s 篁h;罟���)"
+
+#: src/gtkprefs.c:1492
 msgid "_Sending messages removes away status"
 msgstr "���肴�������羔��∫������(_S)"
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1494
 msgid "_Queue new messages when away"
 msgstr "���∫����鐚�絨��������域���舟�ヤ���筝�(_Q)"
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1497
 msgid "Auto-response"
 msgstr "��������"
 
-#: src/gtkprefs.c:1450
+#: src/gtkprefs.c:1500
 msgid "Seconds before _resending:"
 msgstr "���阪��荀�����膈�緇�腱���(_R)鐚�"
 
-#: src/gtkprefs.c:1453
+#: src/gtkprefs.c:1503
 msgid "_Send auto-response"
 msgstr "���肴��������(_S)"
 
-#: src/gtkprefs.c:1455
+#: src/gtkprefs.c:1505
 msgid "_Only send auto-response when idle"
 msgstr "������臀����������肴��������(_O)"
 
-#: src/gtkprefs.c:1457
+#: src/gtkprefs.c:1507
 msgid "Send auto-response in active conversations"
 msgstr "�����画���篋よ�箙�荀����肴��������"
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1514
 msgid "Idle _time reporting:"
 msgstr "��臀������怨��(_T)鐚�"
 
-#: src/gtkprefs.c:1467
+#: src/gtkprefs.c:1517
 msgid "Gaim usage"
 msgstr "Gaim 篏睡����羈�"
 
-#: src/gtkprefs.c:1470
+#: src/gtkprefs.c:1520
 msgid "X usage"
 msgstr "X Window 篏睡����羈�"
 
-#: src/gtkprefs.c:1472
+#: src/gtkprefs.c:1522
 msgid "Windows usage"
 msgstr "Windows 篏睡����羈�"
 
-#: src/gtkprefs.c:1480
+#: src/gtkprefs.c:1530
 msgid "Auto-away"
 msgstr "�����∫��"
 
-#: src/gtkprefs.c:1481
+#: src/gtkprefs.c:1531
 msgid "Set away _when idle"
 msgstr "��臀�������荐㊦�咲�∫��(_W)"
 
-#: src/gtkprefs.c:1483
+#: src/gtkprefs.c:1533
 msgid "_Minutes before setting away:"
 msgstr "��臀��箙�荐㊦�咲�∫��(_M)鐚�"
 
-#: src/gtkprefs.c:1490
+#: src/gtkprefs.c:1540
 msgid "Away m_essage:"
 msgstr "�∫��荐���(_M)鐚�"
 
-#: src/gtkprefs.c:1552
+#: src/gtkprefs.c:1602
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5768,7 +6257,7 @@
 "<span weight=\"bold\">膓牙�鐚�</span>\t\t%s\n"
 "<span weight=\"bold\">罟���鐚�</span>\t%s"
 
-#: src/gtkprefs.c:1557
+#: src/gtkprefs.c:1607
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -5783,319 +6272,357 @@
 "<span weight=\"bold\">膓牙�鐚�</span>  %s\n"
 "<span weight=\"bold\">罟���鐚�</span>  %s"
 
-#: src/gtkprefs.c:1732
+#: src/gtkprefs.c:1785
 msgid "Load"
 msgstr "莠���"
 
-#: src/gtkprefs.c:1739
+#: src/gtkprefs.c:1792
 msgid "Name"
 msgstr "紮���"
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1839
 msgid "Details"
 msgstr "荅括完莖���"
 
-#: src/gtkprefs.c:1901
+#: src/gtkprefs.c:1964
 msgid "Sound Selection"
 msgstr "�後��恰��"
 
-#: src/gtkprefs.c:1995
+#: src/gtkprefs.c:2071
 msgid "Play"
 msgstr "�㊥��"
 
-#: src/gtkprefs.c:2002
+#: src/gtkprefs.c:2078
 msgid "Event"
 msgstr "篋�篁�"
 
-#: src/gtkprefs.c:2022
+#: src/gtkprefs.c:2101
 msgid "Reset"
 msgstr "��臀�"
 
-#: src/gtkprefs.c:2026
+#: src/gtkprefs.c:2105
 msgid "Choose..."
 msgstr "�御��..."
 
-#: src/gtkprefs.c:2150
+#: src/gtkprefs.c:2229
 msgid "_Edit"
 msgstr "膩�鹿(_E)"
 
-#: src/gtkprefs.c:2186
+#: src/gtkprefs.c:2265
 msgid "Interface"
 msgstr "篁���"
 
-#: src/gtkprefs.c:2187
+#: src/gtkprefs.c:2266
 msgid "Smiley Themes"
 msgstr "茵���筝脂�"
 
-#: src/gtkprefs.c:2188
+#: src/gtkprefs.c:2267
 msgid "Fonts"
 msgstr "絖���"
 
-#: src/gtkprefs.c:2189
+#: src/gtkprefs.c:2268
 msgid "Message Text"
 msgstr "荐�����絖�"
 
-#: src/gtkprefs.c:2190
+#: src/gtkprefs.c:2269
 msgid "Shortcuts"
 msgstr "綽��潔��"
 
-#: src/gtkprefs.c:2193
+#: src/gtkprefs.c:2272
 msgid "IMs"
 msgstr "�恰��荐���"
 
-#: src/gtkprefs.c:2195
+#: src/gtkprefs.c:2274
 msgid "Proxy"
 msgstr "篁g��篌堺����"
 
 #. We use the registered default browser in windows
-#: src/gtkprefs.c:2198
+#: src/gtkprefs.c:2277
 msgid "Browser"
 msgstr "�頳遵��"
 
-#: src/gtkprefs.c:2200
+#: src/gtkprefs.c:2279
 msgid "Logging"
 msgstr "�ヨ�"
 
-#: src/gtkprefs.c:2201
+#: src/gtkprefs.c:2280
 msgid "Sounds"
 msgstr "�恰��"
 
-#: src/gtkprefs.c:2202
+#: src/gtkprefs.c:2281
 msgid "Sound Events"
 msgstr "篋�篁狗�恰��"
 
-#: src/gtkprefs.c:2203
+#: src/gtkprefs.c:2282
 msgid "Away / Idle"
 msgstr "�∫�� / ��臀�"
 
-#: src/gtkprefs.c:2204
+#: src/gtkprefs.c:2283
 msgid "Away Messages"
 msgstr "�∫��荐���"
 
-#: src/gtkprefs.c:2207
+#: src/gtkprefs.c:2286
 msgid "Plugins"
 msgstr "罔∞�羝���"
 
-#: src/gtkprefs.c:2257 src/main.c:383 src/win32/systray.c:355
-msgid "Preferences"
-msgstr "�鎁処┃絎�"
-
-#: src/gtkutils.c:285
+#: src/gtkrequest.c:170
+msgid "Apply"
+msgstr "絅���"
+
+#: src/gtksound.c:60
+msgid "Buddy logs in"
+msgstr "絅遵��糸��"
+
+#: src/gtksound.c:61
+msgid "Buddy logs out"
+msgstr "絅遵��糸��"
+
+#: src/gtksound.c:62
+msgid "Message received"
+msgstr "�九�域���"
+
+#: src/gtksound.c:63
+msgid "Message received begins conversation"
+msgstr "荐����九�逸���紮��画�篋よ�"
+
+#: src/gtksound.c:64
+msgid "Message sent"
+msgstr "荐�������"
+
+#: src/gtksound.c:65
+msgid "Person enters chat"
+msgstr "��篋咲�峨�ヨ��紊��"
+
+#: src/gtksound.c:66
+msgid "Person leaves chat"
+msgstr "��篋咲�∫����紊��"
+
+#: src/gtksound.c:67
+msgid "You talk in chat"
+msgstr "��群�峨�ヨ��紊��"
+
+#: src/gtksound.c:68
+msgid "Others talk in chat"
+msgstr "�銀�篋咲�峨�ヨ��紊��"
+
+#: src/gtksound.c:71
+msgid "Someone says your name in chat"
+msgstr "��篋阪����紊��筝㊥��井������絖�"
+
+#: src/gtksound.c:150
+#, c-format
+msgid "Unable to play sound because the chosen file (%s) does not exist."
+msgstr "�≧��㊥�冗�恰��鐚����堺���後���罟�罅� (%s) 筝�絖�����"
+
+#: src/gtksound.c:166
+msgid ""
+"Unable to play sound because the 'Command' sound method has been chosen, but "
+"no command has been set."
+msgstr "�≧��㊥�冗�恰��鐚����咲�後�篋�����篁ゃ���堺�㊥�丈─綣������研羃���荐㊤�篁私���篁ゃ��"
+
+#: src/gtksound.c:175
+#, c-format
+msgid ""
+"Unable to play sound because the configured sound command could not be "
+"launched: %s"
+msgstr "�≧��㊥�冗�恰��鐚����堺��荐㊤����恰����篁ゆ���莨��茴��決�鐚�%s"
+
+#: src/gtkutils.c:283
 msgid "Can't save icon file to disk."
 msgstr "�≧��峨���腓堺�罅�脾�腆�筝���"
 
-#: src/gtkutils.c:320
+#: src/gtkutils.c:318
 msgid "Gaim - Save Icon"
 msgstr "Gaim - �峨���腓�"
 
-#: src/html.c:322
+#. full help text
+#: src/gtkutils.c:908
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -f, --file=FILE     use FILE as config\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"篏睡���劫�: %s [�檎��]...\n"
+"\n"
+"  -a, --acct          蕁�ず絽活��羝���\n"
+"  -w, --away[=MESG]   �糸�ュ�蕁�ず�咲�∫�� (�御���у��� MESG �����絎���荀�\n"
+"                      篏睡�����∫��荐�����腮�)\n"
+"  -l, --login[=NAME]  �����糸�� (�御���у��� NAME �����絎���荀��糸�ョ��絽�\n"
+"                      ��鐚�����篁ラ����篏��阪����)\n"
+"  -n, --loginwin      筝������糸�ワ�蕁�ず�糸�ヨ�腦�\n"
+"  -u, --user=NAME     篏睡��験�� NAME\n"
+"  -f, --file=FILE     篏睡�� FILE �肴┃絎�罟�\n"
+"  -d, --debug         絨��ら�����叱�阪�井�羣�莠後�坂�\n"
+"  -v, --version       蕁�ず�������研�∫��\n"
+"  -h, --help          蕁�ず����茯������研�∫��\n"
+
+#. short message
+#: src/gtkutils.c:923
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "Gaim %s���決� `%s -h' 篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
+
+#: src/html.c:304
 msgid "g003: Error opening connection.\n"
 msgstr "g003: �g����������\n"
 
-#: src/log.c:35
+#: src/log.c:29
 msgid "Error in specifying buddy conversation."
 msgstr "����絎�絅遵�篋よ����主�������"
 
-#: src/log.c:41
+#: src/log.c:35
 msgid "Unable to find conversation log"
 msgstr "�≧��上�遺困茫��ヨ�"
 
-#: src/log.c:130
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - �峨���紊��у�"
-
-#: src/log.c:171 src/log.c:192 src/log.c:205
+#: src/log.c:118 src/log.c:139 src/log.c:152
 #, c-format
 msgid "Unable to make directory %s for logging"
 msgstr "�≧��������� %s 箴��画�荐���"
 
-#: src/log.c:259 src/log.c:275
+#: src/log.c:206 src/log.c:222
 #, c-format
 msgid "IM Sessions with %s\n"
 msgstr "�� %s ���恰��荐���轡篏����\n"
 
-#: src/log.c:262 src/log.c:278
+#: src/log.c:209 src/log.c:225
 #, c-format
 msgid "IM Sessions with %s"
 msgstr "�� %s ���恰��荐���轡篏����"
 
-#: src/log.c:315
+#: src/log.c:269
 #, c-format
 msgid "+++ %s (%s) signed on @ %s"
 msgstr "+++ %s (%s) �糸�� @ %s"
 
-#: src/log.c:320
+#: src/log.c:274
 #, c-format
 msgid "+++ %s (%s) signed off @ %s"
 msgstr "+++ %s (%s) 綏牙��糸�� @ %s"
 
-#: src/log.c:325
+#: src/log.c:279
 #, c-format
 msgid "+++ %s (%s) changed away state @ %s"
 msgstr "+++ %s (%s) 莅��雁�����咲�∫�� @ %s"
 
-#: src/log.c:330
+#: src/log.c:284
 #, c-format
 msgid "+++ %s (%s) came back @ %s"
 msgstr "+++ %s (%s) ��箴�篋� @ %s"
 
-#: src/log.c:335
+#: src/log.c:289
 #, c-format
 msgid "+++ %s (%s) became idle @ %s"
 msgstr "+++ %s (%s) 莅��雁�����咲��臀� @ %s"
 
-#: src/log.c:340
+#: src/log.c:294
 #, c-format
 msgid "+++ %s (%s) returned from idle @ %s"
 msgstr "+++ %s (%s) �演��臀���� @ %s"
 
-#: src/log.c:345
+#: src/log.c:299
 #, c-format
 msgid "+++ Program exit @ %s"
 msgstr "+++ 腮�綣靚��� @ %s"
 
-#: src/log.c:352
+#: src/log.c:306
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed on @ %s"
 msgstr "%s (%s) �怨�� %s (%s) �糸�� @ %s"
 
-#: src/log.c:357
+#: src/log.c:311
 #, c-format
 msgid "%s (%s) reported that %s (%s) signed off @ %s"
 msgstr "%s (%s) �怨�� %s (%s) �糸�� @ %s"
 
-#: src/log.c:362
+#: src/log.c:316
 #, c-format
 msgid "%s (%s) reported that %s (%s) went away @ %s"
 msgstr "%s (%s) �怨�� %s (%s) 莅��雁�����咲�∫�� @ %s"
 
-#: src/log.c:367
+#: src/log.c:321
 #, c-format
 msgid "%s (%s) reported that %s (%s) came back @ %s"
 msgstr "%s (%s) �怨�� %s (%s) ��箴�篋� @ %s"
 
-#: src/log.c:372
+#: src/log.c:326
 #, c-format
 msgid "%s (%s) reported that %s (%s) became idle @ %s"
 msgstr "%s (%s) �怨�� %s (%s) 莅��雁�����咲��臀� @ %s"
 
-#: src/log.c:378
+#: src/log.c:332
 #, c-format
 msgid "%s (%s) reported that %s (%s) returned from idle @ %s"
 msgstr "%s (%s) �怨�� %s (%s) �演��臀���� @ %s"
 
-#: src/log.c:390
+#: src/log.c:344
 #, c-format
 msgid "%s (%s) reported that %s signed on @ %s"
 msgstr "%s (%s) �怨�� %s �糸�� @ %s"
 
-#: src/log.c:395
+#: src/log.c:349
 #, c-format
 msgid "%s (%s) reported that %s signed off @ %s"
 msgstr "%s (%s) �怨�� %s �糸�� @ %s"
 
-#: src/log.c:400
+#: src/log.c:354
 #, c-format
 msgid "%s (%s) reported that %s went away @ %s"
 msgstr "%s (%s) �怨�� %s 莅��贋���咲�∫�� @ %s"
 
-#: src/log.c:405
+#: src/log.c:359
 #, c-format
 msgid "%s (%s) reported that %s came back @ %s"
 msgstr "%s (%s) �怨�� %s ��箴�篋� @ %s"
 
-#: src/log.c:410
+#: src/log.c:364
 #, c-format
 msgid "%s (%s) reported that %s became idle @ %s"
 msgstr "%s (%s) �怨�� %s 莅��雁�����咲��臀� @ %s"
 
-#: src/log.c:416
+#: src/log.c:370
 #, c-format
 msgid "%s (%s) reported that %s returned from idle @ %s"
 msgstr "%s (%s) �怨�� %s �演��臀���� @ %s"
 
-#: src/main.c:189
+#: src/main.c:234
 msgid "Please enter your login."
 msgstr "茫����糸�ャ��"
 
-#: src/main.c:281
+#: src/main.c:326
 msgid "<New User>"
 msgstr "<�遺戎����>"
 
-#: src/main.c:323
+#: src/main.c:368
 msgid "Login"
 msgstr "�糸��"
 
-#: src/main.c:339
+#: src/main.c:384
 msgid "Screen Name:"
 msgstr "絽活��鐚�"
 
-#. And now for the buttons
-#: src/main.c:373
-msgid "Accounts"
-msgstr "絽活��羝���"
-
-#: src/main.c:389 src/win32/systray.c:191
+#: src/main.c:434 src/win32/systray.c:197
 msgid "Sign On"
 msgstr "�糸��"
 
-#: src/multi.c:91
-msgid "Done."
-msgstr "絎�����"
-
-#: src/multi.c:167
-msgid "Signon: "
-msgstr "�糸�ワ�"
-
-#: src/multi.c:226
-msgid "Signon"
-msgstr "�糸��"
-
-#: src/multi.c:238
-msgid "Cancel All"
-msgstr "�����羔�"
-
-#: src/multi.c:293
-#, c-format
-msgid ""
-"%s\n"
-"%s: %s"
-msgstr ""
-"%s\n"
-"%s: %s"
-
-#: src/multi.c:315
-#, c-format
-msgid "%s was unable to sign on"
-msgstr "%s �≧��糸��"
-
-#: src/multi.c:317
-msgid "Signon Error"
-msgstr "�糸�ラ���"
-
-#: src/multi.c:330
-msgid "Notice"
-msgstr "����"
-
-#: src/multi.c:344
-#, c-format
-msgid "%s has been signed off"
-msgstr "%s 綏牙��糸��"
-
-#: src/multi.c:346
-msgid "Connection Error"
-msgstr "�g����"
-
-#: src/prpl.c:110
-msgid "No actions available"
-msgstr "筝���荐延算篏���篏�"
-
-#: src/prpl.c:396
+#: src/prpl.c:292
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr "%s%s%s%s ���ヤ� %s �坂� / 絅合��絅遵� %s%s%s"
 
-#: src/prpl.c:408
+#: src/prpl.c:304
 msgid ""
 "\n"
 "\n"
@@ -6105,51 +6632,40 @@
 "\n"
 "���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
 
-#: src/prpl.c:411
+#: src/prpl.c:307
 msgid "Gaim - Information"
 msgstr "Gaim - 莖�荐�"
 
-#: src/prpl.c:414
+#: src/prpl.c:310
 msgid "Add buddy to your list?"
 msgstr "絨�篏睡�������ユ����絅遵�羝����"
 
-#: src/prpl.c:458
-msgid ""
-"You do not currently have any protocols available that are able to register "
-"new accounts."
-msgstr "����膤紫輝筝℡研�����算篏������┿��筝����医験������荐���絎���"
-
-#: src/prpl.c:495
-msgid "Gaim - Registration"
-msgstr "Gaim - 荐糸��"
-
-#: src/prpl.c:508
-msgid "Registration Information"
-msgstr "荐糸��莖�荐�"
-
-#: src/prpl.c:522
-msgid "Register"
-msgstr "荐糸��"
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: src/request.h:823
+msgid "Accept"
+msgstr "�ュ�"
 
 #: src/server.c:57
 msgid "Please enter your password"
 msgstr "茫�莠後�ユ����絲�腆�"
 
-#: src/server.c:886
+#: src/server.c:879
 #, c-format
 msgid "(%d messages)"
 msgstr "鐚�%d ��荐����"
 
-#: src/server.c:898
+#: src/server.c:891
 msgid "(1 message)"
 msgstr "鐚�筝���荐����"
 
-#: src/server.c:1096 src/server.c:1106
+#: src/server.c:1089 src/server.c:1099
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ャ��"
 
-#: src/server.c:1124 src/server.c:1132
+#: src/server.c:1117 src/server.c:1125
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�冴��"
@@ -6185,208 +6701,142 @@
 msgid "Accept chat invitation?"
 msgstr "�ュ���茫����"
 
-#: src/server.c:1442
+#: src/server.c:1441
 msgid "Gaim - Popup"
 msgstr "Gaim - 荐���"
 
-#: src/server.c:1469
+#: src/server.c:1468
 msgid "More Info"
 msgstr "�翫�莖�荐�"
 
-#: src/sound.c:80
-msgid "Buddy logs in"
-msgstr "絅遵��糸��"
-
-#: src/sound.c:81
-msgid "Buddy logs out"
-msgstr "絅遵��糸��"
-
-#: src/sound.c:82
-msgid "Message received"
-msgstr "�九�域���"
-
-#: src/sound.c:83
-msgid "Message received begins conversation"
-msgstr "荐����九�逸���紮��画�篋よ�"
-
-#: src/sound.c:84
-msgid "Message sent"
-msgstr "荐�������"
-
-#: src/sound.c:85
-msgid "Person enters chat"
-msgstr "��篋咲�峨�ヨ��紊��"
-
-#: src/sound.c:86
-msgid "Person leaves chat"
-msgstr "��篋咲�∫����紊��"
-
-#: src/sound.c:87
-msgid "You talk in chat"
-msgstr "��群�峨�ヨ��紊��"
-
-#: src/sound.c:88
-msgid "Others talk in chat"
-msgstr "�銀�篋咲�峨�ヨ��紊��"
-
-#: src/sound.c:91
-msgid "Someone says your name in chat"
-msgstr "��篋阪����紊��筝㊥��井������絖�"
-
-#: src/sound.c:188
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "�≧��㊥�冗�恰��鐚����堺���後���罟�罅� (%s) 筝�絖�����"
-
-#: src/sound.c:204
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr "�≧��㊥�冗�恰��鐚����咲�後�篋�����篁ゃ���堺�㊥�丈─綣������研羃���荐㊤�篁私���篁ゃ��"
-
-#: src/sound.c:213
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr "�≧��㊥�冗�恰��鐚����堺��荐㊤����恰����篁ゆ���莨��茴��決�鐚�%s"
-
-#: src/stock.c:88
+#: src/stock.c:84
 msgid "_Modify"
 msgstr "篆���(_M)"
 
-#: src/stock.c:89
+#: src/stock.c:85
 msgid "_Open Mail"
 msgstr "�����灸散(_O)"
 
-#: src/util.c:110 src/util.c:115 src/util.c:120 src/util.c:123
+#: src/util.c:78 src/util.c:83 src/util.c:88 src/util.c:91
 msgid "day"
 msgid_plural "days"
 msgstr[0] "紊�"
 
-#: src/util.c:111 src/util.c:115 src/util.c:129 src/util.c:131
+#: src/util.c:79 src/util.c:83 src/util.c:97 src/util.c:99
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "絨��"
 
-#: src/util.c:111 src/util.c:120 src/util.c:129 src/util.c:134
+#: src/util.c:79 src/util.c:88 src/util.c:97 src/util.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "��"
 
-#. full help text
-#: src/util.c:726
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -a, --acct          display account editor window\n"
-"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
-"                      name of away message to use)\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, seperated by commas)\n"
-"  -n, --loginwin      don't automatically login; show login window\n"
-"  -u, --user=NAME     use account NAME\n"
-"  -f, --file=FILE     use FILE as config\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -v, --version       display the current version and exit\n"
-"  -h, --help          display this help and exit\n"
-msgstr ""
-"Gaim %s\n"
-"鋎睡���劫�: %s [�檎��]...\n"
-"\n"
-"  -a, --acct          蕁�ず絽活��羝���\n"
-"  -w, --away[=MESG]   �糸�ュ�蕁�ず�咲�∫�� (�御���у��� MESG �����絎���荀�\n"
-"                      篏睡�����∫��荐�����腮�)\n"
-"  -l, --login[=NAME]  �����糸�� (�御���у��� NAME �����絎���荀��糸�ョ��絽�\n"
-"                      ��鐚�����篁ラ�������阪����)\n"
-"  -n, --loginwin      筝������糸�ワ�蕁�ず�糸�ヨ�腦�\n"
-"  -u, --user=NAME     篏睡��験�� NAME\n"
-"  -f, --file=FILE     篏睡�� FILE �肴┃絎�罟�\n"
-"  -d, --debug         絨��ら�����叱�阪�井�羣�莠後�坂�\n"
-"  -v, --version       蕁�ず�������研�∫��\n"
-"  -h, --help          蕁�ず����茯������研�∫��\n"
-
-#. short message
-#: src/util.c:741
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s���決� `%s -h' 篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
-
-#: src/util.c:1037
-msgid "Not connected to AIM"
-msgstr "羃����e�� AIM"
-
-#: src/util.c:1046 src/util.c:1085
-msgid "No screenname given."
-msgstr "羃���腟��絽活����"
-
-#: src/util.c:1122
-msgid "No roomname given."
-msgstr "羃���腟����紊����腮宴��"
-
-#: src/util.c:1141
-msgid "Invalid AIM URI"
-msgstr "�≧���� AIM URI"
+#: src/util.c:933
+msgid "Calculating..."
+msgstr "荐�膊�筝�..."
+
+#: src/util.c:936
+msgid "Unknown."
+msgstr "���ャ��"
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
 #.
-#: src/win32/systray.c:36
+#: src/win32/systray.c:42
 msgid "Gaim Instant Messenger"
 msgstr "Gaim"
 
-#: src/win32/systray.c:37
+#: src/win32/systray.c:43
 msgid "Gaim Instant Messenger - Signed off"
-msgstr "Gaim - �糸��"
-
-#: src/win32/systray.c:38
+msgstr "Gaim - 綏牙�糸��"
+
+#: src/win32/systray.c:44
 msgid "Gaim Instant Messenger - Away"
 msgstr "Gaim - �∫��"
 
-#: src/win32/systray.c:134
+#: src/win32/systray.c:140
 msgid "New"
 msgstr "�域���"
 
-#: src/win32/systray.c:167
+#: src/win32/systray.c:173
 msgid "Set Away Message"
 msgstr "荐㊤��∫��荐���"
 
-#: src/win32/systray.c:176
+#: src/win32/systray.c:182
 msgid "I'm Back"
 msgstr "����箴�篋�鐚�"
 
-#: src/win32/systray.c:365
+#: src/win32/systray.c:371
 msgid "Exit"
 msgstr "�∫��"
 
-#: src/plugin.c:231
+#: src/plugin.c:222
 #, c-format
 msgid "The plugin %s did not return any valid plugin information"
 msgstr "����罔∞� %s 筝����喝��篁私�������罔∞�荐���"
 
-#: src/plugin.c:236
+#: src/plugin.c:227
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim �≧�莅��ユ������箴���罔∞���"
 
 #. * Custom away message.
-#: src/prpl.h:172
+#: src/prpl.h:175
 msgid "Custom"
 msgstr "篏睡�������"
 
-#: src/gtkdebug.c:111
+#: src/gtkdebug.c:141
 msgid "Debug Window"
 msgstr "�ら���腦�"
 
-#: src/gtkdebug.c:150
-msgid "Pause"
-msgstr "����"
-
-#: src/gtkdebug.c:156
+#: src/gtkdebug.c:184
 msgid "Timestamps"
 msgstr "�����活�"
 
+#~ msgid "Pager Host:"
+#~ msgstr "�喝�主鎧腟延失�����"
+
+#~ msgid "Pager Port:"
+#~ msgstr "�喝�主鎧腟演��荐���鐚�"
+
+#~ msgid "Rename Buddy"
+#~ msgstr "篆��劫ソ����腮�"
+
+#~ msgid "New name:"
+#~ msgstr "�医��絖�鐚�"
+
+#~ msgid "Control-_W closes window"
+#~ msgstr "��筝� Ctrl-W ����荀�腦�(_W)"
+
+#~ msgid "Pause"
+#~ msgstr "����"
+
+#~ msgid "Gaim - Save Image"
+#~ msgstr "Gaim - �峨�綵怨��"
+
+#~ msgid ""
+#~ "You do not currently have any protocols available that are able to "
+#~ "register new accounts."
+#~ msgstr "����膤紫輝筝℡研�����算篏������┿��筝����医験������荐���絎���"
+
+#~ msgid "Gaim - Registration"
+#~ msgstr "Gaim - 荐糸��"
+
+#~ msgid "Registration Information"
+#~ msgstr "荐糸��莖�荐�"
+
+#~ msgid "Register with your server"
+#~ msgstr "��篌堺����┿��"
+
+#~ msgid "File Transfers..."
+#~ msgstr "罟�罅��活叱"
+
+#~ msgid "Accounts..."
+#~ msgstr "絽活��羝���"
+
+#~ msgid "Preferences..."
+#~ msgstr "�鎁処┃絎�"
+
 #~ msgid "Unable to Save Preferences"
 #~ msgstr "�≧��峨��鎁処┃絎�"
 
@@ -6401,21 +6851,6 @@
 #~ msgid "IM Tabs"
 #~ msgstr "�恰��荐����膠�"
 
-#~ msgid "Tab _placement:"
-#~ msgstr "罔�膠や�臀�(_P)鐚�"
-
-#~ msgid "Top"
-#~ msgstr "荀�腦�筝���"
-
-#~ msgid "Bottom"
-#~ msgstr "荀�腦�筝���"
-
-#~ msgid "Left"
-#~ msgstr "荀�腦�綏���"
-
-#~ msgid "Right"
-#~ msgstr "荀�腦��喝��"
-
 #~ msgid ""
 #~ "Show all _instant messages in one tabbed\n"
 #~ "window"
@@ -6430,76 +6865,12 @@
 #~ msgid "Tabs"
 #~ msgstr "罔�膠�"
 
-#~ msgid "Screenname"
-#~ msgstr "絽活��"
-
-#~ msgid "Protocol"
-#~ msgstr "��荐���絎�"
-
 #~ msgid "Load Buddy Icon"
 #~ msgstr "莅���絅遵���腓�"
 
-#~ msgid "Buddy Icon File:"
-#~ msgstr "絅遵���腓堺�罅�鐚�"
-
-#~ msgid "Login Options"
-#~ msgstr "�糸�ラ�檎��"
-
-#~ msgid "Protocol:"
-#~ msgstr "��荐���絎�鐚�"
-
-#~ msgid "Screenname:"
-#~ msgstr "絽活��鐚�"
-
-#~ msgid "Remember Password"
-#~ msgstr "荐�篏鎛�腆�"
-
-#~ msgid "Auto-Login"
-#~ msgstr "�����糸��"
-
-#~ msgid "User Options"
-#~ msgstr "篏睡��������檎��"
-
-#~ msgid "New Mail Notifications"
-#~ msgstr "�育�灸散����"
-
-#~ msgid "%s Options"
-#~ msgstr "%s �檎��"
-
-#~ msgid "Register with server"
-#~ msgstr "��篌堺����┿��"
-
-#~ msgid "Proxy Options"
-#~ msgstr "篁g��篌堺�����檎��"
-
 #~ msgid "Proxy _Type"
 #~ msgstr "篁g��篌堺��������(_T)"
 
-#~ msgid "Use Global Proxy Settings"
-#~ msgstr "篏睡��������篁g��篌堺����┃絎�"
-
-# NOTE ���怨����鐚�筝�����罸�����鐚��合�冴��筝�篏睡����
-#~ msgid "No Proxy"
-#~ msgstr "筝�篏睡��撮��篌堺����"
-
-#~ msgid "_Host:"
-#~ msgstr "筝紙�篏���(_H)鐚�"
-
-#~ msgid "_User:"
-#~ msgstr "篏睡����(_U)鐚�"
-
-#~ msgid "Pa_ssword:"
-#~ msgstr "絲�腆�(_S)鐚�"
-
-#~ msgid "Modify Account"
-#~ msgstr "篆��劫験��"
-
-#~ msgid "Show more options"
-#~ msgstr "蕁�ず莠�紊����檎��"
-
-#~ msgid "Show fewer options"
-#~ msgstr "蕁�ず莠�絨����檎��"
-
 #~ msgid "_Login"
 #~ msgstr "�糸��(_L)"
 
@@ -6536,11 +6907,5 @@
 #~ "���≧�篏睡������絽活��箴��糸�ワ�����醇���荐㊤�����絽活����篏睡������絎�鐚�����������絎�"
 #~ "筝������箴��糸�ョ�����純��"
 
-#~ msgid "Are you sure you want to delete %s?"
-#~ msgstr "��∈絎�荀����� %s鐚�"
-
-#~ msgid "Delete"
-#~ msgstr "����"
-
 #~ msgid "Account Editor"
 #~ msgstr "絽活��羝���"