changeset 15798:ab9aada65ac2

one more to the many I neglected and committed a commit ago. hopefully I did not forget to mtn add any of the new files or forget to put them in configure.ac
author Luke Schierer <lschiere@pidgin.im>
date Sun, 18 Mar 2007 02:23:48 +0000 (2007-03-18)
parents 52a044731fbe
children d8f98ce1cef0
files po/zh_TW.po
diffstat 1 files changed, 2301 insertions(+), 2041 deletions(-) [+]
line wrap: on
line diff
--- a/po/zh_TW.po	Sun Mar 18 01:13:36 2007 +0000
+++ b/po/zh_TW.po	Sun Mar 18 02:23:48 2007 +0000
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2006, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the Gaim package.
-# $InternalId: zh_TW.po,v 1.426 2006/11/24 03:12:10 acli Exp $
+# $InternalId: zh_TW.po,v 1.435 2007/01/14 03:25:01 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -49,14 +49,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 2.0.0\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-11-23 00:00-0500\n"
-"PO-Revision-Date: 2006-11-23 22:11-0500\n"
-"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>\n"
+"PO-Revision-Date: 2007-03-17 11:55+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"
-"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../gaim.desktop.in.h:1
@@ -71,10 +71,14 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "����霢���荐���絎��守���恰��荐���"
 
-#: ../console/gntaccount.c:119 ../console/gntblist.c:271
-#: ../console/gntblist.c:389 ../console/gntblist.c:402
-#: ../console/gntplugin.c:169 ../console/gntplugin.c:214
-#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
+#: ../console/gntaccount.c:119
+#: ../console/gntblist.c:271
+#: ../console/gntblist.c:389
+#: ../console/gntblist.c:402
+#: ../console/gntplugin.c:169
+#: ../console/gntplugin.c:214
+#: ../console/gntstatus.c:291
+#: ../console/gntstatus.c:299
 #: ../libgaim/protocols/jabber/buddy.c:1366
 #: ../libgaim/protocols/jabber/chat.c:677
 #: ../libgaim/protocols/jabber/chat.c:688
@@ -93,15 +97,19 @@
 msgid "Screenname of an account must be non-empty."
 msgstr "絽活��筝�����腥冴��"
 
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:559
+#: ../console/gntaccount.c:423
+#: ../gtk/gtkaccount.c:559
 msgid "New mail notifications"
 msgstr "�育�灸散����"
 
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:488
+#: ../console/gntaccount.c:433
+#: ../gtk/gtkaccount.c:488
 msgid "Remember password"
 msgstr "荐�篏鎛�腆�"
 
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1405 ../gtk/gtkblist.c:3801
+#: ../console/gntaccount.c:474
+#: ../gtk/gtkaccount.c:1405
+#: ../gtk/gtkblist.c:3801
 msgid "Modify Account"
 msgstr "篆��劫験��"
 
@@ -110,52 +118,88 @@
 msgid "New Account"
 msgstr "�医験��"
 
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:400 ../gtk/gtkft.c:695
+#: ../console/gntaccount.c:500
+#: ../gtk/gtkaccount.c:400
+#: ../gtk/gtkft.c:695
 msgid "Protocol:"
 msgstr "��荐���絎�鐚�"
 
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:405 ../gtk/gtkblist.c:5029
+#: ../console/gntaccount.c:508
+#: ../gtk/gtkaccount.c:405
+#: ../gtk/gtkblist.c:5029
 #: ../gtk/plugins/gevolution/new_person_dialog.c:295
 msgid "Screen name:"
 msgstr "絽活��鐚�"
 
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:479
+#: ../console/gntaccount.c:521
+#: ../gtk/gtkaccount.c:479
 msgid "Password:"
 msgstr "絲�腆種�"
 
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5050 ../gtk/gtkblist.c:5412
+#: ../console/gntaccount.c:531
+#: ../gtk/gtkblist.c:5050
+#: ../gtk/gtkblist.c:5412
 msgid "Alias:"
 msgstr "�ュ��鐚�"
 
 #. Cancel
-#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:312
-#: ../console/gntblist.c:379 ../console/gntblist.c:412
-#: ../console/gntblist.c:741 ../console/gntblist.c:910
-#: ../console/gntblist.c:1001 ../console/gntblist.c:2000
-#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:471 ../console/gntstatus.c:596
-#: ../gtk/gtkaccount.c:1841 ../gtk/gtkaccount.c:2360 ../gtk/gtkblist.c:5468
-#: ../gtk/gtkdialogs.c:683 ../gtk/gtkdialogs.c:820 ../gtk/gtkdialogs.c:911
-#: ../gtk/gtkdialogs.c:930 ../gtk/gtkdialogs.c:952 ../gtk/gtkdialogs.c:972
-#: ../gtk/gtkdialogs.c:1016 ../gtk/gtkdialogs.c:1054 ../gtk/gtkdialogs.c:1108
-#: ../gtk/gtkdialogs.c:1145 ../gtk/gtkdialogs.c:1170
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:296
-#: ../gtk/gtkpounce.c:1092 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
-#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:296 ../libgaim/account.c:959
-#: ../libgaim/account.c:1130 ../libgaim/account.c:1164
-#: ../libgaim/conversation.c:1164 ../libgaim/protocols/gg/gg.c:498
-#: ../libgaim/protocols/gg/gg.c:656 ../libgaim/protocols/gg/gg.c:792
-#: ../libgaim/protocols/gg/gg.c:871 ../libgaim/protocols/jabber/buddy.c:588
+#: ../console/gntaccount.c:554
+#: ../console/gntaccount.c:615
+#: ../console/gntaccount.c:834
+#: ../console/gntblist.c:312
+#: ../console/gntblist.c:379
+#: ../console/gntblist.c:412
+#: ../console/gntblist.c:741
+#: ../console/gntblist.c:910
+#: ../console/gntblist.c:1001
+#: ../console/gntblist.c:2000
+#: ../console/gntprefs.c:224
+#: ../console/gntstatus.c:139
+#: ../console/gntstatus.c:471
+#: ../console/gntstatus.c:596
+#: ../gtk/gtkaccount.c:1841
+#: ../gtk/gtkaccount.c:2360
+#: ../gtk/gtkblist.c:5468
+#: ../gtk/gtkdialogs.c:683
+#: ../gtk/gtkdialogs.c:820
+#: ../gtk/gtkdialogs.c:911
+#: ../gtk/gtkdialogs.c:930
+#: ../gtk/gtkdialogs.c:952
+#: ../gtk/gtkdialogs.c:972
+#: ../gtk/gtkdialogs.c:1016
+#: ../gtk/gtkdialogs.c:1054
+#: ../gtk/gtkdialogs.c:1108
+#: ../gtk/gtkdialogs.c:1145
+#: ../gtk/gtkdialogs.c:1170
+#: ../gtk/gtkimhtmltoolbar.c:419
+#: ../gtk/gtkplugin.c:296
+#: ../gtk/gtkpounce.c:1092
+#: ../gtk/gtkprivacy.c:566
+#: ../gtk/gtkprivacy.c:579
+#: ../gtk/gtkprivacy.c:604
+#: ../gtk/gtkprivacy.c:615
+#: ../gtk/gtkrequest.c:270
+#: ../gtk/gtksavedstatuses.c:296
+#: ../libgaim/account.c:959
+#: ../libgaim/account.c:1130
+#: ../libgaim/account.c:1164
+#: ../libgaim/conversation.c:1164
+#: ../libgaim/protocols/gg/gg.c:498
+#: ../libgaim/protocols/gg/gg.c:656
+#: ../libgaim/protocols/gg/gg.c:792
+#: ../libgaim/protocols/gg/gg.c:871
+#: ../libgaim/protocols/jabber/buddy.c:588
 #: ../libgaim/protocols/jabber/buddy.c:1728
 #: ../libgaim/protocols/jabber/buddy.c:1762
 #: ../libgaim/protocols/jabber/chat.c:780
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:1358
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:251
-#: ../libgaim/protocols/msn/msn.c:266 ../libgaim/protocols/msn/msn.c:281
-#: ../libgaim/protocols/msn/msn.c:296 ../libgaim/protocols/msn/msn.c:313
+#: ../libgaim/protocols/jabber/xdata.c:338
+#: ../libgaim/protocols/msn/msn.c:251
+#: ../libgaim/protocols/msn/msn.c:266
+#: ../libgaim/protocols/msn/msn.c:281
+#: ../libgaim/protocols/msn/msn.c:296
+#: ../libgaim/protocols/msn/msn.c:313
 #: ../libgaim/protocols/oscar/oscar.c:1391
 #: ../libgaim/protocols/oscar/oscar.c:2155
 #: ../libgaim/protocols/oscar/oscar.c:2194
@@ -169,13 +213,16 @@
 #: ../libgaim/protocols/oscar/peer.c:991
 #: ../libgaim/protocols/qq/buddy_info.c:482
 #: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
+#: ../libgaim/protocols/qq/buddy_opt.c:402
+#: ../libgaim/protocols/qq/group.c:124
 #: ../libgaim/protocols/qq/group_join.c:138
 #: ../libgaim/protocols/qq/group_join.c:359
 #: ../libgaim/protocols/qq/group_opt.c:142
-#: ../libgaim/protocols/qq/group_opt.c:392 ../libgaim/protocols/qq/qq.c:461
+#: ../libgaim/protocols/qq/group_opt.c:392
+#: ../libgaim/protocols/qq/qq.c:461
 #: ../libgaim/protocols/qq/sendqueue.c:203
-#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
+#: ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159
 #: ../libgaim/protocols/qq/sys_msg.c:247
 #: ../libgaim/protocols/sametime/sametime.c:3399
 #: ../libgaim/protocols/sametime/sametime.c:3484
@@ -185,24 +232,33 @@
 #: ../libgaim/protocols/sametime/sametime.c:5615
 #: ../libgaim/protocols/silc/buddy.c:467
 #: ../libgaim/protocols/silc/buddy.c:1078
-#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1910
-#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
+#: ../libgaim/protocols/silc/buddy.c:1183
+#: ../libgaim/protocols/silc/chat.c:597
+#: ../libgaim/protocols/silc/chat.c:726
+#: ../libgaim/protocols/silc/ops.c:1910
+#: ../libgaim/protocols/silc/silc.c:750
+#: ../libgaim/protocols/silc/silc.c:955
 #: ../libgaim/protocols/yahoo/yahoo.c:3214
-#: ../libgaim/protocols/yahoo/yahoo.c:3223 ../libgaim/request.h:1344
+#: ../libgaim/protocols/yahoo/yahoo.c:3223
+#: ../libgaim/request.h:1344
 #: ../libgaim/request.h:1354
 msgid "Cancel"
 msgstr "��羔�"
 
 #. Save
-#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:474 ../console/gntstatus.c:584 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1163
+#: ../console/gntaccount.c:558
+#: ../console/gntprefs.c:224
+#: ../console/gntstatus.c:474
+#: ../console/gntstatus.c:584
+#: ../gtk/gtkdebug.c:762
+#: ../gtk/gtkrequest.c:276
+#: ../libgaim/account.c:1163
 #: ../libgaim/protocols/jabber/buddy.c:587
 msgid "Save"
 msgstr "�峨�"
 
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1835
+#: ../console/gntaccount.c:610
+#: ../gtk/gtkaccount.c:1835
 #: ../gtk/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
@@ -213,15 +269,22 @@
 msgid "Delete Account"
 msgstr "���ゅ験��"
 
-#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
-#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1840 ../gtk/gtkpounce.c:1091 ../gtk/gtkrequest.c:273
+#: ../console/gntaccount.c:615
+#: ../console/gntaccount.c:681
+#: ../console/gntstatus.c:139
+#: ../console/gntstatus.c:201
+#: ../gtk/gtkaccount.c:1840
+#: ../gtk/gtkpounce.c:1091
+#: ../gtk/gtkrequest.c:273
 #: ../gtk/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "����"
 
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1921
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2192 ../gtk/gtkdocklet.c:543
+#: ../console/gntaccount.c:644
+#: ../console/gntblist.c:1921
+#: ../console/gntui.c:70
+#: ../gtk/gtkaccount.c:2192
+#: ../gtk/gtkdocklet.c:543
 msgid "Accounts"
 msgstr "絽活��羝���"
 
@@ -229,13 +292,21 @@
 msgid "You can enable/disable accounts from the following list."
 msgstr "篁ヤ���茵���絽活�������������������"
 
-#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:312 ../console/gntblist.c:379
-#: ../console/gntblist.c:412 ../console/gntnotify.c:306
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2359 ../gtk/gtkblist.c:5467
-#: ../gtk/gtkconv.c:1634 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/oscar/oscar.c:2433
-#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
+#: ../console/gntaccount.c:673
+#: ../console/gntaccount.c:833
+#: ../console/gntblist.c:312
+#: ../console/gntblist.c:379
+#: ../console/gntblist.c:412
+#: ../console/gntnotify.c:306
+#: ../console/gntstatus.c:191
+#: ../gtk/gtkaccount.c:2359
+#: ../gtk/gtkblist.c:5467
+#: ../gtk/gtkconv.c:1634
+#: ../gtk/gtkrequest.c:274
+#: ../libgaim/protocols/gg/gg.c:870
+#: ../libgaim/protocols/oscar/oscar.c:2433
+#: ../libgaim/protocols/qq/sys_msg.c:104
+#: ../libgaim/protocols/qq/sys_msg.c:159
 #: ../libgaim/protocols/qq/sys_msg.c:247
 #: ../libgaim/protocols/sametime/sametime.c:5490
 #: ../libgaim/protocols/silc/chat.c:596
@@ -246,12 +317,14 @@
 msgid "Modify"
 msgstr "篆���"
 
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2308
+#: ../console/gntaccount.c:758
+#: ../gtk/gtkaccount.c:2308
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s ���ヤ� %s �坂�鐚�絅刻���絅遵� %s%s"
 
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2357
+#: ../console/gntaccount.c:831
+#: ../gtk/gtkaccount.c:2357
 msgid "Add buddy to your list?"
 msgstr "絨�篏睡�������ユ����絅遵�羝����"
 
@@ -271,30 +344,43 @@
 msgid "Error adding buddy"
 msgstr "�医�絅遵���筝㊦�主��篋����"
 
-#: ../console/gntblist.c:296 ../gtk/gtkaccount.c:1904
-#: ../gtk/gtksavedstatuses.c:893 ../libgaim/protocols/oscar/oscar.c:2807
+#: ../console/gntblist.c:296
+#: ../gtk/gtkaccount.c:1904
+#: ../gtk/gtksavedstatuses.c:893
+#: ../libgaim/protocols/oscar/oscar.c:2807
 msgid "Screen Name"
 msgstr "絽活��"
 
-#: ../console/gntblist.c:299 ../console/gntblist.c:371 ../gtk/gtkdialogs.c:929
-#: ../gtk/gtkdialogs.c:951 ../gtk/gtkdialogs.c:971 ../gtk/gtkrequest.c:277
+#: ../console/gntblist.c:299
+#: ../console/gntblist.c:371
+#: ../gtk/gtkdialogs.c:929
+#: ../gtk/gtkdialogs.c:951
+#: ../gtk/gtkdialogs.c:971
+#: ../gtk/gtkrequest.c:277
 #: ../libgaim/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "�ュ��"
 
-#: ../console/gntblist.c:302 ../console/gntblist.c:374
+#: ../console/gntblist.c:302
+#: ../console/gntblist.c:374
 msgid "Group"
 msgstr "臂ょ�"
 
-#: ../console/gntblist.c:305 ../console/gntblist.c:362
-#: ../console/gntnotify.c:155 ../console/gntstatus.c:562
-#: ../gtk/gtknotify.c:402 ../gtk/gtkpounce.c:1259
-#: ../gtk/plugins/gevolution/gevolution.c:444 ../libgaim/plugins/idle.c:153
+#: ../console/gntblist.c:305
+#: ../console/gntblist.c:362
+#: ../console/gntnotify.c:155
+#: ../console/gntstatus.c:562
+#: ../gtk/gtknotify.c:402
+#: ../gtk/gtkpounce.c:1259
+#: ../gtk/plugins/gevolution/gevolution.c:444
+#: ../libgaim/plugins/idle.c:153
 #: ../libgaim/plugins/idle.c:189
 msgid "Account"
 msgstr "絽活��"
 
-#: ../console/gntblist.c:311 ../console/gntblist.c:788 ../gtk/gtkblist.c:4983
+#: ../console/gntblist.c:311
+#: ../console/gntblist.c:788
+#: ../gtk/gtkblist.c:4983
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
 #: ../libgaim/protocols/silc/buddy.c:736
 #: ../libgaim/protocols/silc/buddy.c:1030
@@ -309,7 +395,8 @@
 msgid "Please enter buddy information."
 msgstr "茫�莠後�ュソ����莖�荐���"
 
-#: ../console/gntblist.c:334 ../libgaim/blist.c:1195
+#: ../console/gntblist.c:334
+#: ../libgaim/blist.c:1195
 msgid "Chats"
 msgstr "��紊�"
 
@@ -318,16 +405,22 @@
 #. Contact Info
 #. Personal
 #. Business
-#: ../console/gntblist.c:368 ../gtk/gtkplugin.c:589 ../gtk/gtkroomlist.c:600
+#: ../console/gntblist.c:368
+#: ../gtk/gtkplugin.c:589
+#: ../gtk/gtkroomlist.c:600
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
 #: ../gtk/plugins/gevolution/assoc-buddy.c:123
 #: ../libgaim/protocols/jabber/jabber.c:789
-#: ../libgaim/protocols/msn/msn.c:1533 ../libgaim/protocols/msn/msn.c:1586
-#: ../libgaim/protocols/msn/msn.c:1608 ../libgaim/protocols/qq/buddy_info.c:44
+#: ../libgaim/protocols/msn/msn.c:1533
+#: ../libgaim/protocols/msn/msn.c:1586
+#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libgaim/protocols/qq/buddy_info.c:44
 msgid "Name"
 msgstr "��腮�"
 
-#: ../console/gntblist.c:377 ../console/gntblist.c:790 ../gtk/gtkblist.c:5358
+#: ../console/gntblist.c:377
+#: ../console/gntblist.c:790
+#: ../gtk/gtkblist.c:5358
 msgid "Add Chat"
 msgstr "�医���紊��"
 
@@ -335,7 +428,8 @@
 msgid "You can edit more information from the context menu later."
 msgstr "絋���荀�膵主�篆��劫�銀�膣亥�鐚�茫���辱蕁��後����"
 
-#: ../console/gntblist.c:389 ../console/gntblist.c:402
+#: ../console/gntblist.c:389
+#: ../console/gntblist.c:402
 msgid "Error adding group"
 msgstr "�医�臂ょ���筝㊦�主��篋����"
 
@@ -348,7 +442,9 @@
 msgstr "�e��臂ょ�綏牙�絖���"
 
 # TODO 茫�荀��ユ�後�鐚��������ャ���������医���?
-#: ../console/gntblist.c:410 ../console/gntblist.c:792 ../gtk/gtkblist.c:5464
+#: ../console/gntblist.c:410
+#: ../console/gntblist.c:792
+#: ../gtk/gtkblist.c:5464
 #: ../libgaim/protocols/sametime/sametime.c:5401
 #: ../libgaim/protocols/sametime/sametime.c:5488
 msgid "Add Group"
@@ -368,7 +464,8 @@
 msgstr "茫�����荀��贋�井�篏��х��莖�荐���"
 
 # TODO 荀�荀��� - 20061025
-#: ../console/gntblist.c:741 ../console/gntstatus.c:196
+#: ../console/gntblist.c:741
+#: ../console/gntstatus.c:196
 msgid "Edit"
 msgstr "篆���"
 
@@ -381,7 +478,8 @@
 msgid "Edit Settings"
 msgstr "篆��壕┃絎�"
 
-#: ../console/gntblist.c:810 ../libgaim/protocols/silc/chat.c:878
+#: ../console/gntblist.c:810
+#: ../libgaim/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "��緇�莖�荐�"
 
@@ -389,7 +487,8 @@
 msgid "Add Buddy Pounce"
 msgstr "���ュソ����������"
 
-#: ../console/gntblist.c:822 ../gtk/gtkconv.c:1582
+#: ../console/gntblist.c:822
+#: ../gtk/gtkconv.c:1582
 #: ../libgaim/protocols/oscar/oscar.c:617
 msgid "Send File"
 msgstr "�渇��罟�罅�"
@@ -403,7 +502,8 @@
 msgid "Please enter the new name for %s"
 msgstr "茫�莠後�� %s ���医�腆�"
 
-#: ../console/gntblist.c:908 ../console/gntblist.c:909
+#: ../console/gntblist.c:908
+#: ../console/gntblist.c:909
 #: ../console/gntblist.c:1117
 msgid "Rename"
 msgstr "���遵��"
@@ -431,15 +531,21 @@
 msgid "Confirm Remove"
 msgstr "腆肴�腱脂��"
 
-#: ../console/gntblist.c:1000 ../console/gntblist.c:1119
-#: ../gtk/gtkblist.c:1036 ../gtk/gtkconv.c:1631 ../gtk/gtkrequest.c:275
+#: ../console/gntblist.c:1000
+#: ../console/gntblist.c:1119
+#: ../gtk/gtkblist.c:1036
+#: ../gtk/gtkconv.c:1631
+#: ../gtk/gtkrequest.c:275
 #: ../gtk/gtkstatusbox.c:245
 msgid "Remove"
 msgstr "腱脂��"
 
 #. Buddy List
-#: ../console/gntblist.c:1094 ../console/gntblist.c:2067
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:3969
+#: ../console/gntblist.c:1094
+#: ../console/gntblist.c:2067
+#: ../console/gntprefs.c:219
+#: ../console/gntui.c:71
+#: ../gtk/gtkblist.c:3969
 #: ../gtk/plugins/win32/winprefs/winprefs.c:327
 msgid "Buddy List"
 msgstr "絅遵�羝���"
@@ -455,7 +561,8 @@
 msgid "Toggle Tag"
 msgstr "����罔�荐�"
 
-#: ../console/gntblist.c:1156 ../console/gntblist.c:1275
+#: ../console/gntblist.c:1156
+#: ../console/gntblist.c:1275
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "絽活��鐚�%s (%s)"
@@ -469,7 +576,8 @@
 "\n"
 "��臀��%s"
 
-#: ../console/gntblist.c:1238 ../console/gntblist.c:1254
+#: ../console/gntblist.c:1238
+#: ../console/gntblist.c:1254
 #, c-format
 msgid "Nickname: %s\n"
 msgstr "�援┗鐚�%s\n"
@@ -493,54 +601,75 @@
 "<b>��緇�荀��逸�</b>%s��"
 
 # XXX check
-#: ../console/gntblist.c:1536 ../gtk/gtkdocklet.c:491
+#: ../console/gntblist.c:1536
+#: ../gtk/gtkdocklet.c:491
 #: ../gtk/gtkstatusbox.c:1008
 msgid "New..."
 msgstr "�医�..."
 
 # NOTE �����綏�������鐚�����綏峨�峨���(Saved) ����������:P
 # NOTE 筝�筝�����筝�篋�絽悟��(?)�����������医���鐚��医�筝�������鐚�鐚�綵��榊��荀�腦�箙������医���鐚����醇��荅峨ù������筝�荀純������������羝�����筝�蕁�������
-#: ../console/gntblist.c:1543 ../gtk/gtkdocklet.c:492
+#: ../console/gntblist.c:1543
+#: ../gtk/gtkdocklet.c:492
 #: ../gtk/gtkstatusbox.c:1009
 msgid "Saved..."
 msgstr "����羝���..."
 
-#: ../console/gntblist.c:1889 ../console/gntplugin.c:231 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:538
+#: ../console/gntblist.c:1889
+#: ../console/gntplugin.c:231
+#: ../console/gntui.c:73
+#: ../gtk/gtkdocklet.c:544
+#: ../gtk/gtkplugin.c:538
 msgid "Plugins"
 msgstr "罔∞�羝���"
 
 # NOTE ���処⑮����腮宴��鐚����阪����茹d���篋阪��������罔∞���腮宴��
-#: ../console/gntblist.c:1981 ../gtk/gtkdialogs.c:664 ../gtk/gtkdialogs.c:801
+#: ../console/gntblist.c:1981
+#: ../gtk/gtkdialogs.c:664
+#: ../gtk/gtkdialogs.c:801
 #: ../gtk/gtkdialogs.c:881
 msgid "_Name"
 msgstr "��腮�(_N)"
 
-#: ../console/gntblist.c:1986 ../gtk/gtkdialogs.c:669 ../gtk/gtkdialogs.c:806
+#: ../console/gntblist.c:1986
+#: ../gtk/gtkdialogs.c:669
+#: ../gtk/gtkdialogs.c:806
 #: ../gtk/gtkdialogs.c:886
 msgid "_Account"
 msgstr "絽活��(_A)"
 
-#: ../console/gntblist.c:1994 ../gtk/gtkdialogs.c:677
+#: ../console/gntblist.c:1994
+#: ../gtk/gtkdialogs.c:677
 msgid "New Instant Message"
 msgstr "�医�恰��荐���"
 
-#: ../console/gntblist.c:1996 ../gtk/gtkdialogs.c:679
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+#: ../console/gntblist.c:1996
+#: ../gtk/gtkdialogs.c:679
+msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "茫�莠後�ユ�����活��守���恰��荐����莟∞��絽活����"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../console/gntblist.c:1999 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3800
-#: ../gtk/gtkdialogs.c:682 ../gtk/gtkdialogs.c:819 ../gtk/gtkdialogs.c:910
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:958 ../libgaim/account.c:1129
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1357
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:250
-#: ../libgaim/protocols/msn/msn.c:265 ../libgaim/protocols/msn/msn.c:280
-#: ../libgaim/protocols/msn/msn.c:295 ../libgaim/protocols/oscar/oscar.c:1390
+#: ../console/gntblist.c:1999
+#: ../console/gntnotify.c:79
+#: ../gtk/gtkblist.c:3800
+#: ../gtk/gtkdialogs.c:682
+#: ../gtk/gtkdialogs.c:819
+#: ../gtk/gtkdialogs.c:910
+#: ../gtk/gtkrequest.c:269
+#: ../libgaim/account.c:958
+#: ../libgaim/account.c:1129
+#: ../libgaim/protocols/gg/gg.c:497
+#: ../libgaim/protocols/gg/gg.c:655
+#: ../libgaim/protocols/gg/gg.c:791
+#: ../libgaim/protocols/jabber/jabber.c:1357
+#: ../libgaim/protocols/jabber/xdata.c:337
+#: ../libgaim/protocols/msn/msn.c:250
+#: ../libgaim/protocols/msn/msn.c:265
+#: ../libgaim/protocols/msn/msn.c:280
+#: ../libgaim/protocols/msn/msn.c:295
+#: ../libgaim/protocols/oscar/oscar.c:1390
 #: ../libgaim/protocols/oscar/oscar.c:2154
 #: ../libgaim/protocols/oscar/oscar.c:2241
 #: ../libgaim/protocols/oscar/oscar.c:5753
@@ -548,17 +677,22 @@
 #: ../libgaim/protocols/oscar/oscar.c:5982
 #: ../libgaim/protocols/oscar/oscar.c:6038
 #: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1909
+#: ../libgaim/protocols/silc/buddy.c:1182
+#: ../libgaim/protocols/silc/chat.c:424
+#: ../libgaim/protocols/silc/chat.c:462
+#: ../libgaim/protocols/silc/chat.c:725
+#: ../libgaim/protocols/silc/ops.c:1297
+#: ../libgaim/protocols/silc/ops.c:1909
 #: ../libgaim/protocols/silc/silc.c:749
 #: ../libgaim/protocols/yahoo/yahoo.c:3213
-#: ../libgaim/protocols/yahoo/yahoo.c:3222 ../libgaim/request.h:1344
+#: ../libgaim/protocols/yahoo/yahoo.c:3222
+#: ../libgaim/request.h:1344
 msgid "OK"
 msgstr "腆阪�"
 
 #. Create the "Options" frame.
-#: ../console/gntblist.c:2018 ../gtk/gtkpounce.c:770
+#: ../console/gntblist.c:2018
+#: ../gtk/gtkpounce.c:770
 msgid "Options"
 msgstr "�檎��"
 
@@ -602,7 +736,9 @@
 "%s ��筝������腟���篋��g�鐚�\n"
 "%s"
 
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3798 ../libgaim/account.c:986
+#: ../console/gntconn.c:43
+#: ../gtk/gtkblist.c:3798
+#: ../libgaim/account.c:986
 #: ../libgaim/connection.c:107
 msgid "Connection Error"
 msgstr "�g����"
@@ -611,23 +747,28 @@
 msgid "No such command."
 msgstr "�≧④��篁ゃ��"
 
-#: ../console/gntconv.c:75 ../gtk/gtkconv.c:493
+#: ../console/gntconv.c:75
+#: ../gtk/gtkconv.c:493
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "茯�羈����鐚�莠後�ョ�����後��惹��篁ゆ���������御�檎���"
 
-#: ../console/gntconv.c:80 ../gtk/gtkconv.c:498
+#: ../console/gntconv.c:80
+#: ../gtk/gtkconv.c:498
 msgid "Your command failed for an unknown reason."
 msgstr "��鋌ゅ�決�紊掩��鐚�����筝�����"
 
-#: ../console/gntconv.c:85 ../gtk/gtkconv.c:504
+#: ../console/gntconv.c:85
+#: ../gtk/gtkconv.c:504
 msgid "That command only works in chats, not IMs."
 msgstr "������篁ゅÛ����紊���ф����鐚����恰��荐���賢�≧����"
 
-#: ../console/gntconv.c:88 ../gtk/gtkconv.c:507
+#: ../console/gntconv.c:88
+#: ../gtk/gtkconv.c:507
 msgid "That command only works in IMs, not chats."
 msgstr "������篁ゅÛ���恰��荐���賢����鐚�����紊���х�≧����"
 
-#: ../console/gntconv.c:92 ../gtk/gtkconv.c:511
+#: ../console/gntconv.c:92
+#: ../gtk/gtkconv.c:511
 msgid "That command doesn't work on this protocol."
 msgstr "������篁ゅ��������荐���絎��х�≧����"
 
@@ -656,15 +797,18 @@
 msgid "List of users:\n"
 msgstr "篏睡������茵��\n"
 
-#: ../console/gntconv.c:567 ../gtk/gtkconv.c:386
+#: ../console/gntconv.c:567
+#: ../gtk/gtkconv.c:386
 msgid "Supported debug options are:  version"
 msgstr "��吡���ら���檎����鐚�version"
 
-#: ../console/gntconv.c:602 ../gtk/gtkconv.c:422
+#: ../console/gntconv.c:602
+#: ../gtk/gtkconv.c:422
 msgid "No such command (in this context)."
 msgstr "羃���������篁わ�������茖鋎睡���"
 
-#: ../console/gntconv.c:605 ../gtk/gtkconv.c:425
+#: ../console/gntconv.c:605
+#: ../gtk/gtkconv.c:425
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -672,28 +816,29 @@
 "荀��峨���筝���篁ょ��茯����莠後�ャ��/help &lt;��篁�&gt;���喝���\n"
 "����茖����������篁ゆ��鐚�\n"
 
-#: ../console/gntconv.c:644 ../gtk/gtkconv.c:6737
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
+#: ../console/gntconv.c:644
+#: ../gtk/gtkconv.c:6737
+msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;荐���&gt;鐚�絨���絎���荐����倶��筝������③絽檎���削������句�堺��篁よ������"
 
-#: ../console/gntconv.c:647 ../gtk/gtkconv.c:6740
+#: ../console/gntconv.c:647
+#: ../gtk/gtkconv.c:6740
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;荀��決�����篏�&gt;鐚�罔>賛IRC鐚��決�筝�����篏���"
 
-#: ../console/gntconv.c:650 ../gtk/gtkconv.c:6743
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
+#: ../console/gntconv.c:650
+#: ../gtk/gtkconv.c:6743
+msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "debug &lt;�檎��&gt;鐚���������篋よ����坂�篋��ら���荐���"
 
 # XXX
-#: ../console/gntconv.c:653 ../gtk/gtkconv.c:6746
+#: ../console/gntconv.c:653
+#: ../gtk/gtkconv.c:6746
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear鐚�羝�腥坂困茫������牙粂茵���"
 
-#: ../console/gntconv.c:656 ../gtk/gtkconv.c:6749
+#: ../console/gntconv.c:656
+#: ../gtk/gtkconv.c:6749
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;��篁�&gt;鐚�蕁�ず��筝���篁ょ��茯�����"
 
@@ -722,7 +867,9 @@
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses鐚���綏峨�峨���������荀�腦�"
 
-#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
+#: ../console/gntdebug.c:214
+#: ../console/gntui.c:72
+#: ../gtk/gtkdebug.c:708
 msgid "Debug Window"
 msgstr "�ら���腦�"
 
@@ -730,15 +877,19 @@
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
+#: ../console/gntdebug.c:235
+#: ../gtk/gtkdebug.c:767
 msgid "Clear"
 msgstr "羝���"
 
-#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
+#: ../console/gntdebug.c:240
+#: ../gtk/gtkdebug.c:776
 msgid "Pause"
 msgstr "����"
 
-#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
+#: ../console/gntdebug.c:245
+#: ../gtk/gtkdebug.c:783
+#: ../gtk/gtkdebug.c:784
 msgid "Timestamps"
 msgstr "�����活�"
 
@@ -773,24 +924,30 @@
 msgstr "�糸��灸散"
 
 # XXX 荀�荀���
-#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+#: ../console/gntnotify.c:152
+#: ../console/gntnotify.c:206
 msgid "You have mail!"
 msgstr "���九�育�灸散鐚�"
 
 # FIXME check - 20061025
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:414
+#: ../console/gntnotify.c:155
+#: ../gtk/gtknotify.c:414
 #: ../libgaim/protocols/jabber/jabber.c:1153
 msgid "From"
 msgstr "綏画�茘�絨���"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:423
+#: ../console/gntnotify.c:155
+#: ../gtk/gtknotify.c:423
 msgid "Subject"
 msgstr "筝脂�"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:193
-#: ../console/gntplugin.c:274 ../console/gntstatus.c:206
-#: ../gtk/gtkrequest.c:272 ../libgaim/protocols/msn/msn.c:357
+#: ../console/gntnotify.c:163
+#: ../console/gntplugin.c:193
+#: ../console/gntplugin.c:274
+#: ../console/gntstatus.c:206
+#: ../gtk/gtkrequest.c:272
+#: ../libgaim/protocols/msn/msn.c:357
 #: ../libgaim/protocols/silc/util.c:377
 msgid "Close"
 msgstr "����"
@@ -802,17 +959,20 @@
 msgstr[0] "%s (%s) �� %d 絨��育�灸散��"
 msgstr[1] "%s (%s) �� %d 絨��育�灸散��"
 
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:332
+#: ../console/gntnotify.c:206
+#: ../gtk/gtknotify.c:332
 msgid "New Mail"
 msgstr "�育�灸散"
 
-#: ../console/gntnotify.c:229 ../gtk/gtknotify.c:849
+#: ../console/gntnotify.c:229
+#: ../gtk/gtknotify.c:849
 #: ../libgaim/protocols/oscar/oscar.c:2614
 #, c-format
 msgid "Info for %s"
 msgstr "%s ��莖�荐�"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:850
+#: ../console/gntnotify.c:230
+#: ../gtk/gtknotify.c:850
 #: ../libgaim/protocols/toc/toc.c:476
 msgid "Buddy Information"
 msgstr "絅遵�莖�荐�"
@@ -824,11 +984,14 @@
 # XXX��Info����篏���室箙����緇�篏睡����莖�荐�鐚�篏�筝����鐚���篋��銀�po罟�篁������������藝�
 # XXX javajsp (Ka-Hing CHEUNG) 荀�������Info����膣����醇������緇�篏睡����莖�荐���
 # XXX 羈���上�� (2.0.0b4) 筝����鐚��ら���腦�������疹腮�綺���腴�����Info��鐚�莖�荐�鐚�膣��モ����
-#: ../console/gntnotify.c:309 ../gtk/gtkconv.c:1610 ../gtk/gtkdebug.c:862
+#: ../console/gntnotify.c:309
+#: ../gtk/gtkconv.c:1610
+#: ../gtk/gtkdebug.c:862
 msgid "Info"
 msgstr "莖�荐�"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1571
+#: ../console/gntnotify.c:312
+#: ../gtk/gtkconv.c:1571
 msgid "IM"
 msgstr "�恰��荐���"
 
@@ -836,7 +999,8 @@
 msgid "Join"
 msgstr "����"
 
-#: ../console/gntnotify.c:318 ../libgaim/protocols/sametime/sametime.c:3483
+#: ../console/gntnotify.c:318
+#: ../libgaim/protocols/sametime/sametime.c:3483
 msgid "Invite"
 msgstr "��茫�"
 
@@ -919,16 +1083,22 @@
 msgstr "荐��������������壕�"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1909
+#: ../console/gntprefs.c:220
+#: ../gtk/gtkprefs.c:898
+#: ../gtk/gtkprefs.c:1909
 #: ../gtk/plugins/win32/winprefs/winprefs.c:341
 msgid "Conversations"
 msgstr "篋よ�"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1349 ../gtk/gtkprefs.c:1920
+#: ../console/gntprefs.c:221
+#: ../gtk/gtkprefs.c:1349
+#: ../gtk/gtkprefs.c:1920
 msgid "Logging"
 msgstr "�ヨ�"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
+#: ../console/gntprefs.c:223
+#: ../console/gntui.c:74
+#: ../gtk/gtkdocklet.c:545
 #: ../gtk/gtkprefs.c:1945
 msgid "Preferences"
 msgstr "�鎁処┃絎�"
@@ -947,30 +1117,40 @@
 msgstr "腱脂�ょ����"
 
 # FIXME 茘��紊�勲篋�
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:526
+#: ../console/gntstatus.c:167
+#: ../gtk/gtksavedstatuses.c:526
 msgid "Saved Statuses"
 msgstr "����羝���"
 
 # FIXME ����筝�荅���奨鐚��号���≧�膺肢⑮
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:525
-#: ../gtk/gtksavedstatuses.c:433 ../libgaim/protocols/jabber/buddy.c:283
+#: ../console/gntstatus.c:174
+#: ../console/gntstatus.c:525
+#: ../gtk/gtksavedstatuses.c:433
+#: ../libgaim/protocols/jabber/buddy.c:283
 #: ../libgaim/protocols/jabber/buddy.c:920
 #: ../libgaim/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "�潔��"
 
 # NOTE �����峨������弱�
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:448
+#: ../console/gntstatus.c:174
+#: ../gtk/gtksavedstatuses.c:448
 msgid "Type"
 msgstr "�弱�"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:550
-#: ../console/gntstatus.c:562 ../gtk/gtksavedstatuses.c:459
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/bonjour/bonjour.c:256
+#: ../console/gntstatus.c:174
+#: ../console/gntstatus.c:550
+#: ../console/gntstatus.c:562
+#: ../gtk/gtksavedstatuses.c:459
+#: ../gtk/gtksavedstatuses.c:923
+#: ../libgaim/protocols/bonjour/bonjour.c:256
 #: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/gg/gg.c:1598 ../libgaim/protocols/gg/gg.c:1608
-#: ../libgaim/protocols/gg/gg.c:1614 ../libgaim/protocols/gg/gg.c:1623
-#: ../libgaim/protocols/gg/gg.c:1628 ../libgaim/protocols/irc/irc.c:244
+#: ../libgaim/protocols/gg/gg.c:1598
+#: ../libgaim/protocols/gg/gg.c:1608
+#: ../libgaim/protocols/gg/gg.c:1614
+#: ../libgaim/protocols/gg/gg.c:1623
+#: ../libgaim/protocols/gg/gg.c:1628
+#: ../libgaim/protocols/irc/irc.c:244
 #: ../libgaim/protocols/jabber/jabber.c:1220
 #: ../libgaim/protocols/jabber/jabber.c:1230
 #: ../libgaim/protocols/jabber/jabber.c:1240
@@ -1002,7 +1182,8 @@
 msgstr "荐���"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:579
+#: ../console/gntstatus.c:186
+#: ../console/gntstatus.c:579
 msgid "Use"
 msgstr "篏睡��"
 
@@ -1027,11 +1208,14 @@
 msgstr "絖�����"
 
 #. Set up stuff for the account box
-#: ../console/gntstatus.c:442 ../gtk/gtkblist.c:5077 ../gtk/gtkblist.c:5392
+#: ../console/gntstatus.c:442
+#: ../gtk/gtkblist.c:5077
+#: ../gtk/gtkblist.c:5392
 msgid "Account:"
 msgstr "絽活��鐚�"
 
-#: ../console/gntstatus.c:450 ../gtk/gtkft.c:698
+#: ../console/gntstatus.c:450
+#: ../gtk/gtkft.c:698
 msgid "Status:"
 msgstr "����鐚�"
 
@@ -1043,10 +1227,14 @@
 msgid "Edit Status"
 msgstr "篆��合����"
 
-#: ../console/gntstatus.c:533 ../console/gntstatus.c:562
-#: ../gtk/gtksavedstatuses.c:912 ../gtk/gtksavedstatuses.c:1059
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1581
-#: ../libgaim/protocols/gg/gg.c:1585 ../libgaim/protocols/jabber/buddy.c:623
+#: ../console/gntstatus.c:533
+#: ../console/gntstatus.c:562
+#: ../gtk/gtksavedstatuses.c:912
+#: ../gtk/gtksavedstatuses.c:1059
+#: ../libgaim/protocols/gg/gg.c:1024
+#: ../libgaim/protocols/gg/gg.c:1581
+#: ../libgaim/protocols/gg/gg.c:1585
+#: ../libgaim/protocols/jabber/buddy.c:623
 #: ../libgaim/protocols/jabber/buddy.c:630
 #: ../libgaim/protocols/jabber/buddy.c:659
 #: ../libgaim/protocols/jabber/jabber.c:1191
@@ -1130,25 +1318,28 @@
 msgid "GntGf"
 msgstr ""
 
-#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
+#: ../console/plugins/gntgf.c:357
+#: ../console/plugins/gntgf.c:358
 msgid "Toaster plugin for Gaim-Text."
 msgstr ""
 
-#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
+#: ../console/plugins/gnthistory.c:116
+#: ../gtk/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>�� %s �� %s ��篋よ�鐚�</b><br>"
 
-#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
+#: ../console/plugins/gnthistory.c:138
+#: ../gtk/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "篏睡��Ⅲ�画���罔∞�鐚���荀������ヨ�����"
 
-#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
+#: ../console/plugins/gnthistory.c:139
+#: ../gtk/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
 "�ヨ����遵�札緇���綏ュ�激��->���鎁処┃絎���->���ヨ���箴�������\n"
 "\n"
@@ -1158,14 +1349,14 @@
 msgid "GntHistory"
 msgstr "罩桁兓���"
 
-#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
+#: ../console/plugins/gnthistory.c:181
+#: ../gtk/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "蕁�ず��菴���荐�����篋よ��井�亥��篋よ�荀�腦�筝�"
 
-#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation."
+#: ../console/plugins/gnthistory.c:182
+#: ../gtk/plugins/history.c:191
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
 msgstr "�倶�亥��篋よ�������鐚�����罔∞�絨�����筝�罨∞��篋よ��у�箙�蕁�ず�坂���"
 
 #: ../console/plugins/lastlog.c:69
@@ -1180,7 +1371,8 @@
 msgid "GntLastlog"
 msgstr "罩桁兓���"
 
-#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
+#: ../console/plugins/lastlog.c:123
+#: ../console/plugins/lastlog.c:124
 msgid "Lastlog plugin for gaim-text."
 msgstr ""
 
@@ -1197,7 +1389,9 @@
 msgstr "�ュ��(_A)"
 
 #. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1117 ../gtk/gtkroomlist.c:285
+#: ../gtk/gaimstock.c:138
+#: ../gtk/gtkblist.c:1117
+#: ../gtk/gtkroomlist.c:285
 #: ../gtk/gtkroomlist.c:442
 msgid "_Join"
 msgstr "����(_J)"
@@ -1206,7 +1400,8 @@
 msgid "Close _tabs"
 msgstr "��������(_T)"
 
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1001
+#: ../gtk/gaimstock.c:140
+#: ../gtk/gtkblist.c:1001
 msgid "I_M"
 msgstr "�恰��荐���(_M)"
 
@@ -1227,7 +1422,8 @@
 msgstr "�����灸散(_O)"
 
 #. Pause button
-#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
+#: ../gtk/gaimstock.c:145
+#: ../gtk/gtkft.c:835
 msgid "_Pause"
 msgstr "����(_P)"
 
@@ -1280,7 +1476,8 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../gtk/gtkaccount.c:898 ../gtk/gtkprefs.c:1095
+#: ../gtk/gtkaccount.c:898
+#: ../gtk/gtkprefs.c:1095
 msgid "Use Environmental Settings"
 msgstr "篏睡���医�莅��梧┃絎�"
 
@@ -1302,15 +1499,18 @@
 msgid "Proxy Options"
 msgstr "篁g��篌堺�����檎��"
 
-#: ../gtk/gtkaccount.c:975 ../gtk/gtkprefs.c:1089
+#: ../gtk/gtkaccount.c:975
+#: ../gtk/gtkprefs.c:1089
 msgid "Proxy _type:"
 msgstr "篁g��篌堺��������(_T)鐚�"
 
-#: ../gtk/gtkaccount.c:984 ../gtk/gtkprefs.c:1110
+#: ../gtk/gtkaccount.c:984
+#: ../gtk/gtkprefs.c:1110
 msgid "_Host:"
 msgstr "筝紙�篏���(_H)鐚�"
 
-#: ../gtk/gtkaccount.c:988 ../gtk/gtkprefs.c:1128
+#: ../gtk/gtkaccount.c:988
+#: ../gtk/gtkprefs.c:1128
 msgid "_Port:"
 msgstr "��荐���(_P)鐚�"
 
@@ -1318,7 +1518,8 @@
 msgid "_Username:"
 msgstr "篏睡����(_U)鐚�"
 
-#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1165
+#: ../gtk/gtkaccount.c:1002
+#: ../gtk/gtkprefs.c:1165
 msgid "Pa_ssword:"
 msgstr "絲�腆�(_S)鐚�"
 
@@ -1335,11 +1536,13 @@
 msgstr "�臥��┃絎�(_A)"
 
 #. Register button
-#: ../gtk/gtkaccount.c:1453 ../libgaim/protocols/jabber/jabber.c:857
+#: ../gtk/gtkaccount.c:1453
+#: ../libgaim/protocols/jabber/jabber.c:857
 msgid "Register"
 msgstr "荐糸��"
 
-#: ../gtk/gtkaccount.c:1927 ../gtk/gtkplugin.c:576
+#: ../gtk/gtkaccount.c:1927
+#: ../gtk/gtkplugin.c:576
 msgid "Enabled"
 msgstr "����"
 
@@ -1351,22 +1554,15 @@
 msgid ""
 "<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with Gaim press the "
-"<b>Add</b> button below and configure your first account. If you want Gaim "
-"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"You have no IM accounts configured. To start connecting with Gaim press the <b>Add</b> button below and configure your first account. If you want Gaim to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>罩∴�篏睡�� Gaim!</span>\n"
 "\n"
-"�����┃絎�篁私��恰����荐���絽活����荀�篏睡�� Gaim 箴���荐�鐚�茫�����筝��∝�������ャ����膣�鐚�"
-"��荐㊤�絅醇����絽活���喝���絋��������篏睡������恰����荐�絽活��鐚��������筝�筝�罩ュ�鐚�膵主�"
-"�������ャ����膣�箴�荐㊤��銀���絽活����\n"
-"\n"
-"�����絽����医���篆��号�����ゅ験��鐚����������羝��������絽活�����医�鐚靣�鹿����篁わ�"
-"�喝�����������≪��"
+"�����┃絎�篁私��恰����荐���絽活����荀�篏睡�� Gaim 箴���荐�鐚�茫�����筝��∝�������ャ����膣�鐚���荐㊤�絅醇����絽活���喝���絋��������篏睡������恰����荐�絽活��鐚��������筝�筝�罩ュ�鐚�膵主��������ャ����膣�箴�荐㊤��銀���絽活����\n"
+"\n"
+"�����絽����医���篆��号�����ゅ験��鐚����������羝��������絽活�����医�鐚靣�鹿����篁わ��喝�����������≪��"
 
 # TODO ��莎隙���荅牙�阪��筝����亥����紊��鐚�筝�����紊��罩檎��井����臂ょ���
 # NOTE 茘����翫�� by Paladin
@@ -1375,12 +1571,12 @@
 msgstr "���ヨ��紊��"
 
 #: ../gtk/gtkblist.c:723
-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"
 
-#: ../gtk/gtkblist.c:734 ../gtk/gtkpounce.c:527 ../gtk/gtkroomlist.c:378
+#: ../gtk/gtkblist.c:734
+#: ../gtk/gtkpounce.c:527
+#: ../gtk/gtkroomlist.c:378
 msgid "_Account:"
 msgstr "絽活��(_A)鐚�"
 
@@ -1396,7 +1592,9 @@
 msgid "Add Buddy _Pounce"
 msgstr "���ュソ����������(_P)"
 
-#: ../gtk/gtkblist.c:1018 ../gtk/gtkblist.c:1022 ../gtk/gtkblist.c:1121
+#: ../gtk/gtkblist.c:1018
+#: ../gtk/gtkblist.c:1022
+#: ../gtk/gtkblist.c:1121
 #: ../gtk/gtkblist.c:1144
 msgid "View _Log"
 msgstr "茹����ヨ�(_L)"
@@ -1405,11 +1603,15 @@
 msgid "Alias..."
 msgstr "�ュ��..."
 
-#: ../gtk/gtkblist.c:1042 ../gtk/gtkblist.c:1129 ../gtk/gtkblist.c:1150
+#: ../gtk/gtkblist.c:1042
+#: ../gtk/gtkblist.c:1129
+#: ../gtk/gtkblist.c:1150
 msgid "_Alias..."
 msgstr "�ュ��(_A)..."
 
-#: ../gtk/gtkblist.c:1044 ../gtk/gtkblist.c:1131 ../gtk/gtkblist.c:1152
+#: ../gtk/gtkblist.c:1044
+#: ../gtk/gtkblist.c:1131
+#: ../gtk/gtkblist.c:1152
 msgid "_Remove"
 msgstr "腱脂��(_R)"
 
@@ -1433,7 +1635,8 @@
 msgid "Auto-Join"
 msgstr "��������"
 
-#: ../gtk/gtkblist.c:1157 ../gtk/gtkblist.c:1180
+#: ../gtk/gtkblist.c:1157
+#: ../gtk/gtkblist.c:1180
 msgid "_Collapse"
 msgstr "�区儀(_C)"
 
@@ -1441,15 +1644,18 @@
 msgid "_Expand"
 msgstr "絮���(_E)"
 
-#: ../gtk/gtkblist.c:1431 ../gtk/gtkblist.c:1443 ../gtk/gtkblist.c:4202
+#: ../gtk/gtkblist.c:1431
+#: ../gtk/gtkblist.c:1443
+#: ../gtk/gtkblist.c:4202
 #: ../gtk/gtkblist.c:4212
 msgid "/Tools/Mute Sounds"
 msgstr "/綏ュ��/����"
 
 # XXX ��⑮
-#: ../gtk/gtkblist.c:1903 ../gtk/gtkconv.c:4350 ../gtk/gtkpounce.c:419
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: ../gtk/gtkblist.c:1903
+#: ../gtk/gtkconv.c:4350
+#: ../gtk/gtkpounce.c:419
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "��研���糸�ヤ算篏�筝���������医�����絅遵�����荐���絎���"
 
 #. Buddies menu
@@ -1515,7 +1721,8 @@
 msgid "/_Accounts"
 msgstr "/絽活��(_A)"
 
-#: ../gtk/gtkblist.c:2517 ../gtk/gtkblist.c:6052
+#: ../gtk/gtkblist.c:2517
+#: ../gtk/gtkblist.c:6052
 msgid "/Accounts/Add\\/Edit"
 msgstr "/絽活��(_A)/�医�\\/膩�鹿"
 
@@ -1573,7 +1780,8 @@
 msgid "/Help/_About"
 msgstr "/茯���/����(_A)"
 
-#: ../gtk/gtkblist.c:2568 ../gtk/gtkblist.c:2637
+#: ../gtk/gtkblist.c:2568
+#: ../gtk/gtkblist.c:2637
 #, c-format
 msgid ""
 "\n"
@@ -1659,12 +1867,16 @@
 "\n"
 "<b>����鐚�</b>���怨��"
 
-#: ../gtk/gtkblist.c:3207 ../gtk/gtkdocklet.c:471 ../gtk/gtkstatusbox.c:998
-#: ../libgaim/protocols/gg/gg.c:993 ../libgaim/protocols/jabber/buddy.c:1368
+#: ../gtk/gtkblist.c:3207
+#: ../gtk/gtkdocklet.c:471
+#: ../gtk/gtkstatusbox.c:998
+#: ../libgaim/protocols/gg/gg.c:993
+#: ../libgaim/protocols/jabber/buddy.c:1368
 #: ../libgaim/protocols/novell/novell.c:2865
 #: ../libgaim/protocols/oscar/oscar.c:771
 #: ../libgaim/protocols/oscar/oscar.c:5467
-#: ../libgaim/protocols/yahoo/yahoo.c:2883 ../libgaim/status.c:154
+#: ../libgaim/protocols/yahoo/yahoo.c:2883
+#: ../libgaim/status.c:154
 msgid "Offline"
 msgstr "�∝�"
 
@@ -1679,10 +1891,12 @@
 msgstr "��臀� %d ��"
 
 #. Idle stuff
-#: ../gtk/gtkblist.c:3228 ../gtk/gtkprefs.c:1801
+#: ../gtk/gtkblist.c:3228
+#: ../gtk/gtkprefs.c:1801
 #: ../libgaim/protocols/bonjour/bonjour.c:333
 #: ../libgaim/protocols/jabber/buddy.c:635
-#: ../libgaim/protocols/jabber/buddy.c:671 ../libgaim/protocols/msn/msn.c:548
+#: ../libgaim/protocols/jabber/buddy.c:671
+#: ../libgaim/protocols/msn/msn.c:548
 #: ../libgaim/protocols/msn/state.c:32
 #: ../libgaim/protocols/novell/novell.c:2862
 #: ../libgaim/protocols/oscar/oscar.c:2828
@@ -1695,7 +1909,8 @@
 msgid "/Buddies/New Instant Message..."
 msgstr "/絅遵�/�医�恰��荐���..."
 
-#: ../gtk/gtkblist.c:3357 ../gtk/gtkblist.c:3390
+#: ../gtk/gtkblist.c:3357
+#: ../gtk/gtkblist.c:3390
 msgid "/Buddies/Join a Chat..."
 msgstr "/絅遵�/���ヨ��紊��(_C)..."
 
@@ -1707,7 +1922,8 @@
 msgid "/Buddies/Add Buddy..."
 msgstr "/絅遵�/�医�絅遵�..."
 
-#: ../gtk/gtkblist.c:3360 ../gtk/gtkblist.c:3393
+#: ../gtk/gtkblist.c:3360
+#: ../gtk/gtkblist.c:3393
 msgid "/Buddies/Add Chat..."
 msgstr "/絅遵�/�医���紊��..."
 
@@ -1727,7 +1943,8 @@
 msgid "/Tools/Room List"
 msgstr "/綏ュ��/��紊��羝���"
 
-#: ../gtk/gtkblist.c:3498 ../gtk/gtkdocklet.c:152
+#: ../gtk/gtkblist.c:3498
+#: ../gtk/gtkdocklet.c:152
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -1750,12 +1967,14 @@
 msgid "By log size"
 msgstr "箴��ф�ヨ�紊у�"
 
-#: ../gtk/gtkblist.c:3793 ../gtk/gtkconn.c:178
+#: ../gtk/gtkblist.c:3793
+#: ../gtk/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 腟����g�"
 
-#: ../gtk/gtkblist.c:3802 ../libgaim/protocols/sametime/sametime.c:3653
+#: ../gtk/gtkblist.c:3802
+#: ../libgaim/protocols/sametime/sametime.c:3653
 msgid "Connect"
 msgstr "�g�"
 
@@ -1789,15 +2008,11 @@
 msgid ""
 "<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>罩∴�篏睡�� Gaim!</span>\n"
 "\n"
-"����������篁私�絽活��鐚�茫�������羝��������絽活��->�医�����篁わ��違��絽活��羝���������"
-"絽活����絽活��筝�膓�����鐚�絨演������札�糸�ユ��莅��雁����鐚���罔o���葦��札莊�����絅遵���荐�"
-"篋�鐚�"
+"����������篁私�絽活��鐚�茫�������羝��������絽活��->�医�����篁わ��違��絽活��羝���������絽活����絽活��筝�膓�����鐚�絨演������札�糸�ユ��莅��雁����鐚���罔o���葦��札莊�����絅遵���荐�篋�鐚�"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -1818,23 +2033,22 @@
 msgid "/Buddies/Show Idle Times"
 msgstr "/絅遵�/蕁�ず��臀�����"
 
-#: ../gtk/gtkblist.c:4873 ../gtk/plugins/gevolution/gevolution.c:97
-#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
-#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
+#: ../gtk/gtkblist.c:4873
+#: ../gtk/plugins/gevolution/gevolution.c:97
+#: ../gtk/plugins/gevolution/gevo-util.c:64
+#: ../libgaim/blist.c:521
+#: ../libgaim/blist.c:1294
+#: ../libgaim/blist.c:1523
 #: ../libgaim/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "絅遵�"
 
 #: ../gtk/gtkblist.c:5007
-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"
-
-#: ../gtk/gtkblist.c:5067 ../gtk/gtkblist.c:5427
+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"
+
+#: ../gtk/gtkblist.c:5067
+#: ../gtk/gtkblist.c:5427
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
 #: ../gtk/plugins/gevolution/new_person_dialog.c:307
 msgid "Group:"
@@ -1845,15 +2059,11 @@
 msgstr "������荐���絎�筝���吧��紊����"
 
 #: ../gtk/gtkblist.c:5341
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
+msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "��研���糸�ヤ算篏�筝�����������ヨ��紊������荐���絎���"
 
 #: ../gtk/gtkblist.c:5382
-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"
 
 #: ../gtk/gtkblist.c:5465
@@ -1871,7 +2081,9 @@
 
 #  NOTE ��筝�����筝���荐宴��������羃�����鐚�絨ゅ�倶�����亥����罔∞��檎����篁ゃ��羝����
 #  NOTE 茘�����筝���荐宴������絽御��
-#: ../gtk/gtkblist.c:6130 ../gtk/gtkblist.c:6136 ../gtk/gtkconv.c:2839
+#: ../gtk/gtkblist.c:6130
+#: ../gtk/gtkblist.c:6136
+#: ../gtk/gtkconv.c:2839
 msgid "No actions available"
 msgstr "羃����檎����篁�"
 
@@ -1902,20 +2114,19 @@
 msgid ""
 "%s\n"
 "\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
+"Gaim will not attempt to reconnect the account until you correct the error and re-enable the account."
 msgstr ""
 "%s\n"
 "�����贋③�������筝����医��������絽活����鐚�Gaim 絨�筝�����荅������育�g���"
 
-#: ../gtk/gtkconv.c:746 ../gtk/gtkconv.c:772
+#: ../gtk/gtkconv.c:746
+#: ../gtk/gtkconv.c:772
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "荅峨��絅遵���������紊�研��篏睡����筝�腮�����荐���絎�"
 
 # XXX ��⑮
 #: ../gtk/gtkconv.c:766
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
+msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "��研���糸�ヤ算篏�筝����������茫�����絅遵�����荐���絎���"
 
 #: ../gtk/gtkconv.c:819
@@ -1924,21 +2135,22 @@
 
 #. Put our happy label in it.
 #: ../gtk/gtkconv.c:849
-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 "茫�莠後�ユ���渇��茫���篏睡������腮縁�篁ュ���茫���荐�����"
 
 #: ../gtk/gtkconv.c:870
 msgid "_Buddy:"
 msgstr "絅遵�(_B)鐚�"
 
-#: ../gtk/gtkconv.c:890 ../gtk/gtksavedstatuses.c:1111
+#: ../gtk/gtkconv.c:890
+#: ../gtk/gtksavedstatuses.c:1111
 #: ../gtk/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "荐���(_M)鐚�"
 
-#: ../gtk/gtkconv.c:947 ../gtk/gtkconv.c:2400 ../gtk/gtkdebug.c:218
+#: ../gtk/gtkconv.c:947
+#: ../gtk/gtkconv.c:2400
+#: ../gtk/gtkdebug.c:218
 #: ../gtk/gtkft.c:542
 msgid "Unable to open file."
 msgstr "�≧�����罟�罅���"
@@ -1952,11 +2164,14 @@
 msgid "Save Conversation"
 msgstr "�峨���紊��у�"
 
-#: ../gtk/gtkconv.c:1124 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
+#: ../gtk/gtkconv.c:1124
+#: ../gtk/gtkdebug.c:166
+#: ../gtk/gtkdebug.c:756
 msgid "Find"
 msgstr "��絨�"
 
-#: ../gtk/gtkconv.c:1150 ../gtk/gtkdebug.c:194
+#: ../gtk/gtkconv.c:1150
+#: ../gtk/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "��絨�(_S)鐚�"
 
@@ -1965,8 +2180,7 @@
 msgstr "�ヨ�膤紫輝���������������篋よ�筝㊦��荐����遵�茴�����惹�ヨ�筝㏍��"
 
 #: ../gtk/gtkconv.c:1329
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
+msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "�ヨ�膤紫輝���������������篋よ�筝㊦��荐����遵�筝���茴�����惹�ヨ�筝㏍��"
 
 #: ../gtk/gtkconv.c:1597
@@ -1984,9 +2198,8 @@
 msgstr "��緇��∫��荐���"
 
 #: ../gtk/gtkconv.c:1643
-#, fuzzy
 msgid "Last said"
-msgstr "�贋�井�ユ��"
+msgstr "筝�罨≧���"
 
 #: ../gtk/gtkconv.c:2408
 msgid "Unable to save icon file to disk."
@@ -2124,7 +2337,8 @@
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../gtk/gtkconv.c:2863 ../gtk/gtkconv.c:2895
+#: ../gtk/gtkconv.c:2863
+#: ../gtk/gtkconv.c:2895
 msgid "/Conversation"
 msgstr "/篋よ�"
 
@@ -2209,7 +2423,8 @@
 msgid "_Send"
 msgstr "�渇��(_S)"
 
-#: ../gtk/gtkconv.c:4002 ../libgaim/protocols/sametime/sametime.c:3595
+#: ../gtk/gtkconv.c:4002
+#: ../libgaim/protocols/sametime/sametime.c:3595
 msgid "Topic:"
 msgstr "筝脂�鐚�"
 
@@ -2218,14 +2433,16 @@
 msgid "0 people in room"
 msgstr "羃���篋阪�������翠��"
 
-#: ../gtk/gtkconv.c:5101 ../gtk/gtkconv.c:5222
+#: ../gtk/gtkconv.c:5101
+#: ../gtk/gtkconv.c:5222
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ��篋阪�������翠��"
 msgstr[1] "%d ��篋阪�������翠��"
 
-#: ../gtk/gtkconv.c:5775 ../gtk/gtkstatusbox.c:565
+#: ../gtk/gtkconv.c:5775
+#: ../gtk/gtkstatusbox.c:565
 msgid "Typing"
 msgstr "莠後�ヤ賢"
 
@@ -2237,7 +2454,8 @@
 msgid "Nick Said"
 msgstr "�援┗茴����"
 
-#: ../gtk/gtkconv.c:5791 ../gtk/gtkdocklet.c:513
+#: ../gtk/gtkconv.c:5791
+#: ../gtk/gtkdocklet.c:513
 msgid "Unread Messages"
 msgstr "���荐���"
 
@@ -2281,7 +2499,8 @@
 msgid "Separate IM and Chat windows"
 msgstr "篁ヤ�����荀�腦�蕁�ず�恰��荐�������紊�"
 
-#: ../gtk/gtkconv.c:8233 ../gtk/gtkprefs.c:1297
+#: ../gtk/gtkconv.c:8233
+#: ../gtk/gtkprefs.c:1297
 msgid "New window"
 msgstr "�域�腦�"
 
@@ -2334,7 +2553,8 @@
 msgid "Level "
 msgstr "��疹腮�綺� "
 
-#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
+#: ../gtk/gtkdebug.c:852
+#: ../gtk/gtkdebug.c:858
 msgid "Select the debug filter level."
 msgstr "�御���ら���������疹腮�綺���"
 
@@ -2363,15 +2583,25 @@
 msgid "Fatal Error"
 msgstr "�顔�����荐���"
 
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
+#: ../gtk/gtkdialogs.c:66
+#: ../gtk/gtkdialogs.c:110
 msgid "lead developer"
 msgstr "筝肢����取��"
 
-#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
-#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
-#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
-#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
+#: ../gtk/gtkdialogs.c:67
+#: ../gtk/gtkdialogs.c:68
+#: ../gtk/gtkdialogs.c:69
+#: ../gtk/gtkdialogs.c:70
+#: ../gtk/gtkdialogs.c:71
+#: ../gtk/gtkdialogs.c:73
+#: ../gtk/gtkdialogs.c:74
+#: ../gtk/gtkdialogs.c:75
+#: ../gtk/gtkdialogs.c:76
+#: ../gtk/gtkdialogs.c:77
+#: ../gtk/gtkdialogs.c:78
+#: ../gtk/gtkdialogs.c:81
+#: ../gtk/gtkdialogs.c:82
+#: ../gtk/gtkdialogs.c:83
 msgid "developer"
 msgstr "���取��"
 
@@ -2391,7 +2621,8 @@
 msgid "win32 port"
 msgstr "Windows ����Щ罎�"
 
-#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
+#: ../gtk/gtkdialogs.c:103
+#: ../gtk/gtkdialogs.c:104
 msgid "maintainer"
 msgstr "膓㊧Ⅲ��"
 
@@ -2416,11 +2647,14 @@
 msgid "Arabic"
 msgstr "�炊��篌���"
 
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:187
+#: ../gtk/gtkdialogs.c:117
+#: ../gtk/gtkdialogs.c:118
+#: ../gtk/gtkdialogs.c:187
 msgid "Bulgarian"
 msgstr "篆��������"
 
-#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
+#: ../gtk/gtkdialogs.c:119
+#: ../gtk/gtkdialogs.c:120
 msgid "Bengali"
 msgstr "絖�������"
 
@@ -2429,16 +2663,20 @@
 msgid "Bosnian"
 msgstr "羈√�絨寂���"
 
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:188 ../gtk/gtkdialogs.c:189
+#: ../gtk/gtkdialogs.c:122
+#: ../gtk/gtkdialogs.c:188
+#: ../gtk/gtkdialogs.c:189
 msgid "Catalan"
 msgstr "��羈育����"
 
 # NOTE 罩e幻��������贋・絲�������タ篋�茯���(Valencian)
-#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
+#: ../gtk/gtkdialogs.c:123
+#: ../gtk/gtkdialogs.c:124
 msgid "Valencian-Catalan"
 msgstr "����タ篋���"
 
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:190
+#: ../gtk/gtkdialogs.c:125
+#: ../gtk/gtkdialogs.c:190
 msgid "Czech"
 msgstr "�桁����"
 
@@ -2446,11 +2684,14 @@
 msgid "Danish"
 msgstr "筝拷坤��"
 
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:191
+#: ../gtk/gtkdialogs.c:127
+#: ../gtk/gtkdialogs.c:128
+#: ../gtk/gtkdialogs.c:191
 msgid "German"
 msgstr "緇傑��"
 
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130
+#: ../gtk/gtkdialogs.c:129
+#: ../gtk/gtkdialogs.c:130
 msgid "Greek"
 msgstr "絽�����"
 
@@ -2471,25 +2712,36 @@
 msgid "Esperanto"
 msgstr "筝���茯�"
 
-#: ../gtk/gtkdialogs.c:135 ../gtk/gtkdialogs.c:192 ../gtk/gtkdialogs.c:193
-#: ../gtk/gtkdialogs.c:194 ../gtk/gtkdialogs.c:195
+#: ../gtk/gtkdialogs.c:135
+#: ../gtk/gtkdialogs.c:192
+#: ../gtk/gtkdialogs.c:193
+#: ../gtk/gtkdialogs.c:194
+#: ../gtk/gtkdialogs.c:195
 msgid "Spanish"
 msgstr "茱睡�����"
 
-#: ../gtk/gtkdialogs.c:136 ../gtk/gtkdialogs.c:137
+#: ../gtk/gtkdialogs.c:136
+#: ../gtk/gtkdialogs.c:137
 msgid "Euskera(Basque)"
 msgstr "綏贋������"
 
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
+#: ../gtk/gtkdialogs.c:138
+#: ../gtk/gtkdialogs.c:139
+#: ../gtk/gtkdialogs.c:140
 msgid "Persian"
 msgstr "羈∽����"
 
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:196 ../gtk/gtkdialogs.c:197
+#: ../gtk/gtkdialogs.c:141
+#: ../gtk/gtkdialogs.c:196
+#: ../gtk/gtkdialogs.c:197
 msgid "Finnish"
 msgstr "���㊥��"
 
-#: ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:198 ../gtk/gtkdialogs.c:199
-#: ../gtk/gtkdialogs.c:200 ../gtk/gtkdialogs.c:201
+#: ../gtk/gtkdialogs.c:142
+#: ../gtk/gtkdialogs.c:198
+#: ../gtk/gtkdialogs.c:199
+#: ../gtk/gtkdialogs.c:200
+#: ../gtk/gtkdialogs.c:201
 msgid "French"
 msgstr "羈���"
 
@@ -2497,11 +2749,13 @@
 msgid "Galician"
 msgstr "����茱推���"
 
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:145
+#: ../gtk/gtkdialogs.c:144
+#: ../gtk/gtkdialogs.c:145
 msgid "Gujarati"
 msgstr "�ゅ�����号��"
 
-#: ../gtk/gtkdialogs.c:146 ../gtk/gtkdialogs.c:202
+#: ../gtk/gtkdialogs.c:146
+#: ../gtk/gtkdialogs.c:202
 msgid "Hebrew"
 msgstr "絽�篌����"
 
@@ -2517,29 +2771,38 @@
 #  NOTE ��茯��肢�俄����育�緒�綮f�沿����峨�紫�後勲�������榊�f��膓牙�絲����鎀у����鐚�
 #  NOTE �榊�g��筝㊤�����後��蕁�羈�篋������鎀у����罌�鐚�茘����鎀у������荅我�莠�絅純��
 #  NOTE����荀���Slovenian����
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:203
+#: ../gtk/gtkdialogs.c:149
+#: ../gtk/gtkdialogs.c:203
 msgid "Italian"
 msgstr "�鎀у����"
 
-#: ../gtk/gtkdialogs.c:150 ../gtk/gtkdialogs.c:204 ../gtk/gtkdialogs.c:205
+#: ../gtk/gtkdialogs.c:150
+#: ../gtk/gtkdialogs.c:204
+#: ../gtk/gtkdialogs.c:205
 #: ../gtk/gtkdialogs.c:206
 msgid "Japanese"
 msgstr "�ユ��"
 
-#: ../gtk/gtkdialogs.c:151 ../gtk/gtkdialogs.c:207
+#: ../gtk/gtkdialogs.c:151
+#: ../gtk/gtkdialogs.c:207
 msgid "Georgian"
 msgstr "��音篋���"
 
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:208
+#: ../gtk/gtkdialogs.c:152
+#: ../gtk/gtkdialogs.c:208
 msgid "Korean"
 msgstr "����"
 
 # NOTE 羝�⑮��綺��上招��
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:155
+#: ../gtk/gtkdialogs.c:153
+#: ../gtk/gtkdialogs.c:154
+#: ../gtk/gtkdialogs.c:155
 msgid "Kurdish"
 msgstr "綺�招��"
 
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:209 ../gtk/gtkdialogs.c:210
+#: ../gtk/gtkdialogs.c:156
+#: ../gtk/gtkdialogs.c:209
+#: ../gtk/gtkdialogs.c:210
 msgid "Lithuanian"
 msgstr "腴��九���"
 
@@ -2562,7 +2825,9 @@
 msgid "Norwegian"
 msgstr "�����"
 
-#: ../gtk/gtkdialogs.c:161 ../gtk/gtkdialogs.c:162 ../gtk/gtkdialogs.c:211
+#: ../gtk/gtkdialogs.c:161
+#: ../gtk/gtkdialogs.c:162
+#: ../gtk/gtkdialogs.c:211
 msgid "Polish"
 msgstr "羈∵�㊥��"
 
@@ -2578,15 +2843,19 @@
 msgid "Romanian"
 msgstr "臂�薤�絢篋���"
 
-#: ../gtk/gtkdialogs.c:166 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
+#: ../gtk/gtkdialogs.c:166
+#: ../gtk/gtkdialogs.c:212
+#: ../gtk/gtkdialogs.c:213
 msgid "Russian"
 msgstr "篆���"
 
-#: ../gtk/gtkdialogs.c:167 ../gtk/gtkdialogs.c:168
+#: ../gtk/gtkdialogs.c:167
+#: ../gtk/gtkdialogs.c:168
 msgid "Serbian"
 msgstr "紂��丞境篋���"
 
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:214
+#: ../gtk/gtkdialogs.c:169
+#: ../gtk/gtkdialogs.c:214
 msgid "Slovak"
 msgstr "���篌�����"
 
@@ -2594,7 +2863,8 @@
 #  NOTE 篁ョ乙茯��守�鰹�莊��肴⑮�����守�活�羣�鐚�羈�筝�鐚����喝���臂��箙���zh_TW鐚�
 #  NOTE ��篁ヤ�莊�羝�⑮鐚��九���ぇ�梧⑮羈�鐚�鐚�莊��肴⑮��
 #  NOTE����荀���Italian����
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:215
+#: ../gtk/gtkdialogs.c:170
+#: ../gtk/gtkdialogs.c:215
 msgid "Slovenian"
 msgstr "���膓㊤絢篋���"
 
@@ -2602,7 +2872,8 @@
 msgid "Albanian"
 msgstr "�睡�上郡絨寂���"
 
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:216
+#: ../gtk/gtkdialogs.c:172
+#: ../gtk/gtkdialogs.c:216
 msgid "Swedish"
 msgstr "���御��"
 
@@ -2631,11 +2902,14 @@
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh �� Gnome 莇�����膺肢⑮絨靚�箙��銀�腟���"
 
-#: ../gtk/gtkdialogs.c:178 ../gtk/gtkdialogs.c:217
+#: ../gtk/gtkdialogs.c:178
+#: ../gtk/gtkdialogs.c:217
 msgid "Simplified Chinese"
 msgstr "膂♂�筝㊥��"
 
-#: ../gtk/gtkdialogs.c:179 ../gtk/gtkdialogs.c:180 ../gtk/gtkdialogs.c:218
+#: ../gtk/gtkdialogs.c:179
+#: ../gtk/gtkdialogs.c:180
+#: ../gtk/gtkdialogs.c:218
 msgid "Traditional Chinese"
 msgstr "罩i�筝㊥��"
 
@@ -2649,35 +2923,16 @@
 msgstr "���� Gaim"
 
 #: ../gtk/gtkdialogs.c:333
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
-"<BR><BR>You may modify and redistribute the program under the terms of the "
-"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
-"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
-"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"Gaim 篆�筝���篁� GTK+ ���主��罔∞���荐����綣��������箴� AIM��MSN��Yahoo!��Jabber��"
-"ICQ��IRC��SILC��SIP/SIMPLE��Novell GroupWise��Lotus Sametime��Zephyr��Gadu-"
-"Gadu �� QQ 膈����純��<BR><BR>���ユ�����篆��号���寂�����腮�綣���������� GPL鐚�膃����"
-"��篁私�篁ュ����������罌�罨上�喝��Gaim �у群����筝�篁� GPL, �����冴��COPYING����罟�罅�"
-"箙��с��Gaim ������罨�����篏�鐚��句��罨��榊�乗旺�肢���怨������鐚��喝��荅喝��������"
-"��COPYRIGHT����罟�罅��с�����綣鋇����箴�篁私�篆�����<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr "Gaim 篆�筝���篁� GTK+ ���主��罔∞���荐����綣��������箴� AIM��MSN��Yahoo!��Jabber��ICQ��IRC��SILC��SIP/SIMPLE��Novell GroupWise��Lotus Sametime��Zephyr��Gadu-Gadu �� QQ 膈����純��<BR><BR>���ユ�����篆��号���寂�����腮�綣���������� GPL鐚�膃������篁私�篁ュ����������罌�罨上�喝��Gaim �у群����筝�篁� GPL, �����冴��COPYING����罟�罅�箙��с��Gaim 篆�����罨�����篏�鐚���罨�罩後����旺�肢���怨������鐚�莢∝�肢���喝��荅喝�������冴��COPYRIGHT����罟�罅��с�����綣��鋇���箴�篁私�篆�����<BR><BR>"
 
 #: ../gtk/gtkdialogs.c:348
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr ""
-"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #wingaim �脂��<BR><BR>"
-
-# NOTE  contains zh_TW-specific info here!!
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #wingaim �脂��<BR><BR>"
+
 #: ../gtk/gtkdialogs.c:351
 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>"
 
 #: ../gtk/gtkdialogs.c:357
 msgid "Current Developers"
@@ -2712,9 +2967,7 @@
 msgstr "��緇�篏睡����莖�荐�"
 
 #: ../gtk/gtkdialogs.c:816
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "茫�莠後�ユ�����活��ヨ�絨�莟∞��絽活����"
 
 #  NOTE 罩よ��茘���莅�����篌寂�莠�����緇���絅巡�藥�
@@ -2723,9 +2976,7 @@
 msgstr "茹���篏睡�����ヨ�"
 
 #: ../gtk/gtkdialogs.c:907
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
+msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "茫�莠後�ユ�����活�莅����ヨ���篏睡������絽活�����ュ����"
 
 # XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
@@ -2757,18 +3008,10 @@
 
 #: ../gtk/gtkdialogs.c:1006
 #, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������"
-"篏����"
-msgstr[1] ""
-"��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������"
-"篏����"
+msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
+msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
+msgstr[0] "��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
+msgstr[1] "��③荅���絨�絅遵� %s ���檎�����銀� %d ��絅遵�緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
 # XXX��Remove Buddy������Remove Contact����賢����Gaim�≧����ワ����醇���拷�牙��腥咲��
 #: ../gtk/gtkdialogs.c:1014
@@ -2783,9 +3026,7 @@
 # TODO 茘�����緇��拷�� - 20061025
 #: ../gtk/gtkdialogs.c:1045
 #, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
+msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
 msgstr "��③荅���絨�臂ょ� %s �� %s ��篏居��亥召腟�篁ュ����遵�������膵主�������篏����"
 
 #: ../gtk/gtkdialogs.c:1052
@@ -2798,11 +3039,8 @@
 
 #: ../gtk/gtkdialogs.c:1103
 #, 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 ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
+msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgstr "��③荅���絨�臂ょ� %s ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
 #: ../gtk/gtkdialogs.c:1106
 msgid "Remove Group"
@@ -2814,8 +3052,7 @@
 
 #: ../gtk/gtkdialogs.c:1140
 #, 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�≧����ワ����醇���拷�牙��腥咲��
@@ -2830,9 +3067,7 @@
 
 #: ../gtk/gtkdialogs.c:1165
 #, 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 緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
 
 #: ../gtk/gtkdialogs.c:1168
@@ -2852,20 +3087,28 @@
 msgid "Change Status"
 msgstr "莅��雁����"
 
-#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:995
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1370
-#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
-#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
+#: ../gtk/gtkdocklet.c:459
+#: ../gtk/gtkstatusbox.c:995
+#: ../libgaim/protocols/gg/gg.c:996
+#: ../libgaim/protocols/jabber/buddy.c:1370
+#: ../libgaim/protocols/msn/state.c:29
+#: ../libgaim/protocols/msn/state.c:30
+#: ../libgaim/protocols/msn/state.c:37
+#: ../libgaim/protocols/msn/state.c:38
 #: ../libgaim/protocols/novell/novell.c:2853
-#: ../libgaim/protocols/yahoo/yahoo.c:2885 ../libgaim/status.c:155
+#: ../libgaim/protocols/yahoo/yahoo.c:2885
+#: ../libgaim/status.c:155
 msgid "Available"
 msgstr "筝�膩�"
 
 #. Away stuff
 #. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1815 ../gtk/gtkstatusbox.c:996
-#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
+#: ../gtk/gtkdocklet.c:463
+#: ../gtk/gtkprefs.c:1815
+#: ../gtk/gtkstatusbox.c:996
+#: ../libgaim/protocols/gg/gg.c:999
+#: ../libgaim/protocols/irc/irc.c:524
 #: ../libgaim/protocols/irc/msgs.c:223
 #: ../libgaim/protocols/jabber/buddy.c:1374
 #: ../libgaim/protocols/novell/novell.c:2856
@@ -2874,13 +3117,16 @@
 #: ../libgaim/protocols/oscar/oscar.c:5495
 #: ../libgaim/protocols/silc/buddy.c:1469
 #: ../libgaim/protocols/yahoo/yahoo.c:3359
-#: ../libgaim/protocols/yahoo/yahoo.c:3432 ../libgaim/status.c:158
+#: ../libgaim/protocols/yahoo/yahoo.c:3432
+#: ../libgaim/status.c:158
 msgid "Away"
 msgstr "�∫��"
 
-#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:997
+#: ../gtk/gtkdocklet.c:467
+#: ../gtk/gtkstatusbox.c:997
 #: ../libgaim/protocols/oscar/oscar.c:700
-#: ../libgaim/protocols/yahoo/yahoo.c:2879 ../libgaim/status.c:157
+#: ../libgaim/protocols/yahoo/yahoo.c:2879
+#: ../libgaim/status.c:157
 msgid "Invisible"
 msgstr "�沿昆"
 
@@ -2917,24 +3163,36 @@
 msgid "Not started"
 msgstr "������"
 
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1674
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:630
+# XXX �馹�鐚�
+# XXX gtk/gtkft.c - ��Unknown�������筝������処�膊����後�種�茘������ャ��莠�絅�
+# XXX libgaim/account.c - ��Unknown����筝��ラ�����藝守��荐���絎�鐚�茘���筝�����莠�絅緒����坂�絎����丞��ラ����鐚�
+# XXX                      ������絽活��羝�������荀������ャ��������篋�緇�箙�箙���筝����緒�
+# XXX libgaim/protocols/* - ��Unknown����筝�����絅遵�����鐚����醇������筝�����鐚���荐�膤紫輝���援����������筝�����鐚�
+# XXX                       ���������ャ��鐚��榊憘� Gaim �����������篁h��鐚�
+# XXX - Ambrose 20061123
+#: ../gtk/gtkft.c:159
+#: ../libgaim/account.c:1674
+#: ../libgaim/protocols/gg/gg.c:1002
+#: ../libgaim/protocols/jabber/buddy.c:630
 #: ../libgaim/protocols/jabber/buddy.c:1364
 #: ../libgaim/protocols/jabber/buddy.c:1381
 #: ../libgaim/protocols/novell/novell.c:2868
 msgid "Unknown"
 msgstr "����"
 
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1119
+#: ../gtk/gtkft.c:162
+#: ../gtk/gtkft.c:1119
 msgid "Finished"
 msgstr "綏峨���"
 
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1059
+#: ../gtk/gtkft.c:165
+#: ../gtk/gtkft.c:1059
 msgid "Canceled"
 msgstr "綏峨�羔�"
 
 #  XXX ��⑮
-#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
+#: ../gtk/gtkft.c:168
+#: ../gtk/gtkft.c:975
 msgid "Waiting for transfer to begin"
 msgstr "膈�緇���紮��活叱罟�罅�筝�..."
 
@@ -2943,7 +3201,8 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "罟�罅��活叱鐚�%2$d ��罟�罅�絎���篋� %1$d%%"
 
-#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
+#: ../gtk/gtkft.c:233
+#: ../gtk/gtkft.c:763
 msgid "File Transfers"
 msgstr "罟�罅��活叱"
 
@@ -3130,7 +3389,8 @@
 "\n"
 "%s"
 
-#: ../gtk/gtkimhtml.c:3402 ../gtk/gtkimhtml.c:3414
+#: ../gtk/gtkimhtml.c:3402
+#: ../gtk/gtkimhtml.c:3414
 msgid "Save Image"
 msgstr "�峨�綵怨��"
 
@@ -3159,9 +3419,7 @@
 msgstr "�颷�(_D)"
 
 #: ../gtk/gtkimhtmltoolbar.c:405
-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 ��絎����颷逸��颷井���御���х��鐚������叱�ャ��"
 
 #: ../gtk/gtkimhtmltoolbar.c:409
@@ -3181,7 +3439,8 @@
 msgid "Failed to store image: %s\n"
 msgstr "�≧��峨�綵怨���%s\n"
 
-#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
+#: ../gtk/gtkimhtmltoolbar.c:513
+#: ../gtk/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "���ュ襲��"
 
@@ -3261,22 +3520,15 @@
 msgstr "%Y綛�%m��"
 
 #: ../gtk/gtklog.c:324
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"��������荐������������壕��括鎧腟掩�ヨ����檎��茴�������鐚�膤紫輝篋�篁倶����茴�����亥鎧腟掩��"
-"茯�筝㏍��"
+msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgstr "��������荐������������壕��括鎧腟掩�ヨ����檎��茴�������鐚�膤紫輝篋�篁倶����茴�����亥鎧腟掩�ヨ�筝㏍��"
 
 #: ../gtk/gtklog.c:328
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
+msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
 msgstr "�恰��荐���Ŭ������荐��������恰��荐������檎��茴�����������茴������"
 
 #: ../gtk/gtklog.c:331
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "��紊�����у�絨���������荐�����������紊�����檎��茴�����������茴������"
 
 #: ../gtk/gtklog.c:335
@@ -3292,7 +3544,8 @@
 msgid "Conversations in %s"
 msgstr "�� %s ��篋よ�"
 
-#: ../gtk/gtklog.c:488 ../gtk/gtklog.c:539
+#: ../gtk/gtklog.c:488
+#: ../gtk/gtklog.c:539
 #, c-format
 msgid "Conversations with %s"
 msgstr "�� %s ��篋よ�"
@@ -3379,7 +3632,8 @@
 "\n"
 "%s"
 
-#: ../gtk/gtknotify.c:692 ../libgaim/protocols/sametime/sametime.c:5541
+#: ../gtk/gtknotify.c:692
+#: ../libgaim/protocols/sametime/sametime.c:5541
 msgid "Search Results"
 msgstr "��絨�腟���"
 
@@ -3388,19 +3642,21 @@
 msgid "The browser command \"%s\" is invalid."
 msgstr "�頳遵����篁ゃ��%s�����≧������"
 
-#: ../gtk/gtknotify.c:892 ../gtk/gtknotify.c:904 ../gtk/gtknotify.c:917
+#: ../gtk/gtknotify.c:892
+#: ../gtk/gtknotify.c:904
+#: ../gtk/gtknotify.c:917
 #: ../gtk/gtknotify.c:1045
 msgid "Unable to open URL"
 msgstr "�≧�����膓臥��"
 
-#: ../gtk/gtknotify.c:902 ../gtk/gtknotify.c:915
+#: ../gtk/gtknotify.c:902
+#: ../gtk/gtknotify.c:915
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "���� \"%s\" ���主�����鐚�%s"
 
 #: ../gtk/gtknotify.c:1046
-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 "���悟�����篏睡��������頳遵����鐚��紙����荐㊤���篁ゃ��"
 
 #: ../gtk/gtkplugin.c:274
@@ -3639,18 +3895,15 @@
 msgstr "�≧�����茵���筝脂���"
 
 #: ../gtk/gtkprefs.c:638
-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 "����∝��羝���賢�後�筝��������喝��罩∞��茵���筝脂������札�����括���劫�絨��亥��茵���筝脂�絎�茖��井���賢��"
 
 #: ../gtk/gtkprefs.c:673
 msgid "Icon"
 msgstr "��腓�"
 
-#: ../gtk/gtkprefs.c:680 ../libgaim/protocols/jabber/buddy.c:286
+#: ../gtk/gtkprefs.c:680
+#: ../libgaim/protocols/jabber/buddy.c:286
 #: ../libgaim/protocols/jabber/buddy.c:926
 #: ../libgaim/protocols/jabber/chat.c:769
 msgid "Description"
@@ -3664,14 +3917,20 @@
 msgid "_Show system tray icon:"
 msgstr "蕁�ず膤紫輝綏ヤ��e��腓�(_S)鐚�"
 
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1640
-#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
+#: ../gtk/gtkprefs.c:819
+#: ../gtk/gtkprefs.c:831
+#: ../gtk/gtkprefs.c:1640
+#: ../gtk/plugins/timestamp_format.c:39
+#: ../gtk/plugins/timestamp_format.c:48
 #: ../gtk/plugins/win32/winprefs/winprefs.c:335
 msgid "Always"
 msgstr "��綽�"
 
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1805
-#: ../gtk/gtkprefs.c:1819 ../gtk/plugins/win32/winprefs/winprefs.c:334
+#: ../gtk/gtkprefs.c:820
+#: ../gtk/gtkprefs.c:829
+#: ../gtk/gtkprefs.c:1805
+#: ../gtk/gtkprefs.c:1819
+#: ../gtk/plugins/win32/winprefs/winprefs.c:334
 msgid "Never"
 msgstr "緇�筝�"
 
@@ -3687,7 +3946,8 @@
 msgid "_Hide new IM conversations:"
 msgstr "�沿��佂���恰��荐���困茫�(_H)鐚�"
 
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1820
+#: ../gtk/gtkprefs.c:830
+#: ../gtk/gtkprefs.c:1820
 msgid "When away"
 msgstr "�∫������"
 
@@ -3706,7 +3966,7 @@
 
 #: ../gtk/gtkprefs.c:857
 msgid "_Placement:"
-msgstr "荀�腦�篏�臀��紊��檎��(_P)鐚�"
+msgstr "罔�膠や�臀�(_P)鐚�"
 
 #: ../gtk/gtkprefs.c:859
 msgid "Top"
@@ -3770,21 +4030,18 @@
 
 # NOTE ��筝��������鐚�����┌����昆鐚���Ⅶ篋坂� :P
 #: ../gtk/gtkprefs.c:941
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"�������罔f������絋���戎������絎���吚�弱���鐚����肴�����綣閞e���蕁�篌守��罧究��絖�����"
-"綣��"
-
-#: ../gtk/gtkprefs.c:1010 ../libgaim/protocols/oscar/oscar.c:781
+msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
+msgstr "�������罔f������絋���戎������絎���吚�弱���鐚����肴�����綣閞e���蕁�篌守��罧究��絖���"
+
+#: ../gtk/gtkprefs.c:1010
+#: ../libgaim/protocols/oscar/oscar.c:781
 #: ../libgaim/protocols/oscar/oscar.c:3634
 msgid "IP Address"
 msgstr "IP 篏���"
 
 #: ../gtk/gtkprefs.c:1012
 msgid "ST_UN server:"
-msgstr "STUN 篌堺����(_S)鐚�"
+msgstr "STUN 篌堺����(_U)鐚�"
 
 #: ../gtk/gtkprefs.c:1024
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
@@ -3918,7 +4175,7 @@
 
 #: ../gtk/gtkprefs.c:1361
 msgid "Log all _status changes to system log"
-msgstr "荐��������������壕��括鎧腟掩�ヨ�"
+msgstr "荐������������壕��括鎧腟掩�ヨ�(_S)"
 
 #: ../gtk/gtkprefs.c:1507
 msgid "Sound Selection"
@@ -3936,7 +4193,8 @@
 msgid "Quiet"
 msgstr "絨��"
 
-#: ../gtk/gtkprefs.c:1521 ../libgaim/protocols/silc/silc.c:666
+#: ../gtk/gtkprefs.c:1521
+#: ../libgaim/protocols/silc/silc.c:666
 msgid "Normal"
 msgstr "閫e幻"
 
@@ -4096,7 +4354,8 @@
 msgid "Sounds"
 msgstr "�恰��"
 
-#: ../gtk/gtkprefs.c:1912 ../libgaim/protocols/silc/silc.c:1847
+#: ../gtk/gtkprefs.c:1912
+#: ../libgaim/protocols/silc/silc.c:1847
 msgid "Network"
 msgstr "膓画君"
 
@@ -4141,7 +4400,8 @@
 msgid "Set privacy for:"
 msgstr "絽活��鐚�"
 
-#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
+#: ../gtk/gtkprivacy.c:560
+#: ../gtk/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "荐怨�戎����"
 
@@ -4153,7 +4413,8 @@
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "茫�莠後�ユ����荐怨���機����篏睡��������腮宴��"
 
-#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
+#: ../gtk/gtkprivacy.c:565
+#: ../gtk/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "荐怨�(_P)"
 
@@ -4167,7 +4428,8 @@
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "��∈絎�荐怨� %s ��機�����"
 
-#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
+#: ../gtk/gtkprivacy.c:599
+#: ../gtk/gtkprivacy.c:612
 msgid "Block User"
 msgstr "��腟�篏睡����"
 
@@ -4179,7 +4441,8 @@
 msgid "Please enter the name of the user you wish to block."
 msgstr "茫�莠後�ヨ←����腟���篏睡��������腮宴��"
 
-#: ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
+#: ../gtk/gtkprivacy.c:603
+#: ../gtk/gtkprivacy.c:614
 msgid "_Block"
 msgstr "絨���(_B)"
 
@@ -4196,19 +4459,27 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../gtk/gtkrequest.c:267 ../libgaim/protocols/msn/dialog.c:132
-#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../gtk/gtkrequest.c:267
+#: ../libgaim/protocols/msn/dialog.c:132
+#: ../libgaim/protocols/msn/msn.c:555
+#: ../libgaim/protocols/msn/msn.c:564
 #: ../libgaim/protocols/novell/novell.c:1920
-#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303 ../libgaim/request.h:1335
+#: ../libgaim/protocols/silc/buddy.c:313
+#: ../libgaim/protocols/silc/pk.c:117
+#: ../libgaim/protocols/silc/wb.c:303
+#: ../libgaim/request.h:1335
 msgid "Yes"
 msgstr "��"
 
-#: ../gtk/gtkrequest.c:268 ../libgaim/protocols/msn/dialog.c:133
-#: ../libgaim/protocols/msn/msn.c:555 ../libgaim/protocols/msn/msn.c:564
+#: ../gtk/gtkrequest.c:268
+#: ../libgaim/protocols/msn/dialog.c:133
+#: ../libgaim/protocols/msn/msn.c:555
+#: ../libgaim/protocols/msn/msn.c:564
 #: ../libgaim/protocols/novell/novell.c:1921
-#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304 ../libgaim/request.h:1335
+#: ../libgaim/protocols/silc/buddy.c:314
+#: ../libgaim/protocols/silc/pk.c:118
+#: ../libgaim/protocols/silc/wb.c:304
+#: ../libgaim/request.h:1335
 msgid "No"
 msgstr "��"
 
@@ -4232,15 +4503,18 @@
 msgid "Choose New Name"
 msgstr "�後��医��腮�"
 
-#: ../gtk/gtkrequest.c:1513 ../gtk/gtkrequest.c:1558
+#: ../gtk/gtkrequest.c:1513
+#: ../gtk/gtkrequest.c:1558
 msgid "Save File..."
 msgstr "�峨�罟�罅�..."
 
-#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
+#: ../gtk/gtkrequest.c:1514
+#: ../gtk/gtkrequest.c:1559
 msgid "Open File..."
 msgstr "����罟�罅�..."
 
-#: ../gtk/gtkrequest.c:1606 ../gtk/gtkrequest.c:1620
+#: ../gtk/gtkrequest.c:1606
+#: ../gtk/gtkrequest.c:1620
 msgid "Select Folder..."
 msgstr "�御��莖�����..."
 
@@ -4264,7 +4538,8 @@
 msgstr "�医���紊��(_A)"
 
 #. Use button
-#: ../gtk/gtksavedstatuses.c:549 ../gtk/gtksavedstatuses.c:1183
+#: ../gtk/gtksavedstatuses.c:549
+#: ../gtk/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "篏睡��(_U)"
 
@@ -4272,6 +4547,7 @@
 msgid "Title already in use.  You must choose a unique title."
 msgstr "����罔�蕁�罩e��戎��賢��������後�筝��������罔�蕁���"
 
+# TODO - ������藥�筝�絋ワ�篏��割��井�翫ソ�� - 20061123
 #: ../gtk/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "綏���"
@@ -4280,7 +4556,8 @@
 msgid "_Title:"
 msgstr "罔�蕁�(_T)鐚�"
 
-#: ../gtk/gtksavedstatuses.c:1095 ../gtk/gtksavedstatuses.c:1416
+#: ../gtk/gtksavedstatuses.c:1095
+#: ../gtk/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "����(_S)鐚�"
 
@@ -4348,11 +4625,13 @@
 msgstr "GStreamer ��紮���紊掩����"
 
 #. connect to the server
-#: ../gtk/gtkstatusbox.c:567 ../libgaim/protocols/irc/irc.c:329
+#: ../gtk/gtkstatusbox.c:567
+#: ../libgaim/protocols/irc/irc.c:329
 #: ../libgaim/protocols/jabber/jabber.c:1015
 #: ../libgaim/protocols/msn/session.c:344
 #: ../libgaim/protocols/novell/novell.c:2185
-#: ../libgaim/protocols/oscar/oscar.c:1226 ../libgaim/protocols/qq/qq.c:136
+#: ../libgaim/protocols/oscar/oscar.c:1226
+#: ../libgaim/protocols/qq/qq.c:136
 #: ../libgaim/protocols/sametime/sametime.c:3731
 #: ../libgaim/protocols/simple/simple.c:1669
 #: ../libgaim/protocols/yahoo/yahoo.c:2715
@@ -4364,12 +4643,14 @@
 msgid "Waiting for network connection"
 msgstr "膈�緇�膓画君�g�..."
 
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
+#: ../gtk/gtkutils.c:1310
+#: ../gtk/gtkutils.c:1333
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "莠��� %s ���主��篁ヤ����鐚�%s"
 
-#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
+#: ../gtk/gtkutils.c:1313
+#: ../gtk/gtkutils.c:1335
 msgid "Failed to load image"
 msgstr "莅���綵怨�鎀掩��"
 
@@ -4379,32 +4660,31 @@
 msgstr "�≧��渇������ %s��"
 
 #: ../gtk/gtkutils.c:1412
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
+msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
 msgstr "Gaim 羃���莨���渇������������荀����ュ�渇��罟�罅�"
 
-#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
+#: ../gtk/gtkutils.c:1440
+#: ../gtk/gtkutils.c:1449
+#: ../gtk/gtkutils.c:1454
 msgid "You have dragged an image"
 msgstr "�����割�筝���綵怨��"
 
 #: ../gtk/gtkutils.c:1441
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"���札����镾��活叱�����ヨ����������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�"
-"腟�����篏睡������"
-
-#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
+msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
+msgstr "���札����镾��活叱�����ヨ����������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�腟�����篏睡������"
+
+#: ../gtk/gtkutils.c:1445
+#: ../gtk/gtkutils.c:1460
 msgid "Set as buddy icon"
 msgstr "荐㊦�阪ソ����腓�"
 
-#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
+#: ../gtk/gtkutils.c:1446
+#: ../gtk/gtkutils.c:1461
 msgid "Send image file"
 msgstr "�渇��綵怨�閡�"
 
-#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
+#: ../gtk/gtkutils.c:1447
+#: ../gtk/gtkutils.c:1461
 msgid "Insert in message"
 msgstr "���ュ�域���"
 
@@ -4413,20 +4693,12 @@
 msgstr "�����絎�荐㊦�咲����篏睡������絅遵���腓阪���"
 
 #: ../gtk/gtkutils.c:1455
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-"���札����镾��活叱�����ヨ����������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�"
-"腟�����篏睡������"
+msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
+msgstr "���札����镾��活叱�����ヨ����������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�腟�����篏睡������"
 
 #: ../gtk/gtkutils.c:1457
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-"���札����������������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�腟�����篏睡��"
-"����"
+msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgstr "���札����������������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�腟�����篏睡������"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -4438,9 +4710,7 @@
 msgstr "�≧��渇��������"
 
 #: ../gtk/gtkutils.c:1511
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
 msgstr "�����割�筝������������ぇ网��喝�渇���������������罟�罅�鐚���筝�����������昆��"
 
 #: ../gtk/gtkutils.c:2340
@@ -4455,7 +4725,8 @@
 "<b>���鎞阪�鐚�</b> %d�%d"
 
 #. Label
-#: ../gtk/gtkutils.c:2384 ../gtk/gtkutils.c:2406
+#: ../gtk/gtkutils.c:2384
+#: ../gtk/gtkutils.c:2406
 #: ../gtk/plugins/gevolution/new_person_dialog.c:338
 #: ../libgaim/protocols/oscar/oscar.c:602
 msgid "Buddy Icon"
@@ -4468,11 +4739,11 @@
 
 #: ../gtk/gtkutils.c:2782
 #, c-format
-msgid ""
-"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "�≧�莠��ュ襲���%s��������筝����紊ф���襲�閡�綏我��紕�"
 
-#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
+#: ../gtk/gtkwhiteboard.c:756
+#: ../gtk/gtkwhiteboard.c:775
 msgid "Save File"
 msgstr "�峨�罟�罅�"
 
@@ -4484,7 +4755,8 @@
 msgid "Display Statistics"
 msgstr "蕁�ず腟沿�莖���"
 
-#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
+#: ../gtk/plugins/cap/cap.c:458
+#: ../gtk/plugins/cap/cap.c:461
 msgid "Response Probability:"
 msgstr "����膈������句�鐚�"
 
@@ -4498,7 +4770,8 @@
 msgid "Maximum response timeout:"
 msgstr "絅遵�篏��阪��荀�������筝���鐚�"
 
-#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
+#: ../gtk/plugins/cap/cap.c:813
+#: ../gtk/plugins/cap/cap.c:820
 #: ../gtk/plugins/cap/cap.c:827
 msgid "minutes"
 msgstr "����"
@@ -4529,12 +4802,8 @@
 
 #. *  summary
 #: ../gtk/plugins/cap/cap.c:934
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-"絅遵����������羝�─腟� (contact availability plugin, ��腮� cap) ��箴�����絅遵�羝���"
-"�уソ����腟沿�莖�����"
+msgid "The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."
+msgstr "絅遵����������羝�─腟� (contact availability plugin, ��腮� cap) ��箴�����絅遵�羝����уソ����腟沿�莖�����"
 
 #: ../gtk/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -4563,9 +4832,7 @@
 
 # NOTE 罸頫�筝���お�件�筝��篋堺������\n������鐚�����荀�腦�������
 #: ../gtk/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
+msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
 msgstr ""
 "�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n"
 "��腟����緇����取���鐚�腥�����紊����冴��������鐚����榊�倶��絲���\n"
@@ -4595,18 +4862,13 @@
 #. *< version
 #. *< summary
 #: ../gtk/plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+msgid "Allows for controlling the values associated with different buddy states."
 msgstr "莅�篏��������絅遵�������緇����若��"
 
 #. *< description
 #: ../gtk/plugins/contact_priority.c:187
-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 "顒�篏��������臀��������∫���������∝���������緇����種�篁ヤ梢荐�膊�絅遵�絽活��������罨≦���"
 
 #: ../gtk/plugins/extplacement.c:80
 msgid "By conversation count"
@@ -4645,9 +4907,7 @@
 #. *< summary
 #. *  description
 #: ../gtk/plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
+msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
 msgstr "���区�腦����箙�篋よ��悟���篋���御��篁ヤ�����荀�腦�蕁�ず�恰��荐�������紊�"
 
 #. *< type
@@ -4786,7 +5046,8 @@
 msgid "Gaim GTK+ Theme Control"
 msgstr "Gaim GTK+ 篏���源蕁�荐㊤�"
 
-#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
+#: ../gtk/plugins/gaimrc.c:618
+#: ../gtk/plugins/gaimrc.c:619
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "��箴�筝��� gtkrc 荐㊤���絖���"
 
@@ -4848,7 +5109,6 @@
 msgid "Instant Messaging"
 msgstr "�恰���活�絽活��"
 
-#  Add the label.
 #. Add the label.
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
 msgid "Select a person from your address book below, or add a new person."
@@ -4858,9 +5118,11 @@
 #: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
 #: ../gtk/plugins/gevolution/assoc-buddy.c:358
 #: ../libgaim/protocols/jabber/buddy.c:1727
-#: ../libgaim/protocols/oscar/oscar.c:6107 ../libgaim/protocols/qq/group.c:123
+#: ../libgaim/protocols/oscar/oscar.c:6107
+#: ../libgaim/protocols/qq/group.c:123
 #: ../libgaim/protocols/qq/group_im.c:139
-#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
+#: ../libgaim/protocols/qq/sys_msg.c:162
+#: ../libgaim/protocols/qq/sys_msg.c:232
 #: ../libgaim/protocols/qq/sys_msg.c:250
 #: ../libgaim/protocols/sametime/sametime.c:5614
 msgid "Search"
@@ -4882,12 +5144,8 @@
 #  NOTE 絨��� evolution PO 罟�箙�茘��鐚�荅活�筝��≪��Local Addressbook��罌�
 #. Add the label.
 #: ../gtk/plugins/gevolution/assoc-buddy.c:345
-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 expander
@@ -5008,7 +5266,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
+#: ../gtk/plugins/gtk-signals-test.c:163
+#: ../gtk/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr "罟∽�ヤ戎����篁��∝����腮�拭�������処�醇③絽檎��篏���"
 
@@ -5030,7 +5289,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
+#: ../gtk/plugins/iconaway.c:85
+#: ../gtk/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "�����∫����鐚���絨��鎁遵�羝������篋よ�荀�腦���"
 
@@ -5048,9 +5308,7 @@
 
 # FIXME ��⑮ - 20061028
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
 msgstr "���九�遺����恰�荐���轡篏������荀�羆�鐚�茫���MM��腓咲��紮�篋よ���"
 
 # FIXME ��⑮ - 20061028
@@ -5101,11 +5359,8 @@
 
 #. *  summary
 #: ../gtk/plugins/musicmessaging/musicmessaging.c:667
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"�恰�荐���─腟��咲�恰�膩����箴��恰���活����緒�莅�紊���篏睡�����遵����膩�鹿��筝�篁醇�茘���"
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr "�恰�荐���─腟��咲�恰�膩����箴��恰���活����緒�莅�紊���篏睡�����遵����膩�鹿��筝�篁醇�茘���"
 
 #. ---------- "Notify For" ----------
 #: ../gtk/plugins/notify.c:687
@@ -5205,7 +5460,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/notify.c:913 ../gtk/plugins/notify.c:915
+#: ../gtk/plugins/notify.c:913
+#: ../gtk/plugins/notify.c:915
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "��箴�紊�腮��劫�箴����ユ�����������荐�����"
 
@@ -5221,12 +5477,8 @@
 msgstr "莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎��画���篏���"
 
 #: ../gtk/plugins/raw.c:178
-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 ��⑮
 #: ../gtk/plugins/relnot.c:69
@@ -5245,14 +5497,11 @@
 
 #: ../gtk/plugins/relnot.c:80
 #, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"���札�延���膓峨��鐚���緇����亥�� Gaim %s ��鐚�<br><a href=\"http://gaim."
-"sourceforge.net/\">http://gaim.sourceforge.net</a>."
-
-#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
+msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+msgstr "���札�延���膓峨��鐚���緇����亥�� Gaim %s ��鐚�<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
+
+#: ../gtk/plugins/relnot.c:84
+#: ../gtk/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "���亥����"
 
@@ -5275,11 +5524,8 @@
 
 #. *  description
 #: ../gtk/plugins/relnot.c:148
-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��荅牙���������処����篏級���ヤ戎������"
 
 # FIXME 茘�����茘��拷�� - 20061027
 #: ../gtk/plugins/spellchk.c:1963
@@ -5345,7 +5591,8 @@
 msgid "Text replacement"
 msgstr "��絖���篁�"
 
-#: ../gtk/plugins/spellchk.c:2361 ../gtk/plugins/spellchk.c:2362
+#: ../gtk/plugins/spellchk.c:2361
+#: ../gtk/plugins/spellchk.c:2362
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "箴��т戎������絎�臂���荀��鋐���篁i���肴���賢����絖���"
 
@@ -5355,7 +5602,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
+#: ../gtk/plugins/ticker/ticker.c:77
+#: ../gtk/plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "絅遵�莊�薤���"
 
@@ -5363,7 +5611,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
+#: ../gtk/plugins/ticker/ticker.c:358
+#: ../gtk/plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "絅遵�羝�����羂翫抗�峨������"
 
@@ -5393,7 +5642,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../gtk/plugins/timestamp.c:259 ../gtk/plugins/timestamp.c:261
+#: ../gtk/plugins/timestamp.c:259
+#: ../gtk/plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "罸�� N �������� iChat 馺��主�������活��遺困茫�筝㏍��"
 
@@ -5413,11 +5663,13 @@
 msgid "Co_nversations:"
 msgstr "篋よ�(_N)鐚�"
 
-#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
+#: ../gtk/plugins/timestamp_format.c:37
+#: ../gtk/plugins/timestamp_format.c:46
 msgid "For delayed messages"
 msgstr "���荐���"
 
-#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
+#: ../gtk/plugins/timestamp_format.c:38
+#: ../gtk/plugins/timestamp_format.c:47
 msgid "For delayed messages and in chats"
 msgstr ""
 
@@ -5444,9 +5696,7 @@
 
 #. *  description
 #: ../gtk/plugins/timestamp_format.c:154
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
 msgstr "����罔∞���荐延戎�������荐㊤�篋よ����ヨ���荐��������活��弱���"
 
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:183
@@ -5511,14 +5761,13 @@
 #. *  description
 #: ../gtk/plugins/win32/transparency/win2ktrans.c:663
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
 "����罔∞���札莅�篋よ�荀�腦���絅遵�羝����∝���������������\n"
 "\n"
-"* 顇�羈��������罔∞���荀��喝� Win2000 �� Windows �炊�����順�∝��������"
+"* 茫�羈��������罔∞���荀��喝� Win2000 �� Windows �������順�∝��������"
 
 #: ../gtk/plugins/win32/winprefs/winprefs.c:306
 msgid "GTK+ Runtime Version"
@@ -5584,12 +5833,14 @@
 msgid "Save password"
 msgstr "�峨�絲�腆�"
 
-#: ../libgaim/account.c:984 ../libgaim/connection.c:104
+#: ../libgaim/account.c:984
+#: ../libgaim/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "�鞘��� %s ����絎�罔∞�"
 
-#: ../libgaim/account.c:1066 ../libgaim/protocols/gg/gg.c:696
+#: ../libgaim/account.c:1066
+#: ../libgaim/protocols/gg/gg.c:696
 #: ../libgaim/protocols/jabber/jabber.c:1310
 msgid "New passwords do not match."
 msgstr "�医�腆寂研筝��悟���"
@@ -5625,7 +5876,8 @@
 msgid "Change user information for %s"
 msgstr "�贋�� %s ����篋肴�荐�"
 
-#: ../libgaim/account.c:1159 ../libgaim/protocols/toc/toc.c:1690
+#: ../libgaim/account.c:1159
+#: ../libgaim/protocols/toc/toc.c:1690
 msgid "Set User Info"
 msgstr "荐㊤�篏睡����莖�荐�"
 
@@ -5635,19 +5887,10 @@
 
 #: ../libgaim/blist.c:1919
 #, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-"%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�鐚�絅刻���絨�����絽活��茴�������綏臥�∝�����"
-"��絅遵���臂ょ�羃���茴�Щ�ゃ��\n"
-msgstr[1] ""
-"%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�����絨�����絽活��茴�������綏臥�∝�����篋�絅�"
-"��������臂ょ�羃���茴�Щ�ゃ��\n"
+msgid "%d buddy from group %s was not removed because it belongs to an account which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural "%d buddies from group %s were not removed because they belong to accounts which are currently disabled or offline.  These buddies and the group were not removed.\n"
+msgstr[0] "%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�鐚�絅刻���絨�����絽活��茴�������綏臥�∝�������絅遵���臂ょ�羃���茴�Щ�ゃ��\n"
+msgstr[1] "%d ���� %s 臂ょ���絅遵�筝����茴�Щ�わ����坂�����絨�����絽活��茴�������綏臥�∝�����篋�絅遵�������臂ょ�羃���茴�Щ�ゃ��\n"
 
 #: ../libgaim/blist.c:1929
 msgid "Group not removed"
@@ -5671,7 +5914,8 @@
 msgid "Unable to send message: The message is too large."
 msgstr "�≧����肴��������荐���お紊т���"
 
-#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#: ../libgaim/conversation.c:168
+#: ../libgaim/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "�≧����肴���畿 %s��"
@@ -5723,7 +5967,8 @@
 msgstr "%s �∫����紊�� (%s)��"
 
 # NOTE ��⑮鐚���荐掩���銀��靸�
-#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
+#: ../libgaim/desktopitem.c:286
+#: ../libgaim/desktopitem.c:877
 msgid "No name"
 msgstr "���遵��"
 
@@ -5752,7 +5997,8 @@
 msgid "Unable to send request to resolver process\n"
 msgstr "�≧����肴���畿茹f��腮�綺�\n"
 
-#: ../libgaim/dnsquery.c:528 ../libgaim/dnsquery.c:676
+#: ../libgaim/dnsquery.c:528
+#: ../libgaim/dnsquery.c:676
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -5761,7 +6007,8 @@
 "茹f�� %s ��筝㊦�主��篋����鐚�\n"
 "%s"
 
-#: ../libgaim/dnsquery.c:531 ../libgaim/dnsquery.c:690
+#: ../libgaim/dnsquery.c:531
+#: ../libgaim/dnsquery.c:690
 #: ../libgaim/dnsquery.c:798
 #, c-format
 msgid "Error resolving %s: %d"
@@ -5789,7 +6036,8 @@
 msgid "Unknown reason"
 msgstr "����筝���"
 
-#: ../libgaim/ft.c:191 ../libgaim/protocols/msn/msn.c:410
+#: ../libgaim/ft.c:191
+#: ../libgaim/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5987,57 +6235,39 @@
 msgstr "������ymsgr��膓峨������篁�"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:18
-msgid ""
-"True if the command specified in the \"command\" key should handle \"aim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
 msgstr "絋��後�主�冴������鐚���茵�ず��command��罨�����篁ゆ��������aim��膓峨����"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:19
-msgid ""
-"True if the command specified in the \"command\" key should handle \"gg\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
 msgstr "絋��後�主�冴������鐚���茵�ず��command��罨�����篁ゆ��������gg��膓峨����"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:20
-msgid ""
-"True if the command specified in the \"command\" key should handle \"icq\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
 msgstr "絋��後�主�冴������鐚���茵�ず��command��罨�����篁ゆ��������icq��膓峨����"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:21
-msgid ""
-"True if the command specified in the \"command\" key should handle \"irc\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
 msgstr "絋��後�主�冴������鐚���茵�ず��command��罨�����篁ゆ��������irc��膓峨����"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:22
-msgid ""
-"True if the command specified in the \"command\" key should handle \"msnim\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
 msgstr "絋��後�主�冴������鐚���茵�ず��command��罨�����篁ゆ��������msnim��膓峨����"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:23
-msgid ""
-"True if the command specified in the \"command\" key should handle \"sip\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
 msgstr "絋��後�主�冴������鐚���茵�ず��command��罨�����篁ゆ��������sip��膓峨����"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:24
-msgid ""
-"True if the command specified in the \"command\" key should handle \"xmpp\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
 msgstr "絋��後�主�冴������鐚���茵�ず��command��罨�����篁ゆ��������xmpp��膓峨����"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:25
-msgid ""
-"True if the command specified in the \"command\" key should handle \"ymsgr\" "
-"URLs."
+msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
 msgstr "絋��後�主�冴������鐚���茵�ず��command��罨�����篁ゆ��������ymsgr��膓峨����"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:26
-msgid ""
-"True if the command used to handle this type of URL should be run in a "
-"terminal."
+msgid "True if the command used to handle this type of URL should be run in a terminal."
 msgstr "絋��後�主�冴������鐚���茵�ず������腮�恐������篁ら�����腴���決���"
 
 #: ../libgaim/gconf/gaim.schemas.in.h:27
@@ -6100,28 +6330,22 @@
 
 #: ../libgaim/log.c:1115
 #, 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"
 
 #: ../libgaim/log.c:1117
 #, 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 ��⑮
-#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
+#: ../libgaim/log.c:1175
+#: ../libgaim/log.c:1306
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�鞘��井�ヨ�罟�罅�鐚�</b></font>"
 
-#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
+#: ../libgaim/log.c:1187
+#: ../libgaim/log.c:1320
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>�≧�莅���罟�罅�鐚�%s</b></font>"
@@ -6131,7 +6355,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <��������>鐚�%s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1652
+#: ../libgaim/plugin.c:282
+#: ../libgaim/protocols/jabber/buddy.c:1652
 #: ../libgaim/protocols/msn/servconn.c:139
 #: ../libgaim/protocols/msn/session.c:321
 #: ../libgaim/protocols/oscar/oscar.c:2681
@@ -6159,9 +6384,7 @@
 
 #: ../libgaim/plugin.c:533
 #, 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����茫����医�茖�����罔∞�箙�緇���荅���"
 
 #: ../libgaim/plugin.c:538
@@ -6200,7 +6423,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+#: ../libgaim/plugins/dbus-example.c:158
+#: ../libgaim/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus罔∞�膀�箴�"
 
@@ -6218,32 +6442,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
+#: ../libgaim/plugins/filectl.c:251
+#: ../libgaim/plugins/filectl.c:253
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "��荐掩�����罅�筝㊧叱�ユ��篁や札�у�� Gaim��"
 
 #  NOTE ������叱�ユ�篏�綏�����罔�膠わ���綛上����������������吾�������
 #  FIXME 顑�����緇��拷��
-#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+#: ../libgaim/plugins/idle.c:158
+#: ../libgaim/plugins/idle.c:216
 msgid "Minutes"
 msgstr "������"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
-#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+#: ../libgaim/plugins/idle.c:165
+#: ../libgaim/plugins/idle.c:198
+#: ../libgaim/plugins/idle.c:223
+#: ../libgaim/plugins/idle.c:315
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+#: ../libgaim/plugins/idle.c:166
+#: ../libgaim/plugins/idle.c:255
 msgid "Set Account Idle Time"
 msgstr "������ュ験������臀�����"
 
-#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+#: ../libgaim/plugins/idle.c:169
+#: ../libgaim/plugins/idle.c:227
 msgid "_Set"
 msgstr "荐㊤�(_S)"
 
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
+#: ../libgaim/plugins/idle.c:170
+#: ../libgaim/plugins/idle.c:203
 #: ../libgaim/plugins/idle.c:228
 msgid "_Cancel"
 msgstr "��羔�(_C)"
@@ -6252,7 +6483,8 @@
 msgid "None of your accounts are idle."
 msgstr "����絽活���巡�����臀�������"
 
-#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+#: ../libgaim/plugins/idle.c:199
+#: ../libgaim/plugins/idle.c:259
 msgid "Unset Account Idle Time"
 msgstr "��羔�絽活����臀�����荐㊤�"
 
@@ -6260,7 +6492,8 @@
 msgid "_Unset"
 msgstr "��羔�荐㊤�(_U)"
 
-#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+#: ../libgaim/plugins/idle.c:224
+#: ../libgaim/plugins/idle.c:263
 msgid "Set Idle Time for All Accounts"
 msgstr "荐㊤�����絽活������臀�����"
 
@@ -6268,7 +6501,8 @@
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "��羔�����綏臥��臀�験������臀�����"
 
-#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+#: ../libgaim/plugins/idle.c:317
+#: ../libgaim/plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "��荐掩������荐㊤���群��臀��紊�箙�����"
 
@@ -6294,11 +6528,8 @@
 # NOTE Patch by Kevin Leung
 #. *  description
 #: ../libgaim/plugins/ipc-test-client.c:92
-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 ��呃��恰���上�篌堺����─腟�緇��弱ü�����莠�����篁ゃ��"
 
 #. *< type
 #. *< ui_requirement
@@ -6341,7 +6572,8 @@
 msgid "Auto-response sent:"
 msgstr "�����������削�"
 
-#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
+#: ../libgaim/plugins/log_reader.c:1568
+#: ../libgaim/plugins/log_reader.c:1571
 #: ../libgaim/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
@@ -6356,9 +6588,7 @@
 msgstr "��群膓���罩∵��篌堺�������g���"
 
 #: ../libgaim/plugins/log_reader.c:1603
-msgid ""
-"You are currently disconnected. Messages will not be received unless you are "
-"logged in."
+msgid "You are currently disconnected. Messages will not be received unless you are logged in."
 msgstr "���������∝��������������亥�糸�ュ��鐚�絨��≧��九�遺算篏�荐�����"
 
 #: ../libgaim/plugins/log_reader.c:1618
@@ -6373,28 +6603,32 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
+#: ../libgaim/plugins/log_reader.c:1976
+#: ../libgaim/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
+#: ../libgaim/plugins/log_reader.c:1989
+#: ../libgaim/plugins/log_reader.c:2090
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
+#: ../libgaim/plugins/log_reader.c:2001
+#: ../libgaim/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
+#: ../libgaim/plugins/log_reader.c:2014
+#: ../libgaim/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
@@ -6402,7 +6636,8 @@
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
+#: ../libgaim/plugins/log_reader.c:2026
+#: ../libgaim/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
@@ -6445,14 +6680,11 @@
 #. * description
 #: ../libgaim/plugins/log_reader.c:2134
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
-"\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
-"at your own risk!"
-msgstr ""
-"�句�頳醇�ヨ���鐚�����罔∞������銀��恰��荐������句����ヨ�箙������俄���������� "
-"Adium��Fire��Messenger Plus!��MSN Messenger��篁ュ� Trillian��\n"
+"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
+msgstr ""
+"�句�頳醇�ヨ���鐚�����罔∞������銀��恰��荐������句����ヨ�箙������俄���������� Adium��Fire��Messenger Plus!��MSN Messenger��篁ュ� Trillian��\n"
 "\n"
 "羈��������罔∞�篁����守���弱����鐚���罩ゅ��順�絽悟�倶���絋���篏睡���緇������鐚�"
 
@@ -6478,7 +6710,8 @@
 #. *< name
 #. *< version
 #. *< summary
-#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+#: ../libgaim/plugins/perl/perl.c:590
+#: ../libgaim/plugins/perl/perl.c:591
 msgid "Provides support for loading perl plugins."
 msgstr "��箴�莅��� Perl 罔∞�����叵��"
 
@@ -6491,12 +6724,8 @@
 msgstr "���������ャ��絨�荀���紮���篋よ�"
 
 #: ../libgaim/plugins/psychic.c:21
-msgid ""
-"Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"絨��剛���紮�����困茫�鐚�絨援��恰����篋よ�荀�腦��������� AIM��ICQ��Jabber��Sametime �� "
-"Yahoo��"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr "絨��剛���紮�����困茫�鐚�絨援��恰����篋よ�荀�腦��������� AIM��ICQ��Jabber��Sametime �� Yahoo��"
 
 #: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -6533,7 +6762,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+#: ../libgaim/plugins/signals-test.c:687
+#: ../libgaim/plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "罟∽�ュ��腮�拭�������処�醇③絽檎��篏���"
 
@@ -6551,7 +6781,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+#: ../libgaim/plugins/simple.c:40
+#: ../libgaim/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "���羝������ぇ��蚕���沿タ�処�醇③絽檎��篏���"
 
@@ -6569,7 +6800,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+#: ../libgaim/plugins/ssl/ssl.c:97
+#: ../libgaim/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "�堺��� SSL ���恖�綺��箴�筝��� Wrapper��"
 
@@ -6606,7 +6838,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+#: ../libgaim/plugins/ssl/ssl-nss.c:412
+#: ../libgaim/plugins/ssl/ssl-nss.c:414
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "��� Mozilla �� NSS ��鋐� SSL ����叵��"
 
@@ -6665,27 +6898,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
-msgid ""
-"Notifies in a conversation window when a buddy goes or returns from away or "
-"idle."
+#: ../libgaim/plugins/statenotify.c:145
+#: ../libgaim/plugins/statenotify.c:148
+msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
 msgstr "��困茫�荀�腦�筝㊨¨腓阪ソ���∫�������演�∫��鐚���臀��菴��������ヨ�����"
 
 #: ../libgaim/plugins/tcl/tcl.c:413
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 罔∞�莠��ュ��"
 
-#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+#: ../libgaim/plugins/tcl/tcl.c:415
+#: ../libgaim/plugins/tcl/tcl.c:416
 msgid "Provides support for loading Tcl plugins"
 msgstr "��箴�莅��� Tcl 罔∞������"
 
 #: ../libgaim/plugins/tcl/tcl.c:481
-msgid ""
-"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
-"install ActiveTCL from http://www.activestate.com\n"
-msgstr ""
-"�憘��� ActiveTCL鐚�絋�����膊�篏睡�� TCL 絲�����罔∞�鐚�茫��� http://www.activestate."
-"com 筝�莠���絎�茖� ActiveTCL��\n"
+msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
+msgstr "�鞘��� ActiveTCL鐚�絋�����膊�篏睡�� TCL 絲�����罔∞�鐚�茫��� http://www.activestate.com 筝�莠���絎�茖� ActiveTCL��\n"
 
 #. Send a message about the connection error
 #: ../libgaim/protocols/bonjour/bonjour.c:111
@@ -6693,8 +6922,7 @@
 msgstr "�≧��ユ�狗�e�ョ���恰��荐����g�\n"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:146
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "�≧���菴�腴��� mDNS 篌堺����産腴��g���絎����決�筝㊤���"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:337
@@ -6745,19 +6973,23 @@
 msgstr "筝紙���腮�"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:581 ../libgaim/protocols/gg/gg.c:622
+#: ../libgaim/protocols/bonjour/bonjour.c:581
+#: ../libgaim/protocols/gg/gg.c:622
 #: ../libgaim/protocols/jabber/jabber.c:804
 msgid "First name"
 msgstr "��"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:584 ../libgaim/protocols/gg/gg.c:617
+#: ../libgaim/protocols/bonjour/bonjour.c:584
+#: ../libgaim/protocols/gg/gg.c:617
 #: ../libgaim/protocols/jabber/jabber.c:809
 msgid "Last name"
 msgstr "紮�"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:587 ../libgaim/protocols/gg/gg.c:468
+#: ../libgaim/protocols/bonjour/bonjour.c:587
+#: ../libgaim/protocols/gg/gg.c:468
 #: ../libgaim/protocols/jabber/jabber.c:794
-#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+#: ../libgaim/protocols/silc/silc.c:695
+#: ../libgaim/protocols/silc/silc.c:935
 msgid "E-mail"
 msgstr "�糸��灸散"
 
@@ -6799,28 +7031,30 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "�≧����肴����篋よ��≧���紮���"
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
+#: ../libgaim/protocols/gg/gg.c:76
+#: ../libgaim/proxy.c:1791
 msgid "Invalid proxy settings"
 msgstr "�≧����篁g��篌堺����┃絎�"
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"絨��惹��������荐㊤���篁g��篌堺��������箴�茯������腟����篌堺������腮怨���荐������≧����"
-
-#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
+#: ../libgaim/protocols/gg/gg.c:77
+#: ../libgaim/proxy.c:1791
+msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgstr "絨��惹��������荐㊤���篁g��篌堺��������箴�茯������腟����篌堺������腮怨���荐������≧����"
+
+#: ../libgaim/protocols/gg/gg.c:115
+#: ../libgaim/protocols/gg/gg.c:137
 #: ../libgaim/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Token ���"
 
-#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
+#: ../libgaim/protocols/gg/gg.c:116
+#: ../libgaim/protocols/gg/gg.c:138
 #: ../libgaim/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "�≧���緇� Token��\n"
 
-#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
+#: ../libgaim/protocols/gg/gg.c:269
+#: ../libgaim/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "�峨�絅遵�羝���..."
 
@@ -6828,7 +7062,8 @@
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "����絅遵�羝��������鐚���篁ユ���莖���茴���ユ�罅�筝㏍��"
 
-#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
+#: ../libgaim/protocols/gg/gg.c:276
+#: ../libgaim/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "�≧�����罟�罅�"
 
@@ -6836,7 +7071,8 @@
 msgid "Buddylist saved successfully!"
 msgstr "絅遵�羝����峨�����鐚�"
 
-#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
+#: ../libgaim/protocols/gg/gg.c:307
+#: ../libgaim/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "�≧�莅��ュソ��羝���"
 
@@ -6872,25 +7108,30 @@
 msgid "Registration completed successfully!"
 msgstr "荐糸������鐚�"
 
-#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
+#: ../libgaim/protocols/gg/gg.c:473
+#: ../libgaim/protocols/gg/gg.c:764
 #: ../libgaim/protocols/jabber/jabber.c:783
 #: ../libgaim/protocols/jabber/jabber.c:1345
 msgid "Password"
 msgstr "絲�腆�"
 
-#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
+#: ../libgaim/protocols/gg/gg.c:478
+#: ../libgaim/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "絲�腆種���罨∴叱�ワ�"
 
-#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
+#: ../libgaim/protocols/gg/gg.c:483
+#: ../libgaim/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "莠後�ョ������絲�腆�"
 
-#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
+#: ../libgaim/protocols/gg/gg.c:489
+#: ../libgaim/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "����絲�腆�"
 
-#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
+#: ../libgaim/protocols/gg/gg.c:493
+#: ../libgaim/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "荐糸���亥�� Gadu-Gadu 絽活��"
 
@@ -6899,23 +7140,30 @@
 msgstr "茫�莠後�ヤ札筝���罨�篏�"
 
 #. General
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1038
-#: ../libgaim/protocols/gg/gg.c:1104 ../libgaim/protocols/gg/gg.c:2188
+#: ../libgaim/protocols/gg/gg.c:627
+#: ../libgaim/protocols/gg/gg.c:1038
+#: ../libgaim/protocols/gg/gg.c:1104
+#: ../libgaim/protocols/gg/gg.c:2188
 #: ../libgaim/protocols/jabber/buddy.c:271
 #: ../libgaim/protocols/jabber/buddy.c:803
 #: ../libgaim/protocols/jabber/buddy.c:1529
 #: ../libgaim/protocols/jabber/buddy.c:1711
 #: ../libgaim/protocols/jabber/jabber.c:799
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1536
+#: ../libgaim/protocols/msn/msn.c:1370
+#: ../libgaim/protocols/msn/msn.c:1536
 #: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
-#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
+#: ../libgaim/protocols/silc/buddy.c:1528
+#: ../libgaim/protocols/silc/ops.c:1036
+#: ../libgaim/protocols/silc/ops.c:1179
+#: ../libgaim/protocols/silc/ops.c:1328
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1055
 msgid "Nickname"
 msgstr "�援┗"
 
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1043
-#: ../libgaim/protocols/gg/gg.c:1107 ../libgaim/protocols/jabber/jabber.c:819
+#: ../libgaim/protocols/gg/gg.c:632
+#: ../libgaim/protocols/gg/gg.c:1043
+#: ../libgaim/protocols/gg/gg.c:1107
+#: ../libgaim/protocols/jabber/jabber.c:819
 #: ../libgaim/protocols/oscar/oscar.c:3690
 #: ../libgaim/protocols/oscar/oscar.c:3698
 #: ../libgaim/protocols/qq/buddy_info.c:49
@@ -6926,7 +7174,8 @@
 msgid "Year of birth"
 msgstr "�榊��綛�"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1538
+#: ../libgaim/protocols/gg/gg.c:640
+#: ../libgaim/protocols/msn/msn.c:1538
 #: ../libgaim/protocols/oscar/oscar.c:3654
 #: ../libgaim/protocols/qq/buddy_info.c:46
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1080
@@ -6937,12 +7186,14 @@
 msgid "Male or female"
 msgstr "�傑�ф��絅恰��"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3654
+#: ../libgaim/protocols/gg/gg.c:642
+#: ../libgaim/protocols/oscar/oscar.c:3654
 #: ../libgaim/protocols/qq/buddy_info.c:83
 msgid "Male"
 msgstr "��"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3654
+#: ../libgaim/protocols/gg/gg.c:643
+#: ../libgaim/protocols/oscar/oscar.c:3654
 #: ../libgaim/protocols/qq/buddy_info.c:84
 msgid "Female"
 msgstr "絅�"
@@ -6951,7 +7202,8 @@
 msgid "Only online"
 msgstr "����筝�膩�"
 
-#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
+#: ../libgaim/protocols/gg/gg.c:651
+#: ../libgaim/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "��絨�絅遵�"
 
@@ -6987,7 +7239,8 @@
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "茫�莠御������絲�腆弱�篏����医�腆種�"
 
-#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
+#: ../libgaim/protocols/gg/gg.c:788
+#: ../libgaim/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "莅��� Gadu-Gadu 絲�腆�"
 
@@ -6996,16 +7249,19 @@
 msgid "Select a chat for buddy: %s"
 msgstr "�後�筝�����紊��腟�ソ��鐚�%s"
 
-#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
+#: ../libgaim/protocols/gg/gg.c:866
+#: ../libgaim/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "�医��域��紊��..."
 
-#: ../libgaim/protocols/gg/gg.c:1029 ../libgaim/protocols/gg/gg.c:1098
+#: ../libgaim/protocols/gg/gg.c:1029
+#: ../libgaim/protocols/gg/gg.c:1098
 #: ../libgaim/protocols/oscar/oscar.c:3626
 msgid "UIN"
 msgstr "絽活��"
 
-#: ../libgaim/protocols/gg/gg.c:1033 ../libgaim/protocols/gg/gg.c:1101
+#: ../libgaim/protocols/gg/gg.c:1033
+#: ../libgaim/protocols/gg/gg.c:1101
 #: ../libgaim/protocols/jabber/buddy.c:1525
 #: ../libgaim/protocols/jabber/buddy.c:1701
 #: ../libgaim/protocols/oscar/oscar.c:3637
@@ -7013,11 +7269,13 @@
 msgid "First Name"
 msgstr "��"
 
-#: ../libgaim/protocols/gg/gg.c:1052 ../libgaim/protocols/gg/gg.c:1110
+#: ../libgaim/protocols/gg/gg.c:1052
+#: ../libgaim/protocols/gg/gg.c:1110
 msgid "Birth Year"
 msgstr "�榊��綛�"
 
-#: ../libgaim/protocols/gg/gg.c:1092 ../libgaim/protocols/gg/gg.c:1161
+#: ../libgaim/protocols/gg/gg.c:1092
+#: ../libgaim/protocols/gg/gg.c:1161
 #: ../libgaim/protocols/oscar/oscar.c:3801
 msgid "Unable to display the search results."
 msgstr "�≧�蕁�ず��絨�腟�����"
@@ -7039,7 +7297,8 @@
 msgid "There are no users matching your search criteria."
 msgstr "�≧�箴��ф��絨�罌�篁倶�上�亥�悟���篏睡������"
 
-#: ../libgaim/protocols/gg/gg.c:1291 ../libgaim/protocols/gg/gg.c:1440
+#: ../libgaim/protocols/gg/gg.c:1291
+#: ../libgaim/protocols/gg/gg.c:1440
 msgid "Unable to read socket"
 msgstr "�≧�莅��� Socket"
 
@@ -7059,11 +7318,13 @@
 msgid "Your buddy list was stored on the server."
 msgstr "����絅遵�羝���群茴���丈�寂失�������"
 
-#: ../libgaim/protocols/gg/gg.c:1486 ../libgaim/protocols/gg/gg.c:1716
+#: ../libgaim/protocols/gg/gg.c:1486
+#: ../libgaim/protocols/gg/gg.c:1716
 msgid "Connection failed."
 msgstr "�g�紊掩����"
 
-#: ../libgaim/protocols/gg/gg.c:1622 ../libgaim/protocols/msn/msn.c:562
+#: ../libgaim/protocols/gg/gg.c:1622
+#: ../libgaim/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "絨���"
 
@@ -7147,18 +7408,21 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 篏睡����"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
+#: ../libgaim/protocols/irc/cmds.c:43
+#: ../libgaim/protocols/silc/silc.c:1581
 #, c-format
 msgid "Unknown command: %s"
 msgstr "���ョ����篁わ�%s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:591
+#: ../libgaim/protocols/irc/cmds.c:505
+#: ../libgaim/protocols/jabber/chat.c:591
 #: ../libgaim/protocols/silc/silc.c:1289
 #, c-format
 msgid "current topic is: %s"
 msgstr "�上����筝脂��削�%s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:595
+#: ../libgaim/protocols/irc/cmds.c:509
+#: ../libgaim/protocols/jabber/chat.c:595
 #: ../libgaim/protocols/silc/silc.c:1293
 msgid "No topic is set"
 msgstr "羃���荐㊤�筝脂�"
@@ -7193,8 +7457,10 @@
 msgid "MOTD for %s"
 msgstr "%s �����ヨ���"
 
-#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
+#: ../libgaim/protocols/irc/irc.c:128
+#: ../libgaim/protocols/irc/irc.c:166
+#: ../libgaim/protocols/irc/irc.c:608
+#: ../libgaim/protocols/irc/irc.c:633
 msgid "Server has disconnected"
 msgstr "篌堺����群��罩∫�g�"
 
@@ -7202,11 +7468,13 @@
 msgid "View MOTD"
 msgstr "蕁�ず���ヨ��� (MOTD)"
 
-#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
+#: ../libgaim/protocols/irc/irc.c:271
+#: ../libgaim/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "�脂��(_C)鐚�"
 
-#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
+#: ../libgaim/protocols/irc/irc.c:277
+#: ../libgaim/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "絲�腆�(_P)鐚�"
 
@@ -7215,17 +7483,20 @@
 msgstr "IRC �援┗筝�������腥榊�遵���"
 
 # XXX ��⑮
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:579
+#: ../libgaim/protocols/irc/irc.c:337
+#: ../libgaim/protocols/jabber/jabber.c:579
 #: ../libgaim/protocols/jabber/jabber.c:924
 msgid "SSL support unavailable"
 msgstr "羃��� SSL ���"
 
-#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
+#: ../libgaim/protocols/irc/irc.c:348
+#: ../libgaim/protocols/simple/simple.c:464
 #: ../libgaim/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr "���綮榊� Socket"
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:457
+#: ../libgaim/protocols/irc/irc.c:412
+#: ../libgaim/protocols/jabber/jabber.c:457
 #: ../libgaim/protocols/oscar/oscar.c:1222
 msgid "Couldn't connect to host"
 msgstr "�≧��e�遺失����"
@@ -7234,27 +7505,32 @@
 # NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX ��罩g����������≧��g��活�茘���������腴��羣���鐚�筝������g�紊掩����鐚�荀�筝�����腴�鐚�
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:481
+#: ../libgaim/protocols/irc/irc.c:434
+#: ../libgaim/protocols/jabber/jabber.c:481
 msgid "Connection Failed"
 msgstr "�≧��g��活�茘���������腴��羣�"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:484
+#: ../libgaim/protocols/irc/irc.c:437
+#: ../libgaim/protocols/jabber/jabber.c:484
 msgid "SSL Handshake Failed"
 msgstr "SSL 篋よ�紊掩��"
 
 # NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��f�丈�沿タ
-#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
+#: ../libgaim/protocols/irc/irc.c:605
+#: ../libgaim/protocols/irc/irc.c:630
 msgid "Read error"
 msgstr "莅������"
 
-#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
+#: ../libgaim/protocols/irc/irc.c:769
+#: ../libgaim/protocols/silc/chat.c:1421
 #: ../libgaim/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "篏睡����"
 
 #: ../libgaim/protocols/irc/irc.c:772
 #: ../libgaim/protocols/sametime/sametime.c:3385
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1380
+#: ../libgaim/protocols/silc/chat.c:1424
+#: ../libgaim/protocols/silc/ops.c:1380
 #: ../libgaim/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "筝脂�"
@@ -7277,21 +7553,26 @@
 msgstr "莠�絅順�� IRC ��絎�罔∞�"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:922 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/irc/irc.c:922
+#: ../libgaim/protocols/irc/msgs.c:235
 #: ../libgaim/protocols/jabber/jabber.c:1976
-#: ../libgaim/protocols/msn/msn.c:2054 ../libgaim/protocols/qq/qq.c:1033
+#: ../libgaim/protocols/msn/msn.c:2054
+#: ../libgaim/protocols/qq/qq.c:1033
 #: ../libgaim/protocols/sametime/sametime.c:5720
-#: ../libgaim/protocols/silc/ops.c:1242 ../libgaim/protocols/silc/ops.c:1344
+#: ../libgaim/protocols/silc/ops.c:1242
+#: ../libgaim/protocols/silc/ops.c:1344
 #: ../libgaim/protocols/simple/simple.c:1835
 #: ../libgaim/protocols/toc/toc.c:2347
 msgid "Server"
 msgstr "篌堺����"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:925 ../libgaim/protocols/msn/msn.c:2059
+#: ../libgaim/protocols/irc/irc.c:925
+#: ../libgaim/protocols/msn/msn.c:2059
 #: ../libgaim/protocols/qq/qq.c:1036
 #: ../libgaim/protocols/sametime/sametime.c:5725
-#: ../libgaim/protocols/silc/silc.c:1855 ../libgaim/protocols/toc/toc.c:2351
+#: ../libgaim/protocols/silc/silc.c:1855
+#: ../libgaim/protocols/toc/toc.c:2351
 msgid "Port"
 msgstr "��荐���"
 
@@ -7299,15 +7580,20 @@
 msgid "Encodings"
 msgstr "膩�⊆"
 
-#: ../libgaim/protocols/irc/irc.c:931 ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/irc/irc.c:931
+#: ../libgaim/protocols/irc/msgs.c:229
 #: ../libgaim/protocols/jabber/jabber.c:779
-#: ../libgaim/protocols/silc/buddy.c:1531 ../libgaim/protocols/silc/ops.c:1189
-#: ../libgaim/protocols/silc/ops.c:1191 ../libgaim/protocols/silc/ops.c:1338
-#: ../libgaim/protocols/silc/ops.c:1340 ../libgaim/protocols/silc/silc.c:929
+#: ../libgaim/protocols/silc/buddy.c:1531
+#: ../libgaim/protocols/silc/ops.c:1189
+#: ../libgaim/protocols/silc/ops.c:1191
+#: ../libgaim/protocols/silc/ops.c:1338
+#: ../libgaim/protocols/silc/ops.c:1340
+#: ../libgaim/protocols/silc/silc.c:929
 msgid "Username"
 msgstr "篏睡����"
 
-#: ../libgaim/protocols/irc/irc.c:934 ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/irc/irc.c:934
+#: ../libgaim/protocols/irc/msgs.c:230
 #: ../libgaim/protocols/silc/silc.c:933
 msgid "Real name"
 msgstr "紮���"
@@ -7341,13 +7627,15 @@
 msgid "Cannot ban %s: banlist is full"
 msgstr "�≧�胼�罩� %s鐚�胼�罩∽���群羯�"
 
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/irc/msgs.c:235
+#: ../libgaim/protocols/irc/msgs.c:215
+#: ../libgaim/protocols/irc/msgs.c:235
 #: ../libgaim/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s鐚�</b>%s"
 
-#: ../libgaim/protocols/irc/msgs.c:215 ../libgaim/protocols/oscar/oscar.c:3627
+#: ../libgaim/protocols/irc/msgs.c:215
+#: ../libgaim/protocols/oscar/oscar.c:3627
 #: ../libgaim/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "�援┗"
@@ -7360,14 +7648,17 @@
 msgid " <i>(identified)</i>"
 msgstr " <i>(綏臥�茘�)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:223 ../libgaim/protocols/irc/msgs.c:229
-#: ../libgaim/protocols/irc/msgs.c:230 ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/irc/msgs.c:223
+#: ../libgaim/protocols/irc/msgs.c:229
+#: ../libgaim/protocols/irc/msgs.c:230
+#: ../libgaim/protocols/irc/msgs.c:241
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s鐚�</b>%s<br>"
 
-#: ../libgaim/protocols/irc/msgs.c:241 ../libgaim/protocols/silc/ops.c:1255
+#: ../libgaim/protocols/irc/msgs.c:241
+#: ../libgaim/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "�����脂��"
 
@@ -7381,6 +7672,7 @@
 msgstr "筝�膩���"
 
 #: ../libgaim/protocols/irc/msgs.c:252
+#, fuzzy
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>�颷逸�</b>��絎���腑�<br>"
 
@@ -7465,7 +7757,8 @@
 msgstr "��← %s 荼√�削�(%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:731 ../libgaim/protocols/silc/ops.c:720
+#: ../libgaim/protocols/irc/msgs.c:731
+#: ../libgaim/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "茴� %s 荼√�� (%s)"
@@ -7475,20 +7768,17 @@
 msgid "mode (%s %s) by %s"
 msgstr "罔≦� (%s %s) 茴� %s 荐㊤�"
 
-#: ../libgaim/protocols/irc/msgs.c:839 ../libgaim/protocols/irc/msgs.c:840
+#: ../libgaim/protocols/irc/msgs.c:839
+#: ../libgaim/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "�≧�����援┗"
 
 #: ../libgaim/protocols/irc/msgs.c:841
-msgid ""
-"Your selected nickname was rejected by the server.  It probably contains "
-"invalid characters."
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
 msgstr "篌堺������腟�篋�������絎����援┗鐚��援┗筝㊤ぇ网������≧��絖�����"
 
 #: ../libgaim/protocols/irc/msgs.c:846
-msgid ""
-"Your selected account name was rejected by the server.  It probably contains "
-"invalid characters."
+msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr "篌堺������腟�篋�������絎���絽活����腮縁���腮延賢紊ф������≧��絖�����"
 
 #: ../libgaim/protocols/irc/msgs.c:885
@@ -7518,7 +7808,8 @@
 msgid "Cannot join %s:"
 msgstr "�≧����� %s鐚�"
 
-#: ../libgaim/protocols/irc/msgs.c:1032 ../libgaim/protocols/silc/ops.c:1128
+#: ../libgaim/protocols/irc/msgs.c:1032
+#: ../libgaim/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "�≧����ラ�脂��"
 
@@ -7537,9 +7828,7 @@
 msgstr "action &lt;荀��決�����篏�&gt;鐚��決�筝�����篏���"
 
 #: ../libgaim/protocols/irc/parse.c:117
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
+msgid "away [message]:  Set an away message, or use no message to return from being away."
 msgstr "away [荐���]鐚�荐㊤�筝����∫��荐�����������∫����筝���絎�篁私�荐�����"
 
 #: ../libgaim/protocols/irc/parse.c:118
@@ -7548,61 +7837,32 @@
 
 # XXX ��⑮
 #: ../libgaim/protocols/irc/parse.c:119
-msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
-msgstr ""
-"deop &lt;�援┗1&gt; [�援┗2] ...鐚�腱脂�ゆ����篋榊�����脂��膊∞������罨�����������傑��"
-"���脂��膊∞��������罨������遵��決�������篏���"
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;�援┗1&gt; [�援┗2] ...鐚�腱脂�ゆ����篋榊�����脂��膊∞������罨�����������傑�����脂��膊∞��������罨������遵��決�������篏���"
 
 #: ../libgaim/protocols/irc/parse.c:120
-msgid ""
-"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
-"someone, preventing them from speaking if the channel is moderated (+m). You "
-"must be a channel operator to do this."
-msgstr ""
-"devoice &lt;�援┗1&gt; [�援┗2] ...鐚�腱脂�ゆ����篋榊�����取���罨�����胼�罩∽��篋�篋阪���脂��"
-"筝㊦�取;筝��句��荐�茫���������傑�����脂��膊∞��������罨������遵��決�������篏���"
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;�援┗1&gt; [�援┗2] ...鐚�腱脂�ゆ����篋榊�����取���罨�����胼�罩∽��篋�篋阪���脂��筝㊦�取;筝��句��荐�茫���������傑�����脂��膊∞��������罨������遵��決�������篏���"
 
 #: ../libgaim/protocols/irc/parse.c:121
-msgid ""
-"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
-"channel, or the current channel."
-msgstr ""
-"invite &lt�援┗&gt; [��紊��]鐚���茫�����篋坂����ユ������絎����脂��鐚�����������������"
-"�脂����"
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt�援┗&gt; [��紊��]鐚���茫�����篋坂����ユ������絎����脂��鐚������������������脂����"
 
 #: ../libgaim/protocols/irc/parse.c:122
-msgid ""
-"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"j &lt;��紊��1&gt;[,��紊��2][,...] [絲���1[,絲���2][,...]]鐚�篁ユ��絎���絲��逸�絋���腟�"
-"篋�筝�����荀�鐚����ユ����絎�����紊����"
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;��紊��1&gt;[,��紊��2][,...] [絲���1[,絲���2][,...]]鐚�篁ユ��絎���絲��逸�絋���腟��筝�����荀�鐚����ユ����絎�����紊����"
 
 #: ../libgaim/protocols/irc/parse.c:123
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-"join &lt;��紊��1&gt;[,��紊��2][,...] [絲���1[,絲���2][,...]]鐚�篁ユ��絎���絲��逸�絋�"
-"��腟��筝�����荀�鐚����ユ����絎�����紊����"
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;��紊��1&gt;[,��紊��2][,...] [絲���1[,絲���2][,...]]鐚�篁ユ��絎���絲��逸�絋���腟��筝�����荀�鐚����ユ����絎�����紊����"
 
 #: ../libgaim/protocols/irc/parse.c:124
-msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
-msgstr ""
-"kick &lt;�援┗&gt; [荐���]鐚�絨�����篏睡����荼√�咲�脂����������傑�����脂��膊∞������罨���"
-"���遵��決�������篏���"
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;�援┗&gt; [荐���]鐚�絨�����篏睡����荼√�咲�脂����������傑�����脂��膊∞������罨������遵��決�������篏���"
 
 #: ../libgaim/protocols/irc/parse.c:125
-msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
-msgstr ""
-"list鐚����榊������恐腟>�����紊��羝�����<i>茫�羈������篋�篌堺�����������決�篋�������篏�"
-"箙�緇�鐚�綣決�筝㊥②�����g���</i>"
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list鐚����榊������恐腟>�����紊��羝�����<i>茫�羈������篋�篌堺�����������決�篋�������篏�箙�緇�鐚�綣決�筝㊥②�����g���</i>"
 
 #: ../libgaim/protocols/irc/parse.c:126
 msgid "me &lt;action to perform&gt;:  Perform an action."
@@ -7613,19 +7873,12 @@
 msgstr "memoserv鐚����坂�����篁ゅ�� memoserv"
 
 #: ../libgaim/protocols/irc/parse.c:128
-msgid ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
-"or user mode."
-msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;�援┗|�脂��&gt;鐚�荐㊤���茹i�ら�脂���延戎����罔≦���"
+msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
+msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;�援┗|�脂��&gt;鐚�荐㊤���茹i�ら�脂���延戎����罔≦���"
 
 #: ../libgaim/protocols/irc/parse.c:129
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"msg &lt;�援┗&gt; &lt;荐���&gt;鐚����坂���腱�篋肴���畿��絎���篏睡����鐚��水���渇���医����"
-"�脂��筝㍼���"
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "msg &lt;�援┗&gt; &lt;荐���&gt;鐚����坂���腱�篋肴���畿��絎���篏睡����鐚��水���渇���医���冗�脂��筝㍼���"
 
 #: ../libgaim/protocols/irc/parse.c:130
 msgid "names [channel]:  List the users currently in a channel."
@@ -7641,48 +7894,28 @@
 msgstr "nickserv鐚����坂�����篁ゅ�� nickserv"
 
 #: ../libgaim/protocols/irc/parse.c:133
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"op &lt;�援┗&gt; [�援┗] ...鐚�莖�������篏睡�������脂��膊∞������罨�����������傑������"
-"��膊∞������罨������遵�決�������篏���"
+msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
+msgstr "op &lt;�援┗&gt; [�援┗] ...鐚�莖�������篏睡�������脂��膊∞������罨�����������傑�����脂��膊∞������罨������遵�決�������篏���"
 
 #: ../libgaim/protocols/irc/parse.c:134
-msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
-msgstr ""
-"operwall &lt;荐���&gt;鐚�絋�������ラ������更篁�藝主����鐚�����醇���莨��篏睡��������"
-"篁ゃ��"
+msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "operwall &lt;荐���&gt;鐚�絋�������ラ������更篁�藝主����鐚�����醇���莨��篏睡��������篁ゃ��"
 
 #: ../libgaim/protocols/irc/parse.c:135
 msgid "operserv: Send a command to operserv"
 msgstr "operserv鐚����坂�����篁ゅ�� operserv"
 
 #: ../libgaim/protocols/irc/parse.c:136
-msgid ""
-"part [room] [message]:  Leave the current channel, or a specified channel, "
-"with an optional message."
-msgstr ""
-"part [�脂��] [荐���]鐚��∫���������脂������絎����脂������絎��脂������������絎����榊��荐�"
-"����"
+msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
+msgstr "part [�脂��] [荐���]鐚��∫���������脂������絎����脂������絎��脂������������絎����榊��荐�����"
 
 #: ../libgaim/protocols/irc/parse.c:137
-msgid ""
-"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
-"has."
-msgstr ""
-"ping [�援┗]鐚��ヨ���筝���篏睡������膓画君������綺�����������絎�篏睡������鐚��ヨ�篌堺����"
-"��������綺����"
+msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
+msgstr "ping [�援┗]鐚��ヨ���筝���篏睡������膓画君������綺�����������絎�篏睡������鐚��ヨ�篌堺������������綺����"
 
 #: ../libgaim/protocols/irc/parse.c:138
-msgid ""
-"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-"query &lt;�援┗&gt; &lt;荐���&gt;鐚����坂���腱�篋肴���畿��絎���篏睡����鐚��水���守���医��"
-"�冗�脂��鐚���"
+msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
+msgstr "query &lt;�援┗&gt; &lt;荐���&gt;鐚����坂���腱�篋肴���畿��絎���篏睡����鐚��水���守���医���冗�脂��鐚���"
 
 #: ../libgaim/protocols/irc/parse.c:139
 msgid "quit [message]:  Disconnect from the server, with an optional message."
@@ -7694,12 +7927,8 @@
 msgstr "quote [...]鐚����坂��� RAW ��篁ゅ�遺失������"
 
 #: ../libgaim/protocols/irc/parse.c:141
-msgid ""
-"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
-"channel operator to do this."
-msgstr ""
-"remove &lt;�援┗&gt; [荐���]鐚�絨�����篏睡����荼√�咲�脂����������傑�����脂��膊∞��������"
-"罨������遵��決�������篏���"
+msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
+msgstr "remove &lt;�援┗&gt; [荐���]鐚�絨�����篏睡����荼√�咲�脂����������傑�����脂��膊∞��������罨������遵��決�������篏���"
 
 #: ../libgaim/protocols/irc/parse.c:142
 msgid "time: Displays the current local time at the IRC server."
@@ -7718,20 +7947,12 @@
 msgstr "version [�援┗]鐚����� CTCP VERSION 荀�羆�腟�戎����"
 
 #: ../libgaim/protocols/irc/parse.c:146
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-"voice &lt;�援┗&gt; [�援┗] ...鐚�莖���篏睡���������取���罨�����������傑�����脂��膊∞��"
-"������罨������遵�決�������篏���"
+msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
+msgstr "voice &lt;�援┗&gt; [�援┗] ...鐚�莖���篏睡���������取���罨�����������傑�����脂��膊∞��������罨������遵�決�������篏���"
 
 #: ../libgaim/protocols/irc/parse.c:147
-msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
-msgstr ""
-"wallops &lt;message&gt;鐚�絋�������ラ������更篁�藝主����鐚�����遵葦羃���莨��篏睡���"
-"篋���"
+msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
+msgstr "wallops &lt;message&gt;鐚�絋�������ラ������更篁�藝主����鐚�����遵葦羃���莨��篏睡���篋���"
 
 #: ../libgaim/protocols/irc/parse.c:148
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -7750,9 +7971,12 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING ��膈�"
 
-#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
-#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
-#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
+#: ../libgaim/protocols/irc/parse.c:554
+#: ../libgaim/protocols/irc/parse.c:558
+#: ../libgaim/protocols/toc/toc.c:191
+#: ../libgaim/protocols/toc/toc.c:694
+#: ../libgaim/protocols/toc/toc.c:710
+#: ../libgaim/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "��罩∫�g���"
 
@@ -7780,9 +8004,7 @@
 #: ../libgaim/protocols/jabber/auth.c:234
 #: ../libgaim/protocols/jabber/auth.c:403
 #: ../libgaim/protocols/jabber/auth.c:485
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
+msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "篌堺������荀�膓��掩�����絲���筝我��画�����茯�茘�����荐延研膵主��画�茯�茘�鐚�"
 
 #: ../libgaim/protocols/jabber/auth.c:240
@@ -7875,7 +8097,8 @@
 #: ../libgaim/protocols/jabber/buddy.c:887
 #: ../libgaim/protocols/jabber/buddy.c:895
 #: ../libgaim/protocols/jabber/buddy.c:1531
-#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
+#: ../libgaim/protocols/silc/ops.c:1075
+#: ../libgaim/protocols/silc/util.c:553
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1050
 msgid "E-Mail"
 msgstr "�糸��灸散"
@@ -7896,7 +8119,8 @@
 msgstr "�決岡"
 
 #: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:806 ../libgaim/protocols/msn/msn.c:1595
+#: ../libgaim/protocols/jabber/buddy.c:806
+#: ../libgaim/protocols/msn/msn.c:1595
 #: ../libgaim/protocols/oscar/oscar.c:3670
 msgid "Birthday"
 msgstr "����"
@@ -7907,9 +8131,7 @@
 msgstr "膩�鹿 Jabber vCard"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
-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 "篁ヤ�������罨�篏��醇���御���х������Ű�莠後�ユ���活叱�ユ���喝゛�ョ��荐����喝���"
 
 # NOTE��Client������荅俄戎����篏睡���d��������句���荐����綣��箴�鐚�gaim鐚�
@@ -8006,7 +8228,8 @@
 msgid "Chatty"
 msgstr "�活��紊�"
 
-#: ../libgaim/protocols/jabber/buddy.c:1376 ../libgaim/status.c:159
+#: ../libgaim/protocols/jabber/buddy.c:1376
+#: ../libgaim/status.c:159
 msgid "Extended Away"
 msgstr "�傑�����∫��"
 
@@ -8034,12 +8257,8 @@
 
 #. current comment from Jabber User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1634
-msgid ""
-"Find a contact by entering the search criteria in the given fields. Note: "
-"Each field supports wild card searches (%)"
-msgstr ""
-"茫��������篏�紂����絨�罌�篁駈�篁ヤ梢��絨��恰�丞����機篋冴��羈��������罨�篏�����吂札�����"
-"�� (%) ��絨�"
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr "茫��������篏�紂����絨�罌�篁駈�篁ヤ梢��絨��恰�丞����機篋冴��羈��������罨�篏�����吂札������� (%) ��絨�"
 
 #: ../libgaim/protocols/jabber/buddy.c:1654
 msgid "Directory Query Failed"
@@ -8165,7 +8384,8 @@
 msgstr "���� MUC 罔≦�����紊���т���吂信�号�援┗"
 
 #: ../libgaim/protocols/jabber/chat.c:678
-#: ../libgaim/protocols/jabber/chat.c:689 ../libgaim/protocols/silc/ops.c:1449
+#: ../libgaim/protocols/jabber/chat.c:689
+#: ../libgaim/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "莅�����紊��羝������主�����"
 
@@ -8248,7 +8468,8 @@
 msgstr "�級������"
 
 #: ../libgaim/protocols/jabber/jabber.c:834
-#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
+#: ../libgaim/protocols/silc/ops.c:1069
+#: ../libgaim/protocols/silc/silc.c:697
 #: ../libgaim/protocols/silc/util.c:555
 msgid "Phone"
 msgstr "�肢�"
@@ -8671,16 +8892,12 @@
 msgstr "ban &lt;user&gt; [��紊��]鐚�胼�罩∽��篏睡�����峨�ヨ��紊��"
 
 #: ../libgaim/protocols/jabber/jabber.c:1809
-msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
+msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1815
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
-msgstr ""
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 荐㊤�篏睡���������翠���х��茹��蚊��"
 
 #: ../libgaim/protocols/jabber/jabber.c:1821
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -8695,8 +8912,7 @@
 msgstr "kick &lt;篏睡����&gt; [��紊��]鐚�絨�篏睡����緇���紊��筝㊧権�冴��"
 
 #: ../libgaim/protocols/jabber/jabber.c:1838
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;篏睡����&gt; &lt;荐���&gt;鐚��渇��腱�篋肴���畿�����篏睡����"
 
 #. *< type
@@ -8795,9 +9011,7 @@
 msgstr "綮榊��域��紊��"
 
 #: ../libgaim/protocols/jabber/presence.c:378
-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 "��③荀�綮榊�筝����亥����紊��鐚����荐㊤�絎�鐚�����戎����荐㊤�種�"
 
 #: ../libgaim/protocols/jabber/presence.c:381
@@ -8823,7 +9037,8 @@
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "�≧��渇��罟�罅��� %s鐚����阪��剛���吚�罅��活叱"
 
-#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
+#: ../libgaim/protocols/jabber/si.c:766
+#: ../libgaim/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "�渇��罟�罅�紊掩��"
 
@@ -8836,21 +9051,14 @@
 # XXX ��⑮
 #: ../libgaim/protocols/msn/dialog.c:116
 #, c-format
-msgid ""
-"%s on the local list is inside the group \"%s\" but not on the server list. "
-"Do you want this buddy to be added?"
-msgstr ""
-"%s �����亥���絅遵�羝�������%s��臂ょ�茖���私���失�����鐚�����医�����絅遵��割失����"
-"��絅遵�羝������"
+msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
+msgstr "%s �����亥���絅遵�羝�������%s��臂ょ�茖���私���失�����鐚�����医�����絅遵��割失������絅遵�羝������"
 
 # XXX ��⑮
 #: ../libgaim/protocols/msn/dialog.c:124
 #, c-format
-msgid ""
-"%s is on the local list but not on the server list. Do you want this buddy "
-"to be added?"
-msgstr ""
-"%s �����亥���絅遵�羝�����や���失�����鐚�����医�����絅遵��割失������絅遵�羝������"
+msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+msgstr "%s �����亥���絅遵�羝�����や���失�����鐚�����医�����絅遵��割失������絅遵�羝������"
 
 #: ../libgaim/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -8950,7 +9158,8 @@
 msgid "Too many hits to a FND"
 msgstr "FND ��腟�����紊���拷��"
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:125
+#: ../libgaim/protocols/msn/error.c:112
+#: ../libgaim/protocols/oscar/oscar.c:125
 msgid "Not logged in"
 msgstr "絨����糸��"
 
@@ -8985,7 +9194,8 @@
 msgid "Server busy"
 msgstr "篌堺�����腆�"
 
-#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
+#: ../libgaim/protocols/msn/error.c:138
+#: ../libgaim/protocols/msn/error.c:151
 #: ../libgaim/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "篌堺��������筝���箴�����"
@@ -9049,7 +9259,8 @@
 
 #: ../libgaim/protocols/msn/error.c:198
 #: ../libgaim/protocols/oscar/oscar.c:1314
-#: ../libgaim/protocols/silc/ops.c:1716 ../libgaim/protocols/toc/toc.c:728
+#: ../libgaim/protocols/silc/ops.c:1716
+#: ../libgaim/protocols/toc/toc.c:728
 #: ../libgaim/proxy.c:1340
 msgid "Authentication failed"
 msgstr "茯�茘�紊掩��"
@@ -9123,12 +9334,8 @@
 msgstr "��荐� MSN �喝�種�"
 
 #: ../libgaim/protocols/msn/msn.c:307
-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 �井����茵����肢�鐚������銀���茵���茖�臀�����"
 
 #: ../libgaim/protocols/msn/msn.c:311
 msgid "Allow"
@@ -9150,7 +9357,8 @@
 msgid "Page"
 msgstr "�喝��"
 
-#: ../libgaim/protocols/msn/msn.c:546 ../libgaim/protocols/msn/msn.c:553
+#: ../libgaim/protocols/msn/msn.c:546
+#: ../libgaim/protocols/msn/msn.c:553
 #: ../libgaim/protocols/msn/msn.c:562
 #: ../libgaim/protocols/sametime/sametime.c:3270
 #: ../libgaim/protocols/yahoo/yahoo.c:3032
@@ -9167,27 +9375,32 @@
 msgid "Has you"
 msgstr "篏����鐚�絅刻���絅遵�羝����"
 
-#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
+#: ../libgaim/protocols/msn/msn.c:583
+#: ../libgaim/protocols/msn/state.c:33
 #: ../libgaim/protocols/yahoo/yahoo.c:2861
 #: ../libgaim/protocols/yahoo/yahoo.c:3466
 msgid "Be Right Back"
 msgstr "薤����箴�"
 
-#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
+#: ../libgaim/protocols/msn/msn.c:587
+#: ../libgaim/protocols/msn/state.c:31
 #: ../libgaim/protocols/novell/novell.c:2859
 #: ../libgaim/protocols/novell/novell.c:2993
-#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
+#: ../libgaim/protocols/silc/buddy.c:1473
+#: ../libgaim/protocols/silc/silc.c:53
 #: ../libgaim/protocols/yahoo/yahoo.c:2863
 #: ../libgaim/protocols/yahoo/yahoo.c:3469
 msgid "Busy"
 msgstr "綽�腆�"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2871
+#: ../libgaim/protocols/msn/msn.c:591
+#: ../libgaim/protocols/yahoo/yahoo.c:2871
 #: ../libgaim/protocols/yahoo/yahoo.c:3481
 msgid "On the Phone"
 msgstr "�肢�筝�"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2875
+#: ../libgaim/protocols/msn/msn.c:595
+#: ../libgaim/protocols/yahoo/yahoo.c:2875
 #: ../libgaim/protocols/yahoo/yahoo.c:3487
 msgid "Out to Lunch"
 msgstr "紊��榊���"
@@ -9231,12 +9444,8 @@
 
 # XXX ��⑮
 #: ../libgaim/protocols/msn/msn.c:725
-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��"
 
 #: ../libgaim/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
@@ -9252,7 +9461,8 @@
 
 #. put a link to the actual profile URL
 #: ../libgaim/protocols/msn/msn.c:1370
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223 ../libgaim/util.c:1113
+#: ../libgaim/protocols/yahoo/yahoo_profile.c:1223
+#: ../libgaim/util.c:1113
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s鐚�</b>"
@@ -9261,18 +9471,21 @@
 msgid "MSN Profile"
 msgstr "MSN ��篋肴���"
 
-#: ../libgaim/protocols/msn/msn.c:1467 ../libgaim/protocols/msn/msn.c:1796
+#: ../libgaim/protocols/msn/msn.c:1467
+#: ../libgaim/protocols/msn/msn.c:1796
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:794
 msgid "Error retrieving profile"
 msgstr "��緇���篋肴�荐����主�����"
 
-#: ../libgaim/protocols/msn/msn.c:1537 ../libgaim/protocols/oscar/oscar.c:3676
+#: ../libgaim/protocols/msn/msn.c:1537
+#: ../libgaim/protocols/oscar/oscar.c:3676
 #: ../libgaim/protocols/qq/buddy_info.c:45
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1070
 msgid "Age"
 msgstr "綛顔宗"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/qq/buddy_info.c:51
+#: ../libgaim/protocols/msn/msn.c:1539
+#: ../libgaim/protocols/qq/buddy_info.c:51
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
 msgid "Occupation"
 msgstr "�傑キ"
@@ -9283,14 +9496,19 @@
 msgid "Location"
 msgstr "�����臀�"
 
-#: ../libgaim/protocols/msn/msn.c:1545 ../libgaim/protocols/msn/msn.c:1725
-#: ../libgaim/protocols/msn/msn.c:1731 ../libgaim/protocols/msn/msn.c:1738
+#: ../libgaim/protocols/msn/msn.c:1545
+#: ../libgaim/protocols/msn/msn.c:1725
+#: ../libgaim/protocols/msn/msn.c:1731
+#: ../libgaim/protocols/msn/msn.c:1738
 msgid "Hobbies and Interests"
 msgstr "��絅�/��莇�"
 
-#: ../libgaim/protocols/msn/msn.c:1551 ../libgaim/protocols/msn/msn.c:1659
-#: ../libgaim/protocols/msn/msn.c:1665 ../libgaim/protocols/msn/msn.c:1672
-#: ../libgaim/protocols/msn/msn.c:1680 ../libgaim/protocols/msn/msn.c:1687
+#: ../libgaim/protocols/msn/msn.c:1551
+#: ../libgaim/protocols/msn/msn.c:1659
+#: ../libgaim/protocols/msn/msn.c:1665
+#: ../libgaim/protocols/msn/msn.c:1672
+#: ../libgaim/protocols/msn/msn.c:1680
+#: ../libgaim/protocols/msn/msn.c:1687
 msgid "A Little About Me"
 msgstr "����膂>�"
 
@@ -9334,7 +9552,8 @@
 msgstr "�恰�"
 
 # NOTE �ユ��po罟���MSN��昆��茘���綺у勌����
-#: ../libgaim/protocols/msn/msn.c:1574 ../libgaim/protocols/msn/msn.c:1747
+#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libgaim/protocols/msn/msn.c:1747
 #: ../libgaim/protocols/msn/msn.c:1753
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1127
 msgid "Favorite Quote"
@@ -9358,7 +9577,8 @@
 msgid "Home Phone 2"
 msgstr "篏鎘狗�肢�2"
 
-#: ../libgaim/protocols/msn/msn.c:1590 ../libgaim/protocols/oscar/oscar.c:3688
+#: ../libgaim/protocols/msn/msn.c:1590
+#: ../libgaim/protocols/oscar/oscar.c:3688
 msgid "Home Address"
 msgstr "篏鎘九�医��"
 
@@ -9382,7 +9602,8 @@
 msgid "Anniversary"
 msgstr "�怨拘膣�綽究��"
 
-#: ../libgaim/protocols/msn/msn.c:1597 ../libgaim/protocols/msn/msn.c:1622
+#: ../libgaim/protocols/msn/msn.c:1597
+#: ../libgaim/protocols/msn/msn.c:1622
 msgid "Notes"
 msgstr "��荐�"
 
@@ -9391,11 +9612,13 @@
 msgid "<br><b>Personal</b><br>%s"
 msgstr "<br><b>��篋堺�拷��</b><br>%s"
 
-#: ../libgaim/protocols/msn/msn.c:1609 ../libgaim/protocols/silc/ops.c:1044
+#: ../libgaim/protocols/msn/msn.c:1609
+#: ../libgaim/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "�潔��"
 
-#: ../libgaim/protocols/msn/msn.c:1610 ../libgaim/protocols/oscar/oscar.c:3705
+#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libgaim/protocols/oscar/oscar.c:3705
 msgid "Company"
 msgstr "��夔��腮�"
 
@@ -9416,7 +9639,8 @@
 msgid "Work Phone 2"
 msgstr "�����肢�2"
 
-#: ../libgaim/protocols/msn/msn.c:1615 ../libgaim/protocols/oscar/oscar.c:3696
+#: ../libgaim/protocols/msn/msn.c:1615
+#: ../libgaim/protocols/oscar/oscar.c:3696
 msgid "Work Address"
 msgstr "綏ヤ��医��"
 
@@ -9454,8 +9678,10 @@
 msgid "<hr><b>Contact Info</b>%s%s"
 msgstr "<hr><b>��機莖�荐�</b>%s%s"
 
-#: ../libgaim/protocols/msn/msn.c:1696 ../libgaim/protocols/msn/msn.c:1702
-#: ../libgaim/protocols/msn/msn.c:1709 ../libgaim/protocols/msn/msn.c:1716
+#: ../libgaim/protocols/msn/msn.c:1696
+#: ../libgaim/protocols/msn/msn.c:1702
+#: ../libgaim/protocols/msn/msn.c:1709
+#: ../libgaim/protocols/msn/msn.c:1716
 msgid "Favorite Things"
 msgstr "����篋���"
 
@@ -9463,7 +9689,8 @@
 msgid "Last Updated"
 msgstr "�贋�井�ユ��"
 
-#: ../libgaim/protocols/msn/msn.c:1773 ../libgaim/protocols/qq/buddy_info.c:60
+#: ../libgaim/protocols/msn/msn.c:1773
+#: ../libgaim/protocols/qq/buddy_info.c:60
 #: ../libgaim/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "膓臥��"
@@ -9473,21 +9700,12 @@
 msgstr "����篏睡��������綮榊���������篋肴�����"
 
 #: ../libgaim/protocols/msn/msn.c:1799
-msgid ""
-"MSN reported not being able to find the user's profile. This either means "
-"that the user does not exist, or that the user exists but has not created a "
-"public profile."
-msgstr ""
-"MSN ���沿��鞘��育����篏睡��������篋肴�������茵�ず����篏睡�������巡�絖����篋������巡戎"
-"����絖����篏�羃���綮榊���������篋肴�����"
+msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
+msgstr "MSN ���沿��鞘��育����篏睡��������篋肴�������茵�ず����篏睡�������巡�絖����篋������巡戎����絖����篏�羃���綮榊���������篋肴�����"
 
 #: ../libgaim/protocols/msn/msn.c:1803
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-"Gaim ������篏睡��������篋肴���膓臥���鞘��遺算篏�������莖���������篏睡����罐究�����巡研筝�絖�"
-"����"
+msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
+msgstr "Gaim ������篏睡��������篋肴���膓臥���鞘��遺算篏�������莖���������篏睡����罐究�����巡研筝�絖�����"
 
 #. put a link to the actual profile URL
 #: ../libgaim/protocols/msn/msn.c:1808
@@ -9510,7 +9728,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2033 ../libgaim/protocols/msn/msn.c:2035
+#: ../libgaim/protocols/msn/msn.c:2033
+#: ../libgaim/protocols/msn/msn.c:2035
 msgid "MSN Protocol Plugin"
 msgstr "MSN ��絎�罔∞�"
 
@@ -9611,27 +9830,19 @@
 #: ../libgaim/protocols/msn/notification.c:1314
 #, 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."
+"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."
+"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"
+"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���綽������������篋よ���\n"
 "\n"
 "�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
 msgstr[1] ""
-"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���"
-"綽������������篋よ���\n"
+"MSN 篌堺�����荀��� %d �����ч����篁ラ�画�膓㊧Ⅲ鐚�絮���������延失����������糸�冴��茫���綽������������篋よ���\n"
 "\n"
 "�句境茘桁轡篏�腟���鐚������札��綺��糸�ャ��"
 
@@ -9683,8 +9894,7 @@
 msgstr "�≧�茯�茘�鐚�%s"
 
 #: ../libgaim/protocols/msn/session.c:324
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "�����≧���緇�����絅遵�羝����茫������緇���荅���"
 
 #: ../libgaim/protocols/msn/session.c:345
@@ -9745,8 +9955,7 @@
 msgstr "���堺�����渇��荐�������綺�お綽����篁ヨ����≧����削�"
 
 #: ../libgaim/protocols/msn/switchboard.c:424
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "���� Switchboard �主�����鐚���篁ヨ����≧�����"
 
 #: ../libgaim/protocols/msn/switchboard.c:432
@@ -9876,9 +10085,7 @@
 msgstr "�≧�莨������莠後�ョ��絽活���х��筝紙���腮�"
 
 #: ../libgaim/protocols/novell/nmuser.c:1943
-msgid ""
-"Your account has been disabled because too many incorrect passwords were "
-"entered"
+msgid "Your account has been disabled because too many incorrect passwords were entered"
 msgstr "����絽活��綏画←��������肴叱�ヤ�紊���≧����絲�腆�"
 
 #: ../libgaim/protocols/novell/nmuser.c:1946
@@ -9906,9 +10113,7 @@
 msgstr "荅俄戎������腟�篋���"
 
 #: ../libgaim/protocols/novell/nmuser.c:1965
-msgid ""
-"This evaluation version does not allow more than ten users to log in at one "
-"time"
+msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "荅�������紊����荐怨����篏睡���������糸��"
 
 #: ../libgaim/protocols/novell/nmuser.c:1968
@@ -9960,16 +10165,12 @@
 
 #: ../libgaim/protocols/novell/novell.c:584
 #, c-format
-msgid ""
-"Unable to move user %s to folder %s in the server side list. Error while "
-"creating folder (%s)."
+msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
 msgstr "�≧���失�������羝�����篏睡���� %s 腱肢�括���� %s��綮榊��������主����� (%s)��"
 
 #: ../libgaim/protocols/novell/novell.c:632
 #, c-format
-msgid ""
-"Unable to add %s to your buddy list. Error creating folder in server side "
-"list (%s)."
+msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
 msgstr "�≧��医� %s �喝ソ��羝�������失�������羝���産腴��������主����� (%s)��"
 
 #: ../libgaim/protocols/novell/novell.c:705
@@ -10098,8 +10299,7 @@
 
 #: ../libgaim/protocols/novell/novell.c:2072
 #, 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!
@@ -10107,9 +10307,7 @@
 #.
 #. ...but for now just error out with a nice message.
 #: ../libgaim/protocols/novell/novell.c:2170
-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��括��篌堺������篏�����"
 
 #: ../libgaim/protocols/novell/novell.c:2198
@@ -10146,16 +10344,22 @@
 #: ../libgaim/protocols/oscar/flap_connection.c:237
 #: ../libgaim/protocols/yahoo/yahoo.c:2268
 #: ../libgaim/protocols/yahoo/yahoo.c:2426
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
-#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
+#: ../libgaim/protocols/yahoo/ycht.c:481
+#: ../libgaim/proxy.c:566
+#: ../libgaim/proxy.c:1074
+#: ../libgaim/proxy.c:1185
+#: ../libgaim/proxy.c:1285
 #: ../libgaim/proxy.c:1413
 msgid "Server closed the connection."
 msgstr "篌堺���������g���"
 
 #: ../libgaim/protocols/oscar/flap_connection.c:239
 #: ../libgaim/protocols/yahoo/yahoo.c:2262
-#: ../libgaim/protocols/yahoo/yahoo.c:2420 ../libgaim/proxy.c:578
-#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
+#: ../libgaim/protocols/yahoo/yahoo.c:2420
+#: ../libgaim/proxy.c:578
+#: ../libgaim/proxy.c:1086
+#: ../libgaim/proxy.c:1197
+#: ../libgaim/proxy.c:1297
 #: ../libgaim/proxy.c:1425
 #, c-format
 msgid ""
@@ -10165,8 +10369,11 @@
 "��篌堺����������g�腦��銀賢��:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:242 ../libgaim/proxy.c:1103
-#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
+#: ../libgaim/protocols/oscar/flap_connection.c:242
+#: ../libgaim/proxy.c:1103
+#: ../libgaim/proxy.c:1210
+#: ../libgaim/proxy.c:1309
+#: ../libgaim/proxy.c:1381
 #: ../libgaim/proxy.c:1438
 msgid "Received invalid data on connection with server."
 msgstr "�g��割失�������九�亥�≧����莖�����"
@@ -10312,23 +10519,12 @@
 msgstr "�� AOL ��筝���荐�"
 
 #: ../libgaim/protocols/oscar/oscar.c:323
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking with "
-"is probably using a different encoding than expected.  If you know what "
-"encoding he is using, you can specify it in the advanced account options for "
-"your AIM/ICQ account.)"
-msgstr ""
-"鐚��ユ�狗����荐������主��篋������罩e�����困茫���絅遵�緇����遵��戎�������喝�鋇�箙���絖���"
-"膩�⊆鐚�絋������ラ���f���藝主隈腆種�茫������� AIM/ICQ 絽活�������臥��┃絎���筝㊦����膩�⊆��"
-"罨�篏���絎���鐚�"
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr "鐚��ユ�狗����荐������主��篋������罩e�����困茫���絅遵�緇����遵��戎�������喝�鋇�箙���絖���膩�⊆鐚�絋������ラ���f���藝主隈腆種�茫������� AIM/ICQ 絽活�������臥��┃絎���筝㊦����膩�⊆��罨�篏���絎���鐚�"
 
 #: ../libgaim/protocols/oscar/oscar.c:426
-msgid ""
-"(There was an error receiving this message.  The buddy you are speaking to "
-"most likely has a buggy client.)"
-msgstr ""
-"鐚��ユ�狗����荐������主��篋������罩e�����困茫���絅遵�緇����醇����戎�����馹������句�腮�"
-"綣����"
+msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
+msgstr "鐚��ユ�狗����荐������主��篋������罩e�����困茫���絅遵�緇����醇����戎�����馹������句�腮�綣����"
 
 #: ../libgaim/protocols/oscar/oscar.c:605
 msgid "Voice"
@@ -10339,7 +10535,8 @@
 msgid "AIM Direct IM"
 msgstr "AIM 綣�勄��荐���"
 
-#: ../libgaim/protocols/oscar/oscar.c:611 ../libgaim/protocols/silc/silc.c:693
+#: ../libgaim/protocols/oscar/oscar.c:611
+#: ../libgaim/protocols/silc/silc.c:693
 #: ../libgaim/protocols/silc/util.c:551
 msgid "Chat"
 msgstr "��紊�"
@@ -10494,13 +10691,8 @@
 
 #: ../libgaim/protocols/oscar/oscar.c:1199
 #, 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 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽���篁ヨ�掩��絖�罸�莎桁�鐚�筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����"
 
 #: ../libgaim/protocols/oscar/oscar.c:1284
 #: ../libgaim/protocols/yahoo/yahoo.c:1905
@@ -10526,12 +10718,8 @@
 msgstr "�����≧�篏睡�� AOL �恰��荐���������"
 
 #: ../libgaim/protocols/oscar/oscar.c:1305
-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瑳����膈�緇�����絨����翫����綮狗�激��"
 
 #: ../libgaim/protocols/oscar/oscar.c:1310
 #, c-format
@@ -10561,12 +10749,8 @@
 #: ../libgaim/protocols/oscar/oscar.c:1428
 #: ../libgaim/protocols/oscar/oscar.c:1471
 #, 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 ������"
-"羃����贋�違��"
+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 ������羃����贋�違��"
 
 #: ../libgaim/protocols/oscar/oscar.c:1431
 #: ../libgaim/protocols/oscar/oscar.c:1474
@@ -10604,9 +10788,7 @@
 
 #: ../libgaim/protocols/oscar/oscar.c:2185
 #, 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 荀�羆������ュソ��羝���������緇�篁���茯�茘���������堺����茯�茘�荀�羆����"
 
 #: ../libgaim/protocols/oscar/oscar.c:2190
@@ -10647,8 +10829,7 @@
 #: ../libgaim/protocols/oscar/oscar.c:2371
 #, 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"
@@ -10732,10 +10913,8 @@
 
 #: ../libgaim/protocols/oscar/oscar.c:2536
 #, 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."
+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 ��箴���荐�������阪����渇������綺�お綽���"
 
@@ -10826,9 +11005,7 @@
 #  The conversion failed!
 #. The conversion failed!
 #: ../libgaim/protocols/oscar/oscar.c:3121
-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 "���≧�蕁�ず箴�������篏睡������荐�������阪�������≧��絖�������"
 
 #: ../libgaim/protocols/oscar/oscar.c:3342
@@ -10836,18 +11013,15 @@
 msgstr "�������狗�����"
 
 #: ../libgaim/protocols/oscar/oscar.c:3343
-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 "����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���荅��罨<��"
 
 #: ../libgaim/protocols/oscar/oscar.c:3415
 msgid "You have been signed off for an unknown reason."
 msgstr "�����坂���������糸�冴��"
 
-#: ../libgaim/protocols/oscar/oscar.c:3428 ../libgaim/protocols/toc/toc.c:977
+#: ../libgaim/protocols/oscar/oscar.c:3428
+#: ../libgaim/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
@@ -10924,9 +11098,7 @@
 
 #: ../libgaim/protocols/oscar/oscar.c:3895
 #, 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鐚��≧��弱���絽活��鐚����肴�羆���絽活����������筝�����"
 
 #: ../libgaim/protocols/oscar/oscar.c:3898
@@ -10936,31 +11108,22 @@
 
 #: ../libgaim/protocols/oscar/oscar.c:3901
 #, 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鐚��≧��弱���絽活��鐚����肴�羆���絽活��紊��激��"
 
 #: ../libgaim/protocols/oscar/oscar.c:3904
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because there is already a "
-"request pending for this screen name."
+msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
 msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲����絽活��絨���荀�羆�膈�緇�������"
 
 #: ../libgaim/protocols/oscar/oscar.c:3907
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address has "
-"too many screen names associated with it."
-msgstr ""
-"��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
+msgid "Error 0x%04x: Unable to change e-mail address because the given address has too many screen names associated with it."
+msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����c��"
 
 #: ../libgaim/protocols/oscar/oscar.c:3910
 #, c-format
-msgid ""
-"Error 0x%04x: Unable to change e-mail address because the given address is "
-"invalid."
+msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
 msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医�����≧������"
 
 #: ../libgaim/protocols/oscar/oscar.c:3913
@@ -10988,8 +11151,7 @@
 msgstr "%s ���糸��灸散�医���� %s"
 
 #: ../libgaim/protocols/oscar/oscar.c:4104
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "�≧��渇���恰��荐���襲���荀��渇���恰��荐���襲���綽�����絨��合�贋・�g���"
 
 #: ../libgaim/protocols/oscar/oscar.c:4356
@@ -10997,22 +11159,13 @@
 msgstr "�≧�荐㊤� AIM ��篋肴�����"
 
 #: ../libgaim/protocols/oscar/oscar.c:4357
-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 "�������糸�ュ�����荀�羆�篆��号������篋肴�荐�鐚���篁ラ��篋�莖�荐�筝���←篆��鴻��茫�������糸�ュ������育�画�荐㊤���"
 
 #: ../libgaim/protocols/oscar/oscar.c:4371
 #, 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."
+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 綏我�炊�����㊤�у���"
 
@@ -11022,12 +11175,8 @@
 
 #: ../libgaim/protocols/oscar/oscar.c:4420
 #, 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."
+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 綏我�炊�����㊤�у���"
 
@@ -11037,14 +11186,8 @@
 
 #: ../libgaim/protocols/oscar/oscar.c:4494
 #, 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 ""
-"���咲����絽活��筝������������絽活��鐚���篁ョ�≧�絨�絅遵���%s�����ユ���賢��絽活��綽���篁ヨ��"
-"��絖�罸��咲���㍼������宴���掩��絖�罸��������後�������腥榊�純����腟���鐚��������篁ャ����"
-"絖���腟�����"
+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�����ユ���賢��絽活��綽���篁ヨ�掩��絖�罸��咲���㍼������宴���掩��絖�罸��������後�������腥榊�純����腟���鐚��������篁ャ���後���腟�����"
 
 #: ../libgaim/protocols/oscar/oscar.c:4496
 #: ../libgaim/protocols/oscar/oscar.c:4909
@@ -11057,13 +11200,8 @@
 msgstr "�≧�莅���絅遵�羝���"
 
 #: ../libgaim/protocols/oscar/oscar.c:4601
-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 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃�����"
-"紊縁����遵�札��江��絨��鏅���緇���"
+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 篌堺�������緇�����絅遵�羝�����筝�������絅遵�羝���研羃����阪け鐚����遵�札��江��絨��鏅���緇���"
 
 #: ../libgaim/protocols/oscar/oscar.c:4804
 #: ../libgaim/protocols/oscar/oscar.c:4805
@@ -11076,12 +11214,8 @@
 
 #: ../libgaim/protocols/oscar/oscar.c:4907
 #, 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��茫���Щ�ら��蚕絅遵�緇���"
-"荅���"
+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��茫���Щ�ら��蚕絅遵�緇���荅���"
 
 #: ../libgaim/protocols/oscar/oscar.c:4907
 #: ../libgaim/protocols/oscar/oscar.c:4921
@@ -11090,22 +11224,13 @@
 
 #: ../libgaim/protocols/oscar/oscar.c:4921
 #, 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 ���ャ��筝��������������堺����絅遵�羝���賢��絅遵��悟�������膤紫輝��荐援��筝�����"
 
 #: ../libgaim/protocols/oscar/oscar.c:5014
 #, 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 ����������荐怨�ヤ査�弱�榊��茯�茘�荀�羆�緇�蕁�ず腟�������訓����
 #: ../libgaim/protocols/oscar/oscar.c:5020
@@ -11136,8 +11261,7 @@
 #: ../libgaim/protocols/oscar/oscar.c:5113
 #, 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"
@@ -11149,7 +11273,8 @@
 
 # NOTE: ��茖∞��絖�臂���� #gaim �� MrHappy �� deryni ��箴���
 # NOTE: KingAnt ��箴���絖�臂���篋�筝���鐚�����筝�篋�����
-#: ../libgaim/protocols/oscar/oscar.c:5150 ../libgaim/protocols/toc/toc.c:1378
+#: ../libgaim/protocols/oscar/oscar.c:5150
+#: ../libgaim/protocols/toc/toc.c:1378
 msgid "_Exchange:"
 msgstr "�脂����腆�(_E)鐚�"
 
@@ -11181,9 +11306,7 @@
 msgstr "���御��篋��� %s ����筝����贋・�恰��荐�����"
 
 #: ../libgaim/protocols/oscar/oscar.c:5801
-msgid ""
-"Because this reveals your IP address, it may be considered a security risk.  "
-"Do you wish to continue?"
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
 msgstr "��罔e������峨�堺���� IP 篏���鐚���罩ゅ��醇�����援�筝���蘂��������活�膵主����"
 
 #: ../libgaim/protocols/oscar/oscar.c:5805
@@ -11250,12 +11373,8 @@
 msgstr "������罩e���緇�筝���絅遵���茯�茘�"
 
 #: ../libgaim/protocols/oscar/oscar.c:6085
-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 "���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御����荀�羆����域�茘�����"
 
 #: ../libgaim/protocols/oscar/oscar.c:6102
 msgid "Find Buddy by E-Mail"
@@ -11329,7 +11448,8 @@
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "罩e���羆� %s �g��恰④�� (%s:%hu)鐚�篁ヤ梢綮榊��恰��荐�����"
 
-#: ../libgaim/protocols/oscar/peer.c:703 ../libgaim/protocols/oscar/peer.c:738
+#: ../libgaim/protocols/oscar/peer.c:703
+#: ../libgaim/protocols/oscar/peer.c:738
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "罩e����荅��g��� %s鐚�%hu��"
@@ -11344,13 +11464,8 @@
 msgstr "%s ����荀�羆��贋・�g��� %s"
 
 #: ../libgaim/protocols/oscar/peer.c:984
-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 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
+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 篏���鐚���罩ゅ��醇�����援��拷�∝��蘂�����"
 
 #: ../libgaim/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
@@ -11542,12 +11657,12 @@
 #: ../libgaim/protocols/qq/buddy_opt.c:212
 #: ../libgaim/protocols/qq/group_im.c:136
 #: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#: ../libgaim/protocols/qq/sys_msg.c:85
+#: ../libgaim/protocols/qq/sys_msg.c:228
 msgid "Reject"
 msgstr "��腟�"
 
 #: ../libgaim/protocols/qq/buddy_opt.c:272
-#, fuzzy
 msgid "Add buddy with auth request fails"
 msgstr "�e��茯�茘�荀�羆����医�絅遵�紊掩��"
 
@@ -11621,7 +11736,7 @@
 
 #: ../libgaim/protocols/qq/group.c:120
 msgid "Please input external group ID"
-msgstr ""
+msgstr "茫�莠後�ュ��� Group ID"
 
 #: ../libgaim/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
@@ -11654,7 +11769,8 @@
 
 #: ../libgaim/protocols/qq/group_im.c:133
 #: ../libgaim/protocols/qq/group_opt.c:127
-#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libgaim/protocols/qq/sys_msg.c:87
+#: ../libgaim/protocols/qq/sys_msg.c:230
 msgid "Approve"
 msgstr "��荐�"
 
@@ -11795,7 +11911,8 @@
 msgstr "�≧��糸�ワ�茫�罟∽�ラ�ら�����"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
+#: ../libgaim/protocols/qq/qq.c:139
+#: ../libgaim/protocols/toc/toc.c:173
 #: ../libgaim/protocols/yahoo/yahoo.c:2356
 #: ../libgaim/protocols/yahoo/yahoo.c:2383
 #: ../libgaim/protocols/yahoo/yahoo.c:2490
@@ -11914,7 +12031,8 @@
 msgid "Change My Face"
 msgstr "篆��劫ソ����腓�"
 
-#: ../libgaim/protocols/qq/qq.c:810 ../libgaim/protocols/toc/toc.c:1700
+#: ../libgaim/protocols/qq/qq.c:810
+#: ../libgaim/protocols/toc/toc.c:1700
 msgid "Change Password"
 msgstr "篆��劫�腆�"
 
@@ -11944,7 +12062,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:1006 ../libgaim/protocols/qq/qq.c:1008
+#: ../libgaim/protocols/qq/qq.c:1006
+#: ../libgaim/protocols/qq/qq.c:1008
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ ��絎�罔∞�"
 
@@ -11990,12 +12109,12 @@
 
 #: ../libgaim/protocols/qq/sendqueue.c:169
 msgid "Connection lost!"
-msgstr "�g�腦��銀賢�件�"
+msgstr "�g�筝㊥��"
 
 #. cancel logging progress
 #: ../libgaim/protocols/qq/sendqueue.c:176
 msgid "Login failed, no reply!"
-msgstr "�糸�ュけ��鐚�羃�������鐚�"
+msgstr "�糸�ュけ��鐚�羃�������鐚�"
 
 #: ../libgaim/protocols/qq/sendqueue.c:181
 msgid "Connection timeout!"
@@ -12134,8 +12253,7 @@
 
 #: ../libgaim/protocols/sametime/sametime.c:1636
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "��失������%s��筝�鐚��� Sametime 膊∞��篋榊�弱�坂�筝�������"
 
 # FIXME ��絅遵�鋇����� - 20061025
@@ -12172,7 +12290,6 @@
 msgstr "�≧����肴����"
 
 #: ../libgaim/protocols/sametime/sametime.c:2949
-#, fuzzy
 msgid "Place Closed"
 msgstr "Place 綏臥����"
 
@@ -12208,7 +12325,7 @@
 "<b>External User</b>"
 msgstr ""
 "\n"
-"<b>紊���戎����<b>"
+"<b>紊���戎����</b>"
 
 #: ../libgaim/protocols/sametime/sametime.c:3391
 msgid "Create conference with user"
@@ -12216,9 +12333,7 @@
 
 #: ../libgaim/protocols/sametime/sametime.c:3392
 #, c-format
-msgid ""
-"Please enter a topic for the new conference, and an invitation message to be "
-"sent to %s"
+msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "茫��堺�亥����茘医�莠後�ヤ���筝脂�鐚������弱�坂�����茫�荐���畿%s"
 
 #: ../libgaim/protocols/sametime/sametime.c:3396
@@ -12244,13 +12359,8 @@
 
 #: ../libgaim/protocols/sametime/sametime.c:3476
 #, c-format
-msgid ""
-"Select a conference from the list below to send an invite to user %s. Select "
-"\"Create New Conference\" if you'd like to create a new conference to invite "
-"this user to."
-msgstr ""
-"緇�筝��合��羝���賢�後�筝�����茘医�鐚������弱�咲��茫�腟�戎����%s��絋������渇����筝����亥����"
-"茘医�鐚�筝����茫�����篏睡�������ワ����札�御���������井��茘医����檎����"
+msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
+msgstr "緇�筝��合��羝���賢�後�筝�����茘医�鐚������弱�咲��茫�腟�戎����%s��絋������渇����筝����亥����茘医�鐚�筝����茫�����篏睡�������ワ����札�御���������井��茘医����檎����"
 
 # NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩e�筝㊧⑮����
 #: ../libgaim/protocols/sametime/sametime.c:3481
@@ -12273,12 +12383,8 @@
 # NOTE��Meanwhile����絲����Sametime����絎���筝���荵�蕭�鐚�筝����f・荅�
 #: ../libgaim/protocols/sametime/sametime.c:3645
 #, c-format
-msgid ""
-"No host or IP address has been configured for the Meanwhile account %s. "
-"Please enter one below to continue logging in."
-msgstr ""
-"Meanwhile 絽活����%s��絨���┃絎�筝紙���腮掩�� IP 篏���鐚�茫�����∵叱�ュ�銀�鐚�篁ヤ梢膵主���"
-"�ャ��"
+msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
+msgstr "Meanwhile 絽活����%s��絨���┃絎�筝紙���腮掩�� IP 篏���鐚�茫�����∵叱�ュ�銀�鐚�篁ヤ梢膵主��糸�ャ��"
 
 # NOTE��Meanwhile����絲����Sametime����絎���筝���荵�蕭�鐚�筝����f・荅�
 #: ../libgaim/protocols/sametime/sametime.c:3650
@@ -12338,12 +12444,8 @@
 
 #: ../libgaim/protocols/sametime/sametime.c:4345
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. Please "
-"select the correct user from the list below to add them to your buddy list."
-msgstr ""
-"��%s�����醇��筝���篁私�筝���篏睡������茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝���"
-"�с��"
+msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
+msgstr "��%s�����醇��筝���篁私�筝���篏睡������茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
 
 #: ../libgaim/protocols/sametime/sametime.c:4350
 msgid "Select User"
@@ -12356,12 +12458,8 @@
 
 #: ../libgaim/protocols/sametime/sametime.c:4436
 #, c-format
-msgid ""
-"The identifier '%s' did not match any users in your Sametime community. This "
-"entry has been removed from your buddy list."
-msgstr ""
-"��%s�������� Sametime 腓丞召筝㊦��篁私�篏睡����絽活��筝�膃���絎�絨�緇�����絅遵�羝���賢茴�Щ"
-"�ゃ��"
+msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
+msgstr "��%s�������� Sametime 腓丞召筝㊦��篁私�篏睡����絽活��筝�膃���絎�絨�緇�����絅遵�羝���賢茴�Щ�ゃ��"
 
 #: ../libgaim/protocols/sametime/sametime.c:4441
 msgid "Unable to add user"
@@ -12434,13 +12532,8 @@
 
 #: ../libgaim/protocols/sametime/sametime.c:5394
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following Notes Address "
-"Book groups. Please select the correct group from the list below to add it "
-"to your buddy list."
-msgstr ""
-"��%s�����遵����遺����� Notes ��荐���臂ょ���茫�����拷�後�罩g∈��臂ょ�鐚�篁ュ���ユ����絅�"
-"��羝�����"
+msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
+msgstr "��%s�����遵����遺����� Notes ��荐���臂ょ���茫�����拷�後�罩g∈��臂ょ�鐚�篁ュ���ユ����絅遵�羝�����"
 
 #: ../libgaim/protocols/sametime/sametime.c:5399
 msgid "Select Notes Address Book"
@@ -12452,9 +12545,7 @@
 
 #: ../libgaim/protocols/sametime/sametime.c:5443
 #, c-format
-msgid ""
-"The identifier '%s' did not match any Notes Address Book groups in your "
-"Sametime community."
+msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
 msgstr "������ Sametime 腓丞召筝㍼�筝����篁私�����%s���悟��� Notes ��荐���臂ょ���"
 
 #: ../libgaim/protocols/sametime/sametime.c:5484
@@ -12462,12 +12553,8 @@
 msgstr "Notes ��荐���臂ょ�"
 
 #: ../libgaim/protocols/sametime/sametime.c:5485
-msgid ""
-"Enter the name of a Notes Address Book group in the field below to add the "
-"group and its members to your buddy list."
-msgstr ""
-"莠後�� Notes ��荐���臂ょ���腮掩�惹�篏�筝㍼�篁ユ�医�����臂ょ���絎���絮������≦�井����絅遵�羝���"
-"筝㏍��"
+msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
+msgstr "莠後�� Notes ��荐���臂ょ���腮掩�惹�篏�筝㍼�篁ユ�医�����臂ょ���絎���絮������≦�井����絅遵�羝���賢��"
 
 #: ../libgaim/protocols/sametime/sametime.c:5533
 #, c-format
@@ -12476,13 +12563,8 @@
 
 #: ../libgaim/protocols/sametime/sametime.c:5534
 #, c-format
-msgid ""
-"The identifier '%s' may possibly refer to any of the following users. You "
-"may add these users to your buddy list or send them messages with the action "
-"buttons below."
-msgstr ""
-"��%s�����醇��筝���篁私�筝���篏睡���������戎����∝����膣�鐚���篁�鐚�絅刻����医��喝ソ��羝�"
-"���э�����篁�鐚�絅刻����弱�肴�����"
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "��%s�����醇��筝���篁私�筝���篏睡���������戎����∝����膣�鐚���篁�鐚�絅刻����医��喝ソ��羝����э�����篁�鐚�絅刻����弱�肴�����"
 
 #: ../libgaim/protocols/sametime/sametime.c:5566
 msgid "No matches"
@@ -12502,9 +12584,7 @@
 msgstr "��絨�筝���篏睡����"
 
 #: ../libgaim/protocols/sametime/sametime.c:5609
-msgid ""
-"Enter a name or partial ID in the field below to search for matching users "
-"in your Sametime community."
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
 msgstr "莠後�ュ�������蚕 ID �寂��合��罨�篏�鐚�箴��ヨ��� Sametime 腓丞召筝㊦�����篏睡������"
 
 #: ../libgaim/protocols/sametime/sametime.c:5612
@@ -12536,17 +12616,23 @@
 msgid "Hide client identity"
 msgstr "�沿�鎘∽�句�茘���"
 
-#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
-#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
+#: ../libgaim/protocols/silc/buddy.c:52
+#: ../libgaim/protocols/silc/buddy.c:420
+#: ../libgaim/protocols/silc/buddy.c:545
+#: ../libgaim/protocols/silc/buddy.c:711
 #: ../libgaim/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "篏睡���� %s 筝���恐莊��"
 
-#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
-#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
-#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
-#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
+#: ../libgaim/protocols/silc/buddy.c:53
+#: ../libgaim/protocols/silc/buddy.c:115
+#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libgaim/protocols/silc/buddy.c:124
+#: ../libgaim/protocols/silc/buddy.c:129
+#: ../libgaim/protocols/silc/buddy.c:134
+#: ../libgaim/protocols/silc/buddy.c:139
+#: ../libgaim/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "篋ゆ�絲���"
 
@@ -12578,16 +12664,15 @@
 msgid "Key agreement cannot be started with yourself"
 msgstr "筝�������訓篋ゆ�絲���"
 
-#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
+#: ../libgaim/protocols/silc/buddy.c:258
+#: ../libgaim/protocols/silc/buddy.c:388
 #: ../libgaim/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "��腴�戎����綏俄���恐莊��"
 
 #: ../libgaim/protocols/silc/buddy.c:294
 #, c-format
-msgid ""
-"Key agreement request received from %s. Would you like to perform the key "
-"agreement?"
+msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
 msgstr "�� %s �九�遺���篋ゆ�絲��域�羆�鐚����割困��絲��医���"
 
 #: ../libgaim/protocols/silc/buddy.c:298
@@ -12605,7 +12690,8 @@
 msgid "Key Agreement Request"
 msgstr "篋ゆ�絲��域�羆�"
 
-#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
+#: ../libgaim/protocols/silc/buddy.c:387
+#: ../libgaim/protocols/silc/buddy.c:422
 #: ../libgaim/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "��絲�腆寂��恰��荐���"
@@ -12618,12 +12704,15 @@
 msgid "Set IM Password"
 msgstr "荐㊤��恰��荐����腆�"
 
-#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1492 ../libgaim/protocols/silc/ops.c:1503
+#: ../libgaim/protocols/silc/buddy.c:512
+#: ../libgaim/protocols/silc/buddy.c:547
+#: ../libgaim/protocols/silc/ops.c:1492
+#: ../libgaim/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "��緇�����"
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1493
+#: ../libgaim/protocols/silc/buddy.c:548
+#: ../libgaim/protocols/silc/ops.c:1493
 #: ../libgaim/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "�≧���緇�����"
@@ -12634,17 +12723,22 @@
 msgstr "蕁�ず����"
 
 #: ../libgaim/protocols/silc/buddy.c:635
-#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
+#: ../libgaim/protocols/silc/buddy.c:1030
+#: ../libgaim/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "�≧�莠��ュ����"
 
-#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
-#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
-#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
+#: ../libgaim/protocols/silc/buddy.c:712
+#: ../libgaim/protocols/silc/ops.c:1087
+#: ../libgaim/protocols/silc/ops.c:1159
+#: ../libgaim/protocols/silc/ops.c:1294
+#: ../libgaim/protocols/silc/ops.c:1295
+#: ../libgaim/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "篏睡����莖�荐�"
 
-#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
+#: ../libgaim/protocols/silc/buddy.c:713
+#: ../libgaim/protocols/silc/ops.c:1160
 #: ../libgaim/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "�≧�莅���篏睡����莖�荐�"
@@ -12655,12 +12749,8 @@
 msgstr "絅遵� %s 筝�茴�拭篁�"
 
 #: ../libgaim/protocols/silc/buddy.c:737
-msgid ""
-"You cannot receive buddy notifications until you import his/her public key.  "
-"You can use the Get Public Key command to get the public key."
-msgstr ""
-"�頑�恰�����ュソ�������逸�����≧��九�域�絅遵���絅遵����ャ��荀���緇����逸�������緇���"
-"�違����篁ゅ�喝���"
+msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
+msgstr "�頑�恰�����ュソ�������逸�����≧��九�域�絅遵���絅遵����ャ��荀���緇����逸�������緇����違����篁ゅ�喝���"
 
 #. Open file selector to select the public key.
 #: ../libgaim/protocols/silc/buddy.c:1064
@@ -12673,9 +12763,7 @@
 msgstr "絅遵� %s 筝���恐莊��"
 
 #: ../libgaim/protocols/silc/buddy.c:1076
-msgid ""
-"To add the buddy you must import his/her public key. Press Import to import "
-"a public key."
+msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
 msgstr "荀��医�絅遵�鐚�綽������ヤ�鐚�絅刻������違��荀����ュ���逸�茫��������ャ����"
 
 #: ../libgaim/protocols/silc/buddy.c:1079
@@ -12687,18 +12775,12 @@
 msgstr "�御��罩g∈��篏睡����"
 
 #: ../libgaim/protocols/silc/buddy.c:1177
-msgid ""
-"More than one user was found with the same public key. Select the correct "
-"user from the list to add to the buddy list."
-msgstr ""
-"莇������篏睡����篏睡����筝����違��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
+msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
+msgstr "莇������篏睡����篏睡����筝����違��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
 
 #: ../libgaim/protocols/silc/buddy.c:1179
-msgid ""
-"More than one user was found with the same name. Select the correct user "
-"from the list to add to the buddy list."
-msgstr ""
-"莇������篏睡����篏睡����筝���腮宴��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
+msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
+msgstr "莇������篏睡����篏睡����筝���腮宴��茫�緇�羝����御��罩g∈��篏睡����鐚�篁ヤ梢�医��喝ソ��羝����с��"
 
 #: ../libgaim/protocols/silc/buddy.c:1467
 msgid "Detached"
@@ -12707,17 +12789,20 @@
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
+#: ../libgaim/protocols/silc/buddy.c:1471
+#: ../libgaim/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "筝���"
 
 #  XXX
-#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
+#: ../libgaim/protocols/silc/buddy.c:1475
+#: ../libgaim/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "������鐚�"
 
 #  XXX
-#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
+#: ../libgaim/protocols/silc/buddy.c:1477
+#: ../libgaim/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "罐球墾羇肢�"
 
@@ -12725,86 +12810,105 @@
 msgid "Robot"
 msgstr "罘�罌遺査"
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
+#: ../libgaim/protocols/silc/buddy.c:1486
+#: ../libgaim/protocols/silc/silc.c:668
 #: ../libgaim/protocols/silc/util.c:514
 msgid "Happy"
 msgstr "��綽�"
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
+#: ../libgaim/protocols/silc/buddy.c:1488
+#: ../libgaim/protocols/silc/silc.c:670
 #: ../libgaim/protocols/silc/util.c:516
 msgid "Sad"
 msgstr "����"
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
+#: ../libgaim/protocols/silc/buddy.c:1490
+#: ../libgaim/protocols/silc/silc.c:672
 #: ../libgaim/protocols/silc/util.c:518
 msgid "Angry"
 msgstr "�ゆ��"
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
+#: ../libgaim/protocols/silc/buddy.c:1492
+#: ../libgaim/protocols/silc/silc.c:674
 #: ../libgaim/protocols/silc/util.c:520
 msgid "Jealous"
 msgstr "絆�絋�"
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
+#: ../libgaim/protocols/silc/buddy.c:1494
+#: ../libgaim/protocols/silc/silc.c:676
 #: ../libgaim/protocols/silc/util.c:522
 msgid "Ashamed"
 msgstr "����"
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
+#: ../libgaim/protocols/silc/buddy.c:1496
+#: ../libgaim/protocols/silc/silc.c:678
 #: ../libgaim/protocols/silc/util.c:524
 msgid "Invincible"
 msgstr "�≧��"
 
-#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
+#: ../libgaim/protocols/silc/buddy.c:1498
+#: ../libgaim/protocols/silc/util.c:526
 msgid "In Love"
 msgstr "����筝�"
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
+#: ../libgaim/protocols/silc/buddy.c:1500
+#: ../libgaim/protocols/silc/silc.c:682
 #: ../libgaim/protocols/silc/util.c:528
 msgid "Sleepy"
 msgstr "�括��"
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
+#: ../libgaim/protocols/silc/buddy.c:1502
+#: ../libgaim/protocols/silc/silc.c:684
 #: ../libgaim/protocols/silc/util.c:530
 msgid "Bored"
 msgstr "�惹��"
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
+#: ../libgaim/protocols/silc/buddy.c:1504
+#: ../libgaim/protocols/silc/silc.c:686
 #: ../libgaim/protocols/silc/util.c:532
 msgid "Excited"
 msgstr "��絅�"
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
+#: ../libgaim/protocols/silc/buddy.c:1506
+#: ../libgaim/protocols/silc/silc.c:688
 #: ../libgaim/protocols/silc/util.c:534
 msgid "Anxious"
 msgstr "����"
 
-#: ../libgaim/protocols/silc/buddy.c:1534 ../libgaim/protocols/silc/ops.c:1196
+#: ../libgaim/protocols/silc/buddy.c:1534
+#: ../libgaim/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "篏睡����罔≦�"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1205
+#: ../libgaim/protocols/silc/buddy.c:1550
+#: ../libgaim/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "綽���"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1217
+#: ../libgaim/protocols/silc/buddy.c:1555
+#: ../libgaim/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "��機�号�"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1222
+#: ../libgaim/protocols/silc/buddy.c:1560
+#: ../libgaim/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "�悟�����"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1227
+#: ../libgaim/protocols/silc/buddy.c:1565
+#: ../libgaim/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "�����臀�"
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1232
-#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
+#: ../libgaim/protocols/silc/buddy.c:1570
+#: ../libgaim/protocols/silc/ops.c:1232
+#: ../libgaim/protocols/silc/silc.c:736
+#: ../libgaim/protocols/silc/silc.c:738
 msgid "Timezone"
 msgstr "����"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1237
+#: ../libgaim/protocols/silc/buddy.c:1575
+#: ../libgaim/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "�����臀�"
 
@@ -12824,11 +12928,13 @@
 msgid "Get Public Key..."
 msgstr "��緇�����..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1622
+#: ../libgaim/protocols/silc/buddy.c:1660
+#: ../libgaim/protocols/silc/ops.c:1622
 msgid "Kill User"
 msgstr "緇�膓画君筝�腱脂�や戎����"
 
-#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
+#: ../libgaim/protocols/silc/buddy.c:1670
+#: ../libgaim/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "���醇�推�膵���"
 
@@ -12841,7 +12947,8 @@
 msgid "Channel %s does not exist in the network"
 msgstr "�脂�� %s 筝���恐莊��"
 
-#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
+#: ../libgaim/protocols/silc/chat.c:81
+#: ../libgaim/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "�脂��莖�荐�"
 
@@ -12912,25 +13019,20 @@
 msgstr "�脂�����井���"
 
 #: ../libgaim/protocols/silc/chat.c:412
-msgid ""
-"Channel authentication is used to secure the channel from unauthorized "
-"access. The authentication may be based on passphrase and digital "
-"signatures. If passphrase is set, it is required to be able to join. If "
-"channel public keys are set then only users whose public keys are listed are "
-"able to join."
-msgstr ""
-"�脂��茯�茘�������我②�脂�������罨���茴����鐚�茯�茘����号���札������霅惹��������夓�"
-"膂順���絋���荐㊤�篋�絲�腆種����ラ�脂��絨怨���篋���莠後�ュ�腆種�絋���荐㊤�篋��脂�����逸����ラ��"
-"��絨怨��������������医�т��銀���"
+msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
+msgstr "�脂��茯�茘�������我②�脂�������罨���茴����鐚�茯�茘����号���札������霅惹��������夓�膂順���絋���荐㊤�篋�絲�腆種����ラ�脂��絨怨���篋���莠後�ュ�腆種�絋���荐㊤�篋��脂�����逸����ラ�脂��絨怨��������������医�т��銀���"
 
 #  XXX ��⑮
-#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
-#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
+#: ../libgaim/protocols/silc/chat.c:421
+#: ../libgaim/protocols/silc/chat.c:422
+#: ../libgaim/protocols/silc/chat.c:459
+#: ../libgaim/protocols/silc/chat.c:460
 #: ../libgaim/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "�脂��茯�茘�"
 
-#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
+#: ../libgaim/protocols/silc/chat.c:423
+#: ../libgaim/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "�医�鐚霡脂��"
 
@@ -12939,7 +13041,8 @@
 msgid "Group Name"
 msgstr "��紊����腮�"
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1907
+#: ../libgaim/protocols/silc/chat.c:582
+#: ../libgaim/protocols/silc/ops.c:1907
 #: ../libgaim/protocols/silc/silc.c:944
 msgid "Passphrase"
 msgstr "絲�腆�"
@@ -13025,8 +13128,7 @@
 
 #: ../libgaim/protocols/silc/chat.c:1097
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "���ュ���絖���鐚������薤������ラ�脂�� %s"
 
 #: ../libgaim/protocols/silc/chat.c:1099
@@ -13037,29 +13139,39 @@
 msgid "Cannot join private group"
 msgstr "�≧����ュ���絖�"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libgaim/protocols/silc/chat.c:1294
+#: ../libgaim/protocols/silc/silc.c:1152
 msgid "Call Command"
 msgstr "�弱ŭ��篁�"
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libgaim/protocols/silc/chat.c:1294
+#: ../libgaim/protocols/silc/silc.c:1152
 msgid "Cannot call command"
 msgstr "�≧��決���篁�"
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
+#: ../libgaim/protocols/silc/chat.c:1295
+#: ../libgaim/protocols/silc/silc.c:1153
 msgid "Unknown command"
 msgstr "���ョ����篁�"
 
 #  NOTE ��篋��醇���腦�罔�蕁�
-#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
-#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
-#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
-#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
-#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
+#: ../libgaim/protocols/silc/ft.c:89
+#: ../libgaim/protocols/silc/ft.c:92
+#: ../libgaim/protocols/silc/ft.c:96
+#: ../libgaim/protocols/silc/ft.c:100
+#: ../libgaim/protocols/silc/ft.c:104
+#: ../libgaim/protocols/silc/ft.c:205
+#: ../libgaim/protocols/silc/ft.c:210
+#: ../libgaim/protocols/silc/ft.c:215
+#: ../libgaim/protocols/silc/ft.c:221
+#: ../libgaim/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "絎�����罟�罅��活叱"
 
-#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
-#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
+#: ../libgaim/protocols/silc/ft.c:90
+#: ../libgaim/protocols/silc/ft.c:93
+#: ../libgaim/protocols/silc/ft.c:97
+#: ../libgaim/protocols/silc/ft.c:101
 #: ../libgaim/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "罟�罅��活叱���主�����"
@@ -13096,7 +13208,8 @@
 msgid "Cannot send file"
 msgstr "�≧��渇��罟�罅�"
 
-#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
+#: ../libgaim/protocols/silc/ops.c:554
+#: ../libgaim/protocols/silc/ops.c:563
 #: ../libgaim/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
@@ -13127,13 +13240,15 @@
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "��← <I>%2$s</I> �� <I>%1$s</I> 荼√�� (%3$s)"
 
-#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
+#: ../libgaim/protocols/silc/ops.c:742
+#: ../libgaim/protocols/silc/ops.c:747
 #: ../libgaim/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "��← %s 緇�膓画君筝�腱脂�� (%s)"
 
-#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
+#: ../libgaim/protocols/silc/ops.c:773
+#: ../libgaim/protocols/silc/ops.c:778
 #: ../libgaim/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
@@ -13156,7 +13271,8 @@
 msgid "Job Role"
 msgstr "�決岡"
 
-#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
+#: ../libgaim/protocols/silc/ops.c:1052
+#: ../libgaim/protocols/silc/silc.c:937
 msgid "Organization"
 msgstr "��絮��罕�"
 
@@ -13172,7 +13288,8 @@
 msgid "Join Chat"
 msgstr "���ヨ��紊��"
 
-#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
+#: ../libgaim/protocols/silc/ops.c:1183
+#: ../libgaim/protocols/silc/ops.c:1332
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1060
 msgid "Real Name"
 msgstr "紮���"
@@ -13181,11 +13298,13 @@
 msgid "Status Text"
 msgstr "����荐���"
 
-#: ../libgaim/protocols/silc/ops.c:1284 ../libgaim/protocols/silc/ops.c:1354
+#: ../libgaim/protocols/silc/ops.c:1284
+#: ../libgaim/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "���井��膣�"
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1355
+#: ../libgaim/protocols/silc/ops.c:1285
+#: ../libgaim/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "���井��膣�������� (Babbleprint)"
 
@@ -13193,7 +13312,8 @@
 msgid "_More..."
 msgstr "�翫�(_M)..."
 
-#: ../libgaim/protocols/silc/ops.c:1369 ../libgaim/protocols/silc/silc.c:1003
+#: ../libgaim/protocols/silc/ops.c:1369
+#: ../libgaim/protocols/silc/silc.c:1003
 msgid "Detach From Server"
 msgstr "��篌堺���������g�"
 
@@ -13221,7 +13341,8 @@
 msgid "No public key was received"
 msgstr "羃����九�医����"
 
-#: ../libgaim/protocols/silc/ops.c:1517 ../libgaim/protocols/silc/ops.c:1530
+#: ../libgaim/protocols/silc/ops.c:1517
+#: ../libgaim/protocols/silc/ops.c:1530
 msgid "Server Information"
 msgstr "篌堺�����荐�"
 
@@ -13229,7 +13350,8 @@
 msgid "Cannot get server information"
 msgstr "�≧���緇�篌堺�����荐�"
 
-#: ../libgaim/protocols/silc/ops.c:1547 ../libgaim/protocols/silc/ops.c:1556
+#: ../libgaim/protocols/silc/ops.c:1547
+#: ../libgaim/protocols/silc/ops.c:1556
 msgid "Server Statistics"
 msgstr "篌堺����輝荐�莖���"
 
@@ -13280,7 +13402,8 @@
 msgid "Network Statistics"
 msgstr "膓画君腟沿�莖���"
 
-#: ../libgaim/protocols/silc/ops.c:1610 ../libgaim/protocols/silc/ops.c:1615
+#: ../libgaim/protocols/silc/ops.c:1610
+#: ../libgaim/protocols/silc/ops.c:1615
 msgid "Ping"
 msgstr "Ping"
 
@@ -13305,15 +13428,15 @@
 msgstr "絲��遺困��紊掩��"
 
 #: ../libgaim/protocols/silc/ops.c:1721
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "�√奨�g�紊掩��鐚�茫��������育�g���綮榊��亥���g���"
 
 #: ../libgaim/protocols/silc/ops.c:1756
 msgid "Disconnected by server"
 msgstr "篌堺����賢�隙��g�"
 
-#: ../libgaim/protocols/silc/ops.c:1818 ../libgaim/protocols/silc/ops.c:1865
+#: ../libgaim/protocols/silc/ops.c:1818
+#: ../libgaim/protocols/silc/ops.c:1865
 #: ../libgaim/protocols/silc/silc.c:188
 msgid "Resuming session"
 msgstr "�√奨綏ヤ����筝�"
@@ -13374,9 +13497,7 @@
 
 #: ../libgaim/protocols/silc/pk.c:103
 #, c-format
-msgid ""
-"Received %s's public key. Your local copy does not match this key. Would you "
-"still like to accept this public key?"
+msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
 msgstr "�九�� %s �����逸�篏��九�亥�����域���憝����筝�����篁��倶・���������医���"
 
 #: ../libgaim/protocols/silc/pk.c:108
@@ -13397,7 +13518,8 @@
 "%s\n"
 "%s\n"
 
-#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
+#: ../libgaim/protocols/silc/pk.c:115
+#: ../libgaim/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "�後�����"
 
@@ -13463,11 +13585,13 @@
 "\n"
 "��機�号�"
 
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
+#: ../libgaim/protocols/silc/silc.c:699
+#: ../libgaim/protocols/silc/util.c:559
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
+#: ../libgaim/protocols/silc/silc.c:701
+#: ../libgaim/protocols/silc/util.c:561
 msgid "MMS"
 msgstr "MMS"
 
@@ -13498,20 +13622,17 @@
 msgstr "���� VCard 罟�罅�"
 
 #  XXX 絅遵�鏅���
-#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
+#: ../libgaim/protocols/silc/silc.c:743
+#: ../libgaim/protocols/silc/silc.c:744
 msgid "User Online Status Attributes"
 msgstr "篏睡����筝�膩�����絮���"
 
 #: ../libgaim/protocols/silc/silc.c:745
-msgid ""
-"You can let other users see your online status information and your personal "
-"information. Please fill the information you would like other users to see "
-"about yourself."
-msgstr ""
-"���札腟��銀�篏睡������荀�����筝�膩���������篋肴�荐�����������莖�荐�鐚�����莠後�ユ�������"
-"篋榊��緇�荀���������"
-
-#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
+msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
+msgstr "���札腟��銀�篏睡������荀�����筝�膩���������篋肴�荐�����������莖�荐�鐚�����莠後�ユ������ヤ査��緇�荀���������"
+
+#: ../libgaim/protocols/silc/silc.c:785
+#: ../libgaim/protocols/silc/silc.c:791
 #: ../libgaim/protocols/silc/silc.c:1430
 msgid "Message of the Day"
 msgstr "���ヨ���"
@@ -13520,12 +13641,15 @@
 msgid "No Message of the Day available"
 msgstr "羃������ヨ���"
 
-#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
+#: ../libgaim/protocols/silc/silc.c:786
+#: ../libgaim/protocols/silc/silc.c:1425
 msgid "There is no Message of the Day associated with this connection"
 msgstr "�����g�羃����檎�������ヨ���"
 
-#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
-#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
+#: ../libgaim/protocols/silc/silc.c:837
+#: ../libgaim/protocols/silc/silc.c:881
+#: ../libgaim/protocols/silc/silc.c:952
+#: ../libgaim/protocols/silc/silc.c:953
 msgid "Create New SILC Key Pair"
 msgstr "�∝���亥�� SILC 絲���絨�"
 
@@ -13669,18 +13793,12 @@
 msgstr "whois &lt;�援┗&gt;鐚��ョ���援┗���檎��莖�荐�"
 
 #: ../libgaim/protocols/silc/silc.c:1660
-msgid ""
-"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
-"channel modes"
+msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
 msgstr "cmode &lt;�脂��&gt; [+|-&lt;罔≦�&gt;]; [����]鐚�荐㊤���蕁�ず�脂��罔≦�"
 
 #: ../libgaim/protocols/silc/silc.c:1664
-msgid ""
-"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
-"on channel"
-msgstr ""
-"cumode &lt;�脂��&gt; +|-&lt;罔≦�&gt; &lt;�援┗&gt;鐚�����絎��脂��篆��号��絎����援┗��"
-"罔≦�"
+msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
+msgstr "cumode &lt;�脂��&gt; +|-&lt;罔≦�&gt; &lt;�援┗&gt;鐚�����絎��脂��篆��号��絎����援┗��罔≦�"
 
 #: ../libgaim/protocols/silc/silc.c:1668
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
@@ -13691,12 +13809,8 @@
 msgstr "oper &lt;�援┗&gt; [-pubkey]鐚���緇�篌堺�����������罨���"
 
 #: ../libgaim/protocols/silc/silc.c:1676
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-"invite &lt;�脂��&gt; [-|+]&lt;�援┗&gt;鐚���茫���絎����援┗���医���絎����援┗�育�脂����"
-"茴�������茵���������絎����援┗緇��脂����茴�������茵�賢腱脂��"
+msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
+msgstr "invite &lt;�脂��&gt; [-|+]&lt;�援┗&gt;鐚���茫���絎����援┗���医���絎����援┗�育�脂����茴�������茵���������絎����援┗緇��脂����茴�������茵�賢腱脂��"
 
 #: ../libgaim/protocols/silc/silc.c:1680
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
@@ -13729,12 +13843,8 @@
 msgstr "users &lt;�脂��&gt;鐚����咲�脂��筝㊦��篏睡����"
 
 #: ../libgaim/protocols/silc/silc.c:1709
-msgid ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
-"specific users in channel(s)"
-msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;�脂��...&gt;鐚����堺��絎���筝���"
-"紊����脂����篏睡��������筝�蕁�篏睡����"
+msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;�脂��...&gt;鐚����堺��絎���筝���紊����脂����篏睡��������筝�蕁�篏睡����"
 
 #. *< type
 #. *< ui_requirement
@@ -13807,7 +13917,8 @@
 msgid "Digitally sign and verify all messages"
 msgstr "�娯�膂順讐�����恰��荐���"
 
-#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
+#: ../libgaim/protocols/silc/util.c:207
+#: ../libgaim/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "綮榊� SILC key pair 筝�..."
 
@@ -13874,7 +13985,8 @@
 "���井��膣�������� (Babbleprint)鐚�\n"
 "%s"
 
-#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
+#: ../libgaim/protocols/silc/util.c:374
+#: ../libgaim/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "���域�荐�"
 
@@ -13905,9 +14017,7 @@
 
 #: ../libgaim/protocols/silc/wb.c:288
 #, c-format
-msgid ""
-"%s sent message to whiteboard on %s channel. Would you like to open the "
-"whiteboard?"
+msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
 msgstr "%s �渇��荐����� %s �脂�����醇�帥����������醇�水���"
 
 #: ../libgaim/protocols/silc/wb.c:302
@@ -14107,12 +14217,8 @@
 msgstr "�������糸�ョ鎧腟援��茘���膈�膣�紊��鐚�篁ヨ�雁�≧��糸�ャ��"
 
 #: ../libgaim/protocols/toc/toc.c:558
-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瑳����膈�緇�����絨����翫����綮狗�激��"
 
 #: ../libgaim/protocols/toc/toc.c:560
 #, c-format
@@ -14149,13 +14255,8 @@
 msgstr "TOC ���坂�筝������� (PAUSE) ��篁ゃ��"
 
 #: ../libgaim/protocols/toc/toc.c:1000
-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��篋�����������������х������鐚�茫����茫���"
 
 #: ../libgaim/protocols/toc/toc.c:1373
 msgid "_Group:"
@@ -14178,8 +14279,10 @@
 msgid "File transfer failed; other side probably canceled."
 msgstr "罟�罅��活叱紊掩��鐚����醇����劫�羔��活叱��"
 
-#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
-#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
+#: ../libgaim/protocols/toc/toc.c:1898
+#: ../libgaim/protocols/toc/toc.c:1938
+#: ../libgaim/protocols/toc/toc.c:2062
+#: ../libgaim/protocols/toc/toc.c:2150
 msgid "Could not connect for transfer."
 msgstr "�≧������g�篁ヤ��活叱��"
 
@@ -14213,7 +14316,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
+#: ../libgaim/protocols/toc/toc.c:2326
+#: ../libgaim/protocols/toc/toc.c:2328
 msgid "TOC Protocol Plugin"
 msgstr "TOC ��絎�罔∞�"
 
@@ -14233,7 +14337,6 @@
 msgid "Yahoo! system message for %s:"
 msgstr "%s �� Yahoo! 膤紫輝荐����"
 
-#  NOTE: ��絨丞�� %s%s ����醇����: 荐�����鐚��堺�����札筝�����鐚�箙�筝��醇��┌����鐚�
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
@@ -14254,12 +14357,8 @@
 
 #: ../libgaim/protocols/yahoo/yahoo.c:1045
 #, 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"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:1048
 msgid "Add buddy rejected"
@@ -14267,13 +14366,8 @@
 
 #: ../libgaim/protocols/yahoo/yahoo.c:1799
 #, 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 罟∽�ユ��羃����贋�亥��������"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:1802
 msgid "Failed Yahoo! Authentication"
@@ -14281,12 +14375,8 @@
 
 #: ../libgaim/protocols/yahoo/yahoo.c:1868
 #, 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��絋�������膊���篁�鐚�絅刻�緇�����絅遵�羝���賢腱脂�わ�筝����喝申�ヤ�鐚�絅刻�鐚�茫���筝�筝���������"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:1871
 msgid "Ignore buddy?"
@@ -14297,14 +14387,8 @@
 msgstr "�≧�篁ユ③絽悟�綺顄�茘�鐚�"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:1920
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-"�≧�篁ユ③絽御�号��画�茯�茘�鐚���茵�ず��叱�ヤ������絲�腆種����� Yahoo! �贋�剛�茯�茘���"
-"羈���Gaim ���喝��荅���� Web Messenger �婭�茯�茘�鐚���腮��茘��号�����吨�������純��"
+msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
+msgstr "�≧�篁ユ③絽御�号��画�茯�茘�鐚���茵�ず��叱�ヤ������絲�腆種����� Yahoo! �贋�剛�茯�茘��号���Gaim ���喝��荅���� Web Messenger �婭�茯�茘�鐚���腮��茘��号�����吨�������純��"
 
 #: ../libgaim/protocols/yahoo/yahoo.c:1931
 msgid "Your account is locked, please log in to the Yahoo! website."
@@ -14554,9 +14638,7 @@
 msgstr "��紊��筝�絖���"
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:374
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
 msgstr "���ョ�����������荐演��荀��糸�坂研膈�緇�篋�����鐚�篁ラ���育�峨�ヨ��紊��"
 
 #: ../libgaim/protocols/yahoo/yahoochat.c:452
@@ -14632,16 +14714,12 @@
 msgstr "Yahoo! ��篋肴���"
 
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:827
-msgid ""
-"Sorry, profiles marked as containing adult content are not supported at this "
-"time."
+msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "絨�筝�莎件�����筝����吓�у�茴����阪��腴ヤ�絎�����篋肴�荐���"
 
 # NOTE 羈������腟���⑮��箙�筝�蕁�ず鐚���茘�����篁ヤ���
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:829
-msgid ""
-"If you wish to view this profile, you will need to visit this link in your "
-"web browser"
+msgid "If you wish to view this profile, you will need to visit this link in your web browser"
 msgstr "������括��������篋肴�荐�鐚�茫��������頳遵������篁ヤ��g�"
 
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1026
@@ -14686,26 +14764,16 @@
 msgstr "�≧���緇�篏睡���� %s ����篋肴�荐�"
 
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1192
-msgid ""
-"Sorry, this profile seems to be in a language or format that is not "
-"supported at this time."
+msgid "Sorry, this profile seems to be in a language or format that is not supported at this time."
 msgstr "絨�筝�莎件�������篋肴�荐�篌寂���戎������絨���←��吡��茯�荐����弱���"
 
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1208
-msgid ""
-"Could not retrieve the user's profile. This most likely is a temporary "
-"server-side problem. Please try again later."
-msgstr ""
-"�≧���緇�篏睡��������篋肴�������緇������遵Ŭ��失�����榊憝�����х���馹�鐚�茫�腮�緇���荅���"
+msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
+msgstr "�≧���緇�篏睡��������篋肴�������緇������遵Ŭ��失�����榊憝�����х���馹�鐚�茫�腮�緇���荅���"
 
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1211
-msgid ""
-"Could not retrieve the user's profile. This most likely means that the user "
-"does not exist; however, Yahoo! sometimes does fail to find a user's "
-"profile. If you know that the user exists, please try again later."
-msgstr ""
-"�≧���緇�篏睡��������篋肴�������緇������処;腓咲����篏睡����筝��絖�����区��鐚�Yahoo! ��筝�"
-"���鞘��遺戎��������篋肴������ユ�����ラ��篏睡����腆阪�絖����茫�腮�緇���荅���"
+msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
+msgstr "�≧���緇�篏睡��������篋肴�������緇������処;腓咲����篏睡����筝��絖�����区��鐚�Yahoo! ��筝����鞘��遺戎��������篋肴������ユ�����ラ��篏睡����腆阪�絖����茫�腮�緇���荅���"
 
 #: ../libgaim/protocols/yahoo/yahoo_profile.c:1218
 msgid "The user's profile is empty."
@@ -14725,9 +14793,7 @@
 "%s"
 
 #: ../libgaim/protocols/zephyr/zephyr.c:355
-msgid ""
-"(There was an error converting this message.\t Check the 'Encoding' option "
-"in the Account Editor)"
+msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
 msgstr "鐚��咲����荐������膩�⊆���主��篋������茫�罟∽�ュ験��羝���賢����膩�⊆���檎��鐚�"
 
 #: ../libgaim/protocols/zephyr/zephyr.c:753
@@ -14811,32 +14877,20 @@
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
 #: ../libgaim/protocols/zephyr/zephyr.c:2717
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;絲��&gt;鐚����肴�����&lt;荐���,<i>絲��</i>,*&gt;"
 
 #: ../libgaim/protocols/zephyr/zephyr.c:2723
-msgid ""
-"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
-msgstr ""
-"zi &lt;蕁���&gt; &lt;絲��&gt鐚����肴�����&lt;<i>蕁���</i>,<i>絲��</i>,*&gt;"
+msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
+msgstr "zi &lt;蕁���&gt; &lt;絲��&gt鐚����肴�����&lt;<i>蕁���</i>,<i>絲��</i>,*&gt;"
 
 #: ../libgaim/protocols/zephyr/zephyr.c:2729
-msgid ""
-"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
-"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zcir &lt;蕁���&gt; &lt;絲��&gt; &lt;�ュ���&gt;鐚����肴����� &lt;<i>蕁���</i>,<i>"
-"絲��</i>,<i>�ュ���</i>&gt;"
+msgid "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zcir &lt;蕁���&gt; &lt;絲��&gt; &lt;�ュ���&gt;鐚����肴����� &lt;<i>蕁���</i>,<i>絲��</i>,<i>�ュ���</i>&gt;"
 
 #: ../libgaim/protocols/zephyr/zephyr.c:2735
-msgid ""
-"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
-msgstr ""
-"zir &lt;絲��&gt; &lt;�ュ���&gt;鐚����肴����� &lt;MESSAGE,<i>絲��</i>,<i>�ュ���"
-"</i>&gt;"
+msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+msgstr "zir &lt;絲��&gt; &lt;�ュ���&gt;鐚����肴����� &lt;MESSAGE,<i>絲��</i>,<i>�ュ���</i>&gt;"
 
 #: ../libgaim/protocols/zephyr/zephyr.c:2740
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
@@ -14916,7 +14970,9 @@
 msgid "Exposure"
 msgstr "�乗昆腮�綺�"
 
-#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
+#: ../libgaim/proxy.c:442
+#: ../libgaim/proxy.c:864
+#: ../libgaim/proxy.c:1021
 #: ../libgaim/proxy.c:1579
 #, c-format
 msgid ""
@@ -14931,7 +14987,9 @@
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "�≧�茹f�� HTTP 篁g��篌堺����������鐚�%s\n"
 
-#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
+#: ../libgaim/proxy.c:672
+#: ../libgaim/proxy.c:718
+#: ../libgaim/proxy.c:756
 #: ../libgaim/proxy.c:768
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -15008,17 +15066,17 @@
 #: ../libgaim/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
-msgstr "%s �壕�����緇� %s �� %s"
+msgstr "%s 緇���%s�������壕��冴��%s��"
 
 #: ../libgaim/status.c:621
 #, c-format
 msgid "%s is now %s"
-msgstr "%s ������ %s"
+msgstr "%s ������%s"
 
 #: ../libgaim/status.c:626
 #, c-format
 msgid "%s is no longer %s"
-msgstr "%s 筝��� %s"
+msgstr "%s 筝���%s"
 
 #: ../libgaim/status.c:1293
 #, c-format
@@ -15028,7 +15086,7 @@
 #: ../libgaim/status.c:1310
 #, c-format
 msgid "%s became unidle"
-msgstr "%s �演��臀����"
+msgstr "%s 筝�����臀�"
 
 #: ../libgaim/status.c:1376
 #, c-format
@@ -15038,7 +15096,7 @@
 #: ../libgaim/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
-msgstr "+++ %s �演��臀����"
+msgstr "+++ %s 筝�����臀�"
 
 #: ../libgaim/util.c:680
 #, c-format
@@ -15050,12 +15108,11 @@
 msgid "Error Reading %s"
 msgstr "莅��� %s ��筝㊦�主��篋����"
 
+# NOTE ��They�����藝弱���茘�����絎�������荅縁���絎����������藝弱���絲��隙�藥�絅巡���
 #: ../libgaim/util.c:2434
 #, c-format
-msgid ""
-"An error was encountered reading your %s.  They have not been loaded, and "
-"the old file has been renamed to %s~."
-msgstr "��В������ %s ���主�������絎���筝����茴���ワ�������罟�罅�綏牙Щ�� %s~��"
+msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
+msgstr "��В������%s���主�������罟�罅��х��莖���筝����茴���ワ�������罟�罅�綏牙Щ�� %s~��"
 
 #: ../libgaim/util.c:2897
 msgid "Calculating..."
@@ -15107,16 +15164,15 @@
 msgstr[0] "%d ��"
 msgstr[1] "%d ��"
 
-#: ../libgaim/util.c:3165 ../libgaim/util.c:3463
+#: ../libgaim/util.c:3165
+#: ../libgaim/util.c:3463
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "�≧��g��違��%s��"
 
 #: ../libgaim/util.c:3291
 #, c-format
-msgid ""
-"Unable to allocate enough memory to hold the contents from %s.  The web "
-"server may be trying something malicious."
+msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
 msgstr "�≧��肴��ャ��%s����緇�莇喝���荐��狗�鐚�膓牙���篌堺������醇�傑���≧���"
 
 #: ../libgaim/util.c:3326
@@ -15134,504 +15190,484 @@
 msgid "Unable to connect to %s: %s"
 msgstr "����g��� %s鐚�%s"
 
-#~ msgid "Tag"
-#~ msgstr "罔�荐�"
-
-#~ msgid "The specified buddy was not found in the Evolution Contacts."
-#~ msgstr "��絎���絅遵�筝��� Evolution ��機篋堺���賢��"
-
-#~ msgid "Invalid Username"
-#~ msgstr "篏睡������腮援�≧��"
-
-#~ msgid "Invalid password"
-#~ msgstr "絲�腆主�≧��"
-
-#~ msgid "Invalid username or password"
-#~ msgstr "篏睡������腮掩��絲�腆主�≧��"
-
-#~ msgid "AIM/ICQ Protocol Plugin"
-#~ msgstr "AIM/ICQ ��絎�罔∞�"
-
-#~ msgid ""
-#~ "Always use AIM/ICQ proxy server for file transfers\n"
-#~ "(slower, but does not reveal your IP address)"
-#~ msgstr ""
-#~ "��綽�篏睡�� AIM/ICQ ��篁g��篌堺������画�罟�罅��活叱\n"
-#~ "鐚�莠����篏�筝����顔�我���� IP 篏���鐚�"
-
-#~ msgid "Invalid username."
-#~ msgstr "篏睡������腮援�≧����"
-
-#~ msgid "Wrong password!"
-#~ msgstr "絲�腆守���鐚�"
-
-#~ msgid "Wrong Password"
-#~ msgstr "�����絲�腆�"
-
-#~ msgid "Send unknown \"_slash\" commands as messages"
-#~ msgstr "筝���������膩�����篁わ�筝�緇��倶��荐�������(_S)"
-
-#~ msgid "Tab Options"
-#~ msgstr "�����檎��"
-
-#~ msgid "_Sounds while away"
-#~ msgstr "�∫����篁��弱�咲�恰��(_S)"
-
-#~ msgid "Away / Idle"
-#~ msgstr "�∫�� / ��臀�"
-
-#~ msgid "gaim_proxy_connect() failed"
-#~ msgstr "gaim_proxy_connect() 紊掩��"
-
-#~ msgid "mysql"
-#~ msgstr "mysql"
-
-#~ msgid "_Configure"
-#~ msgstr "荐㊤�(_C)"
+msgid "Tag"
+msgstr "罔�荐�"
+
+msgid "The specified buddy was not found in the Evolution Contacts."
+msgstr "��絎���絅遵�筝��� Evolution ��機篋堺���賢��"
+
+msgid "Invalid Username"
+msgstr "篏睡������腮援�≧��"
+
+msgid "Invalid password"
+msgstr "絲�腆主�≧��"
+
+msgid "Invalid username or password"
+msgstr "篏睡������腮掩��絲�腆主�≧��"
+
+msgid "AIM/ICQ Protocol Plugin"
+msgstr "AIM/ICQ ��絎�罔∞�"
+
+msgid ""
+"Always use AIM/ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"��綽�篏睡�� AIM/ICQ ��篁g��篌堺������画�罟�罅��活叱\n"
+"鐚�莠����篏�筝����顔�我���� IP 篏���鐚�"
+
+msgid "Invalid username."
+msgstr "篏睡������腮援�≧����"
+
+msgid "Wrong password!"
+msgstr "絲�腆守���鐚�"
+
+msgid "Wrong Password"
+msgstr "�����絲�腆�"
+
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "筝���������膩�����篁わ�筝�緇��倶��荐�������(_S)"
+
+msgid "Tab Options"
+msgstr "�����檎��"
+
+msgid "_Sounds while away"
+msgstr "�∫����篁��弱�咲�恰��(_S)"
+
+msgid "Away / Idle"
+msgstr "�∫�� / ��臀�"
+
+msgid "gaim_proxy_connect() failed"
+msgstr "gaim_proxy_connect() 紊掩��"
+
+msgid "mysql"
+msgstr "mysql"
+
+msgid "_Configure"
+msgstr "荐㊤�(_C)"
+
+msgid "Host:"
+msgstr "筝紙�篏���(_H)鐚�"
+
+msgid "Port:"
+msgstr "��荐���鐚�"
+
+msgid "Crazychat"
+msgstr "Crazychat"
+
+msgid "Network Configuration"
+msgstr "膓画君荐㊤�"
+
+msgid "TCP port"
+msgstr "TCP��荐���"
+
+msgid "UDP port"
+msgstr "UDP��荐���"
+
+msgid "Disabled"
+msgstr "����"
+
+msgid "Blink tray icon for unread..."
+msgstr "�������荐�����鐚�����綏ヤ��e��腓�..."
+
+msgid "_Instant Messages:"
+msgstr "�恰��荐���(_I)鐚�"
+
+msgid "C_hat Messages:"
+msgstr "��紊����(_H)鐚�"
 
 #, fuzzy
-#~ msgid "Host:"
-#~ msgstr "筝紙�篏���(_H)鐚�"
-
-#~ msgid "Port:"
-#~ msgstr "��荐���鐚�"
-
-#~ msgid "Crazychat"
-#~ msgstr "Crazychat"
-
-#~ msgid "Network Configuration"
-#~ msgstr "膓画君荐㊤�"
-
-#~ msgid "TCP port"
-#~ msgstr "TCP��荐���"
-
-#~ msgid "UDP port"
-#~ msgstr "UDP��荐���"
-
-#~ msgid "Disabled"
-#~ msgstr "����"
-
-#~ msgid "Blink tray icon for unread..."
-#~ msgstr "�������荐�����鐚�����綏ヤ��e��腓�..."
-
-#~ msgid "_Instant Messages:"
-#~ msgstr "�恰��荐���(_I)鐚�"
-
-#~ msgid "C_hat Messages:"
-#~ msgstr "��紊����(_H)鐚�"
-
-#~ msgid "When my nick is said"
-#~ msgstr "�倶�����援┗茴����"
-
-#~ msgid "Displays an icon for Gaim in the system tray."
-#~ msgstr "��鎧腟怨轡篏��d賢蕁�ず Gaim ����腓冴��"
+msgid "When my nick is said"
+msgstr "�倶����絽活������臀���(_I)"
+
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "��鎧腟怨轡篏��d賢蕁�ず Gaim ����腓冴��"
 
 # NOTE queuing semantics clarified by marv on #gaim
-#~ 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. Also provides options "
-#~ "to blink for unread messages."
-#~ msgstr ""
-#~ "絨� Gaim ����������鐚�蕁�ず�主鎧腟怨轡篏��e��腓坂�鐚�箴�絋��� GNOME��KDE ��緇��荀�腦�"
-#~ "膈�鐚�鐚�������箴�絨�絽悟�����順��綽�����篏�鐚�篁ュ��翫��絅遵�羝�����蕁�ず��絎�箙���箴����九��"
-#~ "�����荐�����鐚�����綏ヤ��e��腓榊�����緒����醐���"
-
-#~ msgid "Cipher Test"
-#~ msgstr "��絲�羝��"
-
-#~ msgid ""
-#~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
-#~ "account properties"
-#~ msgstr ""
-#~ "�糸�ラ����篌堺������荀�篏睡�� TLS/SSL��茫���験��羝�������篆��劫験����荀�腦�藥��吾��TLS ��"
-#~ "���������檎����"
+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. Also provides options to blink for unread messages."
+msgstr "絨� Gaim ����������鐚�蕁�ず�主鎧腟怨轡篏��e��腓坂�鐚�箴�絋��� GNOME��KDE ��緇��荀�腦�膈�鐚�鐚�������箴�絨�絽悟�����順��綽�����篏�鐚�篁ュ��翫��絅遵�羝�����蕁�ず��絎�箙���箴����九�井�����荐�����鐚�����綏ヤ��e��腓榊�����緒����醐���"
+
+msgid "Cipher Test"
+msgstr "��絲�羝��"
+
+msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
+msgstr "�糸�ラ����篌堺������荀�篏睡�� TLS/SSL��茫���験��羝�������篆��劫験����荀�腦�藥��吾��TLS �����������檎����"
 
 # XXX ��⑮
-#~ msgid "Use TLS if available"
-#~ msgstr "TLS ��������"
-
-#~ msgid "Require TLS"
-#~ msgstr "��荀�TLS"
-
-#~ msgid "Lost connection with server for an unknown reason."
-#~ msgstr "���坂������絨��頑��篌堺�����g�筝㊥�激��"
-
-#~ msgid "A"
-#~ msgstr "A��"
-
-#~ msgid "B"
-#~ msgstr "B��"
-
-#~ msgid "AB"
-#~ msgstr "AB��"
-
-#~ msgid "QQ Server"
-#~ msgstr "QQ 篌堺����"
-
-#~ msgid "QQ Port"
-#~ msgstr "QQ ��荐���"
-
-#~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
-#~ msgstr "絅遵���%2$d����腟�篋����渇��罟�罅���%1$s����荀�羆�"
-
-#~ msgid "Unable to read"
-#~ msgstr "�≧�莅���"
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "g003: �g����������\n"
-
-#~ msgid "Buddy icon:"
-#~ msgstr "絅遵���腓削�"
-
-#~ msgid "IM the user"
-#~ msgstr "���阪�恰��荐���畿篏睡����"
-
-#~ msgid "Ignore the user"
-#~ msgstr "綽順�ヤ戎����"
-
-#~ msgid "Get the user's information"
-#~ msgstr "��緇�篏睡����莖�荐�"
-
-#~ msgid "Unable to read header from server"
-#~ msgstr "�≧��延失�������罔��㊧�荐�"
-
-#~ msgid ""
-#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
-#~ msgstr "�≧��延失�������莖�荐�鐚�%s����篁ょ�� %hd鐚��桁墾�� %hd��"
-
-#~ msgid "Unknown server error."
-#~ msgstr "���ヤ失���������"
-
-#~ msgid "users: %s, files: %s, size: %sGB"
-#~ msgstr "篏睡����鐚�%s鐚�罟�罅�鐚�%s鐚�紊у�鐚�%sGB"
-
-#~ msgid "Unable to add \"%s\" to your Napster hotlist"
-#~ msgstr "�≧�絨���%s�����ユ���� Napster �演��羝���賢"
-
-#~ msgid "%s requested your information"
-#~ msgstr "%s �ヨ�����篏睡����莖�荐�"
-
-#~ msgid "%s requested a PING"
-#~ msgstr "%s 荀�羆�筝��� PING"
-
-#~ msgid "NAPSTER Protocol Plugin"
-#~ msgstr "NAPSTER ��絎�罔∞�"
-
-#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
-#~ msgstr "�≧��㊥�冗�恰��鐚����堺���後���罟�罅� (%s) 筝�絖�����"
-
-#~ msgid ""
-#~ "Unable to play sound because the 'Command' sound method has been chosen, "
-#~ "but no command has been set."
-#~ msgstr ""
-#~ "�≧��㊥�冗�恰��鐚����咲�後�篋�����篁ゃ���堺�㊥�丈─綣������研羃���荐㊤�篁私���篁ゃ��"
-
-#~ msgid ""
-#~ "Unable to play sound because the configured sound command could not be "
-#~ "launched: %s"
-#~ msgstr "�≧��㊥�冗�恰��鐚����榊�≧��決���荐㊤����恰����篁わ�%s"
-
-#~ msgid "Unable to initiate a new search"
-#~ msgstr "�≧���紮�筝����亥����絨�"
-
-#~ msgid "You have a pending search. Please wait for it to finish."
-#~ msgstr "����筝�������筝㊦����絨���茫�膈���絎�絎�����"
-
-#~ msgid "Direct IM with %s closed"
-#~ msgstr "�� %s ���恰��荐�������"
-
-#~ msgid "Direct IM with %s failed"
-#~ msgstr "�� %s ���恰��荐���け��"
-
-#~ msgid "Unable to open Direct IM"
-#~ msgstr "�≧������贋・���恰��荐���"
-
-#~ msgid "You have lost your connection to chat room %s."
-#~ msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
-
-#~ msgid "Chat is currently unavailable"
-#~ msgstr "�����≧�篏睡����紊��"
-
-#~ msgid "Unable to create new connection."
-#~ msgstr "�≧������育�g���"
+msgid "Use TLS if available"
+msgstr "TLS ��������"
+
+msgid "Require TLS"
+msgstr "��荀�TLS"
+
+msgid "Lost connection with server for an unknown reason."
+msgstr "���坂������絨��頑��篌堺�����g�筝㊥�激��"
+
+msgid "A"
+msgstr "A��"
+
+msgid "B"
+msgstr "B��"
+
+msgid "AB"
+msgstr "AB��"
+
+msgid "QQ Server"
+msgstr "QQ 篌堺����"
+
+msgid "QQ Port"
+msgstr "QQ ��荐���"
+
+msgid "Your request to send file[%s] has been rejected by buddy[%d]"
+msgstr "絅遵���%2$d����腟�篋����渇��罟�罅���%1$s����荀�羆�"
+
+msgid "Unable to read"
+msgstr "�≧�莅���"
+
+msgid "g003: Error opening connection.\n"
+msgstr "g003: �g����������\n"
+
+msgid "Buddy icon:"
+msgstr "絅遵���腓削�"
+
+msgid "IM the user"
+msgstr "���阪�恰��荐���畿篏睡����"
+
+msgid "Ignore the user"
+msgstr "綽順�ヤ戎����"
+
+msgid "Get the user's information"
+msgstr "��緇�篏睡����莖�荐�"
+
+msgid "Unable to read header from server"
+msgstr "�≧��延失�������罔��㊧�荐�"
+
+msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
+msgstr "�≧��延失�������莖�荐�鐚�%s����篁ょ�� %hd鐚��桁墾�� %hd��"
+
+msgid "Unknown server error."
+msgstr "���ヤ失���������"
+
+msgid "users: %s, files: %s, size: %sGB"
+msgstr "篏睡����鐚�%s鐚�罟�罅�鐚�%s鐚�紊у�鐚�%sGB"
+
+msgid "Unable to add \"%s\" to your Napster hotlist"
+msgstr "�≧�絨���%s�����ユ���� Napster �演��羝���賢"
+
+msgid "%s requested your information"
+msgstr "%s �ヨ�����篏睡����莖�荐�"
+
+msgid "%s requested a PING"
+msgstr "%s 荀�羆�筝��� PING"
+
+msgid "NAPSTER Protocol Plugin"
+msgstr "NAPSTER ��絎�罔∞�"
+
+msgid "Unable to play sound because the chosen file (%s) does not exist."
+msgstr "�≧��㊥�冗�恰��鐚����堺���後���罟�罅� (%s) 筝�絖�����"
+
+msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
+msgstr "�≧��㊥�冗�恰��鐚����咲�後�篋�����篁ゃ���堺�㊥�丈─綣������研羃���荐㊤�篁私���篁ゃ��"
+
+msgid "Unable to play sound because the configured sound command could not be launched: %s"
+msgstr "�≧��㊥�冗�恰��鐚����榊�≧��決���荐㊤����恰����篁わ�%s"
+
+msgid "Unable to initiate a new search"
+msgstr "�≧���紮�筝����亥����絨�"
+
+msgid "You have a pending search. Please wait for it to finish."
+msgstr "����筝�������筝㊦����絨���茫�膈���絎�絎�����"
+
+msgid "Direct IM with %s closed"
+msgstr "�� %s ���恰��荐�������"
+
+msgid "Direct IM with %s failed"
+msgstr "�� %s ���恰��荐���け��"
+
+msgid "Unable to open Direct IM"
+msgstr "�≧������贋・���恰��荐���"
+
+msgid "You have lost your connection to chat room %s."
+msgstr "��群膓��沿��紊�� %s ��罩∫�g���"
+
+msgid "Chat is currently unavailable"
+msgstr "�����≧�篏睡����紊��"
+
+msgid "Unable to create new connection."
+msgstr "�≧������育�g���"
 
 #, fuzzy
-#~ msgid ""
-#~ "Unable to establish listener socket or no AOL proxy connection present."
-#~ msgstr "�≧�綮榊��h�遵�� Socket��"
-
-#~ msgid "Auth host"
-#~ msgstr "茯�茘�篌堺����"
-
-#~ msgid "Auth port"
-#~ msgstr "茯�茘���荐���"
-
-#~ msgid "TOC host"
-#~ msgstr "TOC 篌堺����"
-
-#~ msgid "TOC port"
-#~ msgstr "TOC ��荐���"
-
-#~ msgid "Pager host"
-#~ msgstr "�喝�主鎧腟延失����"
-
-#~ msgid "YCHT host"
-#~ msgstr "YCHT 筝紙�"
-
-#~ msgid "YCHT port"
-#~ msgstr "YCHT ��荐���"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s �糸�冴��"
-
-#~ msgid "Start _Voice Chat"
-#~ msgstr "����茯��活��紊�"
-
-#~ msgid "Screen Name:"
-#~ msgstr "絽活��鐚�"
-
-#, fuzzy
-#~ msgid "Background color name"
-#~ msgstr "�������"
-
-#~ msgid "Whether this tag affects the background color"
-#~ msgstr "筝�膊♂����罔�膠ゆ����襲�粋�������"
-
-#~ msgid "ComboBox model"
-#~ msgstr "ComboBox罔e�"
-
-#~ msgid "The model for the combo box"
-#~ msgstr "Combo Box��罔e�"
-
-#~ msgid "Wrap width"
-#~ msgstr "��茵�絲�墾"
-
-#~ msgid "Wrap width for layouting the items in a grid"
-#~ msgstr "�у�狗���� Grid 筝㊨¨腓榊����茵�絲�墾"
-
-#~ msgid "Row span column"
-#~ msgstr "罘���莊��"
-
-#~ msgid "Column span column"
-#~ msgstr "膰怨��莊��"
-
-#~ msgid "me is using Gaim v%s."
-#~ msgstr "������ Gaim v%s��"
-
-#~ msgid "Call ended."
-#~ msgstr "腟����弱ù��"
-
-#~ msgid "Calling %s"
-#~ msgstr "�弱� %s"
-
-#~ msgid "End Call"
-#~ msgstr "靚����弱�"
-
-#~ msgid "Receiving call from %s"
-#~ msgstr "�嚭�遺��� %s ���弱�"
-
-#~ msgid "Reject Call"
-#~ msgstr "��靚��弱�"
-
-#~ msgid "Accept call"
-#~ msgstr "����弱�"
-
-#~ msgid "Connected to %s"
-#~ msgstr "鎴臥�g��� %s"
-
-#~ msgid "_Mute"
-#~ msgstr "����(_M)"
-
-#~ msgid "Error launching <b>%s</b>: %s"
-#~ msgstr "�決���%s�����主��篋����鐚�%s"
-
-#~ msgid "e-Mail"
-#~ msgstr "�糸��灸散"
-
-#~ msgid "Realname"
-#~ msgstr "紮���"
-
-#~ msgid "Email Address"
-#~ msgstr "�糸��灸散"
-
-#~ msgid "EMail"
-#~ msgstr "�糸��灸散"
-
-#~ msgid "Private Key File"
-#~ msgstr "腱��井�罅�"
-
-#~ msgid "Re-type Passphrase"
-#~ msgstr "��罨∴叱�ュ�腆�"
-
-#~ msgid "%s came back"
-#~ msgstr "%s ��箴�篋�"
-
-#~ msgid "%s went away"
-#~ msgstr "%s 綏牙��∫��"
-
-#~ msgid "New Status..."
-#~ msgstr "�亥����..."
-
-#~ msgid "Saved Status..."
-#~ msgstr "�峨�����..."
-
-#~ msgid "Join A Chat..."
-#~ msgstr "���ヨ��紊��..."
-
-#~ msgid "(+%d more)"
-#~ msgstr "鐚�篁ュ���� %d ��鐚�"
-
-#~ msgid " left the room (%s)."
-#~ msgstr " �∫����紊�� (%s)��"
-
-#~ msgid "Offline "
-#~ msgstr "�∝� "
-
-#~ msgid "Default"
-#~ msgstr "��荐�"
-
-#~ msgid "<span weight=\"bold\">From:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">箴����</span> %s\n"
-
-#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
-#~ msgstr "<span weight=\"bold\">筝脂�鐚�</span> %s\n"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">���九�遺��灸散鐚�</span>\n"
-#~ "\n"
-#~ "%s%s%s%s"
-
-#~ msgid "Pounce Action"
-#~ msgstr "������篏�"
-
-#~ msgid "_Warn"
-#~ msgstr "茘���(_W)"
-
-#~ msgid "Jabber ID"
-#~ msgstr "Jabber 絽活��"
-
-#~ msgid "Away Message"
-#~ msgstr "�∫��荐���"
+msgid "Unable to establish listener socket or no AOL proxy connection present."
+msgstr "�≧�綮榊��h�遵�� Socket��"
+
+msgid "Auth host"
+msgstr "茯�茘�篌堺����"
+
+msgid "Auth port"
+msgstr "茯�茘���荐���"
+
+msgid "TOC host"
+msgstr "TOC 篌堺����"
+
+msgid "TOC port"
+msgstr "TOC ��荐���"
+
+msgid "Pager host"
+msgstr "�喝�主鎧腟延失����"
+
+msgid "YCHT host"
+msgstr "YCHT 筝紙�"
+
+msgid "YCHT port"
+msgstr "YCHT ��荐���"
+
+msgid "%s logged out."
+msgstr "%s �糸�冴��"
+
+msgid "Start _Voice Chat"
+msgstr "����茯��活��紊�"
+
+msgid "Screen Name:"
+msgstr "絽活��鐚�"
+
+msgid "Background color name"
+msgstr "������峨��腮�"
+
+msgid "Whether this tag affects the background color"
+msgstr "筝�膊♂����罔�膠ゆ����襲�粋�������"
+
+msgid "ComboBox model"
+msgstr "ComboBox罔e�"
+
+msgid "The model for the combo box"
+msgstr "Combo Box��罔e�"
+
+msgid "Wrap width"
+msgstr "��茵�絲�墾"
+
+msgid "Wrap width for layouting the items in a grid"
+msgstr "�у�狗���� Grid 筝㊨¨腓榊����茵�絲�墾"
+
+msgid "Row span column"
+msgstr "罘���莊��"
+
+msgid "Column span column"
+msgstr "膰怨��莊��"
+
+msgid "me is using Gaim v%s."
+msgstr "������ Gaim v%s��"
+
+msgid "Call ended."
+msgstr "腟����弱ù��"
+
+msgid "Calling %s"
+msgstr "�弱� %s"
+
+msgid "End Call"
+msgstr "靚����弱�"
+
+msgid "Receiving call from %s"
+msgstr "�嚭�遺��� %s ���弱�"
+
+msgid "Reject Call"
+msgstr "��靚��弱�"
+
+msgid "Accept call"
+msgstr "����弱�"
+
+msgid "Connected to %s"
+msgstr "鎴臥�g��� %s"
+
+msgid "_Mute"
+msgstr "����(_M)"
+
+msgid "Error launching <b>%s</b>: %s"
+msgstr "�決���%s�����主��篋����鐚�%s"
+
+msgid "e-Mail"
+msgstr "�糸��灸散"
+
+msgid "Realname"
+msgstr "紮���"
+
+msgid "Email Address"
+msgstr "�糸��灸散"
+
+msgid "EMail"
+msgstr "�糸��灸散"
+
+msgid "Private Key File"
+msgstr "腱��井�罅�"
+
+msgid "Re-type Passphrase"
+msgstr "��罨∴叱�ュ�腆�"
+
+msgid "%s came back"
+msgstr "%s ��箴�篋�"
+
+msgid "%s went away"
+msgstr "%s 綏牙��∫��"
+
+msgid "New Status..."
+msgstr "�亥����..."
+
+msgid "Saved Status..."
+msgstr "�峨�����..."
+
+msgid "Join A Chat..."
+msgstr "���ヨ��紊��..."
+
+msgid "(+%d more)"
+msgstr "鐚�篁ュ���� %d ��鐚�"
+
+msgid " left the room (%s)."
+msgstr " �∫����紊�� (%s)��"
+
+msgid "Offline "
+msgstr "�∝�"
+
+msgid "Default"
+msgstr "��荐�"
+
+msgid "<span weight=\"bold\">From:</span> %s\n"
+msgstr "<span weight=\"bold\">箴����</span> %s\n"
+
+msgid "<span weight=\"bold\">Subject:</span> %s\n"
+msgstr "<span weight=\"bold\">筝脂�鐚�</span> %s\n"
+
+msgid ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s%s%s%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">���九�遺��灸散鐚�</span>\n"
+"\n"
+"%s%s%s%s"
+
+msgid "Pounce Action"
+msgstr "������篏�"
+
+msgid "_Warn"
+msgstr "茘���(_W)"
+
+msgid "Jabber ID"
+msgstr "Jabber 絽活��"
+
+msgid "Away Message"
+msgstr "�∫��荐���"
 
 #  NOTE Jabber 茵�茯�鐚�荀�筝�
-#, fuzzy
-#~ msgid "(pending)"
-#~ msgstr "�¥�篏�罩g�緇�絨��壕�茘����"
-
-#~ msgid "Hide IP address"
-#~ msgstr "�沿�� IP 篏���"
+msgid "(pending)"
+msgstr "鐚�膈�緇�茯�茘�鐚�"
+
+msgid "Hide IP address"
+msgstr "�沿�� IP 篏���"
 
 # NOTE ���� http://www.geocities.com/Athens/Delphi/6470/icq99.html
 #, fuzzy
-#~ msgid "Web aware"
-#~ msgstr "��荐怨�銀�篏睡������恐莊���ョ��������������"
+msgid "Web aware"
+msgstr "��荐怨�銀�篏睡������恐莊���ョ��������������"
 
 #  XXX ������藥����茘����
-#~ msgid "Active"
-#~ msgstr "����"
-
-#~ msgid "Add User"
-#~ msgstr "�医�篏睡����"
-
-#~ msgid "Write a gtkrc file with these settings to %s"
-#~ msgstr "絨���篋�荐㊤�絲��ュ�� %s �� gtkrc 罟�"
-
-#~ msgid "Screenname:"
-#~ msgstr "絽活��鐚�"
-
-#~ msgid "Host name"
-#~ msgstr "筝紙���腮�"
-
-#~ msgid "Default status messages"
-#~ msgstr "��荐㊦����荐���"
-
-#~ msgid "Edit Status Messages"
-#~ msgstr "篆��合����荐���"
-
-#~ msgid "Set Status Messages..."
-#~ msgstr "荐㊤�����荐���..."
-
-#~ msgid "Not At Home"
-#~ msgstr "筝����"
-
-#~ msgid "Not At Desk"
-#~ msgstr "筝���婚篏�"
-
-#~ msgid "Not In Office"
-#~ msgstr "筝���商���"
-
-#~ msgid "Hello!"
-#~ msgstr "��ソ鐚�"
-
-#~ msgid "Gaim"
-#~ msgstr "Gaim"
-
-#~ msgid "Gaim - Signed off"
-#~ msgstr "Gaim - 綏牙�糸��"
-
-#~ msgid "Gaim - Away"
-#~ msgstr "Gaim - �∫��"
-
-#~ msgid "Set account idle time"
-#~ msgstr "荐㊤�絽活����臀�����"
-
-#~ msgid "Unset account idle time"
-#~ msgstr "��羔�絽活����臀�����荐㊤�"
-
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "Do you wish to add him or her to your buddy list?"
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
-
-#~ msgid "_Alias Buddy..."
-#~ msgstr "�咲����絅遵���筝��ュ��(_A)..."
+msgid "Active"
+msgstr "����"
+
+msgid "Add User"
+msgstr "�医�篏睡����"
+
+msgid "Write a gtkrc file with these settings to %s"
+msgstr "絨���篋�荐㊤�絲��ュ�� %s �� gtkrc 罟�"
+
+msgid "Screenname:"
+msgstr "絽活��鐚�"
+
+msgid "Host name"
+msgstr "筝紙���腮�"
+
+msgid "Default status messages"
+msgstr "��荐㊦����荐���"
+
+msgid "Edit Status Messages"
+msgstr "膩�鹿����荐���"
+
+msgid "Set Status Messages..."
+msgstr "荐㊤�����荐���..."
+
+msgid "Not At Home"
+msgstr "筝����"
+
+msgid "Not At Desk"
+msgstr "筝���婚篏�"
+
+msgid "Not In Office"
+msgstr "筝���商���"
+
+msgid "Hello!"
+msgstr "��ソ鐚�"
+
+msgid "Gaim"
+msgstr "Gaim"
+
+msgid "Gaim - Signed off"
+msgstr "Gaim - 綏牙�糸��"
+
+msgid "Gaim - Away"
+msgstr "Gaim - �∫��"
+
+msgid "Set account idle time"
+msgstr "荐㊤�絽活����臀�����"
+
+msgid "Unset account idle time"
+msgstr "��羔�絽活����臀�����荐㊤�"
+
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
+
+msgid "_Alias Buddy..."
+msgstr "�咲����絅遵���筝��ュ��(_A)..."
 
 # XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
-#~ msgid "Alias Contact..."
-#~ msgstr "�咲��腟�絅遵���筝��ュ��..."
-
-#~ msgid "/Tools/Account Ac_tions"
-#~ msgstr "/綏ュ��/絽活���檎����篁�(_T)"
-
-#~ msgid "/Tools/A_ccounts"
-#~ msgstr "/綏ュ��/絽活��羝���(_C)"
-
-#~ msgid "Idle "
-#~ msgstr "��臀� "
-
-#~ msgid "/Tools/Account Actions"
-#~ msgstr "/綏ュ��/絽活���檎����篁�"
-
-#~ msgid "Active Developers"
-#~ msgstr "�鞘算���取��"
-
-#~ msgid "Change password"
-#~ msgstr "篆��劫�腆�"
-
-#~ msgid "Error processing event or response (%s)."
-#~ msgstr "����篋�篁倶����荀����主����� (%s)��"
-
-#~ msgid "Error Message Suppression"
-#~ msgstr "���荐�������"
-
-#~ msgid "Hide Disconnect Errors"
-#~ msgstr "筝�蕁�ず筝㊥�潔�g����"
-
-#~ msgid "Hide Login Errors"
-#~ msgstr "筝�蕁�ず�糸�ラ���"
+msgid "Alias Contact..."
+msgstr "�咲��腟�絅遵���筝��ュ��..."
+
+msgid "/Tools/Account Ac_tions"
+msgstr "/綏ュ��/絽活���檎����篁�(_T)"
+
+msgid "/Tools/A_ccounts"
+msgstr "/綏ュ��/絽活��羝���(_C)"
+
+msgid "Idle "
+msgstr "��臀�"
+
+msgid "/Tools/Account Actions"
+msgstr "/綏ュ��/絽活���檎����篁�"
+
+msgid "Active Developers"
+msgstr "�鞘算���取��"
+
+msgid "Change password"
+msgstr "篆��劫�腆�"
+
+msgid "Error processing event or response (%s)."
+msgstr "����篋�篁倶����荀����主����� (%s)��"
 
 #, fuzzy
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "筝�蕁�ず筝㊥�潔�g����"
+msgid "Error Message Suppression"
+msgstr "���荐���"
+
+msgid "Hide Disconnect Errors"
+msgstr "筝�蕁�ず筝㊥�潔�g����"
+
+msgid "Hide Login Errors"
+msgstr "筝�蕁�ず�糸�ラ���"
+
+msgid "Hide Reconnecting Dialog"
+msgstr "�沿����佉�g�篋よ�荀�腦�"
 
 #  *< api_version
 #  *< type
@@ -15647,101 +15683,325 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#~ msgid "Auto-Reconnect"
-#~ msgstr "�������育�g�"
-
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "�銀��欠���鐚�膤紫輝������綛�����育�g���"
+msgid "Auto-Reconnect"
+msgstr "�������育�g�"
+
+msgid "When you are kicked offline, this reconnects you."
+msgstr "�銀��欠���鐚�膤紫輝������綛�����育�g���"
 
 # NOTE 茘����後� by Etan Reisner (���取��箙�筝�)
-#~ msgid "Use last matching buddy"
-#~ msgstr "篏睡����緇�鐚���������鐚�筝����拷����絅遵�絽活��"
+msgid "Use last matching buddy"
+msgstr "篏睡����緇�鐚���������鐚�筝����拷����絅遵�絽活��"
 
 # NOTE 罸頫�筝���お�件�筝��篋堺������\n������鐚�����荀�腦�������
+msgid ""
+"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) will use what used to be\n"
+"the built-in order: active, idle, away, away + idle, offline."
+msgstr ""
+"�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n"
+"��腟����緇����取���鐚�腥�����絨����冴��������鐚����榊�倶��絲���\n"
+"篏睡����絅遵�絽活����\n"
+"���∝���������荐㊤� 4 ��鐚����∫��������鐚�����臀���1 ����\n"
+"荀�緇��咲��荐㊦������罨≦���羃���臀�����臀����∫�����∫���守��臀���鐚�\n"
+"篏睡���������荐㊤�弱�喝���"
+
+msgid "_Keep the dialog open"
+msgstr "篆���絨�荅掩�����(_K)"
+
+msgid "A_way"
+msgstr "�∫��(_W)"
+
+msgid "_Idle"
+msgstr "��臀�(_I)"
+
+msgid "Retur_n from idle"
+msgstr "�演��臀����(_N)"
+
+msgid "Bro_wse..."
+msgstr "�頳�(_W)..."
+
+msgid "Remove Buddy Pounce"
+msgstr "腱脂�ゅソ����������"
+
+msgid "_Queue new messages when away"
+msgstr "���∫����鐚�絨��������域���舟�ヤ���筝�(_Q)"
+
+msgid "Unable to set AIM away message."
+msgstr "�≧�荐㊤� AIM �∫��荐�����"
+
+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 "Verify all IM message signatures"
+msgstr "�後������恰��荐�����膂順�"
+
+msgid "Digitally sign all channel messages"
+msgstr "�娯�膂順讐�����脂��荐���"
+
+msgid "Verify all channel message signatures"
+msgstr "�後������脂��荐�����膂順�"
+
+msgid "(%d message)"
+msgid_plural "(%d messages)"
+msgstr[0] "鐚�%d ��荐����"
+msgstr[1] "鐚�%d ��荐����"
+
+msgid "(1 message)"
+msgstr "鐚�筝���荐����"
+
+msgid "Default auto-away"
+msgstr "��荐㊧�����∫��"
+
+msgid "_Sorting:"
+msgstr "��綺�婧�(_S)鐚�"
+
+msgid "Buddy Display"
+msgstr "絅遵�蕁�ず"
+
+# XXX ��⑮
+msgid "Show more buddy details"
+msgstr "蕁�ず�翫�篏睡����膣亥�"
+
+msgid "Gnome Default"
+msgstr "GNOME��荐㊤��"
+
+msgid "Away m_essage:"
+msgstr "�∫��荐���(_M)鐚�"
+
+msgid "IRC"
+msgstr "IRC"
+
+#~ msgid ""
+#~ "\n"
+#~ "%s is typing..."
+#~ msgstr ""
+#~ "\n"
+#~ "%s 罩e��叱��..."
+#~ msgid "Use GNOME Proxy Settings"
+#~ msgstr "篏睡�� GNOME ��篁g��篌堺����┃絎�"
+
+#  NOTE: ��絨丞�� %s%s ����醇����: 荐�����鐚��堺�����札筝�����鐚�箙�筝��醇��┌����鐚�
+#, fuzzy
+#~ msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+#~ msgstr "篏睡���� %s �活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝���%s%s��"
+#~ msgid "Authorize buddy?"
+#~ msgstr "腟��茯�茘�鐚�"
+#~ msgid "Un_block"
+#~ msgstr "茹i�ゅ���(_B)"
+#~ msgid "Buddy Alias"
+#~ msgstr "絅遵��ュ��"
+#~ msgid "Logged In"
+#~ msgstr "綏牙�糸��"
+#~ msgid "Last Seen"
+#~ msgstr "筝�罨∞�糸��"
+#~ msgid "_Browse logs folder"
+#~ msgstr "�頳醇�ヨ�����(_B)"
+#~ msgid "<b>You have %d new e-mail.</b>"
+#~ msgid_plural "<b>You have %d new e-mails.</b>"
+#~ msgstr[0] "<b>���� %d 絨��育�灸散��</b>"
+#~ msgstr[1] "<b>���� %d 絨��育�灸散��</b>"
+#~ msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+#~ msgstr "'%s' 絨� %s 箴�茯�お紊т���茫�荅��絨鋇�藥���綵沿院��\n"
+#~ msgid "Icon Error"
+#~ msgstr "������"
+#~ msgid "Could not set icon"
+#~ msgstr "�≧�荐㊤�����"
+
+# XXX TODO ����絽梧��㊥����Highlight��茘�����蕭�篋�墾��鐚�篏�茘�����札�拷�� - Ambrose 20061029
+#, fuzzy
+#~ msgid "Highlighted Messages"
+#~ msgstr "罔�腓阪�拷��絖�筝�"
+#~ msgid "System Messages"
+#~ msgstr "膤紫輝荐���"
+#~ msgid "Sent Messages"
+#~ msgstr "���肴���"
+#~ msgid "Received Messages"
+#~ msgstr "�九�域���"
+
+#, fuzzy
+#~ msgid "Apply in Chats"
+#~ msgstr "腟���紊���劫�ュ��"
+
+#, fuzzy
+#~ msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+#~ msgstr "�ュ�箴����若��%s����罟�罅��活叱荀�羆����"
+
+#, fuzzy
+#~ msgid "Autoaccept complete"
+#~ msgstr "�ュ��弱�"
+
+#, fuzzy
+#~ msgid "When a file-transfer request arrives from %s"
+#~ msgstr "���箴����若��%s����罟�罅��活叱荀�羆����"
+#~ msgid "_Save"
+#~ msgstr "�峨�(_S)"
+#~ msgid "Auto Accept"
+#~ msgstr "�����ュ�"
+
+#  NOTE ��篋��醇���腦�罔�蕁�
+#~ msgid "Autoaccept File Transfers..."
+#~ msgstr "�����ュ�罟�罅��活叱..."
+#~ msgid ""
+#~ "Path to save the files in\n"
+#~ "(Please provide the full path)"
+#~ msgstr ""
+#~ "罟�罅��峨�莊��\n"
+#~ "鐚�茫���箴�絎��頑君緇�鐚�"
+#~ msgid "Automatically reject from users not in buddy list"
+#~ msgstr "������腟���箴���ソ��羝���賢��篏睡����"
+#~ msgid ""
+#~ "Notify with a popup when an autoaccepted file transfer is complete\n"
+#~ "(only when there's no conversation with the sender)"
+#~ msgstr ""
+#~ "�九��������ュ�罟�罅��活叱��莊喝�肴�腦�����\n"
+#~ "鐚����主���������渇�����画�篋よ�����羈�筝�鐚�"
+#~ msgid "Set autoreply message for %s"
+#~ msgstr "荐㊤�������荀�腟� %s ��荐���"
+#~ msgid "Set Autoreply Message"
+#~ msgstr "荐㊤�������荀�荐���"
+#~ msgid "Set _Autoreply Message"
+#~ msgstr "荐㊤�������荀�荐���(_A)"
+#~ msgid "Autoreply message"
+#~ msgstr "������荀�荐���"
+#~ msgid "Send autoreply messages when"
+#~ msgstr "������荀�荐�����"
+#~ msgid "When my account is _away"
+#~ msgstr "�倶����絽活�����∝���(_A)"
+#~ msgid "_Default reply"
+#~ msgstr "��荐㊤��荀�荐���(_D)"
+#~ msgid "Status message"
+#~ msgstr "����荐���"
+#~ msgid "Autoreply with status message"
+#~ msgstr "������荀�����荐���"
+#~ msgid "Always when there is a status message"
+#~ msgstr "罸�嚷┃絎�篋�����荐�����"
+#~ msgid "Only when there's no autoreply message"
+#~ msgstr "�������荐㊤�������荀�荐�����"
+#~ msgid "Delay between autoreplies"
+#~ msgstr "������荀�荐�����綮狗�我����"
+#~ msgid "_Minimum delay (mins)"
+#~ msgstr "�喝�綮狗�駕���鐚�(_M)"
+#~ msgid "Times to send autoreplies"
+#~ msgstr "���肴������荀�荐�����罨≧��"
+#~ msgid "Ma_ximum count"
+#~ msgstr "��紊�罨≧��"
+#~ msgid ""
+#~ "I am currently not available. Please leave your message, and I will get "
+#~ "back to you as soon as possible."
+#~ msgstr ""
+#~ "���上������絖�筝���茫�����筝�����荐�����倶����箴�������鐚���絨���綽�畿����荀���"
+#, fuzzy
+#~ msgid "Buddy Notes"
+#~ msgstr "絅遵���������"
+
+#, fuzzy
+#~ msgid "Adds the option to store notes for buddies on your buddy list."
+#~ msgstr "%s 筝�������絅遵�羝�����"
+
+#, fuzzy
+#~ msgid "New Line"
+#~ msgstr "�域�腦�"
+
+#, fuzzy
+#~ msgid "Prepends a newline to displayed message."
+#~ msgstr "�≧����肴�����"
+
+#, fuzzy
+#~ msgid "Offline Message"
+#~ msgstr "�∝� "
+#~ msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+#~ msgstr "���札����絅遵�������������絨�荅沿�腦�筝㊦隈莠������ょ��������"
+
+#, fuzzy
+#~ msgid "Idle for"
+#~ msgstr "��臀� "
+
+#, fuzzy
+#~ msgid "Glorious"
+#~ msgstr "臂ょ�"
+#~ msgid "Contact Info"
+#~ msgstr "��機莖�荐�"
+
+#, fuzzy
+#~ msgid "Personal"
+#~ msgstr "��篋阪�恰��荐���験��"
+
+#, fuzzy
+#~ msgid "Work"
+#~ msgstr "�����恰��荐���験��"
+
+#, fuzzy
+#~ msgid "ICQ Protocol Plugin"
+#~ msgstr "IRC ��絎�罔∞�"
+
 #, fuzzy
 #~ msgid ""
-#~ "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) will use what "
-#~ "used to be\n"
-#~ "the built-in order: active, idle, away, away + idle, offline."
+#~ "Always use ICQ proxy server for file transfers\n"
+#~ "(slower, but does not reveal your IP address)"
+#~ msgstr ""
+#~ "��綽�篏睡�� AIM/ICQ ��篁g��篌堺������画�罟�罅��活叱\n"
+#~ "鐚�莠����篏�筝����顔�我���� IP 篏���鐚�"
+#~ msgid "_OK"
+#~ msgstr "腆阪�(_O)"
+#~ msgid "C_onnect"
+#~ msgstr "�g�(_O)"
+#~ msgid "_Search"
+#~ msgstr "��絨�(_S)"
+#~ msgid ""
+#~ "You are attempting to set a custom face. Gaim currently only allows the "
+#~ "standard faces. Please choose an image from "
 #~ msgstr ""
-#~ "�ユ��筝���絅遵��九�网����絅遵江��絅遵�絽活��鐚���荐���箴炊�号����茖�\n"
-#~ "��腟����緇����取���鐚�腥�����絨����冴��������鐚����榊�倶��絲���\n"
-#~ "篏睡����絅遵�絽活����\n"
-#~ "���∝���������荐㊤� 4 ��鐚����∫��������鐚�����臀���1 ����\n"
-#~ "荀�緇��咲��荐㊦������罨≦���羃���臀�����臀����∫�����∫���守��臀���鐚�\n"
-#~ "篏睡���������荐㊤�弱�喝���"
-
-#~ msgid "_Keep the dialog open"
-#~ msgstr "篆���絨�荅掩�����(_K)"
-
-#~ msgid "A_way"
-#~ msgstr "�∫��(_W)"
-
-#~ msgid "_Idle"
-#~ msgstr "��臀�(_I)"
-
-#~ msgid "Retur_n from idle"
-#~ msgstr "�演��臀����(_N)"
-
-#~ msgid "Bro_wse..."
-#~ msgstr "�頳�(_W)..."
-
-#~ msgid "Remove Buddy Pounce"
-#~ msgstr "腱脂�ゅソ����������"
-
-#~ msgid "_Queue new messages when away"
-#~ msgstr "���∫����鐚�絨��������域���舟�ヤ���筝�(_Q)"
-
-#~ msgid "Unable to set AIM away message."
-#~ msgstr "�≧�荐㊤� AIM �∫��荐�����"
-
-#~ 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 "Verify all IM message signatures"
-#~ msgstr "�後������恰��荐�����膂順�"
-
-#~ msgid "Digitally sign all channel messages"
-#~ msgstr "�娯�膂順讐�����脂��荐���"
-
-#~ msgid "Verify all channel message signatures"
-#~ msgstr "�後������脂��荐�����膂順�"
-
-#~ msgid "(%d message)"
-#~ msgid_plural "(%d messages)"
-#~ msgstr[0] "鐚�%d ��荐����"
-#~ msgstr[1] "鐚�%d ��荐����"
-
-#~ msgid "(1 message)"
-#~ msgstr "鐚�筝���荐����"
+#~ "��③��荅������肴�����茵�����罅�鐚�筝�������Gaim����吚�羣�茵�����罅���茫���札筝��後�"
+#~ "��罅�"
+
+#, fuzzy
+#~ msgid "Invalid QQ Face"
+#~ msgstr "��腮援�≧��"
+
+# XXX �馹�鐚�
+# XXX gtk/gtkft.c - ��Unknown�������筝������処�膊����後�種�茘������ャ��莠�絅�
+# XXX libgaim/account.c - ��Unknown����筝��ラ�����藝守��荐���絎�鐚�茘���筝�����莠�絅緒����坂�絎����丞��ラ����鐚�
+# XXX                      ������絽活��羝�������荀������ャ��������篋�緇�箙�箙���筝����緒�
+# XXX libgaim/protocols/* - ��Unknown����筝�����絅遵�����鐚����醇������筝�����鐚���荐�膤紫輝���援����������筝�����鐚�
+# XXX                       ���������ャ��鐚��榊憘� Gaim �����������篁h��鐚�
+# XXX - Ambrose 20061123
+#, fuzzy
+#~ msgid "Unknown-%d"
+#~ msgstr "����"
 
 #, fuzzy
-#~ msgid "Default auto-away"
-#~ msgstr "�����∫��"
-
-#~ msgid "_Sorting:"
-#~ msgstr "��綺�婧�(_S)鐚�"
-
-#~ msgid "Buddy Display"
-#~ msgstr "絅遵�蕁�ず"
-
-# XXX ��⑮
+#~ msgid "%s Address"
+#~ msgstr "�医��"
+
+# TODO 荀�荀��� - 20061025
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "��疹腮�綺� "
+
+#, fuzzy
+#~ msgid "Supports"
+#~ msgstr "���"
+
 #, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "馹�ず篏睡����膣亥�"
-
-#~ msgid "Gnome Default"
-#~ msgstr "GNOME��荐㊤��"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "�∫��荐���(_M)鐚�"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
+#~ msgid "External User"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>紊���戎����<b>"
+
+#, fuzzy
+#~ msgid "Authorization denied message:"
+#~ msgstr "��腟�茯�茘�荐����"
+
+#, fuzzy
+#~ msgid "User"
+#~ msgstr "篏睡����"
+#~ msgid "_Yes"
+#~ msgstr "��(_Y)"
+#~ msgid "_No"
+#~ msgstr "��(_N)"
+
+#, fuzzy
+#~ msgid "Invalid QQ Facea"
+#~ msgstr "�≧���� QQid"
+