changeset 8752:0861903359f9

[gaim-migrate @ 9507] updated committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 22 Apr 2004 04:43:22 +0000 (2004-04-22)
parents 8e30e5d6c3cf
children c7e9687bfd79
files po/ChangeLog po/zh_TW.po
diffstat 2 files changed, 1196 insertions(+), 1075 deletions(-) [+]
line wrap: on
line diff
--- a/po/ChangeLog	Thu Apr 22 03:31:07 2004 +0000
+++ b/po/ChangeLog	Thu Apr 22 04:43:22 2004 +0000
@@ -2,7 +2,7 @@
 
 version 0.77cvs:
 	* Chinese (Simplified) translation updated (Funda Wang)
-	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R. Liu)
 	* Czech translation updated (Miloslav Trmac)
 	* Danish translation updated (Morten Brix Pedersen (mbrix))
 	* Dutch translation updated (Vincent van Adrighem)
--- a/po/zh_TW.po	Thu Apr 22 03:31:07 2004 +0000
+++ b/po/zh_TW.po	Thu Apr 22 04:43:22 2004 +0000
@@ -24,14 +24,12 @@
 msgstr ""
 "Project-Id-Version: Gaim 0.77\n"
 "POT-Creation-Date: 2004-04-21 02:13-0400\n"
-"PO-Revision-Date: 2004-04-21 00:29+0800\n"
-"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
+"PO-Revision-Date: 2004-04-22 11:18+0800\n"
+"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\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=2; plural=n != 1;\n"
-"\n"
 
 #  *< api_version
 #  *< type
@@ -40,13 +38,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
 #: plugins/autorecon.c:110
 msgid "Auto-Reconnect"
 msgstr "�������育�g�"
@@ -54,11 +52,14 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/autorecon.c:113 plugins/autorecon.c:115
+#: plugins/autorecon.c:113
+#: plugins/autorecon.c:115
 msgid "When you are kicked offline, this reconnects you."
 msgstr "�銀��欠���鐚�膤紫輝������綛�����育�g���"
 
-#: plugins/chkmail.c:90 plugins/chkmail.c:113 plugins/chkmail.c:122
+#: plugins/chkmail.c:90
+#: plugins/chkmail.c:113
+#: plugins/chkmail.c:122
 msgid "Mail Server"
 msgstr "�灸散篌堺����"
 
@@ -100,11 +101,9 @@
 #. Explanation
 #: plugins/contact_priority.c:139
 msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
+"The buddy with the lowest score is the buddy who will have priority in the contact.\n"
 "The default values (offline = 4,away = 2, and idle = 1)\n"
-"will use what used to be the built-in order active->idle->away->away+idle-"
-">offline."
+"will use what used to be the built-in order active->idle->away->away+idle->offline."
 msgstr ""
 "�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n"
 "��腟����緇����取���鐚�腥�����絨����冴��������鐚����榊�倶��絲���\n"
@@ -132,18 +131,13 @@
 #. *< version
 #. *< summary
 #: plugins/contact_priority.c:194
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+msgid "Allows for controlling the values associated with different buddy states."
 msgstr "莅�篏��������絅遵�������緇����若��"
 
 #. *< description
 #: plugins/contact_priority.c:196
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"莅�篏��������臀��������∫���������∝���������緇����種�篁ヤ梢荐�膊�絅遵�絽活��������罨�"
-"綺��"
+msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "顒�篏��������臀��������∫���������∝���������緇����種�篁ヤ梢荐�膊�絅遵�絽活��������罨≦���"
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
@@ -160,7 +154,9 @@
 msgid "Gaim - Away"
 msgstr "Gaim - �∫��"
 
-#: plugins/docklet/docklet.c:114 src/gtkaccount.c:497 src/gtkaccount.c:1891
+#: plugins/docklet/docklet.c:114
+#: src/gtkaccount.c:497
+#: src/gtkaccount.c:1891
 msgid "Auto-login"
 msgstr "�����糸��"
 
@@ -176,19 +172,29 @@
 msgid "New..."
 msgstr "�医�..."
 
-#: plugins/docklet/docklet.c:153 src/gtkprefs.c:1626 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:187 src/protocols/jabber/jabber.c:952
-#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:119 src/protocols/novell/novell.c:2144
-#: src/protocols/novell/novell.c:2259 src/protocols/novell/novell.c:2311
-#: src/protocols/oscar/oscar.c:520 src/protocols/oscar/oscar.c:4820
-#: src/protocols/oscar/oscar.c:5803 src/protocols/oscar/oscar.c:6421
+#: plugins/docklet/docklet.c:153
+#: src/gtkprefs.c:1626
+#: src/protocols/gg/gg.c:51
+#: src/protocols/irc/msgs.c:187
+#: src/protocols/jabber/jabber.c:952
+#: src/protocols/jabber/jutil.c:32
+#: src/protocols/jabber/presence.c:63
+#: src/protocols/jabber/presence.c:119
+#: src/protocols/novell/novell.c:2144
+#: src/protocols/novell/novell.c:2259
+#: src/protocols/novell/novell.c:2311
+#: src/protocols/oscar/oscar.c:520
+#: src/protocols/oscar/oscar.c:4820
+#: src/protocols/oscar/oscar.c:5803
+#: src/protocols/oscar/oscar.c:6421
 msgid "Away"
 msgstr "�∫��"
 
 #. else...
-#: plugins/docklet/docklet.c:159 src/away.c:522
-#: src/protocols/oscar/oscar.c:4738 src/protocols/oscar/oscar.c:6429
+#: plugins/docklet/docklet.c:159
+#: src/away.c:522
+#: src/protocols/oscar/oscar.c:4738
+#: src/protocols/oscar/oscar.c:6429
 msgid "Back"
 msgstr "菴���"
 
@@ -196,16 +202,21 @@
 msgid "Mute Sounds"
 msgstr "����"
 
-#: plugins/docklet/docklet.c:172 src/gtkft.c:605
+#: plugins/docklet/docklet.c:172
+#: src/gtkft.c:605
 msgid "File Transfers"
 msgstr "罟�罅��活叱"
 
 #. And now for the buttons
-#: plugins/docklet/docklet.c:173 src/gtkaccount.c:2070 src/main.c:286
+#: plugins/docklet/docklet.c:173
+#: src/gtkaccount.c:2070
+#: src/main.c:286
 msgid "Accounts"
 msgstr "絽活��羝���"
 
-#: plugins/docklet/docklet.c:174 src/gtkprefs.c:2576 src/main.c:292
+#: plugins/docklet/docklet.c:174
+#: src/gtkprefs.c:2576
+#: src/main.c:292
 msgid "Preferences"
 msgstr "�鎁処┃絎�"
 
@@ -246,15 +257,8 @@
 # NOTE queuing semantics clarified by marv on #gaim
 #. *  description
 #: plugins/docklet/docklet.c:511
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
-"the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
-msgstr ""
-"��轡篏��d�鐚�箴�絋� GNOME��KDE ��緇��荀�腦�膈���綏ヤ��o�蕁�ず Gaim ����������鐚�莅���"
-"綽�������篏� Gaim ��綛冗��絽悟�����緒���������������絅遵�羝������糸�ヨ�腦�鐚�鐚�筝�����"
-"鋌ラ�御��絨��九�亥��荐�����遺���筝㍼��翫�医轡篏��e��腓肴←藥���鐚�絋���篏睡�� ICQ 筝�罔c��"
+msgid "Displays a system tray icon (in GNOME, KDE or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list or login window. Also allows messages to be queued until the icon is clicked, similar to ICQ."
+msgstr "��轡篏��d�鐚�箴�絋� GNOME��KDE ��緇��荀�腦�膈���綏ヤ��o�蕁�ず Gaim ����������鐚�莅���辱������篏� Gaim ��綛冗��絽悟�����緒���������������絅遵�羝������糸�ヨ�腦�鐚�鐚�筝�����札�御��絨��九�亥��荐�����遺���筝㍼��翫�医轡篏��e��腓肴←藥���鐚�絋���篏睡�� ICQ 筝�罔c��"
 
 #. *< api_version
 #. *< type
@@ -270,7 +274,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/filectl.c:225 plugins/filectl.c:227
+#: plugins/filectl.c:225
+#: plugins/filectl.c:227
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "��荐掩�����罅�筝㊧叱�ユ��篁や札�у�� Gaim��"
 
@@ -278,7 +283,8 @@
 msgid "Not connected to AIM"
 msgstr "羃����e�� AIM"
 
-#: plugins/gaim-remote/remote.c:98 plugins/gaim-remote/remote.c:137
+#: plugins/gaim-remote/remote.c:98
+#: plugins/gaim-remote/remote.c:137
 msgid "No screenname given."
 msgstr "羃���腟��絽活����"
 
@@ -297,6 +303,8 @@
 "Failed to assign %s to a socket:\n"
 "%s"
 msgstr ""
+"��絎� %s �� Socket 紊掩��鐚�\n"
+"%s"
 
 #: plugins/gaim-remote/remote.c:674
 msgid "Unable to open socket"
@@ -322,11 +330,8 @@
 
 #. *  description
 #: plugins/gaim-remote/remote.c:727
-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�画���腴�ァ�句���遵����"
+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�画���腴�ァ�句���遵����"
 
 #. *< api_version
 #. *< type
@@ -424,17 +429,23 @@
 
 #: plugins/gevolution/add_buddy_dialog.c:146
 #: plugins/gevolution/add_buddy_dialog.c:157
-#: plugins/gevolution/assoc-buddy.c:86 plugins/gevolution/assoc-buddy.c:97
-#: src/gtkblist.c:2964 src/gtkprefs.c:873 src/gtkprefs.c:1654
+#: plugins/gevolution/assoc-buddy.c:86
+#: plugins/gevolution/assoc-buddy.c:97
+#: src/gtkblist.c:2964
+#: src/gtkprefs.c:873
+#: src/gtkprefs.c:1654
 #: src/protocols/jabber/jabber.c:916
 msgid "None"
 msgstr "��"
 
 # NOTE ���処⑮����腮宴��鐚����阪����茹d���篋阪��������罔∞���腮宴��
 #: plugins/gevolution/add_buddy_dialog.c:190
-#: plugins/gevolution/assoc-buddy.c:180 src/gtkprefs.c:1991
-#: src/gtkroomlist.c:561 src/protocols/jabber/jabber.c:591
-#: src/protocols/msn/msn.c:1395 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/assoc-buddy.c:180
+#: src/gtkprefs.c:1991
+#: src/gtkroomlist.c:561
+#: src/protocols/jabber/jabber.c:591
+#: src/protocols/msn/msn.c:1395
+#: src/protocols/trepia/trepia.c:398
 msgid "Name"
 msgstr "��腮�"
 
@@ -452,12 +463,14 @@
 
 #. "Search"
 #: plugins/gevolution/add_buddy_dialog.c:495
-#: plugins/gevolution/assoc-buddy.c:385 src/protocols/oscar/oscar.c:6692
+#: plugins/gevolution/assoc-buddy.c:385
+#: src/protocols/oscar/oscar.c:6692
 msgid "Search"
 msgstr "��絨�"
 
 #: plugins/gevolution/add_buddy_dialog.c:566
-#: plugins/gevolution/new_person_dialog.c:310 src/gtkblist.c:3982
+#: plugins/gevolution/new_person_dialog.c:310
+#: src/gtkblist.c:3982
 #: src/gtkblist.c:4310
 msgid "Group:"
 msgstr "臂ょ�鐚�"
@@ -477,12 +490,8 @@
 #  NOTE 絨��� evolution PO 罟�箙�茘��鐚�荅活�筝��≪��Local Addressbook��罌�
 #. Add the label.
 #: plugins/gevolution/assoc-buddy.c:372
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"茫�緇�篏������������御��筝����g機篋削�絅醇������絅遵����峨サ鐚�篏�篋��札�御���医�筝����g機"
-"篋冴��"
+msgid "Select a person from your address book to add this buddy to, or create a new person."
+msgstr "茫�緇�篏������������御��筝����g機篋削�絅醇������絅遵����峨サ鐚�篏�篋��札�御���医�筝����g機篋冴��"
 
 # XXX ��⑮
 #. Add the disclosure
@@ -501,9 +510,14 @@
 msgid "_Associate Buddy"
 msgstr "���絅遵� (_A)"
 
-#: plugins/gevolution/gevo-util.c:66 plugins/gevolution/gevolution.c:90
-#: src/blist.c:685 src/blist.c:872 src/blist.c:2105 src/gtkblist.c:3807
-#: src/protocols/jabber/roster.c:66 src/protocols/msn/notification.c:793
+#: plugins/gevolution/gevo-util.c:66
+#: plugins/gevolution/gevolution.c:90
+#: src/blist.c:685
+#: src/blist.c:872
+#: src/blist.c:2105
+#: src/gtkblist.c:3807
+#: src/protocols/jabber/roster.c:66
+#: src/protocols/msn/notification.c:793
 msgid "Buddies"
 msgstr "絅遵�"
 
@@ -518,12 +532,13 @@
 msgstr "Evolution �翫��荐㊤�"
 
 # TODO Untranslated
-#. Label
+#  Label
 #: plugins/gevolution/gevolution.c:350
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 
-#: plugins/gevolution/gevolution.c:380 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:380
+#: src/gtkconn.c:620
 msgid "Account"
 msgstr "絽活��"
 
@@ -544,7 +559,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gevolution/gevolution.c:464 plugins/gevolution/gevolution.c:466
+#: plugins/gevolution/gevolution.c:464
+#: plugins/gevolution/gevolution.c:466
 msgid "Provides integration with Ximian Evolution."
 msgstr "��箴��� Ximian Evolution ���翫����"
 
@@ -571,7 +587,8 @@
 msgstr "�銀�莖�荐�鐚�"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:341 src/gtkaccount.c:320
+#: plugins/gevolution/new_person_dialog.c:341
+#: src/gtkaccount.c:320
 #: src/protocols/oscar/oscar.c:425
 msgid "Buddy Icon"
 msgstr "絅遵���腓�"
@@ -597,9 +614,7 @@
 msgstr "蕁�ず��菴���荐�����篋よ��井�亥��篋よ�荀�腦�筝�"
 
 #: plugins/history.c:73
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
 msgstr "��紮��遺困茫���鐚�����罔∞��堺����困茫�荀�腦�筝㊨¨腓坂�罨∞��篋よ���"
 
 #. *< api_version
@@ -616,7 +631,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/iconaway.c:83 plugins/iconaway.c:85
+#: plugins/iconaway.c:83
+#: plugins/iconaway.c:85
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "�����∫����鐚���絨��鎁遵�羝������篋よ�荀�腦���"
 
@@ -632,7 +648,8 @@
 msgid "idle for"
 msgstr "��臀�����"
 
-#: plugins/idle.c:90 plugins/timestamp.c:109
+#: plugins/idle.c:90
+#: plugins/timestamp.c:109
 msgid "minutes."
 msgstr "������"
 
@@ -644,7 +661,8 @@
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: plugins/idle.c:121 plugins/idle.c:122
+#: plugins/idle.c:121
+#: plugins/idle.c:122
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "��荐掩�������峨�ラ��臀�����鐚�筝�┃絎���臀��箙�����"
 
@@ -671,11 +689,8 @@
 # NOTE Patch by Kevin Leung
 #. *  description
 #: plugins/ipc-test-client.c:89
-msgid ""
-"Test plugin IPC support, as a client. This locates the server plugin and "
-"calls the commands registered."
-msgstr ""
-"篁ュ��句�荳�蚕羝��罔∞�膤紫輝�� IPC ��呃��恰���上�篌堺����─腟�緇��弱ü�����莠�����篁ゃ��"
+msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
+msgstr "篁ュ��句�荳�蚕羝��罔∞�膤紫輝�� IPC ��呃��恰���上�篌堺����─腟�緇��弱ü�����莠�����篁ゃ��"
 
 #. *< api_version
 #. *< type
@@ -798,7 +813,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/notify.c:765 plugins/notify.c:767
+#: plugins/notify.c:765
+#: plugins/notify.c:767
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "��箴�紊�腮��劫�箴����ユ�����������荐�����"
 
@@ -815,7 +831,8 @@
 
 #. *< name
 #. *< version
-#: plugins/perl/perl.c:532 plugins/perl/perl.c:533
+#: plugins/perl/perl.c:532
+#: plugins/perl/perl.c:533
 msgid "Provides support for loading perl plugins."
 msgstr "��箴�莅��� Perl 罔∞�����叵��"
 
@@ -831,12 +848,8 @@
 msgstr "莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎��画���篏���"
 
 #: plugins/raw.c:157
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-"莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� Jabber��MSN��IRC �� TOC鐚��画�"
-"��篏�����叱�ユ�篏�莠後�ユ��篁わ��� Enter 緇��級���削��檎��莖�荐������ら���腦�蕁�ず��"
+msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+msgstr "莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� Jabber��MSN��IRC �� TOC鐚��画���篏�����叱�ユ�篏�莠後�ユ��篁わ��� Enter 緇��級���削��檎��莖�荐������ら���腦�蕁�ず��"
 
 # XXX ��⑮
 #: plugins/relnot.c:62
@@ -857,15 +870,12 @@
 # XXX ��⑮
 #: plugins/relnot.c:73
 #, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"筝�莠�膃� %s ��鐚�茫��逸�<br><a href=\"http://gaim.sourceforge.net/\">http://gaim."
-"sourceforge.net</a>."
+msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+msgstr "筝�莠�膃� %s ��鐚�茫��逸�<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
 
 # XXX ��⑮
-#: plugins/relnot.c:77 plugins/relnot.c:78
+#: plugins/relnot.c:77
+#: plugins/relnot.c:78
 msgid "New Version Available"
 msgstr "���亥����"
 
@@ -892,11 +902,8 @@
 # XXX ��⑮
 #. *  description
 #: plugins/relnot.c:139
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr ""
-"筝����ョ����羃����亥������筝��主憝��鐚�絨演���渇�e��荅牙���������処����篏級���ヤ戎������"
+msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
+msgstr "筝����ョ����羃����亥������筝��主憝��鐚�絨演���渇�e��荅牙���������処����篏級���ヤ戎������"
 
 #. *< api_version
 #. *< type
@@ -912,7 +919,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/signals-test.c:468 plugins/signals-test.c:470
+#: plugins/signals-test.c:468
+#: plugins/signals-test.c:470
 msgid "Test to see that all signals are working properly."
 msgstr "罟∽�ュ��腮�拭�������処�醇③絽檎��篏���"
 
@@ -930,7 +938,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/simple.c:34 plugins/simple.c:36
+#: plugins/simple.c:34
+#: plugins/simple.c:36
 msgid "Tests to see that most things are working."
 msgstr "���羝������ぇ��蚕���沿タ�処�醇③絽檎��篏���"
 
@@ -962,7 +971,8 @@
 msgid "Text replacement"
 msgstr "��絖���篁�"
 
-#: plugins/spellchk.c:537 plugins/spellchk.c:538
+#: plugins/spellchk.c:537
+#: plugins/spellchk.c:538
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "箴��т戎������絎�臂���荀��鋐���篁i���肴���賢����絖���"
 
@@ -980,7 +990,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
+#: plugins/ssl/ssl-gnutls.c:226
+#: plugins/ssl/ssl-gnutls.c:228
 msgid "Provides SSL support through GNUTLS."
 msgstr "��� GNUTLS ��鋐� SSL ����叵��"
 
@@ -998,7 +1009,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl-nss.c:315 plugins/ssl/ssl-nss.c:317
+#: plugins/ssl/ssl-nss.c:315
+#: plugins/ssl/ssl-nss.c:317
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "��� Mozilla �� NSS ��鋐� SSL ����叵��"
 
@@ -1016,11 +1028,13 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+#: plugins/ssl/ssl.c:94
+#: plugins/ssl/ssl.c:96
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "�堺��� SSL ���恖�綺��箴�筝��� Wrapper��"
 
-#: plugins/statenotify.c:30 src/gtkpounce.c:820
+#: plugins/statenotify.c:30
+#: src/gtkpounce.c:820
 #, c-format
 msgid "%s has gone away."
 msgstr "%s 綏牙��∫����"
@@ -1054,17 +1068,17 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/statenotify.c:81 plugins/statenotify.c:84
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
+#: plugins/statenotify.c:81
+#: plugins/statenotify.c:84
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
 msgstr "��困茫�荀�腦�筝㊨¨腓阪ソ���∫�������演�∫��鐚���臀��菴��������ヨ�����"
 
 #: plugins/tcl/tcl.c:349
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 罔∞�莠��ュ��"
 
-#: plugins/tcl/tcl.c:351 plugins/tcl/tcl.c:352
+#: plugins/tcl/tcl.c:351
+#: plugins/tcl/tcl.c:352
 msgid "Provides support for loading Tcl plugins"
 msgstr "��箴�莅��� Tcl 罔∞������"
 
@@ -1075,14 +1089,16 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
+#: plugins/ticker/ticker.c:74
+#: plugins/ticker/ticker.c:328
 msgid "Buddy Ticker"
 msgstr "鎁遵�莊�薤���"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
+#: plugins/ticker/ticker.c:331
+#: plugins/ticker/ticker.c:333
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "絅遵�羝�����羂翫抗�峨������"
 
@@ -1112,7 +1128,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/timestamp.c:176 plugins/timestamp.c:178
+#: plugins/timestamp.c:176
+#: plugins/timestamp.c:178
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "罸�� N �������� iChat 馺��主�������活��遺困茫�筝㏍��"
 
@@ -1136,7 +1153,8 @@
 msgstr "���恰��荐����腦�筝㊨¨腓� Slider Bar(_S)"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:365 src/gtkprefs.c:876
+#: plugins/win32/transparency/win2ktrans.c:365
+#: src/gtkprefs.c:876
 msgid "Buddy List Window"
 msgstr "絅遵�羝����腦�"
 
@@ -1183,7 +1201,8 @@
 msgstr "�� Windows �����������決� Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:366 src/gtkblist.c:3005
+#: plugins/win32/winprefs/winprefs.c:366
+#: src/gtkblist.c:3005
 #: src/gtkprefs.c:2490
 msgid "Buddy List"
 msgstr "絅遵�羝���"
@@ -1203,8 +1222,10 @@
 msgstr "絨�絅遵�羝����腦�篆�������∝����筝�絮�(_K)"
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:386 src/gtkprefs.c:914
-#: src/gtkprefs.c:2491 src/protocols/msn/msn.c:1621
+#: plugins/win32/winprefs/winprefs.c:386
+#: src/gtkprefs.c:914
+#: src/gtkprefs.c:2491
+#: src/protocols/msn/msn.c:1621
 msgid "Conversations"
 msgstr "篋よ�"
 
@@ -1216,7 +1237,8 @@
 msgid "WinGaim Options"
 msgstr "WinGaim �檎��"
 
-#: plugins/win32/winprefs/winprefs.c:411 plugins/win32/winprefs/winprefs.c:412
+#: plugins/win32/winprefs/winprefs.c:411
+#: plugins/win32/winprefs/winprefs.c:412
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim ���檎���檎����"
 
@@ -1230,22 +1252,13 @@
 msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
 #: src/about.c:94
-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 "
-"written using Gtk+ and is licensed under the GPL.<BR><BR>"
-msgstr ""
-"Gaim �����罔∞������恰��荐����綣��������箴� AIM��ICQ��Yahoo!��MSN��IRC��"
-"Jabber��Napster��Zephyr鐚�篁ュ� Gadu-Gadu 膈����純��絎���札 GTK+ ���種�筝�札 GPL ��"
-"�劫��寂���<BR><BR>"
+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 written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr "Gaim �����罔∞������恰��荐����綣��������箴� AIM��ICQ��Yahoo!��MSN��IRC��Jabber��Napster��Zephyr鐚�篁ュ� Gadu-Gadu 膈����純��絎���札 GTK+ ���種�筝�札 GPL ���劫��寂���<BR><BR>"
 
 # NOTE  contains zh_TW-specific info here!!
 #: src/about.c:104
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #gaim �脂��<BR><BR><FONT "
-"SIZE=\"4\">罩i�筝㊥����莖�荐�:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/"
-"\">http://gaim.myweb.hinet.net/</A><BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #gaim �脂��<BR><BR><FONT SIZE=\"4\">罩i�筝㊥����莖�荐�:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/\">http://gaim.myweb.hinet.net/</A><BR><BR>"
 
 #: src/about.c:109
 msgid "Active Developers"
@@ -1267,7 +1280,9 @@
 msgid "win32 port"
 msgstr "Windows ����Щ罎�"
 
-#: src/about.c:119 src/about.c:120 src/about.c:121
+#: src/about.c:119
+#: src/about.c:120
+#: src/about.c:121
 msgid "developer"
 msgstr "���取��"
 
@@ -1315,11 +1330,13 @@
 msgstr "�鞘算茘���"
 
 # NOTE 絲��坂�����������鐚�筝�����茯���鐚�筝��� :-)
-#: src/about.c:163 src/about.c:197
+#: src/about.c:163
+#: src/about.c:197
 msgid "Catalan"
 msgstr "��羈育����"
 
-#: src/about.c:164 src/about.c:198
+#: src/about.c:164
+#: src/about.c:198
 msgid "Czech"
 msgstr "�桁����"
 
@@ -1331,19 +1348,23 @@
 msgid "British English"
 msgstr "�怨��掩��"
 
-#: src/about.c:167 src/about.c:199
+#: src/about.c:167
+#: src/about.c:199
 msgid "German"
 msgstr "緇傑��"
 
-#: src/about.c:168 src/about.c:200
+#: src/about.c:168
+#: src/about.c:200
 msgid "Spanish"
 msgstr "茱睡�����"
 
-#: src/about.c:169 src/about.c:201
+#: src/about.c:169
+#: src/about.c:201
 msgid "Finnish"
 msgstr "���㊥��"
 
-#: src/about.c:170 src/about.c:202
+#: src/about.c:170
+#: src/about.c:202
 msgid "French"
 msgstr "羈���"
 
@@ -1356,11 +1377,13 @@
 msgstr "��������"
 
 # NOTE 薤�羝�⑮���鎀у������鐚�篏����� zh-TW :-)
-#: src/about.c:173 src/about.c:204
+#: src/about.c:173
+#: src/about.c:204
 msgid "Italian"
 msgstr "臂�ぇ����"
 
-#: src/about.c:174 src/about.c:206
+#: src/about.c:174
+#: src/about.c:206
 msgid "Korean"
 msgstr "����"
 
@@ -1378,7 +1401,8 @@
 msgid "Norwegian"
 msgstr "�����"
 
-#: src/about.c:178 src/about.c:207
+#: src/about.c:178
+#: src/about.c:207
 msgid "Polish"
 msgstr "羈∵�㊥��"
 
@@ -1394,7 +1418,8 @@
 msgid "Romanian"
 msgstr "臂�薤�絢篋���"
 
-#: src/about.c:182 src/about.c:208
+#: src/about.c:182
+#: src/about.c:208
 msgid "Russian"
 msgstr "篆���"
 
@@ -1402,7 +1427,8 @@
 msgid "Serbian"
 msgstr "紂��丞境篋���"
 
-#: src/about.c:184 src/about.c:210
+#: src/about.c:184
+#: src/about.c:210
 msgid "Swedish"
 msgstr "���御��"
 
@@ -1451,7 +1477,8 @@
 msgid "Chinese"
 msgstr "筝㊥��"
 
-#: src/account.c:279 src/protocols/jabber/jabber.c:993
+#: src/account.c:279
+#: src/protocols/jabber/jabber.c:993
 msgid "New passwords do not match."
 msgstr "�医�腆寂研筝��悟���"
 
@@ -1484,38 +1511,80 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:344 src/connection.c:198 src/dialogs.c:471 src/dialogs.c:527
-#: src/gtkblist.c:2363 src/gtkrequest.c:235 src/protocols/jabber/jabber.c:1038
-#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:195
-#: src/protocols/msn/msn.c:206 src/protocols/msn/msn.c:217
-#: src/protocols/msn/msn.c:228 src/protocols/oscar/oscar.c:2763
-#: src/protocols/oscar/oscar.c:2844 src/protocols/oscar/oscar.c:6482
-#: src/protocols/oscar/oscar.c:6578 src/protocols/oscar/oscar.c:6627
-#: src/protocols/oscar/oscar.c:6709 src/protocols/yahoo/yahoo.c:2504
-#: src/protocols/yahoo/yahoo.c:2512 src/request.h:1240
+#: src/account.c:344
+#: src/connection.c:198
+#: src/dialogs.c:471
+#: src/dialogs.c:527
+#: src/gtkblist.c:2363
+#: src/gtkrequest.c:235
+#: src/protocols/jabber/jabber.c:1038
+#: src/protocols/jabber/xdata.c:337
+#: src/protocols/msn/msn.c:195
+#: src/protocols/msn/msn.c:206
+#: src/protocols/msn/msn.c:217
+#: src/protocols/msn/msn.c:228
+#: src/protocols/oscar/oscar.c:2763
+#: src/protocols/oscar/oscar.c:2844
+#: src/protocols/oscar/oscar.c:6482
+#: src/protocols/oscar/oscar.c:6578
+#: src/protocols/oscar/oscar.c:6627
+#: src/protocols/oscar/oscar.c:6709
+#: src/protocols/yahoo/yahoo.c:2504
+#: src/protocols/yahoo/yahoo.c:2512
+#: src/request.h:1240
 msgid "OK"
 msgstr "腆阪�"
 
-#: src/account.c:345 src/account.c:383 src/connection.c:199 src/dialogs.c:305
-#: src/dialogs.c:317 src/dialogs.c:330 src/dialogs.c:351 src/dialogs.c:472
-#: src/dialogs.c:528 src/dialogs.c:851 src/dialogs.c:872 src/dialogs.c:889
-#: src/dialogs.c:908 src/gtkaccount.c:1744 src/gtkaccount.c:2235
-#: src/gtkblist.c:2364 src/gtkblist.c:4349 src/gtkconn.c:168
-#: src/gtkimhtmltoolbar.c:399 src/gtkprivacy.c:575 src/gtkprivacy.c:588
-#: src/gtkprivacy.c:613 src/gtkprivacy.c:624 src/gtkrequest.c:236
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/jabber/buddy.c:514
-#: src/protocols/jabber/chat.c:693 src/protocols/jabber/jabber.c:660
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/xdata.c:338
-#: src/protocols/msn/msn.c:196 src/protocols/msn/msn.c:207
-#: src/protocols/msn/msn.c:218 src/protocols/msn/msn.c:229
-#: src/protocols/msn/msn.c:242 src/protocols/oscar/oscar.c:2725
-#: src/protocols/oscar/oscar.c:2764 src/protocols/oscar/oscar.c:2800
-#: src/protocols/oscar/oscar.c:2845 src/protocols/oscar/oscar.c:6300
-#: src/protocols/oscar/oscar.c:6483 src/protocols/oscar/oscar.c:6579
-#: src/protocols/oscar/oscar.c:6628 src/protocols/oscar/oscar.c:6693
-#: src/protocols/oscar/oscar.c:6710 src/protocols/trepia/trepia.c:347
-#: src/protocols/yahoo/yahoo.c:2505 src/protocols/yahoo/yahoo.c:2513
-#: src/request.h:1240 src/request.h:1250
+#: src/account.c:345
+#: src/account.c:383
+#: src/connection.c:199
+#: src/dialogs.c:305
+#: src/dialogs.c:317
+#: src/dialogs.c:330
+#: src/dialogs.c:351
+#: src/dialogs.c:472
+#: src/dialogs.c:528
+#: src/dialogs.c:851
+#: src/dialogs.c:872
+#: src/dialogs.c:889
+#: src/dialogs.c:908
+#: src/gtkaccount.c:1744
+#: src/gtkaccount.c:2235
+#: src/gtkblist.c:2364
+#: src/gtkblist.c:4349
+#: src/gtkconn.c:168
+#: src/gtkimhtmltoolbar.c:399
+#: src/gtkprivacy.c:575
+#: src/gtkprivacy.c:588
+#: src/gtkprivacy.c:613
+#: src/gtkprivacy.c:624
+#: src/gtkrequest.c:236
+#: src/protocols/icq/gaim_icq.c:277
+#: src/protocols/jabber/buddy.c:514
+#: src/protocols/jabber/chat.c:693
+#: src/protocols/jabber/jabber.c:660
+#: src/protocols/jabber/jabber.c:1039
+#: src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:196
+#: src/protocols/msn/msn.c:207
+#: src/protocols/msn/msn.c:218
+#: src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:242
+#: src/protocols/oscar/oscar.c:2725
+#: src/protocols/oscar/oscar.c:2764
+#: src/protocols/oscar/oscar.c:2800
+#: src/protocols/oscar/oscar.c:2845
+#: src/protocols/oscar/oscar.c:6300
+#: src/protocols/oscar/oscar.c:6483
+#: src/protocols/oscar/oscar.c:6579
+#: src/protocols/oscar/oscar.c:6628
+#: src/protocols/oscar/oscar.c:6693
+#: src/protocols/oscar/oscar.c:6710
+#: src/protocols/trepia/trepia.c:347
+#: src/protocols/yahoo/yahoo.c:2505
+#: src/protocols/yahoo/yahoo.c:2513
+#: src/request.h:1240
+#: src/request.h:1250
 msgid "Cancel"
 msgstr "��羔�"
 
@@ -1524,8 +1593,11 @@
 msgid "Change user information for %s"
 msgstr "�贋�� %s ����篋肴�荐�"
 
-#: src/account.c:382 src/dialogs.c:839 src/gtkrequest.c:242
-#: src/protocols/jabber/buddy.c:513 src/protocols/trepia/trepia.c:346
+#: src/account.c:382
+#: src/dialogs.c:839
+#: src/gtkrequest.c:242
+#: src/protocols/jabber/buddy.c:513
+#: src/protocols/trepia/trepia.c:346
 msgid "Save"
 msgstr "�峨�"
 
@@ -1549,31 +1621,23 @@
 msgid "Set All Away"
 msgstr "����┃�咲�∫��"
 
-#: src/blist.c:590 src/gtkprefs.c:2493
+#: src/blist.c:590
+#: src/gtkprefs.c:2493
 msgid "Chats"
 msgstr "��紊�"
 
 #: src/blist.c:1192
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
-msgstr[0] ""
-"%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�鐚�絅刻���絨�����絽活��筝�����糸�ャ������絅�"
-"����臂ょ�羃���茴�Щ�ゃ��\n"
-msgstr[1] ""
-"%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�����絨�����絽活��筝�����糸�ャ����篋�絅遵���"
-"臂ょ�羃���茴�Щ�ゃ��\n"
-
 #: src/blist.c:1201
+#, c-format
 msgid "Group not removed"
 msgstr "臂ょ���←腱脂��"
 
-#: src/blist.c:1251 src/gtkaccount.c:164 src/gtkft.c:153 src/gtkutils.c:860
-#: src/protocols/jabber/buddy.c:569 src/protocols/novell/novell.c:2156
+#: src/blist.c:1251
+#: src/gtkaccount.c:164
+#: src/gtkft.c:153
+#: src/gtkutils.c:860
+#: src/protocols/jabber/buddy.c:569
+#: src/protocols/novell/novell.c:2156
 msgid "Unknown"
 msgstr "����"
 
@@ -1582,15 +1646,15 @@
 msgstr "�≧����臂ょ���腮�"
 
 #: src/blist.c:2220
-msgid ""
-"An error was encountered parsing your buddy list.  It has not been loaded."
+msgid "An error was encountered parsing your buddy list.  It has not been loaded."
 msgstr "��В������絅遵�羝������主�������絅遵�羝������茴���ャ��"
 
 #: src/blist.c:2222
 msgid "Buddy List Error"
 msgstr "絅遵�羝������"
 
-#: src/connection.c:119 src/connection.c:170
+#: src/connection.c:119
+#: src/connection.c:170
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "�鞘��� %s ����絎�罔∞�"
@@ -1670,7 +1734,8 @@
 msgid "Last created window"
 msgstr "筝�筝���������荀�腦�"
 
-#: src/conversation.c:2469 src/gtkprefs.c:1402
+#: src/conversation.c:2469
+#: src/gtkprefs.c:1402
 msgid "New window"
 msgstr "�域�腦�"
 
@@ -1691,8 +1756,7 @@
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
 "\n"
-"This will increase %s's warning level and he or she will be subject to "
-"harsher rate limiting.\n"
+"This will increase %s's warning level and he or she will be subject to harsher rate limiting.\n"
 msgstr ""
 "<span weight=\"bold\" size=\"larger\">茘��� %s?</span>\n"
 "\n"
@@ -1708,57 +1772,53 @@
 
 #: src/dialogs.c:301
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "��③荅���絨� %s  緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
 # XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
-#: src/dialogs.c:303 src/dialogs.c:304
+#: src/dialogs.c:303
+#: src/dialogs.c:304
 msgid "Remove Buddy"
 msgstr "腱脂�ゅソ��"
 
 #: src/dialogs.c:313
 #, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
+msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "��③荅���絨� %s 緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
-#: src/dialogs.c:315 src/dialogs.c:316
+#: src/dialogs.c:315
+#: src/dialogs.c:316
 msgid "Remove Chat"
 msgstr "腱脂�よ��紊��"
 
 #: src/dialogs.c:325
 #, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"��③荅���絨�臂ょ� %s ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
-
-#: src/dialogs.c:328 src/dialogs.c:329
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "��③荅���絨�臂ょ� %s ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
+
+#: src/dialogs.c:328
+#: src/dialogs.c:329
 msgid "Remove Group"
 msgstr "腱脂�ょ召腟�"
 
 #: src/dialogs.c:346
 #, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr ""
-"��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������"
-"篏����"
+msgid "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr "��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
 # XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
-#: src/dialogs.c:349 src/dialogs.c:350
+#: src/dialogs.c:349
+#: src/dialogs.c:350
 msgid "Remove Contact"
 msgstr "腱脂�ゅソ��"
 
-#: src/dialogs.c:453 src/dialogs.c:509
+#: src/dialogs.c:453
+#: src/dialogs.c:509
 msgid "_Screen name"
 msgstr "絽活��(_S)"
 
-#: src/dialogs.c:459 src/dialogs.c:515
+#: src/dialogs.c:459
+#: src/dialogs.c:515
 msgid "_Account"
 msgstr "絽活��(_A)"
 
@@ -1775,19 +1835,21 @@
 msgstr "��緇�篏睡����莖�荐�"
 
 #: src/dialogs.c:524
-msgid ""
-"Please enter the screen name of the person whose info you would like to view."
+msgid "Please enter the screen name of the person whose info you would like to view."
 msgstr "茫�莠後�ユ�����活��ヨ�絨�莟∞��絽活����"
 
-#: src/dialogs.c:552 src/gtkimhtmltoolbar.c:240
+#: src/dialogs.c:552
+#: src/gtkimhtmltoolbar.c:240
 msgid "Select Text Color"
 msgstr "荐㊤���絖�蕁��"
 
-#: src/dialogs.c:580 src/gtkimhtmltoolbar.c:310
+#: src/dialogs.c:580
+#: src/gtkimhtmltoolbar.c:310
 msgid "Select Background Color"
 msgstr "頥㊤��������"
 
-#: src/dialogs.c:619 src/gtkimhtmltoolbar.c:164
+#: src/dialogs.c:619
+#: src/gtkimhtmltoolbar.c:164
 msgid "Select Font"
 msgstr "�御��絖���"
 
@@ -1796,8 +1858,7 @@
 msgstr "����遵�峨�筝���羃����������∫��荐���"
 
 #: src/dialogs.c:694
-msgid ""
-"Please give the message a title, or choose \"Use\" to use without saving."
+msgid "Please give the message a title, or choose \"Use\" to use without saving."
 msgstr "茫�腟��荐������罔�蕁�鐚�������篏睡����箴�篏睡�������筝��峨�絎���"
 
 #: src/dialogs.c:704
@@ -1828,7 +1889,10 @@
 msgid "Enter an alias for this chat."
 msgstr "茫��咲������紊��莠後�ヤ����ュ����"
 
-#: src/dialogs.c:871 src/dialogs.c:888 src/dialogs.c:907 src/gtkrequest.c:243
+#: src/dialogs.c:871
+#: src/dialogs.c:888
+#: src/dialogs.c:907
+#: src/gtkrequest.c:243
 msgid "Alias"
 msgstr "�ュ��"
 
@@ -1900,7 +1964,8 @@
 "    �檎��:\n"
 "       -h, --help [commmand]    蕁�ず��篁ょ��茯���\n"
 
-#: src/gaim-remote.c:174 src/gaim-remote.c:190
+#: src/gaim-remote.c:174
+#: src/gaim-remote.c:190
 msgid "Gaim not running (on session 0)\n"
 msgstr "Gaim 筝����決�鐚���轡篏���� 0鐚�\n"
 
@@ -1958,19 +2023,23 @@
 msgid "sorry, i ran out for a while. bbl"
 msgstr "筝�絅醇��������∫��筝�筝�筝���"
 
-#: src/gaimrc.c:375 src/gaimrc.c:1451
+#: src/gaimrc.c:375
+#: src/gaimrc.c:1451
 msgid "boring default"
 msgstr "�∴��鐚���荐㍼�"
 
-#: src/gaimrc.c:1260 src/gtkblist.c:2966
+#: src/gaimrc.c:1260
+#: src/gtkblist.c:2966
 msgid "Alphabetical"
 msgstr "箴��у�罸�"
 
-#: src/gaimrc.c:1262 src/gtkblist.c:2967
+#: src/gaimrc.c:1262
+#: src/gtkblist.c:2967
 msgid "By status"
 msgstr "箴��х����"
 
-#: src/gaimrc.c:1264 src/gtkblist.c:2968
+#: src/gaimrc.c:1264
+#: src/gtkblist.c:2968
 msgid "By log size"
 msgstr "箴��ф�ヨ�紊у�"
 
@@ -1994,7 +2063,8 @@
 msgid "Protocol:"
 msgstr "��荐���絎�鐚�"
 
-#: src/gtkaccount.c:406 src/gtkblist.c:3954
+#: src/gtkaccount.c:406
+#: src/gtkblist.c:3954
 msgid "Screen Name:"
 msgstr "絽活��鐚�"
 
@@ -2002,7 +2072,9 @@
 msgid "Password:"
 msgstr "絲�腆種�"
 
-#: src/gtkaccount.c:484 src/gtkblist.c:3968 src/gtkblist.c:4296
+#: src/gtkaccount.c:484
+#: src/gtkblist.c:3968
+#: src/gtkblist.c:4296
 msgid "Alias:"
 msgstr "�ュ��鐚�"
 
@@ -2038,34 +2110,41 @@
 msgstr "%s �檎��"
 
 #. Use Global Proxy Settings
-#: src/gtkaccount.c:778 src/gtkaccount.c:825
+#: src/gtkaccount.c:778
+#: src/gtkaccount.c:825
 msgid "Use Global Proxy Settings"
 msgstr "篏睡��������篁g��篌堺����┃絎�"
 
 # NOTE ��札��篁g��篌堺�����罸�����
 # NOTE 薤�羝���������罸�����鐚�篏�茗���茯���罸�������筝�����鐚���筝�篏睡����莠�絅�
 #. No Proxy
-#: src/gtkaccount.c:784 src/gtkaccount.c:832
+#: src/gtkaccount.c:784
+#: src/gtkaccount.c:832
 msgid "No Proxy"
 msgstr "筝�篏睡��撮��篌堺����"
 
 #. HTTP
-#: src/gtkaccount.c:790 src/gtkaccount.c:839
+#: src/gtkaccount.c:790
+#: src/gtkaccount.c:839
 msgid "HTTP"
 msgstr "HTTP"
 
 #. SOCKS 4
-#: src/gtkaccount.c:796 src/gtkaccount.c:846
+#: src/gtkaccount.c:796
+#: src/gtkaccount.c:846
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
 #. SOCKS 5
-#: src/gtkaccount.c:802 src/gtkaccount.c:853
+#: src/gtkaccount.c:802
+#: src/gtkaccount.c:853
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:808 src/gtkaccount.c:860 src/gtkprefs.c:1203
+#: src/gtkaccount.c:808
+#: src/gtkaccount.c:860
+#: src/gtkprefs.c:1203
 msgid "Use Environmental Settings"
 msgstr "篏睡���医�莅��梧┃絎�"
 
@@ -2081,15 +2160,18 @@
 msgid "Proxy Options"
 msgstr "篁g��篌堺�����檎��"
 
-#: src/gtkaccount.c:937 src/gtkprefs.c:1197
+#: src/gtkaccount.c:937
+#: src/gtkprefs.c:1197
 msgid "Proxy _type:"
 msgstr "篁g��篌堺��������(_T)鐚�"
 
-#: src/gtkaccount.c:946 src/gtkprefs.c:1227
+#: src/gtkaccount.c:946
+#: src/gtkprefs.c:1227
 msgid "_Host:"
 msgstr "筝紙�篏���(_H)鐚�"
 
-#: src/gtkaccount.c:950 src/gtkprefs.c:1245
+#: src/gtkaccount.c:950
+#: src/gtkprefs.c:1245
 msgid "_Port:"
 msgstr "��荐���(_P)鐚�"
 
@@ -2097,7 +2179,8 @@
 msgid "_Username:"
 msgstr "篏睡����(_U)鐚�"
 
-#: src/gtkaccount.c:963 src/gtkprefs.c:1282
+#: src/gtkaccount.c:963
+#: src/gtkprefs.c:1282
 msgid "Pa_ssword:"
 msgstr "絲�腆�(_S)鐚�"
 
@@ -2119,7 +2202,8 @@
 msgstr "蕁�ず莠�絨����檎��"
 
 #. Register button
-#: src/gtkaccount.c:1385 src/protocols/jabber/jabber.c:659
+#: src/gtkaccount.c:1385
+#: src/protocols/jabber/jabber.c:659
 msgid "Register"
 msgstr "荐糸��"
 
@@ -2128,18 +2212,24 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "��∈絎�荀����� %s鐚�"
 
-#: src/gtkaccount.c:1743 src/gtkrequest.c:239
+#: src/gtkaccount.c:1743
+#: src/gtkrequest.c:239
 msgid "Delete"
 msgstr "����"
 
-#: src/gtkaccount.c:1857 src/protocols/oscar/oscar.c:3360
+#: src/gtkaccount.c:1857
+#: src/protocols/oscar/oscar.c:3360
 msgid "Screen Name"
 msgstr "絽活��"
 
-#: src/gtkaccount.c:1880 src/protocols/jabber/jabber.c:950
-#: src/protocols/oscar/oscar.c:526 src/protocols/oscar/oscar.c:4818
-#: src/protocols/oscar/oscar.c:6420 src/protocols/yahoo/yahoo.c:2299
-#: src/protocols/zephyr/zephyr.c:1182 src/protocols/zephyr/zephyr.c:1192
+#: src/gtkaccount.c:1880
+#: src/protocols/jabber/jabber.c:950
+#: src/protocols/oscar/oscar.c:526
+#: src/protocols/oscar/oscar.c:4818
+#: src/protocols/oscar/oscar.c:6420
+#: src/protocols/yahoo/yahoo.c:2299
+#: src/protocols/zephyr/zephyr.c:1182
+#: src/protocols/zephyr/zephyr.c:1192
 msgid "Online"
 msgstr "筝�膩�"
 
@@ -2171,16 +2261,20 @@
 msgstr "絨�篏睡�������ユ����絅遵�羝����"
 
 #. Add button
-#: src/gtkaccount.c:2234 src/gtkblist.c:4348 src/gtkconv.c:1107
-#: src/gtkconv.c:3338 src/gtkconv.c:3429 src/gtkrequest.c:240
-#: src/protocols/icq/gaim_icq.c:277 src/protocols/oscar/oscar.c:3007
+#: src/gtkaccount.c:2234
+#: src/gtkblist.c:4348
+#: src/gtkconv.c:1107
+#: src/gtkconv.c:3338
+#: src/gtkconv.c:3429
+#: src/gtkrequest.c:240
+#: src/protocols/icq/gaim_icq.c:277
+#: src/protocols/oscar/oscar.c:3007
 msgid "Add"
 msgstr "����"
 
-#: src/gtkblist.c:801 src/gtkblist.c:4236
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
+#: src/gtkblist.c:801
+#: src/gtkblist.c:4236
+msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "��研���糸�ヤ算篏�筝�����������ヨ��紊������荐���絎���"
 
 # TODO ��莎隙���荅牙�阪��筝����亥����紊��鐚�筝�����紊��罩檎��井����臂ょ���
@@ -2190,20 +2284,22 @@
 msgstr "���ヨ��紊��"
 
 #: src/gtkblist.c:835
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
+msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "茫�莠後�ラ���惹�����喝���ュソ��羝�������紊�������区�荐���\n"
 
-#: src/gtkblist.c:848 src/gtkpounce.c:361 src/gtkroomlist.c:365
+#: src/gtkblist.c:848
+#: src/gtkpounce.c:361
+#: src/gtkroomlist.c:365
 msgid "_Account:"
 msgstr "絽活��(_A)鐚�"
 
-#: src/gtkblist.c:1087 src/gtkblist.c:3155
+#: src/gtkblist.c:1087
+#: src/gtkblist.c:3155
 msgid "Get _Info"
 msgstr "��緇�莖�荐�(_I)"
 
-#: src/gtkblist.c:1090 src/gtkblist.c:3146
+#: src/gtkblist.c:1090
+#: src/gtkblist.c:3146
 msgid "I_M"
 msgstr "�恰��荐���(_M)"
 
@@ -2215,11 +2311,15 @@
 msgid "View _Log"
 msgstr "茹����ヨ�(_L)"
 
-#: src/gtkblist.c:1159 src/gtkblist.c:1260 src/gtkblist.c:1274
+#: src/gtkblist.c:1159
+#: src/gtkblist.c:1260
+#: src/gtkblist.c:1274
 msgid "_Alias..."
 msgstr "�ュ��(_A)..."
 
-#: src/gtkblist.c:1161 src/gtkblist.c:1262 src/gtkblist.c:1279
+#: src/gtkblist.c:1161
+#: src/gtkblist.c:1262
+#: src/gtkblist.c:1279
 #: src/gtkconn.c:361
 msgid "_Remove"
 msgstr "腱脂��(_R)"
@@ -2241,7 +2341,9 @@
 msgstr "���遵��(_R)"
 
 #. join button
-#: src/gtkblist.c:1238 src/gtkroomlist.c:261 src/gtkroomlist.c:417
+#: src/gtkblist.c:1238
+#: src/gtkroomlist.c:261
+#: src/gtkroomlist.c:417
 #: src/stock.c:87
 msgid "_Join"
 msgstr "����(_J)"
@@ -2250,7 +2352,8 @@
 msgid "Auto-Join"
 msgstr "��������"
 
-#: src/gtkblist.c:1276 src/gtkblist.c:1302
+#: src/gtkblist.c:1276
+#: src/gtkblist.c:1302
 msgid "_Collapse"
 msgstr "�区儀(_C)"
 
@@ -2259,9 +2362,9 @@
 msgstr "絮���(_E)"
 
 # XXX ��⑮
-#: src/gtkblist.c:1964 src/gtkconv.c:3916
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: src/gtkblist.c:1964
+#: src/gtkconv.c:3916
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "��研���糸�ヤ算篏�筝���������医�����絅遵�����荐���絎���"
 
 #. Buddies menu
@@ -2480,7 +2583,7 @@
 #: src/gtkblist.c:2764
 #, c-format
 msgid "Idle (%dh%02dm) "
-msgstr "��臀��%d 絨�� %d ����"
+msgstr "��臀��%d 絨�� %02d ����"
 
 #: src/gtkblist.c:2766
 #, c-format
@@ -2543,21 +2646,18 @@
 msgid "Set an away message"
 msgstr "荐㊤�筝����∫��荐���"
 
-#: src/gtkblist.c:3909 src/protocols/yahoo/yahoo.c:2431
+#: src/gtkblist.c:3909
+#: src/protocols/yahoo/yahoo.c:2431
 msgid "Add Buddy"
 msgstr "�医�絅遵�"
 
 #: src/gtkblist.c:3932
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�������荐㊤�絨���"
-"��ソ��羝���賢蕁�ず��\n"
+msgid "Please enter the screen name of the person you would like to add to your buddy list. You may optionally enter an alias, or nickname,  for the buddy. The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "茫�莠後�ユ�����活����ュソ����絽活�������札�咲����絅遵�荐㊤��ュ�����援┗鐚�������荐㊤�絨�����ソ��羝���賢蕁�ず��\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:3992 src/gtkblist.c:4276
+#: src/gtkblist.c:3992
+#: src/gtkblist.c:4276
 msgid "Account:"
 msgstr "絽活��鐚�"
 
@@ -2566,9 +2666,7 @@
 msgstr "�医���紊��"
 
 #: src/gtkblist.c:4266
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
+msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "茫�莠後�ュ�ュ��鐚��������惹�����喝���ュソ��羝�������紊�������区�荐���\n"
 
 #: src/gtkblist.c:4345
@@ -2583,7 +2681,9 @@
 msgid "No actions available"
 msgstr "筝���荐延算篏���篏�"
 
-#: src/gtkconn.c:78 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:78
+#: src/gtkconn.c:250
+#: src/gtkconn.c:261
 msgid "Done."
 msgstr "絎�����"
 
@@ -2599,7 +2699,8 @@
 msgid "Cancel All"
 msgstr "�����羔�"
 
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:361
+#: src/gtkconn.c:593
 msgid "_Reconnect"
 msgstr "���育�g�(_R)"
 
@@ -2638,7 +2739,8 @@
 msgid "That file already exists"
 msgstr "�e��罟�罅�綏牙�絖���"
 
-#: src/gtkconv.c:191 src/gtkft.c:1106
+#: src/gtkconv.c:191
+#: src/gtkft.c:1106
 msgid "Would you like to overwrite it?"
 msgstr "���荀���絎����"
 
@@ -2648,9 +2750,7 @@
 
 #. Put our happy label in it.
 #: src/gtkconv.c:533
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
+msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "茫�莠後�ユ���渇��茫���篏睡������腮縁�篁ュ���茫���荐�����"
 
 #: src/gtkconv.c:554
@@ -2677,14 +2777,16 @@
 msgid "Un-Ignore"
 msgstr "��羔�綽順�ヤ戎����"
 
-#: src/gtkconv.c:1075 src/gtkprefs.c:806
+#: src/gtkconv.c:1075
+#: src/gtkprefs.c:806
 msgid "Ignore"
 msgstr "綽順�ヤ戎����"
 
 # XXX��Info����篏���室箙����緇�篏睡����莖�荐�鐚�篏�筝����鐚���篋��銀�po罟�篁������������藝�
 # XXX javajsp (Ka-Hing CHEUNG) 荀�������Info����膣����醇������緇�篏睡����莖�荐���
 #. Info button
-#: src/gtkconv.c:1084 src/gtkconv.c:3352
+#: src/gtkconv.c:1084
+#: src/gtkconv.c:3352
 msgid "Info"
 msgstr "��緇�莖�荐�"
 
@@ -2693,7 +2795,9 @@
 msgstr "��緇��∝�荐���"
 
 #. Remove button
-#: src/gtkconv.c:1105 src/gtkconv.c:3345 src/gtkconv.c:3436
+#: src/gtkconv.c:1105
+#: src/gtkconv.c:3345
+#: src/gtkconv.c:3436
 #: src/gtkrequest.c:241
 msgid "Remove"
 msgstr "腱脂��"
@@ -2867,7 +2971,10 @@
 
 #. From right to left...
 #. Send button
-#: src/gtkconv.c:3308 src/gtkconv.c:3310 src/gtkconv.c:3408 src/gtkconv.c:3410
+#: src/gtkconv.c:3308
+#: src/gtkconv.c:3310
+#: src/gtkconv.c:3408
+#: src/gtkconv.c:3410
 msgid "Send"
 msgstr "����"
 
@@ -2882,7 +2989,9 @@
 msgstr "茘���篏睡����"
 
 #. Block button
-#: src/gtkconv.c:3331 src/gtkprivacy.c:612 src/gtkprivacy.c:623
+#: src/gtkconv.c:3331
+#: src/gtkprivacy.c:612
+#: src/gtkprivacy.c:623
 msgid "Block"
 msgstr "絨���"
 
@@ -2898,7 +3007,8 @@
 msgid "Remove the user from your buddy list"
 msgstr "絨�篏睡����������絅遵�羝���賢腱脂��"
 
-#: src/gtkconv.c:3355 src/gtkconv.c:3677
+#: src/gtkconv.c:3355
+#: src/gtkconv.c:3677
 msgid "Get the user's information"
 msgstr "��緇�篏睡����莖�荐�"
 
@@ -2940,14 +3050,13 @@
 msgid "Close conversation"
 msgstr "����篋よ�"
 
-#: src/gtkconv.c:4752 src/gtkconv.c:4784 src/gtkconv.c:4905 src/gtkconv.c:4972
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d ��篋阪�������翠��"
-msgstr[1] "%d ��篋阪�������翠��"
-
-#: src/gtkconv.c:5491 src/gtkconv.c:5494
+#: src/gtkconv.c:4752
+#: src/gtkconv.c:4784
+#: src/gtkconv.c:4905
+#: src/gtkconv.c:4972
+#: src/gtkconv.c:5491
+#: src/gtkconv.c:5494
+#, c-format
 msgid "<main>/Conversation/Close"
 msgstr "<mail>/篋よ�/����"
 
@@ -2968,7 +3077,8 @@
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
-#: src/gtkft.c:156 src/gtkft.c:957
+#: src/gtkft.c:156
+#: src/gtkft.c:957
 msgid "Finished"
 msgstr "絎�篋�"
 
@@ -3044,7 +3154,8 @@
 msgstr "�沿��勈叱膣亥�"
 
 #. Pause button
-#: src/gtkft.c:696 src/stock.c:90
+#: src/gtkft.c:696
+#: src/stock.c:90
 msgid "_Pause"
 msgstr "����(_P)"
 
@@ -3118,9 +3229,7 @@
 
 # NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
 #: src/gtkimhtml.c:2635
-msgid ""
-"Unable to guess the image type based on the file extension supplied.  "
-"Defaulting to PNG."
+msgid "Unable to guess the image type based on the file extension supplied.  Defaulting to PNG."
 msgstr "Gaim �≧�箴��у�����箴��ゅ�ュ襲��弢�鐚�����倶�� PNG 罟�������"
 
 #: src/gtkimhtml.c:2643
@@ -3149,9 +3258,7 @@
 msgstr "���ラ�g�"
 
 #: src/gtkimhtmltoolbar.c:394
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
+msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "茫�莠後�ユ����荀����ョ�� URL ��絎����颷逸��颷井���御���х��鐚������叱�ャ��"
 
 #: src/gtkimhtmltoolbar.c:398
@@ -3222,18 +3329,13 @@
 msgstr "篋よ�鐚�"
 
 #. Window **********
-#: src/gtklog.c:368 src/gtklog.c:384
+#: src/gtklog.c:368
+#: src/gtklog.c:384
 msgid "System Log"
 msgstr "膤紫輝�ヨ�"
 
 #. Descriptive label
 #: src/gtknotify.c:217
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s �� %d 絨��育�灸散��"
-msgstr[1] "%s �� %d 絨��育�灸散��"
-
 #: src/gtknotify.c:229
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
@@ -3271,19 +3373,21 @@
 msgid "The browser command \"%s\" is invalid."
 msgstr "�頳遵����篁ゃ��%s�����≧������"
 
-#: src/gtknotify.c:444 src/gtknotify.c:458 src/gtknotify.c:473
+#: src/gtknotify.c:444
+#: src/gtknotify.c:458
+#: src/gtknotify.c:473
 #: src/gtknotify.c:581
 msgid "Unable to open URL"
 msgstr "�≧�����膓臥��"
 
-#: src/gtknotify.c:455 src/gtknotify.c:470
+#: src/gtknotify.c:455
+#: src/gtknotify.c:470
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "�決���%s�����主��篋����鐚�%s"
 
 #: src/gtknotify.c:582
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "���悟�����篏睡��������頳遵����鐚��紙����荐㊤���篁ゃ��"
 
 #: src/gtkpounce.c:143
@@ -3295,7 +3399,8 @@
 msgstr "茫�莠後�ヤ���絅遵�篁ラ�画�������"
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:336 src/gtkpounce.c:756
+#: src/gtkpounce.c:336
+#: src/gtkpounce.c:756
 msgid "New Buddy Pounce"
 msgstr "�医�絅遵���������"
 
@@ -3443,19 +3548,18 @@
 msgstr "�九�ュ��羃���荐㊤���鐚�篁ュ��号��荐㊤����援┗蕁�ず(_I)"
 
 #: src/gtkprefs.c:584
-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."
-msgstr ""
-"����∝��羝���賢�後�筝��������喝��罩∞��茵���筝脂������札�����括���劫�絨��亥��茵���筝脂�"
-"絎�茖��井���賢��"
+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."
+msgstr "����∝��羝���賢�後�筝��������喝��罩∞��茵���筝脂������札�����括���劫�絨��亥��茵���筝脂�絎�茖��井���賢��"
 
 #: src/gtkprefs.c:619
 msgid "Icon"
 msgstr "��腓�"
 
-#: src/gtkprefs.c:626 src/gtkprefs.c:2028 src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:684
+#: src/gtkprefs.c:626
+#: src/gtkprefs.c:2028
+#: src/protocols/jabber/buddy.c:265
+#: src/protocols/jabber/buddy.c:748
+#: src/protocols/jabber/chat.c:684
 msgid "Description"
 msgstr "�颷�"
 
@@ -3510,7 +3614,9 @@
 msgid "Bac_kground color"
 msgstr "�������(_K)"
 
-#: src/gtkprefs.c:794 src/gtkprefs.c:1026 src/gtkprefs.c:1074
+#: src/gtkprefs.c:794
+#: src/gtkprefs.c:1026
+#: src/gtkprefs.c:1074
 msgid "Display"
 msgstr "蕁�ず"
 
@@ -3586,23 +3692,33 @@
 msgid "Buddy List Toolbar"
 msgstr "絅遵�羝���轡�桁��"
 
-#: src/gtkprefs.c:868 src/gtkprefs.c:999 src/gtkprefs.c:1050
+#: src/gtkprefs.c:868
+#: src/gtkprefs.c:999
+#: src/gtkprefs.c:1050
 msgid "Show _buttons as:"
 msgstr "蕁�ず���窮��(_B)鐚�"
 
-#: src/gtkprefs.c:870 src/gtkprefs.c:1001 src/gtkprefs.c:1052
+#: src/gtkprefs.c:870
+#: src/gtkprefs.c:1001
+#: src/gtkprefs.c:1052
 msgid "Pictures"
 msgstr "��綵�"
 
-#: src/gtkprefs.c:871 src/gtkprefs.c:1002 src/gtkprefs.c:1053
+#: src/gtkprefs.c:871
+#: src/gtkprefs.c:1002
+#: src/gtkprefs.c:1053
 msgid "Text"
 msgstr "��絖�"
 
-#: src/gtkprefs.c:872 src/gtkprefs.c:1003 src/gtkprefs.c:1054
+#: src/gtkprefs.c:872
+#: src/gtkprefs.c:1003
+#: src/gtkprefs.c:1054
 msgid "Pictures and text"
 msgstr "��綵∵����絖�"
 
-#: src/gtkprefs.c:877 src/gtkprefs.c:1014 src/gtkprefs.c:1065
+#: src/gtkprefs.c:877
+#: src/gtkprefs.c:1014
+#: src/gtkprefs.c:1065
 msgid "_Raise window on events"
 msgstr "�銀�篁句�主����鐚�絨�荀�腦����井��筝���(_R)"
 
@@ -3618,7 +3734,8 @@
 msgid "Buddy Display"
 msgstr "絅遵�蕁�ず"
 
-#: src/gtkprefs.c:885 src/gtkprefs.c:1021
+#: src/gtkprefs.c:885
+#: src/gtkprefs.c:1021
 msgid "Show buddy _icons"
 msgstr "蕁�ず絅遵���腓�(_I)"
 
@@ -3695,19 +3812,23 @@
 msgid "Show status _icons on tabs"
 msgstr "���膠や�蕁�ず絅遵�����(_I)"
 
-#: src/gtkprefs.c:998 src/gtkprefs.c:1049
+#: src/gtkprefs.c:998
+#: src/gtkprefs.c:1049
 msgid "Window"
 msgstr "荀�腦�"
 
-#: src/gtkprefs.c:1008 src/gtkprefs.c:1059
+#: src/gtkprefs.c:1008
+#: src/gtkprefs.c:1059
 msgid "New window _width:"
 msgstr "�域�腦�絲�墾(_W)鐚�"
 
-#: src/gtkprefs.c:1010 src/gtkprefs.c:1061
+#: src/gtkprefs.c:1010
+#: src/gtkprefs.c:1061
 msgid "New window _height:"
 msgstr "�域�腦�蕭�綺�(_H)鐚�"
 
-#: src/gtkprefs.c:1012 src/gtkprefs.c:1063
+#: src/gtkprefs.c:1012
+#: src/gtkprefs.c:1063
 msgid "_Entry field height:"
 msgstr "莠後�ユ�蕭�綺�(_E)鐚�"
 
@@ -3759,7 +3880,8 @@
 msgid "Co_lorize screen names"
 msgstr "絨�絽活��篁ラ��峨����(_L)"
 
-#: src/gtkprefs.c:1100 src/protocols/oscar/oscar.c:587
+#: src/gtkprefs.c:1100
+#: src/protocols/oscar/oscar.c:587
 #: src/protocols/oscar/oscar.c:4215
 msgid "IP Address"
 msgstr "IP 篏���"
@@ -3987,8 +4109,10 @@
 msgid "Send auto-response in _active conversations"
 msgstr "�����画���篋よ�箙�荀����肴��������(_A)"
 
-#: src/gtkprefs.c:1651 src/protocols/msn/state.c:30
-#: src/protocols/novell/novell.c:2150 src/protocols/oscar/oscar.c:3373
+#: src/gtkprefs.c:1651
+#: src/protocols/msn/state.c:30
+#: src/protocols/novell/novell.c:2150
+#: src/protocols/oscar/oscar.c:3373
 #: src/protocols/yahoo/yahoo.c:2295
 msgid "Idle"
 msgstr "��臀�"
@@ -4182,7 +4306,8 @@
 msgid "Block only the users below"
 msgstr "絨���篁ヤ���篏睡����"
 
-#: src/gtkprivacy.c:374 src/protocols/jabber/jabber.c:1272
+#: src/gtkprivacy.c:374
+#: src/protocols/jabber/jabber.c:1272
 msgid "Privacy"
 msgstr "�援�荐㊤�"
 
@@ -4195,7 +4320,8 @@
 msgid "Set privacy for:"
 msgstr "絽活��鐚�"
 
-#: src/gtkprivacy.c:569 src/gtkprivacy.c:585
+#: src/gtkprivacy.c:569
+#: src/gtkprivacy.c:585
 msgid "Permit User"
 msgstr "荐怨�戎����"
 
@@ -4207,7 +4333,8 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "茫�莠後�ユ����荐怨���機����篏睡��������腮宴��"
 
-#: src/gtkprivacy.c:574 src/gtkprivacy.c:587
+#: src/gtkprivacy.c:574
+#: src/gtkprivacy.c:587
 msgid "Permit"
 msgstr "荐怨�"
 
@@ -4221,7 +4348,8 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "��∈絎�荐怨� %s ��機�����"
 
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:621
+#: src/gtkprivacy.c:608
+#: src/gtkprivacy.c:621
 msgid "Block User"
 msgstr "��腟�篏睡����"
 
@@ -4246,13 +4374,17 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:233 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1317 src/request.h:1231
+#: src/gtkrequest.c:233
+#: src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1317
+#: src/request.h:1231
 msgid "Yes"
 msgstr "��"
 
-#: src/gtkrequest.c:234 src/protocols/gg/gg.c:663
-#: src/protocols/novell/novell.c:1318 src/request.h:1231
+#: src/gtkrequest.c:234
+#: src/protocols/gg/gg.c:663
+#: src/protocols/novell/novell.c:1318
+#: src/request.h:1231
 msgid "No"
 msgstr "��"
 
@@ -4260,14 +4392,13 @@
 msgid "Apply"
 msgstr "絅���"
 
-#: src/gtkrequest.c:238 src/protocols/msn/msn.c:261
+#: src/gtkrequest.c:238
+#: src/protocols/msn/msn.c:261
 msgid "Close"
 msgstr "����"
 
 #: src/gtkroomlist.c:322
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"list rooms."
+msgid "You are not currently signed on with any protocols that have the ability to list rooms."
 msgstr "��研���糸�ヤ算篏�筝�����������肴��紊������荐���絎���"
 
 #: src/gtkroomlist.c:335
@@ -4326,16 +4457,12 @@
 msgstr "�≧��㊥�冗�恰��鐚����堺���後���罟�罅� (%s) 筝�絖�����"
 
 #: src/gtksound.c:174
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
+msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
 msgstr "�≧��㊥�冗�恰��鐚����咲�後�篋�����篁ゃ���堺�㊥�丈─綣������研羃���荐㊤�篁私���篁ゃ��"
 
 #: src/gtksound.c:186
 #, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
+msgid "Unable to play sound because the configured sound command could not be launched: %s"
 msgstr "�≧��㊥�冗�恰��鐚����榊�≧��決���荐㊤����恰����篁わ�%s"
 
 #: src/gtkutils.c:297
@@ -4356,28 +4483,22 @@
 
 #: src/log.c:561
 #, c-format
-msgid ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;��������&gt;:"
-"</b></font> %s<br/>\n"
+msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;��������&gt;:</b></font> %s<br/>\n"
 
 #: src/log.c:563
 #, c-format
-msgid ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
-"REPLY&gt;:</b></font> %s<br/>\n"
-msgstr ""
-"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;��������&gt;:"
-"</b></font> %s<br/>\n"
+msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
+msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;��������&gt;:</b></font> %s<br/>\n"
 
 # XXX ��⑮
-#: src/log.c:614 src/log.c:800
+#: src/log.c:614
+#: src/log.c:800
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�鞘��井�ヨ�罟�罅�鐚�</b></font>"
 
-#: src/log.c:624 src/log.c:812
+#: src/log.c:624
+#: src/log.c:812
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>�≧�莅���罟�罅�鐚�%s</b></font>"
@@ -4457,12 +4578,11 @@
 
 #: src/plugin.c:269
 #, c-format
-msgid ""
-"The required plugin %s was not found. Please install this plugin and try "
-"again."
+msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "�鞘��育��荀���罔∞���%s����茫����医�茖�����罔∞�箙�緇���荅���"
 
-#: src/plugin.c:274 src/plugin.c:302
+#: src/plugin.c:274
+#: src/plugin.c:302
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim �≧�莅��ユ������箴���罔∞���"
 
@@ -4472,16 +4592,23 @@
 msgstr "�≧�莠��ラ��荀���罔∞���%s����"
 
 # NOTE �推�絖��∝�頑⑮鐚���罔g���ュ�緇�絅���
-#: src/prefs.c:113 src/status.c:273
+#: src/prefs.c:113
+#: src/status.c:273
 msgid "Slightly less boring default"
 msgstr "�∴��鐚���荐㍼�"
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:360 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/novell/novell.c:2141
-#: src/protocols/novell/novell.c:2258 src/protocols/novell/novell.c:2309
-#: src/protocols/oscar/oscar.c:606 src/protocols/yahoo/yahoo.c:2599
+#: src/protocols/gg/gg.c:49
+#: src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:360
+#: 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/novell/novell.c:2141
+#: src/protocols/novell/novell.c:2258
+#: src/protocols/novell/novell.c:2309
+#: src/protocols/oscar/oscar.c:606
+#: src/protocols/yahoo/yahoo.c:2599
 #: src/protocols/yahoo/yahoo.c:2714
 msgid "Available"
 msgstr "筝�膩�"
@@ -4494,12 +4621,18 @@
 msgid "Away for friends only"
 msgstr "�∫��鐚�����絅遵���札���井��鐚�"
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:956
-#: src/protocols/jabber/presence.c:126 src/protocols/oscar/oscar.c:524
-#: src/protocols/oscar/oscar.c:4733 src/protocols/oscar/oscar.c:4811
-#: src/protocols/oscar/oscar.c:4835 src/protocols/oscar/oscar.c:6426
-#: src/protocols/oscar/oscar.c:6431 src/protocols/yahoo/yahoo.c:2293
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:2724
+#: src/protocols/gg/gg.c:53
+#: src/protocols/jabber/jabber.c:956
+#: src/protocols/jabber/presence.c:126
+#: src/protocols/oscar/oscar.c:524
+#: src/protocols/oscar/oscar.c:4733
+#: src/protocols/oscar/oscar.c:4811
+#: src/protocols/oscar/oscar.c:4835
+#: src/protocols/oscar/oscar.c:6426
+#: src/protocols/oscar/oscar.c:6431
+#: src/protocols/yahoo/yahoo.c:2293
+#: src/protocols/yahoo/yahoo.c:2619
+#: src/protocols/yahoo/yahoo.c:2724
 msgid "Invisible"
 msgstr "�沿昆"
 
@@ -4516,13 +4649,17 @@
 msgid "Unable to resolve hostname."
 msgstr "�≧�茹f��筝紙���腮宴��"
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1159
+#: src/protocols/gg/gg.c:139
+#: src/protocols/novell/novell.c:1159
 msgid "Unable to connect to server."
 msgstr "�≧��g��遺失������"
 
-#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
-#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
+#: src/protocols/gg/gg.c:142
+#: src/protocols/jabber/auth.c:130
+#: src/protocols/jabber/auth.c:204
+#: src/protocols/jabber/auth.c:354
+#: src/protocols/jabber/auth.c:452
+#: src/protocols/jabber/auth.c:464
 #: src/protocols/jabber/jabber.c:104
 msgid "Invalid response from server."
 msgstr "�≧����篌堺����������"
@@ -4557,12 +4694,18 @@
 msgstr "�≧�莅��� Socket"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/gg/gg.c:402 src/protocols/icq/gaim_icq.c:344
-#: src/protocols/msn/dispatch.c:208 src/protocols/msn/msn.c:514
-#: src/protocols/msn/servconn.c:77 src/protocols/napster/napster.c:475
-#: src/protocols/napster/napster.c:506 src/protocols/toc/toc.c:200
-#: src/protocols/yahoo/yahoo.c:1958 src/protocols/yahoo/yahoo.c:1989
-#: src/protocols/yahoo/yahoo.c:2052 src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:402
+#: src/protocols/icq/gaim_icq.c:344
+#: src/protocols/msn/dispatch.c:208
+#: src/protocols/msn/msn.c:514
+#: src/protocols/msn/servconn.c:77
+#: src/protocols/napster/napster.c:475
+#: src/protocols/napster/napster.c:506
+#: src/protocols/toc/toc.c:200
+#: src/protocols/yahoo/yahoo.c:1958
+#: src/protocols/yahoo/yahoo.c:1989
+#: src/protocols/yahoo/yahoo.c:2052
+#: src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:139
 msgid "Unable to connect."
 msgstr "�≧��g���"
@@ -4587,7 +4730,8 @@
 msgid "Critical error in GG library\n"
 msgstr "�� GG Library 筝㊦����紊ч���\n"
 
-#: src/protocols/gg/gg.c:455 src/protocols/gg/gg.c:546
+#: src/protocols/gg/gg.c:455
+#: src/protocols/gg/gg.c:546
 #: src/protocols/toc/toc.c:176
 #, c-format
 msgid "Connect to %s failed"
@@ -4626,50 +4770,68 @@
 msgid "Active"
 msgstr "����"
 
-#: src/protocols/gg/gg.c:667 src/protocols/oscar/oscar.c:4207
+#: src/protocols/gg/gg.c:667
+#: src/protocols/oscar/oscar.c:4207
 msgid "UIN"
 msgstr "絽活��"
 
 #. First Name
-#: src/protocols/gg/gg.c:671 src/protocols/jabber/jabber.c:606
-#: src/protocols/oscar/oscar.c:4218 src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:671
+#: src/protocols/jabber/jabber.c:606
+#: src/protocols/oscar/oscar.c:4218
+#: src/protocols/trepia/trepia.c:267
 msgid "First Name"
 msgstr "��"
 
 #. Last Name
-#: src/protocols/gg/gg.c:676 src/protocols/jabber/jabber.c:611
-#: src/protocols/oscar/oscar.c:4219 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:676
+#: src/protocols/jabber/jabber.c:611
+#: src/protocols/oscar/oscar.c:4219
+#: src/protocols/trepia/trepia.c:274
 msgid "Last Name"
 msgstr "紮�"
 
-#: src/protocols/gg/gg.c:680 src/protocols/gg/gg.c:1392
-#: src/protocols/irc/msgs.c:183 src/protocols/oscar/oscar.c:4208
+#: src/protocols/gg/gg.c:680
+#: src/protocols/gg/gg.c:1392
+#: src/protocols/irc/msgs.c:183
+#: src/protocols/oscar/oscar.c:4208
 msgid "Nick"
 msgstr "�援┗"
 
-#: src/protocols/gg/gg.c:687 src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:687
+#: src/protocols/gg/gg.c:690
 msgid "Birth Year"
 msgstr "�榊��綛�"
 
-#: src/protocols/gg/gg.c:696 src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:698
 #: src/protocols/gg/gg.c:700
 msgid "Sex"
 msgstr "�у��"
 
 #. City
-#: src/protocols/gg/gg.c:704 src/protocols/jabber/jabber.c:621
-#: src/protocols/oscar/oscar.c:4261 src/protocols/oscar/oscar.c:4269
-#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
+#: src/protocols/gg/gg.c:704
+#: src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:4261
+#: src/protocols/oscar/oscar.c:4269
+#: src/protocols/trepia/trepia.c:331
+#: src/protocols/trepia/trepia.c:410
 msgid "City"
 msgstr "���"
 
 #. res[0] == username
-#: src/protocols/gg/gg.c:725 src/protocols/msn/msn.c:1331
-#: src/protocols/msn/msn.c:1575 src/protocols/napster/napster.c:393
-#: src/protocols/oscar/oscar.c:3185 src/protocols/oscar/oscar.c:3401
-#: src/protocols/toc/toc.c:498 src/protocols/yahoo/yahoo.c:2898
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:2943
-#: src/protocols/yahoo/yahoo.c:3101 src/protocols/zephyr/zephyr.c:567
+#: src/protocols/gg/gg.c:725
+#: src/protocols/msn/msn.c:1331
+#: src/protocols/msn/msn.c:1575
+#: src/protocols/napster/napster.c:393
+#: src/protocols/oscar/oscar.c:3185
+#: src/protocols/oscar/oscar.c:3401
+#: src/protocols/toc/toc.c:498
+#: src/protocols/yahoo/yahoo.c:2898
+#: src/protocols/yahoo/yahoo.c:2920
+#: src/protocols/yahoo/yahoo.c:2943
+#: src/protocols/yahoo/yahoo.c:3101
+#: src/protocols/zephyr/zephyr.c:567
 msgid "Buddy Information"
 msgstr "絅遵�莖�荐�"
 
@@ -4710,30 +4872,24 @@
 msgstr "�� Gadu-Gadu 篌堺����������主�����"
 
 #: src/protocols/gg/gg.c:972
-msgid ""
-"Gaim was unable to complete your request due to a problem communicating with "
-"the Gadu-Gadu HTTP server.  Please try again later."
-msgstr ""
-"���阪�� Gadu-Gadu HTTP 篌堺����������主���馹�鐚���篁� Gaim 羃���莨��絎���������絎���"
-"綏ヤ���茫�緇�������荅���"
+msgid "Gaim was unable to complete your request due to a problem communicating with the Gadu-Gadu HTTP server.  Please try again later."
+msgstr "���阪�� Gadu-Gadu HTTP 篌堺����������主���馹�鐚���篁� Gaim 羃���莨��絎���������絎���綏ヤ���茫�緇�������荅���"
 
 #: src/protocols/gg/gg.c:1000
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr "�≧����� Gadu-Gadu ��絅遵�羝���"
 
 #: src/protocols/gg/gg.c:1001
-msgid ""
-"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
-"again later."
+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:1074
 msgid "Couldn't export buddy list"
 msgstr "�≧����阪ソ��羝���"
 
-#: src/protocols/gg/gg.c:1075 src/protocols/gg/gg.c:1098
-msgid ""
-"Gaim was unable to connect to the buddy list server.  Please try again later."
+#: src/protocols/gg/gg.c:1075
+#: src/protocols/gg/gg.c:1098
+msgid "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr "Gaim �≧��d�絅遵�羝���失������茫���藥���荅��罨<��"
 
 #: src/protocols/gg/gg.c:1097
@@ -4745,30 +4901,23 @@
 msgstr "�≧�絖�������"
 
 #: src/protocols/gg/gg.c:1147
-msgid ""
-"Gaim was unable to search the Directory because it was unable to connect to "
-"the directory server.  Please try again later."
-msgstr ""
-"���� Gaim 羃���莨���d�����篌堺�������篁ョ�≧���絨�����筝���莖�����茫�緇�������荅��"
-"罨<��"
+msgid "Gaim was unable to search the Directory because it was unable to connect to the directory server.  Please try again later."
+msgstr "���� Gaim 羃���莨���d�����篌堺�������篁ョ�≧���絨�����筝���莖�����茫�緇�������荅��罨<��"
 
 #: src/protocols/gg/gg.c:1180
 msgid "Unable to change Gadu-Gadu password"
 msgstr "�≧�篆��� Gadu-Gadu 絲�腆�"
 
 #: src/protocols/gg/gg.c:1181
-msgid ""
-"Gaim was unable to change your password due to an error connecting to the "
-"Gadu-Gadu server.  Please try again later."
-msgstr ""
-"���� Gaim 羃���莨���d� Gadu-Gadu 篌堺�������篁ョ�≧�篆��号����絲�腆若��茫�緇�������荅��"
-"罨<��"
+msgid "Gaim was unable to change your password due to an error connecting to the Gadu-Gadu server.  Please try again later."
+msgstr "���� Gaim 羃���莨���d� Gadu-Gadu 篌堺�������篁ョ�≧�篆��号����絲�腆若��茫�緇�������荅��罨<��"
 
 #: src/protocols/gg/gg.c:1198
 msgid "Directory Search"
 msgstr "������絨�"
 
-#: src/protocols/gg/gg.c:1207 src/protocols/jabber/jabber.c:1055
+#: src/protocols/gg/gg.c:1207
+#: src/protocols/jabber/jabber.c:1055
 #: src/protocols/toc/toc.c:1546
 msgid "Change Password"
 msgstr "篆��劫�腆�"
@@ -4790,12 +4939,8 @@
 msgstr "�≧�莅���篏睡����膂>�罟���"
 
 #: src/protocols/gg/gg.c:1261
-msgid ""
-"Gaim was unable to access this user's profile due to an error connecting to "
-"the directory server.  Please try again later."
-msgstr ""
-"���� Gaim 羃���莨���d�����篌堺�������篁ョ�≧���緇�篏睡������篋阪��莖�����茫�緇�������荅�"
-"筝�罨<��"
+msgid "Gaim was unable to access this user's profile due to an error connecting to the directory server.  Please try again later."
+msgstr "���� Gaim 羃���莨���d�����篌堺�������篁ョ�≧���緇�篏睡������篋阪��莖�����茫�緇�������荅��罨<��"
 
 #. *< api_version
 #. *< type
@@ -4807,7 +4952,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/gg/gg.c:1373 src/protocols/gg/gg.c:1375
+#: src/protocols/gg/gg.c:1373
+#: src/protocols/gg/gg.c:1375
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu ��絎�罔∞�"
 
@@ -4820,16 +4966,22 @@
 msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 msgstr "篏睡���� %s (%s%s%s%s%s) 荀�羆�����茯�茘���"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:229
-#: src/protocols/msn/notification.c:588 src/protocols/msn/notification.c:909
-#: src/protocols/msn/notification.c:1076 src/protocols/oscar/oscar.c:2935
+#: src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/presence.c:229
+#: src/protocols/msn/notification.c:588
+#: src/protocols/msn/notification.c:909
+#: src/protocols/msn/notification.c:1076
+#: src/protocols/oscar/oscar.c:2935
 #: src/protocols/oscar/oscar.c:5446
 msgid "Authorize"
 msgstr "腟��茯�茘�"
 
-#: src/protocols/icq/gaim_icq.c:297 src/protocols/jabber/presence.c:230
-#: src/protocols/msn/notification.c:589 src/protocols/msn/notification.c:911
-#: src/protocols/msn/notification.c:1078 src/protocols/oscar/oscar.c:2937
+#: src/protocols/icq/gaim_icq.c:297
+#: src/protocols/jabber/presence.c:230
+#: src/protocols/msn/notification.c:589
+#: src/protocols/msn/notification.c:911
+#: src/protocols/msn/notification.c:1078
+#: src/protocols/oscar/oscar.c:2937
 #: src/protocols/oscar/oscar.c:5447
 msgid "Deny"
 msgstr "��腟�"
@@ -4856,33 +5008,26 @@
 msgstr "���ョ����篁わ�%s"
 
 #: src/protocols/irc/cmds.c:137
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
-msgstr ""
-"<B>��吡�� IRC ��篁わ�</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG "
-"NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC "
-"UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
+msgid "<B>Supported IRC Commands:</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
+msgstr "<B>��吡�� IRC ��篁わ�</B><BR>AWAY INVITE JOIN KICK<BR>ME MODE MSG NAMES<BR>NICK OP DEOP OPERWALL<BR>PART PING QUERY QUIT<BR>QUOTE REMOVE TOPIC UMODE<BR>VOICE DEVOICE WALLOPS WHOIS<BR>"
 
 #: src/protocols/irc/cmds.c:146
-msgid ""
-"<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-msgstr ""
-"<B>��吡�� IRC ��篁わ�</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL "
-"PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
-
-#: src/protocols/irc/cmds.c:469 src/protocols/jabber/chat.c:527
+msgid "<B>Supported IRC Commands:</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
+msgstr "<B>��吡�� IRC ��篁わ�</B><BR>AWAY JOIN ME MODE<BR>MSG NICK OPERWALL PING<BR>QUERY QUIT QUOTE UMODE<BR>WALLOPS WHOIS"
+
+#: src/protocols/irc/cmds.c:469
+#: src/protocols/jabber/chat.c:527
 #, c-format
 msgid "current topic is: %s"
 msgstr "�上����筝脂��削�%s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:529
+#: src/protocols/irc/cmds.c:472
+#: src/protocols/jabber/chat.c:529
 msgid "No topic is set"
 msgstr "羃���荐㊤�筝脂�"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:199
+#: src/protocols/irc/dcc_send.c:272
+#: src/protocols/yahoo/yahoo_filexfer.c:199
 #: src/protocols/yahoo/yahoo_filexfer.c:208
 #: src/protocols/yahoo/yahoo_filexfer.c:217
 msgid "File Transfer Aborted"
@@ -4918,8 +5063,10 @@
 msgid "View MOTD"
 msgstr "蕁�ず���ヨ��� (MOTD)"
 
-#: src/protocols/irc/irc.c:154 src/protocols/jabber/buddy.c:883
-#: src/protocols/oscar/oscar.c:440 src/protocols/oscar/oscar.c:6527
+#: src/protocols/irc/irc.c:154
+#: src/protocols/jabber/buddy.c:883
+#: src/protocols/oscar/oscar.c:440
+#: src/protocols/oscar/oscar.c:6527
 #: src/protocols/yahoo/yahoo.c:2456
 msgid "Send File"
 msgstr "�渇��罟�罅�"
@@ -4928,7 +5075,8 @@
 msgid "_Channel:"
 msgstr "�脂��(_C)鐚�"
 
-#: src/protocols/irc/irc.c:173 src/protocols/jabber/chat.c:59
+#: src/protocols/irc/irc.c:173
+#: src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "絲�腆�(_P)鐚�"
 
@@ -4936,7 +5084,8 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC �援┗筝�������腥榊�遵���"
 
-#: src/protocols/irc/irc.c:212 src/protocols/toc/toc.c:228
+#: src/protocols/irc/irc.c:212
+#: src/protocols/toc/toc.c:228
 #, c-format
 msgid "Signon: %s"
 msgstr "�糸�ワ�%s"
@@ -4946,15 +5095,18 @@
 msgstr "�≧�綮榊� Socket"
 
 # NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
-#: src/protocols/irc/irc.c:370 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:370
+#: src/protocols/trepia/trepia.c:926
 msgid "Read error"
 msgstr "莅������"
 
-#: src/protocols/irc/irc.c:504 src/protocols/yahoo/yahoochat.c:1343
+#: src/protocols/irc/irc.c:504
+#: src/protocols/yahoo/yahoochat.c:1343
 msgid "Users"
 msgstr "篏睡����"
 
-#: src/protocols/irc/irc.c:507 src/protocols/yahoo/yahoochat.c:1352
+#: src/protocols/irc/irc.c:507
+#: src/protocols/yahoo/yahoochat.c:1352
 msgid "Topic"
 msgstr "筝脂�"
 
@@ -4976,22 +5128,28 @@
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "莠�絅順�� IRC ��絎�罔∞�"
 
-#: src/protocols/irc/irc.c:630 src/protocols/irc/msgs.c:197
-#: src/protocols/jabber/jabber.c:1382 src/protocols/napster/napster.c:657
+#: src/protocols/irc/irc.c:630
+#: src/protocols/irc/msgs.c:197
+#: src/protocols/jabber/jabber.c:1382
+#: src/protocols/napster/napster.c:657
 msgid "Server"
 msgstr "篌堺����"
 
-#: src/protocols/irc/irc.c:633 src/protocols/jabber/jabber.c:1403
-#: src/protocols/msn/msn.c:1741 src/protocols/napster/napster.c:662
+#: src/protocols/irc/irc.c:633
+#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/msn/msn.c:1741
+#: src/protocols/napster/napster.c:662
 #: src/protocols/trepia/trepia.c:1306
 msgid "Port"
 msgstr "��荐���"
 
-#: src/protocols/irc/irc.c:636 src/protocols/zephyr/zephyr.c:1400
+#: src/protocols/irc/irc.c:636
+#: src/protocols/zephyr/zephyr.c:1400
 msgid "Encoding"
 msgstr "膩�⊆"
 
-#: src/protocols/irc/irc.c:639 src/protocols/irc/msgs.c:191
+#: src/protocols/irc/irc.c:639
+#: src/protocols/irc/msgs.c:191
 #: src/protocols/jabber/jabber.c:581
 msgid "Username"
 msgstr "篏睡����"
@@ -5020,7 +5178,8 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(綏臥�茘�)</i>"
 
-#: src/protocols/irc/msgs.c:192 src/protocols/yahoo/yahoo.c:3001
+#: src/protocols/irc/msgs.c:192
+#: src/protocols/yahoo/yahoo.c:3001
 msgid "Realname"
 msgstr "紮���"
 
@@ -5152,10 +5311,9 @@
 msgid "Wallops from %s"
 msgstr "箴��� %s �� Wallops"
 
-#: src/protocols/irc/parse.c:165 src/protocols/zephyr/zephyr.c:199
-msgid ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
+#: src/protocols/irc/parse.c:165
+#: src/protocols/zephyr/zephyr.c:199
+msgid "(There was an error converting this message.  Check the 'Encoding' option in the Account Editor)"
 msgstr "鐚��咲����荐������膩�⊆���主��篋������茫�罟∽�ュ験��羝���賢����膩�⊆���檎��鐚�"
 
 #: src/protocols/irc/parse.c:318
@@ -5171,9 +5329,12 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING ��膈�"
 
-#: src/protocols/irc/parse.c:421 src/protocols/oscar/oscar.c:780
-#: src/protocols/toc/toc.c:218 src/protocols/toc/toc.c:625
-#: src/protocols/toc/toc.c:641 src/protocols/toc/toc.c:709
+#: src/protocols/irc/parse.c:421
+#: src/protocols/oscar/oscar.c:780
+#: src/protocols/toc/toc.c:218
+#: src/protocols/toc/toc.c:625
+#: src/protocols/toc/toc.c:641
+#: src/protocols/toc/toc.c:709
 msgid "Disconnected."
 msgstr "��罩∫�g���"
 
@@ -5185,19 +5346,21 @@
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "篌堺������荀�膓��掩�����絲���筝我��画�膣���絖�茯�茘�"
 
-#: src/protocols/jabber/auth.c:160 src/protocols/jabber/auth.c:161
-#: src/protocols/jabber/auth.c:238 src/protocols/jabber/auth.c:239
+#: src/protocols/jabber/auth.c:160
+#: src/protocols/jabber/auth.c:161
+#: src/protocols/jabber/auth.c:238
+#: src/protocols/jabber/auth.c:239
 msgid "Plaintext Authentication"
 msgstr "膣���絖�茯�茘�"
 
 #  TODO Untranslated
-#: src/protocols/jabber/auth.c:162 src/protocols/jabber/auth.c:240
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
+#: src/protocols/jabber/auth.c:162
+#: src/protocols/jabber/auth.c:240
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "篌堺������荀�膓��掩�����絲���筝我��画�膣���絖�茯�茘�����荐延研膵主��画�茯�茘�鐚�"
 
-#: src/protocols/jabber/auth.c:170 src/protocols/jabber/auth.c:248
+#: src/protocols/jabber/auth.c:170
+#: src/protocols/jabber/auth.c:248
 msgid "Server does not use any supported authentication method"
 msgstr "篌堺����研筝���箴�篁私�筝�腮�←��吡��茯�茘��劫�"
 
@@ -5206,103 +5369,127 @@
 msgid "Invalid challenge from server"
 msgstr "篌堺������箴�篋��≧����薊�茘�����"
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:603
+#: src/protocols/jabber/buddy.c:247
+#: src/protocols/jabber/buddy.c:603
 msgid "Full Name"
 msgstr "����"
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:616
+#: src/protocols/jabber/buddy.c:248
+#: src/protocols/jabber/buddy.c:616
 msgid "Family Name"
 msgstr "紮�"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:620
+#: src/protocols/jabber/buddy.c:249
+#: src/protocols/jabber/buddy.c:620
 msgid "Given Name"
 msgstr "��"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:601 src/protocols/yahoo/yahoo.c:2997
+#: src/protocols/jabber/buddy.c:250
+#: src/protocols/jabber/buddy.c:635
+#: src/protocols/jabber/jabber.c:601
+#: src/protocols/yahoo/yahoo.c:2997
 msgid "Nickname"
 msgstr "�援┗"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/jabber.c:641
+#: src/protocols/jabber/buddy.c:251
+#: src/protocols/jabber/jabber.c:641
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:252
+#: src/protocols/jabber/buddy.c:663
 msgid "Street Address"
 msgstr "茵����医��"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:253
+#: src/protocols/jabber/buddy.c:659
 msgid "Extended Address"
 msgstr "�医��(膾�)"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:254
+#: src/protocols/jabber/buddy.c:667
 msgid "Locality"
 msgstr "絽�鐚��"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:255
+#: src/protocols/jabber/buddy.c:671
 msgid "Region"
 msgstr "���鎴�"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:675
+#: src/protocols/jabber/buddy.c:256
+#: src/protocols/jabber/buddy.c:675
 #: src/protocols/jabber/jabber.c:631
 msgid "Postal Code"
 msgstr "�級������"
 
 #. Country
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:257
+#: src/protocols/jabber/buddy.c:680
+#: src/protocols/trepia/trepia.c:339
+#: src/protocols/trepia/trepia.c:416
 msgid "Country"
 msgstr "��絎�"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:691
+#: src/protocols/jabber/buddy.c:258
+#: src/protocols/jabber/buddy.c:691
 #: src/protocols/jabber/buddy.c:698
 msgid "Telephone"
 msgstr "�肢�"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/yahoo/yahoo.c:2993
+#: src/protocols/jabber/buddy.c:259
+#: src/protocols/jabber/buddy.c:709
+#: src/protocols/jabber/buddy.c:717
+#: src/protocols/yahoo/yahoo.c:2993
 msgid "Email"
 msgstr "�糸��灸散"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:260
+#: src/protocols/jabber/buddy.c:732
 msgid "Organization Name"
 msgstr "��絮��罕�"
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:261
+#: src/protocols/jabber/buddy.c:736
 msgid "Organization Unit"
 msgstr "��絮�����"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:262
+#: src/protocols/jabber/buddy.c:742
 msgid "Title"
 msgstr "�潔��"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:263
+#: src/protocols/jabber/buddy.c:745
 msgid "Role"
 msgstr "�決岡"
 
-#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:638
+#: src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:638
 #: src/protocols/oscar/oscar.c:4242
 msgid "Birthday"
 msgstr "����"
 
-#: src/protocols/jabber/buddy.c:508 src/protocols/jabber/buddy.c:509
+#: src/protocols/jabber/buddy.c:508
+#: src/protocols/jabber/buddy.c:509
 msgid "Edit Jabber vCard"
 msgstr "膩�鹿 Jabber vCard"
 
 #: src/protocols/jabber/buddy.c:510
-msgid ""
-"All items below are optional. Enter only the information with which you feel "
-"comfortable."
+msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "篁ヤ�������罨�篏��醇���御���х������Ű�莠後�ユ���活叱�ユ���喝゛�ョ��荐����喝���"
 
 #: src/protocols/jabber/buddy.c:552
 msgid "Jabber ID"
 msgstr "Jabber 絽活��"
 
-#: src/protocols/jabber/buddy.c:562 src/protocols/jabber/buddy.c:569
-#: src/protocols/jabber/buddy.c:580 src/protocols/jabber/jabber.c:930
-#: src/protocols/msn/msn.c:348 src/protocols/oscar/oscar.c:568
-#: src/protocols/oscar/oscar.c:574 src/protocols/oscar/oscar.c:576
+#: src/protocols/jabber/buddy.c:562
+#: src/protocols/jabber/buddy.c:569
+#: src/protocols/jabber/buddy.c:580
+#: src/protocols/jabber/jabber.c:930
+#: src/protocols/msn/msn.c:348
+#: src/protocols/oscar/oscar.c:568
+#: src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:576
 #: src/protocols/yahoo/yahoo.c:2407
 msgid "Status"
 msgstr "����"
@@ -5312,7 +5499,8 @@
 # NOTE Jabber ��絎�����Resource��筝�荅���絽娯���筝�腮�戎���������絖�筝駕�
 # NOTE ��札茵�ず������井�劫�����糸�ヤ�����綵≫�鐚�������絲����臀�
 # NOTE 荀� http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:578 src/protocols/jabber/jabber.c:1385
+#: src/protocols/jabber/buddy.c:578
+#: src/protocols/jabber/jabber.c:1385
 msgid "Resource"
 msgstr ""
 
@@ -5323,8 +5511,10 @@
 msgid "Middle Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:616
-#: src/protocols/oscar/oscar.c:4260 src/protocols/oscar/oscar.c:4268
+#: src/protocols/jabber/buddy.c:643
+#: src/protocols/jabber/jabber.c:616
+#: src/protocols/oscar/oscar.c:4260
+#: src/protocols/oscar/oscar.c:4268
 msgid "Address"
 msgstr "�医��"
 
@@ -5370,7 +5560,8 @@
 msgid "Unsubscribe"
 msgstr "緇�絅遵�����賢腱脂��"
 
-#: src/protocols/jabber/chat.c:42 src/protocols/yahoo/yahoochat.c:965
+#: src/protocols/jabber/chat.c:42
+#: src/protocols/yahoo/yahoochat.c:965
 msgid "_Room:"
 msgstr "��紊��(_R)鐚�"
 
@@ -5396,7 +5587,8 @@
 msgid "%s is not a valid server name"
 msgstr "%s 筝������������篌堺������腮�"
 
-#: src/protocols/jabber/chat.c:171 src/protocols/jabber/chat.c:172
+#: src/protocols/jabber/chat.c:171
+#: src/protocols/jabber/chat.c:172
 msgid "Invalid Server Name"
 msgstr "篌堺������腮援�≧��"
 
@@ -5407,7 +5599,8 @@
 msgstr "%s 筝�������������援┗"
 
 # NOTE Arto Alakulju �主憗��room handle���恰����紊���т戎�����������援┗��綏�
-#: src/protocols/jabber/chat.c:177 src/protocols/jabber/chat.c:178
+#: src/protocols/jabber/chat.c:177
+#: src/protocols/jabber/chat.c:178
 msgid "Invalid Room Handle"
 msgstr "�援┗�≧��"
 
@@ -5415,7 +5608,8 @@
 msgid "Configuration error"
 msgstr "荐㊤����"
 
-#: src/protocols/jabber/chat.c:341 src/protocols/jabber/chat.c:486
+#: src/protocols/jabber/chat.c:341
+#: src/protocols/jabber/chat.c:486
 msgid "Unable to configure"
 msgstr "�≧�荐㊤�"
 
@@ -5428,7 +5622,8 @@
 msgid "This room is not capable of being configured"
 msgstr "������紊��筝���吧┃絎�"
 
-#: src/protocols/jabber/chat.c:408 src/protocols/jabber/chat.c:477
+#: src/protocols/jabber/chat.c:408
+#: src/protocols/jabber/chat.c:477
 msgid "Registration error"
 msgstr "荐糸�����"
 
@@ -5439,11 +5634,13 @@
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "���� MUC 罔≦�����紊���т���吂信�号�援┗"
 
-#: src/protocols/jabber/chat.c:600 src/protocols/jabber/chat.c:611
+#: src/protocols/jabber/chat.c:600
+#: src/protocols/jabber/chat.c:611
 msgid "Roomlist Error"
 msgstr "��紊��羝������"
 
-#: src/protocols/jabber/chat.c:601 src/protocols/jabber/chat.c:612
+#: src/protocols/jabber/chat.c:601
+#: src/protocols/jabber/chat.c:612
 msgid "Error retreiving roomlist"
 msgstr "莅�����紊��羝������主�����"
 
@@ -5470,30 +5667,50 @@
 msgid "Error initializing session"
 msgstr "絨�綏ヤ�����画���紮������主��篋����"
 
-#: src/protocols/jabber/jabber.c:204 src/protocols/msn/httpmethod.c:255
-#: src/protocols/msn/msn.c:84 src/protocols/msn/msn.c:104
-#: src/protocols/msn/msn.c:174 src/protocols/msn/msn.c:274
-#: src/protocols/msn/msn.c:571 src/protocols/msn/msn.c:743
-#: src/protocols/msn/msn.c:772 src/protocols/msn/msn.c:804
-#: src/protocols/msn/msn.c:812 src/protocols/msn/msn.c:845
-#: src/protocols/msn/msn.c:853 src/protocols/msn/msn.c:867
-#: src/protocols/msn/msn.c:876 src/protocols/msn/msn.c:891
-#: src/protocols/msn/msn.c:901 src/protocols/msn/msn.c:923
-#: src/protocols/msn/msn.c:973 src/protocols/msn/msn.c:1011
-#: src/protocols/msn/msn.c:1113 src/protocols/msn/msn.c:1146
-#: src/protocols/msn/msn.c:1167 src/protocols/msn/msn.c:1178
-#: src/protocols/msn/msn.c:1189 src/protocols/msn/msn.c:1213
-#: src/protocols/msn/msn.c:1225 src/protocols/msn/msn.c:1306
-#: src/protocols/msn/notification.c:147 src/protocols/msn/notification.c:175
-#: src/protocols/msn/notification.c:1299 src/protocols/msn/notification.c:1319
-#: src/protocols/msn/session.c:209 src/protocols/trepia/trepia.c:248
-#: src/protocols/trepia/trepia.c:698 src/protocols/trepia/trepia.c:987
-#: src/protocols/trepia/trepia.c:1031 src/protocols/trepia/trepia.c:1130
+#: src/protocols/jabber/jabber.c:204
+#: src/protocols/msn/httpmethod.c:255
+#: src/protocols/msn/msn.c:84
+#: src/protocols/msn/msn.c:104
+#: src/protocols/msn/msn.c:174
+#: src/protocols/msn/msn.c:274
+#: src/protocols/msn/msn.c:571
+#: src/protocols/msn/msn.c:743
+#: src/protocols/msn/msn.c:772
+#: src/protocols/msn/msn.c:804
+#: src/protocols/msn/msn.c:812
+#: src/protocols/msn/msn.c:845
+#: src/protocols/msn/msn.c:853
+#: src/protocols/msn/msn.c:867
+#: src/protocols/msn/msn.c:876
+#: src/protocols/msn/msn.c:891
+#: src/protocols/msn/msn.c:901
+#: src/protocols/msn/msn.c:923
+#: src/protocols/msn/msn.c:973
+#: src/protocols/msn/msn.c:1011
+#: src/protocols/msn/msn.c:1113
+#: src/protocols/msn/msn.c:1146
+#: src/protocols/msn/msn.c:1167
+#: src/protocols/msn/msn.c:1178
+#: src/protocols/msn/msn.c:1189
+#: src/protocols/msn/msn.c:1213
+#: src/protocols/msn/msn.c:1225
+#: src/protocols/msn/msn.c:1306
+#: src/protocols/msn/notification.c:147
+#: src/protocols/msn/notification.c:175
+#: src/protocols/msn/notification.c:1299
+#: src/protocols/msn/notification.c:1319
+#: src/protocols/msn/session.c:209
+#: src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:698
+#: src/protocols/trepia/trepia.c:987
+#: src/protocols/trepia/trepia.c:1031
+#: src/protocols/trepia/trepia.c:1130
 #: src/protocols/trepia/trepia.c:1186
 msgid "Write error"
 msgstr "絲��ラ���"
 
-#: src/protocols/jabber/jabber.c:242 src/protocols/jabber/jabber.c:262
+#: src/protocols/jabber/jabber.c:242
+#: src/protocols/jabber/jabber.c:262
 msgid "Read Error"
 msgstr "莅������"
 
@@ -5508,16 +5725,19 @@
 msgid "SSL Handshake Failed"
 msgstr "SSL 篋よ�紊掩��"
 
-#: src/protocols/jabber/jabber.c:363 src/protocols/jabber/jabber.c:692
+#: src/protocols/jabber/jabber.c:363
+#: src/protocols/jabber/jabber.c:692
 msgid "Invalid Jabber ID"
 msgstr "Jabber 絽活���≧��"
 
 # XXX ��⑮
-#: src/protocols/jabber/jabber.c:391 src/protocols/jabber/jabber.c:719
+#: src/protocols/jabber/jabber.c:391
+#: src/protocols/jabber/jabber.c:719
 msgid "SSL support unavailable"
 msgstr "羃��� SSL ���"
 
-#: src/protocols/jabber/jabber.c:401 src/protocols/jabber/jabber.c:729
+#: src/protocols/jabber/jabber.c:401
+#: src/protocols/jabber/jabber.c:729
 #: src/protocols/trepia/trepia.c:1070
 msgid "Unable to create socket"
 msgstr "���綮榊� Socket"
@@ -5527,23 +5747,28 @@
 msgid "Registration of %s@%s successful"
 msgstr "����荐糸�� %s@%s"
 
-#: src/protocols/jabber/jabber.c:428 src/protocols/jabber/jabber.c:429
+#: src/protocols/jabber/jabber.c:428
+#: src/protocols/jabber/jabber.c:429
 msgid "Registration Successful"
 msgstr "荐糸������"
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:1175
+#: src/protocols/jabber/jabber.c:435
+#: src/protocols/jabber/jabber.c:1175
 msgid "Unknown Error"
 msgstr "���ラ���"
 
-#: src/protocols/jabber/jabber.c:437 src/protocols/jabber/jabber.c:438
+#: src/protocols/jabber/jabber.c:437
+#: src/protocols/jabber/jabber.c:438
 msgid "Registration Failed"
 msgstr "荐糸��紊掩��"
 
-#: src/protocols/jabber/jabber.c:549 src/protocols/jabber/jabber.c:550
+#: src/protocols/jabber/jabber.c:549
+#: src/protocols/jabber/jabber.c:550
 msgid "Already Registered"
 msgstr "綏牙�荐糸��"
 
-#: src/protocols/jabber/jabber.c:585 src/protocols/jabber/jabber.c:1026
+#: src/protocols/jabber/jabber.c:585
+#: src/protocols/jabber/jabber.c:1026
 msgid "Password"
 msgstr "絲�腆�"
 
@@ -5552,8 +5777,10 @@
 msgstr "�糸��灸散"
 
 #. State
-#: src/protocols/jabber/jabber.c:626 src/protocols/oscar/oscar.c:4262
-#: src/protocols/oscar/oscar.c:4270 src/protocols/trepia/trepia.c:335
+#: src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:4262
+#: src/protocols/oscar/oscar.c:4270
+#: src/protocols/trepia/trepia.c:335
 #: src/protocols/trepia/trepia.c:413
 msgid "State"
 msgstr "��鐚鎴�"
@@ -5570,15 +5797,20 @@
 msgid "Please fill out the information below to register your new account."
 msgstr "�堺�����医験�区┿��鐚�茫�紂��筝���莖���鐚�"
 
-#: src/protocols/jabber/jabber.c:657 src/protocols/jabber/jabber.c:658
+#: src/protocols/jabber/jabber.c:657
+#: src/protocols/jabber/jabber.c:658
 msgid "Register New Jabber Account"
 msgstr "荐糸���亥�� Jabber 絽恰��"
 
 #. connect to the server
-#: src/protocols/jabber/jabber.c:775 src/protocols/msn/dispatch.c:212
-#: src/protocols/msn/msn.c:505 src/protocols/napster/napster.c:499
-#: src/protocols/novell/novell.c:1575 src/protocols/oscar/oscar.c:947
-#: src/protocols/trepia/trepia.c:1064 src/protocols/yahoo/yahoo.c:2177
+#: src/protocols/jabber/jabber.c:775
+#: src/protocols/msn/dispatch.c:212
+#: src/protocols/msn/msn.c:505
+#: src/protocols/napster/napster.c:499
+#: src/protocols/novell/novell.c:1575
+#: src/protocols/oscar/oscar.c:947
+#: src/protocols/trepia/trepia.c:1064
+#: src/protocols/yahoo/yahoo.c:2177
 #: src/protocols/zephyr/zephyr.c:864
 msgid "Connecting"
 msgstr "�g�筝�"
@@ -5595,9 +5827,12 @@
 msgid "Re-initializing Stream"
 msgstr "筝我����医��紮�筝�"
 
-#: src/protocols/jabber/jabber.c:874 src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1194 src/protocols/jabber/jabber.c:1227
-#: src/protocols/oscar/oscar.c:574 src/protocols/oscar/oscar.c:5811
+#: src/protocols/jabber/jabber.c:874
+#: src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1194
+#: src/protocols/jabber/jabber.c:1227
+#: src/protocols/oscar/oscar.c:574
+#: src/protocols/oscar/oscar.c:5811
 msgid "Not Authorized"
 msgstr "���茘�"
 
@@ -5639,19 +5874,26 @@
 msgid "Error"
 msgstr "���"
 
-#: src/protocols/jabber/jabber.c:951 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:117
+#: src/protocols/jabber/jabber.c:951
+#: src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:66
+#: src/protocols/jabber/presence.c:117
 msgid "Chatty"
 msgstr "�活��紊�"
 
-#: src/protocols/jabber/jabber.c:953 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:122
+#: src/protocols/jabber/jabber.c:953
+#: src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:68
+#: src/protocols/jabber/presence.c:122
 msgid "Extended Away"
 msgstr "�傑�����∫��"
 
-#: src/protocols/jabber/jabber.c:954 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:124
-#: src/protocols/oscar/oscar.c:514 src/protocols/oscar/oscar.c:4823
+#: src/protocols/jabber/jabber.c:954
+#: src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:70
+#: src/protocols/jabber/presence.c:124
+#: src/protocols/oscar/oscar.c:514
+#: src/protocols/oscar/oscar.c:4823
 #: src/protocols/oscar/oscar.c:6422
 msgid "Do Not Disturb"
 msgstr "茫��炊����"
@@ -5664,7 +5906,8 @@
 msgid "Your password has been changed."
 msgstr "����篆��剛�����絲�腆若��"
 
-#: src/protocols/jabber/jabber.c:976 src/protocols/jabber/jabber.c:977
+#: src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/jabber.c:977
 msgid "Error changing password"
 msgstr "篆��劫�腆惹�����榊憥���"
 
@@ -5672,7 +5915,8 @@
 msgid "Password (again)"
 msgstr "��絲�腆種���罨∞∈茯�鐚�"
 
-#: src/protocols/jabber/jabber.c:1036 src/protocols/jabber/jabber.c:1037
+#: src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:1037
 msgid "Change Jabber Password"
 msgstr "篆��� Jabber 絲�腆�"
 
@@ -5680,7 +5924,8 @@
 msgid "Please enter your new password"
 msgstr "茫�莠後�ユ�����医�腆�"
 
-#: src/protocols/jabber/jabber.c:1048 src/protocols/toc/toc.c:1532
+#: src/protocols/jabber/jabber.c:1048
+#: src/protocols/toc/toc.c:1532
 msgid "Set User Info"
 msgstr "荐㊤�篏睡����莖�荐�"
 
@@ -5708,7 +5953,8 @@
 msgid "Gone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1143 src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1143
+#: src/protocols/jabber/jabber.c:1217
 msgid "Internal Server Error"
 msgstr "篌堺�����ч�����"
 
@@ -5935,7 +6181,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/jabber/jabber.c:1361 src/protocols/jabber/jabber.c:1363
+#: src/protocols/jabber/jabber.c:1361
+#: src/protocols/jabber/jabber.c:1363
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber ��絎�罔∞�"
 
@@ -5951,7 +6198,7 @@
 #  TODO Untranslated
 #: src/protocols/jabber/jabber.c:1398
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr ""
+msgstr "��荐延戎�����絖�罔≦�鐚��������絲�������筝��画�茯�茘�"
 
 #: src/protocols/jabber/jabber.c:1407
 msgid "Connect server"
@@ -5999,14 +6246,13 @@
 msgid "The user %s wants to add you to their buddy list."
 msgstr "篏睡���� %s �活�絨������ヤ�鐚�絅刻���絅遵�羝���賢��"
 
-#: src/protocols/jabber/presence.c:277 src/protocols/jabber/presence.c:278
+#: src/protocols/jabber/presence.c:277
+#: src/protocols/jabber/presence.c:278
 msgid "Create New Room"
 msgstr "綮榊��域��紊��"
 
 #: src/protocols/jabber/presence.c:279
-msgid ""
-"You are creating a new room.  Would you like to configure it, or accept the "
-"default settings?"
+msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
 msgstr "��③荀�綮榊�筝����亥����紊��鐚����荐㊤�絎�鐚�����戎����荐㊤�種�"
 
 #: src/protocols/jabber/presence.c:281
@@ -6032,23 +6278,28 @@
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "�≧��渇��罟�罅��� %s鐚����阪��剛���吚�罅��活叱"
 
-#: src/protocols/jabber/si.c:580 src/protocols/jabber/si.c:581
+#: src/protocols/jabber/si.c:580
+#: src/protocols/jabber/si.c:581
 msgid "File Send Failed"
 msgstr "�渇��罟�罅�紊掩��"
 
-#: src/protocols/msn/dispatch.c:42 src/protocols/msn/notification.c:240
+#: src/protocols/msn/dispatch.c:42
+#: src/protocols/msn/notification.c:240
 msgid "Unable to request USR\n"
 msgstr "�≧���緇� USR\n"
 
-#: src/protocols/msn/dispatch.c:59 src/protocols/msn/notification.c:257
+#: src/protocols/msn/dispatch.c:59
+#: src/protocols/msn/notification.c:257
 msgid "Unable to login using MD5"
 msgstr "�≧�篏睡�� MD5 �糸��"
 
-#: src/protocols/msn/dispatch.c:68 src/protocols/msn/notification.c:266
+#: src/protocols/msn/dispatch.c:68
+#: src/protocols/msn/notification.c:266
 msgid "Unable to send USR"
 msgstr "�≧����� USR"
 
-#: src/protocols/msn/dispatch.c:73 src/protocols/msn/notification.c:271
+#: src/protocols/msn/dispatch.c:73
+#: src/protocols/msn/notification.c:271
 msgid "Requesting to send password"
 msgstr "���阪�腆寂賢"
 
@@ -6056,15 +6307,18 @@
 msgid "Protocol version not supported"
 msgstr "筝���吨������������荐���絎�"
 
-#: src/protocols/msn/dispatch.c:117 src/protocols/msn/notification.c:410
+#: src/protocols/msn/dispatch.c:117
+#: src/protocols/msn/notification.c:410
 msgid "Unable to request CVR\n"
 msgstr "�≧���緇� CVR\n"
 
-#: src/protocols/msn/dispatch.c:126 src/protocols/msn/notification.c:419
+#: src/protocols/msn/dispatch.c:126
+#: src/protocols/msn/notification.c:419
 msgid "Unable to request INF\n"
 msgstr "�≧���緇� INF\n"
 
-#: src/protocols/msn/dispatch.c:147 src/protocols/msn/notification.c:1564
+#: src/protocols/msn/dispatch.c:147
+#: src/protocols/msn/notification.c:1564
 msgid "Got invalid XFR"
 msgstr "��緇��≧���� XFR"
 
@@ -6076,12 +6330,14 @@
 msgid "Unable to parse message."
 msgstr "�≧�茹f��荐�����"
 
-#: src/protocols/msn/dispatch.c:232 src/protocols/msn/notification.c:528
+#: src/protocols/msn/dispatch.c:232
+#: src/protocols/msn/notification.c:528
 #: src/protocols/msn/notification.c:1826
 msgid "Unable to write to server"
 msgstr "�≧�絲��ュ�遺失����"
 
-#: src/protocols/msn/dispatch.c:236 src/protocols/msn/notification.c:1833
+#: src/protocols/msn/dispatch.c:236
+#: src/protocols/msn/notification.c:1833
 msgid "Syncing with server"
 msgstr "��篌堺������罩ヤ賢"
 
@@ -6134,7 +6390,8 @@
 msgid "Not on list"
 msgstr "筝������賢"
 
-#: src/protocols/msn/error.c:68 src/protocols/zephyr/zephyr.c:527
+#: src/protocols/msn/error.c:68
+#: src/protocols/zephyr/zephyr.c:527
 msgid "User is offline"
 msgstr "篏睡�������∝���"
 
@@ -6186,7 +6443,8 @@
 msgid "Too many hits to a FND"
 msgstr "FND ��腟�����紊���拷��"
 
-#: src/protocols/msn/error.c:110 src/protocols/oscar/oscar.c:186
+#: src/protocols/msn/error.c:110
+#: src/protocols/oscar/oscar.c:186
 msgid "Not logged in"
 msgstr "絨����糸��"
 
@@ -6220,7 +6478,8 @@
 msgid "Server busy"
 msgstr "篌堺�����腆�"
 
-#: src/protocols/msn/error.c:136 src/protocols/msn/error.c:149
+#: src/protocols/msn/error.c:136
+#: src/protocols/msn/error.c:149
 #: src/protocols/msn/error.c:204
 msgid "Server unavailable"
 msgstr "篌堺��������筝���箴�����"
@@ -6245,7 +6504,8 @@
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR ���御�����ユ�������荐援��"
 
-#: src/protocols/msn/error.c:160 src/protocols/msn/notification.c:304
+#: src/protocols/msn/error.c:160
+#: src/protocols/msn/notification.c:304
 msgid "Unable to write"
 msgstr "�≧�絲���"
 
@@ -6282,7 +6542,8 @@
 msgid "Server too busy"
 msgstr "篌堺����お綽�腆�"
 
-#: src/protocols/msn/error.c:196 src/protocols/oscar/oscar.c:1360
+#: src/protocols/msn/error.c:196
+#: src/protocols/oscar/oscar.c:1360
 #: src/protocols/toc/toc.c:659
 msgid "Authentication failed"
 msgstr "茯�茘�紊掩��"
@@ -6349,12 +6610,8 @@
 msgstr "��荐� MSN �喝�種�"
 
 #: src/protocols/msn/msn.c:236
-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?"
-msgstr ""
-"��������荐怨����ソ��羝���賢��絅遵��渇�� Mobile Page �井����茵����肢�鐚������銀���茵���"
-"茖�臀�����"
+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?"
+msgstr "��������荐怨����ソ��羝���賢��絅遵��渇�� Mobile Page �井����茵����肢�鐚������銀���茵���茖�臀�����"
 
 #: src/protocols/msn/msn.c:240
 msgid "Allow"
@@ -6372,39 +6629,55 @@
 msgid "Page"
 msgstr "�喝��"
 
-#: src/protocols/msn/msn.c:361 src/protocols/msn/msn.c:662
+#: src/protocols/msn/msn.c:361
+#: src/protocols/msn/msn.c:662
 #: src/protocols/msn/state.c:32
 msgid "Away From Computer"
 msgstr "筝����肢����"
 
-#: src/protocols/msn/msn.c:362 src/protocols/msn/msn.c:664
-#: src/protocols/msn/state.c:31 src/protocols/yahoo/yahoo.c:2275
-#: src/protocols/yahoo/yahoo.c:2601 src/protocols/yahoo/yahoo.c:2715
+#: src/protocols/msn/msn.c:362
+#: src/protocols/msn/msn.c:664
+#: src/protocols/msn/state.c:31
+#: src/protocols/yahoo/yahoo.c:2275
+#: src/protocols/yahoo/yahoo.c:2601
+#: src/protocols/yahoo/yahoo.c:2715
 msgid "Be Right Back"
 msgstr "薤����箴�"
 
-#: src/protocols/msn/msn.c:363 src/protocols/msn/msn.c:666
-#: src/protocols/msn/state.c:29 src/protocols/novell/novell.c:2147
-#: src/protocols/novell/novell.c:2260 src/protocols/novell/novell.c:2314
-#: src/protocols/yahoo/yahoo.c:2277 src/protocols/yahoo/yahoo.c:2603
+#: src/protocols/msn/msn.c:363
+#: src/protocols/msn/msn.c:666
+#: src/protocols/msn/state.c:29
+#: src/protocols/novell/novell.c:2147
+#: src/protocols/novell/novell.c:2260
+#: src/protocols/novell/novell.c:2314
+#: src/protocols/yahoo/yahoo.c:2277
+#: src/protocols/yahoo/yahoo.c:2603
 #: src/protocols/yahoo/yahoo.c:2716
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: src/protocols/msn/msn.c:364 src/protocols/msn/msn.c:668
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2285
-#: src/protocols/yahoo/yahoo.c:2611 src/protocols/yahoo/yahoo.c:2720
+#: src/protocols/msn/msn.c:364
+#: src/protocols/msn/msn.c:668
+#: src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2285
+#: src/protocols/yahoo/yahoo.c:2611
+#: src/protocols/yahoo/yahoo.c:2720
 msgid "On The Phone"
 msgstr "�肢�筝�"
 
-#: src/protocols/msn/msn.c:365 src/protocols/msn/msn.c:670
-#: src/protocols/msn/state.c:34 src/protocols/yahoo/yahoo.c:2289
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:2722
+#: src/protocols/msn/msn.c:365
+#: src/protocols/msn/msn.c:670
+#: src/protocols/msn/state.c:34
+#: src/protocols/yahoo/yahoo.c:2289
+#: src/protocols/yahoo/yahoo.c:2615
+#: src/protocols/yahoo/yahoo.c:2722
 msgid "Out To Lunch"
 msgstr "紊��榊���"
 
-#: src/protocols/msn/msn.c:366 src/protocols/msn/msn.c:672
-#: src/protocols/zephyr/zephyr.c:1179 src/protocols/zephyr/zephyr.c:1194
+#: src/protocols/msn/msn.c:366
+#: src/protocols/msn/msn.c:672
+#: src/protocols/zephyr/zephyr.c:1179
+#: src/protocols/zephyr/zephyr.c:1194
 msgid "Hidden"
 msgstr "�沿��"
 
@@ -6443,105 +6716,111 @@
 
 # XXX ��⑮
 #: src/protocols/msn/msn.c:473
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-"MSN ��荀� SSL 腮�綣鎺�����呃�茫�絎�茖�筝�������吡�� SSL 腮�綣鎺���荅恰��茫��� http://"
-"gaim.sf.net/faq-ssl.php��"
+msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
+msgstr "MSN ��荀� SSL 腮�綣鎺�����呃�茫�絎�茖�筝�������吡�� SSL 腮�綣鎺���荅恰��茫��� http://gaim.sf.net/faq-ssl.php��"
 
 #: src/protocols/msn/msn.c:785
 #, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your allow list."
-msgstr ""
-"MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com����"
-"��絨�筝���莅��贋������荐掩�����"
-
-#: src/protocols/msn/msn.c:789 src/protocols/msn/msn.c:829
+msgid "An MSN screen name must be in the form \"user@server.com\". Perhaps you meant %s@hotmail.com. No changes were made to your allow list."
+msgstr "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com������絨�筝���莅��贋������荐掩�����"
+
+#: src/protocols/msn/msn.c:789
+#: src/protocols/msn/msn.c:829
 msgid "Invalid MSN screen name"
 msgstr "�≧���� MSN 篏睡����絽活��"
 
 # MSN6.0筝㊥����絨���Block��筝�荅���茘����冴��絨�����
 #: src/protocols/msn/msn.c:825
 #, c-format
-msgid ""
-"An MSN screen name must be in the form \"user@server.com\". Perhaps you "
-"meant %s@hotmail.com. No changes were made to your block list."
-msgstr ""
-"MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com����"
-"��絨�筝���莅��贋����絨���羝�����"
-
-#: src/protocols/msn/msn.c:1332 src/protocols/yahoo/yahoo.c:2899
+msgid "An MSN screen name must be in the form \"user@server.com\". Perhaps you meant %s@hotmail.com. No changes were made to your block list."
+msgstr "MSN ��絽活��綽����冴��user@server.com�����弱�����荐掩���������� %s@hotmail.com������絨�筝���莅��贋����絨���羝�����"
+
+#: src/protocols/msn/msn.c:1332
+#: src/protocols/yahoo/yahoo.c:2899
 msgid "<html><body><b>Error retrieving profile</b></body></html>"
 msgstr "<html><body><b>莅�����篋肴�荐����主�����</b></body></html>"
 
 #. Age
-#: src/protocols/msn/msn.c:1402 src/protocols/oscar/oscar.c:4247
-#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
+#: src/protocols/msn/msn.c:1402
+#: src/protocols/oscar/oscar.c:4247
+#: src/protocols/trepia/trepia.c:285
+#: src/protocols/trepia/trepia.c:404
 #: src/protocols/yahoo/yahoo.c:3009
 msgid "Age"
 msgstr "綛顔宗"
 
 #. Gender
-#: src/protocols/msn/msn.c:1409 src/protocols/oscar/oscar.c:4234
-#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
+#: src/protocols/msn/msn.c:1409
+#: src/protocols/oscar/oscar.c:4234
+#: src/protocols/trepia/trepia.c:279
+#: src/protocols/trepia/trepia.c:406
 #: src/protocols/yahoo/yahoo.c:3017
 msgid "Gender"
 msgstr "�у��"
 
-#: src/protocols/msn/msn.c:1417 src/protocols/yahoo/yahoo.c:3013
+#: src/protocols/msn/msn.c:1417
+#: src/protocols/yahoo/yahoo.c:3013
 msgid "Marital Status"
 msgstr "紿�紮紫��羈�"
 
-#: src/protocols/msn/msn.c:1424 src/protocols/yahoo/yahoo.c:3005
+#: src/protocols/msn/msn.c:1424
+#: src/protocols/yahoo/yahoo.c:3005
 msgid "Location"
 msgstr "�����臀�"
 
-#: src/protocols/msn/msn.c:1432 src/protocols/yahoo/yahoo.c:3021
+#: src/protocols/msn/msn.c:1432
+#: src/protocols/yahoo/yahoo.c:3021
 msgid "Occupation"
 msgstr "�傑キ"
 
-#: src/protocols/msn/msn.c:1449 src/protocols/msn/msn.c:1455
-#: src/protocols/msn/msn.c:1462 src/protocols/msn/msn.c:1469
+#: src/protocols/msn/msn.c:1449
+#: src/protocols/msn/msn.c:1455
+#: src/protocols/msn/msn.c:1462
+#: src/protocols/msn/msn.c:1469
 #: src/protocols/msn/msn.c:1476
 msgid "A Little About Me"
 msgstr "����膂>�"
 
-#: src/protocols/msn/msn.c:1485 src/protocols/msn/msn.c:1498
+#: src/protocols/msn/msn.c:1485
+#: src/protocols/msn/msn.c:1498
 #: src/protocols/msn/msn.c:1505
 msgid "Favorite Things"
 msgstr "����篋���"
 
-#: src/protocols/msn/msn.c:1514 src/protocols/msn/msn.c:1520
+#: src/protocols/msn/msn.c:1514
+#: src/protocols/msn/msn.c:1520
 #: src/protocols/msn/msn.c:1527
 msgid "Hobbies and Interests"
 msgstr "��絅�/��莇�"
 
 # NOTE �ユ��po罟���MSN��昆��茘���綺у勌����
-#: src/protocols/msn/msn.c:1536 src/protocols/msn/msn.c:1542
+#: src/protocols/msn/msn.c:1536
+#: src/protocols/msn/msn.c:1542
 #: src/protocols/yahoo/yahoo.c:3056
 msgid "Favorite Quote"
 msgstr "綺у勌��"
 
-#: src/protocols/msn/msn.c:1550 src/protocols/yahoo/yahoo.c:3092
+#: src/protocols/msn/msn.c:1550
+#: src/protocols/yahoo/yahoo.c:3092
 msgid "Last Updated"
 msgstr "�贋�井�ユ��"
 
 #. Homepage
-#: src/protocols/msn/msn.c:1561 src/protocols/trepia/trepia.c:289
+#: src/protocols/msn/msn.c:1561
+#: src/protocols/trepia/trepia.c:289
 #: src/protocols/trepia/trepia.c:419
 msgid "Homepage"
 msgstr "膓臥��"
 
 # NOTE 茘����翫�� by Ambrose
-#: src/protocols/msn/msn.c:1583 src/protocols/yahoo/yahoo.c:3107
+#: src/protocols/msn/msn.c:1583
+#: src/protocols/yahoo/yahoo.c:3107
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "�≧���緇�篏睡���� %s ����篋肴�荐�"
 
-#: src/protocols/msn/msn.c:1585 src/protocols/yahoo/yahoo.c:3109
+#: src/protocols/msn/msn.c:1585
+#: src/protocols/yahoo/yahoo.c:3109
 msgid "The user's profile is empty."
 msgstr "����篏睡������莖�荐�����順����"
 
@@ -6563,11 +6842,13 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/msn/msn.c:1716 src/protocols/msn/msn.c:1718
+#: src/protocols/msn/msn.c:1716
+#: src/protocols/msn/msn.c:1718
 msgid "MSN Protocol Plugin"
 msgstr "MSN ��絎�罔∞�"
 
-#: src/protocols/msn/msn.c:1736 src/protocols/trepia/trepia.c:1301
+#: src/protocols/msn/msn.c:1736
+#: src/protocols/trepia/trepia.c:1301
 msgid "Login server"
 msgstr "�糸�ヤ失����"
 
@@ -6579,7 +6860,8 @@
 msgid "Unable to connect to server"
 msgstr "�≧��g��遺失����"
 
-#: src/protocols/msn/nexus.c:121 src/protocols/msn/nexus.c:130
+#: src/protocols/msn/nexus.c:121
+#: src/protocols/msn/nexus.c:130
 msgid "Unable to write to MSN Nexus server."
 msgstr "�≧�絲��ュ�� MSN �� Nexus 篌堺������"
 
@@ -6591,11 +6873,13 @@
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr "��荅���� MSN ���糸�ヤ失�����画�茯�茘�����鐚��主��篋�筝����������"
 
-#: src/protocols/msn/notification.c:309 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:309
+#: src/protocols/trepia/trepia.c:635
 msgid "Retrieving buddy list"
 msgstr "莅���絅遵�羝���賢"
 
-#: src/protocols/msn/notification.c:334 src/protocols/msn/notification.c:366
+#: src/protocols/msn/notification.c:334
+#: src/protocols/msn/notification.c:366
 #: src/protocols/oscar/oscar.c:1649
 msgid "Password sent"
 msgstr "絲�腆守����"
@@ -6621,16 +6905,15 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "篏睡���� %s鐚�%s鐚��活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝�����"
 
-#: src/protocols/msn/notification.c:903 src/protocols/msn/notification.c:1070
+#: src/protocols/msn/notification.c:903
+#: src/protocols/msn/notification.c:1070
 #, c-format
 msgid "The user %s (%s) wants to add you to their buddy list."
 msgstr "篏睡���� %s鐚�%s鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���"
 
 #: src/protocols/msn/notification.c:1362
 #, c-format
-msgid ""
-"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
-"again."
+msgid "Your MSN buddy list for %s is temporarily unavailable. Please wait and try again."
 msgstr "�����≧���緇� %s ��絅遵�羝����茫������緇���荅���"
 
 #: src/protocols/msn/notification.c:1607
@@ -6640,33 +6923,8 @@
 # NOTE "in %d minutes" ��寚���� %d ����箙��с�������
 # NOTE 顑����翫�� by Ambrose
 #: src/protocols/msn/notification.c:1776
-#, c-format
-msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
-msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
-msgstr[0] ""
-"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���"
-"綽������������篋よ���\n"
-"\n"
-"�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
-msgstr[1] ""
-"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���"
-"綽������������篋よ���\n"
-"\n"
-"�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
-
 #: src/protocols/msn/servconn.c:389
+#, c-format
 msgid "IO Error."
 msgstr "IO �����"
 
@@ -6718,9 +6976,7 @@
 msgstr "%s �ヨ�����篏睡����莖�荐�"
 
 #: src/protocols/napster/napster.c:422
-msgid ""
-"You were disconnected from the server, because you logged on from a "
-"different location"
+msgid "You were disconnected from the server, because you logged on from a different location"
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ャ��"
 
 #. MSG_CLIENT_PING
@@ -6733,7 +6989,8 @@
 msgid "Get Info"
 msgstr "��緇�莖�荐�"
 
-#: src/protocols/napster/napster.c:555 src/protocols/oscar/oscar.c:5517
+#: src/protocols/napster/napster.c:555
+#: src/protocols/oscar/oscar.c:5517
 #: src/protocols/toc/toc.c:1259
 msgid "_Group:"
 msgstr "臂ょ�(_G)鐚�"
@@ -6748,7 +7005,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/napster/napster.c:639 src/protocols/napster/napster.c:641
+#: src/protocols/napster/napster.c:639
+#: src/protocols/napster/napster.c:641
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER ��絎�罔∞�"
 
@@ -6787,21 +7045,17 @@
 #  TODO Untranslated
 #: src/protocols/novell/novell.c:536
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (0x%X)."
-msgstr ""
-"�≧���失�������羝�����篏睡���� %s 腱肢�括���� %s��綮榊��������主����� (0x%X)��"
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (0x%X)."
+msgstr "�≧���失�������羝�����篏睡���� %s 腱肢�括���� %s��綮榊��������主����� (0x%X)��"
 
 #: src/protocols/novell/novell.c:584
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (0x%X)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (0x%X)."
 msgstr "�≧��医� %s �喝ソ��羝�������失�������羝���産腴��������主����� (0x%X)��"
 
 #  NOTE��GroupWise�����篁九��腮縁�罩e�筝㊥����紊ф�筝�������臂ょ���...
-#: src/protocols/novell/novell.c:615 src/protocols/novell/novell.c:1344
+#: src/protocols/novell/novell.c:615
+#: src/protocols/novell/novell.c:1344
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise ��茘� %d"
@@ -6811,7 +7065,8 @@
 msgid "Could not get details for user %s (0x%X)."
 msgstr "�≧���緇�篏睡���� %s ��膣亥� (0x%X)��"
 
-#: src/protocols/novell/novell.c:773 src/protocols/novell/novell.c:1107
+#: src/protocols/novell/novell.c:773
+#: src/protocols/novell/novell.c:1107
 msgid "Error communicating with server. Closing connection."
 msgstr "��篌堺����������荐��主������������g���"
 
@@ -6885,8 +7140,7 @@
 
 #: src/protocols/novell/novell.c:1462
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ����篌寂��∝�鐚���篁ヤ����九�井���������榊��荐�����"
 
 #. TODO: Would be nice to prompt if not set!
@@ -6894,9 +7148,7 @@
 #.
 #. ...but for now just error out with a nice message.
 #: src/protocols/novell/novell.c:1560
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
 msgstr "�≧��g��割失������茫�莠後�ユ������g��括��篌堺������篏�����"
 
 #: src/protocols/novell/novell.c:1582
@@ -6907,8 +7159,10 @@
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "������茘医群膓��������≧�膵主����坂算篏�荐�����"
 
-#: src/protocols/novell/novell.c:2153 src/protocols/oscar/oscar.c:576
-#: src/protocols/oscar/oscar.c:5813 src/protocols/yahoo/yahoo.c:2297
+#: src/protocols/novell/novell.c:2153
+#: src/protocols/oscar/oscar.c:576
+#: src/protocols/oscar/oscar.c:5813
+#: src/protocols/yahoo/yahoo.c:2297
 msgid "Offline"
 msgstr "�∝�"
 
@@ -6933,7 +7187,8 @@
 "<b>����鐚�</b>%s"
 
 #  NOTE ������篌寂����∝������銀���絎������∝�������箙�筝�筝�絎��������∝�鐚����喝Ű⑮���∝���箙�筝�紊��∵�
-#: src/protocols/novell/novell.c:2261 src/protocols/novell/novell.c:2317
+#: src/protocols/novell/novell.c:2261
+#: src/protocols/novell/novell.c:2317
 msgid "Appear Offline"
 msgstr "�∝�"
 
@@ -6947,7 +7202,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/novell/novell.c:2405 src/protocols/novell/novell.c:2407
+#: src/protocols/novell/novell.c:2405
+#: src/protocols/novell/novell.c:2407
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger ��絎�罔∞�"
 
@@ -7072,7 +7328,8 @@
 msgid "Chat"
 msgstr "��紊�"
 
-#: src/protocols/oscar/oscar.c:437 src/protocols/oscar/oscar.c:6535
+#: src/protocols/oscar/oscar.c:437
+#: src/protocols/oscar/oscar.c:6535
 msgid "Get File"
 msgstr "�ユ�倶�罅�"
 
@@ -7148,24 +7405,27 @@
 
 #: src/protocols/oscar/oscar.c:490
 msgid "Live Video"
-msgstr ""
+msgstr "����荀�荐�"
 
 #  NOTE AIM_CAPS_CAMERA鐚��恰���藝弱��(^^;)
 #: src/protocols/oscar/oscar.c:493
 msgid "Camera"
 msgstr "�х�御�"
 
-#: src/protocols/oscar/oscar.c:512 src/protocols/oscar/oscar.c:4832
+#: src/protocols/oscar/oscar.c:512
+#: src/protocols/oscar/oscar.c:4832
 #: src/protocols/oscar/oscar.c:6425
 msgid "Free For Chat"
 msgstr "����腥肴��紊�"
 
-#: src/protocols/oscar/oscar.c:516 src/protocols/oscar/oscar.c:4826
+#: src/protocols/oscar/oscar.c:516
+#: src/protocols/oscar/oscar.c:4826
 #: src/protocols/oscar/oscar.c:6423
 msgid "Not Available"
 msgstr "�傑�����∫��"
 
-#: src/protocols/oscar/oscar.c:518 src/protocols/oscar/oscar.c:4829
+#: src/protocols/oscar/oscar.c:518
+#: src/protocols/oscar/oscar.c:4829
 #: src/protocols/oscar/oscar.c:6424
 msgid "Occupied"
 msgstr "綽�腆�"
@@ -7193,7 +7453,8 @@
 msgid "Direct IM with %s failed"
 msgstr "�� %s ���恰��荐���け��"
 
-#: src/protocols/oscar/oscar.c:792 src/protocols/toc/toc.c:885
+#: src/protocols/oscar/oscar.c:792
+#: src/protocols/toc/toc.c:885
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
@@ -7202,7 +7463,8 @@
 msgid "Chat is currently unavailable"
 msgstr "�����≧�篏睡����紊��"
 
-#: src/protocols/oscar/oscar.c:879 src/protocols/oscar/oscar.c:943
+#: src/protocols/oscar/oscar.c:879
+#: src/protocols/oscar/oscar.c:943
 msgid "Couldn't connect to host"
 msgstr "�≧��e�遺失����"
 
@@ -7212,19 +7474,15 @@
 
 #: src/protocols/oscar/oscar.c:903
 #, c-format
-msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"�≧��糸�ワ��≧�篁� %s 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽���篁ヨ�掩��絖�罸�莎桁�鐚�"
-"筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����"
+msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "�≧��糸�ワ��≧�篁� %s 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽���篁ヨ�掩��絖�罸�莎桁�鐚�筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����"
 
 #: src/protocols/oscar/oscar.c:931
 msgid "Unable to login to AIM"
 msgstr "�≧��糸�ュ�� AIM"
 
-#: src/protocols/oscar/oscar.c:1035 src/protocols/oscar/oscar.c:1453
+#: src/protocols/oscar/oscar.c:1035
+#: src/protocols/oscar/oscar.c:1453
 msgid "Could Not Connect"
 msgstr "�≧��g�"
 
@@ -7232,7 +7490,8 @@
 msgid "Connection established, cookie sent"
 msgstr "�g�綏峨産腴�鐚�筝�群���� Cookie"
 
-#: src/protocols/oscar/oscar.c:1156 src/protocols/yahoo/yahoo_filexfer.c:209
+#: src/protocols/oscar/oscar.c:1156
+#: src/protocols/yahoo/yahoo_filexfer.c:209
 #: src/protocols/yahoo/yahoo_filexfer.c:218
 msgid "Unable to establish file descriptor."
 msgstr "�≧�綮榊�罟�罅�篁�膣鴻��"
@@ -7245,7 +7504,8 @@
 msgid "Unable to establish listener socket."
 msgstr "�≧�綮榊��h�遵�� Socket��"
 
-#: src/protocols/oscar/oscar.c:1337 src/protocols/toc/toc.c:571
+#: src/protocols/oscar/oscar.c:1337
+#: src/protocols/toc/toc.c:571
 msgid "Incorrect nickname or password."
 msgstr "������援┗��絲�腆�"
 
@@ -7259,12 +7519,8 @@
 msgstr "AOL �恰��荐�����������筝�絖�����"
 
 #: src/protocols/oscar/oscar.c:1351
-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."
-msgstr ""
-"�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
-"膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
+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."
+msgstr "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅����g�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
 #: src/protocols/oscar/oscar.c:1356
 #, c-format
@@ -7279,17 +7535,15 @@
 msgid "Received authorization"
 msgstr "�九�域�茘�"
 
-#: src/protocols/oscar/oscar.c:1496 src/protocols/oscar/oscar.c:1526
+#: src/protocols/oscar/oscar.c:1496
+#: src/protocols/oscar/oscar.c:1526
 #: src/protocols/oscar/oscar.c:1614
 #, c-format
-msgid ""
-"You may be disconnected shortly.  You may want to use TOC until this is "
-"fixed.  Check %s for updates."
-msgstr ""
-"����醇���㊥����筝㊥�潔�g�������醇���喝�������馹�茴�信罩e�篏睡�� TOC��茫��� %s ������"
-"羃����贋�違��"
-
-#: src/protocols/oscar/oscar.c:1499 src/protocols/oscar/oscar.c:1529
+msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
+msgstr "����醇���㊥����筝㊥�潔�g�������醇���喝�������馹�茴�信罩e�篏睡�� TOC��茫��� %s ������羃����贋�違��"
+
+#: src/protocols/oscar/oscar.c:1499
+#: src/protocols/oscar/oscar.c:1529
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim �≧���緇������� AIM �糸�ョ⊆��"
 
@@ -7297,12 +7551,14 @@
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim �≧���緇��������糸�ョ⊆��"
 
-#: src/protocols/oscar/oscar.c:2199 src/protocols/oscar/oscar.c:5917
+#: src/protocols/oscar/oscar.c:2199
+#: src/protocols/oscar/oscar.c:5917
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "�� %s ���恰��荐���群膓�茴�産腴�"
 
-#: src/protocols/oscar/oscar.c:2533 src/protocols/oscar/oscar.c:2555
+#: src/protocols/oscar/oscar.c:2533
+#: src/protocols/oscar/oscar.c:2555
 msgid "(There was an error receiving this message)"
 msgstr "鐚��九�����荐������主�����鐚�"
 
@@ -7312,15 +7568,11 @@
 msgstr "%s ����荀�羆��贋・�g��� %s"
 
 #: src/protocols/oscar/oscar.c:2719
-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 "
-"considered a privacy risk."
-msgstr ""
-"����荀�羆�絨����������肢����綮榊�莎欠�贋・�g�鐚����������渇���恰��荐���襲�����鏆�������"
-"��罔e������我���� IP 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
-
-#: src/protocols/oscar/oscar.c:2724 src/protocols/oscar/oscar.c:6299
+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 considered a privacy risk."
+msgstr "����荀�羆�絨����������肢����綮榊�莎欠�贋・�g�鐚����������渇���恰��荐���襲�����鏆���������罔e������我���� IP 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
+
+#: src/protocols/oscar/oscar.c:2724
+#: src/protocols/oscar/oscar.c:6299
 msgid "Connect"
 msgstr "�g�"
 
@@ -7338,19 +7590,22 @@
 
 #: src/protocols/oscar/oscar.c:2791
 #, c-format
-msgid ""
-"The user %s requires authorization before being added to a buddy list.  Do "
-"you want to send an authorization request?"
+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:2796 src/protocols/oscar/oscar.c:2798
+#: src/protocols/oscar/oscar.c:2796
+#: src/protocols/oscar/oscar.c:2798
 msgid "Request Authorization"
 msgstr "荀�羆�茯�茘�"
 
-#: src/protocols/oscar/oscar.c:2834 src/protocols/oscar/oscar.c:2836
-#: src/protocols/oscar/oscar.c:2843 src/protocols/oscar/oscar.c:2925
-#: src/protocols/oscar/oscar.c:2945 src/protocols/oscar/oscar.c:3281
-#: src/protocols/oscar/oscar.c:3341 src/protocols/oscar/oscar.c:5438
+#: src/protocols/oscar/oscar.c:2834
+#: src/protocols/oscar/oscar.c:2836
+#: src/protocols/oscar/oscar.c:2843
+#: src/protocols/oscar/oscar.c:2925
+#: src/protocols/oscar/oscar.c:2945
+#: src/protocols/oscar/oscar.c:3281
+#: src/protocols/oscar/oscar.c:3341
+#: src/protocols/oscar/oscar.c:5438
 #: src/protocols/oscar/oscar.c:5484
 msgid "No reason given."
 msgstr "羃���腟��������"
@@ -7368,15 +7623,15 @@
 "篏睡���� %u ���坂�������鐚��活�絨������ヤ�鐚�絅刻���絅遵�羝���賢鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:2933 src/protocols/oscar/oscar.c:5444
+#: src/protocols/oscar/oscar.c:2933
+#: src/protocols/oscar/oscar.c:5444
 msgid "Authorization Request"
 msgstr "茯�茘�荀�羆�"
 
 #: src/protocols/oscar/oscar.c:2945
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "篏睡���� %u ���坂�������鐚���腟�篋�����九���ュソ��羝�����荀�羆�鐚�\n"
@@ -7444,51 +7699,13 @@
 msgid "Decline"
 msgstr "紿���"
 
+# XXX 莊����㊥����茘���������鐚��頑⑮�����<��絅遵�頫�筝���鐚�筝���
 #: src/protocols/oscar/oscar.c:3090
-#, 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:3099
-#, 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:3108
-#, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪��渇������綺�お綽���"
-msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����渇������綺�お綽���"
-
-# XXX 莊����㊥����茘���������鐚��頑⑮�����<��絅遵�頫�筝���鐚�筝���
 #: src/protocols/oscar/oscar.c:3117
-#, 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 ��箴���荐�������坂�鐚�絅刻�紊����>���"
-msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������坂�鐚�絅刻�紊����>���"
-
 #: src/protocols/oscar/oscar.c:3126
-#, 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 ��箴���荐�������堺��お���>���"
-msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���>���"
-
 #: src/protocols/oscar/oscar.c:3135
-#, 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 ��箴���荐��������筝�����"
-msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐��������筝�����"
-
 #: src/protocols/oscar/oscar.c:3184
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
@@ -7524,7 +7741,8 @@
 msgstr "筝�膩���"
 
 # XXX �壕⑮��荐糸���ユ���������莠�����鐚�
-#: src/protocols/oscar/oscar.c:3368 src/protocols/yahoo/yahoo.c:3088
+#: src/protocols/oscar/oscar.c:3368
+#: src/protocols/yahoo/yahoo.c:3088
 msgid "Member Since"
 msgstr "���堺���∞������"
 
@@ -7535,9 +7753,7 @@
 #  The conversion failed!
 #. The conversion failed!
 #: src/protocols/oscar/oscar.c:3636
-msgid ""
-"[Unable to display a message from this user because it contained invalid "
-"characters.]"
+msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "���≧�蕁�ず箴�������篏睡������荐�������阪�������≧��絖�������"
 
 #: src/protocols/oscar/oscar.c:3854
@@ -7545,17 +7761,11 @@
 msgstr "�������狗�����"
 
 #: src/protocols/oscar/oscar.c:3855
-msgid ""
-"The last action you attempted could not be performed because you are over "
-"the rate limit. Please wait 10 seconds and try again."
-msgstr ""
-"����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���"
-"荅��罨<��"
+msgid "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:3918
-msgid ""
-"You have been disconnected because you have signed on with this screen name "
-"at another location."
+msgid "You have been disconnected because you have signed on with this screen name at another location."
 msgstr "��←筝㊥�潔�g�鐚����堺���怨�銀����井�合�糸�ラ����絽活����"
 
 #: src/protocols/oscar/oscar.c:3920
@@ -7566,7 +7776,8 @@
 msgid "Finalizing connection"
 msgstr "絎����g�"
 
-#: src/protocols/oscar/oscar.c:4221 src/protocols/oscar/oscar.c:4228
+#: src/protocols/oscar/oscar.c:4221
+#: src/protocols/oscar/oscar.c:4228
 msgid "Email Address"
 msgstr "�糸��灸散"
 
@@ -7574,12 +7785,14 @@
 msgid "Mobile Phone"
 msgstr "茵����肢�"
 
-#: src/protocols/oscar/oscar.c:4234 src/protocols/trepia/trepia.c:281
+#: src/protocols/oscar/oscar.c:4234
+#: src/protocols/trepia/trepia.c:281
 #: src/protocols/trepia/trepia.c:407
 msgid "Female"
 msgstr "絅�"
 
-#: src/protocols/oscar/oscar.c:4234 src/protocols/trepia/trepia.c:280
+#: src/protocols/oscar/oscar.c:4234
+#: src/protocols/trepia/trepia.c:280
 #: src/protocols/trepia/trepia.c:407
 msgid "Male"
 msgstr "��"
@@ -7596,7 +7809,8 @@
 msgid "Home Address"
 msgstr "篏鎘九�医��"
 
-#: src/protocols/oscar/oscar.c:4263 src/protocols/oscar/oscar.c:4271
+#: src/protocols/oscar/oscar.c:4263
+#: src/protocols/oscar/oscar.c:4271
 msgid "Zip Code"
 msgstr "�級������"
 
@@ -7664,46 +7878,32 @@
 
 #: src/protocols/oscar/oscar.c:4432
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+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:4435
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"ends in a space."
+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:4438
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
+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:4441
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this screen name."
-msgstr ""
-"��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����堺��群膓����榊���銀�荀�羆���������絅純��"
+msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this screen name."
+msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����堺��群膓����榊���銀�荀�羆���������絅純��"
 
 #: src/protocols/oscar/oscar.c:4444
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
+msgid "Error 0x%04x: Unable to change email address because the given address has too many screen names associated with it."
+msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
 
 #: src/protocols/oscar/oscar.c:4447
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change email address because the given address is "
-"invalid."
+msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
 msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医�����≧������"
 
 #: src/protocols/oscar/oscar.c:4450
@@ -7720,7 +7920,8 @@
 "����絽活������茴��弱���絋�筝�鐚�\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4461 src/protocols/oscar/oscar.c:4468
+#: src/protocols/oscar/oscar.c:4461
+#: src/protocols/oscar/oscar.c:4468
 msgid "Account Info"
 msgstr "絽活��莖�荐�"
 
@@ -7734,30 +7935,17 @@
 msgstr "�≧�荐㊤� AIM ��篋肴�����"
 
 #: src/protocols/oscar/oscar.c:4682
-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 "
-"fully connected."
-msgstr ""
-"�������糸�ュ�����荀�羆�篆��号������篋肴�荐�鐚���篁ラ��篋�莖�荐�筝���←篆��鴻��茫�������糸�ュ�"
-"�����育�画�荐㊤���"
+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 fully connected."
+msgstr "�������糸�ュ�����荀�羆�篆��号������篋肴�荐�鐚���篁ラ��篋�莖�荐�筝���←篆��鴻��茫�������糸�ュ������育�画�荐㊤���"
 
 #: src/protocols/oscar/oscar.c:4709
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
-msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
-msgstr[1] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
-
 #: src/protocols/oscar/oscar.c:4714
+#, c-format
 msgid "Profile too long."
 msgstr "��篋肴�荐����激��"
 
-#: src/protocols/oscar/oscar.c:4730 src/protocols/oscar/oscar.c:6430
+#: src/protocols/oscar/oscar.c:4730
+#: src/protocols/oscar/oscar.c:6430
 msgid "Visible"
 msgstr "�乗昆"
 
@@ -7766,38 +7954,22 @@
 msgstr "�≧�荐㊤� AIM �∫��荐�����"
 
 #: src/protocols/oscar/oscar.c:4749
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"��������糸�ョ�綺鎘�����篆��号�����∫��荐������������絨�膓㊥��������荐㊤���������茫���"
-"絎����糸�ュ���荐㊤�筝�罨<��"
+msgid "You have probably requested to set your away message before the login procedure completed.  You remain in a \"present\" state; try setting it again when you are fully connected."
+msgstr "��������糸�ョ�綺鎘�����篆��号�����∫��荐������������絨�膓㊥��������荐㊤���������茫�������糸�ュ���荐㊤�筝�罨<��"
 
 #: src/protocols/oscar/oscar.c:4789
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
-msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
-msgstr[0] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
-msgstr[1] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝�����Gaim 綏我�炊�����㊤�у���"
-
 #: src/protocols/oscar/oscar.c:4794
+#, c-format
 msgid "Away message too long."
 msgstr "�∫��荐������激��"
 
 #: src/protocols/oscar/oscar.c:4887
 #, c-format
-msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4888 src/protocols/oscar/oscar.c:5305
+msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
+msgstr "���咲����絽活��筝������������絽活��鐚���篁ョ�≧�絨�絅遵���%s�����ユ���賢��絽活��綽���篁ヨ�掩��絖�罸��咲���㍼������宴���掩��絖�罸��������後�������腥榊�純����腟���鐚��������篁ャ���後���腟�����"
+
+#: src/protocols/oscar/oscar.c:4888
+#: src/protocols/oscar/oscar.c:5305
 #: src/protocols/oscar/oscar.c:5318
 msgid "Unable To Add"
 msgstr "�≧�����"
@@ -7807,51 +7979,37 @@
 msgstr "�≧�莅���絅遵�羝���"
 
 #: src/protocols/oscar/oscar.c:5025
-msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-"Gaim ����羃���莨���� AIM 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃�����"
-"紊縁����遵�札��江��絨��鏅���緇���"
-
-#: src/protocols/oscar/oscar.c:5201 src/protocols/oscar/oscar.c:5202
-#: src/protocols/oscar/oscar.c:5207 src/protocols/oscar/oscar.c:5362
-#: src/protocols/oscar/oscar.c:5363 src/protocols/oscar/oscar.c:5368
+msgid "Gaim was temporarily unable to retrieve your buddy list from the AIM servers.  Your buddy list is not lost, and will probably become available in a few hours."
+msgstr "Gaim ����羃���莨���� AIM 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃����阪け鐚����遵�札��江��絨��鏅���緇���"
+
+#: src/protocols/oscar/oscar.c:5201
+#: src/protocols/oscar/oscar.c:5202
+#: src/protocols/oscar/oscar.c:5207
+#: src/protocols/oscar/oscar.c:5362
+#: src/protocols/oscar/oscar.c:5363
+#: src/protocols/oscar/oscar.c:5368
 msgid "Orphans"
 msgstr "絖ゅ����"
 
 #: src/protocols/oscar/oscar.c:5304
 #, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
-"list.  Please remove one and try again."
-msgstr ""
-"���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���"
-"荅���"
-
-#: src/protocols/oscar/oscar.c:5304 src/protocols/oscar/oscar.c:5317
+msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
+msgstr "���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���荅���"
+
+#: src/protocols/oscar/oscar.c:5304
+#: src/protocols/oscar/oscar.c:5317
 msgid "(no name)"
 msgstr "(羃�����絖�)"
 
 #: src/protocols/oscar/oscar.c:5317
 #, c-format
-msgid ""
-"Could not add the buddy %s for an unknown reason.  The most common reason "
-"for this is that you have the maximum number of allowed buddies in your "
-"buddy list."
-msgstr ""
-"���坂���������≧�絨�絅遵� %s ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟���"
-"����膤紫輝��荐援��筝�����"
+msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
+msgstr "���坂���������≧�絨�絅遵� %s ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟�������膤紫輝��荐援��筝�����"
 
 #: src/protocols/oscar/oscar.c:5399
 #, 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 綏牙���荐掩�����ュ�遺�鐚�絅刻���絅遵�羝���賢����������荀�絨�篁�鐚�絅刻�����"
-"���"
+msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
+msgstr "篏睡���� %s 綏牙���荐掩�����ュ�遺�鐚�絅刻���絅遵�羝���賢����������荀�絨�篁�鐚�絅刻����ュ���"
 
 # NOTE ����������荐怨�ヤ査�弱�榊��茯�茘�荀�羆�緇�蕁�ず腟�������訓����
 #: src/protocols/oscar/oscar.c:5405
@@ -7882,8 +8040,7 @@
 #: src/protocols/oscar/oscar.c:5484
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the "
-"following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the following reason:\n"
 "%s"
 msgstr ""
 "篏睡���� %s ���坂�������鐚���腟�篋����篁�鐚�絅刻����ュソ��羝�����荀�羆�鐚�\n"
@@ -7895,7 +8052,8 @@
 
 # NOTE: ��茖∞��絖�臂���� #gaim �� MrHappy �� deryni ��箴���
 # NOTE: KingAnt ��箴���絖�臂���篋�筝���鐚�����筝�篋�����
-#: src/protocols/oscar/oscar.c:5522 src/protocols/toc/toc.c:1264
+#: src/protocols/oscar/oscar.c:5522
+#: src/protocols/toc/toc.c:1264
 msgid "_Exchange:"
 msgstr "�脂����腆�(_E)鐚�"
 
@@ -7917,9 +8075,7 @@
 msgstr "���御��篋��� %s ����筝����贋・�恰��荐�����"
 
 #: src/protocols/oscar/oscar.c:6295
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
+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:6480
@@ -7968,12 +8124,8 @@
 msgstr "������罩e���緇�筝���絅遵���茯�茘�"
 
 #: src/protocols/oscar/oscar.c:6673
-msgid ""
-"You can re-request authorization from these buddies by right-clicking on "
-"them and selecting \"Re-request Authorization.\""
-msgstr ""
-"���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��"
-"��荀�羆����域�茘�����"
+msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
+msgstr "���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御����荀�羆����域�茘�����"
 
 #: src/protocols/oscar/oscar.c:6687
 msgid "Find Buddy by E-mail"
@@ -8058,7 +8210,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/oscar/oscar.c:6996 src/protocols/oscar/oscar.c:6998
+#: src/protocols/oscar/oscar.c:6996
+#: src/protocols/oscar/oscar.c:6998
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ ��絎�罔∞�"
 
@@ -8174,12 +8327,8 @@
 msgstr "�������糸�ョ鎧腟援��茘���膈�膣�紊��鐚�篁ヨ�雁�≧��糸�ャ��"
 
 #: src/protocols/toc/toc.c:580
-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."
-msgstr ""
-"�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
-"膩�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
+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."
+msgstr "�����g�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅����g�鐚��i瑳����膈�緇�����絨����翫����綮狗�激��"
 
 #: src/protocols/toc/toc.c:582
 #, c-format
@@ -8212,13 +8361,8 @@
 msgstr "TOC ���坂�筝������� (PAUSE) ��篁ゃ��"
 
 #: src/protocols/toc/toc.c:908
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-"�狗�����主����鐚�TOC ��綽順�ユ������箴���荐�����������遵�������肴�����鐚�絨���権�榊鎧"
-"腟宴��Gaim 絨��水���主����罔g��篋�����������������х������鐚�茫����茫���"
+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 is only temporary, please be patient."
+msgstr "�狗�����主����鐚�TOC ��綽順�ユ������箴���荐�����������遵�������肴�����鐚�絨���権�榊鎧腟宴��Gaim 絨��水���主����罔g��篋�����������������х������鐚�茫����茫���"
 
 #: src/protocols/toc/toc.c:1402
 msgid "Get Dir Info"
@@ -8237,8 +8381,10 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "罟�罅��活叱紊掩��鐚����醇����劫�羔��活叱��"
 
-#: src/protocols/toc/toc.c:1745 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1909 src/protocols/toc/toc.c:1997
+#: src/protocols/toc/toc.c:1745
+#: src/protocols/toc/toc.c:1785
+#: src/protocols/toc/toc.c:1909
+#: src/protocols/toc/toc.c:1997
 msgid "Could not connect for transfer."
 msgstr "�≧������g�篁ヤ��活叱��"
 
@@ -8251,12 +8397,6 @@
 msgstr "Gaim - �峨���..."
 
 #: src/protocols/toc/toc.c:2076
-#, 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"
-msgstr[1] "%s 荀�羆� %s �ユ�� %d ��罟�罅�鐚�%s (%.2f %s)%s%s"
-
 #: src/protocols/toc/toc.c:2083
 #, c-format
 msgid "%s requests you to send them a file"
@@ -8272,7 +8412,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/toc/toc.c:2167 src/protocols/toc/toc.c:2169
+#: src/protocols/toc/toc.c:2167
+#: src/protocols/toc/toc.c:2169
 msgid "TOC Protocol Plugin"
 msgstr "TOC ��絎�罔∞�"
 
@@ -8349,7 +8490,8 @@
 msgstr "��茹�膓臥��"
 
 # NOTE Debian 茘���local���冴�����亥���
-#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
+#: src/protocols/trepia/trepia.c:821
+#: src/protocols/trepia/trepia.c:824
 msgid "Local Users"
 msgstr "���亥���篏睡����"
 
@@ -8367,15 +8509,14 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/trepia/trepia.c:1282 src/protocols/trepia/trepia.c:1284
+#: src/protocols/trepia/trepia.c:1282
+#: src/protocols/trepia/trepia.c:1284
 msgid "Trepia Protocol Plugin"
 msgstr "Trepia ��絎�罔∞�"
 
 # XXX ��⑮
 #: src/protocols/yahoo/yahoo.c:308
-msgid ""
-"You have been logged off as you have logged in on a different machine or "
-"device."
+msgid "You have been logged off as you have logged in on a different machine or device."
 msgstr "��群膓�茴��糸�削����堺��群��Ί����糸�ャ��"
 
 #: src/protocols/yahoo/yahoo.c:747
@@ -8399,12 +8540,8 @@
 
 #: src/protocols/yahoo/yahoo.c:869
 #, c-format
-msgid ""
-"%s has (retroactively) denied your request to add them to your list for the "
-"following reason: %s."
-msgstr ""
-"篏睡���� %s ���坂�������鐚�������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆�鐚�%"
-"s"
+msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
+msgstr "篏睡���� %s ���坂�������鐚�������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆�鐚�%s"
 
 #: src/protocols/yahoo/yahoo.c:872
 msgid "Add buddy rejected"
@@ -8412,13 +8549,8 @@
 
 #: src/protocols/yahoo/yahoo.c:1599
 #, c-format
-msgid ""
-"The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-"Yahoo 篌堺�����羆�篋�篏睡���腮������茯�茘��劫�鐚���罩ら���������� Gaim 緇����巡�������"
-"�糸�� Yahoo��茫��� %s 罟∽�ユ��羃����贋�亥��������"
+msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
+msgstr "Yahoo 篌堺�����羆�篋�篏睡���腮������茯�茘��劫�鐚���罩ら���������� Gaim 緇����巡��������糸�� Yahoo��茫��� %s 罟∽�ユ��羃����贋�亥��������"
 
 #: src/protocols/yahoo/yahoo.c:1602
 msgid "Failed Yahoo! Authentication"
@@ -8426,12 +8558,8 @@
 
 #: src/protocols/yahoo/yahoo.c:1675
 #, c-format
-msgid ""
-"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
-"\"Yes\" will remove and ignore the buddy."
-msgstr ""
-"����荅�申�ュ������絅遵������х�� %s��絋�������膊���篁�鐚�絅刻�緇�����絅遵�羝���賢腱脂�わ�筝�"
-"���喝申�ヤ�鐚�絅刻�鐚�茫���筝�筝���������"
+msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
+msgstr "����荅�申�ュ������絅遵������х�� %s��絋�������膊���篁�鐚�絅刻�緇�����絅遵�羝���賢腱脂�わ�筝����喝申�ヤ�鐚�絅刻�鐚�茫���筝�筝���������"
 
 #: src/protocols/yahoo/yahoo.c:1678
 msgid "Ignore buddy?"
@@ -8464,37 +8592,45 @@
 msgid "Could not add buddy to server list"
 msgstr "�≧�絨�絅遵��医��割失�������羝�����"
 
-#: src/protocols/yahoo/yahoo.c:1889 src/protocols/yahoo/yahoo.c:2020
+#: src/protocols/yahoo/yahoo.c:1889
+#: src/protocols/yahoo/yahoo.c:2020
 msgid "Unable to read"
 msgstr "�≧�莅���"
 
-#: src/protocols/yahoo/yahoo.c:2042 src/protocols/yahoo/yahoo.c:2152
-#: src/protocols/yahoo/yahoo.c:2195 src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoo.c:2042
+#: src/protocols/yahoo/yahoo.c:2152
+#: src/protocols/yahoo/yahoo.c:2195
+#: src/protocols/yahoo/yahoochat.c:1360
 #: src/protocols/yahoo/yahoochat.c:1421
 msgid "Connection problem"
 msgstr "�g����"
 
-#: src/protocols/yahoo/yahoo.c:2279 src/protocols/yahoo/yahoo.c:2605
+#: src/protocols/yahoo/yahoo.c:2279
+#: src/protocols/yahoo/yahoo.c:2605
 #: src/protocols/yahoo/yahoo.c:2717
 msgid "Not At Home"
 msgstr "筝����"
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2607
+#: src/protocols/yahoo/yahoo.c:2281
+#: src/protocols/yahoo/yahoo.c:2607
 #: src/protocols/yahoo/yahoo.c:2718
 msgid "Not At Desk"
 msgstr "筝���婚篏�"
 
-#: src/protocols/yahoo/yahoo.c:2283 src/protocols/yahoo/yahoo.c:2609
+#: src/protocols/yahoo/yahoo.c:2283
+#: src/protocols/yahoo/yahoo.c:2609
 #: src/protocols/yahoo/yahoo.c:2719
 msgid "Not In Office"
 msgstr "筝���商���"
 
-#: src/protocols/yahoo/yahoo.c:2287 src/protocols/yahoo/yahoo.c:2613
+#: src/protocols/yahoo/yahoo.c:2287
+#: src/protocols/yahoo/yahoo.c:2613
 #: src/protocols/yahoo/yahoo.c:2721
 msgid "On Vacation"
 msgstr "羝≦���私�"
 
-#: src/protocols/yahoo/yahoo.c:2291 src/protocols/yahoo/yahoo.c:2617
+#: src/protocols/yahoo/yahoo.c:2291
+#: src/protocols/yahoo/yahoo.c:2617
 #: src/protocols/yahoo/yahoo.c:2723
 msgid "Stepped Out"
 msgstr "莎医�阪サ篋�"
@@ -8503,7 +8639,8 @@
 # NOTE ��箙�茵�ず篏�筝�����荀�����絅遵��糸�ョ�膈�����(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2355 src/protocols/yahoo/yahoo.c:2387
+#: src/protocols/yahoo/yahoo.c:2355
+#: src/protocols/yahoo/yahoo.c:2387
 msgid "Not on server list"
 msgstr "筝���失�������羝���賢"
 
@@ -8546,33 +8683,32 @@
 msgstr "���ュソ��������������紊��..."
 
 #: src/protocols/yahoo/yahoo.c:2916
-msgid ""
-"<b>Sorry, profiles marked as containing adult content are not supported at "
-"this time.</b><br><br>\n"
+msgid "<b>Sorry, profiles marked as containing adult content are not supported at this time.</b><br><br>\n"
 msgstr "<b>絨�筝�莎件�����筝����吓�у�茴����阪��腴ヤ�絎�����篋肴�荐���</b><br><br>\n"
 
 # NOTE 羈������腟���⑮��箙�筝�蕁�ず鐚���茘�����篁ヤ���
-#: src/protocols/yahoo/yahoo.c:2917 src/protocols/yahoo/yahoo.c:2940
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser<br>"
+#: src/protocols/yahoo/yahoo.c:2917
+#: src/protocols/yahoo/yahoo.c:2940
+msgid "If you wish to view this profile, you will need to visit this link in your web browser<br>"
 msgstr "������括��������篋肴�荐�鐚�茫��������頳遵������篁ヤ��g�<br>"
 
 #: src/protocols/yahoo/yahoo.c:2939
-msgid ""
-"<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
+msgid "<b>Sorry, non-English profiles are not supported at this time.</b><br><br>\n"
 msgstr "<b>絨�筝�莎件���������吧�掩������篋肴�荐���</b><br><br>\n"
 
-#: src/protocols/yahoo/yahoo.c:2987 src/protocols/yahoo/yahoo.c:2988
+#: src/protocols/yahoo/yahoo.c:2987
+#: src/protocols/yahoo/yahoo.c:2988
 msgid "Yahoo! ID"
 msgstr "Yahoo! 絽活��"
 
-#: src/protocols/yahoo/yahoo.c:3032 src/protocols/yahoo/yahoo.c:3035
+#: src/protocols/yahoo/yahoo.c:3032
+#: src/protocols/yahoo/yahoo.c:3035
 #: src/protocols/yahoo/yahoo.c:3038
 msgid "Hobbies"
 msgstr "��絅�"
 
-#: src/protocols/yahoo/yahoo.c:3047 src/protocols/yahoo/yahoo.c:3050
+#: src/protocols/yahoo/yahoo.c:3047
+#: src/protocols/yahoo/yahoo.c:3050
 msgid "Latest News"
 msgstr "���井���"
 
@@ -8602,7 +8738,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/yahoo/yahoo.c:3294 src/protocols/yahoo/yahoo.c:3296
+#: src/protocols/yahoo/yahoo.c:3294
+#: src/protocols/yahoo/yahoo.c:3296
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo ��絎�罔∞�"
 
@@ -8627,9 +8764,7 @@
 msgstr "��紊��羝�������恐��"
 
 #: src/protocols/yahoo/yahoo_filexfer.c:200
-msgid ""
-"Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
-"(1,048,576 bytes)."
+msgid "Gaim cannot send files over Yahoo! that are bigger than One Megabyte (1,048,576 bytes)."
 msgstr "Gaim �≧���� Yahoo! �勌��紊ф�� 1MB (104,8576 ��篏���腟�) ��罟�罅���"
 
 #: src/protocols/yahoo/yahoochat.c:198
@@ -8680,7 +8815,8 @@
 msgid "Webcams"
 msgstr "������鎀�"
 
-#: src/protocols/yahoo/yahoochat.c:1360 src/protocols/yahoo/yahoochat.c:1421
+#: src/protocols/yahoo/yahoochat.c:1360
+#: src/protocols/yahoo/yahoochat.c:1421
 msgid "Unable to fetch room list."
 msgstr "�≧���緇���紊��羝�����"
 
@@ -8710,7 +8846,8 @@
 msgid "<br>At %s since %s"
 msgstr "<br>緇� %2$s 莎桁群�� %1$s"
 
-#: src/protocols/zephyr/zephyr.c:831 src/protocols/zephyr/zephyr.c:832
+#: src/protocols/zephyr/zephyr.c:831
+#: src/protocols/zephyr/zephyr.c:832
 msgid "Anyone"
 msgstr "篁私�篋�"
 
@@ -8719,9 +8856,7 @@
 msgstr "綏牙��糸�� Zephyr"
 
 #: src/protocols/zephyr/zephyr.c:858
-msgid ""
-"Because Zephyr uses your system username, you are unable to have multiple "
-"accounts on it when logged in as the same user."
+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 絽恰�句����"
 
 # NOTE �������po罟������������号�鐚���茯��堺�莠�羝�罐�
@@ -8759,7 +8894,8 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/zephyr/zephyr.c:1372 src/protocols/zephyr/zephyr.c:1374
+#: src/protocols/zephyr/zephyr.c:1372
+#: src/protocols/zephyr/zephyr.c:1374
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr ��絎�罔∞�"
 
@@ -8785,10 +8921,10 @@
 msgstr "�乗昆腮�綺�"
 
 # TODO Untranslated
-#. Forbidden
+#  Forbidden
 #: src/proxy.c:955
 msgid "Access denied: proxy server forbids port 80 tunnelling."
-msgstr ""
+msgstr "��腟�絖���鐚�Proxy 篌堺�����罩∫��荐��� 80 ��莖����渇����"
 
 #: src/proxy.c:957
 #, c-format
@@ -8800,11 +8936,8 @@
 msgstr "�≧����篁g��篌堺����┃絎�"
 
 #: src/proxy.c:1696
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"絨��惹��������荐㊤���篁g��篌堺��������箴�茯������腟����篌堺������腮怨���荐������≧����"
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "絨��惹��������荐㊤���篁g��篌堺��������箴�茯������腟����篌堺������腮怨���荐������≧����"
 
 #. * Custom away message.
 #: src/prpl.h:194
@@ -8823,17 +8956,13 @@
 msgstr "茫�莠後�ユ����絲�腆�"
 
 #: src/server.c:962
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "鐚�%d ��荐����"
-msgstr[1] "鐚�%d ��荐����"
-
 #: src/server.c:976
+#, c-format
 msgid "(1 message)"
 msgstr "鐚�筝���荐����"
 
-#: src/server.c:1160 src/server.c:1170
+#: src/server.c:1160
+#: src/server.c:1170
 #, c-format
 msgid "%s logged in."
 msgstr "%s �糸�ャ��"
@@ -8863,7 +8992,8 @@
 msgid "%s became unidle"
 msgstr "%s �演��臀����"
 
-#: src/server.c:1244 src/server.c:1252
+#: src/server.c:1244
+#: src/server.c:1252
 #, c-format
 msgid "%s logged out."
 msgstr "%s �糸�冴��"
@@ -8935,24 +9065,14 @@
 msgid "Unknown."
 msgstr "���ャ��"
 
-#: src/util.c:2074 src/util.c:2079 src/util.c:2084 src/util.c:2087
-msgid "day"
-msgid_plural "days"
-msgstr[0] "��"
-msgstr[1] "��"
-
-#: src/util.c:2075 src/util.c:2079 src/util.c:2093 src/util.c:2095
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "絨��"
-msgstr[1] "鎞��"
-
-#: src/util.c:2075 src/util.c:2084 src/util.c:2093 src/util.c:2098
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "��"
-msgstr[1] "��"
-
+#: src/util.c:2074
+#: src/util.c:2079
+#: src/util.c:2084
+#: src/util.c:2087
+#: src/util.c:2075
+#: src/util.c:2093
+#: src/util.c:2095
+#: src/util.c:2098
 #: src/util.c:2430
 msgid "g003: Error opening connection.\n"
 msgstr "g003: ������������\n"
@@ -8968,3 +9088,4 @@
 #: src/win32/win32dep.c:277
 msgid "Notification"
 msgstr "����"
+