# HG changeset patch
# User Ambrose C. Li <acli@ada.dhs.org>
# Date 1189743777 0
# Node ID dc2b7de9d01d7e17aa532593e90af3401ca3922c
# Parent 6055127a45c2c5905ddcba8a3f25e0e690187f26
Fixes #3085 , zh_TW translation update
committer: Ka-Hing Cheung <khc@hxbc.us>
diff -r 6055127a45c2 -r dc2b7de9d01d po/zh_TW.po
--- a/po/zh_TW.po Fri Sep 14 03:44:03 2007 +0000
+++ b/po/zh_TW.po Fri Sep 14 04:22:57 2007 +0000
@@ -3,7 +3,7 @@
# Copyright (C) 2003-2007, Ambrose C. Li <acli@ada.dhs.org>
#
# This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.479 2007/07/15 15:13:59 acli Exp $
+# $InternalId: zh_TW.po,v 1.489 2007/09/14 04:05:55 acli Exp $
#
# ----------------------------------------------------------
# For internal use only:
@@ -46,13 +46,14 @@
# NOTE ����茯�����腮縁��ゃ��筝���茯���紊�鐚�筝�网�茘�����XX����鐚�筝�茘���XX茯���鐚����阪�筝�������鐚�筝����
# ----------------------------------------------------------
#
-msgid ""
-msgstr ""
-"Project-Id-Version: Pidgin 2.1.0\n"
-"POT-Creation-Date: 2007-07-15 03:23-0400\n"
-"PO-Revision-Date: 2007-07-13 04:19-0400\n"
-"Last-Translator: Ambrose Li <acli@ada.dhs.org>, Paladin R. Liu <paladin@ms1."
-"hinet.net>\n"
+#: ../libpurple/certificate.c:543
+msgid ""
+msgstr ""
+"Project-Id-Version: Pidgin 2.2.0\n"
+"POT-Creation-Date: 2007-09-11 03:29-0400\n"
+"PO-Revision-Date: 2007-09-13 14:52+0800\n"
+"Last-Translator: Ambrose C. Li <acli@ada.dhs.org>, 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"
@@ -63,17 +64,17 @@
# NOTE Untranslated
#. Translators may want to transliterate the name.
#. It is not to be translated.
-#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
-#: ../finch/finch.c:404
+#: ../finch/finch.c:64 ../finch/finch.c:300 ../finch/finch.c:329
+#: ../finch/finch.c:415
msgid "Finch"
msgstr "Finch"
-#: ../finch/finch.c:204
+#: ../finch/finch.c:206
#, c-format
msgid "%s. Try `%s -h' for more information.\n"
msgstr "%s���決���%s -h��篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
-#: ../finch/finch.c:206
+#: ../finch/finch.c:208
#, c-format
msgid ""
"%s\n"
@@ -95,7 +96,7 @@
" -v, --version 蕁�ず�������研�∫��\n"
# NOTE 膃����筝��� %s 篆�������腮縁�筝����綣����
-#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
+#: ../finch/finch.c:327 ../pidgin/gtkmain.c:711
#, c-format
msgid ""
"%s encountered errors migrating your settings from %s to %s. Please "
@@ -105,15 +106,18 @@
"%s 絨�荐㊤��援���� %s 莉�腱肢�括���� %s ��筝㊦�主�����鐚�茫�茯炊�ュ��剛札篋堺��絎���莉�腱紫�綺��"
"筝���� http://developer.pidgin.im ���偓���������"
-#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:483 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:309
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+#: ../libpurple/protocols/jabber/buddy.c:2027
#: ../libpurple/protocols/jabber/chat.c:677
#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/jabber/jabber.c:1511
#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
+#: ../libpurple/protocols/silc/ops.c:1456
#: ../libpurple/protocols/silc10/ops.c:1451
msgid "Error"
msgstr "���"
@@ -127,86 +131,90 @@
msgid "Screenname of an account must be non-empty."
msgstr "絽活��筝�����腥冴��"
-#: ../finch/gntaccount.c:431
+#: ../finch/gntaccount.c:436
msgid "New mail notifications"
msgstr "�育�灸散����"
-#: ../finch/gntaccount.c:441
+#: ../finch/gntaccount.c:446
msgid "Remember password"
msgstr "荐�篏鎛�腆�"
-#: ../finch/gntaccount.c:479
+#: ../finch/gntaccount.c:484
msgid "There's no protocol plugins installed."
msgstr "����絎�茖�篁私���絎�罔∞���"
-#: ../finch/gntaccount.c:480
+#: ../finch/gntaccount.c:485
msgid "(You probably forgot to 'make install'.)"
msgstr "鐚�紊ф����荐�篋��決���make install��篋���鐚�"
-#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:4014
+#: ../finch/gntaccount.c:495 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4037
msgid "Modify Account"
msgstr "篆��劫験��"
# XXX check
-#: ../finch/gntaccount.c:490
+#: ../finch/gntaccount.c:495
msgid "New Account"
msgstr "�医験��"
-#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:520 ../pidgin/gtkft.c:695
msgid "Protocol:"
msgstr "��荐���絎�鐚�"
-#: ../finch/gntaccount.c:523
+#: ../finch/gntaccount.c:528
#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
msgid "Screen name:"
msgstr "絽活��鐚�"
-#: ../finch/gntaccount.c:536
+#: ../finch/gntaccount.c:541
msgid "Password:"
msgstr "絲�腆種�"
-#: ../finch/gntaccount.c:546
+#: ../finch/gntaccount.c:551
msgid "Alias:"
msgstr "�ュ��鐚�"
#. Cancel button
#. Cancel
-#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
-#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:412
-#: ../finch/gntblist.c:447 ../finch/gntblist.c:794 ../finch/gntblist.c:996
-#: ../finch/gntblist.c:1092 ../finch/gntblist.c:2198 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606
-#: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../finch/gntaccount.c:574 ../finch/gntaccount.c:637
+#: ../finch/gntaccount.c:883 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:458 ../finch/gntpounce.c:666
+#: ../finch/gntprefs.c:264 ../finch/gntsound.c:1057 ../finch/gntstatus.c:144
+#: ../finch/gntstatus.c:484 ../finch/gntstatus.c:609
+#: ../libpurple/account.c:1004 ../libpurple/account.c:1254
+#: ../libpurple/account.c:1289 ../libpurple/conversation.c:1215
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
+#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/gg/gg.c:884
+#: ../libpurple/protocols/jabber/buddy.c:728
+#: ../libpurple/protocols/jabber/buddy.c:2389
+#: ../libpurple/protocols/jabber/buddy.c:2425
#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6073
-#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:1009
+#: ../libpurple/protocols/jabber/jabber.c:1018
+#: ../libpurple/protocols/jabber/jabber.c:1733
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/jabber/usermood.c:185
+#: ../libpurple/protocols/jabber/usernick.c:79
+#: ../libpurple/protocols/jabber/xdata.c:400
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
+#: ../libpurple/protocols/msn/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6078
+#: ../libpurple/protocols/oscar/peer.c:1046
#: ../libpurple/protocols/qq/buddy_info.c:484
#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/buddy_opt.c:411
#: ../libpurple/protocols/qq/group.c:124
#: ../libpurple/protocols/qq/group_join.c:140
#: ../libpurple/protocols/qq/group_join.c:365
#: ../libpurple/protocols/qq/group_opt.c:144
#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/qq/sys_msg.c:113
+#: ../libpurple/protocols/qq/sys_msg.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:266
#: ../libpurple/protocols/sametime/sametime.c:3388
#: ../libpurple/protocols/sametime/sametime.c:3474
#: ../libpurple/protocols/sametime/sametime.c:3645
@@ -229,110 +237,113 @@
#: ../libpurple/protocols/silc10/ops.c:1904
#: ../libpurple/protocols/silc10/silc.c:736
#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:5915
-#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
-#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
-#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
-#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
-#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../libpurple/protocols/yahoo/yahoo.c:1029
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
+#: ../libpurple/protocols/yahoo/yahoo.c:3506 ../pidgin/gtkaccount.c:1908
+#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5971
+#: ../pidgin/gtkcertmgr.c:196 ../pidgin/gtkdialogs.c:757
+#: ../pidgin/gtkdialogs.c:896 ../pidgin/gtkdialogs.c:988
+#: ../pidgin/gtkdialogs.c:1008 ../pidgin/gtkdialogs.c:1032
+#: ../pidgin/gtkdialogs.c:1054 ../pidgin/gtkdialogs.c:1102
+#: ../pidgin/gtkdialogs.c:1143 ../pidgin/gtkdialogs.c:1199
+#: ../pidgin/gtkdialogs.c:1238 ../pidgin/gtkdialogs.c:1265
+#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtklog.c:327
+#: ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1100
#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1582
+#: ../pidgin/gtkstatusbox.c:1573
msgid "Cancel"
msgstr "��羔�"
#. Save button
#. Save
-#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
-#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../finch/gntaccount.c:578 ../finch/gntcertmgr.c:310
+#: ../finch/gntplugin.c:378 ../finch/gntpounce.c:464 ../finch/gntprefs.c:264
+#: ../finch/gntsound.c:1054 ../finch/gntstatus.c:487 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:1288 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:748
#: ../pidgin/gtkrequest.c:276
msgid "Save"
msgstr "�峨�"
-#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
+#: ../finch/gntaccount.c:631 ../pidgin/gtkaccount.c:1900
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1567
#, c-format
msgid "Are you sure you want to delete %s?"
msgstr "��∈絎�荀����� %s鐚�"
-#: ../finch/gntaccount.c:629
+#: ../finch/gntaccount.c:634
msgid "Delete Account"
msgstr "���ゅ験��"
#. Delete button
-#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
-#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
-#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
+#: ../finch/gntaccount.c:636 ../finch/gntaccount.c:706
+#: ../finch/gntcertmgr.c:318 ../finch/gntpounce.c:665 ../finch/gntpounce.c:728
+#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:209
+#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1099 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1572
msgid "Delete"
msgstr "����"
-#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2104 ../finch/gntui.c:77
-#: ../pidgin/gtkaccount.c:2327 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:668 ../finch/gntblist.c:2118 ../finch/gntui.c:82
+#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
msgid "Accounts"
msgstr "絽活��羝���"
-#: ../finch/gntaccount.c:669
+#: ../finch/gntaccount.c:674
msgid "You can enable/disable accounts from the following list."
msgstr "篁ヤ���茵���絽活�������������������"
#. Add button
-#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
-#: ../finch/gntblist.c:412 ../finch/gntblist.c:447 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../finch/gntaccount.c:697 ../finch/gntaccount.c:882 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntcertmgr.c:305
+#: ../finch/gntnotify.c:379 ../finch/gntpounce.c:712 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
+#: ../libpurple/protocols/qq/sys_msg.c:173
+#: ../libpurple/protocols/qq/sys_msg.c:267
#: ../libpurple/protocols/sametime/sametime.c:5486
#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1651
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
+#: ../pidgin/gtkblist.c:5970 ../pidgin/gtkconv.c:1644
#: ../pidgin/gtkrequest.c:274
msgid "Add"
msgstr "����"
#. Modify button
-#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+#: ../finch/gntaccount.c:702 ../finch/gntpounce.c:720
msgid "Modify"
msgstr "篆���"
-#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2447
+#: ../finch/gntaccount.c:805 ../pidgin/gtkaccount.c:2441
#, c-format
msgid "%s%s%s%s has made %s his or her buddy%s%s"
msgstr "%s%s%s%s ���ヤ� %s �坂�鐚�絅刻���絅遵� %s%s"
-#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2499
+#: ../finch/gntaccount.c:878 ../pidgin/gtkaccount.c:2493
msgid "Add buddy to your list?"
msgstr "絨�篏睡�������ユ����絅遵�羝����"
# NOTE: ���㊦�� %s%s%s%s ����劫験��鐚���絽活����磁�ュ��鐚�膃�������� %s ����磁鐚�
# NOTE: ��絨丞�� %s%s ����醇����: 荐�����鐚��堺�����札筝�����鐚�箙�筝��醇��┌����鐚�
-#: ../finch/gntaccount.c:927 ../pidgin/gtkaccount.c:2551
+#: ../finch/gntaccount.c:938 ../pidgin/gtkaccount.c:2551
#, c-format
msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
msgstr "篏睡���� %s%s%s%s �活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝���%s%s��"
-#: ../finch/gntaccount.c:952 ../finch/gntaccount.c:955
-#: ../finch/gntaccount.c:982 ../pidgin/gtkaccount.c:2574
+#: ../finch/gntaccount.c:963 ../finch/gntaccount.c:966
+#: ../finch/gntaccount.c:993 ../pidgin/gtkaccount.c:2574
#: ../pidgin/gtkaccount.c:2580
msgid "Authorize buddy?"
msgstr "腟��茯�茘�鐚�"
-#: ../finch/gntaccount.c:959 ../finch/gntaccount.c:986
+#: ../finch/gntaccount.c:970 ../finch/gntaccount.c:997
#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
msgid "Authorize"
msgstr "腟��茯�茘�"
-#: ../finch/gntaccount.c:960 ../finch/gntaccount.c:987
+#: ../finch/gntaccount.c:971 ../finch/gntaccount.c:998
#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
msgid "Deny"
msgstr "��腟�"
@@ -357,36 +368,36 @@
msgid "Error adding buddy"
msgstr "�医�絅遵���筝㊦�主��篋����"
-#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2864
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2881
+#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:979
msgid "Screen Name"
msgstr "絽活��"
-#: ../finch/gntblist.c:327 ../finch/gntblist.c:404 ../finch/gntblist.c:1240
-#: ../libpurple/protocols/msn/msn.c:1364
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1392
#: ../libpurple/protocols/silc/chat.c:606
#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
-#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1007
+#: ../pidgin/gtkdialogs.c:1031 ../pidgin/gtkdialogs.c:1053
#: ../pidgin/gtkrequest.c:277
msgid "Alias"
msgstr "�ュ��"
-#: ../finch/gntblist.c:330 ../finch/gntblist.c:407
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
msgid "Group"
msgstr "臂ょ�"
-#: ../finch/gntblist.c:334 ../finch/gntblist.c:395 ../finch/gntblist.c:1292
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1304
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:575
#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:3005 ../pidgin/gtknotify.c:488
+#: ../pidgin/gtkpounce.c:1267 ../pidgin/plugins/gevolution/gevolution.c:445
msgid "Account"
msgstr "絽活��"
-#: ../finch/gntblist.c:340 ../finch/gntblist.c:843
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
#: ../libpurple/protocols/silc/buddy.c:725
#: ../libpurple/protocols/silc/buddy.c:1027
#: ../libpurple/protocols/silc/buddy.c:1072
@@ -395,7 +406,7 @@
#: ../libpurple/protocols/silc10/buddy.c:1033
#: ../libpurple/protocols/silc10/buddy.c:1080
#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../libpurple/protocols/yahoo/yahoo.c:3340 ../pidgin/gtkblist.c:5477
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
msgid "Add Buddy"
msgstr "�医�絅遵�"
@@ -405,15 +416,16 @@
msgid "Please enter buddy information."
msgstr "茫�莠後�ュソ����莖�荐���"
-#: ../finch/gntblist.c:367 ../libpurple/blist.c:1190
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
msgid "Chats"
msgstr "��紊�"
# NOTE ���処⑮����腮宴��鐚����阪����茹ｄ���篋阪��������罔∞���腮宴��
#. Extract their Name and put it in
-#: ../finch/gntblist.c:401 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:925
+#: ../libpurple/protocols/jabber/jabber.c:928
+#: ../libpurple/protocols/msn/msn.c:1581 ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1673
#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
#: ../pidgin/gtkroomlist.c:617
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
@@ -421,161 +433,166 @@
msgid "Name"
msgstr "��腮�"
-#: ../finch/gntblist.c:410 ../finch/gntblist.c:845 ../pidgin/gtkblist.c:5800
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "��������"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5856
msgid "Add Chat"
msgstr "�医���紊��"
-#: ../finch/gntblist.c:411
+#: ../finch/gntblist.c:419
msgid "You can edit more information from the context menu later."
msgstr "絋���荀�膵主�篆��劫�銀�膣亥�鐚�茫���辱蕁��後����"
-#: ../finch/gntblist.c:424 ../finch/gntblist.c:437
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
msgid "Error adding group"
msgstr "�医�臂ょ���筝㊦�主��篋����"
-#: ../finch/gntblist.c:425
+#: ../finch/gntblist.c:433
msgid "You must give a name for the group to add."
msgstr "茫�腟����医���臂ょ�莠後�ュ��腮宴��"
-#: ../finch/gntblist.c:438
+#: ../finch/gntblist.c:446
msgid "A group with the name already exists."
msgstr "�ｅ��臂ょ�綏牙�絖���"
# TODO 茫�荀��ユ�後�鐚��������ャ���������医���?
-#: ../finch/gntblist.c:445 ../finch/gntblist.c:847
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
+#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5967
msgid "Add Group"
msgstr "���ョ召腟�"
# TODO 荀�荀��� - 20061026
-#: ../finch/gntblist.c:445
+#: ../finch/gntblist.c:453
msgid "Enter the name of the group"
msgstr "茫�腟�召腟�莠後�ュ��腮宴��"
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
msgid "Edit Chat"
msgstr "篆��壕��紊��"
-#: ../finch/gntblist.c:793
+#: ../finch/gntblist.c:801
msgid "Please Update the necessary fields."
msgstr "茫�����荀��贋�井�篏��х��莖�荐���"
# TODO 荀�荀��� - 20061025
-#: ../finch/gntblist.c:794 ../finch/gntstatus.c:204
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
msgid "Edit"
msgstr "篆���"
-#: ../finch/gntblist.c:810
-msgid "Auto-join"
-msgstr "��������"
-
# XXX ������篆��拷�檎����鐚�
-#: ../finch/gntblist.c:819
+#: ../finch/gntblist.c:827
msgid "Edit Settings"
msgstr "篆��壕┃絎�"
# XXX 20070518
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
msgid "Information"
msgstr "莖�荐�"
-#: ../finch/gntblist.c:855 ../pidgin/gtkutils.c:926
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
msgid "Retrieving..."
msgstr "莅���筝�..."
-#: ../finch/gntblist.c:895 ../finch/gntconv.c:407
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:484
#: ../libpurple/protocols/silc/chat.c:899
#: ../libpurple/protocols/silc10/chat.c:883
msgid "Get Info"
msgstr "��緇�莖�荐�"
-#: ../finch/gntblist.c:899
+#: ../finch/gntblist.c:907
msgid "Add Buddy Pounce"
msgstr "���ュソ����������"
#. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:906 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1599
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:496
+#: ../libpurple/protocols/jabber/si.c:874
+#: ../libpurple/protocols/oscar/oscar.c:653 ../libpurple/protocols/qq/qq.c:587
+#: ../pidgin/gtkconv.c:1592
msgid "Send File"
msgstr "�渇��罟�罅�"
-#: ../finch/gntblist.c:910
+#: ../finch/gntblist.c:918
msgid "View Log"
msgstr "茹����ヨ�"
-#: ../finch/gntblist.c:991
+#: ../finch/gntblist.c:999
#, c-format
msgid "Please enter the new name for %s"
msgstr "茫�莠後�� %s ���医�腆�"
-#: ../finch/gntblist.c:993 ../finch/gntblist.c:1240
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
msgid "Rename"
msgstr "���遵��"
-#: ../finch/gntblist.c:993
+#: ../finch/gntblist.c:1001
msgid "Set Alias"
msgstr "荐㊤��ュ��"
# FIXME 茘�����緇��拷�� - 20061029
-#: ../finch/gntblist.c:994
+#: ../finch/gntblist.c:1002
msgid "Enter empty string to reset the name."
msgstr "絋���荀���臀���腮縁�茫�莠後�ョ��遵�筝蚊��"
-#: ../finch/gntblist.c:1070
+#: ../finch/gntblist.c:1078
msgid "Removing this contact will also remove all the buddies in the contact"
msgstr "腱脂�ら��腟�絅遵�������腱脂�よ��∝������絅遵�"
-#: ../finch/gntblist.c:1078
+#: ../finch/gntblist.c:1086
msgid "Removing this group will also remove all the buddies in the group"
msgstr "腱脂�ら����臂ょ�������腱脂�よ��∝������絅遵�"
-#: ../finch/gntblist.c:1083
+#: ../finch/gntblist.c:1091
#, c-format
msgid "Are you sure you want to remove %s?"
msgstr "��∈絎�荀����� %s鐚�"
#. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1086
+#: ../finch/gntblist.c:1094
msgid "Confirm Remove"
msgstr "腆肴�腱脂��"
-#: ../finch/gntblist.c:1091 ../finch/gntblist.c:1242 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1648 ../pidgin/gtkrequest.c:275
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:226
+#: ../pidgin/gtkconv.c:1641 ../pidgin/gtkrequest.c:275
#: ../pidgin/gtkstatusbox.c:263
msgid "Remove"
msgstr "腱脂��"
#. Buddy List
-#: ../finch/gntblist.c:1216 ../finch/gntblist.c:2283 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2306 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2685 ../pidgin/gtkblist.c:4281
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
msgid "Buddy List"
msgstr "絅遵�羝���"
# XXX - 20061122
# NOTE (01��35��37腱�) wabz: Anyway, I think the concept is more important than the literal translation - you use "Toggle Tag" on the currently selected buddy, then select a group/contact and hit "Place Tagged", and the buddy is moved
-#: ../finch/gntblist.c:1247
+#: ../finch/gntblist.c:1256
msgid "Place tagged"
msgstr "腱糸��綏我�荐�������"
# FIXME - 20061122
-#: ../finch/gntblist.c:1252
+#: ../finch/gntblist.c:1261
msgid "Toggle Tag"
msgstr "����罔�荐�"
#. General
-#: ../finch/gntblist.c:1287 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../finch/gntblist.c:1297 ../libpurple/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:2207
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:1247
+#: ../libpurple/protocols/jabber/buddy.c:2190
+#: ../libpurple/protocols/jabber/buddy.c:2372
+#: ../libpurple/protocols/jabber/jabber.c:938
+#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/msn/msn.c:1400 ../libpurple/protocols/msn/msn.c:1584
#: ../libpurple/protocols/qq/buddy_info.c:43
#: ../libpurple/protocols/silc/buddy.c:1535
#: ../libpurple/protocols/silc/ops.c:1002
@@ -585,29 +602,29 @@
#: ../libpurple/protocols/silc10/ops.c:1036
#: ../libpurple/protocols/silc10/ops.c:1179
#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3029
msgid "Nickname"
msgstr "�援┗"
#. Idle stuff
-#: ../finch/gntblist.c:1307 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../finch/gntblist.c:1319 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:340
+#: ../libpurple/protocols/jabber/buddy.c:787
+#: ../libpurple/protocols/jabber/buddy.c:951
+#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
+#: ../libpurple/protocols/oscar/oscar.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3057
+#: ../pidgin/gtkblist.c:3457 ../pidgin/gtkprefs.c:1924
msgid "Idle"
msgstr "��臀�"
-#: ../finch/gntblist.c:1320
+#: ../finch/gntblist.c:1333
msgid "On Mobile"
msgstr "篏睡�����茖�臀�賢"
-#: ../finch/gntblist.c:1400
+#: ../finch/gntblist.c:1414
#, c-format
msgid ""
"Online: %d\n"
@@ -616,12 +633,12 @@
"筝�膩�鐚�%d 篋�\n"
"膰醇�醐�%d 篋�"
-#: ../finch/gntblist.c:1409
+#: ../finch/gntblist.c:1423
#, c-format
msgid "Account: %s (%s)"
msgstr "絽活��鐚�%s (%s)"
-#: ../finch/gntblist.c:1421
+#: ../finch/gntblist.c:1435
#, c-format
msgid ""
"\n"
@@ -631,51 +648,55 @@
"<b>��緇�荀��逸�</b>%s��"
# XXX check
-#: ../finch/gntblist.c:1687 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: ../finch/gntblist.c:1701 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1071
msgid "New..."
msgstr "�医�..."
# NOTE �����綏�������鐚�����綏峨�峨���(Saved) ����������:P
# NOTE 筝�筝�����筝�篋�絽悟��(?)�����������医���鐚��医�筝�������鐚�鐚�綵��榊��荀�腦�箙������医���鐚����醇��荅峨ù������筝�荀純������������羝�����筝�蕁�������
-#: ../finch/gntblist.c:1694 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: ../finch/gntblist.c:1708 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1072
msgid "Saved..."
msgstr "����羝���..."
-#: ../finch/gntblist.c:2072 ../finch/gntplugin.c:254 ../finch/gntui.c:82
+#: ../finch/gntblist.c:2086 ../finch/gntplugin.c:254 ../finch/gntui.c:88
#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
msgid "Plugins"
msgstr "罔∞�羝���"
# NOTE ���処⑮����腮宴��鐚����阪����茹ｄ���篋阪��������罔∞���腮宴��
-#: ../finch/gntblist.c:2179 ../pidgin/gtkdialogs.c:708
-#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+#: ../finch/gntblist.c:2202 ../pidgin/gtkdialogs.c:738
+#: ../pidgin/gtkdialogs.c:877 ../pidgin/gtkdialogs.c:958
msgid "_Name"
msgstr "��腮�(_N)"
-#: ../finch/gntblist.c:2184 ../pidgin/gtkdialogs.c:713
-#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
+#: ../finch/gntblist.c:2207 ../pidgin/gtkdialogs.c:743
+#: ../pidgin/gtkdialogs.c:882 ../pidgin/gtkdialogs.c:963
msgid "_Account"
msgstr "絽活��(_A)"
-#: ../finch/gntblist.c:2192 ../pidgin/gtkdialogs.c:721
+#: ../finch/gntblist.c:2215 ../pidgin/gtkdialogs.c:751
msgid "New Instant Message"
msgstr "�医�恰��荐���"
-#: ../finch/gntblist.c:2194 ../pidgin/gtkdialogs.c:723
+#: ../finch/gntblist.c:2217 ../pidgin/gtkdialogs.c:753
msgid ""
"Please enter the screen name or alias of the person you would like to IM."
msgstr "茫�莠後�ユ�����活��守���恰��荐����莟∞��絽活����"
-#: ../finch/gntblist.c:2197 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6072
+#. Not multiline
+#. Not masked?
+#. No hints?
+#: ../finch/gntblist.c:2220 ../finch/gntcertmgr.c:89 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:1003 ../libpurple/account.c:1253
+#: ../libpurple/protocols/gg/gg.c:506 ../libpurple/protocols/gg/gg.c:665
+#: ../libpurple/protocols/gg/gg.c:802
+#: ../libpurple/protocols/jabber/jabber.c:1732
+#: ../libpurple/protocols/jabber/xdata.c:399
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
+#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6077
#: ../libpurple/protocols/silc/buddy.c:454
#: ../libpurple/protocols/silc/buddy.c:1190
#: ../libpurple/protocols/silc/chat.c:447
@@ -692,43 +713,161 @@
#: ../libpurple/protocols/silc10/ops.c:1297
#: ../libpurple/protocols/silc10/ops.c:1903
#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
-#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
-#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:1028
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3505 ../pidgin/gtkblist.c:4036
+#: ../pidgin/gtkcertmgr.c:194 ../pidgin/gtkdialogs.c:756
+#: ../pidgin/gtkdialogs.c:895 ../pidgin/gtkdialogs.c:987
+#: ../pidgin/gtkrequest.c:269
msgid "OK"
msgstr "腆阪�"
#. Create the "Options" frame.
-#: ../finch/gntblist.c:2217 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+#: ../finch/gntblist.c:2240 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:789
msgid "Options"
msgstr "�檎��"
-#: ../finch/gntblist.c:2223
+#: ../finch/gntblist.c:2246
msgid "Send IM..."
msgstr "���阪�恰��荐���..."
-#: ../finch/gntblist.c:2227
+#: ../finch/gntblist.c:2250
msgid "Show empty groups"
msgstr "蕁�ず腥榊��絅順��臂ょ�"
-#: ../finch/gntblist.c:2233
+#: ../finch/gntblist.c:2256
msgid "Show offline buddies"
msgstr "蕁�ず�∝�絅遵�"
-#: ../finch/gntblist.c:2239
+#: ../finch/gntblist.c:2262
msgid "Sort by status"
msgstr "箴��х��������"
-#: ../finch/gntblist.c:2243
+#: ../finch/gntblist.c:2266
msgid "Sort alphabetically"
msgstr "箴��у�罸�����"
-#: ../finch/gntblist.c:2247
+#: ../finch/gntblist.c:2270
msgid "Sort by log size"
msgstr "箴��ф�ヨ�紊у�����"
+#: ../finch/gntcertmgr.c:85 ../pidgin/gtkcertmgr.c:187
+msgid "Certificate Import"
+msgstr "���ユ��茘�"
+
+#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
+msgid "Specify a hostname"
+msgstr "茫���絎�筝紙���腮�"
+
+# XXX 茘�����緇��拷�� - acli 20070913
+#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
+msgid "Type the host name this certificate is for."
+msgstr "茫�莠後�ラ��綣究��茘���絮���筝紙���腮宴��"
+
+#: ../finch/gntcertmgr.c:96 ../pidgin/gtkcertmgr.c:209
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+"�≧����ユ�罅���%s����\n"
+"茫�罟∽�ユ�罅��������������� PEM �弱���\n"
+
+#: ../finch/gntcertmgr.c:98 ../pidgin/gtkcertmgr.c:211
+msgid "Certificate Import Error"
+msgstr "��茘����ラ���"
+
+#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
+msgid "X.509 certificate import failed"
+msgstr "X.509 ��茘����ュけ��"
+
+#: ../finch/gntcertmgr.c:109 ../pidgin/gtkcertmgr.c:223
+msgid "Select a PEM certificate"
+msgstr "�御��PEM��茘�"
+
+#: ../finch/gntcertmgr.c:126 ../pidgin/gtkcertmgr.c:244
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+"�≧����肴�恰�罅���%s����\n"
+"茫�腆阪�����罨���絲��ョ���罟�\n"
+
+#: ../finch/gntcertmgr.c:128 ../pidgin/gtkcertmgr.c:246
+msgid "Certificate Export Error"
+msgstr "��茘����咲���"
+
+#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
+msgid "X.509 certificate export failed"
+msgstr "X.509 ��茘����阪け��"
+
+#: ../finch/gntcertmgr.c:158 ../pidgin/gtkcertmgr.c:298
+msgid "PEM X.509 Certificate Export"
+msgstr "���� X.509 ��茘�"
+
+#. Build a notification thing
+#. TODO: This needs a better GUI, but a notification will do for now
+#: ../finch/gntcertmgr.c:187 ../pidgin/gtkcertmgr.c:336
+#, c-format
+msgid "Certificate for %s"
+msgstr "%s ����茘�"
+
+#: ../finch/gntcertmgr.c:194 ../pidgin/gtkcertmgr.c:343
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+"����鐚�%s\n"
+"\n"
+"SHA1 ��膣�鐚�\n"
+"%s"
+
+#: ../finch/gntcertmgr.c:197 ../pidgin/gtkcertmgr.c:346
+msgid "SSL Host Certificate"
+msgstr "SSL 筝紙���茘�"
+
+#: ../finch/gntcertmgr.c:232 ../pidgin/gtkcertmgr.c:391
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr "腆阪�荀����� %s ����茘�鐚�"
+
+#: ../finch/gntcertmgr.c:235 ../pidgin/gtkcertmgr.c:393
+msgid "Confirm certificate delete"
+msgstr "腆阪����ゆ��茘�"
+
+#: ../finch/gntcertmgr.c:292 ../pidgin/gtkcertmgr.c:621
+msgid "Certificate Manager"
+msgstr "��茘�膊∞��"
+
+#. Creating the user splits
+#: ../finch/gntcertmgr.c:297 ../libpurple/protocols/bonjour/bonjour.c:652
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
+msgid "Hostname"
+msgstr "筝紙���腮�"
+
+# XXX��Info����篏���室箙����緇�篏睡����莖�荐�鐚�篏�筝����鐚���篋��銀�po罟�篁������������藝�
+# XXX javajsp (Ka-Hing CHEUNG) 荀�������Info����膣����醇������緇�篏睡����莖�荐���
+# XXX 羈���上�� (2.0.0b4) 筝����鐚��ら���腦�������疹腮�綺���腴�����Info��鐚�莖�荐�鐚�膣��モ����
+#: ../finch/gntcertmgr.c:314 ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1620
+#: ../pidgin/gtkdebug.c:834
+msgid "Info"
+msgstr "莖�荐�"
+
+#. Close button
+#: ../finch/gntcertmgr.c:323 ../finch/gntft.c:236 ../finch/gntnotify.c:181
+#: ../finch/gntplugin.c:209 ../finch/gntplugin.c:309 ../finch/gntpounce.c:737
+#: ../finch/gntstatus.c:215 ../libpurple/protocols/msn/msn.c:403
+#: ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "����"
+
#: ../finch/gntconn.c:110
#, c-format
msgid "%s (%s)"
@@ -751,42 +890,46 @@
"\n"
"�����贋③�������筝����医��������絽活����鐚�Finch 絨�筝�����荅������育�ｇ���"
-#: ../finch/gntconv.c:117
+#: ../finch/gntconv.c:119
msgid "No such command."
msgstr "�≧④��篁ゃ��"
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:492
+#: ../finch/gntconv.c:123 ../pidgin/gtkconv.c:469
msgid "Syntax Error: You typed the wrong number of arguments to that command."
msgstr "茯�羈����鐚�莠後�ョ�����後��惹��篁ゆ���������御�檎���"
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:498
+#: ../finch/gntconv.c:128 ../pidgin/gtkconv.c:475
msgid "Your command failed for an unknown reason."
msgstr "��鋌ゅ�決�紊掩��鐚�����筝�����"
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:505
+#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:482
msgid "That command only works in chats, not IMs."
msgstr "������篁ゅÛ����紊���ф����鐚����恰��荐���賢�≧����"
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:508
+#: ../finch/gntconv.c:136 ../pidgin/gtkconv.c:485
msgid "That command only works in IMs, not chats."
msgstr "������篁ゅÛ���恰��荐���賢����鐚�����紊���х�≧����"
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:513
+#: ../finch/gntconv.c:140 ../pidgin/gtkconv.c:490
msgid "That command doesn't work on this protocol."
msgstr "������篁ゅ��������荐���絎��х�≧����"
+#: ../finch/gntconv.c:148
+msgid "Message was not sent, because you are not signed on."
+msgstr "���堺��研���糸�ワ���篁ヨ����≧����削�"
+
# XXX �����藝種�
-#: ../finch/gntconv.c:224
+#: ../finch/gntconv.c:231
#, c-format
msgid "%s (%s -- %s)"
msgstr "%s (%s -- %s)"
-#: ../finch/gntconv.c:247
+#: ../finch/gntconv.c:254
#, c-format
msgid "%s [%s]"
msgstr "%s [%s]"
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: ../finch/gntconv.c:259 ../finch/gntconv.c:747
#, c-format
msgid ""
"\n"
@@ -795,48 +938,65 @@
"\n"
"%s 罩ｅ��叱��..."
-#: ../finch/gntconv.c:271
+#: ../finch/gntconv.c:278
msgid "You have left this chat."
msgstr "���∫��篋���紊����"
-#: ../finch/gntconv.c:342
+#: ../finch/gntconv.c:367 ../pidgin/gtkconv.c:1351
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr "�ヨ�膤紫輝���������������篋よ�筝㊦��荐����遵�茴�����惹�ヨ�筝㏍��"
+
+#: ../finch/gntconv.c:373 ../pidgin/gtkconv.c:1359
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr "�ヨ�膤紫輝���������������篋よ�筝㊦��荐����遵�筝���茴�����惹�ヨ�筝㏍��"
+
+#: ../finch/gntconv.c:419
msgid "Send To"
msgstr "�渇����"
-#: ../finch/gntconv.c:386
+#: ../finch/gntconv.c:463
msgid "Conversation"
msgstr "篋よ�"
-#: ../finch/gntconv.c:392
+#: ../finch/gntconv.c:469
msgid "Clear Scrollback"
msgstr "羝�腥坂困茫��у�"
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: ../finch/gntconv.c:473 ../finch/gntprefs.c:190
msgid "Show Timestamps"
msgstr "蕁�ず�����活�"
-#: ../finch/gntconv.c:412
+#: ../finch/gntconv.c:489
msgid "Add Buddy Pounce..."
msgstr "���ュソ����������..."
-#: ../finch/gntconv.c:614
+#: ../finch/gntconv.c:504
+msgid "Enable Logging"
+msgstr "��紮�荐����ヨ�"
+
+#: ../finch/gntconv.c:510
+msgid "Enable Sounds"
+msgstr "�����恰��"
+
+#: ../finch/gntconv.c:713
msgid "<AUTO-REPLY> "
msgstr "<��������> "
#. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: ../finch/gntconv.c:835
msgid "List of users:\n"
msgstr "篏睡������茵��\n"
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:335
+#: ../finch/gntconv.c:997 ../pidgin/gtkconv.c:311
msgid "Supported debug options are: version"
msgstr "��吡���ら���檎����鐚�version"
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:384
+#: ../finch/gntconv.c:1033 ../pidgin/gtkconv.c:361
msgid "No such command (in this context)."
msgstr "羃���������篁わ�������茖鋎睡���"
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:387
+#: ../finch/gntconv.c:1036 ../pidgin/gtkconv.c:364
msgid ""
"Use \"/help <command>\" for help on a specific command.\n"
"The following commands are available in this context:\n"
@@ -844,60 +1004,60 @@
"荀��峨���筝���篁ょ��茯����莠後�ャ��/help <��篁�>���喝���\n"
"����茖����������篁ゆ��鐚�\n"
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7198
+#: ../finch/gntconv.c:1094 ../pidgin/gtkconv.c:7538
msgid ""
"say <message>: Send a message normally as if you weren't using a "
"command."
msgstr "say <荐���>鐚�絨���絎���荐����倶��筝������③絽檎���削������句�堺��篁よ������"
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7201
+#: ../finch/gntconv.c:1097 ../pidgin/gtkconv.c:7541
msgid "me <action>: Send an IRC style action to a buddy or chat."
msgstr "me <荀��決�����篏�>鐚�罔＞賛IRC鐚��決�筝�����篏���"
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7204
+#: ../finch/gntconv.c:1100 ../pidgin/gtkconv.c:7544
msgid ""
"debug <option>: Send various debug information to the current "
"conversation."
msgstr "debug <�檎��>鐚���������篋よ����坂�篋��ら���荐���"
# XXX
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7207
+#: ../finch/gntconv.c:1103 ../pidgin/gtkconv.c:7547
msgid "clear: Clears the conversation scrollback."
msgstr "clear鐚�羝�腥坂困茫������牙粂茵���"
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7213
+#: ../finch/gntconv.c:1106 ../pidgin/gtkconv.c:7553
msgid "help <command>: Help on a specific command."
msgstr "help <��篁�>鐚�蕁�ず��筝���篁ょ��茯�����"
-#: ../finch/gntconv.c:991
+#: ../finch/gntconv.c:1109
msgid "users: Show the list of users in the chat."
msgstr "users鐚�蕁�ず������紊���х��篏睡������"
-#: ../finch/gntconv.c:996
+#: ../finch/gntconv.c:1114
msgid "plugins: Show the plugins window."
msgstr "plugins鐚�蕁�ず��罔∞���荀�腦�"
-#: ../finch/gntconv.c:999
+#: ../finch/gntconv.c:1117
msgid "buddylist: Show the buddylist."
msgstr "buddylist鐚�蕁�ず絅遵�羝�����"
-#: ../finch/gntconv.c:1002
+#: ../finch/gntconv.c:1120
msgid "accounts: Show the accounts window."
msgstr "accounts鐚�蕁�ず絽活��羝�����"
-#: ../finch/gntconv.c:1005
+#: ../finch/gntconv.c:1123
msgid "debugwin: Show the debug window."
msgstr "debugwin鐚�蕁�ず�ら���腦�"
-#: ../finch/gntconv.c:1008
+#: ../finch/gntconv.c:1126
msgid "prefs: Show the preference window."
msgstr "prefs鐚�蕁�ず���鎁処┃絎���荀�腦�"
-#: ../finch/gntconv.c:1011
+#: ../finch/gntconv.c:1129
msgid "statuses: Show the savedstatuses window."
msgstr "statuses鐚�������羝�����荀�腦�"
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:694
msgid "Debug Window"
msgstr "�ら���腦�"
@@ -923,101 +1083,97 @@
msgstr "罟�罅��活叱鐚�%2$d ��罟�罅�絎���篋� %1$d%%"
#. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:87
#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
msgid "File Transfers"
msgstr "罟�罅��活叱"
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:644
msgid "Progress"
msgstr "�峨墾"
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:651
msgid "Filename"
msgstr "罟���"
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:658
msgid "Size"
msgstr "紊у�"
-#: ../finch/gntft.c:198
+#: ../finch/gntft.c:200
msgid "Speed"
msgstr "��綺�"
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:200 ../pidgin/gtkft.c:665
msgid "Remaining"
msgstr "���"
#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
+#: ../finch/gntft.c:200 ../finch/gntstatus.c:546 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:344
+#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
+#: ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/jabber/buddy.c:778
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:941
+#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/msn/msn.c:543
#: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3794
+#: ../libpurple/protocols/oscar/oscar.c:820
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:2693
+#: ../libpurple/protocols/oscar/oscar.c:3773
#: ../libpurple/protocols/sametime/sametime.c:3263
#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3245 ../pidgin/gtkblist.c:3101
+#: ../pidgin/gtkblist.c:3115 ../pidgin/gtkblist.c:3117
#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
msgid "Status"
msgstr "����"
-#: ../finch/gntft.c:208
+#: ../finch/gntft.c:210
msgid "Close this window when all transfers finish"
msgstr "������罟�罅��活叱絎��∽��鐚���������荀�腦�"
-#: ../finch/gntft.c:215
+#: ../finch/gntft.c:217
msgid "Clear finished transfers"
msgstr "羝��ゅ群絎������活叱"
-#: ../finch/gntft.c:229
+#: ../finch/gntft.c:231
msgid "Stop"
msgstr "筝㊥②"
-#. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:272
-msgid "Close"
-msgstr "����"
-
# XXX ��⑮
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: ../finch/gntft.c:304 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
msgid "Waiting for transfer to begin"
msgstr "膈�緇���紮��活叱罟�罅�筝�..."
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
msgid "Canceled"
msgstr "綏峨�羔�"
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: ../finch/gntft.c:373 ../pidgin/gtkft.c:1055
msgid "Failed"
msgstr "紊掩��"
# XXX pending Paladin's confirmation - acli 20070713
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: ../finch/gntft.c:419 ../pidgin/gtkft.c:133
#, c-format
msgid "%.2f KiB/s"
msgstr "%.2f kB/s"
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../finch/gntft.c:430
+#, c-format
+msgid "The file was saved as %s."
+msgstr "����絖�罟��� %s��"
+
+#: ../finch/gntft.c:431 ../finch/gntft.c:432 ../pidgin/gtkft.c:162
#: ../pidgin/gtkft.c:1115
msgid "Finished"
msgstr "綏峨���"
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:436 ../libpurple/protocols/msn/session.c:347
msgid "Transferring"
msgstr "�活叱筝�"
@@ -1030,11 +1186,11 @@
msgid "You have mail!"
msgstr "���九�育�灸散鐚�"
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:495
msgid "Sender"
msgstr "�寂拭篋�"
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:502
msgid "Subject"
msgstr "筝脂�"
@@ -1045,32 +1201,25 @@
msgstr[0] "%s (%s) �� %d 絨��育�灸散��"
msgstr[1] "%s (%s) �� %d 絨��育�灸散��"
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:340
msgid "New Mail"
msgstr "�育�灸散"
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:908
#, c-format
msgid "Info for %s"
msgstr "%s ��莖�荐�"
#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:917
+#: ../pidgin/gtknotify.c:909
msgid "Buddy Information"
msgstr "絅遵�莖�荐�"
-#: ../finch/gntnotify.c:376
+#: ../finch/gntnotify.c:376 ../libpurple/protocols/qq/group_join.c:367
msgid "Continue"
msgstr "膵主�"
-# XXX��Info����篏���室箙����緇�篏睡����莖�荐�鐚�篏�筝����鐚���篋��銀�po罟�篁������������藝�
-# XXX javajsp (Ka-Hing CHEUNG) 荀�������Info����膣����醇������緇�篏睡����莖�荐���
-# XXX 羈���上�� (2.0.0b4) 筝����鐚��ら���腦�������疹腮�綺���腴�����Info��鐚�莖�荐�鐚�膣��モ����
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:834
-msgid "Info"
-msgstr "莖�荐�"
-
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1588
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1581
msgid "IM"
msgstr "�恰��荐���"
@@ -1138,7 +1287,7 @@
#. Back to instant-apply! I win! BU-HAHAHA!
#. Create the window
#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2066
msgid "Preferences"
msgstr "�鎁処┃絎�"
@@ -1146,7 +1295,6 @@
msgid "Please enter a buddy to pounce."
msgstr "茫�莠後�ヤ���絅遵�篁ラ�画�������"
-#. Create the window.
#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
msgid "New Buddy Pounce"
msgstr "�医�絅遵���������"
@@ -1160,7 +1308,7 @@
msgstr "����茯亥������"
#. Account:
-#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:455
msgid "Account:"
msgstr "絽活��鐚�"
@@ -1169,7 +1317,7 @@
msgstr "絅遵���腮縁�"
#. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:584
msgid "Pounce When Buddy..."
msgstr "��������..."
@@ -1214,7 +1362,7 @@
msgstr "���坂���荐���"
#. Create the "Action" frame.
-#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:645
msgid "Action"
msgstr "�決���篏�"
@@ -1242,72 +1390,84 @@
msgid "Pounce only when my status is not available"
msgstr "������������筝��冴��筝�膩���������"
-#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1280
msgid "Recurring"
msgstr "��荀��主��"
-#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#: ../finch/gntpounce.c:617
+msgid "Cannot create pounce"
+msgstr "�≧��医�絅遵���������"
+
+#: ../finch/gntpounce.c:618
+msgid "You do not have any accounts."
+msgstr "����荐㊤�篁私�絽活��"
+
+#: ../finch/gntpounce.c:619
+msgid "You must create an account first before you can create a pounce."
+msgstr "�医�絅遵�����������鐚�綽������医�筝���絽活����"
+
+#: ../finch/gntpounce.c:661 ../pidgin/gtkpounce.c:1095
#, c-format
msgid "Are you sure you want to delete the pounce on %s for %s?"
msgstr "��∈絎�������ゅ� %2$s �� %1$s ����鐚�"
-#: ../finch/gntpounce.c:685 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
+#: ../finch/gntpounce.c:695 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1324
msgid "Buddy Pounces"
msgstr "絅遵���������"
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1451
#, c-format
msgid "%s has started typing to you (%s)"
msgstr "%s ��紮�莠後�ヨ���畿�� (%s)"
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1453
#, c-format
msgid "%s has paused while typing to you (%s)"
msgstr "%s ����莠後�ヨ���畿�� (%s)"
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1455
#, c-format
msgid "%s has signed on (%s)"
msgstr "%s 綏牙��糸�� (%s)"
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1457
#, c-format
msgid "%s has returned from being idle (%s)"
msgstr "%s �演��臀���� (%s)"
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1459
#, c-format
msgid "%s has returned from being away (%s)"
msgstr "%s �演�∫��菴��� (%s)"
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:819 ../pidgin/gtkpounce.c:1461
#, c-format
msgid "%s has stopped typing to you (%s)"
msgstr "%s ��罩∵叱�ヨ���畿�� (%s)"
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:821 ../pidgin/gtkpounce.c:1463
#, c-format
msgid "%s has signed off (%s)"
msgstr "%s 綏牙��糸�� (%s)"
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1465
#, c-format
msgid "%s has become idle (%s)"
msgstr "%s 莅��雁�����咲��臀� (%s)"
# XXX This string is very problematic. The other person might have changed to any non-available
# XXX status like "Busy" (not necessarily "Away"), and "綏牙��∫��" seems misleading. - 20061123
-#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1467
#, c-format
msgid "%s has gone away. (%s)"
msgstr "%s 綏牙��∫���� (%s)"
-#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1469
#, c-format
msgid "%s has sent you a message. (%s)"
msgstr "%s ���坂���荐���畿���� (%s)"
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
msgid "Unknown pounce event. Please report this!"
msgstr "���ョ������篋�篁吟��茫����演�����馹�鐚�"
@@ -1315,13 +1475,13 @@
msgid "Based on keyboard use"
msgstr "篁ラ�窮�ょ��篏睡���阪�堺�"
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1929
msgid "From last sent message"
msgstr "緇�筝�罨♂���肴������阪�堺�"
#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/gtkprefs.c:1928 ../pidgin/gtkprefs.c:1942
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
msgid "Never"
msgstr "緇�筝�"
@@ -1370,12 +1530,12 @@
msgstr "�贋�合������"
#. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2032
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
msgid "Conversations"
msgstr "篋よ�"
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1466 ../pidgin/gtkprefs.c:2043
msgid "Logging"
msgstr "�ヨ�"
@@ -1383,16 +1543,167 @@
msgid "Not implemented yet."
msgstr "荅峨���遵����篏�"
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
-#: ../pidgin/gtkrequest.c:1572
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1555
+#: ../pidgin/gtkrequest.c:1601
msgid "Save File..."
msgstr "�峨�罟�罅�..."
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
-#: ../pidgin/gtkrequest.c:1573
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1556
+#: ../pidgin/gtkrequest.c:1602
msgid "Open File..."
msgstr "����罟�罅�..."
+#: ../finch/gntsound.c:96 ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "絅遵��糸��"
+
+#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "絅遵��糸��"
+
+#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "�九�域���"
+
+#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "荐����九�逸���紮��画�篋よ�"
+
+#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "荐�������"
+
+#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "��篋咲�峨�ヨ��紊��"
+
+#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "��篋咲�∫����紊��"
+
+#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "������紊��茯��"
+
+#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "�銀�篋咲�峨�ヨ��紊��"
+
+#: ../finch/gntsound.c:106 ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "��篋阪����紊��筝㊥��井������絖�"
+
+#: ../finch/gntsound.c:360 ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer ���"
+
+#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer ��紮���紊掩����"
+
+#: ../finch/gntsound.c:715 ../finch/gntsound.c:801 ../pidgin/gtkprefs.c:1586
+#: ../pidgin/gtkprefs.c:1675 ../pidgin/gtkprefs.c:1871
+msgid "(default)"
+msgstr "(��荐�)"
+
+#: ../finch/gntsound.c:728
+msgid "Select Sound File ..."
+msgstr "�御���恰��罟�..."
+
+#: ../finch/gntsound.c:903
+msgid "Sound Preferences"
+msgstr "�恰��荐㊤�"
+
+#: ../finch/gntsound.c:914
+msgid "Profiles"
+msgstr "��篋肴���"
+
+#: ../finch/gntsound.c:953 ../pidgin/gtkprefs.c:1716
+msgid "Automatic"
+msgstr "����"
+
+#: ../finch/gntsound.c:956
+msgid "Console Beep"
+msgstr "�銀���"
+
+#: ../finch/gntsound.c:957 ../pidgin/gtkprefs.c:1720
+msgid "Command"
+msgstr "��篁�"
+
+#: ../finch/gntsound.c:958
+msgid "No Sound"
+msgstr "�♂�恰��"
+
+#: ../finch/gntsound.c:960 ../pidgin/gtkprefs.c:1711
+msgid "Sound Method"
+msgstr "�恰���㊥�丈�劫�"
+
+#: ../finch/gntsound.c:965
+msgid "Method: "
+msgstr "�㊥�丈�劫�鐚�"
+
+#: ../finch/gntsound.c:972
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+"�恰����篁わ�\n"
+"(茫�篁� %s 篁ｈ；罟���)"
+
+#. Sound options
+#: ../finch/gntsound.c:980 ../pidgin/gtkprefs.c:1755
+msgid "Sound Options"
+msgstr "�恰���檎��"
+
+#: ../finch/gntsound.c:981
+msgid "Sounds when conversation has focus"
+msgstr "�銀困茫���緇�莠後�ョ����弱�咲�恰��"
+
+#: ../finch/gntsound.c:989 ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:1762 ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
+msgid "Always"
+msgstr "��綽�"
+
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:1760
+msgid "Only when available"
+msgstr "筝�膩������∫������"
+
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
+msgid "Only when not available"
+msgstr "�∫������"
+
+#: ../finch/gntsound.c:998
+msgid "Volume(0-100):"
+msgstr "�渇��(0-100)鐚�"
+
+#. Sound events
+#: ../finch/gntsound.c:1017 ../pidgin/gtkprefs.c:1797
+msgid "Sound Events"
+msgstr "篋�篁狗�恰��"
+
+#: ../finch/gntsound.c:1019 ../pidgin/gtkprefs.c:1856
+msgid "Event"
+msgstr "篋�篁�"
+
+#: ../finch/gntsound.c:1019
+msgid "File"
+msgstr "罟�罅�"
+
+#: ../finch/gntsound.c:1038 ../pidgin/gtkprefs.c:1875
+msgid "Test"
+msgstr "羝��"
+
+#: ../finch/gntsound.c:1041 ../pidgin/gtkprefs.c:1879
+msgid "Reset"
+msgstr "��臀�"
+
+#: ../finch/gntsound.c:1044 ../pidgin/gtkprefs.c:1883
+msgid "Choose..."
+msgstr "�御��..."
+
#: ../finch/gntstatus.c:137
#, c-format
msgid "Are you sure you want to delete \"%s\""
@@ -1408,9 +1719,9 @@
msgstr "����羝���"
# FIXME ����筝�荅���奨鐚��号���≧�膺肢⑮
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:538
+#: ../libpurple/protocols/jabber/buddy.c:298
+#: ../libpurple/protocols/jabber/buddy.c:1359
#: ../libpurple/protocols/novell/novell.c:1484
#: ../pidgin/gtksavedstatuses.c:499
msgid "Title"
@@ -1421,30 +1732,39 @@
msgid "Type"
msgstr "�弱�"
-#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
-#: ../libpurple/protocols/bonjour/bonjour.c:247
-#: ../libpurple/protocols/bonjour/bonjour.c:254
-#: ../libpurple/protocols/bonjour/bonjour.c:320
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:563 ../finch/gntstatus.c:575
+#: ../libpurple/protocols/bonjour/bonjour.c:256
+#: ../libpurple/protocols/bonjour/bonjour.c:263
+#: ../libpurple/protocols/bonjour/bonjour.c:346
+#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
+#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
+#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1620
+#: ../libpurple/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/myspace/myspace.c:148
#: ../libpurple/protocols/novell/novell.c:2838
#: ../libpurple/protocols/novell/novell.c:2941
#: ../libpurple/protocols/novell/novell.c:2947
#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5533
-#: ../libpurple/protocols/oscar/oscar.c:5751
-#: ../libpurple/protocols/oscar/oscar.c:5765
-#: ../libpurple/protocols/oscar/oscar.c:5781
-#: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/oscar/oscar.c:5770
+#: ../libpurple/protocols/oscar/oscar.c:5786
+#: ../libpurple/protocols/oscar/oscar.c:5793
+#: ../libpurple/protocols/oscar/oscar.c:5800
#: ../libpurple/protocols/sametime/sametime.c:3286
#: ../libpurple/protocols/sametime/sametime.c:3292
#: ../libpurple/protocols/sametime/sametime.c:3298
@@ -1452,15 +1772,15 @@
#: ../libpurple/protocols/silc/buddy.c:1551
#: ../libpurple/protocols/silc10/buddy.c:1551
#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/yahoo/yahoo.c:3748
+#: ../libpurple/protocols/yahoo/yahoo.c:3754
#: ../libpurple/protocols/zephyr/zephyr.c:2337
#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
msgid "Message"
msgstr "荐���"
#. Use
-#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:592
msgid "Use"
msgstr "篏睡��"
@@ -1472,53 +1792,79 @@
msgid "Please enter a non-empty title for the status."
msgstr "茫��咲��������莠後�ヤ�����腥榊�順��罔�蕁���"
-#: ../finch/gntstatus.c:308
+#: ../finch/gntstatus.c:309
msgid "Duplicate title"
msgstr "罔�蕁���荀�"
-#: ../finch/gntstatus.c:309
+#: ../finch/gntstatus.c:310
msgid "Please enter a different title for the status."
msgstr "�榊畿��������莠後�ュΊ���罔�蕁���"
-#: ../finch/gntstatus.c:449
+#: ../finch/gntstatus.c:451
msgid "Substatus"
msgstr "絖�����"
-#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:463 ../pidgin/gtkft.c:698
msgid "Status:"
msgstr "����鐚�"
-#: ../finch/gntstatus.c:475
+#: ../finch/gntstatus.c:478
msgid "Message:"
msgstr "荐����"
-#: ../finch/gntstatus.c:524
+#: ../finch/gntstatus.c:527
msgid "Edit Status"
msgstr "篆��合����"
-#: ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:569
msgid "Use different status for following accounts"
msgstr "�咲��蚕絽活��荐㊤�筝���������"
#. Save & Use
-#: ../finch/gntstatus.c:600
+#: ../finch/gntstatus.c:603
msgid "Save & Use"
msgstr "�峨�筝�戎��"
-#: ../finch/gntui.c:84
+#: ../finch/gntui.c:85
+msgid "Certificates"
+msgstr "��茘�"
+
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2034
+msgid "Sounds"
+msgstr "�恰��"
+
+#: ../finch/gntui.c:91
msgid "Statuses"
msgstr "����"
-#: ../finch/plugins/gntclipboard.c:149
+#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
+#: ../finch/plugins/gntclipboard.c:128
+msgid "Error loading the plugin."
+msgstr "莠��ユ─腟���筝㊨�㊨�������"
+
+#: ../finch/plugins/gntclipboard.c:116
+msgid "Couldn't find X display"
+msgstr "�鞘��� X Display ��荐㊤�"
+
+#: ../finch/plugins/gntclipboard.c:122
+#, fuzzy
+msgid "Couldn't find window"
+msgstr "�≧�����罟�罅�"
+
+#: ../finch/plugins/gntclipboard.c:129
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr "�≧�莠��ユ─腟�鐚����阪産臀�─腟���羃���腟������ X11 ��叵��"
+
+#: ../finch/plugins/gntclipboard.c:158
msgid "GntClipboard"
msgstr "GntClipboard"
-#: ../finch/plugins/gntclipboard.c:151
+#: ../finch/plugins/gntclipboard.c:160
msgid "Clipboard plugin"
msgstr "��下膂炊─腟�"
# FIXME: ��緇�筝�����
-#: ../finch/plugins/gntclipboard.c:152
+#: ../finch/plugins/gntclipboard.c:161
msgid ""
"When the gnt clipboard contents change, the contents are made available to "
"X, if possible."
@@ -1641,71 +1987,72 @@
msgid "accounts"
msgstr "絽活��羝���"
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/account.c:957 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:256
msgid "Password is required to sign on."
msgstr "�糸�ユ����荀�絲�腆若��"
-#: ../libpurple/account.c:963
+#: ../libpurple/account.c:983
#, c-format
msgid "Enter password for %s (%s)"
msgstr "莠後�� %s (%s) ��絲�腆�"
-#: ../libpurple/account.c:970
+#: ../libpurple/account.c:990
msgid "Enter Password"
msgstr "莠後�ュ�腆�"
-#: ../libpurple/account.c:975
+#: ../libpurple/account.c:995
msgid "Save password"
msgstr "�峨�絲�腆�"
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: ../libpurple/account.c:1030 ../libpurple/connection.c:104
+#: ../libpurple/connection.c:177
#, c-format
msgid "Missing protocol plugin for %s"
msgstr "�鞘��� %s ����絎�罔∞�"
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4010
+#: ../libpurple/account.c:1032 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4033
msgid "Connection Error"
msgstr "�ｇ����"
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: ../libpurple/account.c:1190 ../libpurple/protocols/gg/gg.c:707
+#: ../libpurple/protocols/jabber/jabber.c:1683
msgid "New passwords do not match."
msgstr "�医�腆寂研筝��悟���"
# NOTE 茘����翫�� by Ambrose
-#: ../libpurple/account.c:1179
+#: ../libpurple/account.c:1199
msgid "Fill out all fields completely."
msgstr "茫�紂�Ε�岩蚕茵��惹������罨�篏���"
-#: ../libpurple/account.c:1202
+#: ../libpurple/account.c:1222
msgid "Original password"
msgstr "��絲�腆�"
-#: ../libpurple/account.c:1209
+#: ../libpurple/account.c:1229
msgid "New password"
msgstr "�医�腆�"
-#: ../libpurple/account.c:1216
+#: ../libpurple/account.c:1236
msgid "New password (again)"
msgstr "�医�腆種���罨∞∈茯�鐚�"
-#: ../libpurple/account.c:1222
+#: ../libpurple/account.c:1242
#, c-format
msgid "Change password for %s"
msgstr "篆��� %s ��絲�腆�"
-#: ../libpurple/account.c:1230
+#: ../libpurple/account.c:1250
msgid "Please enter your current password and your new password."
msgstr "茫�莠後�ユ��������絲�腆寂札��絽���篏睡�����医�腆若��"
-#: ../libpurple/account.c:1261
+#: ../libpurple/account.c:1281
#, c-format
msgid "Change user information for %s"
msgstr "�贋�� %s ����篋肴�荐�"
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1284 ../libpurple/protocols/toc/toc.c:1670
msgid "Set User Info"
msgstr "荐㊤�篏睡����莖�荐�"
@@ -1716,19 +2063,20 @@
# XXX libgaim/protocols/* - ��Unknown����筝�����絅遵�����鐚����醇������筝�����鐚���荐�膤紫輝���援����������筝�����鐚�
# XXX ���������ャ��鐚��榊憘� Pidgin �����������篁ｈ��鐚�
# XXX - Ambrose 20061123
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/account.c:1755 ../libpurple/protocols/gg/gg.c:1017
+#: ../libpurple/protocols/jabber/buddy.c:782
+#: ../libpurple/protocols/jabber/buddy.c:2025
+#: ../libpurple/protocols/jabber/buddy.c:2042
#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:159
msgid "Unknown"
msgstr "����"
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1301
+#: ../libpurple/blist.c:1530 ../libpurple/protocols/jabber/roster.c:69
+#: ../libpurple/protocols/myspace/myspace.c:3238 ../pidgin/gtkblist.c:5367
#: ../pidgin/plugins/gevolution/gevo-util.c:64
+#: ../pidgin/plugins/gevolution/gevolution.c:96
msgid "Buddies"
msgstr "絅遵�"
@@ -1736,22 +2084,184 @@
msgid "buddy list"
msgstr "絅遵�羝���"
+#: ../libpurple/certificate.c:545
+msgid "(DOES NOT MATCH)"
+msgstr "鐚�筝���悟�鐚�"
+
+# XXX ������⑮ - acli 20070913
+#. Make messages
+#: ../libpurple/certificate.c:549
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr "%s �榊ず篋�篁ヤ������恰�����茘�鐚�"
+
+#: ../libpurple/certificate.c:550
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+"����鐚�%s %s\n"
+"��膣� (SHA1)鐚�%s"
+
+# XXX ������⑮ - acli 20070913
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:555
+msgid "Single-use Certificate Verification"
+msgstr "�後��恰���茘�"
+
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:872
+msgid "Certificate Authorities"
+msgstr "��茘�罘�罕�"
+
+# TODO Untranslated - acli 20070913
+#. Scheme name
+#. Pool name
+#: ../libpurple/certificate.c:1040
+msgid "SSL Peers Cache"
+msgstr "SSL Peer 綽��"
+
+#. Make messages
+#: ../libpurple/certificate.c:1171
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr "�ュ� %s ����茘����"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1177
+msgid "SSL Certificate Verification"
+msgstr "�後� SSL ��茘�"
+
+#. Number of actions
+#: ../libpurple/certificate.c:1186
+msgid "Accept"
+msgstr "�ュ�"
+
+#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:90
+#: ../libpurple/protocols/qq/sys_msg.c:246
+msgid "Reject"
+msgstr "��腟�"
+
+#: ../libpurple/certificate.c:1188
+msgid "_View Certificate..."
+msgstr "罟∵���茘�(_V)"
+
+# FIXME 茘���筝�紊����� - acli 20070913
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1288
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead. This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"��%s���榊ず����茘��牙┗絎���荅峨卯�若��%s��鐚����������順���ｇ����巡��������賢絽���篏�"
+"����������"
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1313
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr "��%s���榊ず����茘�����綾��鐚��≧������画��後���"
+
+#: ../libpurple/certificate.c:1331
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr "��%s���榊ず����茘������≧������"
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
+msgid "SSL Certificate Error"
+msgstr "SSL ��茘����"
+
+#: ../libpurple/certificate.c:1340
+msgid "Invalid certificate chain"
+msgstr "�≧������茘���"
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1360
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#. vrq will be completed by user_auth
+#: ../libpurple/certificate.c:1382
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#: ../libpurple/certificate.c:1408
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"��%s���榊ず����茘����牙┗絎����掩����茘�罘�罕�膂順�種�篏�絲���筝��紙���荅我��茘�罘�罕�������膂�"
+"腴���"
+
+#: ../libpurple/certificate.c:1417
+msgid "Invalid certificate authority signature"
+msgstr "��茘�罘�罕���膂順����≧����"
+
+#. Make messages
+#: ../libpurple/certificate.c:1882
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+"����鐚�%s\n"
+"\n"
+"��膣� (SHA1)鐚�%s\n"
+"\n"
+"�����ユ��鐚�%s\n"
+"紊掩���ユ��鐚�%s\n"
+
+#. TODO: Find what the handle ought to be
+#: ../libpurple/certificate.c:1891
+msgid "Certificate Information"
+msgstr "��茘�莖�荐�"
+
#: ../libpurple/connection.c:106
msgid "Registration Error"
msgstr "荐糸�����"
-#: ../libpurple/connection.c:293
+#: ../libpurple/connection.c:179
+msgid "Unregistration Error"
+msgstr "��┿�����"
+
+#: ../libpurple/connection.c:349
#, c-format
msgid "+++ %s signed on"
msgstr "+++ %s �糸��"
-#: ../libpurple/connection.c:323
+#: ../libpurple/connection.c:379
#, c-format
msgid "+++ %s signed off"
msgstr "+++ %s �糸��"
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/connection.c:496 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:2313
#: ../libpurple/protocols/msn/servconn.c:139
#: ../libpurple/protocols/msn/session.c:322
msgid "Unknown error"
@@ -1770,45 +2280,45 @@
msgid "The message is too large."
msgstr "����荐���お紊т���"
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
-#: ../libpurple/protocols/bonjour/jabber.c:326
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
+#: ../libpurple/protocols/bonjour/jabber.c:298
msgid "Unable to send message."
msgstr "�≧����肴�����"
-#: ../libpurple/conversation.c:1169
+#: ../libpurple/conversation.c:1211
msgid "Send Message"
msgstr "���肴���"
-#: ../libpurple/conversation.c:1172
+#: ../libpurple/conversation.c:1214
msgid "_Send Message"
msgstr "���肴���(_S)"
-#: ../libpurple/conversation.c:1578
+#: ../libpurple/conversation.c:1620
#, c-format
msgid "%s entered the room."
msgstr "%s �峨�ヨ��紊����"
-#: ../libpurple/conversation.c:1581
+#: ../libpurple/conversation.c:1623
#, c-format
msgid "%s [<I>%s</I>] entered the room."
msgstr "%s [<I>%s</I>] �峨�ヨ��紊����"
-#: ../libpurple/conversation.c:1691
+#: ../libpurple/conversation.c:1733
#, c-format
msgid "You are now known as %s"
msgstr "篏��壕��援┗�� %s"
-#: ../libpurple/conversation.c:1711
+#: ../libpurple/conversation.c:1753
#, c-format
msgid "%s is now known as %s"
msgstr "%s �壕��援┗�� %s"
-#: ../libpurple/conversation.c:1786
+#: ../libpurple/conversation.c:1828
#, c-format
msgid "%s left the room."
msgstr "%s �∫����紊����"
-#: ../libpurple/conversation.c:1789
+#: ../libpurple/conversation.c:1831
#, c-format
msgid "%s left the room (%s)."
msgstr "%s �∫����紊�� (%s)��"
@@ -2184,15 +2694,15 @@
msgid "Old flat format"
msgstr "��綣鎶渇�∽�罅�"
-#: ../libpurple/log.c:837
+#: ../libpurple/log.c:838
msgid "Logging of this conversation failed."
msgstr "�≧�荐�������篋よ���"
-#: ../libpurple/log.c:1280
+#: ../libpurple/log.c:1281
msgid "XML"
msgstr "XML"
-#: ../libpurple/log.c:1364
+#: ../libpurple/log.c:1365
#, c-format
msgid ""
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
@@ -2201,7 +2711,7 @@
"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s <��������>:"
"</b></font> %s<br/>\n"
-#: ../libpurple/log.c:1366
+#: ../libpurple/log.c:1367
#, c-format
msgid ""
"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s <AUTO-"
@@ -2211,16 +2721,16 @@
"</b></font> %s<br/>\n"
# XXX ��⑮
-#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
+#: ../libpurple/log.c:1425 ../libpurple/log.c:1558
msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
msgstr "<font color=\"red\"><b>�鞘��井�ヨ�罟�罅�鐚�</b></font>"
-#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
+#: ../libpurple/log.c:1437 ../libpurple/log.c:1567
#, c-format
msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
msgstr "<font color=\"red\"><b>�≧�莅���罟�罅�鐚�%s</b></font>"
-#: ../libpurple/log.c:1498
+#: ../libpurple/log.c:1499
#, c-format
msgid "(%s) %s <AUTO-REPLY>: %s\n"
msgstr "(%s) %s <������荀�>鐚�%s\n"
@@ -2310,13 +2820,13 @@
#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1458
-#: ../libpurple/protocols/oscar/oscar.c:2251
-#: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5865
-#: ../libpurple/protocols/oscar/oscar.c:5920
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2226
+#: ../libpurple/protocols/oscar/oscar.c:2275
+#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5925
+#: ../libpurple/protocols/oscar/oscar.c:6151
+#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1387
#: ../libpurple/request.h:1397
msgid "_Cancel"
msgstr "��羔�(_C)"
@@ -2374,8 +2884,8 @@
"�九��������ュ�罟�罅��活叱��莊喝�肴�腦�����\n"
"鐚����主���������渇�����画�篋よ�����羈�筝�鐚�"
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1687
msgid "Notes"
msgstr "��荐�"
@@ -2395,18 +2905,18 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
msgid "Buddy Notes"
msgstr "絅遵���荐�"
#. *< name
#. *< version
-#: ../libpurple/plugins/buddynote.c:92
+#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
msgid "Store notes on particular buddies."
msgstr "腟����ュソ����筝���荐祉��"
#. *< summary
-#: ../libpurple/plugins/buddynote.c:93
+#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
msgid "Adds the option to store notes for buddies on your buddy list."
msgstr "��箴�腟�ソ��羝������絅遵���筝���荐紫�����純��"
@@ -2609,44 +3119,44 @@
#. * offset is way off. The user should never really see it, but
#. * it's here just in case. The parens are to make it clear it's
#. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:492
+#: ../libpurple/plugins/log_reader.c:493
msgid "(UTC)"
msgstr "(UTC)"
-#: ../libpurple/plugins/log_reader.c:1573
+#: ../libpurple/plugins/log_reader.c:1577
msgid "User is offline."
msgstr "篏睡�������∝�����"
-#: ../libpurple/plugins/log_reader.c:1579
+#: ../libpurple/plugins/log_reader.c:1583
msgid "Auto-response sent:"
msgstr "�����������削�"
-#: ../libpurple/plugins/log_reader.c:1589
-#: ../libpurple/plugins/log_reader.c:1592
+#: ../libpurple/plugins/log_reader.c:1593
+#: ../libpurple/plugins/log_reader.c:1596
#: ../libpurple/plugins/statenotify.c:80
#, c-format
msgid "%s has signed off."
msgstr "%s 綏牙��糸�冴��"
-#: ../libpurple/plugins/log_reader.c:1606
+#: ../libpurple/plugins/log_reader.c:1610
msgid "One or more messages may have been undeliverable."
msgstr "筝�����紊���荐�����遵�渇��紊掩����"
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1620
msgid "You were disconnected from the server."
msgstr "��群膓���罩∵��篌堺�������ｇ���"
-#: ../libpurple/plugins/log_reader.c:1624
+#: ../libpurple/plugins/log_reader.c:1628
msgid ""
"You are currently disconnected. Messages will not be received unless you are "
"logged in."
msgstr "���������∝��������������亥�糸�ュ��鐚�絨��≧��九�遺算篏�荐�����"
-#: ../libpurple/plugins/log_reader.c:1639
+#: ../libpurple/plugins/log_reader.c:1643
msgid "Message could not be sent because the maximum length was exceeded."
msgstr "�掩�守���育�桁墾筝���鐚���篁ヨ����≧����冴��"
-#: ../libpurple/plugins/log_reader.c:1644
+#: ../libpurple/plugins/log_reader.c:1648
msgid "Message could not be sent."
msgstr "荐����≧����冴��"
@@ -2654,68 +3164,68 @@
#. 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.
-#: ../libpurple/plugins/log_reader.c:2344
-#: ../libpurple/plugins/log_reader.c:2467
+#: ../libpurple/plugins/log_reader.c:2349
+#: ../libpurple/plugins/log_reader.c:2472
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.
-#: ../libpurple/plugins/log_reader.c:2357
-#: ../libpurple/plugins/log_reader.c:2472
+#: ../libpurple/plugins/log_reader.c:2362
+#: ../libpurple/plugins/log_reader.c:2477
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.
-#: ../libpurple/plugins/log_reader.c:2369
-#: ../libpurple/plugins/log_reader.c:2476
+#: ../libpurple/plugins/log_reader.c:2374
+#: ../libpurple/plugins/log_reader.c:2481
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.
-#: ../libpurple/plugins/log_reader.c:2383
-#: ../libpurple/plugins/log_reader.c:2481
+#: ../libpurple/plugins/log_reader.c:2388
+#: ../libpurple/plugins/log_reader.c:2486
msgid "QIP"
msgstr "QIP"
#. 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.
-#: ../libpurple/plugins/log_reader.c:2395
-#: ../libpurple/plugins/log_reader.c:2485
+#: ../libpurple/plugins/log_reader.c:2400
+#: ../libpurple/plugins/log_reader.c:2490
msgid "MSN Messenger"
msgstr "MSN Messenger"
#. 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.
-#: ../libpurple/plugins/log_reader.c:2407
-#: ../libpurple/plugins/log_reader.c:2489
+#: ../libpurple/plugins/log_reader.c:2412
+#: ../libpurple/plugins/log_reader.c:2494
msgid "Trillian"
msgstr "Trillian"
#. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2449
+#: ../libpurple/plugins/log_reader.c:2454
msgid "General Log Reading Configuration"
msgstr "�堺�����ヨ�莅���荐㊤�"
-#: ../libpurple/plugins/log_reader.c:2453
+#: ../libpurple/plugins/log_reader.c:2458
msgid "Fast size calculations"
msgstr "綽���荐�膊��ヨ�紊у�"
# XXX 茘���荐��������弱�XX������膓�薊�羈����������主憝��羈��������∝刈羈��������∝�羈���膈�鐚�緇�����篌寂��������惹�後Ⅳ鐚�
# XXX ��茖����name heuristics������筝�篋�綛��� Pidgin��篌域���絽活��荳�����膓�薊��ц���鐚����絖�臂��ゆ�件�������茘���������膓�薊�羈�����
-#: ../libpurple/plugins/log_reader.c:2457
+#: ../libpurple/plugins/log_reader.c:2462
msgid "Use name heuristics"
msgstr "�拷��絽活����篏睡���薊�羈��� (heuristics)"
#. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2463
+#: ../libpurple/plugins/log_reader.c:2468
msgid "Log Directory"
msgstr "�ヨ�����"
@@ -2725,20 +3235,20 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../libpurple/plugins/log_reader.c:2518
+#: ../libpurple/plugins/log_reader.c:2523
msgid "Log Reader"
msgstr "�ヨ�罟∵���"
#. *< name
#. *< version
#. * summary
-#: ../libpurple/plugins/log_reader.c:2522
+#: ../libpurple/plugins/log_reader.c:2527
msgid "Includes other IM clients' logs in the log viewer."
msgstr "���ヨ��頳遵��賢�����銀��恰��荐������句��ヨ���"
# XXX 茘�����緇��拷�駕�膃��罧居� - 20061025
#. * description
-#: ../libpurple/plugins/log_reader.c:2526
+#: ../libpurple/plugins/log_reader.c:2531
msgid ""
"When viewing logs, this plugin will include logs from other IM clients. "
"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2802,7 +3312,7 @@
"���初���榊��荐�������峨�����絅遵�������������絋�����荀�鐚�荐��������絅遵�����������"
"��絨�荅沿�腦�筝㊦隈莠������ゃ��"
-#: ../libpurple/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:156
#, c-format
msgid ""
"\"%s\" is currently offline. Do you want to save the rest of the messages in "
@@ -2811,17 +3321,17 @@
"��%s�������咲�∝�鐚����篏睡����絅遵��������������遵�峨����初���榊��荐������鐚��峨���"
"荐��������%s��筝�罨∞�糸�ユ���������削�"
-#: ../libpurple/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:160
msgid "Offline Message"
msgstr "�∝�荐���"
-#: ../libpurple/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:161
msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
msgstr "���札����絅遵�������������絨�荅沿�腦�筝㊦隈莠������ょ��������"
-#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/plugins/offlinemsg.c:165
#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
#: ../libpurple/protocols/novell/novell.c:1917
#: ../libpurple/protocols/silc/buddy.c:317
#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
@@ -2831,9 +3341,9 @@
msgid "Yes"
msgstr "��"
-#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/plugins/offlinemsg.c:166
#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
#: ../libpurple/protocols/novell/novell.c:1918
#: ../libpurple/protocols/silc/buddy.c:318
#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
@@ -2843,11 +3353,11 @@
msgid "No"
msgstr "��"
-#: ../libpurple/plugins/offlinemsg.c:189
+#: ../libpurple/plugins/offlinemsg.c:193
msgid "Save offline messages in pounce"
msgstr "篏睡����絅遵������������峨��∝�荐���"
-#: ../libpurple/plugins/offlinemsg.c:193
+#: ../libpurple/plugins/offlinemsg.c:197
msgid "Do not ask. Always save in pounce."
msgstr "罸����������綽�篏睡����絅遵������������峨��∝�荐�����"
@@ -2911,7 +3421,7 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:711
msgid "Signals Test"
msgstr "篆∴��羝��"
@@ -2919,8 +3429,8 @@
#. *< version
#. * summary
#. * description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:714
+#: ../libpurple/plugins/signals-test.c:716
msgid "Test to see that all signals are working properly."
msgstr "罟∽�ュ��腮�拭�������処�醇③絽檎��篏���"
@@ -2942,6 +3452,50 @@
msgid "Tests to see that most things are working."
msgstr "���羝������ぇ��蚕���沿タ�処�醇③絽檎��篏���"
+#. Scheme name
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:903
+#: ../libpurple/plugins/ssl/ssl-nss.c:657
+msgid "X.509 Certificates"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:987
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:990
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:992
+msgid "Provides SSL support through GNUTLS."
+msgstr "��� GNUTLS ��鋐� SSL ����叵��"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ssl/ssl-nss.c:742
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. * summary
+#. * description
+#: ../libpurple/plugins/ssl/ssl-nss.c:745
+#: ../libpurple/plugins/ssl/ssl-nss.c:747
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "��� Mozilla �� NSS ��鋐� SSL ����叵��"
+
#. *< type
#. *< ui_requirement
#. *< flags
@@ -2960,44 +3514,6 @@
msgid "Provides a wrapper around SSL support libraries."
msgstr "�堺��� SSL ���恖�綺��箴�筝��� Wrapper��"
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
-msgid "GNUTLS"
-msgstr "GNUTLS"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
-msgid "Provides SSL support through GNUTLS."
-msgstr "��� GNUTLS ��鋐� SSL ����叵��"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
-msgid "NSS"
-msgstr "NSS"
-
-#. *< name
-#. *< version
-#. * summary
-#. * description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
-msgid "Provides SSL support through Mozilla NSS."
-msgstr "��� Mozilla �� NSS ��鋐� SSL ����叵��"
-
#: ../libpurple/plugins/statenotify.c:50
#, c-format
msgid "%s is no longer away."
@@ -3086,25 +3602,43 @@
"Unable to establish connection with the local mDNS server. Is it running?"
msgstr "�≧���菴�腴��� mDNS 篌堺����産腴��ｇ���絎����決�筝㊤���"
-#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#. Away stuff
-#: ../libpurple/protocols/bonjour/bonjour.c:294
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4545
-#: ../libpurple/protocols/oscar/oscar.c:5611
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
-#: ../pidgin/gtkstatusbox.c:1056
-msgid "Away"
-msgstr "�∫��"
+#. Creating the options for the protocol
+#: ../libpurple/protocols/bonjour/bonjour.c:351
+#: ../libpurple/protocols/bonjour/bonjour.c:656
+#: ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/jabber/jabber.c:943
+msgid "First name"
+msgstr "��"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:353
+#: ../libpurple/protocols/bonjour/bonjour.c:659
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:948
+msgid "Last name"
+msgstr "紮�"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:357
+#: ../libpurple/protocols/jabber/buddy.c:295
+#: ../libpurple/protocols/jabber/buddy.c:1325
+#: ../libpurple/protocols/jabber/buddy.c:1335
+#: ../libpurple/protocols/jabber/buddy.c:2192
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
+msgid "E-Mail"
+msgstr "�糸��灸散"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:360
+#: ../libpurple/protocols/bonjour/bonjour.c:665
+msgid "AIM Account"
+msgstr "AIM 絽活��"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/bonjour/bonjour.c:668
+msgid "XMPP Account"
+msgstr "XMPP 絽活��"
#. *< type
#. *< ui_requirement
@@ -3116,42 +3650,20 @@
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: ../libpurple/protocols/bonjour/bonjour.c:467
+#: ../libpurple/protocols/bonjour/bonjour.c:469
msgid "Bonjour Protocol Plugin"
msgstr "Bonjour ��絎�罔∞�"
# XXX ������緇�絅��� - ambrose 20070414
# NOTE 絨��� evolution PO 罟�箙�茘��鐚�荅活�筝��≪��Local Addressbook��罌�
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:535
+#: ../libpurple/protocols/bonjour/bonjour.c:610
msgid "Purple Person"
msgstr "�ｇ機篋�"
-#. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
-msgid "Hostname"
-msgstr "筝紙���腮�"
-
-#. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:587
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
-msgid "First name"
-msgstr "��"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:590
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
-msgid "Last name"
-msgstr "紮�"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:593
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/bonjour/bonjour.c:662
+#: ../libpurple/protocols/gg/gg.c:477
+#: ../libpurple/protocols/jabber/jabber.c:933
#: ../libpurple/protocols/silc/silc.c:770
#: ../libpurple/protocols/silc/silc.c:1011
#: ../libpurple/protocols/silc10/silc.c:681
@@ -3159,43 +3671,35 @@
msgid "E-mail"
msgstr "�糸��灸散"
-#: ../libpurple/protocols/bonjour/bonjour.c:596
-msgid "AIM Account"
-msgstr "AIM 絽活��"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:599
-msgid "XMPP Account"
-msgstr "XMPP 絽活��"
-
# NOTE ������荐���絎���腮縁�筝������顄�
#: ../libpurple/protocols/bonjour/bonjour.h:33
msgid "Bonjour"
msgstr "Bonjour"
-#: ../libpurple/protocols/bonjour/jabber.c:395
+#: ../libpurple/protocols/bonjour/jabber.c:380
#, c-format
msgid "%s has closed the conversation."
msgstr "%s 綏牙���������篋よ���"
-#: ../libpurple/protocols/bonjour/jabber.c:441
-#: ../libpurple/protocols/bonjour/jabber.c:654
-#: ../libpurple/protocols/bonjour/jabber.c:679
+#: ../libpurple/protocols/bonjour/jabber.c:437
+#: ../libpurple/protocols/bonjour/jabber.c:660
+#: ../libpurple/protocols/bonjour/jabber.c:678
msgid "Unable to send the message, the conversation couldn't be started."
msgstr "�≧����肴����篋よ��≧���紮���"
-#: ../libpurple/protocols/bonjour/jabber.c:575
+#: ../libpurple/protocols/bonjour/jabber.c:583
msgid "Cannot open socket"
msgstr "�≧�����Socket"
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: ../libpurple/protocols/bonjour/jabber.c:591
msgid "Error setting socket options"
msgstr "荐㊤� Socket �檎�������"
-#: ../libpurple/protocols/bonjour/jabber.c:607
+#: ../libpurple/protocols/bonjour/jabber.c:615
msgid "Could not bind socket to port"
msgstr "�≧���� Socket �育��荐���"
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: ../libpurple/protocols/bonjour/jabber.c:623
msgid "Could not listen on socket"
msgstr "�≧��ｈ�� Socket"
@@ -3272,269 +3776,293 @@
msgid "Registration completed successfully!"
msgstr "荐糸������鐚�"
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:917
+#: ../libpurple/protocols/jabber/jabber.c:1718
msgid "Password"
msgstr "絲�腆�"
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
msgid "Password (retype)"
msgstr "絲�腆種���罨∴叱�ワ�"
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
msgid "Enter current token"
msgstr "莠後�ョ������絲�腆�"
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
msgid "Current token"
msgstr "����絲�腆�"
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
msgid "Register New Gadu-Gadu Account"
msgstr "荐糸���亥�� Gadu-Gadu 絽活��"
-#: ../libpurple/protocols/gg/gg.c:499
+#: ../libpurple/protocols/gg/gg.c:504
msgid "Please, fill in the following fields"
msgstr "茫�莠後�ヤ札筝���罨�篏�"
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
+#: ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:958
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3795
#: ../libpurple/protocols/qq/buddy_info.c:49
msgid "City"
msgstr "���"
-#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/gg/gg.c:647
msgid "Year of birth"
msgstr "�榊��綛�"
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1586
+#: ../libpurple/protocols/myspace/user.c:115
+#: ../libpurple/protocols/oscar/oscar.c:3725
#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
-#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
msgid "Gender"
msgstr "�у��"
-#: ../libpurple/protocols/gg/gg.c:646
+#: ../libpurple/protocols/gg/gg.c:651
msgid "Male or female"
msgstr "�傑�ф��絅恰��"
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/oscar/oscar.c:3725
#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: ../libpurple/protocols/qq/qq.c:226
msgid "Male"
msgstr "��"
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3746
+#: ../libpurple/protocols/gg/gg.c:653
+#: ../libpurple/protocols/oscar/oscar.c:3725
#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:229
msgid "Female"
msgstr "絅�"
-#: ../libpurple/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:657
msgid "Only online"
msgstr "����筝�膩�"
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
msgid "Find buddies"
msgstr "��絨�絅遵�"
-#: ../libpurple/protocols/gg/gg.c:658
+#: ../libpurple/protocols/gg/gg.c:663
msgid "Please, enter your search criteria below"
msgstr "茫�����壕叱�ユ������絨�罌�篁�"
-#: ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/gg/gg.c:701
msgid "Fill in the fields."
msgstr "紂��井�篏�筝㏍��"
-#: ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/gg/gg.c:713
msgid "Your current password is different from the one that you specified."
msgstr "����������箴���絲�腆取����絎���絽活��筝�膃���"
-#: ../libpurple/protocols/gg/gg.c:722
+#: ../libpurple/protocols/gg/gg.c:727
msgid "Unable to change password. Error occurred.\n"
msgstr "�≧�篆��劫�腆若������主����\n"
-#: ../libpurple/protocols/gg/gg.c:731
+#: ../libpurple/protocols/gg/gg.c:736
msgid "Change password for the Gadu-Gadu account"
msgstr "莅��� Gadu-Gadu 絽活����絲�腆�"
-#: ../libpurple/protocols/gg/gg.c:732
+#: ../libpurple/protocols/gg/gg.c:737
msgid "Password was changed successfully!"
msgstr "絲�腆寂信�号����鐚�"
-#: ../libpurple/protocols/gg/gg.c:765
+#: ../libpurple/protocols/gg/gg.c:770
msgid "Current password"
msgstr "��絲�腆�"
-#: ../libpurple/protocols/gg/gg.c:790
+#: ../libpurple/protocols/gg/gg.c:795
msgid "Please, enter your current password and your new password for UIN: "
msgstr "茫�莠後�ユ������絲�腆弱�篏����医�腆種�"
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
msgid "Change Gadu-Gadu Password"
msgstr "莅��� Gadu-Gadu 絲�腆�"
-#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/gg/gg.c:876
#, c-format
msgid "Select a chat for buddy: %s"
msgstr "�後�筝�����紊��腟�ソ��鐚�%s"
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
msgid "Add to chat..."
msgstr "�医��域��紊��..."
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/gg/gg.c:1008
+#: ../libpurple/protocols/jabber/buddy.c:2029
#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5583
+#: ../libpurple/protocols/oscar/oscar.c:827
+#: ../libpurple/protocols/oscar/oscar.c:5588
#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: ../libpurple/protocols/qq/qq.c:292
+#: ../libpurple/protocols/yahoo/yahoo.c:3096 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3101 ../pidgin/gtkblist.c:3433
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1060
msgid "Offline"
msgstr "�∝�"
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../libpurple/protocols/gg/gg.c:1011
+#: ../libpurple/protocols/jabber/buddy.c:2031
#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: ../libpurple/protocols/qq/qq.c:280
+#: ../libpurple/protocols/yahoo/yahoo.c:3098 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1056
msgid "Available"
msgstr "筝�膩�"
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:2035
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:732
+#: ../libpurple/protocols/oscar/oscar.c:4540
+#: ../libpurple/protocols/oscar/oscar.c:5616
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3650
+#: ../libpurple/protocols/yahoo/yahoo.c:3724 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkstatusbox.c:1057
+msgid "Away"
+msgstr "�∫��"
+
+#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
+#: ../libpurple/protocols/oscar/oscar.c:2692
+#: ../libpurple/protocols/oscar/oscar.c:3692
msgid "UIN"
msgstr "絽活��"
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
+#: ../libpurple/protocols/jabber/buddy.c:2186
+#: ../libpurple/protocols/jabber/buddy.c:2362
+#: ../libpurple/protocols/oscar/oscar.c:3703
#: ../libpurple/protocols/silc/ops.c:990
#: ../libpurple/protocols/silc10/ops.c:1024
msgid "First Name"
msgstr "��"
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
msgid "Birth Year"
msgstr "�榊��綛�"
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3925
+#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
+#: ../libpurple/protocols/oscar/oscar.c:3904
msgid "Unable to display the search results."
msgstr "�≧�蕁�ず��絨�腟�����"
# FIXME ��筝��鎞�鐚�荀�荀��� - 20061028
-#: ../libpurple/protocols/gg/gg.c:1166
+#: ../libpurple/protocols/gg/gg.c:1171
msgid "Gadu-Gadu Public Directory"
msgstr "Gadu-Gadu ���怨���"
-#: ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/gg/gg.c:1172
msgid "Search results"
msgstr "��絨�腟���"
-#: ../libpurple/protocols/gg/gg.c:1210
+#: ../libpurple/protocols/gg/gg.c:1215
msgid "No matching users found"
msgstr "�鞘��亥�����篏睡����"
-#: ../libpurple/protocols/gg/gg.c:1211
+#: ../libpurple/protocols/gg/gg.c:1216
msgid "There are no users matching your search criteria."
msgstr "�≧�箴��ф��絨�罌�篁倶�上�亥�悟���篏睡������"
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
msgid "Unable to read socket"
msgstr "�≧�莅��� Socket"
-#: ../libpurple/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1395
msgid "Buddy list downloaded"
msgstr "筝�莠�絅遵�羝���"
-#: ../libpurple/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1396
msgid "Your buddy list was downloaded from the server."
msgstr "��群緇�篌堺�����莠�絅遵�羝�����"
-#: ../libpurple/protocols/gg/gg.c:1398
+#: ../libpurple/protocols/gg/gg.c:1403
msgid "Buddy list uploaded"
msgstr "筝��喝ソ��羝���"
-#: ../libpurple/protocols/gg/gg.c:1399
+#: ../libpurple/protocols/gg/gg.c:1404
msgid "Your buddy list was stored on the server."
msgstr "����絅遵�羝���群茴���丈�寂失�������"
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
msgid "Connection failed."
msgstr "�ｇ�紊掩����"
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
msgid "Blocked"
msgstr "絨���"
-#: ../libpurple/protocols/gg/gg.c:1639
+#: ../libpurple/protocols/gg/gg.c:1644
msgid "Add to chat"
msgstr "�医��域��紊��"
-#: ../libpurple/protocols/gg/gg.c:1648
+#: ../libpurple/protocols/gg/gg.c:1653
msgid "Unblock"
msgstr "茹ｉ�ゅ���"
-#: ../libpurple/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1657
msgid "Block"
msgstr "絨���"
-#: ../libpurple/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1674
msgid "Chat _name:"
msgstr "��紊����腮�(_N)鐚�"
-#: ../libpurple/protocols/gg/gg.c:1909
+#: ../libpurple/protocols/gg/gg.c:1914
msgid "Chat error"
msgstr "��紊����"
-#: ../libpurple/protocols/gg/gg.c:1910
+#: ../libpurple/protocols/gg/gg.c:1915
msgid "This chat name is already in use"
msgstr "��紊����腮掩③��戎��賢"
-#: ../libpurple/protocols/gg/gg.c:1993
+#: ../libpurple/protocols/gg/gg.c:1998
msgid "Not connected to the server."
msgstr "絨����ｇ��遺失������"
-#: ../libpurple/protocols/gg/gg.c:2016
+#: ../libpurple/protocols/gg/gg.c:2021
msgid "Find buddies..."
msgstr "絨��上ソ��..."
-#: ../libpurple/protocols/gg/gg.c:2022
+#: ../libpurple/protocols/gg/gg.c:2027
msgid "Change password..."
msgstr "篆��劫�腆�..."
-#: ../libpurple/protocols/gg/gg.c:2028
+#: ../libpurple/protocols/gg/gg.c:2033
msgid "Upload buddylist to Server"
msgstr "筝��喝ソ��羝����遺失����"
-#: ../libpurple/protocols/gg/gg.c:2032
+#: ../libpurple/protocols/gg/gg.c:2037
msgid "Download buddylist from Server"
msgstr "��失�����莠�絅遵�羝���"
-#: ../libpurple/protocols/gg/gg.c:2036
+#: ../libpurple/protocols/gg/gg.c:2041
msgid "Delete buddylist from Server"
msgstr "絨�篌堺�������絅遵�羝�������"
-#: ../libpurple/protocols/gg/gg.c:2040
+#: ../libpurple/protocols/gg/gg.c:2045
msgid "Save buddylist to file..."
msgstr "�峨�絅遵�羝����井�罅�筝�..."
-#: ../libpurple/protocols/gg/gg.c:2044
+#: ../libpurple/protocols/gg/gg.c:2049
msgid "Load buddylist from file..."
msgstr "���罅�莅���絅遵�羝���..."
@@ -3549,16 +4077,16 @@
#. id
#. name
#. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: ../libpurple/protocols/gg/gg.c:2153
msgid "Gadu-Gadu Protocol Plugin"
msgstr "Gadu-Gadu ��絎�罔∞�"
#. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: ../libpurple/protocols/gg/gg.c:2154
msgid "Polish popular IM"
msgstr "羈∵�㊤撮��罩∴����恰����荐�腮�綣�"
-#: ../libpurple/protocols/gg/gg.c:2203
+#: ../libpurple/protocols/gg/gg.c:2208
msgid "Gadu-Gadu User"
msgstr "Gadu-Gadu 篏睡����"
@@ -3615,7 +4143,8 @@
msgstr "%s �����ヨ���"
#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
+#: ../libpurple/protocols/myspace/myspace.c:2350
msgid "Server has disconnected"
msgstr "篌堺����群��罩∫�ｇ�"
@@ -3629,7 +4158,7 @@
msgstr "�脂��(_C)鐚�"
#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
msgid "_Password:"
msgstr "絲�腆�(_P)鐚�"
@@ -3637,71 +4166,64 @@
msgid "IRC nicks may not contain whitespace"
msgstr "IRC �援┗筝�������腥榊�遵���"
+#. 1. connect to server
#. connect to the server
#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/jabber/jabber.c:1276
#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/myspace/myspace.c:301
#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/oscar/oscar.c:1285
#: ../libpurple/protocols/qq/qq.c:136
#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/simple/simple.c:1677
+#: ../libpurple/protocols/yahoo/yahoo.c:2936
#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
msgid "Connecting"
msgstr "�ｇ�筝�"
# XXX ��⑮
#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: ../libpurple/protocols/jabber/jabber.c:611
+#: ../libpurple/protocols/jabber/jabber.c:1096
msgid "SSL support unavailable"
msgstr "羃��� SSL ���"
+#. TODO: try other ports if in auto mode, then save
+#. * working port and try that first next time.
#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/myspace/myspace.c:317
#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1592
msgid "Couldn't create socket"
msgstr "���綮榊� Socket"
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: ../libpurple/protocols/irc/irc.c:421
+#: ../libpurple/protocols/myspace/myspace.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:1281
msgid "Couldn't connect to host"
msgstr "�≧��ｅ�遺失����"
-# FIXME ambiguous - 20061025
-# NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
-# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-# XXX ��罩ｇ����������≧��ｇ��活�茘���������腴��羣���鐚�筝������ｇ�紊掩����鐚�荀�筝�����腴�鐚�
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
-msgid "Connection Failed"
-msgstr "�≧��ｇ��活�茘���������腴��羣�"
-
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
-msgid "SSL Handshake Failed"
-msgstr "SSL 篋よ�紊掩��"
-
# NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��ｆ�丈�沿タ
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
+#: ../libpurple/protocols/myspace/myspace.c:2346
msgid "Read error"
msgstr "莅������"
-#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/irc/irc.c:773
#: ../libpurple/protocols/silc/chat.c:1412
#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: ../libpurple/protocols/yahoo/yahoochat.c:1497
msgid "Users"
msgstr "篏睡����"
-#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/irc/irc.c:776
#: ../libpurple/protocols/sametime/sametime.c:3374
#: ../libpurple/protocols/silc/chat.c:1415
#: ../libpurple/protocols/silc/ops.c:1389
#: ../libpurple/protocols/silc10/chat.c:1429
#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: ../libpurple/protocols/yahoo/yahoochat.c:1506
msgid "Topic"
msgstr "筝脂�"
@@ -3713,34 +4235,34 @@
#. *< id
#. *< name
#. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:914
msgid "IRC Protocol Plugin"
msgstr "IRC ��絎�罔∞�"
#. * summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: ../libpurple/protocols/irc/irc.c:915
msgid "The IRC Protocol Plugin that Sucks Less"
msgstr "莠�絅順�� IRC ��絎�罔∞�"
#. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6650
-#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:6655
+#: ../libpurple/protocols/qq/qq.c:755
#: ../libpurple/protocols/sametime/sametime.c:5727
#: ../libpurple/protocols/silc/ops.c:1249
#: ../libpurple/protocols/silc/ops.c:1341
#: ../libpurple/protocols/silc10/ops.c:1244
#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/simple/simple.c:1856
#: ../libpurple/protocols/toc/toc.c:2327
msgid "Server"
msgstr "篌堺����"
#. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6653
-#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2187
+#: ../libpurple/protocols/oscar/oscar.c:6658
+#: ../libpurple/protocols/qq/qq.c:758
#: ../libpurple/protocols/sametime/sametime.c:5732
#: ../libpurple/protocols/silc/silc.c:1918
#: ../libpurple/protocols/silc10/silc.c:1861
@@ -3748,12 +4270,13 @@
msgid "Port"
msgstr "��荐���"
-#: ../libpurple/protocols/irc/irc.c:948
+#: ../libpurple/protocols/irc/irc.c:946
msgid "Encodings"
msgstr "膩�⊆"
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:905
+#: ../libpurple/protocols/jabber/jabber.c:908
#: ../libpurple/protocols/silc/buddy.c:1539
#: ../libpurple/protocols/silc/ops.c:1197
#: ../libpurple/protocols/silc/ops.c:1200
@@ -3769,7 +4292,7 @@
msgid "Username"
msgstr "篏睡����"
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
#: ../libpurple/protocols/silc/silc.c:1009
#: ../libpurple/protocols/silc10/silc.c:920
msgid "Real name"
@@ -3779,7 +4302,7 @@
#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
#.
-#: ../libpurple/protocols/irc/irc.c:962
+#: ../libpurple/protocols/irc/irc.c:960
msgid "Use SSL"
msgstr "篏睡�� SSL"
@@ -3813,7 +4336,7 @@
msgstr " <i>(綏臥�茘�)</i>"
#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/oscar/oscar.c:3693
#: ../libpurple/protocols/silc/ops.c:1418
#: ../libpurple/protocols/silc10/ops.c:1414
msgid "Nick"
@@ -4093,7 +4616,7 @@
msgstr "names [�脂��]鐚����榊�������脂��筝㊦��篏睡����羝�����"
#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: ../libpurple/protocols/jabber/jabber.c:2254
msgid "nick <new nickname>: Change your nickname."
msgstr "nick <�井�援┗>鐚��壕������援┗��"
@@ -4222,6 +4745,22 @@
msgid "Disconnected."
msgstr "��罩∫�ｇ���"
+#: ../libpurple/protocols/jabber/adhoccommands.c:138
+#: ../libpurple/protocols/jabber/jabber.c:672
+#: ../libpurple/protocols/jabber/jabber.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1883
+msgid "Unknown Error"
+msgstr "���ラ���"
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:141
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/adhoccommands.c:174
+msgid "execute"
+msgstr ""
+
#: ../libpurple/protocols/jabber/auth.c:52
msgid "Server requires TLS/SSL for login. No TLS/SSL support found."
msgstr "�糸�ラ����篌堺������荀�篏睡�� TLS/SSL鐚�篏��鞘��� TLS/SSL ��叵��"
@@ -4230,248 +4769,520 @@
msgid "Server requires plaintext authentication over an unencrypted stream"
msgstr "篌堺������荀�膓��掩�����絲���筝我��画�����茯�茘�"
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: ../libpurple/protocols/jabber/auth.c:317
+#: ../libpurple/protocols/jabber/auth.c:506
#, c-format
msgid ""
"%s requires plaintext authentication over an unencrypted connection. Allow "
"this and continue authentication?"
msgstr "%s ��荀�膓��掩�����絲���筝我��画�����茯�茘�����荐延研膵主��画�茯�茘�鐚�"
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: ../libpurple/protocols/jabber/auth.c:319
+#: ../libpurple/protocols/jabber/auth.c:320
+#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:509
+#: ../libpurple/protocols/jabber/auth.c:593
+#: ../libpurple/protocols/jabber/auth.c:594
msgid "Plaintext Authentication"
msgstr "����茯�茘�"
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: ../libpurple/protocols/jabber/auth.c:332
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:605
msgid "Server does not use any supported authentication method"
msgstr "篌堺����研筝���箴�篁私�筝�腮�←��吡��茯�茘��劫�"
#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: ../libpurple/protocols/jabber/auth.c:460
+#: ../libpurple/protocols/jabber/auth.c:556
+#: ../libpurple/protocols/jabber/auth.c:771
+#: ../libpurple/protocols/jabber/auth.c:912
+#: ../libpurple/protocols/jabber/auth.c:937
+#: ../libpurple/protocols/jabber/auth.c:956
+#: ../libpurple/protocols/jabber/jabber.c:125
msgid "Invalid response from server."
msgstr "篌堺������箴�篋��≧����������"
-#: ../libpurple/protocols/jabber/auth.c:572
+#: ../libpurple/protocols/jabber/auth.c:595
msgid ""
"This server requires plaintext authentication over an unencrypted "
"connection. Allow this and continue authentication?"
msgstr "篌堺������荀�膓��掩�����絲���筝我��画�����茯�茘�����荐延研膵主��画�茯�茘�鐚�"
# XXX 絅遵���鋋����茘�����緇��拷��
-#: ../libpurple/protocols/jabber/auth.c:769
#: ../libpurple/protocols/jabber/auth.c:792
+#: ../libpurple/protocols/jabber/auth.c:815
msgid "Invalid challenge from server"
msgstr "篌堺������箴�篋��≧����薊�茘�����"
# NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��ｆ�丈�沿タ
-#: ../libpurple/protocols/jabber/auth.c:864
+#: ../libpurple/protocols/jabber/auth.c:887
msgid "SASL error"
msgstr "SASL ���"
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:1219
#: ../libpurple/protocols/sametime/sametime.c:4128
#: ../libpurple/protocols/silc/ops.c:986
#: ../libpurple/protocols/silc10/ops.c:1020
msgid "Full Name"
msgstr "����"
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:1231
#: ../libpurple/protocols/silc/ops.c:998
#: ../libpurple/protocols/silc10/ops.c:1032
msgid "Family Name"
msgstr "紮�"
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:1234
msgid "Given Name"
msgstr "��"
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/jabber.c:978
msgid "URL"
msgstr "URL"
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:1282
msgid "Street Address"
msgstr "茵����医��"
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:1279
msgid "Extended Address"
msgstr "�医��(膾�)"
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: ../libpurple/protocols/jabber/buddy.c:290
+#: ../libpurple/protocols/jabber/buddy.c:1285
msgid "Locality"
msgstr "絽�鐚��"
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: ../libpurple/protocols/jabber/buddy.c:291
+#: ../libpurple/protocols/jabber/buddy.c:1288
msgid "Region"
msgstr "���鎴�"
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: ../libpurple/protocols/jabber/buddy.c:292
+#: ../libpurple/protocols/jabber/buddy.c:1291
msgid "Postal Code"
msgstr "�級������"
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:293
+#: ../libpurple/protocols/jabber/buddy.c:1295
#: ../libpurple/protocols/silc/silc.c:1015
#: ../libpurple/protocols/silc10/silc.c:926
msgid "Country"
msgstr "��絎�"
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:294
+#: ../libpurple/protocols/jabber/buddy.c:1306
+#: ../libpurple/protocols/jabber/buddy.c:1313
msgid "Telephone"
msgstr "�肢�"
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
-msgid "E-Mail"
-msgstr "�糸��灸散"
-
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: ../libpurple/protocols/jabber/buddy.c:296
+#: ../libpurple/protocols/jabber/buddy.c:1350
msgid "Organization Name"
msgstr "��絮��罕�"
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: ../libpurple/protocols/jabber/buddy.c:297
+#: ../libpurple/protocols/jabber/buddy.c:1353
msgid "Organization Unit"
msgstr "��絮�����"
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: ../libpurple/protocols/jabber/buddy.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1362
msgid "Role"
msgstr "�決岡"
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: ../libpurple/protocols/jabber/buddy.c:300
+#: ../libpurple/protocols/jabber/buddy.c:1250
+#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/oscar/oscar.c:3742
msgid "Birthday"
msgstr "����"
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../libpurple/protocols/jabber/buddy.c:301
+#: ../libpurple/protocols/jabber/buddy.c:1365
+#: ../libpurple/protocols/jabber/chat.c:775
+#: ../libpurple/protocols/jabber/usermood.c:176 ../pidgin/gtkblist.c:3113
#: ../pidgin/gtkprefs.c:738
msgid "Description"
msgstr "�颷�"
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:722
+#: ../libpurple/protocols/jabber/buddy.c:723
msgid "Edit XMPP vCard"
msgstr "膩�鹿 XMPP vCard"
-#: ../libpurple/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:724
msgid ""
"All items below are optional. Enter only the information with which you feel "
"comfortable."
msgstr "篁ヤ�������罨�篏��醇���御���х������Ű�莠後�ユ���活叱�ユ���喝゛�ョ��荐����喝���"
# NOTE��Client������荅俄戎����篏睡���ｄ��������句���荐����綣��箴�鐚�gaim鐚�
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:795
+#: ../libpurple/protocols/jabber/buddy.c:960
msgid "Client"
msgstr "���句�"
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: ../libpurple/protocols/jabber/buddy.c:799
+#: ../libpurple/protocols/jabber/buddy.c:964
msgid "Operating System"
msgstr "篏�罐㊦鎧腟�"
+#: ../libpurple/protocols/jabber/buddy.c:815
+#: ../libpurple/protocols/jabber/buddy.c:975
+msgid "Last Activity"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:817
+#: ../libpurple/protocols/jabber/buddy.c:977
+msgid "Service Discovery Info"
+msgstr "�����√�莖�荐�"
+
+#: ../libpurple/protocols/jabber/buddy.c:819
+#: ../libpurple/protocols/jabber/buddy.c:979
+msgid "Service Discovery Items"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:981
+#, fuzzy
+msgid "Extended Stanza Addressing"
+msgstr "�医��(膾�)"
+
+#: ../libpurple/protocols/jabber/buddy.c:823
+#: ../libpurple/protocols/jabber/buddy.c:983
+msgid "Multi-User Chat"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/jabber/buddy.c:985
+#, fuzzy
+msgid "Multi-User Chat Extended Presence Information"
+msgstr "����篏睡����羃���篁����檎��莖�荐���"
+
+# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
+#: ../libpurple/protocols/jabber/buddy.c:827
+#: ../libpurple/protocols/jabber/buddy.c:987
+msgid "In-Band Bytestreams"
+msgstr "絽九�т���腟�筝我�"
+
+#: ../libpurple/protocols/jabber/buddy.c:829
+#: ../libpurple/protocols/jabber/buddy.c:989
+#, fuzzy
+msgid "Ad-Hoc Commands"
+msgstr "��篁�"
+
+#: ../libpurple/protocols/jabber/buddy.c:831
+#: ../libpurple/protocols/jabber/buddy.c:991
+msgid "PubSub Service"
+msgstr "PubSub ����"
+
+#: ../libpurple/protocols/jabber/buddy.c:833
+#: ../libpurple/protocols/jabber/buddy.c:993
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5 篏���腟�筝我�"
+
+#: ../libpurple/protocols/jabber/buddy.c:835
+#: ../libpurple/protocols/jabber/buddy.c:995
+msgid "Out of Band Data"
+msgstr "絽九��御��"
+
+# NOTE Untranslated
+#: ../libpurple/protocols/jabber/buddy.c:837
+#: ../libpurple/protocols/jabber/buddy.c:997
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+#: ../libpurple/protocols/jabber/buddy.c:839
+#: ../libpurple/protocols/jabber/buddy.c:999
+#, fuzzy
+msgid "In-Band Registration"
+msgstr "荐糸�����"
+
+#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:1001
+msgid "User Location"
+msgstr "篏睡���������臀�"
+
+#: ../libpurple/protocols/jabber/buddy.c:843
+#: ../libpurple/protocols/jabber/buddy.c:1003
+msgid "User Avatar"
+msgstr "篏睡������荳�"
+
+#: ../libpurple/protocols/jabber/buddy.c:845
+#: ../libpurple/protocols/jabber/buddy.c:1005
+#, fuzzy
+msgid "Chat State Notifications"
+msgstr "絅遵���������"
+
+# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-version/>
+# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
+#: ../libpurple/protocols/jabber/buddy.c:847
+#: ../libpurple/protocols/jabber/buddy.c:1007
+msgid "Software Version"
+msgstr "荵�蕭�����"
+
+#: ../libpurple/protocols/jabber/buddy.c:849
+#: ../libpurple/protocols/jabber/buddy.c:1009
+msgid "Stream Initiation"
+msgstr "��紮�筝我�"
+
+#: ../libpurple/protocols/jabber/buddy.c:851
+#: ../libpurple/protocols/jabber/buddy.c:1011
+#: ../libpurple/protocols/sametime/sametime.c:3235
+msgid "File Transfer"
+msgstr "罟�罅��活叱"
+
+#: ../libpurple/protocols/jabber/buddy.c:853
+#: ../libpurple/protocols/jabber/buddy.c:1013
+msgid "User Mood"
+msgstr "篏睡������膩�"
+
+# XXX may be wrong
+#: ../libpurple/protocols/jabber/buddy.c:855
+#: ../libpurple/protocols/jabber/buddy.c:1015
+#, fuzzy
+msgid "User Activity"
+msgstr "篏睡�����悟�����"
+
+#: ../libpurple/protocols/jabber/buddy.c:857
+#: ../libpurple/protocols/jabber/buddy.c:1017
+#, fuzzy
+msgid "Entity Capabilities"
+msgstr "�後���"
+
+# FIXME ���巡�筝�絨� - acli 20070913
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/jabber/buddy.c:1019
+msgid "Encrypted Session Negotiations"
+msgstr "��絲�綏ヤ��������"
+
+#: ../libpurple/protocols/jabber/buddy.c:861
+#: ../libpurple/protocols/jabber/buddy.c:1021
+#, fuzzy
+msgid "User Tune"
+msgstr "篏睡����"
+
+#: ../libpurple/protocols/jabber/buddy.c:863
+#: ../libpurple/protocols/jabber/buddy.c:1023
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "荀�篋ゆ�絲��遺��恰��荐���"
+
+#: ../libpurple/protocols/jabber/buddy.c:865
+#: ../libpurple/protocols/jabber/buddy.c:1025
+#, fuzzy
+msgid "Reachability Address"
+msgstr "�糸��灸散"
+
+#: ../libpurple/protocols/jabber/buddy.c:867
+#: ../libpurple/protocols/jabber/buddy.c:1027
+msgid "User Profile"
+msgstr "篏睡����莖���"
+
+#: ../libpurple/protocols/jabber/buddy.c:869
+#: ../libpurple/protocols/jabber/buddy.c:1029
+msgid "Jingle"
+msgstr "Jingle"
+
+#: ../libpurple/protocols/jabber/buddy.c:871
+#: ../libpurple/protocols/jabber/buddy.c:1031
+msgid "Jingle Audio"
+msgstr "Jingle �活�"
+
+#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:1033
+msgid "User Nickname"
+msgstr "篏睡�����援┗"
+
+#: ../libpurple/protocols/jabber/buddy.c:875
+#: ../libpurple/protocols/jabber/buddy.c:1035
+msgid "Jingle ICE UDP"
+msgstr "Jingle ICE UDP"
+
+#: ../libpurple/protocols/jabber/buddy.c:877
+#: ../libpurple/protocols/jabber/buddy.c:1037
+msgid "Jingle ICE TCP"
+msgstr "Jingle ICE TCP"
+
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:1039
+msgid "Jingle Raw UDP"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:881
+#: ../libpurple/protocols/jabber/buddy.c:1041
+msgid "Jingle Video"
+msgstr "Jingle 荀�荐�"
+
+#: ../libpurple/protocols/jabber/buddy.c:883
+#: ../libpurple/protocols/jabber/buddy.c:1043
+msgid "Jingle DTMF"
+msgstr "Jingle DTMF"
+
+#: ../libpurple/protocols/jabber/buddy.c:885
+#: ../libpurple/protocols/jabber/buddy.c:1045
+msgid "Message Receipts"
+msgstr "�九�亥��荐���"
+
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:1047
+msgid "Public Key Publishing"
+msgstr "�寂�����"
+
+# NOTE Jabber �医���処���
+#: ../libpurple/protocols/jabber/buddy.c:889
+#: ../libpurple/protocols/jabber/buddy.c:1049
+msgid "User Chatting"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:1051
+msgid "User Browsing"
+msgstr "篏睡�����頳�"
+
+# NOTE Jabber �医���処���
+#: ../libpurple/protocols/jabber/buddy.c:893
+#: ../libpurple/protocols/jabber/buddy.c:1053
+msgid "User Gaming"
+msgstr ""
+
+# NOTE Jabber �医���処���
+#: ../libpurple/protocols/jabber/buddy.c:895
+#: ../libpurple/protocols/jabber/buddy.c:1055
+msgid "User Viewing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:897
+#: ../libpurple/protocols/jabber/buddy.c:1057
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
+msgid "Ping"
+msgstr "Ping"
+
+#: ../libpurple/protocols/jabber/buddy.c:899
+#: ../libpurple/protocols/jabber/buddy.c:1059
+#, fuzzy
+msgid "Stanza Encryption"
+msgstr "Trillian ��絲�"
+
+#: ../libpurple/protocols/jabber/buddy.c:901
+#: ../libpurple/protocols/jabber/buddy.c:1061
+msgid "Entity Time"
+msgstr ""
+
+# XXX ��⑮- acli 20070913
+#: ../libpurple/protocols/jabber/buddy.c:903
+#: ../libpurple/protocols/jabber/buddy.c:1063
+msgid "Delayed Delivery"
+msgstr "綮狗�臥����"
+
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:1065
+msgid "Collaborative Data Objects"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:907
+#: ../libpurple/protocols/jabber/buddy.c:1067
+msgid "File Repository and Sharing"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:909
+#: ../libpurple/protocols/jabber/buddy.c:1069
+msgid "STUN Service Discovery for Jingle"
+msgstr "Jingle ���� STUN �����究謙"
+
+# FIXME ���巡�筝�絨�
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/jabber/buddy.c:1071
+msgid "Simplified Encrypted Session Negotiation"
+msgstr "膂≦����絲�綏ヤ��������"
+
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1073
+msgid "Hop Check"
+msgstr ""
+
+#: ../libpurple/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:1081
+#: ../libpurple/protocols/oscar/oscar.c:2899
+msgid "Capabilities"
+msgstr "�後���"
+
# TODO Untranslated
# NOTE 茘������� by Ambrose
# NOTE Jabber ��絎�����Resource��筝�荅���絽娯���筝�腮�戎���������絖�筝駕�
# NOTE ��札茵�ず������井�劫�����糸�ヤ�����綵≫�鐚�������絲����臀�
# NOTE 荀� http://www.jabber.org/user/userguide.html
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: ../libpurple/protocols/jabber/buddy.c:933
+#: ../libpurple/protocols/jabber/libxmpp.c:205
+#: ../libpurple/protocols/jabber/si.c:859
msgid "Resource"
msgstr ""
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../libpurple/protocols/jabber/jabber.c:1243
-#: ../libpurple/protocols/jabber/jabber.c:1253
-#: ../libpurple/protocols/jabber/jabber.c:1263
-#: ../libpurple/protocols/jabber/jabber.c:1273
-#: ../libpurple/protocols/jabber/jabber.c:1283
+#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/jabber.c:1527
+#: ../libpurple/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1596
+#: ../libpurple/protocols/jabber/jabber.c:1619
msgid "Priority"
msgstr "����罨≦�"
# NOTE: 羈���緇傑����茘���膃��������鐚����㊥��茘����銀�����鐚��ユ���活⑮篋�篋�
# NOTE: ��恐筝�綛冗���亥�ｅぇ絖後����掩���ュ����鐚��上����箙�莊����㊥��PO罟�������羈��後��
-#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/jabber/buddy.c:1237
#: ../libpurple/protocols/silc/ops.c:994
#: ../libpurple/protocols/silc10/ops.c:1028
msgid "Middle Name"
msgstr "�掩���ュ��"
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
+#: ../libpurple/protocols/jabber/buddy.c:1270
+#: ../libpurple/protocols/jabber/jabber.c:953
+#: ../libpurple/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/oscar/oscar.c:3794
#: ../libpurple/protocols/qq/buddy_info.c:56
#: ../libpurple/protocols/silc/ops.c:1030
#: ../libpurple/protocols/silc10/ops.c:1064
msgid "Address"
msgstr "�医��"
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: ../libpurple/protocols/jabber/buddy.c:1276
msgid "P.O. Box"
msgstr "�究�推拭膊�"
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
msgid "Photo"
msgstr "�х��"
# NOTE 荀� http://www.jabber.org/jeps/jep-0054.html
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: ../libpurple/protocols/jabber/buddy.c:1386
msgid "Logo"
msgstr "罔�茯�"
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: ../libpurple/protocols/jabber/buddy.c:1940
msgid "Un-hide From"
msgstr "�乗昆腟�"
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: ../libpurple/protocols/jabber/buddy.c:1944
msgid "Temporarily Hide From"
msgstr "�����沿昆��"
#. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/jabber/buddy.c:1952
msgid "Cancel Presence Notification"
msgstr "��羔�筝�膩���������"
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1959
msgid "(Re-)Request authorization"
msgstr "荀�羆������域�羆�茯�茘�"
@@ -4480,43 +5291,51 @@
#. if(NOT ME)
#. shouldn't this just happen automatically when the buddy is
#. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: ../libpurple/protocols/jabber/buddy.c:1968
msgid "Unsubscribe"
msgstr "緇�絅遵�����賢腱脂��"
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/buddy.c:1983
+msgid "Log In"
+msgstr "�糸��"
+
+#: ../libpurple/protocols/jabber/buddy.c:1987
+msgid "Log Out"
+msgstr "�糸��"
+
+#: ../libpurple/protocols/jabber/buddy.c:2033
+#: ../libpurple/protocols/jabber/jabber.c:1549
msgid "Chatty"
msgstr "�活��紊�"
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: ../libpurple/protocols/jabber/buddy.c:2037
msgid "Extended Away"
msgstr "�傑�����∫��"
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/jabber/buddy.c:2039
+#: ../libpurple/protocols/jabber/jabber.c:1618
+#: ../libpurple/protocols/oscar/oscar.c:726
+#: ../libpurple/protocols/oscar/oscar.c:5792
#: ../libpurple/protocols/sametime/sametime.c:3297
msgid "Do Not Disturb"
msgstr "茫��炊����"
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: ../libpurple/protocols/jabber/buddy.c:2184
msgid "JID"
msgstr "JID"
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/jabber/buddy.c:2188
+#: ../libpurple/protocols/jabber/buddy.c:2367
+#: ../libpurple/protocols/oscar/oscar.c:3704
msgid "Last Name"
msgstr "紮�"
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:2220
msgid "The following are the results of your search"
msgstr "篁ヤ��堺��絨�腟���"
#. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: ../libpurple/protocols/jabber/buddy.c:2295
msgid ""
"Find a contact by entering the search criteria in the given fields. Note: "
"Each field supports wild card searches (%)"
@@ -4524,44 +5343,44 @@
"茫��������篏�紂����絨�罌�篁駈�篁ヤ梢��絨��恰�丞����機篋冴��羈��������罨�篏�����吂札�����"
"�� (%) ��絨�"
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: ../libpurple/protocols/jabber/buddy.c:2315
msgid "Directory Query Failed"
msgstr "�ヨ�����篌堺����け��"
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: ../libpurple/protocols/jabber/buddy.c:2316
msgid "Could not query the directory server."
msgstr "�≧��ヨ�����篌堺����"
#. Try to translate the message (see static message
#. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:2350
#, c-format
msgid "Server Instructions: %s"
msgstr "篌堺������篁わ�%s"
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:2357
msgid "Fill in one or more fields to search for any matching XMPP users."
msgstr "紂��ヤ�����紊���罨�篏�鐚�篁ユ��絨�XMPP篏睡������"
-#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/jabber/buddy.c:2377
#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3728
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: ../libpurple/protocols/oscar/oscar.c:3707
+#: ../libpurple/protocols/oscar/oscar.c:3716
msgid "E-Mail Address"
msgstr "�糸��灸散"
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:2386
+#: ../libpurple/protocols/jabber/buddy.c:2387
msgid "Search for XMPP users"
msgstr "��絨�XMPP篏睡����"
#. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/jabber/buddy.c:2388
#: ../libpurple/protocols/qq/group.c:123
#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/qq/sys_msg.c:268
#: ../libpurple/protocols/sametime/sametime.c:5611
#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
@@ -4569,25 +5388,25 @@
msgstr "��絨�"
# NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��ｆ�丈�沿タ
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: ../libpurple/protocols/jabber/buddy.c:2403
msgid "Invalid Directory"
msgstr "�≧������"
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: ../libpurple/protocols/jabber/buddy.c:2420
msgid "Enter a User Directory"
msgstr "�峨�ヤ戎����������"
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: ../libpurple/protocols/jabber/buddy.c:2421
msgid "Select a user directory to search"
msgstr "�御��筝���篏睡��������篁ラ�画���絨�"
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: ../libpurple/protocols/jabber/buddy.c:2424
msgid "Search Directory"
msgstr "��絨�����"
#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5273
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: ../libpurple/protocols/oscar/oscar.c:5278
+#: ../libpurple/protocols/yahoo/yahoochat.c:1048
msgid "_Room:"
msgstr "��紊��(_R)鐚�"
@@ -4686,25 +5505,29 @@
msgstr "絨��乗��紊��"
# XXX 茘�����緇��拷��
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: ../libpurple/protocols/jabber/jabber.c:94
msgid "Error initializing session"
msgstr "絨�綏ヤ�����画���紮������主��篋����"
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: ../libpurple/protocols/jabber/jabber.c:146
+msgid "You require encryption, but it is not available on this server."
+msgstr "����絎�綽�����絲�鐚�篏���篌堺���������絲����純��"
+
+#: ../libpurple/protocols/jabber/jabber.c:260
+#: ../libpurple/protocols/jabber/jabber.c:313
+#: ../libpurple/protocols/jabber/jabber.c:341
msgid "Write error"
msgstr "絲��ラ���"
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: ../libpurple/protocols/jabber/jabber.c:409
+#: ../libpurple/protocols/jabber/jabber.c:446
msgid "Read Error"
msgstr "莅������"
-#: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#: ../libpurple/protocols/yahoo/yahoo.c:2381
-#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#: ../libpurple/protocols/jabber/jabber.c:483
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2555
+#: ../libpurple/protocols/yahoo/yahoo.c:2587
#, c-format
msgid ""
"Could not establish a connection with the server:\n"
@@ -4713,55 +5536,70 @@
"�≧���篌堺����産腴��ｇ�:\n"
"%s"
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: ../libpurple/protocols/jabber/jabber.c:530
msgid "Unable to create socket"
msgstr "�≧�綮榊� Socket"
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: ../libpurple/protocols/jabber/jabber.c:576
+#: ../libpurple/protocols/jabber/jabber.c:1064
msgid "Invalid XMPP ID"
msgstr "XMPP 絽活���≧��"
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: ../libpurple/protocols/jabber/jabber.c:581
msgid "Invalid XMPP ID. Domain must be set."
msgstr "XMPP 絽活���≧��鐚����������荐㊤�����"
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: ../libpurple/protocols/jabber/jabber.c:657
#, c-format
msgid "Registration of %s@%s successful"
msgstr "����荐糸�� %s@%s"
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:663
+#, c-format
+msgid "Registration to %s successful"
+msgstr "����荐糸�� %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:666
msgid "Registration Successful"
msgstr "荐糸������"
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
-msgid "Unknown Error"
-msgstr "���ラ���"
-
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:675
msgid "Registration Failed"
msgstr "荐糸��紊掩��"
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: ../libpurple/protocols/jabber/jabber.c:693
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr "����腱脂�� %s ��荐糸��"
+
+#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:696
+msgid "Unregistration Successful"
+msgstr "腱脂�よ┿������"
+
+#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:705
+msgid "Unregistration Failed"
+msgstr "腱脂�よ┿��紊掩��"
+
+#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:866
msgid "Already Registered"
msgstr "綏牙�荐糸��"
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/jabber/jabber.c:963
+#: ../libpurple/protocols/oscar/oscar.c:3783
+#: ../libpurple/protocols/oscar/oscar.c:3796
msgid "State"
msgstr "��鐚鎴�"
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:968
msgid "Postal code"
msgstr "�級������"
-#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/jabber/jabber.c:973
#: ../libpurple/protocols/silc/ops.c:1035
#: ../libpurple/protocols/silc/silc.c:772
#: ../libpurple/protocols/silc/util.c:557
@@ -4771,43 +5609,80 @@
msgid "Phone"
msgstr "�肢�"
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: ../libpurple/protocols/jabber/jabber.c:983
msgid "Date"
msgstr "�ユ��"
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:988
+msgid "Unregister"
+msgstr "腱脂�よ┿��"
+
+#: ../libpurple/protocols/jabber/jabber.c:995
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr "茫�紂��篁ヤ�莖���篁ユ�贋�井����荐糸��莖�����"
+
+#: ../libpurple/protocols/jabber/jabber.c:998
msgid "Please fill out the information below to register your new account."
msgstr "�堺�����医験�区┿��鐚�茫�紂��筝���莖���鐚�"
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1007
msgid "Register New XMPP Account"
msgstr "荐糸���亥�� XMPP 絽恰��"
-#. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1008
+#: ../libpurple/protocols/jabber/jabber.c:1017
msgid "Register"
msgstr "荐糸��"
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: ../libpurple/protocols/jabber/jabber.c:1013
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr "莅��� %s 筝���荐糸��莖�荐�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1014
+#, c-format
+msgid "Register New Account at %s"
+msgstr "荐糸���� %s ���医験��"
+
+#: ../libpurple/protocols/jabber/jabber.c:1017
+msgid "Change Registration"
+msgstr "莅��頑┿��莖�荐�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1122
+msgid "Error unregistering account"
+msgstr "腱脂�ゅ験��荐糸�����"
+
+#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1128
+msgid "Account successfully unregistered"
+msgstr "腱脂�ゅ験��荐糸������"
+
+#: ../libpurple/protocols/jabber/jabber.c:1280
msgid "Initializing Stream"
msgstr "筝我���紮�筝�"
-#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/jabber/jabber.c:1285
+msgid "Initializing SSL/TLS"
+msgstr "SSL/TLS ��紮�筝�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1289
#: ../libpurple/protocols/msn/session.c:351
msgid "Authenticating"
msgstr "茯�茘�筝�"
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: ../libpurple/protocols/jabber/jabber.c:1298
msgid "Re-initializing Stream"
msgstr "筝我����医��紮�筝�"
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: ../libpurple/protocols/jabber/jabber.c:1392
+#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1938
+#: ../libpurple/protocols/oscar/oscar.c:825
+#: ../libpurple/protocols/oscar/oscar.c:5586
msgid "Not Authorized"
msgstr "���茘�"
@@ -4816,91 +5691,198 @@
# NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
# NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
# NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../libpurple/protocols/jabber/jabber.c:1438
msgid "Both"
msgstr "綏俄��梧�茘�"
# NOTE Jabber 茵�茯�鐚�荀���Both��罌�
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1440
msgid "From (To pending)"
msgstr "綏画�茘�絨��刻�篏�篁�膈�緇�絨��壕�茘����"
# FIXME ����筝�荅���奨鐚��号���≧�膺肢⑮
# NOTE gntnotify 絖�臂��冴���寂拭篋冴��
# NOTE Jabber 茵�茯�絖�臂����Both��罌�
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: ../libpurple/protocols/jabber/jabber.c:1442
msgid "From"
msgstr "綏画�茘�絨���"
# NOTE Jabber 茵�茯�鐚�荀���Both��罌�
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: ../libpurple/protocols/jabber/jabber.c:1445
msgid "To"
msgstr "綏牙�峨��壕�茘�"
# NOTE Jabber 茵�茯�鐚�荀���Both��罌�
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: ../libpurple/protocols/jabber/jabber.c:1447
msgid "None (To pending)"
msgstr "�￥�篏�罩ｇ�緇�絨��壕�茘����"
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1449
#: ../pidgin/plugins/gevolution/eds-utils.c:73
#: ../pidgin/plugins/gevolution/eds-utils.c:86
msgid "None"
msgstr "��"
# NOTE Jabber 茵�茯�鐚�荀���Both��罌�
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: ../libpurple/protocols/jabber/jabber.c:1452
msgid "Subscription"
msgstr "茯�茘�����"
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: ../libpurple/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1621
+#: ../libpurple/protocols/jabber/usermood.c:167
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
+msgid "Mood"
+msgstr "綽���"
+
+#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1622
+msgid "Mood Text"
+msgstr "�颷井��膩�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1623
+msgid "Tune Artist"
+msgstr "罔�����腮�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1555
+#: ../libpurple/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1624
+msgid "Tune Title"
+msgstr "罔��峨��腮�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1533
+#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1625
+msgid "Tune Album"
+msgstr "絨�莠���腮�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1580
+#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Tune Genre"
+msgstr "罔��牙┏蕁�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1604
+#: ../libpurple/protocols/jabber/jabber.c:1627
+#, fuzzy
+msgid "Tune Comment"
+msgstr "絅遵�茯���"
+
+# NOTE ��荀� http://www.xmpp.org/extensions/xep-0118.html
+# FIXME
+#: ../libpurple/protocols/jabber/jabber.c:1536
+#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1582
+#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1628
+msgid "Tune Track"
+msgstr "罔��� ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1606
+#: ../libpurple/protocols/jabber/jabber.c:1629
+msgid "Tune Time"
+msgstr "罔��臥�桁墾"
+
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Tune Year"
+msgstr "篏��峨拘篁�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1608
+#: ../libpurple/protocols/jabber/jabber.c:1631
+msgid "Tune URL"
+msgstr "罔��牙恐��"
+
+#: ../libpurple/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1610
+#: ../libpurple/protocols/jabber/jabber.c:1633
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "��荐�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1661
msgid "Password Changed"
msgstr "絲�腆寂信�号����"
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: ../libpurple/protocols/jabber/jabber.c:1662
msgid "Your password has been changed."
msgstr "����篆��剛�����絲�腆若��"
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1667
msgid "Error changing password"
msgstr "篆��劫�腆惹�����榊憥���"
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: ../libpurple/protocols/jabber/jabber.c:1724
msgid "Password (again)"
msgstr "��絲�腆種���罨∞∈茯�鐚�"
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1731
msgid "Change XMPP Password"
msgstr "篆��� XMPP 絲�腆�"
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1731
msgid "Please enter your new password"
msgstr "茫�莠後�ユ�����医�腆�"
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/jabber/jabber.c:1745
+#: ../libpurple/protocols/oscar/oscar.c:6372
#: ../libpurple/protocols/silc/silc.c:1093
#: ../libpurple/protocols/silc10/silc.c:1004
msgid "Set User Info..."
msgstr "荐㊤�篏睡����莖�荐�..."
#. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/oscar/oscar.c:6383
#: ../libpurple/protocols/silc/silc.c:1089
#: ../libpurple/protocols/silc10/silc.c:1000
msgid "Change Password..."
msgstr "篆��劫�腆�..."
#. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: ../libpurple/protocols/jabber/jabber.c:1755
msgid "Search for Users..."
msgstr "��絨�篏睡����..."
# NOTE 荀� http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1841
msgid "Bad Request"
msgstr "�渇��膓峨�����主��篋�筝��������"
@@ -4908,52 +5890,52 @@
# NOTE鐚�紊ф�篆����糸�ョ����篏睡�������絖�筝駕���綏ヤ�����糸�ワ�篁ヨ�雁�≧�絖���
# NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
# NOTE 茘����翫�� by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1843
msgid "Conflict"
msgstr "��腮掩��篏���茵�腦�"
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: ../libpurple/protocols/jabber/jabber.c:1845
msgid "Feature Not Implemented"
msgstr "荅峨���遵����篏�"
# NOTE Jabber ��� <forbidden/>鐚����閫ｅ幻鐚�茵�ず罨���筝�紊�鐚�
# NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1847
msgid "Forbidden"
msgstr "罨���筝�紊�"
# NOTE Jabber ��� <gone/>鐚�茵�ず篏睡������篌堺�����丞�筝�膩�鐚�緇�箴��≫�膩�
# NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1849
msgid "Gone"
msgstr "綏臥�∝�"
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1928
msgid "Internal Server Error"
msgstr "篌堺�����ч�����"
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1853
msgid "Item Not Found"
msgstr "�������上��"
# FIXME 茘����巡�絅遵���騌��� 20070518 acli
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1855
msgid "Malformed XMPP ID"
msgstr "�後���� XMPP 絽活��"
# NOTE Jabber ��� <not-acceptable/>鐚�茵�ず�����榊��荀�羆����初���遺失�������銀散篋堺��荐�筝���
# NOTE 罌�篁駈�箴�絋�荐���賢����胼�絖�鐚�鐚�篁ヨ�雁�≧�絖���
# NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1857
msgid "Not Acceptable"
msgstr "�≧��ュ�"
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1859
msgid "Not Allowed"
msgstr "筝�茴���荐�"
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1863
msgid "Payment Required"
msgstr "綽���篁�罨�"
@@ -4961,78 +5943,78 @@
# NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
# NOTE�������≧���機����荅我���筝�絖���������
# NOTE 茘����翫�� by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1865
msgid "Recipient Unavailable"
msgstr "�����≧���機�ユ�区��"
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1869
msgid "Registration Required"
msgstr "綽���荐糸��"
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1871
msgid "Remote Server Not Found"
msgstr "��腴�失�������上��"
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1873
msgid "Remote Server Timeout"
msgstr "��腴�失�����丈��"
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1875
msgid "Server Overloaded"
msgstr "篌堺�����莠�"
# NOTE Jabber ��� <service-unavailable/>鐚�茵�ず篌堺�����九�遺����靸��������篁�
# NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
# NOTE 茘����翫�� by Ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1877
msgid "Service Unavailable"
msgstr "筝���箴�荅臥������"
# NOTE Jabber ��� <subscription-required/>鐚�茵�ず篏睡������������
# NOTE 綽���篋�����緇���Subscription��鐚�茯�茘�鐚�
# NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1879
msgid "Subscription Required"
msgstr "綽���茯�茘�"
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1881
msgid "Unexpected Request"
msgstr "��������荀�羆�"
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1888
msgid "Authorization Aborted"
msgstr "茯�茘���羔�"
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1890
msgid "Incorrect encoding in authorization"
msgstr "茯�茘��������膩�⊆"
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1893
msgid "Invalid authzid"
msgstr "�≧���� authzid"
# XXX 荀�荀��ヨ⑮��
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1896
msgid "Invalid Authorization Mechanism"
msgstr "�≧����茯�茘�罘���"
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1899
msgid "Authorization mechanism too weak"
msgstr "茯�茘�罘��九お��綣延�"
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1904
msgid "Temporary Authentication Failure"
msgstr "茯�茘�����紊掩��"
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1907
msgid "Authentication Failure"
msgstr "茯�茘�紊掩��"
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1913
msgid "Bad Format"
msgstr "�≧�����弱�"
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1915
msgid "Bad Namespace Prefix"
msgstr "�≧���� Namespace Prefix"
@@ -5042,11 +6024,11 @@
# NOTE 荀� http://www.jabber.org/user/userguide.html
# NOTE Jabber ��絎�筝� Stanza Error ��筝�腮���� <conflict/>
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1918
msgid "Resource Conflict"
msgstr "綏牙�篁ユ��絎��� Resource ���銀��井�合�糸��"
-#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1920
#: ../libpurple/protocols/silc/silc.c:244
#: ../libpurple/protocols/silc10/ops.c:1720
msgid "Connection Timeout"
@@ -5054,170 +6036,191 @@
# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-gone/>
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1922
msgid "Host Gone"
msgstr "篌堺����群筝�����吚��腟����篌堺������腮�"
# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-unknown/>
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1924
msgid "Host Unknown"
msgstr "筝�����篌堺������腮�"
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1926
msgid "Improper Addressing"
msgstr "�����絎���"
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1930
msgid "Invalid ID"
msgstr "絽活���≧��"
# FIXME 綽���荀��ヨ⑮��
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1932
msgid "Invalid Namespace"
msgstr "�遵��腥咲���≧��"
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1934
msgid "Invalid XML"
msgstr "�≧���� XML"
# XXX ������⑮鐚�茘�����緇��拷��
# NOTE Jabber ��絎�筝㊦����nonmatching-hosts��
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1936
msgid "Non-matching Hosts"
msgstr "筝紙���腮延��娯�"
# XXX ������⑮鐚�茘�����緇��拷�蚊��筝���ソ�������鋋咲��罔ｅ�鐚�紊ф�羃���紊�ぇ���馹�
# NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <policy-violation/>
# NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1940
msgid "Policy Violation"
msgstr "����篋������睡�"
# NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1942
msgid "Remote Connection Failed"
msgstr "�≧��ｇ��活�茘���������腴��羣�"
# NOTE Jabber ��絎� Stream Error ��筝�腮���� <resource-constraint/>
# NOTE ����茖�� Resource 鋇�荅����糸�ユ��篏睡���������� Resource 筝�荅��靸�研筝��後��
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1944
msgid "Resource Constraint"
msgstr "篌堺�����羣��㊦失"
# NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <restricted-xml/>
# NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1946
msgid "Restricted XML"
msgstr "XML 筝㊤����� Jabber ��絎�筝�絎壕┗�� XML ��膣�"
# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <see-other-host/>
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1948
msgid "See Other Host"
msgstr "篌堺�������茘�����荀�羆�篋����医����喝Ί�篌堺����"
# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <system-shutdown/>
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1950
msgid "System Shutdown"
msgstr "篌堺������������罘�筝�"
# NOTE 荀� http://www.jabber.org/jeps/jep-0103.html
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1952
msgid "Undefined Condition"
msgstr "�渇��膓峨�����主��篋�筝��������"
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1954
msgid "Unsupported Encoding"
msgstr "篌堺�������吡畿絎���絖���膩�⊆"
# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-stanza-type/>
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1956
msgid "Unsupported Stanza Type"
msgstr "篌堺�������吡畿絎���罧笈�初��� (Stanza Type)"
# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-version/>
# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1958
msgid "Unsupported Version"
msgstr "筝���吡畿絎��� XMPP ����"
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1960
msgid "XML Not Well Formed"
msgstr "XML ��篁倶�弱����馹�"
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1962
msgid "Stream Error"
msgstr "筝我����"
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:2045
#, c-format
msgid "Unable to ban user %s"
msgstr "�≧�胼�罩≫戎���� %s"
# XXX ��⑮��鐚����￥�膈�膣��� - ambrose 20070415
# NOTE: Unknown affiliation �� owner��admin��member��outcast��none 篋�腮�札紊����銀�筝����後��
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:2065
#, c-format
msgid "Unknown affiliation: \"%s\""
msgstr "筝�����膈�膣�鐚���%s��"
# XXX ��⑮ - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: ../libpurple/protocols/jabber/jabber.c:2070
#, c-format
msgid "Unable to affiliate user %s as \"%s\""
msgstr "�≧�絨�篏睡���� %s ��膈�膣�荐㊤��冴��%s��"
# XXX ��⑮ - ambrose 20070415
# NOTE: Unknown role �� moderator��participant��visitor��none ��腮�札紊����銀�筝����後��
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: ../libpurple/protocols/jabber/jabber.c:2089
#, c-format
msgid "Unknown role: \"%s\""
msgstr "筝�����荳�蚕鐚���%s��"
# XXX ��⑮ - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: ../libpurple/protocols/jabber/jabber.c:2094
#, c-format
msgid "Unable to set role \"%s\" for user: %s"
msgstr "�≧�絨�篏睡���� %2$s ��荳�蚕荐㊤��冴��%1$s��"
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: ../libpurple/protocols/jabber/jabber.c:2147
#, c-format
msgid "Unable to kick user %s"
msgstr "�≧�荼√�坂戎���� %s"
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:2178
+#, c-format
+msgid "Unable to ping user %s"
+msgstr "�≧� Ping 篏睡���� %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2200
+#: ../libpurple/protocols/jabber/jabber.c:2210
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2206
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2232
+#, fuzzy, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr "�≧��㊥�冗�恰��鐚����堺���後���罟�罅� (%s) 筝�絖�����"
+
+#: ../libpurple/protocols/jabber/jabber.c:2246
msgid "config: Configure a chat room."
msgstr "config鐚�荐㊤�筝�����紊��"
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:2250
msgid "configure: Configure a chat room."
msgstr "configure鐚�荐㊤�筝�����紊��"
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: ../libpurple/protocols/jabber/jabber.c:2259
msgid "part [room]: Leave the room."
msgstr "part [��紊��]鐚��∫����紊����"
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: ../libpurple/protocols/jabber/jabber.c:2264
msgid "register: Register with a chat room."
msgstr "register鐚����ヤ�����紊��"
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:2270
msgid "topic [new topic]: View or change the topic."
msgstr "topic [�遺源蕁�]鐚�罟∵���篆��壕��紊�源蕁�"
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: ../libpurple/protocols/jabber/jabber.c:2276
msgid "ban <user> [room]: Ban a user from the room."
msgstr "ban <篏睡����> [��紊��]鐚�胼�罩∽��篏睡�����峨�ヨ��紊��"
# XXX ��⑮��鐚����￥�膈�膣��� - ambrose 20070415
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:2282
msgid ""
"affiliate <user> <owner|admin|member|outcast|none>: Set a user's "
"affiliation with the room."
@@ -5226,7 +6229,7 @@
"������紊���х��膈�膣�"
# NOTE 茘����劫�� by ambrose
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:2288
msgid ""
"role <user> <moderator|participant|visitor|none>: Set a user's "
"role in the room."
@@ -5234,23 +6237,32 @@
"role <篏睡����> <moderator|participant|visitor|none>: 荐㊤�篏睡������"
"����紊���х��荳�蚕��"
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:2294
msgid "invite <user> [message]: Invite a user to the room."
msgstr "invite <篏睡����> [荐���]鐚���茫�篏睡�����峨�ヨ��紊��"
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:2300
msgid "join: <room> [server]: Join a chat on this server."
msgstr "join: <��紊��> [篌堺����]鐚����ヤ��守����篌堺������筝�����紊��"
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:2306
msgid "kick <user> [room]: Kick a user from the room."
msgstr "kick <篏睡����> [��紊��]鐚�絨�篏睡����緇���紊��筝㊧権�冴��"
-#: ../libpurple/protocols/jabber/jabber.c:1870
+#: ../libpurple/protocols/jabber/jabber.c:2311
msgid ""
"msg <user> <message>: Send a private message to another user."
msgstr "msg <篏睡����> <荐���>鐚��渇��腱�篋肴���畿�����篏睡����"
+#: ../libpurple/protocols/jabber/jabber.c:2317
+msgid "ping <jid>:\tPing a user/component/server."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/yahoo/yahoo.c:4142
+msgid "buzz: Buzz a user to get their attention"
+msgstr "buzz: 腟�ソ��筝������吟��綣�篁�鐚�絅刻�羈���"
+
#. *< type
#. *< ui_requirement
#. *< flags
@@ -5261,125 +6273,139 @@
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: ../libpurple/protocols/jabber/libxmpp.c:172
+#: ../libpurple/protocols/jabber/libxmpp.c:174
msgid "XMPP Protocol Plugin"
msgstr "XMPP ��絎�罔∞�"
#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: ../libpurple/protocols/jabber/libxmpp.c:201 ../pidgin/gtkaccount.c:506
msgid "Domain"
msgstr "����"
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:209
+msgid "Require SSL/TLS"
+msgstr "��荀� SSL/TLS"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:213
msgid "Force old (port 5223) SSL"
msgstr "綣決辱篏睡����綣� SSL (port 5223)"
# NOTE 茘����翫�� by Ambrose
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: ../libpurple/protocols/jabber/libxmpp.c:218
msgid "Allow plaintext auth over unencrypted streams"
msgstr "��荐延戎������鐚��������絲���筝我�筝��画�茯�茘�"
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/jabber/libxmpp.c:223
+#: ../libpurple/protocols/myspace/myspace.c:3271
+#: ../libpurple/protocols/simple/simple.c:1862
msgid "Connect port"
msgstr "�ｇ���"
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
#. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/jabber/libxmpp.c:227
+#: ../libpurple/protocols/myspace/myspace.c:3268
#: ../libpurple/protocols/silc/silc.c:1914
#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
msgid "Connect server"
msgstr "�ｇ�篌堺����"
-#: ../libpurple/protocols/jabber/message.c:102
+#: ../libpurple/protocols/jabber/message.c:103
#, c-format
msgid "%s has left the conversation."
msgstr "%s 綏牙��∫������篋よ���"
-#: ../libpurple/protocols/jabber/message.c:153
+#: ../libpurple/protocols/jabber/message.c:158
#, c-format
msgid "Message from %s"
msgstr "�� %s �弱�榊��荐���"
-#: ../libpurple/protocols/jabber/message.c:217
+#: ../libpurple/protocols/jabber/message.c:222
#, c-format
msgid "%s has set the topic to: %s"
msgstr "%s ����紊�源蕁�荐㊤��削�%s"
-#: ../libpurple/protocols/jabber/message.c:219
+#: ../libpurple/protocols/jabber/message.c:224
#, c-format
msgid "The topic is: %s"
msgstr "筝脂�鐚�%s"
-#: ../libpurple/protocols/jabber/message.c:267
+#: ../libpurple/protocols/jabber/message.c:272
#, c-format
msgid "Message delivery to %s failed: %s"
msgstr "�≧��渇��荐����� %s鐚�%s"
-#: ../libpurple/protocols/jabber/message.c:270
+#: ../libpurple/protocols/jabber/message.c:275
msgid "XMPP Message Error"
msgstr "XMPP 荐������"
-#: ../libpurple/protocols/jabber/message.c:359
+#: ../libpurple/protocols/jabber/message.c:304
+#: ../libpurple/protocols/yahoo/yahoo.c:4117
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s 綏峨��� [%s] ���ュ�遺�鐚�絅刻���絅遵�羝���"
+
+#: ../libpurple/protocols/jabber/message.c:404
#, c-format
msgid " (Code %s)"
msgstr " (篁ｇ⊆ %s)"
-#: ../libpurple/protocols/jabber/parser.c:193
+#: ../libpurple/protocols/jabber/parser.c:196
msgid "XML Parse error"
msgstr "XML �������"
-#: ../libpurple/protocols/jabber/presence.c:290
+#: ../libpurple/protocols/jabber/presence.c:427
msgid "Unknown Error in presence"
msgstr "筝�����筝�膩��������"
-#: ../libpurple/protocols/jabber/presence.c:364
-#: ../libpurple/protocols/jabber/presence.c:365
+#: ../libpurple/protocols/jabber/presence.c:508
+#: ../libpurple/protocols/jabber/presence.c:509
msgid "Create New Room"
msgstr "綮榊��域��紊��"
-#: ../libpurple/protocols/jabber/presence.c:366
+#: ../libpurple/protocols/jabber/presence.c:510
msgid ""
"You are creating a new room. Would you like to configure it, or accept the "
"default settings?"
msgstr "��③荀�綮榊�筝����亥����紊��鐚����荐㊤�絎�鐚�����戎����荐㊤�種�"
-#: ../libpurple/protocols/jabber/presence.c:372
+#: ../libpurple/protocols/jabber/presence.c:516
msgid "_Configure Room"
msgstr "荐㊤���紊��(_C)"
-#: ../libpurple/protocols/jabber/presence.c:373
+#: ../libpurple/protocols/jabber/presence.c:517
msgid "_Accept Defaults"
msgstr "篏睡����荐㊤��(_A)"
-#: ../libpurple/protocols/jabber/presence.c:409
+#: ../libpurple/protocols/jabber/presence.c:559
#, c-format
msgid "Error in chat %s"
msgstr "��紊�� %s �主�����"
-#: ../libpurple/protocols/jabber/presence.c:412
+#: ../libpurple/protocols/jabber/presence.c:563
#, c-format
msgid "Error joining chat %s"
msgstr "���ヨ��紊�� %s ���主�����"
-#: ../libpurple/protocols/jabber/si.c:769
+#: ../libpurple/protocols/jabber/si.c:775
#, c-format
msgid "Unable to send file to %s, user does not support file transfers"
msgstr "�≧��渇��罟�罅��� %s鐚����阪��剛���吚�罅��活叱"
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: ../libpurple/protocols/jabber/si.c:776
+#: ../libpurple/protocols/jabber/si.c:777
+#: ../libpurple/protocols/jabber/si.c:845
msgid "File Send Failed"
msgstr "�渇��罟�罅�紊掩��"
-#: ../libpurple/protocols/jabber/si.c:832
+#: ../libpurple/protocols/jabber/si.c:838
#, c-format
msgid "Unable to send file to %s, invalid JID"
msgstr "�≧����肴���畿 %s鐚����咲���� JID ���≧����"
-#: ../libpurple/protocols/jabber/si.c:834
+#: ../libpurple/protocols/jabber/si.c:840
#, c-format
msgid "Unable to send file to %s, user is not online"
msgstr "�≧��渇��罟�罅��� %s鐚����阪��合����羃����ｇ�"
@@ -5387,21 +6413,67 @@
# NOTE��not subscribed to user presence������羃�����SUB_TO���� subscription
# FIXME ��緇���¨�����馹���茘���鐚�篏��������� PO 罟��丈����茘��鐚�荀���To��罌�鐚�鐚�
# FIXME 絋�������荀��刻��銀����� presence ��茘���箙�荀�筝�藹��号��茵���-acli 20070614
-#: ../libpurple/protocols/jabber/si.c:836
+#: ../libpurple/protocols/jabber/si.c:842
#, c-format
msgid "Unable to send file to %s, not subscribed to user presence"
msgstr "�≧��渇��罟�罅��� %s鐚����堺���峨��壕�茘�"
# FIXME ��筝����� - acli 20070614
-#: ../libpurple/protocols/jabber/si.c:851
+#: ../libpurple/protocols/jabber/si.c:857
#, c-format
msgid "Please select which resource of %s you would like to send a file to"
msgstr "茫���絎�罟�罅���荅峨�渇���� %s ���ｄ��� Resource"
-#: ../libpurple/protocols/jabber/si.c:867
+#: ../libpurple/protocols/jabber/si.c:873
msgid "Select a Resource"
msgstr "�御��筝��� Resource"
+#: ../libpurple/protocols/jabber/usermood.c:180
+#: ../libpurple/protocols/jabber/usermood.c:181
+msgid "Edit User Mood"
+msgstr "膩�鹿篏睡������膩�"
+
+#: ../libpurple/protocols/jabber/usermood.c:182
+msgid "Please select your mood from the list."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usermood.c:184
+#: ../libpurple/protocols/jabber/usernick.c:79
+msgid "Set"
+msgstr "荐㊤�"
+
+#: ../libpurple/protocols/jabber/usermood.c:192
+msgid "Set Mood..."
+msgstr "荐㊤���膩�..."
+
+# XXX may be wrong
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Set User Nickname"
+msgstr "荐㊤�篏睡�����援┗"
+
+#: ../libpurple/protocols/jabber/usernick.c:77
+msgid "Please specify a new nickname for you."
+msgstr "茫��堺����訓荐㊤��亥���援┗��"
+
+#: ../libpurple/protocols/jabber/usernick.c:78
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+#: ../libpurple/protocols/jabber/usernick.c:100
+msgid "Set Nickname..."
+msgstr "荐㊤��援┗..."
+
+#: ../libpurple/protocols/jabber/xdata.c:378
+msgid "Actions"
+msgstr "��篏�"
+
+# XXX 荀�荀���
+#: ../libpurple/protocols/jabber/xdata.c:380
+msgid "Select an action"
+msgstr "�御��筝�����篏�"
+
# XXX ��⑮
#: ../libpurple/protocols/msn/dialog.c:110
#, c-format
@@ -5625,7 +6697,7 @@
msgstr "篌堺����お綽�腆�"
#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/oscar/oscar.c:1378
#: ../libpurple/protocols/silc/silc.c:233
#: ../libpurple/protocols/silc10/ops.c:1709
#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5665,42 +6737,52 @@
msgid "MSN Error: %s\n"
msgstr "MSN ���鐚�%s\n"
-#: ../libpurple/protocols/msn/msn.c:121
-msgid "You have just sent a Nudge!"
-msgstr "�������坂�筝����弱ǚ�"
-
-#: ../libpurple/protocols/msn/msn.c:146
+#: ../libpurple/protocols/msn/msn.c:130
+msgid "Nudge"
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:131
+#, c-format
+msgid "%s has nudged you!"
+msgstr "%s �弱ŭ���"
+
+#: ../libpurple/protocols/msn/msn.c:132
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:174
msgid "Your new MSN friendly name is too long."
msgstr "������ MSN �援┗紊��激��"
-#: ../libpurple/protocols/msn/msn.c:254
+#: ../libpurple/protocols/msn/msn.c:282
msgid "Set your friendly name."
msgstr "荐㊤������援┗��"
# NOTE MSN���援┗筝���Yahoo鐚�篏睡������札莠後�ヤ算篏����井�援┗鐚�
# NOTE �割戎��篏睡������絽活��罸��♂��篆�鐚�篌寂�箙���������
# XXX ����箴��������菴医��篋�絲�����篏睡�����弱�榊��茫�羆�鐚�馹�
-#: ../libpurple/protocols/msn/msn.c:255
+#: ../libpurple/protocols/msn/msn.c:283
msgid "This is the name that other MSN buddies will see you as."
msgstr "�ヤ査�� MSN �ラ�掩������篋肴�����蕁�ず�����援┗��"
-#: ../libpurple/protocols/msn/msn.c:273
+#: ../libpurple/protocols/msn/msn.c:301
msgid "Set your home phone number."
msgstr "荐㊤�����篏鎘狗�肢���腆若��"
-#: ../libpurple/protocols/msn/msn.c:290
+#: ../libpurple/protocols/msn/msn.c:318
msgid "Set your work phone number."
msgstr "荐㊤�����莨�����肢���腆若��"
-#: ../libpurple/protocols/msn/msn.c:307
+#: ../libpurple/protocols/msn/msn.c:335
msgid "Set your mobile phone number."
msgstr "荐㊤�����茵����肢���腆若��"
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:350
msgid "Allow MSN Mobile pages?"
msgstr "��荐� MSN �喝�種�"
-#: ../libpurple/protocols/msn/msn.c:323
+#: ../libpurple/protocols/msn/msn.c:351
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?"
@@ -5708,321 +6790,323 @@
"��������荐怨����ソ��羝���賢��絅遵��渇�� Mobile Page �井����茵����肢�鐚������銀���茵���"
"茖�臀�����"
-#: ../libpurple/protocols/msn/msn.c:329
+#: ../libpurple/protocols/msn/msn.c:357
msgid "Allow"
msgstr "��荐�"
-#: ../libpurple/protocols/msn/msn.c:330
+#: ../libpurple/protocols/msn/msn.c:358
msgid "Disallow"
msgstr "筝���荐�"
-#: ../libpurple/protocols/msn/msn.c:346
+#: ../libpurple/protocols/msn/msn.c:374
msgid "This Hotmail account may not be active."
msgstr "����Hotmail絽活�����遵���←������"
-#: ../libpurple/protocols/msn/msn.c:372
+#: ../libpurple/protocols/msn/msn.c:400
msgid "Send a mobile message."
msgstr "���肴���荐�����"
-#: ../libpurple/protocols/msn/msn.c:374
+#: ../libpurple/protocols/msn/msn.c:402
msgid "Page"
msgstr "�喝��"
-#: ../libpurple/protocols/msn/msn.c:521
+#: ../libpurple/protocols/msn/msn.c:549
msgid "Has you"
msgstr "篏����鐚�絅刻���絅遵�羝����"
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2895
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3074
+#: ../libpurple/protocols/yahoo/yahoo.c:3758
msgid "Be Right Back"
msgstr "薤����箴�"
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
#: ../libpurple/protocols/novell/novell.c:2822
#: ../libpurple/protocols/novell/novell.c:2952
#: ../libpurple/protocols/silc/buddy.c:1480
#: ../libpurple/protocols/silc/silc.c:56
#: ../libpurple/protocols/silc10/buddy.c:1480
#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2897
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: ../libpurple/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3761
msgid "Busy"
msgstr "綽�腆�"
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: ../libpurple/protocols/msn/msn.c:587
+#: ../libpurple/protocols/yahoo/yahoo.c:3084
+#: ../libpurple/protocols/yahoo/yahoo.c:3773
msgid "On the Phone"
msgstr "�肢�筝�"
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2909
-#: ../libpurple/protocols/yahoo/yahoo.c:3525
+#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
msgid "Out to Lunch"
msgstr "紊��榊���"
-#: ../libpurple/protocols/msn/msn.c:591
+#: ../libpurple/protocols/msn/msn.c:619
msgid "Set Friendly Name..."
msgstr "荐㊤��援┗..."
-#: ../libpurple/protocols/msn/msn.c:596
+#: ../libpurple/protocols/msn/msn.c:624
msgid "Set Home Phone Number..."
msgstr "荐㊤�篏鎘狗�肢���腆�..."
-#: ../libpurple/protocols/msn/msn.c:600
+#: ../libpurple/protocols/msn/msn.c:628
msgid "Set Work Phone Number..."
msgstr "荐㊤�綏ヤ��肢���腆�..."
-#: ../libpurple/protocols/msn/msn.c:604
+#: ../libpurple/protocols/msn/msn.c:632
msgid "Set Mobile Phone Number..."
msgstr "荐㊤�茵����肢���腆�..."
-#: ../libpurple/protocols/msn/msn.c:610
+#: ../libpurple/protocols/msn/msn.c:638
msgid "Enable/Disable Mobile Devices..."
msgstr "���� / ����茵���茖�臀�..."
-#: ../libpurple/protocols/msn/msn.c:615
+#: ../libpurple/protocols/msn/msn.c:643
msgid "Allow/Disallow Mobile Pages..."
msgstr "��荐� / 筝���荐� Mobile Page..."
-#: ../libpurple/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:654
msgid "Open Hotmail Inbox"
msgstr "����Hotmail�銀散��"
-#: ../libpurple/protocols/msn/msn.c:650
+#: ../libpurple/protocols/msn/msn.c:678
msgid "Send to Mobile"
msgstr "�渇���活����肢�"
-#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/msn/msn.c:688
#: ../libpurple/protocols/novell/novell.c:3408
msgid "Initiate _Chat"
msgstr "������紊��(_C)"
# XXX ��⑮
-#: ../libpurple/protocols/msn/msn.c:698
+#: ../libpurple/protocols/msn/msn.c:726
msgid "SSL support is needed for MSN. Please install a supported SSL library."
msgstr "MSN ��荀� SSL 腮�綣鎺�����呃�茫�絎�茖�筝�������吡�� SSL 腮�綣鎺���"
-#: ../libpurple/protocols/msn/msn.c:723
+#: ../libpurple/protocols/msn/msn.c:751
msgid "Failed to connect to server."
msgstr "�≧��ｇ��遺失������"
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1507 ../libpurple/protocols/msn/msn.c:1855
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
msgid "Error retrieving profile"
msgstr "��緇���篋肴�荐����主�����"
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1578 ../pidgin/plugins/convcolors.c:309
#: ../pidgin/plugins/pidginrc.c:366
msgid "General"
msgstr "筝���"
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3769
+#: ../libpurple/protocols/msn/msn.c:1585
+#: ../libpurple/protocols/myspace/user.c:110
+#: ../libpurple/protocols/oscar/oscar.c:3748
#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
msgid "Age"
msgstr "綛顔宗"
-#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/msn/msn.c:1587
#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
msgid "Occupation"
msgstr "�傑キ"
-#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/myspace/user.c:119
#: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
#: ../libpurple/protocols/zephyr/zephyr.c:798
#: ../libpurple/protocols/zephyr/zephyr.c:1215
msgid "Location"
msgstr "�����臀�"
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msn/msn.c:1593 ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/msn/msn.c:1791 ../libpurple/protocols/msn/msn.c:1798
msgid "Hobbies and Interests"
msgstr "��絅�/��莇�"
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1599 ../libpurple/protocols/msn/msn.c:1719
+#: ../libpurple/protocols/msn/msn.c:1725 ../libpurple/protocols/msn/msn.c:1732
+#: ../libpurple/protocols/msn/msn.c:1740 ../libpurple/protocols/msn/msn.c:1747
msgid "A Little About Me"
msgstr "����膂＞�"
-#: ../libpurple/protocols/msn/msn.c:1588
+#: ../libpurple/protocols/msn/msn.c:1616
msgid "Social"
msgstr "腓鞘困"
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
msgid "Marital Status"
msgstr "紿�紮紫��羈�"
-#: ../libpurple/protocols/msn/msn.c:1591
+#: ../libpurple/protocols/msn/msn.c:1619
msgid "Interests"
msgstr "��莇�"
-#: ../libpurple/protocols/msn/msn.c:1592
+#: ../libpurple/protocols/msn/msn.c:1620
msgid "Pets"
msgstr "絲窮��"
-#: ../libpurple/protocols/msn/msn.c:1593
+#: ../libpurple/protocols/msn/msn.c:1621
msgid "Hometown"
msgstr "����"
-#: ../libpurple/protocols/msn/msn.c:1594
+#: ../libpurple/protocols/msn/msn.c:1622
msgid "Places Lived"
msgstr "絮�篏�����佀��"
-#: ../libpurple/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1623
msgid "Fashion"
msgstr "��絨�"
-#: ../libpurple/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1624
msgid "Humor"
msgstr "綛初�"
-#: ../libpurple/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1625
msgid "Music"
msgstr "�恰�"
# NOTE �ユ��po罟���MSN��昆��茘���綺у勌����
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1626 ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
msgid "Favorite Quote"
msgstr "綺у勌��"
-#: ../libpurple/protocols/msn/msn.c:1615
+#: ../libpurple/protocols/msn/msn.c:1643
msgid "Contact Info"
msgstr "��機莖�荐�"
-#: ../libpurple/protocols/msn/msn.c:1616
+#: ../libpurple/protocols/msn/msn.c:1644
msgid "Personal"
msgstr "��篋肴���"
-#: ../libpurple/protocols/msn/msn.c:1619
+#: ../libpurple/protocols/msn/msn.c:1647
msgid "Significant Other"
msgstr "�����"
-#: ../libpurple/protocols/msn/msn.c:1620
+#: ../libpurple/protocols/msn/msn.c:1648
msgid "Home Phone"
msgstr "篏鎘狗�肢�"
-#: ../libpurple/protocols/msn/msn.c:1621
+#: ../libpurple/protocols/msn/msn.c:1649
msgid "Home Phone 2"
msgstr "篏鎘狗�肢�2"
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/oscar/oscar.c:3786
msgid "Home Address"
msgstr "篏鎘九�医��"
-#: ../libpurple/protocols/msn/msn.c:1623
+#: ../libpurple/protocols/msn/msn.c:1651
msgid "Personal Mobile"
msgstr "��篋肴����肢�"
-#: ../libpurple/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1652
msgid "Home Fax"
msgstr "篏鎘九�括��"
-#: ../libpurple/protocols/msn/msn.c:1625
+#: ../libpurple/protocols/msn/msn.c:1653
msgid "Personal E-Mail"
msgstr "��篋咲�糸��灸散"
-#: ../libpurple/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1654
msgid "Personal IM"
msgstr "��篋阪�恰��荐���験��"
-#: ../libpurple/protocols/msn/msn.c:1628
+#: ../libpurple/protocols/msn/msn.c:1656
msgid "Anniversary"
msgstr "�怨拘膣�綽究��"
#. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: ../libpurple/protocols/msn/msn.c:1672
msgid "Work"
msgstr "綏ヤ�莖���"
-#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/msn/msn.c:1674
#: ../libpurple/protocols/silc/ops.c:1010
#: ../libpurple/protocols/silc10/ops.c:1044
msgid "Job Title"
msgstr "�潔��"
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: ../libpurple/protocols/msn/msn.c:1675
+#: ../libpurple/protocols/oscar/oscar.c:3807
msgid "Company"
msgstr "��夔��腮�"
-#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/msn/msn.c:1676
#: ../libpurple/protocols/novell/novell.c:1480
msgid "Department"
msgstr "��絮�����"
-#: ../libpurple/protocols/msn/msn.c:1649
+#: ../libpurple/protocols/msn/msn.c:1677
msgid "Profession"
msgstr "絨�罐�"
-#: ../libpurple/protocols/msn/msn.c:1650
+#: ../libpurple/protocols/msn/msn.c:1678
msgid "Work Phone"
msgstr "�����肢�"
-#: ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1679
msgid "Work Phone 2"
msgstr "�����肢�2"
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: ../libpurple/protocols/msn/msn.c:1680
+#: ../libpurple/protocols/oscar/oscar.c:3799
msgid "Work Address"
msgstr "綏ヤ��医��"
-#: ../libpurple/protocols/msn/msn.c:1653
+#: ../libpurple/protocols/msn/msn.c:1681
msgid "Work Mobile"
msgstr "����茵����肢�"
-#: ../libpurple/protocols/msn/msn.c:1654
+#: ../libpurple/protocols/msn/msn.c:1682
msgid "Work Pager"
msgstr "�����弱û��"
-#: ../libpurple/protocols/msn/msn.c:1655
+#: ../libpurple/protocols/msn/msn.c:1683
msgid "Work Fax"
msgstr "�����括��"
-#: ../libpurple/protocols/msn/msn.c:1656
+#: ../libpurple/protocols/msn/msn.c:1684
msgid "Work E-Mail"
msgstr "�����糸��灸散"
-#: ../libpurple/protocols/msn/msn.c:1657
+#: ../libpurple/protocols/msn/msn.c:1685
msgid "Work IM"
msgstr "�����恰��荐���験��"
-#: ../libpurple/protocols/msn/msn.c:1658
+#: ../libpurple/protocols/msn/msn.c:1686
msgid "Start Date"
msgstr "��紮��ユ��"
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1756 ../libpurple/protocols/msn/msn.c:1762
+#: ../libpurple/protocols/msn/msn.c:1769 ../libpurple/protocols/msn/msn.c:1776
msgid "Favorite Things"
msgstr "����篋���"
-#: ../libpurple/protocols/msn/msn.c:1793
+#: ../libpurple/protocols/msn/msn.c:1821
msgid "Last Updated"
msgstr "�贋�井�ユ��"
-#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msn/msn.c:1832
#: ../libpurple/protocols/qq/buddy_info.c:60
#: ../libpurple/protocols/silc/ops.c:1026
#: ../libpurple/protocols/silc10/ops.c:1060
msgid "Homepage"
msgstr "膓臥��"
-#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msn/msn.c:1856
msgid "The user has not created a public profile."
msgstr "����篏睡��������綮榊���������篋肴�����"
-#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msn/msn.c:1857
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 "
@@ -6031,15 +7115,15 @@
"MSN ���沿��鞘��育����篏睡��������篋肴�������茵�ず����篏睡�������巡�絖����篋������巡戎"
"����絖����篏�羃���綮榊���������篋肴�����"
-#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msn/msn.c:1861
msgid ""
"Could not find any information in the user's profile. The user most likely "
"does not exist."
msgstr ""
"������篏睡��������篋肴���膓臥���鞘��遺算篏�������莖���������篏睡����罐究�����巡研筝�絖�����"
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1869
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
msgid "Profile URL"
msgstr "��篋肴���膓峨��"
@@ -6053,19 +7137,19 @@
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: ../libpurple/protocols/msn/msn.c:2155 ../libpurple/protocols/msn/msn.c:2157
msgid "MSN Protocol Plugin"
msgstr "MSN ��絎�罔∞�"
-#: ../libpurple/protocols/msn/msn.c:2163
+#: ../libpurple/protocols/msn/msn.c:2191
msgid "Use HTTP Method"
msgstr "篏睡�� HTTP �劫�"
-#: ../libpurple/protocols/msn/msn.c:2168
+#: ../libpurple/protocols/msn/msn.c:2196
msgid "Show custom smileys"
msgstr "蕁�ず篏睡������腓�"
-#: ../libpurple/protocols/msn/msn.c:2176
+#: ../libpurple/protocols/msn/msn.c:2204
msgid "nudge: nudge a user to get their attention"
msgstr "nudge鐚��弱ü戎����鐚�綣�莎隙�����羈���"
@@ -6084,8 +7168,8 @@
#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
msgid "Unable to connect"
msgstr "�≧��ｇ�"
@@ -6206,8 +7290,8 @@
msgstr "茹ｆ�� HTTP ��筝㊦�主�������"
#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:205
msgid "You have signed on from another location."
msgstr "���怨�銀����井�合�糸�ャ��"
@@ -6230,10 +7314,11 @@
"Your MSN buddy list is temporarily unavailable. Please wait and try again."
msgstr "�����≧���緇�����絅遵�羝����茫������緇���荅���"
+# See cnscode.org.tw
#: ../libpurple/protocols/msn/session.c:346
#: ../libpurple/protocols/msn/session.c:348
msgid "Handshaking"
-msgstr "篋よ�筝�"
+msgstr "篋ゆ�賢"
#: ../libpurple/protocols/msn/session.c:349
msgid "Starting authentication"
@@ -6300,30 +7385,430 @@
msgid "Message may have not been sent because an unknown error occurred:"
msgstr "���榊�主��筝��������鐚�荐�����醇������削�"
-#: ../libpurple/protocols/msn/switchboard.c:963
-#, c-format
-msgid "%s just sent you a Nudge!"
-msgstr "%s ���弱ŭ���"
-
-#: ../libpurple/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:252
#, c-format
msgid "%s has added you to his or her buddy list."
msgstr "%s 絨������ヤ�鐚�絅刻���絅遵�羝�����"
-#: ../libpurple/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:321
#, c-format
msgid "%s has removed you from his or her buddy list."
msgstr "%s 絨����篁�鐚�絅刻���絅遵�羝���賢腱脂�ゃ��"
-#: ../libpurple/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:643
#, c-format
msgid "Unable to add \"%s\"."
msgstr "�≧��医���%s����"
-#: ../libpurple/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:645
msgid "The screen name specified is invalid."
msgstr "����莠後�ョ��絽活���≧����"
+# XXX ��⑮ - 20061025/20070912
+#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Missing Cipher"
+msgstr "罨�膽咲��荀�����絲��号�"
+
+# XXX ��⑮ - 20061025/20070912
+#: ../libpurple/protocols/myspace/myspace.c:112
+msgid "The RC4 cipher could not be found"
+msgstr "�鞘��� RC4 ��絲��号�"
+
+#: ../libpurple/protocols/myspace/myspace.c:113
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"�≧�莠��� MySpaceIM 罔∞���茫���膣��恰�� RC4 ��吡�� libpurple鐚��� 2.0.1 ���坂札"
+"筝�鐚���"
+
+#: ../libpurple/protocols/myspace/myspace.c:286
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr "MySpace ��筝���吨�傑�� %d ��絖�����絲�腆種�������絲�腆弱群�� %d ��絖����激��"
+
+#. Notify an error message also, because this is important!
+#: ../libpurple/protocols/myspace/myspace.c:292
+#: ../libpurple/protocols/myspace/myspace.c:1795
+msgid "MySpaceIM Error"
+msgstr "MySpaceIM ���"
+
+# NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��ｆ�丈�沿タ
+#: ../libpurple/protocols/myspace/myspace.c:348
+msgid "Reading challenge"
+msgstr "莅���薊�茘����遺賢"
+
+# XXX 絅遵���鋋����茘�����緇��拷��
+#: ../libpurple/protocols/myspace/myspace.c:354
+#, fuzzy
+msgid "Unexpected challenge length from server"
+msgstr "篌堺������箴���薊�茘����井�����鋈�紊����桁墾"
+
+#: ../libpurple/protocols/myspace/myspace.c:358
+msgid "Logging in"
+msgstr "�糸�ヤ賢"
+
+#: ../libpurple/protocols/myspace/myspace.c:1276
+#, c-format
+msgid "Connection to server lost (no data received within %d seconds)"
+msgstr "��篌堺����け�脂�ｇ�鐚�%d 腱��ф�銀��遺算篏��御��鐚�"
+
+#. Can't write _()'d strings in array initializers. Workaround.
+#: ../libpurple/protocols/myspace/myspace.c:1319
+msgid "New mail messages"
+msgstr "���育�灸散"
+
+#: ../libpurple/protocols/myspace/myspace.c:1320
+msgid "New blog comments"
+msgstr "膓画����亥��荐�"
+
+#: ../libpurple/protocols/myspace/myspace.c:1321
+msgid "New profile comments"
+msgstr "��篋肴���膓臥�����亥��荐�"
+
+# FIXME 茘���緇�筝����� - acli 20070913
+#: ../libpurple/protocols/myspace/myspace.c:1322
+msgid "New friend requests!"
+msgstr "���亥��篋ゅ�荀�羆�鐚�"
+
+#: ../libpurple/protocols/myspace/myspace.c:1323
+msgid "New picture comments"
+msgstr "�悟�������亥��荐�"
+
+#: ../libpurple/protocols/myspace/myspace.c:1353
+msgid "MySpace"
+msgstr "MySpace"
+
+# TODO 荀�荀��� - 20061027
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+#: ../libpurple/protocols/myspace/myspace.c:1537
+#: ../libpurple/protocols/sametime/sametime.c:1544
+msgid "Connected"
+msgstr "綏臥�ｇ�"
+
+#: ../libpurple/protocols/myspace/myspace.c:1548
+#: ../libpurple/protocols/myspace/myspace.c:1550
+msgid "No username set"
+msgstr "����荐㊤�篏睡������腮�"
+
+#: ../libpurple/protocols/myspace/myspace.c:1549
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"茫��� http://editprofile.myspace.com/index.cfm?fuseaction=profile.username ��"
+"��筝���篏睡������腮怨�鐚�����荅����亥�糸�ャ��"
+
+#: ../libpurple/protocols/myspace/myspace.c:1776
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "��荐���絎����鐚�篁ｇ⊆ %d鐚�%s"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+#: ../libpurple/protocols/myspace/myspace.c:2000
+msgid "Failed to add buddy"
+msgstr "�≧��医�絅遵�"
+
+#: ../libpurple/protocols/myspace/myspace.c:1966
+msgid "'addbuddy' command failed."
+msgstr "��addbuddy����篁ゅけ����"
+
+#: ../libpurple/protocols/myspace/myspace.c:2000
+#: ../libpurple/protocols/myspace/myspace.c:2241
+msgid "persist command failed"
+msgstr "��persist����篁ゅけ��"
+
+#: ../libpurple/protocols/myspace/myspace.c:2109
+#, c-format
+msgid "No such user: %s"
+msgstr "�≧④篏睡����鐚�%s"
+
+#: ../libpurple/protocols/myspace/myspace.c:2110
+msgid "User lookup"
+msgstr "��絨�篏睡����"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+#: ../libpurple/protocols/myspace/myspace.c:2241
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "Failed to remove buddy"
+msgstr "�≧�腱脂�や戎����"
+
+#: ../libpurple/protocols/myspace/myspace.c:2222
+msgid "'delbuddy' command failed"
+msgstr "��delbuddy����篁ゅけ��"
+
+#: ../libpurple/protocols/myspace/myspace.c:2263
+msgid "blocklist command failed"
+msgstr "��blocklist����篁ゅけ��"
+
+#: ../libpurple/protocols/myspace/myspace.c:2309
+#, fuzzy
+msgid "Invalid input condition"
+msgstr "絎����ｇ�"
+
+#. TODO: g_realloc like msn, yahoo, irc, jabber?
+#: ../libpurple/protocols/myspace/myspace.c:2327
+#: ../libpurple/protocols/myspace/myspace.c:2358
+msgid "Read buffer full"
+msgstr "莅������������羯推�"
+
+#: ../libpurple/protocols/myspace/myspace.c:2396
+msgid "Unparseable message"
+msgstr "�≧�茹ｆ��荐���"
+
+#: ../libpurple/protocols/myspace/myspace.c:2465
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr "�≧��ｅ�遺失�����%s (%d)"
+
+# NOTE ����召腟���腮�
+#: ../libpurple/protocols/myspace/myspace.c:2636
+msgid "IM Friends"
+msgstr "�恰��荐�����絅遵�"
+
+#: ../libpurple/protocols/myspace/myspace.c:2735
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr "緇�篌堺�����医����贋�遺� %d ��絅遵�鐚�����群��ソ��羝������絅遵�鐚�"
+
+#: ../libpurple/protocols/myspace/myspace.c:2736
+msgid "Add contacts from server"
+msgstr "緇�篌堺�������ヨ��機篋�"
+
+#: ../libpurple/protocols/myspace/myspace.c:2788
+#: ../libpurple/protocols/myspace/myspace.c:2853
+msgid "Add friends from MySpace.com"
+msgstr "緇� MySpace.com �医�絅遵�"
+
+#: ../libpurple/protocols/myspace/myspace.c:2789
+msgid "Importing friends failed"
+msgstr "���ュソ��紊掩��"
+
+#. TODO: find out how
+#: ../libpurple/protocols/myspace/myspace.c:2845
+msgid "Find people..."
+msgstr "絨��上ソ��..."
+
+#: ../libpurple/protocols/myspace/myspace.c:2848
+msgid "Change IM name..."
+msgstr "莅��翫�恰����荐���腮�..."
+
+# NOTE ��篌寂����腦�罔�蕁�
+#: ../libpurple/protocols/myspace/myspace.c:3150
+msgid "myim URL handler"
+msgstr "myim 膓峨��������"
+
+#: ../libpurple/protocols/myspace/myspace.c:3151
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr "�≧��上�札�������� myim 膓峨���� MySpaceIM 絽活����"
+
+#: ../libpurple/protocols/myspace/myspace.c:3152
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr "茫����������� MySpaceIM 絽活��緇�����荅���"
+
+#: ../libpurple/protocols/myspace/myspace.c:3275
+msgid "Show display name in status text"
+msgstr "��������蕁�ず�援┗"
+
+#: ../libpurple/protocols/myspace/myspace.c:3278
+msgid "Show headline in status text"
+msgstr "��������蕁�ず罔�蕁�"
+
+#: ../libpurple/protocols/myspace/myspace.c:3283
+msgid "Send emoticons"
+msgstr "�渇��茵�����腓�"
+
+#: ../libpurple/protocols/myspace/myspace.c:3288
+msgid "Screen resolution (dots per inch)"
+msgstr "��綛�茹ｅ�鎺��DPI鐚�"
+
+#: ../libpurple/protocols/myspace/myspace.c:3291
+msgid "Base font size (points)"
+msgstr "�榊�絖�蕭�紊у�(藥�)"
+
+#: ../libpurple/protocols/myspace/user.c:95
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
+msgid "User"
+msgstr "篏睡����"
+
+#. TODO: link to username, if available
+#: ../libpurple/protocols/myspace/user.c:102
+#: ../libpurple/protocols/oscar/oscar.c:2957
+msgid "Profile"
+msgstr "��篋肴���"
+
+#: ../libpurple/protocols/myspace/user.c:124
+msgid "Headline"
+msgstr "�㊥�羔���"
+
+#: ../libpurple/protocols/myspace/user.c:129
+msgid "Song"
+msgstr "罩���"
+
+#: ../libpurple/protocols/myspace/user.c:134
+msgid "Total Friends"
+msgstr "絅遵�膰醇��"
+
+#: ../libpurple/protocols/myspace/user.c:145
+#: ../libpurple/protocols/myspace/user.c:148
+#: ../libpurple/protocols/myspace/user.c:151
+msgid "Client Version"
+msgstr "絎∽�句�����"
+
+#. TODO: icons for each zap
+#: ../libpurple/protocols/myspace/zap.c:44
+#: ../libpurple/protocols/myspace/zap.c:177
+msgid "Zap"
+msgstr "��"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "%s has zapped you!"
+msgstr "%s 綏峨��� [%s] ���ュ�遺�鐚�絅刻���絅遵�羝���"
+
+#: ../libpurple/protocols/myspace/zap.c:44
+#, fuzzy, c-format
+msgid "Zapping %s..."
+msgstr "�弱� %s"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+msgid "Whack"
+msgstr "��"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, fuzzy, c-format
+msgid "%s has whacked you!"
+msgstr "%s 鎴峨��� [%s] ���ュ�遺�鐚�絅刻���絅遵�羝���"
+
+#: ../libpurple/protocols/myspace/zap.c:45
+#, c-format
+msgid "Whacking %s..."
+msgstr "�� %s 筝�..."
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy
+msgid "Torch"
+msgstr "筝脂�"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, fuzzy, c-format
+msgid "%s has torched you!"
+msgstr "荅俄戎������腟�篋���"
+
+#: ../libpurple/protocols/myspace/zap.c:46
+#, c-format
+msgid "Torching %s..."
+msgstr "�� %s 筝�..."
+
+#: ../libpurple/protocols/myspace/zap.c:47
+msgid "Smooch"
+msgstr "荀���"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, fuzzy, c-format
+msgid "%s has smooched you!"
+msgstr "%s 綏牙��糸�ャ��"
+
+#: ../libpurple/protocols/myspace/zap.c:47
+#, c-format
+msgid "Smooching %s..."
+msgstr "荀��� %s 筝�..."
+
+#: ../libpurple/protocols/myspace/zap.c:48
+msgid "Hug"
+msgstr "����"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, fuzzy, c-format
+msgid "%s has hugged you!"
+msgstr "%s 綏牙��糸�ャ��"
+
+#: ../libpurple/protocols/myspace/zap.c:48
+#, c-format
+msgid "Hugging %s..."
+msgstr "���� %s 筝�..."
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy
+msgid "Slap"
+msgstr "���篌�����"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, fuzzy, c-format
+msgid "%s has slapped you!"
+msgstr "%s 綏峨��� [%s] ���ュ�遺�鐚�絅刻���絅遵�羝���"
+
+#: ../libpurple/protocols/myspace/zap.c:49
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:50
+msgid "Goose"
+msgstr "��絮���"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "%s has goosed you!"
+msgstr "%s ��篋�����絮��￥�"
+
+#: ../libpurple/protocols/myspace/zap.c:50
+#, c-format
+msgid "Goosing %s..."
+msgstr "�� %s ��絮��＞賢..."
+
+# TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:51
+msgid "High-five"
+msgstr "High-five"
+
+# TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "%s has high-fived you!"
+msgstr "%s high-five 篋����"
+
+# TODO Untranslated
+#: ../libpurple/protocols/myspace/zap.c:51
+#, c-format
+msgid "High-fiving %s..."
+msgstr "High-five %s 筝�..."
+
+#: ../libpurple/protocols/myspace/zap.c:52
+msgid "Punk"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, fuzzy, c-format
+msgid "%s has punk'd you!"
+msgstr "%s 綏牙��糸�ャ��"
+
+#: ../libpurple/protocols/myspace/zap.c:52
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+msgid "Raspberry"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "%s has raspberried you!"
+msgstr ""
+
+#: ../libpurple/protocols/myspace/zap.c:53
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
#: ../libpurple/protocols/novell/nmuser.c:1864
msgid "Required parameters not passed in"
msgstr "羃�����箴�����������"
@@ -6675,18 +8160,18 @@
msgid "Server port"
msgstr "篌堺������荐���"
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2459
+#: ../libpurple/protocols/oscar/flap_connection.c:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2633
#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
msgid "Server closed the connection."
msgstr "篌堺���������ｇ���"
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/protocols/oscar/flap_connection.c:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2460
+#: ../libpurple/protocols/yahoo/yahoo.c:2627 ../libpurple/proxy.c:592
#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
#, c-format
@@ -6697,7 +8182,7 @@
"��篌堺����������ｇ�腦��銀賢��:\n"
"%s"
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/oscar/flap_connection.c:392
#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
#: ../libpurple/proxy.c:1461
@@ -6735,7 +8220,7 @@
msgstr "ICQ ��絎�罔∞�"
#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/yahoo/yahoo.c:4407
#: ../libpurple/protocols/zephyr/zephyr.c:2997
msgid "Encoding"
msgstr "膩�⊆"
@@ -6765,7 +8250,7 @@
msgid "Direct IM established"
msgstr "�恰��荐���群膓�綮榊�"
-#: ../libpurple/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:656
#, c-format
msgid "File %s is %s, which is larger than the maximum size of %s."
msgstr "罟�罅���%s��紊у��� %s鐚�莇���� %s ����筝�����"
@@ -6871,7 +8356,7 @@
msgid "Not while on AOL"
msgstr "�� AOL ��筝���荐�"
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: ../libpurple/protocols/oscar/oscar.c:347
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 "
@@ -6882,7 +8367,7 @@
"膩�⊆鐚�絋������ラ���ｆ���藝主隈腆種�茫������� AIM/ICQ 絽活�������臥��┃絎���筝㊦����膩�⊆��"
"罨�篏���絎���鐚�"
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: ../libpurple/protocols/oscar/oscar.c:456
#, c-format
msgid ""
"(There was an error receiving this message. Either you and %s have "
@@ -6892,22 +8377,22 @@
"�����馹������句�腮�綣����"
#. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
-#: ../pidgin/gtkutils.c:2389
+#: ../libpurple/protocols/oscar/oscar.c:638 ../pidgin/gtkutils.c:2386
+#: ../pidgin/gtkutils.c:2416
#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
msgid "Buddy Icon"
msgstr "絅遵���腓�"
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: ../libpurple/protocols/oscar/oscar.c:641
msgid "Voice"
msgstr "�臥��"
# NOTE 絨����贋･羔������壕⑮�冴���恰��荐�����
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: ../libpurple/protocols/oscar/oscar.c:644
msgid "AIM Direct IM"
msgstr "AIM 綣�勄��荐���"
-#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/oscar/oscar.c:647
#: ../libpurple/protocols/silc/silc.c:768
#: ../libpurple/protocols/silc/util.c:553
#: ../libpurple/protocols/silc10/silc.c:679
@@ -6915,33 +8400,33 @@
msgid "Chat"
msgstr "��紊�"
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:650
+#: ../libpurple/protocols/oscar/oscar.c:5994
msgid "Get File"
msgstr "�ユ�倶�罅�"
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:657
msgid "Games"
msgstr "����"
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:660
msgid "Add-Ins"
msgstr "罔∞�"
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:663
msgid "Send Buddy List"
msgstr "���阪ソ��羝���"
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:666
msgid "ICQ Direct Connect"
msgstr "ICQ 綣�吚･�ｇ�"
# NOTE ���銀�PO罟���茘�����鐚���AP����荅俄����������綣��
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:669
msgid "AP User"
msgstr "AP 鋎睡����"
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:672
msgid "ICQ RTF"
msgstr "ICQ RTF"
@@ -6952,100 +8437,101 @@
# NOTE (18:17:29) KingAnt: Right...
# NOTE (18:17:36) wing: what does that mean though?
# NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:675
msgid "Nihilist"
msgstr "Nihilist"
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:678
msgid "ICQ Server Relay"
msgstr "ICQ 篌堺�������"
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: ../libpurple/protocols/oscar/oscar.c:681
msgid "Old ICQ UTF8"
msgstr "��綣� ICQ UTF8"
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: ../libpurple/protocols/oscar/oscar.c:684
msgid "Trillian Encryption"
msgstr "Trillian ��絲�"
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: ../libpurple/protocols/oscar/oscar.c:687
msgid "ICQ UTF8"
msgstr "ICQ UTF8"
# NOTE ��篌寂����腮��筝��肢������絖�
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: ../libpurple/protocols/oscar/oscar.c:690
msgid "Hiptop"
msgstr "Hiptop"
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: ../libpurple/protocols/oscar/oscar.c:693
msgid "Security Enabled"
msgstr "��篆�絎�����"
# XXX ��⑮
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: ../libpurple/protocols/oscar/oscar.c:696
msgid "Video Chat"
msgstr "荀����鎀�"
# XXX ��⑮
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: ../libpurple/protocols/oscar/oscar.c:700
msgid "iChat AV"
msgstr "iChat 荀����鎀�"
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: ../libpurple/protocols/oscar/oscar.c:703
msgid "Live Video"
msgstr "����荀�荐�"
# NOTE AIM_CAPS_CAMERA鐚��恰���藝弱��(^^;)
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: ../libpurple/protocols/oscar/oscar.c:706
msgid "Camera"
msgstr "�х�御�"
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5759
+#: ../libpurple/protocols/oscar/oscar.c:724
+#: ../libpurple/protocols/oscar/oscar.c:5764
msgid "Free For Chat"
msgstr "����腥肴��紊�"
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:728
+#: ../libpurple/protocols/oscar/oscar.c:5799
msgid "Not Available"
msgstr "�傑�����∫��"
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: ../libpurple/protocols/oscar/oscar.c:730
+#: ../libpurple/protocols/oscar/oscar.c:5785
msgid "Occupied"
msgstr "綽�腆�"
# NOTE ���� http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: ../libpurple/protocols/oscar/oscar.c:734
msgid "Web Aware"
msgstr "��荐怨�銀�篏睡������恐莊���ョ��������������"
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: ../libpurple/protocols/oscar/oscar.c:736 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/qq/qq.c:288
+#: ../libpurple/protocols/yahoo/yahoo.c:3092 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1059
msgid "Invisible"
msgstr "�沿昆"
-#: ../libpurple/protocols/oscar/oscar.c:739
+#: ../libpurple/protocols/oscar/oscar.c:738
msgid "Online"
msgstr "筝�膩�"
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3721
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
+#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1125
msgid "IP Address"
msgstr "IP 篏���"
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:844
+#: ../libpurple/protocols/oscar/oscar.c:2884
msgid "Warning Level"
msgstr "茘���膈�膣�"
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: ../libpurple/protocols/oscar/oscar.c:854
msgid "Buddy Comment"
msgstr "絅遵�茯���"
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: ../libpurple/protocols/oscar/oscar.c:994
#, c-format
msgid ""
"Could not connect to authentication server:\n"
@@ -7054,7 +8540,7 @@
"�≧��ｇ��活�茘�篌堺�����\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: ../libpurple/protocols/oscar/oscar.c:1002
#, c-format
msgid ""
"Could not connect to BOS server:\n"
@@ -7063,20 +8549,20 @@
"�≧��ｇ��� BOS 篌堺�����\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: ../libpurple/protocols/oscar/oscar.c:1042
msgid "Screen name sent"
msgstr "���阪験��"
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: ../libpurple/protocols/oscar/oscar.c:1047
msgid "Connection established, cookie sent"
msgstr "�ｇ�綏峨産腴�鐚�筝�群���� Cookie"
#. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: ../libpurple/protocols/oscar/oscar.c:1076
msgid "Finalizing connection"
msgstr "絎����ｇ�"
-#: ../libpurple/protocols/oscar/oscar.c:1261
+#: ../libpurple/protocols/oscar/oscar.c:1258
#, c-format
msgid ""
"Unable to login: Could not sign on as %s because the screen name is "
@@ -7086,31 +8572,31 @@
"�≧��糸�ワ��≧�篁� %s 荳�蚕�糸�ワ����咲����絽活�����≧������絽活��綽����堺�����脂�球�医��鐚�"
"����篁ヨ�掩��絖�罸�莎桁�鐚�筝�Û���掩��絖�罸����後���腥榊�緒��������掩�後�腟�����"
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: ../libpurple/protocols/oscar/oscar.c:1343
+#: ../libpurple/protocols/yahoo/yahoo.c:2102
msgid "Invalid screen name."
msgstr "絽活���≧����"
-#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/oscar/oscar.c:1350
#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:2123
msgid "Incorrect password."
msgstr "�����絲�腆若��"
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: ../libpurple/protocols/oscar/oscar.c:1355
msgid "Your account is currently suspended."
msgstr "����絽活����������賢��"
# NOTE�������≧�篏睡������荅我�������筝�絖���������
# NOTE 茘����翫�� by Ambrose
#. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: ../libpurple/protocols/oscar/oscar.c:1359
msgid "The AOL Instant Messenger service is temporarily unavailable."
msgstr "�����≧�篏睡�� AOL �恰��荐���������"
-#: ../libpurple/protocols/oscar/oscar.c:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1375
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."
@@ -7118,44 +8604,44 @@
"�����ｇ�鐚�埇���篏�紊����紫���茫�膈�緇�������緇���茵���荅���絋�������句梗膾���荅�����"
"膩�鐚��ｉ瑳����膈�緇�����絨����翫����綮狗�激��"
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: ../libpurple/protocols/oscar/oscar.c:1369
#, c-format
msgid "The client version you are using is too old. Please upgrade at %s"
msgstr "����篏睡�������句�腮�綣鎀���������茫��� %s �贋��"
-#: ../libpurple/protocols/oscar/oscar.c:1412
+#: ../libpurple/protocols/oscar/oscar.c:1408
msgid "Could Not Connect"
msgstr "�≧��ｇ�"
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: ../libpurple/protocols/oscar/oscar.c:1412
msgid "Received authorization"
msgstr "�九�域�茘�"
-#: ../libpurple/protocols/oscar/oscar.c:1440
+#: ../libpurple/protocols/oscar/oscar.c:1434
msgid "The SecurID key entered is invalid."
msgstr "����莠後�ョ�� SecurID 腆主�≧����"
-#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:1447
msgid "Enter SecurID"
msgstr "茫�莠後�� SecurID"
-#: ../libpurple/protocols/oscar/oscar.c:1455
+#: ../libpurple/protocols/oscar/oscar.c:1448
msgid "Enter the 6 digit number from the digital display."
msgstr "茫�莠後�ユ�悟⊆蕁�ず����蕁�ず���℡��後���"
#. *
#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
#.
-#: ../libpurple/protocols/oscar/oscar.c:1457
-#: ../libpurple/protocols/oscar/oscar.c:2250
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2225
+#: ../libpurple/protocols/oscar/oscar.c:2274
+#: ../libpurple/protocols/oscar/oscar.c:5869
+#: ../libpurple/protocols/oscar/oscar.c:6150 ../libpurple/request.h:1387
msgid "_OK"
msgstr "腆阪�(_O)"
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:1539
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
#, c-format
msgid ""
"You may be disconnected shortly. You may want to use TOC until this is "
@@ -7164,53 +8650,53 @@
"����醇���㊥����筝㊥�潔�ｇ�������醇���喝�������馹�茴�信罩ｅ�篏睡�� TOC��茫��� %s ������"
"羃����贋�違��"
-#: ../libpurple/protocols/oscar/oscar.c:1499
-#: ../libpurple/protocols/oscar/oscar.c:1542
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
msgid "Unable to get a valid AIM login hash."
msgstr "�≧���緇������� AIM �糸�ョ⊆��"
-#: ../libpurple/protocols/oscar/oscar.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:1620
#, c-format
msgid "You may be disconnected shortly. Check %s for updates."
msgstr "����醇���㊥����筝㊥�潔�ｇ���茫��� %s ������羃����贋�違��"
-#: ../libpurple/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1623
msgid "Unable to get a valid login hash."
msgstr "�≧���緇��������糸�ョ⊆��"
-#: ../libpurple/protocols/oscar/oscar.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:1652
msgid "Password sent"
msgstr "絲�腆守����"
-#: ../libpurple/protocols/oscar/oscar.c:1715
+#: ../libpurple/protocols/oscar/oscar.c:1708
msgid "Unable to initialize connection"
msgstr "�≧���紮����ｇ�"
-#: ../libpurple/protocols/oscar/oscar.c:2220
+#: ../libpurple/protocols/oscar/oscar.c:2195
msgid "Please authorize me so I can add you to my buddy list."
msgstr "茫���������茯�茘�荀�羆�鐚�絅処�����札絨������ユ����絅遵�羝���賢��"
-#: ../libpurple/protocols/oscar/oscar.c:2248
+#: ../libpurple/protocols/oscar/oscar.c:2223
msgid "Authorization Request Message:"
msgstr "茯�茘�荀�羆�荐����"
-#: ../libpurple/protocols/oscar/oscar.c:2249
+#: ../libpurple/protocols/oscar/oscar.c:2224
msgid "Please authorize me!"
msgstr "茫���������茯�茘�鐚�"
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/oscar/oscar.c:2265
+#: ../libpurple/protocols/oscar/oscar.c:2273
+#: ../libpurple/protocols/oscar/oscar.c:2400
+#: ../libpurple/protocols/oscar/oscar.c:5247
+#: ../libpurple/protocols/yahoo/yahoo.c:1027
msgid "No reason given."
msgstr "羃���腟��������"
-#: ../libpurple/protocols/oscar/oscar.c:2295
+#: ../libpurple/protocols/oscar/oscar.c:2272
msgid "Authorization Denied Message:"
msgstr "��腟�茯�茘�荐����"
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2400
#, c-format
msgid ""
"The user %u has denied your request to add them to your buddy list for the "
@@ -7220,17 +8706,17 @@
"篏睡���� %u ���坂�������鐚���腟�篋�����九���ュソ��羝�����荀�羆�鐚�\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: ../libpurple/protocols/oscar/oscar.c:2401
msgid "ICQ authorization denied."
msgstr "ICQ 茯�茘���腟���"
#. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: ../libpurple/protocols/oscar/oscar.c:2408
#, c-format
msgid "The user %u has granted your request to add them to your buddy list."
msgstr "篏睡���� %u ���鋋�����九���ュソ��羝�����荀�羆���"
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: ../libpurple/protocols/oscar/oscar.c:2416
#, c-format
msgid ""
"You have received a special message\n"
@@ -7243,7 +8729,7 @@
"箴����%s [%s]\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: ../libpurple/protocols/oscar/oscar.c:2424
#, c-format
msgid ""
"You have received an ICQ page\n"
@@ -7256,7 +8742,7 @@
"箴����%s [%s]\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2455
+#: ../libpurple/protocols/oscar/oscar.c:2432
#, c-format
msgid ""
"You have received an ICQ e-mail from %s [%s]\n"
@@ -7269,38 +8755,38 @@
"荐����削�\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: ../libpurple/protocols/oscar/oscar.c:2453
#, c-format
msgid "ICQ user %u has sent you a buddy: %s (%s)"
msgstr "ICQ 篏睡���� %u ��箴�筝���絅遵�莖�荐�鐚�%s (%s)"
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: ../libpurple/protocols/oscar/oscar.c:2459
msgid "Do you want to add this buddy to your buddy list?"
msgstr "���喝�篁�鐚�絅刻����ュ�井����絅遵�����賢���"
-#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2464 ../pidgin/gtkroomlist.c:308
msgid "_Add"
msgstr "����(_A)"
-#: ../libpurple/protocols/oscar/oscar.c:2488
+#: ../libpurple/protocols/oscar/oscar.c:2465
msgid "_Decline"
msgstr "紿���(_D)"
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: ../libpurple/protocols/oscar/oscar.c:2589
#, c-format
msgid "You missed %hu message from %s because it was invalid."
msgid_plural "You missed %hu messages from %s because they were invalid."
msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪����≧������"
msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪������≧������"
-#: ../libpurple/protocols/oscar/oscar.c:2581
+#: ../libpurple/protocols/oscar/oscar.c:2598
#, c-format
msgid "You missed %hu message from %s because it was too large."
msgid_plural "You missed %hu messages from %s because they were too large."
msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������阪�紊�ぇ篋���"
msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪���紊�ぇ篋���"
-#: ../libpurple/protocols/oscar/oscar.c:2590
+#: ../libpurple/protocols/oscar/oscar.c:2607
#, c-format
msgid ""
"You missed %hu message from %s because the rate limit has been exceeded."
@@ -7310,21 +8796,21 @@
msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������阪����渇������綺�お綽���"
# XXX 莊����㊥������茘��� (Arto) ������鐚��頑⑮�����＜��絅遵�頫�筝���鐚�筝���
-#: ../libpurple/protocols/oscar/oscar.c:2599
+#: ../libpurple/protocols/oscar/oscar.c:2616
#, c-format
msgid "You missed %hu message from %s because he/she was too evil."
msgid_plural "You missed %hu messages from %s because he/she was too evil."
msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������坂�鐚�絅刻�紊����＞���"
msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������坂�鐚�絅刻�紊����＞���"
-#: ../libpurple/protocols/oscar/oscar.c:2608
+#: ../libpurple/protocols/oscar/oscar.c:2625
#, c-format
msgid "You missed %hu message from %s because you are too evil."
msgid_plural "You missed %hu messages from %s because you are too evil."
msgstr[0] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���＞���"
msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐�������堺��お���＞���"
-#: ../libpurple/protocols/oscar/oscar.c:2617
+#: ../libpurple/protocols/oscar/oscar.c:2634
#, c-format
msgid "You missed %hu message from %s for an unknown reason."
msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -7332,63 +8818,55 @@
msgstr[1] "���阪け篋� %hu ���� %s ��箴���荐��������筝�����"
#. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2772
+#: ../libpurple/protocols/oscar/oscar.c:2789
#, c-format
msgid "Unable to send message: %s"
msgstr "�≧����肴����%s"
-#: ../libpurple/protocols/oscar/oscar.c:2772
-#: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2789
+#: ../libpurple/protocols/oscar/oscar.c:2794
+#: ../libpurple/protocols/oscar/oscar.c:2858
msgid "Unknown reason."
msgstr "����筝�����"
-#: ../libpurple/protocols/oscar/oscar.c:2775
+#: ../libpurple/protocols/oscar/oscar.c:2792
#: ../libpurple/protocols/sametime/sametime.c:2409
#, c-format
msgid "Unable to send message to %s:"
msgstr "�≧����肴����� %s鐚�"
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: ../libpurple/protocols/oscar/oscar.c:2858
#, c-format
msgid "User information not available: %s"
msgstr "�≧���緇���篋肴�荐�鐚�%s"
-#: ../libpurple/protocols/oscar/oscar.c:2872
+#: ../libpurple/protocols/oscar/oscar.c:2889
msgid "Online Since"
msgstr "筝�膩���"
# XXX �壕⑮��荐糸���ユ���������莠�����鐚�
-#: ../libpurple/protocols/oscar/oscar.c:2877
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2894
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
msgid "Member Since"
msgstr "���堺���∞������"
-#: ../libpurple/protocols/oscar/oscar.c:2882
-msgid "Capabilities"
-msgstr "�後���"
-
-#: ../libpurple/protocols/oscar/oscar.c:2912
+#: ../libpurple/protocols/oscar/oscar.c:2929
msgid "Available Message"
msgstr "絨���荐���"
-#: ../libpurple/protocols/oscar/oscar.c:2940
-msgid "Profile"
-msgstr "��篋肴���"
-
-#: ../libpurple/protocols/oscar/oscar.c:3020
+#: ../libpurple/protocols/oscar/oscar.c:3037
msgid "Your AIM connection may be lost."
msgstr "���� AIM ���醇�欠�篋���"
# The conversion failed!
#. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3208
+#: ../libpurple/protocols/oscar/oscar.c:3225
msgid ""
"[Unable to display a message from this user because it contained invalid "
"characters.]"
msgstr "���≧�蕁�ず箴�������篏睡������荐�������阪�������≧��絖�������"
-#: ../libpurple/protocols/oscar/oscar.c:3411
+#: ../libpurple/protocols/oscar/oscar.c:3389
msgid ""
"The last action you attempted could not be performed because you are over "
"the rate limit. Please wait 10 seconds and try again."
@@ -7396,114 +8874,110 @@
"����菴�����筝�����篏��≧�絎���鐚����堺��群膓����亥�守��荐���������筝�����茫�膈�緇���腱�緇���"
"荅��罨＜��"
-#: ../libpurple/protocols/oscar/oscar.c:3483
-msgid "You have been signed off for an unknown reason."
-msgstr "�����坂���������糸�冴��"
-
-#: ../libpurple/protocols/oscar/oscar.c:3496
+#: ../libpurple/protocols/oscar/oscar.c:3472
#: ../libpurple/protocols/toc/toc.c:977
#, c-format
msgid "You have been disconnected from chat room %s."
msgstr "��群膓��沿��紊�� %s ��罩∫�ｇ���"
-#: ../libpurple/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/oscar/oscar.c:3722
#: ../libpurple/protocols/silc/util.c:585
#: ../libpurple/protocols/silc10/util.c:581
msgid "Mobile Phone"
msgstr "茵����肢�"
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: ../libpurple/protocols/oscar/oscar.c:3752
msgid "Personal Web Page"
msgstr "��篋榊恐��"
-#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3776
#: ../libpurple/protocols/qq/buddy_info.c:40
msgid "Additional Information"
msgstr "�銀�莖�荐�"
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/oscar/oscar.c:3784
+#: ../libpurple/protocols/oscar/oscar.c:3797
msgid "Zip Code"
msgstr "�級������"
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/oscar/oscar.c:3808
msgid "Division"
msgstr "����"
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3809
msgid "Position"
msgstr "�隙�"
-#: ../libpurple/protocols/oscar/oscar.c:3832
+#: ../libpurple/protocols/oscar/oscar.c:3811
msgid "Web Page"
msgstr "膓臥��"
-#: ../libpurple/protocols/oscar/oscar.c:3835
+#: ../libpurple/protocols/oscar/oscar.c:3814
msgid "Work Information"
msgstr "綏ヤ�莖�荐�"
# XXX �����藝� (��綵≫��榊憟��)鐚� (絅遵���札��茘���荐��������ｅ��??)
-#: ../libpurple/protocols/oscar/oscar.c:3891
+#: ../libpurple/protocols/oscar/oscar.c:3870
msgid "Pop-Up Message"
msgstr "綵��肴���"
# Patch by Kevin Leung
-#: ../libpurple/protocols/oscar/oscar.c:3931
+#: ../libpurple/protocols/oscar/oscar.c:3910
#, c-format
msgid "The following screen name is associated with %s"
msgid_plural "The following screen names are associated with %s"
msgstr[0] "筝����� %s ��絽活��"
msgstr[1] "筝����� %s ��絽活��"
-#: ../libpurple/protocols/oscar/oscar.c:3936
+#: ../libpurple/protocols/oscar/oscar.c:3915
msgid "Screen name"
msgstr "絽活��"
-#: ../libpurple/protocols/oscar/oscar.c:3962
+#: ../libpurple/protocols/oscar/oscar.c:3941
#, c-format
msgid "No results found for e-mail address %s"
msgstr "�鞘��医���糸��灸散�医�� %s �檎����腟���"
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:3962
#, c-format
msgid "You should receive an e-mail asking to confirm %s."
msgstr "����荅我���九�遺�絨�荀�羆�絨� %s �画�茯�茘����糸��灸散��"
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: ../libpurple/protocols/oscar/oscar.c:3964
msgid "Account Confirmation Requested"
msgstr "絽活��腆肴�"
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: ../libpurple/protocols/oscar/oscar.c:3995
msgid "Error Changing Account Info"
msgstr "�贋�劫験��莖�荐����"
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: ../libpurple/protocols/oscar/oscar.c:3998
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
"differs from the original."
msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����肴�羆���絽活����������筝�����"
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4001
#, c-format
msgid "Error 0x%04x: Unable to format screen name because it is invalid."
msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����阪����≧������"
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: ../libpurple/protocols/oscar/oscar.c:4004
#, c-format
msgid ""
"Error 0x%04x: Unable to format screen name because the requested screen name "
"is too long."
msgstr "��� 0x%04x鐚��≧��弱���絽活��鐚����肴�羆���絽活��紊��激��"
-#: ../libpurple/protocols/oscar/oscar.c:4028
+#: ../libpurple/protocols/oscar/oscar.c:4007
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because there is already a "
"request pending for this screen name."
msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲����絽活��絨���荀�羆�膈�緇�������"
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: ../libpurple/protocols/oscar/oscar.c:4010
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7511,37 +8985,37 @@
msgstr ""
"��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医����紊����絽活���∝�����ｃ��"
-#: ../libpurple/protocols/oscar/oscar.c:4034
+#: ../libpurple/protocols/oscar/oscar.c:4013
#, c-format
msgid ""
"Error 0x%04x: Unable to change e-mail address because the given address is "
"invalid."
msgstr "��� 0x%04x鐚��≧��壕��糸��灸散�医��鐚����咲�����糸��灸散�医�����≧������"
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: ../libpurple/protocols/oscar/oscar.c:4016
#, c-format
msgid "Error 0x%04x: Unknown error."
msgstr "��� 0x%04x鐚����ラ�����"
-#: ../libpurple/protocols/oscar/oscar.c:4047
+#: ../libpurple/protocols/oscar/oscar.c:4026
#, c-format
msgid "The e-mail address for %s is %s"
msgstr "%s ���糸��灸散�医���� %s"
-#: ../libpurple/protocols/oscar/oscar.c:4049
+#: ../libpurple/protocols/oscar/oscar.c:4028
msgid "Account Info"
msgstr "絽活��莖�荐�"
-#: ../libpurple/protocols/oscar/oscar.c:4221
+#: ../libpurple/protocols/oscar/oscar.c:4211
msgid ""
"Your IM Image was not sent. You must be Direct Connected to send IM Images."
msgstr "�≧��渇���恰��荐���襲���荀��渇���恰��荐���襲���綽�����絨��合�贋･�ｇ���"
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: ../libpurple/protocols/oscar/oscar.c:4482
msgid "Unable to set AIM profile."
msgstr "�≧�荐㊤� AIM ��篋肴�����"
-#: ../libpurple/protocols/oscar/oscar.c:4488
+#: ../libpurple/protocols/oscar/oscar.c:4483
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 "
@@ -7550,7 +9024,7 @@
"�������糸�ュ�����荀�羆�篆��号������篋肴�荐�鐚���篁ラ��篋�莖�荐�筝���←篆��鴻��茫�������糸�ュ�"
"�����育�画�荐㊤���"
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: ../libpurple/protocols/oscar/oscar.c:4497
#, c-format
msgid ""
"The maximum profile length of %d byte has been exceeded. It has been "
@@ -7561,11 +9035,11 @@
msgstr[0] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝���鐚����潔����綏画←��ｻ��"
msgstr[1] "��篋肴�荐����桁墾莇��坂� %d ��篏���腟���筝���鐚����潔����綏画←��ｻ��"
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: ../libpurple/protocols/oscar/oscar.c:4502
msgid "Profile too long."
msgstr "��篋肴�荐����激��"
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: ../libpurple/protocols/oscar/oscar.c:4547
#, c-format
msgid ""
"The maximum away message length of %d byte has been exceeded. It has been "
@@ -7576,11 +9050,11 @@
msgstr[0] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝���鐚����潔����綏画←��ｻ��"
msgstr[1] "�∫��荐������桁墾莇��坂� %d ��篏���腟���筝���鐚����潔����綏画←��ｻ��"
-#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:4552
msgid "Away message too long."
msgstr "�∫��荐������激��"
-#: ../libpurple/protocols/oscar/oscar.c:4626
+#: ../libpurple/protocols/oscar/oscar.c:4621
#, c-format
msgid ""
"Could not add the buddy %s because the screen name is invalid. Screen names "
@@ -7591,9 +9065,9 @@
"���脂�球�医��鐚�����綽���篁ヨ�掩��絖�罸��咲���㍼������宴���掩��絖�罸��������後�������腥榊�純��"
"��腟���鐚��������篁ャ���後���腟�����"
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#: ../libpurple/protocols/oscar/oscar.c:5051
-#: ../libpurple/protocols/oscar/oscar.c:5066
+#: ../libpurple/protocols/oscar/oscar.c:4623
+#: ../libpurple/protocols/oscar/oscar.c:5056
+#: ../libpurple/protocols/oscar/oscar.c:5071
msgid "Unable To Add"
msgstr "�≧�����"
@@ -7609,16 +9083,15 @@
"AIM 篌堺���������≧����堺����絅遵�羝�����筝�������絅遵�羝���研羃����阪け鐚����遵�札��江"
"��絨��鏅���緇���"
-#: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4938
-#: ../libpurple/protocols/oscar/oscar.c:4943
-#: ../libpurple/protocols/oscar/oscar.c:5120
-#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:4915
+#: ../libpurple/protocols/oscar/oscar.c:4917
+#: ../libpurple/protocols/oscar/oscar.c:5125
#: ../libpurple/protocols/oscar/oscar.c:5126
+#: ../libpurple/protocols/oscar/oscar.c:5131
msgid "Orphans"
msgstr "絖ゅ����"
-#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5054
#, c-format
msgid ""
"Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7627,17 +9100,17 @@
"���堺����絅遵�羈���賢��紊����絅遵�鐚���篁ユ���莨�����ュソ�� %s��茫���Щ�ら��蚕絅遵�緇���"
"荅���"
-#: ../libpurple/protocols/oscar/oscar.c:5049
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: ../libpurple/protocols/oscar/oscar.c:5054
+#: ../libpurple/protocols/oscar/oscar.c:5069
msgid "(no name)"
msgstr "(羃�����絖�)"
-#: ../libpurple/protocols/oscar/oscar.c:5063
+#: ../libpurple/protocols/oscar/oscar.c:5068
#, c-format
msgid "Could not add the buddy %s for an unknown reason."
msgstr "�≧��� %s ���ュソ��羝��������筝�����"
-#: ../libpurple/protocols/oscar/oscar.c:5157
+#: ../libpurple/protocols/oscar/oscar.c:5162
#, c-format
msgid ""
"The user %s has given you permission to add you to their buddy list. Do you "
@@ -7647,23 +9120,23 @@
"���"
# NOTE ����������荐怨�ヤ査�弱�榊��茯�茘�荀�羆�緇�蕁�ず腟�������訓����
-#: ../libpurple/protocols/oscar/oscar.c:5165
+#: ../libpurple/protocols/oscar/oscar.c:5170
msgid "Authorization Given"
msgstr "腟��茯�茘�"
#. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: ../libpurple/protocols/oscar/oscar.c:5243
#, c-format
msgid "The user %s has granted your request to add them to your buddy list."
msgstr "篏睡���� %s ��荐延����篁�鐚�絅刻����ュソ��羝�����荀�羆���"
# NOTE ���������弱�榊��茯�茘�荀�羆�茴���劫��荐掩��蕁�ず��
-#: ../libpurple/protocols/oscar/oscar.c:5239
+#: ../libpurple/protocols/oscar/oscar.c:5244
msgid "Authorization Granted"
msgstr "茯�茘��峨��"
#. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/oscar/oscar.c:5247
#, c-format
msgid ""
"The user %s has denied your request to add them to your buddy list for the "
@@ -7673,32 +9146,32 @@
"篏睡���� %s ���坂�������鐚���腟�篋����篁�鐚�絅刻����ュソ��羝�����荀�羆�鐚�\n"
"%s"
-#: ../libpurple/protocols/oscar/oscar.c:5243
+#: ../libpurple/protocols/oscar/oscar.c:5248
msgid "Authorization Denied"
msgstr "茯�茘�茴���"
# NOTE: ��茖∞��絖�臂���� #gaim �� MrHappy �� deryni ��箴���
# NOTE: KingAnt ��箴���絖�臂���篋�筝���鐚�����筝�篋�����
-#: ../libpurple/protocols/oscar/oscar.c:5279
+#: ../libpurple/protocols/oscar/oscar.c:5284
#: ../libpurple/protocols/toc/toc.c:1371
msgid "_Exchange:"
msgstr "�脂����腆�(_E)鐚�"
-#: ../libpurple/protocols/oscar/oscar.c:5319
+#: ../libpurple/protocols/oscar/oscar.c:5324
msgid "Invalid chat name specified."
msgstr "腟��篋��≧������紊����腮宴��"
-#: ../libpurple/protocols/oscar/oscar.c:5388
+#: ../libpurple/protocols/oscar/oscar.c:5393
msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
msgstr "�≧��渇���恰��荐���襲���AIM ��紊�研筝���吓�恰��荐���襲����勌����"
-#: ../libpurple/protocols/oscar/oscar.c:5548
#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
msgid "Away Message"
msgstr "�∫��荐���"
# XXX 絅遵�鋇�絨�鐚���絅遵�閽��馹�
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: ../libpurple/protocols/oscar/oscar.c:5558
msgid "<i>(retrieving)</i>"
msgstr " <i>(��絨�筝�)</i>"
@@ -7706,90 +9179,90 @@
# NOTE (21:24:59) wing: what is the "iTunes Music Store Link" in the AIM status message?
# NOTE (21:29:48) KingAnt: wing: The AIM protocol allows people to advertise the song their currently listening to as part of their status
# XXX ��篁ラ����荅我�����馹���茘���鐚�篏������割��井��┌�劫�� - ambrose 20070415
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:5758
msgid "iTunes Music Store Link"
msgstr "iTunes Store 膓牙��ｇ�"
-#: ../libpurple/protocols/oscar/oscar.c:5861
+#: ../libpurple/protocols/oscar/oscar.c:5866
#, c-format
msgid "Buddy Comment for %s"
msgstr "%s ��絅遵�茯���"
-#: ../libpurple/protocols/oscar/oscar.c:5862
+#: ../libpurple/protocols/oscar/oscar.c:5867
msgid "Buddy Comment:"
msgstr "絅遵�茯����"
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: ../libpurple/protocols/oscar/oscar.c:5914
#, c-format
msgid "You have selected to open a Direct IM connection with %s."
msgstr "���御��篋��� %s ����筝����贋･�恰��荐�����"
-#: ../libpurple/protocols/oscar/oscar.c:5913
+#: ../libpurple/protocols/oscar/oscar.c:5918
msgid ""
"Because this reveals your IP address, it may be considered a security risk. "
"Do you wish to continue?"
msgstr "��罔ｅ������峨�堺���� IP 篏���鐚���罩ゅ��醇�����援�筝���蘂��������活�膵主����"
-#: ../libpurple/protocols/oscar/oscar.c:5919
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/peer.c:1045
msgid "C_onnect"
msgstr "�ｇ�(_O)"
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: ../libpurple/protocols/oscar/oscar.c:5959
msgid "Get AIM Info"
msgstr "��緇� AIM 莖�荐�"
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: ../libpurple/protocols/oscar/oscar.c:5965
msgid "Edit Buddy Comment"
msgstr "膩�鹿絅遵�茯���"
-#: ../libpurple/protocols/oscar/oscar.c:5968
+#: ../libpurple/protocols/oscar/oscar.c:5973
msgid "Get Status Msg"
msgstr "��緇�����荐���"
# NOTE 絨����贋･羔������壕⑮�冴���恰��荐�����
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: ../libpurple/protocols/oscar/oscar.c:5986
msgid "Direct IM"
msgstr "�恰��荐���"
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:6008
msgid "Re-request Authorization"
msgstr "���域�羆�茯�茘�"
# NOTE Require��寚����荀���鐚�筝�����荀�羆���
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: ../libpurple/protocols/oscar/oscar.c:6067
msgid "Require authorization"
msgstr "��荀�茯�茘�"
-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6070
msgid "Web aware (enabling this will cause you to receive SPAM!)"
msgstr "��荐怨�銀�篏睡������恐莊���ョ��������������鐚���絨��贋���九�医���乗����鐚�"
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: ../libpurple/protocols/oscar/oscar.c:6075
msgid "ICQ Privacy Options"
msgstr "ICQ �援��檎��"
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: ../libpurple/protocols/oscar/oscar.c:6094
msgid "The new formatting is invalid."
msgstr "�亥���弱����≧������"
-#: ../libpurple/protocols/oscar/oscar.c:6090
+#: ../libpurple/protocols/oscar/oscar.c:6095
msgid "Screen name formatting can change only capitalization and whitespace."
msgstr "絽活���弱������醇�壕�紊у�篁ュ�腥榊�純��"
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6148
msgid "Change Address To:"
msgstr "莅��翫�医���削�"
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6194
msgid "<i>you are not waiting for authorization</i>"
msgstr "<i>��研羃������緇�薊�茘�</i>"
-#: ../libpurple/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6197
msgid "You are awaiting authorization from the following buddies"
msgstr "������罩ｅ���緇�筝���絅遵���茯�茘�"
-#: ../libpurple/protocols/oscar/oscar.c:6193
+#: ../libpurple/protocols/oscar/oscar.c:6198
msgid ""
"You can re-request authorization from these buddies by right-clicking on "
"them and selecting \"Re-request Authorization.\""
@@ -7797,74 +9270,74 @@
"���札���域�羆���篋�絅遵���茯�茘�鐚������ソ��羝���賢篁ユ�藜��渇�級���篁���鐚��九��御��"
"��荀�羆����域�茘�����"
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: ../libpurple/protocols/oscar/oscar.c:6215
msgid "Find Buddy by E-Mail"
msgstr "篁ラ�糸��灸散�医��箴��上�絅遵�"
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: ../libpurple/protocols/oscar/oscar.c:6216
msgid "Search for a buddy by e-mail address"
msgstr "篏睡���糸��灸散�医����絨�絅遵�"
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: ../libpurple/protocols/oscar/oscar.c:6217
msgid "Type the e-mail address of the buddy you are searching for."
msgstr "茫�莠後�ュ��合���糸��灸散�医����"
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: ../libpurple/protocols/oscar/oscar.c:6220
msgid "_Search"
msgstr "��絨�(_S)"
-#: ../libpurple/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6378
msgid "Set User Info (URL)..."
msgstr "荐㊤�篏睡����莖�荐� (���嘒��)..."
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: ../libpurple/protocols/oscar/oscar.c:6389
msgid "Change Password (URL)"
msgstr "篆��劫�腆� (���嘒��)"
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: ../libpurple/protocols/oscar/oscar.c:6393
msgid "Configure IM Forwarding (URL)"
msgstr "荐㊤��恰��荐�����莉��� (���嘒��)"
# NOTE 茘����翫�� by Ambrose
#. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6403
msgid "Set Privacy Options..."
msgstr "荐㊤��援��檎��..."
#. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6410
msgid "Confirm Account"
msgstr "腆肴�絽活��"
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6414
msgid "Display Currently Registered E-Mail Address"
msgstr "蕁�ず������荐糸�����糸��灸散篏���"
-#: ../libpurple/protocols/oscar/oscar.c:6413
+#: ../libpurple/protocols/oscar/oscar.c:6418
msgid "Change Currently Registered E-Mail Address..."
msgstr "篆��合������荐糸�����糸��灸散篏���..."
-#: ../libpurple/protocols/oscar/oscar.c:6420
+#: ../libpurple/protocols/oscar/oscar.c:6425
msgid "Show Buddies Awaiting Authorization"
msgstr "蕁�ず膈�緇�茯�茘���絅遵�"
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: ../libpurple/protocols/oscar/oscar.c:6431
msgid "Search for Buddy by E-Mail Address..."
msgstr "篏睡���糸��灸散�医����絨�絅遵�..."
-#: ../libpurple/protocols/oscar/oscar.c:6431
+#: ../libpurple/protocols/oscar/oscar.c:6436
msgid "Search for Buddy by Information"
msgstr "箴��ц�荐�絨��上ソ��"
-#: ../libpurple/protocols/oscar/oscar.c:6499
+#: ../libpurple/protocols/oscar/oscar.c:6504
msgid "Use recent buddies group"
msgstr "篏睡����Recent Buddies��臂ょ�"
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: ../libpurple/protocols/oscar/oscar.c:6507
msgid "Show how long you have been idle"
msgstr "蕁�ず����臀��箙�����"
-#: ../libpurple/protocols/oscar/oscar.c:6657
+#: ../libpurple/protocols/oscar/oscar.c:6662
msgid ""
"Always use ICQ proxy server for file transfers\n"
"(slower, but does not reveal your IP address)"
@@ -7872,26 +9345,26 @@
"��綽�篏睡�� ICQ ��篁ｇ��篌堺������画�罟�罅��活叱\n"
"鐚�莠����篏�筝����顔�我���� IP 篏���鐚�"
-#: ../libpurple/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/peer.c:697
#, c-format
msgid "Asking %s to connect to us at %s:%hu for Direct IM."
msgstr "罩ｅ���羆� %s �ｇ��恰④�� (%s:%hu)鐚�篁ヤ梢綮榊��恰��荐�����"
-#: ../libpurple/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:782
#, c-format
msgid "Attempting to connect to %s:%hu."
msgstr "罩ｅ����荅��ｇ��� %s鐚�%hu��"
-#: ../libpurple/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:856
msgid "Attempting to connect via proxy server."
msgstr "罩ｅ����荅���� Proxy 鋍堺�����ｇ���"
-#: ../libpurple/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1033
#, c-format
msgid "%s has just asked to directly connect to %s"
msgstr "%s ����荀�羆��贋･�ｇ��� %s"
-#: ../libpurple/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1037
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 "
@@ -8086,7 +9559,6 @@
msgstr "����腟�篋� %d ��荀�羆�"
#: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:137
msgid "Input your reason:"
msgstr "茫�莠後�ュ���鐚�"
@@ -8103,39 +9575,33 @@
msgid "Sorry, you are not my type..."
msgstr "絨�筝�莎件�����篏�鐚���筝�箴�������"
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
-msgid "Reject"
-msgstr "��腟�"
-
#: ../libpurple/protocols/qq/buddy_opt.c:277
-msgid "Add buddy with auth request fails"
+msgid "Add buddy with auth request failed"
msgstr "�ｅ��茯�茘�荀�羆����医�絅遵�紊掩��"
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#. TODO: We don't really need to notify the user about this, do we?
+#: ../libpurple/protocols/qq/buddy_opt.c:309
msgid "You have successfully removed a buddy"
msgstr "������腱脂�や�筝���絅遵�"
-#: ../libpurple/protocols/qq/buddy_opt.c:336
-msgid "You have successfully removed yourself from a buddy"
-msgstr "������緇�筝���絅遵���絅遵�羝���賢腱脂�や�����訓"
-
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#. TODO: Does the user really need to be notified about this?
+#: ../libpurple/protocols/qq/buddy_opt.c:338
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr "������緇�絨��合��絅遵�羝���賢腱脂�や�����訓"
+
+#: ../libpurple/protocols/qq/buddy_opt.c:404
#, c-format
msgid "User %d needs authentication"
msgstr "篏睡���� %d ��荀�茯�茘�"
-#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/buddy_opt.c:406
#: ../libpurple/protocols/qq/group_join.c:136
msgid "Input request here"
msgstr "茫�莠後�ヨ�羆�"
# XXX - 20061026
#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/buddy_opt.c:407
#: ../libpurple/protocols/qq/group_join.c:137
msgid "Would you be my friend?"
msgstr "�喝����篋ゅ���������"
@@ -8143,22 +9609,22 @@
#. multiline
#. masked
#. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:408
#: ../libpurple/protocols/qq/group_join.c:138
#: ../libpurple/protocols/qq/group_opt.c:143
msgid "Send"
msgstr "����"
-#: ../libpurple/protocols/qq/buddy_opt.c:416
-#, c-format
-msgid "You have added %d in buddy list"
+#: ../libpurple/protocols/qq/buddy_opt.c:418
+#, c-format
+msgid "You have added %d to buddy list"
msgstr "����絨� %d ���ュソ��羝���"
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: ../libpurple/protocols/qq/buddy_opt.c:515
msgid "QQid Error"
msgstr "QQid ���"
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: ../libpurple/protocols/qq/buddy_opt.c:516
msgid "Invalid QQid"
msgstr "�≧���� QQid"
@@ -8187,7 +9653,7 @@
msgstr "QQ 臂�"
#: ../libpurple/protocols/qq/group.c:120
-msgid "Please input external group ID"
+msgid "Please enter external group ID"
msgstr "茫�莠後�ュ��� Group ID"
# NOTE ��荀� hi.qq.com/intro/mo.shtml?d10.htm
@@ -8197,12 +9663,12 @@
#: ../libpurple/protocols/qq/group_im.c:126
#, c-format
-msgid "User %d applied to join group %d"
+msgid "User %d requested to join group %d"
msgstr "篏睡���� %d 荀�羆����ョ召腟� %d"
#: ../libpurple/protocols/qq/group_im.c:127
#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: ../libpurple/protocols/qq/sys_msg.c:193
#, c-format
msgid "Reason: %s"
msgstr "����鐚�%s"
@@ -8222,37 +9688,37 @@
#: ../libpurple/protocols/qq/group_im.c:141
#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:248
msgid "Approve"
msgstr "��荐�"
#: ../libpurple/protocols/qq/group_im.c:180
#, c-format
-msgid "You request to join group %d has been rejected by admin %d"
-msgstr "膊∞��篋� %d ��腟�篋������ョ召腟� %d"
+msgid "Your request to join group %d has been rejected by admin %d"
+msgstr "膊∞��篋� %2$d ��腟�篋������ョ召腟� %1$d"
#: ../libpurple/protocols/qq/group_im.c:221
#, c-format
-msgid "You request to join group %d has been approved by admin %d"
-msgstr "膊∞��篋� %d ��荐延������ョ召腟� %d"
+msgid "Your request to join group %d has been approved by admin %d"
+msgstr "膊∞��篋� %2$d ��荐延������ョ召腟� %1$d"
#: ../libpurple/protocols/qq/group_im.c:257
#, c-format
-msgid "You [%d] has exit group \"%d\""
+msgid "You [%d] have left group \"%d\""
msgstr "�� [%d] ���坂�臂ょ���%d��"
#: ../libpurple/protocols/qq/group_im.c:291
#, c-format
-msgid "You [%d] has been added by group \"%d\""
-msgstr "臂ょ���%2$d���医�篋��� [%1$d]"
+msgid "You [%d] have been added to group \"%d\""
+msgstr "�� [%d] 綏牙�茴����ョ召腟� \"%d\""
#: ../libpurple/protocols/qq/group_im.c:292
msgid "This group has been added to your buddy list"
msgstr "臂ょ�綏我�医��喝ソ��羝�����"
#: ../libpurple/protocols/qq/group_internal.c:41
-msgid "I am not member"
+msgid "I am not a member"
msgstr "��筝�������"
#: ../libpurple/protocols/qq/group_internal.c:44
@@ -8276,7 +9742,7 @@
msgstr "��臂ょ�筝�絎壕┗紊�篋阪����"
#: ../libpurple/protocols/qq/group_join.c:233
-msgid "You have successfully exited the group"
+msgid "You have successfully left the group"
msgstr "�������∫��臂ょ�"
#: ../libpurple/protocols/qq/group_join.c:257
@@ -8284,16 +9750,16 @@
msgstr "QQ 臂ょ�茯�茘�"
#: ../libpurple/protocols/qq/group_join.c:258
-msgid "Your authorization operation has been accepted by the QQ server"
+msgid "Your authorization request has been accepted by the QQ server"
msgstr "QQ 篌堺����･��篋�����茯�茘�"
#: ../libpurple/protocols/qq/group_join.c:329
-msgid "You inputted a group id outside the acceptable range"
+msgid "You entered a group ID outside the acceptable range"
msgstr "��絎���臂ょ� ID ������膀���箙�紊�"
#: ../libpurple/protocols/qq/group_join.c:360
-msgid "Are you sure to exit this Qun?"
-msgstr "��∈絎�荀��∫������臂� (Qun) ���"
+msgid "Are you sure you want to leave this Qun?"
+msgstr "��∈絎�荀��∫��臂ょ�鐚�"
#: ../libpurple/protocols/qq/group_join.c:362
msgid ""
@@ -8301,10 +9767,6 @@
"this operation will eventually remove this Qun."
msgstr "茫�羈������絋������窮���鐚�����腟���������臂� (Qun) 腱脂�ゃ��"
-#: ../libpurple/protocols/qq/group_join.c:367
-msgid "Go ahead"
-msgstr "腆阪�"
-
#: ../libpurple/protocols/qq/group_network.c:92
#, c-format
msgid "Code [0x%02X]: %s"
@@ -8314,20 +9776,24 @@
msgid "Group Operation Error"
msgstr "臂ょ���篏����"
-#. we wanna see window
+#. we want to see window
#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:88
-msgid "Do you wanna approve the request?"
+#: ../libpurple/protocols/qq/sys_msg.c:87
+msgid "Do you want to approve the request?"
msgstr "��荐演����荀�羆�鐚�"
+#: ../libpurple/protocols/qq/group_opt.c:137
+msgid "Enter your reason:"
+msgstr "茫�莠後�ュ���鐚�"
+
# NOTE QQ��member�����������＜��
#: ../libpurple/protocols/qq/group_opt.c:235
-msgid "You have successfully modify Qun member"
+msgid "You have successfully modified Qun member"
msgstr "�����贋�剛�臂ょ��筝�������"
# FIXME ��⑮ ambrose 20070415
#: ../libpurple/protocols/qq/group_opt.c:305
-msgid "You have successfully modify Qun information"
+msgid "You have successfully modified Qun information"
msgstr "�����贋�剛�臂ょ��莖�荐�"
#: ../libpurple/protocols/qq/group_opt.c:392
@@ -8347,20 +9813,18 @@
msgstr "膤紫輝荐���"
#: ../libpurple/protocols/qq/im.c:576
-msgid "Server ACK"
-msgstr "篌堺��������"
-
-#: ../libpurple/protocols/qq/im.c:576
msgid "Failed to send IM."
msgstr "���阪�恰��荐���け����"
+# NOTE OSCAR ���荐���������� http://aimdoc.sourceforge.net/OSCARdoc/鐚�篏����腴�緇��ｆ�丈�沿タ
#: ../libpurple/protocols/qq/keep_alive.c:87
-msgid "Keep alive error, seems connection lost!"
-msgstr "Keep alive �主�����鐚��ｇ�篌寂�綏牙��銀賢�件�"
+#, fuzzy
+msgid "Keep alive error"
+msgstr "莅������"
#: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Request login token error!"
-msgstr "���糸�ヨ�羆���Token �榊憥���"
+msgid "Error requesting login token"
+msgstr "��緇� Login Token ���"
#: ../libpurple/protocols/qq/login_logout.c:486
msgid "Unable to login, check debug log"
@@ -8386,101 +9850,87 @@
msgid "Unknown-%d"
msgstr "���ワ�篁ｇ⊆ %d鐚�"
-# NOTE ��筝㊦����%s������UDP������TCP��鐚���篁ヨ⑮�����冴��篏������������医����
-#: ../libpurple/protocols/qq/qq.c:209
-#, c-format
-msgid "%s Address"
-msgstr "%s 篏���"
+#: ../libpurple/protocols/qq/qq.c:211
+msgid "TCP Address"
+msgstr "TCP 篏���"
+
+#: ../libpurple/protocols/qq/qq.c:213
+msgid "UDP Address"
+msgstr "UDP 篏���"
# FIXME ������⑮鐚�篏���������莖���筝�鐚���羃���QQ絽恰�駈���荅我��ぇ�贋③腆榊��茘�� - Ambrose 20070414
-#: ../libpurple/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:242
msgid "Level"
msgstr "���潔���"
-#: ../libpurple/protocols/qq/qq.c:278
-msgid "QQ: Available"
-msgstr "QQ: 筝�膩�"
-
-#: ../libpurple/protocols/qq/qq.c:282
-msgid "QQ: Away"
-msgstr "QQ: �∫��"
-
-#: ../libpurple/protocols/qq/qq.c:286
-msgid "QQ: Invisible"
-msgstr "QQ: �沿昆"
-
-#: ../libpurple/protocols/qq/qq.c:290
-msgid "QQ: Offline"
-msgstr "QQ: �∝�"
-
-#: ../libpurple/protocols/qq/qq.c:371
+#: ../libpurple/protocols/qq/qq.c:373
msgid "Invalid name"
msgstr "��腮援�≧��"
# NOTE ��荀� qq.h
-#: ../libpurple/protocols/qq/qq.c:437
+#: ../libpurple/protocols/qq/qq.c:439
#, c-format
msgid "<b>Current Online</b>: %d<br>\n"
msgstr "<b>����筝�膩�絅遵�</b>: %d 篋�<br>\n"
-#: ../libpurple/protocols/qq/qq.c:438
+#: ../libpurple/protocols/qq/qq.c:440
#, c-format
msgid "<b>Last Refresh</b>: %s<br>\n"
msgstr "<b>��菴��贋�井����鐚�</b>%s<br>\n"
-#: ../libpurple/protocols/qq/qq.c:442
+#: ../libpurple/protocols/qq/qq.c:444
#, c-format
msgid "<b>Connection Mode</b>: %s<br>\n"
msgstr "<b>�ｇ�罔≦�</b>鐚�%s<br>\n"
-#: ../libpurple/protocols/qq/qq.c:443
+#: ../libpurple/protocols/qq/qq.c:445
#, c-format
msgid "<b>Server IP</b>: %s: %d<br>\n"
msgstr "<b>篌堺�������鐚�</b>%s鐚�%d<br>\n"
# XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:446
#, c-format
msgid "<b>My Public IP</b>: %s<br>\n"
msgstr "<b>��訓篏���鐚�</b>%s<br>\n"
-#: ../libpurple/protocols/qq/qq.c:449
+#: ../libpurple/protocols/qq/qq.c:451
#, c-format
msgid "<b>Login Time</b>: %s<br>\n"
msgstr "<b>�糸�ユ����鐚�</b>%s<br>\n"
-#: ../libpurple/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:452
#, c-format
msgid "<b>Last Login IP</b>: %s<br>\n"
msgstr "<b>筝�罨∞�糸�ヤ���鐚�</b>%s<br>\n"
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:453
#, c-format
msgid "<b>Last Login Time</b>: %s\n"
msgstr "<b>筝�罨∞�糸�ユ����鐚�</b>%s\n"
# XXX - 20061027
-#: ../libpurple/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:457
msgid "Login Information"
msgstr "�糸�ヨ�荐�"
-#: ../libpurple/protocols/qq/qq.c:531
-msgid "Modify My Information"
-msgstr "篆��壕�荐�"
-
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:533
+msgid "Set My Information"
+msgstr "荐㊤�����莖�荐�"
+
+#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
msgid "Change Password"
msgstr "篆��劫�腆�"
-#: ../libpurple/protocols/qq/qq.c:537
+#: ../libpurple/protocols/qq/qq.c:539
msgid "Show Login Information"
msgstr "蕁�ず�糸�ヨ�荐�"
-#: ../libpurple/protocols/qq/qq.c:558
-msgid "Exit this QQ Qun"
+#: ../libpurple/protocols/qq/qq.c:560
+msgid "Leave this QQ Qun"
msgstr "�∫������ QQ 臂� (Qun)"
-#: ../libpurple/protocols/qq/qq.c:582
+#: ../libpurple/protocols/qq/qq.c:584
msgid "Block this buddy"
msgstr "絨�������絅遵�"
@@ -8494,26 +9944,13 @@
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
msgid "QQ Protocol\tPlugin"
msgstr "QQ ��絎�罔∞�"
-#: ../libpurple/protocols/qq/qq.c:750
-msgid "Login in TCP"
-msgstr "篁� TCP �糸��"
-
-#: ../libpurple/protocols/qq/qq.c:753
-msgid "Login Hidden"
-msgstr "篁ラ�沿������嶃��"
-
-#: ../libpurple/protocols/qq/qq_proxy.c:497
-msgid "Socket send error"
-msgstr "絲��� Socket ��筝㊦�主�����"
-
-# XXX - 20061027
-#: ../libpurple/protocols/qq/qq_proxy.c:500
-msgid "Connection refused"
-msgstr "�ｇ�茴���"
+#: ../libpurple/protocols/qq/qq.c:752
+msgid "Connect using TCP"
+msgstr "篏睡�� TCP �ｇ�"
#: ../libpurple/protocols/qq/recv_core.c:309
msgid "Socket error"
@@ -8542,62 +9979,59 @@
msgid "Connection lost"
msgstr "�ｇ�筝㊥��"
+# FIXME 茘�����緇��拷�� - 20070912 acli
#. cancel login progress
#: ../libpurple/protocols/qq/sendqueue.c:131
msgid "Login failed, no reply"
msgstr "�糸�ュけ��鐚�羃�������"
-#: ../libpurple/protocols/qq/sys_msg.c:112
-msgid "Do you wanna add this buddy?"
-msgstr "���喝�����篏睡�������ュ�井����絅遵�����賢���"
+#: ../libpurple/protocols/qq/sys_msg.c:110
+msgid "Do you want to add this buddy?"
+msgstr "������ラ����篏睡�����医ソ��羝���賢���"
#. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: ../libpurple/protocols/qq/sys_msg.c:166
#, c-format
msgid "You have been added by %s"
msgstr "%s 綏峨������ュ�遺�鐚�絅刻���絅遵�羝���"
-#: ../libpurple/protocols/qq/sys_msg.c:171
-msgid "Would like to add him?"
-msgstr "���喝�篁�鐚�絅刻����ュ�井����絅遵�羝������"
-
-#: ../libpurple/protocols/qq/sys_msg.c:178
-#, c-format
-msgid "%s has added you [%s]"
-msgstr "%s 綏峨��� [%s] ���ュ�遺�鐚�絅刻���絅遵�羝���"
-
-#: ../libpurple/protocols/qq/sys_msg.c:194
+# FIXME fix the original string :P
+#: ../libpurple/protocols/qq/sys_msg.c:169
+#: ../libpurple/protocols/qq/sys_msg.c:263
+msgid "Would you like to add him?"
+msgstr "���絨�篁�鐚�絅刻����ユ����絅遵�羝������"
+
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr "%s 絨��� [%s] ���ヤ�鐚�絅刻���絅遵�羝�����"
+
+#: ../libpurple/protocols/qq/sys_msg.c:192
#, c-format
msgid "User %s rejected your request"
msgstr "篏睡������%s����腟�篋�����荀�羆�"
-#: ../libpurple/protocols/qq/sys_msg.c:214
-#, c-format
-msgid "User %s has approved your request"
-msgstr "篏睡������%s����荐延�����荀�羆�"
-
-#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#: ../libpurple/protocols/qq/sys_msg.c:212
+#, c-format
+msgid "User %s approved your request"
+msgstr "篏睡���� %s ��荐延�����荀�羆�"
+
#. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
-#, c-format
-msgid "%s wanna add you [%s] as friends"
-msgstr "%s �活�絨����%s鐚����ヤ�鐚�絅刻���絅遵�羝���"
-
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: ../libpurple/protocols/qq/sys_msg.c:238
+#, c-format
+msgid "%s wants to add you [%s] as a friend"
+msgstr "%s �活�絨��� [%s] ���ヤ�鐚�絅刻���絅遵�羝���"
+
+#: ../libpurple/protocols/qq/sys_msg.c:239
#, c-format
msgid "Message: %s"
msgstr "荐����%s"
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: ../libpurple/protocols/qq/sys_msg.c:261
#, c-format
msgid "%s is not in your buddy list"
msgstr "%s 筝�������絅遵�羝�����"
-# FIXME fix the original string :P
-#: ../libpurple/protocols/qq/sys_msg.c:266
-msgid "Would you like to add him?"
-msgstr "���絨�篁�鐚�絅刻����ユ����絅遵�羝������"
-
#: ../libpurple/protocols/sametime/sametime.c:417
msgid "Connection closed (writing)"
msgstr "�ｇ�����鐚�絲��ワ�"
@@ -8629,17 +10063,21 @@
msgid "Get Notes Address Book Info"
msgstr "��緇� Notes ��荐���莖�荐�"
+# NOTE 荀�cnscode.org.tw
+# FIXME 茘�����緇��拷��
#: ../libpurple/protocols/sametime/sametime.c:1504
msgid "Sending Handshake"
-msgstr "�渇�� Handshake"
-
+msgstr "�渇��篋ゆ�賢"
+
+# NOTE 荀�cnscode.org.tw
#: ../libpurple/protocols/sametime/sametime.c:1509
msgid "Waiting for Handshake Acknowledgement"
-msgstr "膈�緇� Handshake ����"
-
+msgstr "膈�緇�篋ゆ�����"
+
+# NOTE 荀�cnscode.org.tw
#: ../libpurple/protocols/sametime/sametime.c:1514
msgid "Handshake Acknowledged, Sending Login"
-msgstr "Handshake�九�医����鐚����榊�糸�ヨ�羆�"
+msgstr "�九�遺困�≦����鐚����榊�糸�ヨ�羆�筝�"
#: ../libpurple/protocols/sametime/sametime.c:1519
msgid "Waiting for Login Acknowledgement"
@@ -8647,11 +10085,11 @@
#: ../libpurple/protocols/sametime/sametime.c:1524
msgid "Login Redirected"
-msgstr "���医����糸��"
+msgstr "�糸�ュ群茴����医���"
#: ../libpurple/protocols/sametime/sametime.c:1530
msgid "Forcing Login"
-msgstr "綣決��糸��"
+msgstr "綣決��糸�ヤ賢"
#: ../libpurple/protocols/sametime/sametime.c:1534
msgid "Login Acknowledged"
@@ -8662,11 +10100,6 @@
msgid "Starting Services"
msgstr "��������"
-# TODO 荀�荀��� - 20061027
-#: ../libpurple/protocols/sametime/sametime.c:1544
-msgid "Connected"
-msgstr "綏臥�ｇ�"
-
#: ../libpurple/protocols/sametime/sametime.c:1645
#, c-format
msgid ""
@@ -8723,10 +10156,6 @@
msgid "Video Camera"
msgstr "荀�荐�"
-#: ../libpurple/protocols/sametime/sametime.c:3235
-msgid "File Transfer"
-msgstr "罟�罅��活叱"
-
#: ../libpurple/protocols/sametime/sametime.c:3269
#: ../libpurple/protocols/sametime/sametime.c:4145
msgid "Supports"
@@ -8794,7 +10223,7 @@
msgid "Send TEST Announcement"
msgstr "���堺謙荅�����"
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4274
+#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4338
msgid "Topic:"
msgstr "筝脂�鐚�"
@@ -8821,7 +10250,7 @@
msgid "No Sametime Community Server Specified"
msgstr "����絎� Sametime 腓丞召篌堺����"
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
+#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4038
msgid "Connect"
msgstr "�ｇ�"
@@ -8997,8 +10426,7 @@
"��%s�����醇��筝���篁私�筝���篏睡���������戎����∝����膣�鐚���篁�鐚�絅刻����医��喝ソ��羝�"
"���э�����篁�鐚�絅刻����弱�肴�����"
-#. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
+#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:724
msgid "Search Results"
msgstr "��絨�腟���"
@@ -9437,13 +10865,6 @@
msgid "User Modes"
msgstr "篏睡����罔≦�"
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
-msgid "Mood"
-msgstr "綽���"
-
#: ../libpurple/protocols/silc/buddy.c:1562
#: ../libpurple/protocols/silc/ops.c:1224
#: ../libpurple/protocols/silc10/buddy.c:1562
@@ -9978,7 +11399,7 @@
#: ../libpurple/protocols/silc/ops.c:1326
#: ../libpurple/protocols/silc10/ops.c:1183
#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
msgid "Real Name"
msgstr "紮���"
@@ -10113,13 +11534,6 @@
msgstr "膓画君腟沿�莖���"
#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
-msgid "Ping"
-msgstr "Ping"
-
-#: ../libpurple/protocols/silc/ops.c:1596
#: ../libpurple/protocols/silc10/ops.c:1612
msgid "Ping failed"
msgstr "Ping 紊掩��"
@@ -10273,7 +11687,7 @@
msgstr "��������綽���"
#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1640
msgid "Normal"
msgstr "罩ｅ幻"
@@ -10666,7 +12080,7 @@
msgstr "絎����х恐��膓画君�恰����茘� (SILC) ��絎�"
#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2035
msgid "Network"
msgstr "膓画君"
@@ -10933,26 +12347,26 @@
msgstr "�≧�絲���"
#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1490
msgid "Could not connect"
msgstr "�≧��ｇ�"
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1524
+#: ../libpurple/protocols/simple/simple.c:1566
+#: ../libpurple/protocols/simple/simple.c:1579
+#: ../libpurple/protocols/simple/simple.c:1630
msgid "Could not create listen socket"
msgstr "�≧�綮榊� Socket �ｈ��"
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1547
msgid "Couldn't resolve host"
msgstr "�≧�茹ｆ��筝紙�"
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1638
msgid "Could not resolve hostname"
msgstr "�≧�茹ｆ��筝紙�"
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1655
msgid "SIP screen names may not contain whitespaces or @ symbols"
msgstr "SIP ��絽活��筝�������腥榊�遵�������@��膃���"
@@ -10964,36 +12378,36 @@
#. *< id
#. *< name
#. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1830
msgid "SIP/SIMPLE Protocol Plugin"
msgstr "SIP/SIMPLE ��荐���絎�罔∞�"
#. * summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1831
msgid "The SIP/SIMPLE Protocol Plugin"
msgstr "SIP/SIMPLE ��荐���絎�罔∞�"
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1859
msgid "Publish status (note: everyone may watch you)"
msgstr "���紫����鐚�茫�羈����篁私�篋咲�処�順���井���"
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1865
msgid "Use UDP"
msgstr "篏睡�� UDP"
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1867
msgid "Use proxy"
msgstr "篏睡�� Proxy"
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1869
msgid "Proxy"
msgstr "篁ｇ��篌堺����"
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1871
msgid "Auth User"
msgstr "茯�茘�篏睡����"
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1873
msgid "Auth Domain"
msgstr "茯�茘�����"
@@ -11157,8 +12571,8 @@
msgid "Password Change Successful"
msgstr "絲�腆寂信�号����"
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
-#: ../pidgin/gtkblist.c:5873
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5576
+#: ../pidgin/gtkblist.c:5929
msgid "_Group:"
msgstr "臂ょ�(_G)鐚�"
@@ -11218,33 +12632,27 @@
msgid "TOC Protocol Plugin"
msgstr "TOC ��絎�罔∞�"
+#: ../libpurple/protocols/yahoo/yahoo.c:782
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s ��箴�篋�筝���荀����鎀�����茫�鐚�篏�������羃���荀����鎀�����叵��"
+
# NOTE 茘����翫�� by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: ../libpurple/protocols/yahoo/yahoo.c:838
msgid "Your Yahoo! message did not get sent."
msgstr "�≧����堺���� Yahoo! 荐�����"
-# XXX ���遵�札茘������筝�藥�
-#: ../libpurple/protocols/yahoo/yahoo.c:880
-#, c-format
-msgid "%s just sent you a Buzz!"
-msgstr "%s ���弱ŭ���"
-
# XXX ��⑮
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: ../libpurple/protocols/yahoo/yahoo.c:957
#, c-format
msgid "Yahoo! system message for %s:"
msgstr "%s �� Yahoo! 膤紫輝荐����"
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: ../libpurple/protocols/yahoo/yahoo.c:1026
msgid "Authorization denied message:"
msgstr "��腟�茯�茘�荐����"
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "篏睡���� %s ������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆���"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: ../libpurple/protocols/yahoo/yahoo.c:1044
#, c-format
msgid ""
"%s has (retroactively) denied your request to add them to your list for the "
@@ -11253,11 +12661,16 @@
"篏睡���� %s ���坂�������鐚�������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆�鐚�%"
"s"
-#: ../libpurple/protocols/yahoo/yahoo.c:1073
+#: ../libpurple/protocols/yahoo/yahoo.c:1047
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "篏睡���� %s ������腟�篋�������絨�篁�鐚�絅刻��医��恰����絅遵�羝�����荀�羆���"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1049
msgid "Add buddy rejected"
msgstr "�医�絅遵�茴���"
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: ../libpurple/protocols/yahoo/yahoo.c:1991
#, c-format
msgid ""
"The Yahoo server has requested the use of an unrecognized authentication "
@@ -11267,11 +12680,11 @@
"Yahoo 篌堺�����羆�篋�篏睡���腮������茯�茘��劫�鐚���罩ゅ����巡��������糸�� Yahoo��茫��� "
"%s 罟∽�ユ��羃����贋�亥��������"
-#: ../libpurple/protocols/yahoo/yahoo.c:1827
+#: ../libpurple/protocols/yahoo/yahoo.c:1994
msgid "Failed Yahoo! Authentication"
msgstr "Yahoo! 茯�茘�紊掩��"
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2060
#, c-format
msgid ""
"You have tried to ignore %s, but the user is on your buddy list. Clicking "
@@ -11280,49 +12693,49 @@
"����荅�申�ュ������絅遵������х�� %s��絋�������膊���篁�鐚�絅刻�緇�����絅遵�羝���賢腱脂�わ�筝�"
"���喝申�ヤ�鐚�絅刻�鐚�茫���筝�筝���������"
-#: ../libpurple/protocols/yahoo/yahoo.c:1896
+#: ../libpurple/protocols/yahoo/yahoo.c:2063
msgid "Ignore buddy?"
msgstr "綽順�ヤ戎����鐚�"
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: ../libpurple/protocols/yahoo/yahoo.c:2126
msgid "Your account is locked, please log in to the Yahoo! website."
msgstr "篏���絽恰�句����茴�����������茫����糸�� Yahoo! 膓牙���"
-#: ../libpurple/protocols/yahoo/yahoo.c:1958
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
#, c-format
msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
msgstr "���ョ�����篁ｇ⊆ %d��綏牙��糸�ュ�� Yahoo!鐚�絎��合恐腴�筝����遵群膓�篆�③���������"
-#: ../libpurple/protocols/yahoo/yahoo.c:2012
+#: ../libpurple/protocols/yahoo/yahoo.c:2183
#, c-format
msgid "Could not add buddy %s to group %s to the server list on account %s."
msgstr "�≧�絨�絅遵���%1$s���医��喝験����%3$s����失�������羝����х��臂ょ���%2$s����"
-#: ../libpurple/protocols/yahoo/yahoo.c:2015
+#: ../libpurple/protocols/yahoo/yahoo.c:2186
msgid "Could not add buddy to server list"
msgstr "�≧�絨�絅遵��医��割失�������羝�����"
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2305
#, c-format
msgid "[ Audible %s/%s/%s.swf ] %s"
msgstr "[ �恰��罟� %s/%s/%s.swf ] %s"
# XXX ��⑮ - 20061025
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: ../libpurple/protocols/yahoo/yahoo.c:2648
msgid "Received unexpected HTTP response from server."
msgstr "篌堺�����弱�坂�絅����� HTTP ������"
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2684
-#: ../libpurple/protocols/yahoo/yahoo.c:2787
-#: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/yahoo.c:2672
+#: ../libpurple/protocols/yahoo/yahoo.c:2858
+#: ../libpurple/protocols/yahoo/yahoo.c:2961
+#: ../libpurple/protocols/yahoo/yahoo.c:2971
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
#: ../libpurple/protocols/yahoo/ycht.c:585
msgid "Connection problem"
msgstr "�ｇ����"
-#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#: ../libpurple/protocols/yahoo/yahoo.c:2698
#, c-format
msgid ""
"Lost connection with %s:\n"
@@ -11331,7 +12744,7 @@
"�� %s 箙������ｇ�腦��銀賢��:\n"
"%s"
-#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#: ../libpurple/protocols/yahoo/yahoo.c:2723
#, c-format
msgid ""
"Could not establish a connection with %s:\n"
@@ -11340,28 +12753,28 @@
"�≧��� %s 綮榊��ｇ�:\n"
"%s"
-#: ../libpurple/protocols/yahoo/yahoo.c:2899
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: ../libpurple/protocols/yahoo/yahoo.c:3078
+#: ../libpurple/protocols/yahoo/yahoo.c:3764
msgid "Not at Home"
msgstr "筝����"
-#: ../libpurple/protocols/yahoo/yahoo.c:2901
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: ../libpurple/protocols/yahoo/yahoo.c:3080
+#: ../libpurple/protocols/yahoo/yahoo.c:3767
msgid "Not at Desk"
msgstr "筝���婚篏�"
-#: ../libpurple/protocols/yahoo/yahoo.c:2903
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: ../libpurple/protocols/yahoo/yahoo.c:3082
+#: ../libpurple/protocols/yahoo/yahoo.c:3770
msgid "Not in Office"
msgstr "筝���商���"
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: ../libpurple/protocols/yahoo/yahoo.c:3086
+#: ../libpurple/protocols/yahoo/yahoo.c:3776
msgid "On Vacation"
msgstr "羝≦���私�"
-#: ../libpurple/protocols/yahoo/yahoo.c:2911
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3782
msgid "Stepped Out"
msgstr "莎医�阪ｻ篋�"
@@ -11369,92 +12782,96 @@
# NOTE ��箙�茵�ず篏�筝�����荀�����絅遵��糸�ョ�膈�����(yeah, it mean the buddy
# NOTE isn't on the server's buddy list/ which also means you won't
# NOTE be able to see when they log on, etc)
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: ../libpurple/protocols/yahoo/yahoo.c:3183
+#: ../libpurple/protocols/yahoo/yahoo.c:3213
msgid "Not on server list"
msgstr "筝���失�������羝���賢"
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: ../libpurple/protocols/yahoo/yahoo.c:3230
+#: ../libpurple/protocols/yahoo/yahoo.c:3288
msgid "Appear Online"
msgstr "�援┗筝�膩�"
# NOTE Yahoo 絎��壕⑮��羂檎��蕁�ず�∝���鐚�茯��巡�藥��九��恰�����絨���篋削����傑����荳���
-#: ../libpurple/protocols/yahoo/yahoo.c:3054
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: ../libpurple/protocols/yahoo/yahoo.c:3233
+#: ../libpurple/protocols/yahoo/yahoo.c:3309
msgid "Appear Permanently Offline"
msgstr "�傑���援┗�∝�"
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: ../libpurple/protocols/yahoo/yahoo.c:3251
msgid "Presence"
msgstr "筝�膩�����"
# NOTE 筝�罨∞�糸�ユ��筝��援┗�∝�鐚���篁ュ����������絖���
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: ../libpurple/protocols/yahoo/yahoo.c:3294
msgid "Appear Offline"
msgstr "�����援┗�∝�"
# NOTE ��������х��筝�����篁�
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: ../libpurple/protocols/yahoo/yahoo.c:3303
msgid "Don't Appear Permanently Offline"
msgstr "��罩∫�傑���援┗�∝�"
# NOTE #gaim �� Vann �� LSchiere 茹ｏ�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
# NOTE Yahoo ����Chat��罩ｅ�茘����冴��������違��
-#: ../libpurple/protocols/yahoo/yahoo.c:3172
+#: ../libpurple/protocols/yahoo/yahoo.c:3351
msgid "Join in Chat"
msgstr "���ュソ��������������紊��"
# NOTE����茘医������������顑���Yahoo! 絅遵�閽����冴��Conference����箴�罩ｅ�筝㊧⑮����
-#: ../libpurple/protocols/yahoo/yahoo.c:3178
+#: ../libpurple/protocols/yahoo/yahoo.c:3357
msgid "Initiate Conference"
msgstr "������茘医�"
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
+#: ../libpurple/protocols/yahoo/yahoo.c:3385
msgid "Presence Settings"
msgstr "筝�膩�����荐㊤�"
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: ../libpurple/protocols/yahoo/yahoo.c:3391
msgid "Start Doodling"
msgstr "��紮� Doodle"
-#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
-msgid "Active which ID?"
-msgstr "��������� ID鐚�"
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
+msgid "Activate which ID?"
+msgstr "��������� ID鐚�"
# NOTE #gaim �� Vann �� LSchiere 茹ｏ�絋����後�篋���絅遵��������寂�����紊��箴水���ヨ�����紊�
# NOTE Yahoo ����Chat��罩ｅ�茘����冴��������違��
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: ../libpurple/protocols/yahoo/yahoo.c:3503
msgid "Join whom in chat?"
-msgstr "���ュ����絅遵�������������紊��鐚�"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3268
+msgstr "���ヨ�����紊��鐚�"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3515
msgid "Activate ID..."
msgstr "���� ID..."
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
msgid "Join User in Chat..."
msgstr "���ュソ��������������紊��..."
-# XXX ���遵�札茘������筝�藥�
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
-msgid "You have just sent a Buzz!"
-msgstr "�������坂�筝����弱ǚ�"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: ../libpurple/protocols/yahoo/yahoo.c:3524
+msgid "Open Inbox"
+msgstr "�����銀散��"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
+msgid "Buzz"
+msgstr "�駈�"
+
+# XXX ������⑮ - acli 20070913
+#: ../libpurple/protocols/yahoo/yahoo.c:4118
+#, c-format
+msgid "Buzzing %s..."
+msgstr "罩ｅ��畿 %s 筝�����..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:4133
msgid "join <room>: Join a chat room on the Yahoo network"
msgstr "join: <��紊��>鐚����ヤ��� Yahoo! 膓画君��筝�����紊��"
-#: ../libpurple/protocols/yahoo/yahoo.c:3843
+#: ../libpurple/protocols/yahoo/yahoo.c:4138
msgid "list: List rooms on the Yahoo network"
msgstr "list鐚�����Yahoo膓画君筝�����紊��羝���"
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
-msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: 腟�ソ��筝������吟��綣�篁�鐚�絅刻�羈���"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
+#: ../libpurple/protocols/yahoo/yahoo.c:4146
msgid "doodle: Request user to start a Doodle session"
msgstr "doodle: 荀�羆�篏睡������紮� Doodle Session"
@@ -11468,134 +12885,60 @@
#. *< version
#. * summary
#. * description
-#: ../libpurple/protocols/yahoo/yahoo.c:4059
-#: ../libpurple/protocols/yahoo/yahoo.c:4061
+#: ../libpurple/protocols/yahoo/yahoo.c:4355
+#: ../libpurple/protocols/yahoo/yahoo.c:4357
msgid "Yahoo Protocol Plugin"
msgstr "Yahoo ��絎�罔∞�"
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: ../libpurple/protocols/yahoo/yahoo.c:4380
msgid "Yahoo Japan"
msgstr "Yahoo Japan"
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: ../libpurple/protocols/yahoo/yahoo.c:4383
msgid "Pager server"
msgstr "�喝�寂失����"
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: ../libpurple/protocols/yahoo/yahoo.c:4386
msgid "Japan Pager server"
msgstr "�喝�寂失������ユ���医��鐚�"
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: ../libpurple/protocols/yahoo/yahoo.c:4389
msgid "Pager port"
msgstr "�喝�主鎧腟演��荐���"
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: ../libpurple/protocols/yahoo/yahoo.c:4392
msgid "File transfer server"
msgstr "罟�罅��活叱篌堺����"
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: ../libpurple/protocols/yahoo/yahoo.c:4395
msgid "Japan file transfer server"
msgstr "罟�罅��活叱篌堺������ユ���医��鐚�"
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: ../libpurple/protocols/yahoo/yahoo.c:4398
msgid "File transfer port"
msgstr "罟�罅��活叱��荐���"
# XXX �≦��筝�茘��鐚���茘����医�����������������潟���贋����(?!)
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: ../libpurple/protocols/yahoo/yahoo.c:4401
msgid "Chat room locale"
msgstr "��紊������ (Locale)"
-#: ../libpurple/protocols/yahoo/yahoo.c:4108
+#: ../libpurple/protocols/yahoo/yahoo.c:4404
msgid "Ignore conference and chatroom invitations"
msgstr "綽順�ユ��茘医�����紊����茫�"
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
msgid "Chat room list URL"
msgstr "��紊��羝�������恐��"
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
msgid "Yahoo Chat server"
msgstr "Yahoo ��紊�失����"
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
msgid "Yahoo Chat port"
msgstr "Yahoo ��紊����荐���"
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 紿���篋�篏�荅√�鋌�鐚�絅刻��井��茘医���%s������茫�鐚����掩����%s����"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
-msgid "Invitation Rejected"
-msgstr "��茫�茴����篋�"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
-msgid "Failed to join chat"
-msgstr "�≧����ヨ��紊��"
-
-#. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
-msgid "Unknown room"
-msgstr "���ヨ��紊��"
-
-#. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
-msgid "Maybe the room is full"
-msgstr "箙�荐沿��紊��篏睡����綏牙��育��筝���"
-
-#. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
-msgid "Not available"
-msgstr "��紊��筝�絖���"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
-msgid ""
-"Unknown error. You may need to logout and wait five minutes before being "
-"able to rejoin a chatroom"
-msgstr "���ョ�����������荐演��荀��糸�坂研膈�緇�篋�����鐚�篁ラ���育�峨�ヨ��紊��"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
-#, c-format
-msgid "You are now chatting in %s."
-msgstr "��憜���峨�ャ��%s���画���紊���"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
-msgid "Failed to join buddy in chat"
-msgstr "�≧����ュソ��������������紊��"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
-msgid "Maybe they're not in a chat?"
-msgstr "���巡�鐚�絅刻�筝������紊���э�"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
-msgid "Fetching the room list failed."
-msgstr "莅�����紊��羝����主�������"
-
-# NOTE 茹ｃ������活��紊���篏睡�����悟����(marv)
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
-msgid "Voices"
-msgstr "����活��紊�"
-
-# NOTE 茹ｃ��������鎀���篏睡�����悟����(marv)
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
-msgid "Webcams"
-msgstr "������鎀�"
-
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-msgid "Unable to fetch room list."
-msgstr "�≧���緇���紊��羝�����"
-
-# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
-# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
-# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
-msgid "User Rooms"
-msgstr "篏睡����綮榊�箙���紊��"
-
#. Write a local message to this conversation showing that a request for a
#. * Doodle session has been made
#.
@@ -11611,86 +12954,86 @@
msgstr "�≧�綮榊�罟�罅�篁�膣鴻��"
#. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
msgid "Write Error"
msgstr "絲��ラ���"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
msgid "Yahoo! Japan Profile"
msgstr "Yahoo! Japan ��篋肴���"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
msgid "Yahoo! Profile"
msgstr "Yahoo! ��篋肴���"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
msgid ""
"Sorry, profiles marked as containing adult content are not supported at this "
"time."
msgstr "絨�筝�莎件�����筝����吓�у�茴����阪��腴ヤ�絎�����篋肴�荐���"
# NOTE 羈������腟���⑮��箙�筝�蕁�ず鐚���茘�����篁ヤ���
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
msgid ""
"If you wish to view this profile, you will need to visit this link in your "
"web browser:"
msgstr "������括��������篋肴�荐�鐚�茫��������頳遵������篁ヤ��ｇ�鐚�"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
msgid "Yahoo! ID"
msgstr "Yahoo! 絽活��"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
msgid "Hobbies"
msgstr "��絅�"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
msgid "Latest News"
msgstr "���井���"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
msgid "Home Page"
msgstr "膓臥��"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
msgid "Cool Link 1"
msgstr "�潔�ｇ�(筝�)"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
msgid "Cool Link 2"
msgstr "�潔�ｇ�(篋�)"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
msgid "Cool Link 3"
msgstr "�潔�ｇ�(筝�)"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
msgid "Last Update"
msgstr "�贋�井�ユ��"
# NOTE 茘����翫�� by Ambrose
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
#, c-format
msgid "User information for %s unavailable"
msgstr "�≧���緇�篏睡���� %s ����篋肴�荐�"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
msgid ""
"Sorry, this profile seems to be in a language or format that is not "
"supported at this time."
msgstr "絨�筝�莎件�������篋肴�荐�篌寂���戎������絨���←��吡��茯�荐����弱���"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
msgid ""
"Could not retrieve the user's profile. This most likely is a temporary "
"server-side problem. Please try again later."
msgstr ""
"�≧���緇�篏睡��������篋肴�������緇������遵Ŭ��失�����榊憝�����х���馹�鐚�茫�腮�緇���荅���"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
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 "
@@ -11699,10 +13042,84 @@
"�≧���緇�篏睡��������篋肴�������緇������処；腓咲����篏睡����筝��絖�����区��鐚�Yahoo! ��筝�"
"���鞘��遺戎��������篋肴������ユ�����ラ��篏睡����腆阪�絖����茫�腮�緇���荅���"
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
msgid "The user's profile is empty."
msgstr "����篏睡������莖�荐�����順����"
+#: ../libpurple/protocols/yahoo/yahoochat.c:217
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s 紿���篋�篏�荅√�鋌�鐚�絅刻��井��茘医���%s������茫�鐚����掩����%s����"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:219
+msgid "Invitation Rejected"
+msgstr "��茫�茴����篋�"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:438
+msgid "Failed to join chat"
+msgstr "�≧����ヨ��紊��"
+
+#. -6
+#: ../libpurple/protocols/yahoo/yahoochat.c:441
+msgid "Unknown room"
+msgstr "���ヨ��紊��"
+
+#. -15
+#: ../libpurple/protocols/yahoo/yahoochat.c:444
+msgid "Maybe the room is full"
+msgstr "箙�荐沿��紊��篏睡����綏牙��育��筝���"
+
+#. -35
+#: ../libpurple/protocols/yahoo/yahoochat.c:447
+msgid "Not available"
+msgstr "��紊��筝�絖���"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:451
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr "���ョ�����������荐演��荀��糸�坂研膈�緇�篋�����鐚�篁ラ���育�峨�ヨ��紊��"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:534
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "��憜���峨�ャ��%s���画���紊���"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:719
+msgid "Failed to join buddy in chat"
+msgstr "�≧����ュソ��������������紊��"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:720
+msgid "Maybe they're not in a chat?"
+msgstr "���巡�鐚�絅刻�筝������紊���э�"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1416
+#: ../libpurple/protocols/yahoo/yahoochat.c:1442
+msgid "Fetching the room list failed."
+msgstr "莅�����紊��羝����主�������"
+
+# NOTE 茹ｃ������活��紊���篏睡�����悟����(marv)
+#: ../libpurple/protocols/yahoo/yahoochat.c:1500
+msgid "Voices"
+msgstr "����活��紊�"
+
+# NOTE 茹ｃ��������鎀���篏睡�����悟����(marv)
+#: ../libpurple/protocols/yahoo/yahoochat.c:1503
+msgid "Webcams"
+msgstr "������鎀�"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:1514
+#: ../libpurple/protocols/yahoo/yahoochat.c:1584
+msgid "Unable to fetch room list."
+msgstr "�≧���緇���紊��羝�����"
+
+# NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
+# NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
+# NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
+#: ../libpurple/protocols/yahoo/yahoochat.c:1577
+msgid "User Rooms"
+msgstr "篏睡����綮榊�箙���紊��"
+
#: ../libpurple/protocols/yahoo/ycht.c:456
msgid "Connection problem with the YCHT server."
msgstr "�� YCHT 篌堺�����榊憥�ｇ����"
@@ -11727,11 +13144,6 @@
msgid "Unable to send to chat %s,%s,%s"
msgstr "�≧��渇���活��紊�� %s,%s,%s"
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
-msgid "User"
-msgstr "篏睡����"
-
#: ../libpurple/protocols/zephyr/zephyr.c:791
#: ../libpurple/protocols/zephyr/zephyr.c:1210
msgid "Hidden or not logged-in"
@@ -11976,7 +13388,17 @@
msgid "%s is now known as %s.\n"
msgstr "%s �壕��援┗�� %s��\n"
-#: ../libpurple/server.c:680
+#: ../libpurple/server.c:301
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#: ../libpurple/server.c:346
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s 綣�莎隙�����羈����"
+
+#: ../libpurple/server.c:795
#, c-format
msgid ""
"%s has invited %s to the chat room %s:\n"
@@ -11985,20 +13407,40 @@
"%s ��茫� %s �域��紊����%s��鐚�\n"
"%s"
-#: ../libpurple/server.c:685
+#: ../libpurple/server.c:800
#, c-format
msgid "%s has invited %s to the chat room %s\n"
msgstr "%s ��茫�篋� %s �域��紊����%s��鐚�\n"
-#: ../libpurple/server.c:689
+#: ../libpurple/server.c:804
msgid "Accept chat invitation?"
msgstr "�ュ���茫����"
+# FIXME ambiguous - 20061025
+# NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
+# NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
+# XXX ��罩ｇ����������≧��ｇ��活�茘���������腴��羣���鐚�筝������ｇ�紊掩����鐚�荀�筝�����腴�鐚�
+#: ../libpurple/sslconn.c:163
+msgid "SSL Connection Failed"
+msgstr "SSL �ｇ�紊掩��"
+
+#: ../libpurple/sslconn.c:165
+msgid "SSL Handshake Failed"
+msgstr "SSL 篋よ�紊掩��"
+
+#: ../libpurple/sslconn.c:167
+msgid "SSL peer presented an invalid certificate"
+msgstr "SSL peer �榊ず篋��≧������茘�"
+
+#: ../libpurple/sslconn.c:170
+msgid "Unknown SSL error"
+msgstr "���ョ�� SSL ���"
+
#: ../libpurple/status.c:152
msgid "Unset"
msgstr "��羔�荐㊤�"
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1058
msgid "Do not disturb"
msgstr "茫��炊����"
@@ -12050,13 +13492,13 @@
msgid "%x %X"
msgstr "%x %X"
-#: ../libpurple/util.c:2691
+#: ../libpurple/util.c:2720
#, c-format
msgid "Error Reading %s"
msgstr "莅��� %s ��筝㊦�主��篋����"
# NOTE ��They�����藝弱���茘�����絎�������荅縁���絎����������藝弱���絲��隙�藥�絅巡���
-#: ../libpurple/util.c:2692
+#: ../libpurple/util.c:2721
#, c-format
msgid ""
"An error was encountered reading your %s. They have not been loaded, and "
@@ -12064,84 +13506,84 @@
msgstr ""
"��В������%s���主�������罟�罅��х��莖���筝����茴���ワ�������罟�罅�綏牙Щ�� %s~��"
-#: ../libpurple/util.c:3192
+#: ../libpurple/util.c:3221
msgid "Calculating..."
msgstr "荐�膊�筝�..."
-#: ../libpurple/util.c:3195
+#: ../libpurple/util.c:3224
msgid "Unknown."
msgstr "���ャ��"
-#: ../libpurple/util.c:3221
+#: ../libpurple/util.c:3250
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d 腱�"
msgstr[1] "%d 腱�"
-#: ../libpurple/util.c:3233
+#: ../libpurple/util.c:3262
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d ��"
msgstr[1] "%d ��"
-#: ../libpurple/util.c:3241
+#: ../libpurple/util.c:3270
#, c-format
msgid "%s, %d hour"
msgid_plural "%s, %d hours"
msgstr[0] "%s %d 絨��"
msgstr[1] "%s %d 鎞��"
-#: ../libpurple/util.c:3247
+#: ../libpurple/util.c:3276
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d 鎞��"
msgstr[1] "%d 鎞��"
-#: ../libpurple/util.c:3255
+#: ../libpurple/util.c:3284
#, c-format
msgid "%s, %d minute"
msgid_plural "%s, %d minutes"
msgstr[0] "%s %d ��"
msgstr[1] "%s %d ��"
-#: ../libpurple/util.c:3261
+#: ../libpurple/util.c:3290
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d ��"
msgstr[1] "%d ��"
-#: ../libpurple/util.c:3521
+#: ../libpurple/util.c:3550
#, c-format
msgid "Could not open %s: Redirected too many times"
msgstr "������� %s鐚����医�����罨≧�梧����筝���"
-#: ../libpurple/util.c:3558 ../libpurple/util.c:3853
+#: ../libpurple/util.c:3587 ../libpurple/util.c:3882
#, c-format
msgid "Unable to connect to %s"
msgstr "�≧��ｇ��違��%s��"
-#: ../libpurple/util.c:3681
+#: ../libpurple/util.c:3710
#, c-format
msgid ""
"Unable to allocate enough memory to hold the contents from %s. The web "
"server may be trying something malicious."
msgstr "�≧��肴��ャ��%s����緇�莇喝���荐��狗�鐚�膓牙���篌堺������醇�傑���≧���"
-#: ../libpurple/util.c:3716
+#: ../libpurple/util.c:3745
#, c-format
msgid "Error reading from %s: %s"
msgstr "顒��� %s ��筝㊦�主�����鐚�%s"
-#: ../libpurple/util.c:3747
+#: ../libpurple/util.c:3776
#, c-format
msgid "Error writing to %s: %s"
msgstr "絲��� %s ��筝㊦�主��篋����鐚�%s"
-#: ../libpurple/util.c:3772
+#: ../libpurple/util.c:3801
#, c-format
msgid "Unable to connect to %s: %s"
msgstr "�≧��ｇ��� %s鐚�%s"
@@ -12168,39 +13610,39 @@
msgstr "膤紫輝�ｆ�劫��"
#. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: ../pidgin/gtkaccount.c:407
msgid "Login Options"
msgstr "�糸�ラ�檎��"
-#: ../pidgin/gtkaccount.c:430
+#: ../pidgin/gtkaccount.c:428
msgid "Pro_tocol:"
msgstr "��荐���絎�(_T)鐚�"
-#: ../pidgin/gtkaccount.c:441
+#: ../pidgin/gtkaccount.c:439
msgid "Screen _name:"
msgstr "絽活��(_N)鐚�"
# NOTE Debian 茘���local���冴�����亥���鐚����������Windows茘��鐚�篏�����茖鎁遵�閴�莠�絋ョ��
# XXX
-#: ../pidgin/gtkaccount.c:531
+#: ../pidgin/gtkaccount.c:529
msgid "_Local alias:"
msgstr "絽活���ュ��鐚������������鐚�(_L)鐚�"
-#: ../pidgin/gtkaccount.c:535
+#: ../pidgin/gtkaccount.c:533
msgid "Remember pass_word"
msgstr "荐�篏鎛�腆�(_W)"
#. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: ../pidgin/gtkaccount.c:591
msgid "User Options"
msgstr "篏睡��������檎��"
-#: ../pidgin/gtkaccount.c:606
+#: ../pidgin/gtkaccount.c:604
msgid "New _mail notifications"
msgstr "�育�灸散����(_M)"
#. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: ../pidgin/gtkaccount.c:609
msgid "Use this buddy _icon for this account:"
msgstr "篏睡�����絅遵���腓�(_I)鐚�"
@@ -12236,7 +13678,7 @@
msgid "SOCKS 5"
msgstr "SOCKS 5"
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1210
msgid "Use Environmental Settings"
msgstr "篏睡���医�莅��梧┃絎�"
@@ -12258,15 +13700,15 @@
msgid "Proxy Options"
msgstr "篁ｇ��篌堺�����檎��"
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1204
msgid "Proxy _type:"
msgstr "篁ｇ��篌堺��������(_T)鐚�"
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1225
msgid "_Host:"
msgstr "筝紙�篏���(_H)鐚�"
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1243
msgid "_Port:"
msgstr "��荐���(_P)鐚�"
@@ -12274,10 +13716,18 @@
msgid "_Username:"
msgstr "篏睡����(_U)鐚�"
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1280
msgid "Pa_ssword:"
msgstr "絲�腆�(_S)鐚�"
+#: ../pidgin/gtkaccount.c:1195
+msgid "Unable to save new account"
+msgstr "�≧��峨��医験��"
+
+#: ../pidgin/gtkaccount.c:1196
+msgid "An account already exists with the specified criteria."
+msgstr "綏我��筝���箙�����絎�罌�篁句��絽活����"
+
#: ../pidgin/gtkaccount.c:1473
msgid "Add Account"
msgstr "�医�絽活��"
@@ -12286,19 +13736,23 @@
msgid "_Basic"
msgstr "�堺��┃絎�(_B)"
-#: ../pidgin/gtkaccount.c:1503
+#: ../pidgin/gtkaccount.c:1499
+msgid "Create this new account on the server"
+msgstr "��失�����綮榊������医験��"
+
+#: ../pidgin/gtkaccount.c:1515
msgid "_Advanced"
msgstr "�臥��┃絎�(_A)"
-#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:568
msgid "Enabled"
msgstr "����"
-#: ../pidgin/gtkaccount.c:2003
+#: ../pidgin/gtkaccount.c:2001
msgid "Protocol"
msgstr "��荐���絎�"
-#: ../pidgin/gtkaccount.c:2203
+#: ../pidgin/gtkaccount.c:2201
#, c-format
msgid ""
"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12322,231 +13776,243 @@
# TODO ��莎隙���荅牙�阪��筝����亥����紊��鐚�筝�����紊��罩檎��井����臂ょ���
# NOTE 茘����翫�� by Paladin
-#: ../pidgin/gtkblist.c:763
+#: ../pidgin/gtkblist.c:765
msgid "Join a Chat"
msgstr "���ヨ��紊��"
-#: ../pidgin/gtkblist.c:784
+#: ../pidgin/gtkblist.c:786
msgid ""
"Please enter the appropriate information about the chat you would like to "
"join.\n"
msgstr "茫�莠後�ラ���惹�����喝���ュソ��羝�������紊�������区�荐���\n"
#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
-#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkblist.c:797 ../pidgin/gtkblist.c:5524
+#: ../pidgin/gtkblist.c:5890 ../pidgin/gtkpounce.c:538
#: ../pidgin/gtkroomlist.c:395
msgid "_Account:"
msgstr "絽活��(_A)鐚�"
-#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkblist.c:1086 ../pidgin/gtkprivacy.c:602
#: ../pidgin/gtkprivacy.c:616
msgid "_Block"
msgstr "絨���(_B)"
-#: ../pidgin/gtkblist.c:1084
+#: ../pidgin/gtkblist.c:1086
msgid "Un_block"
msgstr "茹ｉ�ゅ���(_B)"
-#: ../pidgin/gtkblist.c:1135
+#: ../pidgin/gtkblist.c:1137
msgid "Get _Info"
msgstr "��緇�莖�荐�(_I)"
-#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1140 ../pidgin/pidginstock.c:89
msgid "I_M"
msgstr "�恰��荐���(_M)"
-#: ../pidgin/gtkblist.c:1144
+#: ../pidgin/gtkblist.c:1146
msgid "_Send File"
msgstr "�渇��罟�罅�(_S)"
-#: ../pidgin/gtkblist.c:1151
+#: ../pidgin/gtkblist.c:1153
msgid "Add Buddy _Pounce"
msgstr "���ュソ����������(_P)"
-#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: ../pidgin/gtkblist.c:1158 ../pidgin/gtkblist.c:1162
+#: ../pidgin/gtkblist.c:1267 ../pidgin/gtkblist.c:1290
msgid "View _Log"
msgstr "茹����ヨ�(_L)"
-#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1175 ../pidgin/gtkblist.c:1184
+#: ../pidgin/gtkblist.c:1275 ../pidgin/gtkblist.c:1296
msgid "_Alias..."
msgstr "�ュ��(_A)..."
-#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: ../pidgin/gtkblist.c:1178 ../pidgin/gtkblist.c:1186
+#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
msgid "_Remove"
msgstr "腱脂��(_R)"
-#: ../pidgin/gtkblist.c:1232
+#: ../pidgin/gtkblist.c:1236
msgid "Add a _Buddy"
msgstr "�医�筝���絅遵�(_B)"
-#: ../pidgin/gtkblist.c:1235
+#: ../pidgin/gtkblist.c:1239
msgid "Add a C_hat"
msgstr "�医�筝�����紊��(_H)"
-#: ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1242
msgid "_Delete Group"
msgstr "���ょ召腟�(_D)"
-#: ../pidgin/gtkblist.c:1240
+#: ../pidgin/gtkblist.c:1244
msgid "_Rename"
msgstr "���遵��(_R)"
#. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1263 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:87
msgid "_Join"
msgstr "����(_J)"
-#: ../pidgin/gtkblist.c:1260
+#: ../pidgin/gtkblist.c:1265
msgid "Auto-Join"
msgstr "��������"
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
+#: ../pidgin/gtkblist.c:1303 ../pidgin/gtkblist.c:1327
msgid "_Collapse"
msgstr "�区儀(_C)"
-#: ../pidgin/gtkblist.c:1326
+#: ../pidgin/gtkblist.c:1332
msgid "_Expand"
msgstr "絮���(_E)"
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
-#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
+#: ../pidgin/gtkblist.c:1583 ../pidgin/gtkblist.c:1595
+#: ../pidgin/gtkblist.c:4600 ../pidgin/gtkblist.c:4613
msgid "/Tools/Mute Sounds"
msgstr "/綏ュ��/����"
# XXX ��⑮
-#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4602
+#: ../pidgin/gtkblist.c:2055 ../pidgin/gtkconv.c:4826
#: ../pidgin/gtkpounce.c:429
msgid ""
"You are not currently signed on with an account that can add that buddy."
msgstr "��研���糸�ヤ算篏�筝���������医�����絅遵�����荐���絎���"
#. Buddies menu
-#: ../pidgin/gtkblist.c:2838
+#: ../pidgin/gtkblist.c:2866
msgid "/_Buddies"
msgstr "/絅遵�(_B)"
-#: ../pidgin/gtkblist.c:2839
+#: ../pidgin/gtkblist.c:2867
msgid "/Buddies/New Instant _Message..."
msgstr "/絅遵�/�医�恰��荐���(_M)"
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2868
msgid "/Buddies/Join a _Chat..."
msgstr "/絅遵�/���ヨ��紊��(_C)"
-#: ../pidgin/gtkblist.c:2841
+#: ../pidgin/gtkblist.c:2869
msgid "/Buddies/Get User _Info..."
msgstr "/絅遵�/��緇�篏睡����莖�荐�(_I)..."
# NOTE 罩よ��茘���莅�����篌寂�莠�����緇���絅巡�藥�
-#: ../pidgin/gtkblist.c:2842
+#: ../pidgin/gtkblist.c:2870
msgid "/Buddies/View User _Log..."
msgstr "/絅遵�/莅���篏睡�����ヨ�(_L)..."
-#: ../pidgin/gtkblist.c:2844
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/絅遵�/蕁�ず�∝�絅遵�(_O)"
-
-#: ../pidgin/gtkblist.c:2845
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/絅遵�/蕁�ず腥榊�順��臂ょ�(_E)"
-
-#: ../pidgin/gtkblist.c:2846
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/絅遵�/蕁�ず絅遵�膣亥�(_D)"
-
-#: ../pidgin/gtkblist.c:2847
-msgid "/Buddies/Show Idle _Times"
-msgstr "/絅遵�/蕁�ず��臀�����(_T)"
-
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2872
+msgid "/Buddies/Show"
+msgstr "/絅遵�/蕁�ず"
+
+#: ../pidgin/gtkblist.c:2873
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr "/絅遵�/蕁�ず/�∝�絅遵�(_O)"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Buddies/Show/_Empty Groups"
+msgstr "/絅遵�/蕁�ず/腥榊�順召腟�(_E)"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Buddies/Show/Buddy _Details"
+msgstr "/絅遵�/蕁�ず/絅遵�膣亥�(_D)"
+
+#: ../pidgin/gtkblist.c:2876
+msgid "/Buddies/Show/Idle _Times"
+msgstr "/絅遵�/蕁�ず/��臀�����(_T)"
+
+#: ../pidgin/gtkblist.c:2877
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr "/絅遵�/蕁�ず/��荐���絎���腓�(_P)"
+
+#: ../pidgin/gtkblist.c:2878
msgid "/Buddies/_Sort Buddies"
msgstr "/絅遵�/絅遵�羝����綺�(_S)"
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2880
msgid "/Buddies/_Add Buddy..."
msgstr "/絅遵�/�医�絅遵�(_A)..."
-#: ../pidgin/gtkblist.c:2851
+#: ../pidgin/gtkblist.c:2881
msgid "/Buddies/Add C_hat..."
msgstr "/絅遵�/�医���紊��(_H)..."
-#: ../pidgin/gtkblist.c:2852
+#: ../pidgin/gtkblist.c:2882
msgid "/Buddies/Add _Group..."
msgstr "/絅遵�/�医�臂ょ�(_G)..."
-#: ../pidgin/gtkblist.c:2854
+#: ../pidgin/gtkblist.c:2884
msgid "/Buddies/_Quit"
msgstr "/絅遵�/腟���腮�綣�(_Q)"
#. Accounts menu
-#: ../pidgin/gtkblist.c:2857
+#: ../pidgin/gtkblist.c:2887
msgid "/_Accounts"
msgstr "/絽活��(_A)"
-#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
+#: ../pidgin/gtkblist.c:2888 ../pidgin/gtkblist.c:6589
msgid "/Accounts/Add\\/Edit"
msgstr "/絽活��(_A)/�医�\\/膩�鹿"
#. Tools
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2891
msgid "/_Tools"
msgstr "綏ュ��(_T)"
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2892
msgid "/Tools/Buddy _Pounces"
msgstr "/綏ュ��/絅遵���������(_P)"
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2893
+msgid "/Tools/_Certificates"
+msgstr "/綏ュ��/��茘�(_C)"
+
+#: ../pidgin/gtkblist.c:2894
msgid "/Tools/Plu_gins"
msgstr "/綏ュ��/罔∞�(_G)"
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2895
msgid "/Tools/Pr_eferences"
msgstr "/綏ュ��/�鎁処┃絎�(_E)"
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2896
msgid "/Tools/Pr_ivacy"
msgstr "/綏ュ��/�援�荐㊤�(_I)"
-#: ../pidgin/gtkblist.c:2867
+#: ../pidgin/gtkblist.c:2898
msgid "/Tools/_File Transfers"
msgstr "/綏ュ��/罟�罅��活叱(_F)"
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2899
msgid "/Tools/R_oom List"
msgstr "/綏ュ��/��紊��羝���(_O)"
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2900
msgid "/Tools/System _Log"
msgstr "/綏ュ��/膤紫輝�ヨ�(_L)"
-#: ../pidgin/gtkblist.c:2871
+#: ../pidgin/gtkblist.c:2902
msgid "/Tools/Mute _Sounds"
msgstr "/綏ュ��/����(_S)"
#. Help
-#: ../pidgin/gtkblist.c:2873
+#: ../pidgin/gtkblist.c:2904
msgid "/_Help"
msgstr "/茯���(_H)"
-#: ../pidgin/gtkblist.c:2874
+#: ../pidgin/gtkblist.c:2905
msgid "/Help/Online _Help"
msgstr "/茯���/膩�筝�茯���(_H)"
-#: ../pidgin/gtkblist.c:2875
+#: ../pidgin/gtkblist.c:2906
msgid "/Help/_Debug Window"
msgstr "/茯���/�ら���腦�(_D)"
-#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+#: ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:2910
msgid "/Help/_About"
msgstr "/茯���/����(_A)"
-#: ../pidgin/gtkblist.c:2908
+#: ../pidgin/gtkblist.c:2939
#, c-format
msgid ""
"\n"
@@ -12555,133 +14021,133 @@
"\n"
"<b>絽活��鐚�</b>%s"
-#: ../pidgin/gtkblist.c:2986
+#: ../pidgin/gtkblist.c:3017
msgid "Buddy Alias"
msgstr "絅遵��ュ��"
-#: ../pidgin/gtkblist.c:3015
+#: ../pidgin/gtkblist.c:3046
msgid "Logged In"
msgstr "綏牙�糸��"
-#: ../pidgin/gtkblist.c:3061
+#: ../pidgin/gtkblist.c:3092
msgid "Last Seen"
msgstr "筝�罨∞�糸��"
# XXX��Spooky��筝����茯�Ŭ����������鐚�筝�筝�絎�����綛初��篌主������膊���Spooky��
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3113
msgid "Spooky"
msgstr "綛初��篌主��"
-#: ../pidgin/gtkblist.c:3083
+#: ../pidgin/gtkblist.c:3115
msgid "Awesome"
msgstr "���怨��"
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3117
msgid "Rockin'"
msgstr "���怨��"
-#: ../pidgin/gtkblist.c:3428
+#: ../pidgin/gtkblist.c:3450
#, c-format
msgid "Idle %dd %dh %02dm"
msgstr "��臀� %d �� %d 絨�� %02d ��"
-#: ../pidgin/gtkblist.c:3430
+#: ../pidgin/gtkblist.c:3452
#, c-format
msgid "Idle %dh %02dm"
msgstr "��靷� %d 絨�� %02d ��"
-#: ../pidgin/gtkblist.c:3432
+#: ../pidgin/gtkblist.c:3454
#, c-format
msgid "Idle %dm"
msgstr "��靷� %d ��"
-#: ../pidgin/gtkblist.c:3577
+#: ../pidgin/gtkblist.c:3599
msgid "/Buddies/New Instant Message..."
msgstr "/絅遵�/�医�恰��荐���..."
-#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkblist.c:3633
msgid "/Buddies/Join a Chat..."
msgstr "/絅遵�/���ヨ��紊��(_C)..."
-#: ../pidgin/gtkblist.c:3579
+#: ../pidgin/gtkblist.c:3601
msgid "/Buddies/Get User Info..."
msgstr "/絅遵�/��緇�篏睡����莖�荐�..."
-#: ../pidgin/gtkblist.c:3580
+#: ../pidgin/gtkblist.c:3602
msgid "/Buddies/Add Buddy..."
msgstr "/絅遵�/�医�絅遵�..."
-#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
+#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
msgid "/Buddies/Add Chat..."
msgstr "/絅遵�/�医���紊��..."
-#: ../pidgin/gtkblist.c:3582
+#: ../pidgin/gtkblist.c:3604
msgid "/Buddies/Add Group..."
msgstr "/絅遵�/�医�臂ょ�..."
-#: ../pidgin/gtkblist.c:3617
+#: ../pidgin/gtkblist.c:3639
msgid "/Tools/Privacy"
msgstr "/綏ュ��/�援�荐㊤�"
-#: ../pidgin/gtkblist.c:3620
+#: ../pidgin/gtkblist.c:3642
msgid "/Tools/Room List"
msgstr "/綏ュ��/��紊��羝���"
-#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3739 ../pidgin/gtkdocklet.c:153
#, c-format
msgid "%d unread message from %s\n"
msgid_plural "%d unread messages from %s\n"
msgstr[0] "%d ���� %s �弱�榊�������荐���\n"
msgstr[1] "%d ���� %s �弱�榊�������荐���\n"
-#: ../pidgin/gtkblist.c:3797
+#: ../pidgin/gtkblist.c:3819
msgid "Manually"
msgstr "篏睡�������"
-#: ../pidgin/gtkblist.c:3799
+#: ../pidgin/gtkblist.c:3821
msgid "Alphabetically"
msgstr "箴��у�罸�"
-#: ../pidgin/gtkblist.c:3800
+#: ../pidgin/gtkblist.c:3822
msgid "By status"
msgstr "箴��х����"
-#: ../pidgin/gtkblist.c:3801
+#: ../pidgin/gtkblist.c:3823
msgid "By log size"
msgstr "箴��ф�ヨ�紊у�"
-#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4028 ../pidgin/gtkconn.c:178
#, c-format
msgid "%s disconnected"
msgstr "%s 腟����ｇ�"
-#: ../pidgin/gtkblist.c:4015
+#: ../pidgin/gtkblist.c:4038
msgid "Re-enable Account"
msgstr "���医����絽活��"
-#: ../pidgin/gtkblist.c:4039
+#: ../pidgin/gtkblist.c:4064
#, c-format
msgid "<span color=\"red\">%s disconnected: %s</span>"
msgstr "<span color=\"red\">%s 腟����ｇ�鐚�%s</span>"
-#: ../pidgin/gtkblist.c:4191
+#: ../pidgin/gtkblist.c:4216
msgid "<b>Username:</b>"
msgstr "<b>篏睡������腮縁�</b>"
-#: ../pidgin/gtkblist.c:4198
+#: ../pidgin/gtkblist.c:4223
msgid "<b>Password:</b>"
msgstr "<b>絲�腆種�</b>"
-#: ../pidgin/gtkblist.c:4209
+#: ../pidgin/gtkblist.c:4234
msgid "_Login"
msgstr "�糸��(_L)"
-#: ../pidgin/gtkblist.c:4292
+#: ../pidgin/gtkblist.c:4317
msgid "/Accounts"
msgstr "/絽活��"
#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4306
+#: ../pidgin/gtkblist.c:4331
#, c-format
msgid ""
"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12699,23 +14165,27 @@
#. set the Show Offline Buddies option. must be done
#. * after the treeview or faceprint gets mad. -Robot101
#.
-#: ../pidgin/gtkblist.c:4555
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/絅遵�/蕁�ず�∝�絅遵�"
-
-#: ../pidgin/gtkblist.c:4558
-msgid "/Buddies/Show Empty Groups"
-msgstr "/絅遵�/蕁�ず腥榊��絅順��臂ょ�"
-
-#: ../pidgin/gtkblist.c:4564
-msgid "/Buddies/Show Buddy Details"
-msgstr "/絅遵�/蕁�ず絅遵�膣亥�"
-
-#: ../pidgin/gtkblist.c:4567
-msgid "/Buddies/Show Idle Times"
-msgstr "/絅遵�/蕁�ず��臀�����"
-
-#: ../pidgin/gtkblist.c:5444
+#: ../pidgin/gtkblist.c:4594
+msgid "/Buddies/Show/Offline Buddies"
+msgstr "/絅遵�/蕁�ず/�∝�絅遵�"
+
+#: ../pidgin/gtkblist.c:4597
+msgid "/Buddies/Show/Empty Groups"
+msgstr "/絅遵�/蕁�ず/腥榊召腟�"
+
+#: ../pidgin/gtkblist.c:4603
+msgid "/Buddies/Show/Buddy Details"
+msgstr "/絅遵�/蕁�ず/絅遵�膣亥�"
+
+#: ../pidgin/gtkblist.c:4606
+msgid "/Buddies/Show/Idle Times"
+msgstr "/絅遵�/蕁�ず/��臀�����"
+
+#: ../pidgin/gtkblist.c:4609
+msgid "/Buddies/Show/Protocol Icons"
+msgstr "/絅遵�/蕁�ず/��荐���絎���腓�"
+
+#: ../pidgin/gtkblist.c:5501
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. "
@@ -12725,71 +14195,76 @@
"��ソ��羝���賢蕁�ず��\n"
#. End of account box
-#: ../pidgin/gtkblist.c:5479
+#: ../pidgin/gtkblist.c:5536
msgid "_Screen name:"
msgstr "絽活��(_S)鐚�"
-#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
+#: ../pidgin/gtkblist.c:5558 ../pidgin/gtkblist.c:5911
msgid "A_lias:"
msgstr "�ュ��(_L)鐚�"
-#: ../pidgin/gtkblist.c:5767
+#: ../pidgin/gtkblist.c:5823
msgid "This protocol does not support chat rooms."
msgstr "������荐���絎�筝���吧��紊����"
-#: ../pidgin/gtkblist.c:5783
+#: ../pidgin/gtkblist.c:5839
msgid ""
"You are not currently signed on with any protocols that have the ability to "
"chat."
msgstr "��研���糸�ヤ算篏�筝�����������ヨ��紊������荐���絎���"
-#: ../pidgin/gtkblist.c:5824
+#: ../pidgin/gtkblist.c:5880
msgid ""
"Please enter an alias, and the appropriate information about the chat you "
"would like to add to your buddy list.\n"
msgstr "茫�莠後�ュ�ュ��鐚��������惹�����喝���ュソ��羝�������紊�������区�荐���\n"
-#: ../pidgin/gtkblist.c:5912
+#: ../pidgin/gtkblist.c:5968
msgid "Please enter the name of the group to be added."
msgstr "茫�腟����医���臂ょ�莠後�ュ��腮宴��"
# XXX
-#: ../pidgin/gtkblist.c:6552
+#: ../pidgin/gtkblist.c:6609
msgid "<PurpleMain>/Accounts/"
msgstr "<PurpleMain>/絽活��/"
-#: ../pidgin/gtkblist.c:6576
+#: ../pidgin/gtkblist.c:6633
msgid "_Edit Account"
msgstr "膩�鹿絽活��(_E)"
# NOTE ��筝�����筝���荐宴��������羃�����鐚�絨ゅ�倶�����亥����罔∞��檎����篁ゃ��羝����
# NOTE 茘�����筝���荐宴������絽御��
-#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2982
+#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3056
msgid "No actions available"
msgstr "羃����檎����篁�"
# #NOTE ��筝�筝�����Enable Account��絨�����
-#: ../pidgin/gtkblist.c:6597
+#: ../pidgin/gtkblist.c:6654
msgid "_Disable"
msgstr "����験��(_D)"
-#: ../pidgin/gtkblist.c:6609
+#: ../pidgin/gtkblist.c:6666
msgid "Enable Account"
msgstr "����絽活��"
# XXX
-#: ../pidgin/gtkblist.c:6615
+#: ../pidgin/gtkblist.c:6672
msgid "<PurpleMain>/Accounts/Enable Account"
msgstr "<PurpleMain>/絽活��/����絽活��"
-#: ../pidgin/gtkblist.c:6664
+#: ../pidgin/gtkblist.c:6721
msgid "/Tools"
msgstr "/綏ュ��"
-#: ../pidgin/gtkblist.c:6734
+#: ../pidgin/gtkblist.c:6791
msgid "/Buddies/Sort Buddies"
msgstr "/絅遵�/絅遵�羝����綺�"
+#. Widget creation function
+#: ../pidgin/gtkcertmgr.c:549
+msgid "SSL Servers"
+msgstr "SSL 篌堺����"
+
#: ../pidgin/gtkconn.c:179
#, c-format
msgid ""
@@ -12801,225 +14276,216 @@
"%s\n"
"�����贋③�������筝����医��������絽活����鐚�%s 絨�筝�����荅������育�ｇ���"
-#: ../pidgin/gtkconv.c:485
+#: ../pidgin/gtkconv.c:462
msgid "Unknown command."
msgstr "���ョ����篁�"
-#: ../pidgin/gtkconv.c:757 ../pidgin/gtkconv.c:783
+#: ../pidgin/gtkconv.c:734 ../pidgin/gtkconv.c:760
msgid "That buddy is not on the same protocol as this chat."
msgstr "荅峨��絅遵���������紊�研��篏睡����筝�腮�����荐���絎�"
# XXX ��⑮
-#: ../pidgin/gtkconv.c:777
+#: ../pidgin/gtkconv.c:754
msgid ""
"You are not currently signed on with an account that can invite that buddy."
msgstr "��研���糸�ヤ算篏�筝����������茫�����絅遵�����荐���絎���"
-#: ../pidgin/gtkconv.c:830
+#: ../pidgin/gtkconv.c:807
msgid "Invite Buddy Into Chat Room"
msgstr "��茫�絅遵��峨�ヨ��紊��"
#. Put our happy label in it.
-#: ../pidgin/gtkconv.c:860
+#: ../pidgin/gtkconv.c:837
msgid ""
"Please enter the name of the user you wish to invite, along with an optional "
"invite message."
msgstr "茫�莠後�ユ���渇��茫���篏睡������腮縁�篁ュ���茫���荐�����"
-#: ../pidgin/gtkconv.c:881
+#: ../pidgin/gtkconv.c:858
msgid "_Buddy:"
msgstr "絅遵�(_B)鐚�"
-#: ../pidgin/gtkconv.c:901 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: ../pidgin/gtkconv.c:878 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1527
msgid "_Message:"
msgstr "荐���(_M)鐚�"
-#: ../pidgin/gtkconv.c:958 ../pidgin/gtkconv.c:2506 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:936 ../pidgin/gtkconv.c:2581 ../pidgin/gtkdebug.c:218
#: ../pidgin/gtkft.c:542
msgid "Unable to open file."
msgstr "�≧�����罟�罅���"
-#: ../pidgin/gtkconv.c:964
+#: ../pidgin/gtkconv.c:942
#, c-format
msgid "<h1>Conversation with %s</h1>\n"
msgstr "<h1>�� %s ��篋よ�</h1>\n"
-#: ../pidgin/gtkconv.c:1000
+#: ../pidgin/gtkconv.c:980
msgid "Save Conversation"
msgstr "�峨���紊��у�"
-#: ../pidgin/gtkconv.c:1149 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1129 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
msgid "Find"
msgstr "��絨�"
-#: ../pidgin/gtkconv.c:1175 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1155 ../pidgin/gtkdebug.c:194
msgid "_Search for:"
msgstr "��絨�(_S)鐚�"
-#: ../pidgin/gtkconv.c:1358
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "�ヨ�膤紫輝���������������篋よ�筝㊦��荐����遵�茴�����惹�ヨ�筝㏍��"
-
-#: ../pidgin/gtkconv.c:1366
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr "�ヨ�膤紫輝���������������篋よ�筝㊦��荐����遵�筝���茴�����惹�ヨ�筝㏍��"
-
-#: ../pidgin/gtkconv.c:1614
+#: ../pidgin/gtkconv.c:1607
msgid "Un-Ignore"
msgstr "��羔�綽順�ヤ戎����"
# NOTE��Ignore����茘���綽順�ヤ戎������鐚�篏� gtkprefs.c 筝㊦����Ignore��
# NOTE 箙���綽順�ユ�弱���������������処⑮����綽順�ャ��
-#: ../pidgin/gtkconv.c:1617
+#: ../pidgin/gtkconv.c:1610
msgid "Ignore"
msgstr "綽順��"
-#: ../pidgin/gtkconv.c:1637
+#: ../pidgin/gtkconv.c:1630
msgid "Get Away Message"
msgstr "��緇��∫��荐���"
-#: ../pidgin/gtkconv.c:1660
+#: ../pidgin/gtkconv.c:1653
msgid "Last said"
msgstr "筝�罨≧���"
-#: ../pidgin/gtkconv.c:2514
+#: ../pidgin/gtkconv.c:2589
msgid "Unable to save icon file to disk."
msgstr "�≧��峨���腓堺�罅��括�腆�筝���"
-#: ../pidgin/gtkconv.c:2565
+#: ../pidgin/gtkconv.c:2640
msgid "Save Icon"
msgstr "�峨���腓�"
-#: ../pidgin/gtkconv.c:2617
+#: ../pidgin/gtkconv.c:2692
msgid "Animate"
msgstr "����"
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2697
msgid "Hide Icon"
msgstr "�沿���霚�"
# NOTE ����Right-Click��腓堺��蕁�ず����篁わ�茘���As���冴���冴����緇�絅���
-#: ../pidgin/gtkconv.c:2625
+#: ../pidgin/gtkconv.c:2700
msgid "Save Icon As..."
msgstr "�峨���腓�..."
-#: ../pidgin/gtkconv.c:2629
+#: ../pidgin/gtkconv.c:2704
msgid "Set Custom Icon..."
msgstr "�����腓�..."
-#: ../pidgin/gtkconv.c:2642
+#: ../pidgin/gtkconv.c:2717
msgid "Remove Custom Icon"
msgstr "腱脂�よ�����腓�"
+#: ../pidgin/gtkconv.c:2844
+msgid "Show All"
+msgstr "����¨腓�"
+
#. Conversation menu
-#: ../pidgin/gtkconv.c:2784
+#: ../pidgin/gtkconv.c:2863
msgid "/_Conversation"
msgstr "/篋よ�(_C)"
-#: ../pidgin/gtkconv.c:2786
+#: ../pidgin/gtkconv.c:2865
msgid "/Conversation/New Instant _Message..."
msgstr "/絅遵�/�医�恰��荐���(_M)..."
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2870
msgid "/Conversation/_Find..."
msgstr "/篋よ�/��絨�(_F)..."
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2872
msgid "/Conversation/View _Log"
msgstr "/篋よ�/茹���罩桁兓���(_L)"
-#: ../pidgin/gtkconv.c:2794
+#: ../pidgin/gtkconv.c:2873
msgid "/Conversation/_Save As..."
msgstr "/篋よ�/����井�(_S)..."
-#: ../pidgin/gtkconv.c:2796
+#: ../pidgin/gtkconv.c:2875
msgid "/Conversation/Clea_r Scrollback"
msgstr "/篋よ�/羝�腥坂困茫��у�(_R)"
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2879
msgid "/Conversation/Se_nd File..."
msgstr "/篋よ�/�渇��罟�罅�(_N)..."
-#: ../pidgin/gtkconv.c:2801
+#: ../pidgin/gtkconv.c:2880
msgid "/Conversation/Add Buddy _Pounce..."
msgstr "/篋よ�/�医�絅遵���������(_P)..."
-#: ../pidgin/gtkconv.c:2803
+#: ../pidgin/gtkconv.c:2882
msgid "/Conversation/_Get Info"
msgstr "/篋よ�/��緇�莖�荐�(_G)"
-#: ../pidgin/gtkconv.c:2805
+#: ../pidgin/gtkconv.c:2884
msgid "/Conversation/In_vite..."
msgstr "/篋よ�/��茫�(_V)..."
-#: ../pidgin/gtkconv.c:2807
+#: ../pidgin/gtkconv.c:2886
msgid "/Conversation/M_ore"
msgstr "/篋よ�/�翫�(_O)"
-#: ../pidgin/gtkconv.c:2811
+#: ../pidgin/gtkconv.c:2890
msgid "/Conversation/Al_ias..."
msgstr "/篋よ�/�ュ��(_I)..."
-#: ../pidgin/gtkconv.c:2813
+#: ../pidgin/gtkconv.c:2892
msgid "/Conversation/_Block..."
msgstr "/篋よ�/絨���(_B)..."
-#: ../pidgin/gtkconv.c:2815
+#: ../pidgin/gtkconv.c:2894
msgid "/Conversation/_Unblock..."
msgstr "/篋よ�/茹ｉ�ゅ���(_B)..."
-#: ../pidgin/gtkconv.c:2817
+#: ../pidgin/gtkconv.c:2896
msgid "/Conversation/_Add..."
msgstr "/篋よ�/�医�(_A)..."
-#: ../pidgin/gtkconv.c:2819
+#: ../pidgin/gtkconv.c:2898
msgid "/Conversation/_Remove..."
msgstr "/篋よ�/腱脂��(_R)..."
-#: ../pidgin/gtkconv.c:2824
+#: ../pidgin/gtkconv.c:2903
msgid "/Conversation/Insert Lin_k..."
msgstr "/篋よ�/���ラ�ｇ�(_k)..."
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2905
msgid "/Conversation/Insert Imag_e..."
msgstr "/篋よ�/���ュ襲��(_E)..."
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2911
msgid "/Conversation/_Close"
msgstr "/篋よ�/����(_C)"
#. Options
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2915
msgid "/_Options"
msgstr "/�檎��(_O)"
-#: ../pidgin/gtkconv.c:2837
+#: ../pidgin/gtkconv.c:2916
msgid "/Options/Enable _Logging"
msgstr "/�檎��/��紮�荐����ヨ�(_L)"
-#: ../pidgin/gtkconv.c:2838
+#: ../pidgin/gtkconv.c:2917
msgid "/Options/Enable _Sounds"
msgstr "/�檎��/�����恰��(_S)"
-#: ../pidgin/gtkconv.c:2839
-msgid "/Options/Show Buddy _Icon"
-msgstr "/�檎��/蕁�ず絅遵���腓�(_I)"
-
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2919
msgid "/Options/Show Formatting _Toolbars"
msgstr "/�檎��/蕁�ず�弱�綏ュ�桁��(_T)"
-#: ../pidgin/gtkconv.c:2842
+#: ../pidgin/gtkconv.c:2920
msgid "/Options/Show Ti_mestamps"
msgstr "/�檎��/蕁�ず�����活�(_M)"
-#: ../pidgin/gtkconv.c:2918
+#: ../pidgin/gtkconv.c:3044
msgid "/Conversation/More"
msgstr "/篋よ�/�翫�"
-#: ../pidgin/gtkconv.c:3026
+#: ../pidgin/gtkconv.c:3100
msgid "/Options"
msgstr "/�檎��"
@@ -13028,177 +14494,173 @@
#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
#. * the 'Conversation' menu pops up because the entries can change after the
#. * conversation is created.
-#: ../pidgin/gtkconv.c:3061 ../pidgin/gtkconv.c:3093
+#: ../pidgin/gtkconv.c:3135 ../pidgin/gtkconv.c:3167
msgid "/Conversation"
msgstr "/篋よ�"
-#: ../pidgin/gtkconv.c:3101
+#: ../pidgin/gtkconv.c:3175
msgid "/Conversation/View Log"
msgstr "/篋よ�/茹���罩桁兓���"
-#: ../pidgin/gtkconv.c:3107
+#: ../pidgin/gtkconv.c:3181
msgid "/Conversation/Send File..."
msgstr "/篋よ�/�渇��罟�罅�..."
-#: ../pidgin/gtkconv.c:3111
+#: ../pidgin/gtkconv.c:3185
msgid "/Conversation/Add Buddy Pounce..."
msgstr "/篋よ�/�医�絅遵���������..."
-#: ../pidgin/gtkconv.c:3117
+#: ../pidgin/gtkconv.c:3191
msgid "/Conversation/Get Info"
msgstr "/篋よ�/��緇�莖�荐�"
-#: ../pidgin/gtkconv.c:3121
+#: ../pidgin/gtkconv.c:3195
msgid "/Conversation/Invite..."
msgstr "/篋よ�/��茫�..."
-#: ../pidgin/gtkconv.c:3127
+#: ../pidgin/gtkconv.c:3201
msgid "/Conversation/Alias..."
msgstr "/篋よ�/�ュ��..."
-#: ../pidgin/gtkconv.c:3131
+#: ../pidgin/gtkconv.c:3205
msgid "/Conversation/Block..."
msgstr "/篋よ�/絨���..."
-#: ../pidgin/gtkconv.c:3135
+#: ../pidgin/gtkconv.c:3209
msgid "/Conversation/Unblock..."
msgstr "/篋よ�/茹ｉ�ゅ���..."
-#: ../pidgin/gtkconv.c:3139
+#: ../pidgin/gtkconv.c:3213
msgid "/Conversation/Add..."
msgstr "/篋よ�/�医�..."
-#: ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkconv.c:3217
msgid "/Conversation/Remove..."
msgstr "/篋よ�/腱脂��..."
-#: ../pidgin/gtkconv.c:3149
+#: ../pidgin/gtkconv.c:3223
msgid "/Conversation/Insert Link..."
msgstr "/篋よ�/���ラ�ｇ�..."
-#: ../pidgin/gtkconv.c:3153
+#: ../pidgin/gtkconv.c:3227
msgid "/Conversation/Insert Image..."
msgstr "/篋よ�/���ュ襲��..."
-#: ../pidgin/gtkconv.c:3159
+#: ../pidgin/gtkconv.c:3233
msgid "/Options/Enable Logging"
msgstr "/�檎��/��紮�荐����ヨ�"
-#: ../pidgin/gtkconv.c:3162
+#: ../pidgin/gtkconv.c:3236
msgid "/Options/Enable Sounds"
msgstr "/�檎��/�����恰��"
-#: ../pidgin/gtkconv.c:3175
+#: ../pidgin/gtkconv.c:3249
msgid "/Options/Show Formatting Toolbars"
msgstr "/�檎��/蕁�ず�弱�綏ュ�桁��"
-#: ../pidgin/gtkconv.c:3178
+#: ../pidgin/gtkconv.c:3252
msgid "/Options/Show Timestamps"
msgstr "/�檎��/蕁�ず�����活�"
-#: ../pidgin/gtkconv.c:3181
-msgid "/Options/Show Buddy Icon"
-msgstr "/�檎��/蕁�ず絅遵���腓�"
-
-#: ../pidgin/gtkconv.c:3265 ../pidgin/gtkconv.c:3307
+#: ../pidgin/gtkconv.c:3329 ../pidgin/gtkconv.c:3371
msgid "User is typing..."
msgstr "絨��号③��叱��..."
-#: ../pidgin/gtkconv.c:3310
+#: ../pidgin/gtkconv.c:3374
msgid "User has typed something and stopped"
msgstr "絨��壕叱�ヤ�筝�篋��沿タ鐚�筝�������篋�"
#. Build the Send To menu
-#: ../pidgin/gtkconv.c:3492
+#: ../pidgin/gtkconv.c:3557 ../pidgin/gtkconv.c:8000
msgid "_Send To"
msgstr "�渇����(_S)"
-#: ../pidgin/gtkconv.c:4206
+#: ../pidgin/gtkconv.c:4270
msgid "_Send"
msgstr "�渇��(_S)"
#. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4310
+#: ../pidgin/gtkconv.c:4374
msgid "0 people in room"
msgstr "羃���篋阪�������翠��"
-#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
+#: ../pidgin/gtkconv.c:5742 ../pidgin/gtkconv.c:5863
#, c-format
msgid "%d person in room"
msgid_plural "%d people in room"
msgstr[0] "%d ��篋阪�������翠��"
msgstr[1] "%d ��篋阪�������翠��"
-#: ../pidgin/gtkconv.c:6216 ../pidgin/gtkstatusbox.c:659
+#: ../pidgin/gtkconv.c:6464 ../pidgin/gtkstatusbox.c:659
msgid "Typing"
msgstr "莠後�ヤ賢"
-#: ../pidgin/gtkconv.c:6222
+#: ../pidgin/gtkconv.c:6468
msgid "Stopped Typing"
msgstr "��罩∵叱��"
-#: ../pidgin/gtkconv.c:6227
+#: ../pidgin/gtkconv.c:6471
msgid "Nick Said"
msgstr "�援┗茴����"
-#: ../pidgin/gtkconv.c:6232 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6474 ../pidgin/gtkdocklet.c:492
msgid "Unread Messages"
msgstr "���荐���"
-#: ../pidgin/gtkconv.c:6237
+#: ../pidgin/gtkconv.c:6477
msgid "New Event"
msgstr "�遺�篁�"
# XXX
-#: ../pidgin/gtkconv.c:7210
+#: ../pidgin/gtkconv.c:7550
msgid "clear: Clears all conversation scrollbacks."
msgstr "clear鐚�羝�腥堺����篋よ������牙粂茵���"
-#: ../pidgin/gtkconv.c:7374
+#: ../pidgin/gtkconv.c:7714
msgid "Confirm close"
msgstr "腆肴�����"
-#: ../pidgin/gtkconv.c:7406
+#: ../pidgin/gtkconv.c:7746
msgid "You have unread messages. Are you sure you want to close the window?"
msgstr "�������������荐�������∈絎�荀���������荀�腦����"
-#: ../pidgin/gtkconv.c:7978
+#: ../pidgin/gtkconv.c:8333
msgid "Close other tabs"
msgstr "�����銀�����"
-#: ../pidgin/gtkconv.c:7984
+#: ../pidgin/gtkconv.c:8339
msgid "Close all tabs"
msgstr "������������"
-#: ../pidgin/gtkconv.c:7992
+#: ../pidgin/gtkconv.c:8347
msgid "Detach this tab"
msgstr "���∫��������"
-#: ../pidgin/gtkconv.c:7998
+#: ../pidgin/gtkconv.c:8353
msgid "Close this tab"
msgstr "������������"
-#: ../pidgin/gtkconv.c:8444
+#: ../pidgin/gtkconv.c:8853
msgid "Close conversation"
msgstr "����篋よ�"
-#: ../pidgin/gtkconv.c:8968
+#: ../pidgin/gtkconv.c:9455
msgid "Last created window"
msgstr "筝�筝���������荀�腦�"
-#: ../pidgin/gtkconv.c:8970
+#: ../pidgin/gtkconv.c:9457
msgid "Separate IM and Chat windows"
msgstr "篁ヤ�����荀�腦�蕁�ず�恰��荐�������紊�"
-#: ../pidgin/gtkconv.c:8972 ../pidgin/gtkprefs.c:1410
+#: ../pidgin/gtkconv.c:9459 ../pidgin/gtkprefs.c:1414
msgid "New window"
msgstr "�域�腦�"
-#: ../pidgin/gtkconv.c:8974
+#: ../pidgin/gtkconv.c:9461
msgid "By group"
msgstr "箴�臂ょ�"
-#: ../pidgin/gtkconv.c:8976
+#: ../pidgin/gtkconv.c:9463
msgid "By account"
msgstr "箴�絽活��"
@@ -13272,25 +14734,22 @@
msgid "Fatal Error"
msgstr "�顔�����荐���"
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:116
msgid "lead developer"
msgstr "筝肢����取��"
#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:77
+#: ../pidgin/gtkdialogs.c:78 ../pidgin/gtkdialogs.c:79
+#: ../pidgin/gtkdialogs.c:80 ../pidgin/gtkdialogs.c:81
+#: ../pidgin/gtkdialogs.c:82 ../pidgin/gtkdialogs.c:83
+#: ../pidgin/gtkdialogs.c:84 ../pidgin/gtkdialogs.c:85
+#: ../pidgin/gtkdialogs.c:88 ../pidgin/gtkdialogs.c:90
+#: ../pidgin/gtkdialogs.c:91
msgid "developer"
msgstr "���取��"
-#: ../pidgin/gtkdialogs.c:77
-msgid "developer & webmaster"
-msgstr "���取���主恐腴�膊∞����"
-
#: ../pidgin/gtkdialogs.c:86
msgid "support"
msgstr "���"
@@ -13299,162 +14758,175 @@
msgid "support/QA"
msgstr "��吓�弱��膊�"
-#: ../pidgin/gtkdialogs.c:109
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:111
+msgid "developer & webmaster"
+msgstr "���取���主恐腴�膊∞����"
+
+#: ../pidgin/gtkdialogs.c:98
+msgid "Senior Contributor/QA"
+msgstr "莖�羞沿旺�肢���弱��膊�"
+
+#: ../pidgin/gtkdialogs.c:107
msgid "win32 port"
msgstr "Windows ����Щ罎�"
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
msgid "maintainer"
msgstr "膓㊧Ⅲ��"
-#: ../pidgin/gtkdialogs.c:112
+#: ../pidgin/gtkdialogs.c:110
msgid "libfaim maintainer"
msgstr "libfaim 膓㊧Ⅲ��"
#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: ../pidgin/gtkdialogs.c:113
msgid "hacker and designated driver [lazy bum]"
msgstr "腮�綣靣�����惹��絎��御� [罩紙�狗�]"
+#: ../pidgin/gtkdialogs.c:114
+msgid "XMPP developer"
+msgstr "XMPP ���取��"
+
#: ../pidgin/gtkdialogs.c:115
-msgid "XMPP developer"
-msgstr "XMPP ���取��"
-
-#: ../pidgin/gtkdialogs.c:116
msgid "original author"
msgstr "��篏���"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:123
+#: ../pidgin/gtkdialogs.c:132
msgid "Afrikaans"
msgstr "�����決�㊥��"
-#: ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:133
msgid "Arabic"
msgstr "�炊��篌���"
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+#: ../pidgin/gtkdialogs.c:222
msgid "Bulgarian"
msgstr "篆��������"
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
msgid "Bengali"
msgstr "絖�������"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=B&page=2
# NOTE 羝�⑮��羈∽��絢篋���鐚��遺���⑮��羈√�絨寂���
-#: ../pidgin/gtkdialogs.c:131
+#: ../pidgin/gtkdialogs.c:140
msgid "Bosnian"
msgstr "羈√�絨寂���"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:224
msgid "Catalan"
msgstr "��羈育����"
# NOTE �頑⑮��������タ篋�綣��閿育������鐚�篏�罩ｅ幻��������贋･絲�������タ篋�茯���(Valencian)
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: ../pidgin/gtkdialogs.c:142 ../pidgin/gtkdialogs.c:143
msgid "Valencian-Catalan"
msgstr "����タ篋���"
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:225
msgid "Czech"
msgstr "�桁����"
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:145 ../pidgin/gtkdialogs.c:146
msgid "Danish"
msgstr "筝拷坤��"
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:226
msgid "German"
msgstr "緇傑��"
# NOTE ��������筝�筝鴻��鐚�筝㊧⑮��箴�����筝�箴�茯�����
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=D
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
+#: ../pidgin/gtkdialogs.c:151
msgid "Dzongkha"
msgstr "筝�筝号��"
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
msgid "Greek"
msgstr "絽�����"
-#: ../pidgin/gtkdialogs.c:145
+#: ../pidgin/gtkdialogs.c:154
msgid "Australian English"
msgstr "羮恰寛綣�偎��"
-#: ../pidgin/gtkdialogs.c:146
+#: ../pidgin/gtkdialogs.c:155
msgid "Canadian English"
msgstr "���水ぇ綣�偎��"
-#: ../pidgin/gtkdialogs.c:147
+#: ../pidgin/gtkdialogs.c:156
msgid "British English"
msgstr "�怨��掩��"
# XXX 絲����������鐚�筝����鐚�篏�絲�������ソ�閽���篋阪���筝��������� - Ambrose
-#: ../pidgin/gtkdialogs.c:148
+#: ../pidgin/gtkdialogs.c:157
msgid "Esperanto"
msgstr "筝���茯�"
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
msgid "Spanish"
msgstr "茱睡�����"
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:159
+msgid "Estonian"
+msgstr "��羃�絨寂���"
+
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:161
msgid "Euskera(Basque)"
msgstr "綏贋������"
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
msgid "Persian"
msgstr "羈∽����"
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
msgid "Finnish"
msgstr "���㊥��"
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
msgid "French"
msgstr "羈���"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=1
-#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:237
msgid "Galician"
msgstr "����茱推���"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=G&page=2
-#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
msgid "Gujarati"
msgstr "�ゅ�����号��"
-#: ../pidgin/gtkdialogs.c:160
+#: ../pidgin/gtkdialogs.c:170
msgid "Gujarati Language Team"
msgstr "�ゅ�����号��膺肢⑮絨靚�"
-#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
+#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:238
msgid "Hebrew"
msgstr "絽�篌����"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:172
msgid "Hindi"
msgstr "�医墾��"
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:173
msgid "Hungarian"
msgstr "��������"
-#: ../pidgin/gtkdialogs.c:164
+#: ../pidgin/gtkdialogs.c:174
msgid "Indonesian"
msgstr "�医絢��"
@@ -13463,54 +14935,54 @@
# NOTE �榊�ｇ��筝㊤�����後��蕁�羈�篋������鎀у����罌�鐚�茘����鎀у������荅我�莠�絅純��
# NOTE����荀���Slovenian����
# NOTE 荐誌��� zh_TW �� zh_HK 罩ｅ���絎駈��������医�茘����臂�ぇ����
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:239
msgid "Italian"
msgstr "臂�ぇ����"
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
-#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241 ../pidgin/gtkdialogs.c:242
msgid "Japanese"
msgstr "�ユ��"
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:243
msgid "Georgian"
msgstr "��音篋���"
# FIXME ��札茘�ソ筝�藥� 20070520 acli
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:177
msgid "Ubuntu Georgian Translators"
msgstr "Ubuntu ��筝�������音篋���膺肢⑮篋阪��"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
# NOTE 荐誌�KDE 茘����������
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
msgid "Kannada"
msgstr "綺欠�����"
-#: ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:178
msgid "Kannada Translation team"
msgstr "綺欠�����膺肢⑮絨靚�"
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:245
msgid "Korean"
msgstr "����"
# NOTE 羝�⑮������綺��上招��鐚��域⑮����綺�招��鐚�罔�羣�茘��鐚���箴�篋��絽梧�鐚�����綺��上招��
# NOTE 荐誌��� zh_TW �� zh_HK 罩ｅ���絎駈�篆����医�茘����綺�招��
-#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
+#: ../pidgin/gtkdialogs.c:180 ../pidgin/gtkdialogs.c:181
+#: ../pidgin/gtkdialogs.c:182
msgid "Kurdish"
msgstr "綺�招��"
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:247
msgid "Lithuanian"
msgstr "腴��九���"
# NOTE��薤��狗���������腮��掩�茯���鐚�莊�絽�����薤��狗��筝��♂��篆�
-#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:248
msgid "Macedonian"
msgstr "薤��狗����"
@@ -13519,61 +14991,55 @@
# NOTE �銀�茘�������筝拷坤鐚������鐚�紊ц�援�丞�鐚���筝拷坤綣�Û���鐚�膓㊤�榊�丞�鐚����掩�������罔�羣������鐚����т����羣�鐚���紊��� :P鐚�
# NOTE 茘��割����上�����������緇�����磁�э�箙���筝�����磁��茘��恰�上�����������������箙���
# NOTE �∞����罔�羣���筝�荅�鐚���荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:249
msgid "Bokm奪l Norwegian"
msgstr "罔�羣������"
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:187
msgid "Nepali"
msgstr "絨惹��丈��"
# NOTE Flemish 茘�����篋�http://www.ee.tku.edu.tw/~rexchen/cdict/
# XXX Dutch �� Flemish ����筝�腮��荐�鐚�������荅峨Û����決�㊥����鐚���ｻ��羈��㊤招������鐚�
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:188
msgid "Dutch, Flemish"
msgstr "�決�㊥��鐚閿��㊤招����"
-# XXX ����荅我����nn��腆種��潟��Nynorsk Norwegian��鐚���篁ョ�頑⑮���������筝���亥��
-# XXX 篏���������no��腆種�篏� no.po �九�綏牙�筝�絖��������＞��№����
-#: ../pidgin/gtkdialogs.c:179
-msgid "Norwegian"
-msgstr "�����"
-
-#: ../pidgin/gtkdialogs.c:180
+#: ../pidgin/gtkdialogs.c:189
msgid "Norwegian Nynorsk"
msgstr "�井�����"
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:191
+#: ../pidgin/gtkdialogs.c:192 ../pidgin/gtkdialogs.c:250
msgid "Polish"
msgstr "羈∵�㊥��"
-#: ../pidgin/gtkdialogs.c:184
+#: ../pidgin/gtkdialogs.c:193
msgid "Portuguese"
msgstr "罔�羣�����"
-#: ../pidgin/gtkdialogs.c:185
+#: ../pidgin/gtkdialogs.c:194
msgid "Portuguese-Brazil"
msgstr "綏頑タ����"
# NOTE�������������育�順��箴����罩ｅ幻��茘��
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=P&page=2
-#: ../pidgin/gtkdialogs.c:186
+#: ../pidgin/gtkdialogs.c:195
msgid "Pashto"
msgstr "�������"
-#: ../pidgin/gtkdialogs.c:187
+#: ../pidgin/gtkdialogs.c:196
msgid "Romanian"
msgstr "臂�薤�絢篋���"
-#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
msgid "Russian"
msgstr "篆���"
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:198 ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:253 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:255
msgid "Slovak"
msgstr "���篌�����"
@@ -13581,99 +15047,101 @@
# NOTE 篁ョ乙茯��守�鰹�莊��肴⑮�����守�活�羣�鐚�羈�筝�鐚����喝���臂��箙���zh_TW鐚�
# NOTE ��篁ヤ�莊�羝�⑮鐚��九���ぇ�梧⑮羈�鐚�鐚�莊��肴⑮��
# NOTE����荀���Italian����
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:256
msgid "Slovenian"
msgstr "���膓㊤絢篋���"
-#: ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:201
msgid "Albanian"
msgstr "�睡�上郡絨寂���"
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
msgid "Serbian"
msgstr "紂��丞境篋���"
-#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:258
msgid "Swedish"
msgstr "���御��"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
# NOTE 羝����⑮��羈亥嘘�障��鐚��遺���⑮��紂�膠括�障��鐚���箴�莠�絽梧�鐚�����羈亥嘘�障��
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:205
msgid "Tamil"
msgstr "��嘘�丈��"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:206
msgid "Telugu"
msgstr "緇傑��紲���"
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:207
msgid "Thai"
msgstr "羈井��"
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:259
msgid "Turkish"
msgstr "���喝�倶��"
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
msgid "Vietnamese"
msgstr "莇�����"
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:209
msgid "T.M.Thanh and the Gnome-Vi Team"
msgstr "T.M.Thanh �� Gnome 莇�����膺肢⑮絨靚�箙��銀�腟���"
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:210 ../pidgin/gtkdialogs.c:260
msgid "Simplified Chinese"
msgstr "膂♂�筝㊥��"
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
msgid "Hong Kong Chinese"
msgstr "羝��筝㊥��"
-#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:261
msgid "Traditional Chinese"
msgstr "罩ｉ�筝㊥��"
# NOTE ��荀� http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
-#: ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:221
msgid "Amharic"
msgstr "�水�������"
-#: ../pidgin/gtkdialogs.c:334
+#: ../pidgin/gtkdialogs.c:346
#, c-format
msgid "About %s"
msgstr "���� %s"
-#: ../pidgin/gtkdialogs.c:372
+#: ../pidgin/gtkdialogs.c:384
#, c-format
msgid ""
"%s is a graphical modular messaging client based on libpurple which is "
"capable of connecting to AIM, MSN, Yahoo!, XMPP, 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 %s. %s is copyrighted "
-"by its contributors. See the 'COPYRIGHT' file for the complete list of "
-"contributors. We provide no warranty for this program.<BR><BR>"
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, 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 %s. %s "
+"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 ""
"%s 篆�筝���篁� GTK+ ���種���綵≫��√���罔∞���荐����綣��篁� libpurple �阪�榊�鐚�����"
"��箴� AIM��MSN��Yahoo!��XMPP��ICQ��IRC��SILC��SIP/SIMPLE��Novell GroupWise��"
-"Lotus Sametime��Bonjour��Zephyr��Gadu-Gadu �� QQ 膈����純��<BR><BR>���ユ�����篆�"
-"�号���寂�����腮�綣���������� GPL鐚�篁紙��膃������莠��亥���銀��������罌�罨上�喝��%s ��"
-"綏臥����筝�篁� GPL, �狗�������冴��COPYING����罟�罅�箙��с��%s 篆�����罨�����篏�鐚���罨�罩後��"
-"��旺�肢���怨������鐚�莢∝�肢���喝��荅喝�������冴��COPYRIGHT����罟�罅��с�����綣��鋇���箴�篁�"
-"篏�篆�����<BR><BR>"
-
-#: ../pidgin/gtkdialogs.c:387
+"Lotus Sametime��Bonjour��Zephyr��MySpaceIM��Gadu-Gadu �� QQ 膈����純��<BR><BR>"
+"���ユ�����篆��号���寂�����腮�綣���������� GPL鐚�篁紙��膃������莠��亥���銀��������罌�"
+"罨上�喝��%s �у群����筝�篁� GPL, �狗�������冴��COPYING����罟�罅�箙��с��%s 篆�����罨�����"
+"篏�鐚���罨�罩後����旺�肢���怨������鐚�莢∝�肢���喝��荅喝�������冴��COPYRIGHT����罟�罅��с�����"
+"綣��鋇���箴�篁私�篆�����<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:402
msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
msgstr ""
"<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 筝��� #pidgin �脂��<BR><BR>"
-#: ../pidgin/gtkdialogs.c:392
+#: ../pidgin/gtkdialogs.c:407
msgid "Current Developers"
msgstr "�鞘算���取��"
@@ -13681,80 +15149,85 @@
# NOTE Luke Schierer 茯�:����篋�篋坂�������篋�鐚�����筝����� gaim 莖ｅ����
# NOTE ��篁ユ③腆榊��茘������������牙��罔∞�篏�����������罔∞������俄�����箙�蕁�����
# NOTE 筝�����罔ｅソ���騌���蚕鐚���篁ョ浸�������援��罔∞�篏�������罸�莠�絅� :P
-#: ../pidgin/gtkdialogs.c:407
+#: ../pidgin/gtkdialogs.c:422
msgid "Crazy Patch Writers"
msgstr "���援��罔∞�篏���"
-#: ../pidgin/gtkdialogs.c:422
+#: ../pidgin/gtkdialogs.c:437
msgid "Retired Developers"
msgstr "��篁脂���取��"
+# NOTE ��荀���Crazy Patch Writer��罌�
+#: ../pidgin/gtkdialogs.c:452
+msgid "Retired Crazy Patch Writers"
+msgstr "��篁紫�����掩─腟�篏���"
+
# NOTE ��⑮��臂�轡篋阪�＜��鐚�篏��ｆ���篆�絎���茘��鐚�Pidgin �� Artist ����荐㊧���腓冴�����井�雁��篁��∝�膈���篋�緇��ｅ����綏ヤ���篋削���篁ュ���¨����荐㊧��＜��
-#: ../pidgin/gtkdialogs.c:437
+#: ../pidgin/gtkdialogs.c:467
msgid "Artists"
msgstr "綛渇�∵┃荐�"
-#: ../pidgin/gtkdialogs.c:452
+#: ../pidgin/gtkdialogs.c:482
msgid "Current Translators"
msgstr "�鞘算茘���"
-#: ../pidgin/gtkdialogs.c:472
+#: ../pidgin/gtkdialogs.c:502
msgid "Past Translators"
msgstr "��篁肢⑮��"
# NOTE ���������� Pidgin��荀�腦�筝㍼���緇��榊憼����篏��ら��������腮��荐�鐚�筝��処⑮����荐�����
-#: ../pidgin/gtkdialogs.c:490
+#: ../pidgin/gtkdialogs.c:520
msgid "Debugging Information"
msgstr "�ら������荐�"
-#: ../pidgin/gtkdialogs.c:859
+#: ../pidgin/gtkdialogs.c:890
msgid "Get User Info"
msgstr "��緇�篏睡����莖�荐�"
-#: ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:892
msgid ""
"Please enter the screen name or alias of the person whose info you would "
"like to view."
msgstr "茫�莠後�ユ�����活��ヨ�絨�莟∞��絽活����"
-#: ../pidgin/gtkdialogs.c:951
+#: ../pidgin/gtkdialogs.c:982
msgid "View User Log"
msgstr "茹���篏睡�����ヨ�"
-#: ../pidgin/gtkdialogs.c:953
+#: ../pidgin/gtkdialogs.c:984
msgid ""
"Please enter the screen name or alias of the person whose log you would like "
"to view."
msgstr "茫�莠後�ユ�����活�莅����ヨ���篏睡������絽活�����ュ����"
# XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:1004
msgid "Alias Contact"
msgstr "�咲��腟�絅遵���筝��ュ��"
# XXX 筝㊥��茘����≧����ュ�冴��Alias Buddy������Alias Contact��
-#: ../pidgin/gtkdialogs.c:974
+#: ../pidgin/gtkdialogs.c:1005
msgid "Enter an alias for this contact."
msgstr "茫��咲��腟�絅遵�莠後�ヤ����ュ����"
-#: ../pidgin/gtkdialogs.c:996
+#: ../pidgin/gtkdialogs.c:1027
#, c-format
msgid "Enter an alias for %s."
msgstr "茫��� %s 莠後�ヤ����ュ��"
-#: ../pidgin/gtkdialogs.c:998
+#: ../pidgin/gtkdialogs.c:1029
msgid "Alias Buddy"
msgstr "�咲����絅遵���筝��ュ��"
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1050
msgid "Alias Chat"
msgstr "腟���紊���劫�ュ��"
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1051
msgid "Enter an alias for this chat."
msgstr "茫��咲������紊��莠後�ヤ����ュ����"
-#: ../pidgin/gtkdialogs.c:1059
+#: ../pidgin/gtkdialogs.c:1090
#, c-format
msgid ""
"You are about to remove the contact containing %s and %d other buddy from "
@@ -13770,32 +15243,32 @@
"篏����"
# XXX��Remove Buddy������Remove Contact����賢����Pidgin�≧����ワ����醇���拷�牙��腥咲��
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1098
msgid "Remove Contact"
msgstr "腱脂�ら��腟�絅遵�"
# XXX��Remove Buddy������Remove Contact����賢����Pidgin�≧����ワ����醇���拷�牙��腥咲��
-#: ../pidgin/gtkdialogs.c:1070
+#: ../pidgin/gtkdialogs.c:1101
msgid "_Remove Contact"
msgstr "腱脂�よ��機篋�(_R)"
# TODO 茘�����緇��拷�� - 20061025
-#: ../pidgin/gtkdialogs.c:1101
+#: ../pidgin/gtkdialogs.c:1132
#, c-format
msgid ""
"You are about to merge the group called %s into the group called %s. Do you "
"want to continue?"
msgstr "��③荅���絨�臂ょ� %s �� %s ��篏居��亥召腟�篁ュ����遵�������膵主�������篏����"
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1139
msgid "Merge Groups"
msgstr "��篏窮召腟�"
-#: ../pidgin/gtkdialogs.c:1111
+#: ../pidgin/gtkdialogs.c:1142
msgid "_Merge Groups"
msgstr "��篏窮召腟�(_M)"
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1192
#, c-format
msgid ""
"You are about to remove the group %s and all its members from your buddy "
@@ -13803,42 +15276,42 @@
msgstr ""
"��③荅���絨�臂ょ� %s ���檎�������≦�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1195
msgid "Remove Group"
msgstr "腱脂�ょ召腟�"
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1198
msgid "_Remove Group"
msgstr "腱脂�ょ召腟�(_R)"
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1231
#, c-format
msgid ""
"You are about to remove %s from your buddy list. Do you want to continue?"
msgstr "��③荅���絨� %s 緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
# XXX��Remove Buddy������Remove Contact����賢����Pidgin�≧����ワ����醇���拷�牙��腥咲��
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1234
msgid "Remove Buddy"
msgstr "腱脂�ら����絅遵�"
# XXX��Remove Buddy������Remove Contact����賢����Pidgin�≧����ワ����醇���拷�牙��腥咲��
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1237
msgid "_Remove Buddy"
msgstr "腱脂�ら����絅遵�(_R)"
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1258
#, c-format
msgid ""
"You are about to remove the chat %s from your buddy list. Do you want to "
"continue?"
msgstr "��③荅���絨� %s 緇�����絅遵�羝���賢腱脂�ゃ�����膵主�������篏����"
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1261
msgid "Remove Chat"
msgstr "腱脂�よ��紊��"
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1264
msgid "_Remove Chat"
msgstr "腱脂�よ��紊��(_R)"
@@ -13954,7 +15427,7 @@
msgstr "罟�罅��活叱膣亥�(_D)"
#. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:94
msgid "_Pause"
msgstr "����(_P)"
@@ -13964,44 +15437,44 @@
msgstr "�√奨(_R)"
# NOTE Nautilus茘���莢寂�������鐚�Abiword茘������弱���莢寂���鐚��巡��醇��篋���
-#: ../pidgin/gtkimhtml.c:795
+#: ../pidgin/gtkimhtml.c:815
msgid "Paste as Plain _Text"
msgstr "莢寂�膣���絖�(_T)"
-#: ../pidgin/gtkimhtml.c:812
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1190
msgid "_Reset formatting"
msgstr "羝��ゆ�弱���(_R)"
-#: ../pidgin/gtkimhtml.c:1349
+#: ../pidgin/gtkimhtml.c:1372
msgid "Hyperlink color"
msgstr "�ｇ�蕁��"
-#: ../pidgin/gtkimhtml.c:1350
+#: ../pidgin/gtkimhtml.c:1373
msgid "Color to draw hyperlinks."
msgstr "馹�ず�ｇ���������蕁�儸��"
-#: ../pidgin/gtkimhtml.c:1353
+#: ../pidgin/gtkimhtml.c:1376
msgid "Hyperlink prelight color"
msgstr "�ｇ�蕁��"
-#: ../pidgin/gtkimhtml.c:1354
+#: ../pidgin/gtkimhtml.c:1377
msgid "Color to draw hyperlinks when mouse is over them."
msgstr "�嚱�藜�膓����ｇ������ｇ�蕁�儸��"
-#: ../pidgin/gtkimhtml.c:1575
+#: ../pidgin/gtkimhtml.c:1597
msgid "_Copy E-Mail Address"
msgstr "茲�茖初�糸��灸散�医��(_C)"
-#: ../pidgin/gtkimhtml.c:1587
+#: ../pidgin/gtkimhtml.c:1609
msgid "_Open Link in Browser"
msgstr "���頳遵��賢�����ｇ�(_O)"
-#: ../pidgin/gtkimhtml.c:1597
+#: ../pidgin/gtkimhtml.c:1619
msgid "_Copy Link Location"
msgstr "茲�茖初�ｇ�篏���(_C)"
# NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
-#: ../pidgin/gtkimhtml.c:3341
+#: ../pidgin/gtkimhtml.c:3365
msgid ""
"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
"\n"
@@ -14012,7 +15485,7 @@
"����倶�� PNG 罟�������"
# NOTE "Defaulting to PNG" ���� gaim ���∴����順����羈�筝��牙��綵怨��� PNG �弢�
-#: ../pidgin/gtkimhtml.c:3344
+#: ../pidgin/gtkimhtml.c:3368
msgid ""
"Unrecognized file type\n"
"\n"
@@ -14022,7 +15495,7 @@
"\n"
"����倶�� PNG 罟�������"
-#: ../pidgin/gtkimhtml.c:3373
+#: ../pidgin/gtkimhtml.c:3397
#, c-format
msgid ""
"<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -14033,7 +15506,7 @@
"\n"
"%s"
-#: ../pidgin/gtkimhtml.c:3376
+#: ../pidgin/gtkimhtml.c:3400
#, c-format
msgid ""
"Error saving image\n"
@@ -14044,130 +15517,201 @@
"\n"
"%s"
-#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
+#: ../pidgin/gtkimhtml.c:3478 ../pidgin/gtkimhtml.c:3490
msgid "Save Image"
msgstr "�峨�綵怨��"
-#: ../pidgin/gtkimhtml.c:3494
+#: ../pidgin/gtkimhtml.c:3518
msgid "_Save Image..."
msgstr "�峨�綵怨��(_S)..."
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: ../pidgin/gtkimhtmltoolbar.c:162
msgid "Select Font"
msgstr "�御��絖���"
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: ../pidgin/gtkimhtmltoolbar.c:241
msgid "Select Text Color"
msgstr "荐㊤���絖�蕁��"
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: ../pidgin/gtkimhtmltoolbar.c:320
msgid "Select Background Color"
msgstr "頥㊤��������"
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: ../pidgin/gtkimhtmltoolbar.c:409
msgid "_URL"
msgstr "_URL"
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: ../pidgin/gtkimhtmltoolbar.c:417
msgid "_Description"
msgstr "�颷�(_D)"
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: ../pidgin/gtkimhtmltoolbar.c:420
msgid ""
"Please enter the URL and description of the link that you want to insert. "
"The description is optional."
msgstr "茫�莠後�ユ����荀����ョ�� URL ��絎����颷逸��颷井���御���х��鐚������叱�ャ��"
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: ../pidgin/gtkimhtmltoolbar.c:424
msgid "Please enter the URL of the link that you want to insert."
msgstr "茫�莠後�ユ����荀����ョ�� URL��"
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: ../pidgin/gtkimhtmltoolbar.c:429 ../pidgin/gtkimhtmltoolbar.c:1098
msgid "Insert Link"
msgstr "���ラ�ｇ�"
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
+#: ../pidgin/gtkimhtmltoolbar.c:433 ../pidgin/gtkimhtmltoolbar.c:1258
msgid "_Insert"
msgstr "����(_I)"
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: ../pidgin/gtkimhtmltoolbar.c:513
#, c-format
msgid "Failed to store image: %s\n"
msgstr "�≧��峨�綵怨���%s\n"
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: ../pidgin/gtkimhtmltoolbar.c:539 ../pidgin/gtkimhtmltoolbar.c:549
msgid "Insert Image"
msgstr "���ュ襲��"
# XXX 茘���筝�����
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: ../pidgin/gtkimhtmltoolbar.c:760
msgid "This theme has no available smileys."
msgstr "����茵���筝脂�筝���算篏�茵�����"
#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: ../pidgin/gtkimhtmltoolbar.c:777
msgid "Smile!"
msgstr "膃�筝���鐚�"
-#: ../pidgin/gtkimhtmltoolbar.c:1064
-msgid "_Bold"
-msgstr "膕�蕭�(_B)"
+#: ../pidgin/gtkimhtmltoolbar.c:842 ../pidgin/gtkimhtmltoolbar.c:1215
+msgid "_Font"
+msgstr "絖���(_F)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+#, fuzzy
+msgid "Group Items"
+msgstr "臂ょ� ID鐚�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1050
+msgid "Ungroup Items"
+msgstr "茹ｉ�ょ召腟�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1084 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "膕�蕭�"
# NOTE��Italic�����������腮�綺��罔＞賛��絲���篁ユ�牙��坂源��絖���鐚�����蕭����九����茘��篏�綏我�号訓���削�筝����醇�号③
-#: ../pidgin/gtkimhtmltoolbar.c:1065
-msgid "_Italic"
-msgstr "��蕭�(_I)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1066
-msgid "_Underline"
-msgstr "綺�膩�(_U)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1067
-msgid "_Larger"
-msgstr "�上ぇ絖�蕭�(_L)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1069
+#: ../pidgin/gtkimhtmltoolbar.c:1085 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "��蕭�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1086 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "綺�膩�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1087
+msgid "Strikethrough"
+msgstr "���ょ�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1089
+msgid "Increase Font Size"
+msgstr "�上ぇ絖�蕭�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1090
+msgid "Decrease Font Size"
+msgstr "膰��絖�蕭�"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1092
+msgid "Font Face"
+msgstr "絖���"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1093
+msgid "Background Color"
+msgstr "�������"
+
+# XXX 茘�����絖�蕁�儸�������絅緒� - acli 20070614
+#: ../pidgin/gtkimhtmltoolbar.c:1094
+msgid "Foreground Color"
+msgstr "�������"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1096
+msgid "Reset Formatting"
+msgstr "羝��ゆ�弱���"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1099
+msgid "Insert IM Image"
+msgstr "���ュ襲��"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Insert Smiley"
+msgstr "���ヨ；��"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1175
+msgid "<b>_Bold</b>"
+msgstr "<b>膕�蕭�(_B)</b>"
+
+# NOTE��Italic�����������腮�綺��罔＞賛��絲���篁ユ�牙��坂源��絖���鐚�����蕭����九����茘��篏�綏我�号訓���削�筝����醇�号③
+#: ../pidgin/gtkimhtmltoolbar.c:1176
+msgid "<i>_Italic</i>"
+msgstr "<i>��蕭�(_I)</i>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1177
+msgid "<u>_Underline</u>"
+msgstr "<u>綺�膩�(_U)</u>"
+
+# NOTE ����箴������PO罟���茘��鐚��医�決�茯���箴�箙�羃����∽��茘��鐚�
+#: ../pidgin/gtkimhtmltoolbar.c:1178
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr "<span strikethrough='true'>���ょ�</span>"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1179
+#, fuzzy
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+"<span size='larger' weight='bold'>�峨�綵怨���鋇㊦�主�����</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1181
msgid "_Normal"
msgstr "罩ｅ幻(_N)"
-#: ../pidgin/gtkimhtmltoolbar.c:1071
-msgid "_Smaller"
-msgstr "膰��絖�蕭�(_S)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1072
+#: ../pidgin/gtkimhtmltoolbar.c:1183
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr "<span size='smaller'>膰��(_S)</span>"
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+#: ../pidgin/gtkimhtmltoolbar.c:1187
msgid "_Font face"
msgstr "絖���(_F)"
# XXX 茘�����絖�蕁�儸�������絅緒� - acli 20070614
-#: ../pidgin/gtkimhtmltoolbar.c:1073
-msgid "_Foreground color"
-msgstr "�������(_F)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1074
-msgid "_Background color"
-msgstr "�������(_B)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1100
-msgid "_Font"
-msgstr "絖���(_F)"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1135
-msgid "_Reset font"
-msgstr "羝��ゆ�弱���(_R)"
+#: ../pidgin/gtkimhtmltoolbar.c:1188
+msgid "Foreground _color"
+msgstr "�������(_C)"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1189
+msgid "Bac_kground color"
+msgstr "�������(_K)"
# XXX
-#: ../pidgin/gtkimhtmltoolbar.c:1162
+#: ../pidgin/gtkimhtmltoolbar.c:1266
msgid "_Smiley"
msgstr "膃�筝���鐚�(_S)"
-#: ../pidgin/gtkimhtmltoolbar.c:1168
+#: ../pidgin/gtkimhtmltoolbar.c:1272
msgid "_Image"
msgstr "綵怨��(_I)"
-#: ../pidgin/gtkimhtmltoolbar.c:1174
+#: ../pidgin/gtkimhtmltoolbar.c:1278
msgid "_Link"
msgstr "�ｇ�(_L)"
+#: ../pidgin/gtkimhtmltoolbar.c:1284
+msgid "_Horizontal rule"
+msgstr "罘��(_H)"
+
# XXX 筝����� - ambrose 20070415
#: ../pidgin/gtklog.c:292
#, c-format
@@ -14252,14 +15796,14 @@
msgid "System Log"
msgstr "膤紫輝�ヨ�"
-#: ../pidgin/gtkmain.c:385
+#: ../pidgin/gtkmain.c:386
#, c-format
msgid "%s %s. Try `%s -h' for more information.\n"
msgstr "%s %s���決���%s -h��篁ョ�峨��顔�俄�罩ョ��莖�荐���\n"
# FIXME
# NOTE hard-code 篋�筝�����Pidgin����⑮��茖��篏��������藥��育�ｏ�篁ゆ���ラ�ｆ���鐚�������篆���鐚�緇��喝�井��┌�����膊�
-#: ../pidgin/gtkmain.c:387
+#: ../pidgin/gtkmain.c:388
#, c-format
msgid ""
"%s %s\n"
@@ -14286,7 +15830,7 @@
"���絽活��鐚�筝�戎����������) \n"
" -v, --version 蕁�ず�������研�∫��\n"
-#: ../pidgin/gtkmain.c:511
+#: ../pidgin/gtkmain.c:512
#, c-format
msgid ""
"%s has segfaulted and attempted to dump a core file.\n"
@@ -14311,48 +15855,48 @@
# TODO Untranslated - This will need to be translated (NOT transliterated) for Chinese, but that'd be too much work
#. Translators may want to transliterate the name.
#. It is not to be translated.
-#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:50
msgid "Pidgin"
msgstr "Pidgin"
-#: ../pidgin/gtknotify.c:343
+#: ../pidgin/gtknotify.c:348
msgid "Open All Messages"
msgstr "��������荐���"
-#: ../pidgin/gtknotify.c:395
+#: ../pidgin/gtknotify.c:401
msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
msgstr "<span weight=\"bold\" size=\"larger\">�����灸散鐚�</span>"
-#: ../pidgin/gtknotify.c:515
+#: ../pidgin/gtknotify.c:521
#, c-format
msgid "%s has %d new message."
msgid_plural "%s has %d new messages."
msgstr[0] "%s �� %d 絨��育�灸散��"
msgstr[1] "%s �� %d 絨��育�灸散��"
-#: ../pidgin/gtknotify.c:526
+#: ../pidgin/gtknotify.c:532
#, c-format
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>"
-#: ../pidgin/gtknotify.c:965
+#: ../pidgin/gtknotify.c:957
#, c-format
msgid "The browser command \"%s\" is invalid."
msgstr "�頳遵����篁ゃ��%s�����≧������"
-#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
-#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
+#: ../pidgin/gtknotify.c:959 ../pidgin/gtknotify.c:971
+#: ../pidgin/gtknotify.c:984 ../pidgin/gtknotify.c:1112
msgid "Unable to open URL"
msgstr "�≧�����膓臥��"
-#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
+#: ../pidgin/gtknotify.c:969 ../pidgin/gtknotify.c:982
#, c-format
msgid "Error launching \"%s\": %s"
msgstr "���� \"%s\" ���主�����鐚�%s"
-#: ../pidgin/gtknotify.c:1121
+#: ../pidgin/gtknotify.c:1113
msgid ""
"The 'Manual' browser command has been chosen, but no command has been set."
msgstr "���悟�����篏睡��������頳遵����鐚��紙����荐㊤���篁ゃ��"
@@ -14404,100 +15948,100 @@
msgstr "�御��罟�罅�"
#. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: ../pidgin/gtkpounce.c:531
msgid "Pounce on Whom"
msgstr "����茯亥������"
-#: ../pidgin/gtkpounce.c:560
+#: ../pidgin/gtkpounce.c:558
msgid "_Buddy name:"
msgstr "絅遵���腮�(_B)鐚�"
+#: ../pidgin/gtkpounce.c:592
+msgid "Si_gns on"
+msgstr "�糸��(_G)"
+
#: ../pidgin/gtkpounce.c:594
-msgid "Si_gns on"
-msgstr "�糸��(_G)"
+msgid "Signs o_ff"
+msgstr "�糸��(_F)"
#: ../pidgin/gtkpounce.c:596
-msgid "Signs o_ff"
-msgstr "�糸��(_F)"
+msgid "Goes a_way"
+msgstr "�∫��(_W)"
#: ../pidgin/gtkpounce.c:598
-msgid "Goes a_way"
-msgstr "�∫��(_W)"
+msgid "Ret_urns from away"
+msgstr "菴���(_U)"
#: ../pidgin/gtkpounce.c:600
-msgid "Ret_urns from away"
-msgstr "菴���(_U)"
+msgid "Becomes _idle"
+msgstr "��臀�(_I)"
#: ../pidgin/gtkpounce.c:602
-msgid "Becomes _idle"
-msgstr "��臀�(_I)"
-
-#: ../pidgin/gtkpounce.c:604
msgid "Is no longer i_dle"
msgstr "筝�����臀�(_D)"
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:604
msgid "Starts _typing"
msgstr "��紮�莠後��(_T)"
+#: ../pidgin/gtkpounce.c:606
+msgid "P_auses while typing"
+msgstr "����莠後��(_A)"
+
#: ../pidgin/gtkpounce.c:608
-msgid "P_auses while typing"
-msgstr "����莠後��(_A)"
-
-#: ../pidgin/gtkpounce.c:610
msgid "Stops t_yping"
msgstr "��罩∵叱��(_Y)"
-#: ../pidgin/gtkpounce.c:612
+#: ../pidgin/gtkpounce.c:610
msgid "Sends a _message"
msgstr "���坂���荐���(_M)"
+#: ../pidgin/gtkpounce.c:653
+msgid "Ope_n an IM window"
+msgstr "�����恰��荐����腦�(_N)"
+
#: ../pidgin/gtkpounce.c:655
-msgid "Ope_n an IM window"
-msgstr "�����恰��荐����腦�(_N)"
-
-#: ../pidgin/gtkpounce.c:657
msgid "_Pop up a notification"
msgstr "綵��咲����(_P)"
-#: ../pidgin/gtkpounce.c:659
+#: ../pidgin/gtkpounce.c:657
msgid "Send a _message"
msgstr "���肴���(_M)"
+#: ../pidgin/gtkpounce.c:659
+msgid "E_xecute a command"
+msgstr "�決���篁�(_X)"
+
#: ../pidgin/gtkpounce.c:661
-msgid "E_xecute a command"
-msgstr "�決���篁�(_X)"
-
-#: ../pidgin/gtkpounce.c:663
msgid "P_lay a sound"
msgstr "�㊥�冗�恰��(_L)"
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:667
msgid "Brows_e..."
msgstr "�頳�(_E)..."
-#: ../pidgin/gtkpounce.c:671
+#: ../pidgin/gtkpounce.c:669
msgid "Br_owse..."
msgstr "�頳�(_O)..."
-#: ../pidgin/gtkpounce.c:672
+#: ../pidgin/gtkpounce.c:670
msgid "Pre_view"
msgstr "��荀�(_V)"
-#: ../pidgin/gtkpounce.c:799
+#: ../pidgin/gtkpounce.c:797
msgid "P_ounce only when my status is not Available"
msgstr "������������筝��冴��筝�膩���������(_O)"
-#: ../pidgin/gtkpounce.c:804
+#: ../pidgin/gtkpounce.c:802
msgid "_Recurring"
msgstr "��荀��主��(_R)"
-#: ../pidgin/gtkpounce.c:1260
+#: ../pidgin/gtkpounce.c:1245
msgid "Pounce Target"
msgstr "�������"
#: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
msgid "Default"
msgstr "��荐�"
@@ -14531,13 +16075,6 @@
msgid "_Show system tray icon:"
msgstr "蕁�ず膤紫輝綏ヤ��ｅ��腓�(_S)鐚�"
-#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
-msgid "Always"
-msgstr "��綽�"
-
#: ../pidgin/gtkprefs.c:898
msgid "On unread messages"
msgstr "�����荐�����"
@@ -14550,7 +16087,7 @@
msgid "_Hide new IM conversations:"
msgstr "�沿��佂���恰��荐���困茫�(_H)鐚�"
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1943
msgid "When away"
msgstr "�∫������"
@@ -14603,9 +16140,10 @@
msgid "Show _formatting on incoming messages"
msgstr "蕁�ず���区������弱���(_F)"
+# TODO 荀�荀��� - acli 20070912
#: ../pidgin/gtkprefs.c:997
-msgid "Show buddy _icons"
-msgstr "蕁�ず絅遵���腓�(_I)"
+msgid "Show _detailed information"
+msgstr "蕁�ず荅括完莖�荐�(_D)"
#: ../pidgin/gtkprefs.c:999
msgid "Enable buddy ic_on animation"
@@ -14648,132 +16186,132 @@
msgid "Conversation _font:"
msgstr "篋よ�����絖���(_F)鐚�"
-#: ../pidgin/gtkprefs.c:1041
+#: ../pidgin/gtkprefs.c:1042
msgid "Default Formatting"
msgstr "��荐㊥�弱�"
# NOTE ��筝��������鐚�����┌����昆鐚���Ⅶ篋坂� :P
-#: ../pidgin/gtkprefs.c:1057
+#: ../pidgin/gtkprefs.c:1061
msgid ""
"This is how your outgoing message text will appear when you use protocols "
"that support formatting."
msgstr ""
"�������罔ｆ������絋���戎������絎���吚�弱���鐚����肴�����綣閞ｅ���蕁�篌守��罧究��絖���"
-#: ../pidgin/gtkprefs.c:1123
+#: ../pidgin/gtkprefs.c:1127
msgid "ST_UN server:"
msgstr "STUN 篌堺����(_U)鐚�"
-#: ../pidgin/gtkprefs.c:1135
+#: ../pidgin/gtkprefs.c:1139
msgid "<span style=\"italic\">Example: stunserver.org</span>"
msgstr "<span style=\"italic\">箴�鐚�stunserver.org</span>"
-#: ../pidgin/gtkprefs.c:1139
+#: ../pidgin/gtkprefs.c:1143
msgid "_Autodetect IP address"
msgstr "�����究謙 IP 篏���(_A)"
-#: ../pidgin/gtkprefs.c:1148
+#: ../pidgin/gtkprefs.c:1152
msgid "Public _IP:"
msgstr "����IP (_I)鐚�"
-#: ../pidgin/gtkprefs.c:1177
+#: ../pidgin/gtkprefs.c:1181
msgid "Ports"
msgstr "��荐���"
-#: ../pidgin/gtkprefs.c:1180
+#: ../pidgin/gtkprefs.c:1184
msgid "_Manually specify range of ports to listen on"
msgstr "�����荐����ｈ�順���(_M)"
-#: ../pidgin/gtkprefs.c:1183
+#: ../pidgin/gtkprefs.c:1187
msgid "_Start port:"
msgstr "��紮���荐���(_S)鐚�"
-#: ../pidgin/gtkprefs.c:1190
+#: ../pidgin/gtkprefs.c:1194
msgid "_End port:"
msgstr "腟�����荐���(_E)鐚�"
-#: ../pidgin/gtkprefs.c:1198
+#: ../pidgin/gtkprefs.c:1202
msgid "Proxy Server"
msgstr "篁ｇ��篌堺����"
# NOTE ���怨����鐚�筝�����罸�����鐚��合�冴��筝�篏睡����
-#: ../pidgin/gtkprefs.c:1202
+#: ../pidgin/gtkprefs.c:1206
msgid "No proxy"
msgstr "筝�篏睡��撮��篌堺����"
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1262
msgid "_User:"
msgstr "篏睡����(_U)鐚�"
-#: ../pidgin/gtkprefs.c:1323
+#: ../pidgin/gtkprefs.c:1327
msgid "Seamonkey"
msgstr "Seamonkey"
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1328
msgid "Opera"
msgstr "Opera"
-#: ../pidgin/gtkprefs.c:1325
+#: ../pidgin/gtkprefs.c:1329
msgid "Netscape"
msgstr "Netscape"
-#: ../pidgin/gtkprefs.c:1326
+#: ../pidgin/gtkprefs.c:1330
msgid "Mozilla"
msgstr "Mozilla"
-#: ../pidgin/gtkprefs.c:1327
+#: ../pidgin/gtkprefs.c:1331
msgid "Konqueror"
msgstr "Konqueror"
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1332
msgid "GNOME Default"
msgstr "GNOME��荐�"
-#: ../pidgin/gtkprefs.c:1329
+#: ../pidgin/gtkprefs.c:1333
msgid "Galeon"
msgstr "Galeon"
-#: ../pidgin/gtkprefs.c:1330
+#: ../pidgin/gtkprefs.c:1334
msgid "Firefox"
msgstr "Firefox"
-#: ../pidgin/gtkprefs.c:1331
+#: ../pidgin/gtkprefs.c:1335
msgid "Firebird"
msgstr "Firebird"
-#: ../pidgin/gtkprefs.c:1332
+#: ../pidgin/gtkprefs.c:1336
msgid "Epiphany"
msgstr "Epiphany"
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1345
msgid "Manual"
msgstr "篏睡�������"
-#: ../pidgin/gtkprefs.c:1394
+#: ../pidgin/gtkprefs.c:1398
msgid "Browser Selection"
msgstr "�御���頳遵��"
-#: ../pidgin/gtkprefs.c:1398
+#: ../pidgin/gtkprefs.c:1402
msgid "_Browser:"
msgstr "�頳遵��(_B)鐚�"
-#: ../pidgin/gtkprefs.c:1406
+#: ../pidgin/gtkprefs.c:1410
msgid "_Open link in:"
msgstr "���頳遵��賢�����ｇ�(_O)鐚�"
-#: ../pidgin/gtkprefs.c:1408
+#: ../pidgin/gtkprefs.c:1412
msgid "Browser default"
msgstr "�頳遵����荐�"
-#: ../pidgin/gtkprefs.c:1409
+#: ../pidgin/gtkprefs.c:1413
msgid "Existing window"
msgstr "�∽����荀�腦�"
-#: ../pidgin/gtkprefs.c:1411
+#: ../pidgin/gtkprefs.c:1415
msgid "New tab"
msgstr "�医����"
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1429
#, c-format
msgid ""
"_Manual:\n"
@@ -14782,80 +16320,63 @@
"篏睡�������(_M)鐚�\n"
"(茫�篁� %s 篁ｈ；膓峨��)"
-#: ../pidgin/gtkprefs.c:1465
+#: ../pidgin/gtkprefs.c:1469
msgid "Log _format:"
msgstr "�ヨ��弱�(_F)鐚�"
-#: ../pidgin/gtkprefs.c:1470
+#: ../pidgin/gtkprefs.c:1474
msgid "Log all _instant messages"
msgstr "荐��������恰��荐���(_I)"
-#: ../pidgin/gtkprefs.c:1472
+#: ../pidgin/gtkprefs.c:1476
msgid "Log all c_hats"
msgstr "荐���������紊��у�(_H)"
-#: ../pidgin/gtkprefs.c:1474
+#: ../pidgin/gtkprefs.c:1478
msgid "Log all _status changes to system log"
msgstr "荐������������壕��括鎧腟掩�ヨ�(_S)"
-#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
-#: ../pidgin/gtkprefs.c:1865
-msgid "(default)"
-msgstr "(��荐�)"
-
-#: ../pidgin/gtkprefs.c:1620
+#: ../pidgin/gtkprefs.c:1624
msgid "Sound Selection"
msgstr "�後��恰��"
-#: ../pidgin/gtkprefs.c:1630
+#: ../pidgin/gtkprefs.c:1634
msgid "Quietest"
msgstr "��絨��"
-#: ../pidgin/gtkprefs.c:1632
+#: ../pidgin/gtkprefs.c:1636
msgid "Quieter"
msgstr "��鎞��"
-#: ../pidgin/gtkprefs.c:1634
+#: ../pidgin/gtkprefs.c:1638
msgid "Quiet"
msgstr "鎞��"
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1642
msgid "Loud"
msgstr "鎀ц��"
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1644
msgid "Louder"
msgstr "��紊ц��"
-#: ../pidgin/gtkprefs.c:1642
+#: ../pidgin/gtkprefs.c:1646
msgid "Loudest"
msgstr "��紊ц��"
-#: ../pidgin/gtkprefs.c:1705
-msgid "Sound Method"
-msgstr "�恰���㊥�丈�劫�"
-
-#: ../pidgin/gtkprefs.c:1706
+#: ../pidgin/gtkprefs.c:1712
msgid "_Method:"
msgstr "�㊥�丈�劫�(_M)鐚�"
-#: ../pidgin/gtkprefs.c:1708
+#: ../pidgin/gtkprefs.c:1714
msgid "Console beep"
msgstr "�銀���"
-#: ../pidgin/gtkprefs.c:1710
-msgid "Automatic"
-msgstr "����"
-
-#: ../pidgin/gtkprefs.c:1714
-msgid "Command"
-msgstr "��篁�"
-
-#: ../pidgin/gtkprefs.c:1715
+#: ../pidgin/gtkprefs.c:1721
msgid "No sounds"
msgstr "�♂�恰��"
-#: ../pidgin/gtkprefs.c:1723
+#: ../pidgin/gtkprefs.c:1729
#, c-format
msgid ""
"Sound c_ommand:\n"
@@ -14864,118 +16385,82 @@
"�恰����篁�(_C)鐚�\n"
"(茫�篁� %s 篁ｈ；罟���)"
-#: ../pidgin/gtkprefs.c:1749
-msgid "Sound Options"
-msgstr "�恰���檎��"
-
-#: ../pidgin/gtkprefs.c:1750
+#: ../pidgin/gtkprefs.c:1756
msgid "Sounds when conversation has _focus"
msgstr "�銀困茫���緇�莠後�ョ����弱�咲�恰��(_F)"
-#: ../pidgin/gtkprefs.c:1752
+#: ../pidgin/gtkprefs.c:1758
msgid "Enable sounds:"
msgstr "�����恰��鐚�"
-#: ../pidgin/gtkprefs.c:1754
-msgid "Only when available"
-msgstr "筝�膩������∫������"
-
-#: ../pidgin/gtkprefs.c:1755
-msgid "Only when not available"
-msgstr "�∫������"
-
-#: ../pidgin/gtkprefs.c:1763
+#: ../pidgin/gtkprefs.c:1769
msgid "Volume:"
msgstr "�渇���"
-#: ../pidgin/gtkprefs.c:1791
-msgid "Sound Events"
-msgstr "篋�篁狗�恰��"
-
-#: ../pidgin/gtkprefs.c:1843
+#: ../pidgin/gtkprefs.c:1849
msgid "Play"
msgstr "�㊥��"
-#: ../pidgin/gtkprefs.c:1850
-msgid "Event"
-msgstr "篋�篁�"
-
-#: ../pidgin/gtkprefs.c:1869
-msgid "Test"
-msgstr "羝��"
-
-#: ../pidgin/gtkprefs.c:1873
-msgid "Reset"
-msgstr "��臀�"
-
-#: ../pidgin/gtkprefs.c:1877
-msgid "Choose..."
-msgstr "�御��..."
-
-#: ../pidgin/gtkprefs.c:1920
+#: ../pidgin/gtkprefs.c:1926
msgid "_Report idle time:"
msgstr "��臀������堺�(_R)"
-#: ../pidgin/gtkprefs.c:1925
+#: ../pidgin/gtkprefs.c:1931
msgid "Based on keyboard or mouse use"
msgstr "篁ラ�窮�ゅ�羯�藜���篏睡���阪�堺�"
-#: ../pidgin/gtkprefs.c:1934
+#: ../pidgin/gtkprefs.c:1940
msgid "_Auto-reply:"
msgstr "篏������肴��������鐚�"
-#: ../pidgin/gtkprefs.c:1938
+#: ../pidgin/gtkprefs.c:1944
msgid "When both away and idle"
msgstr "�狗�∫��筝�������臀���"
#. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1944
+#: ../pidgin/gtkprefs.c:1950
msgid "Auto-away"
msgstr "�����∫��"
-#: ../pidgin/gtkprefs.c:1946
+#: ../pidgin/gtkprefs.c:1952
msgid "Change status when _idle"
msgstr "��臀����贋�合����(_I)"
# NOTE 茘����翫�� by Ambrose
-#: ../pidgin/gtkprefs.c:1950
-msgid "_Minutes before changing status:"
+#: ../pidgin/gtkprefs.c:1956
+msgid "_Minutes before becoming idle:"
msgstr "��臀��絨������贋�合����(_M)鐚�"
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:1964
msgid "Change _status to:"
msgstr "�贋�合������(_S)鐚�"
#. Signon status stuff
-#: ../pidgin/gtkprefs.c:1979
+#: ../pidgin/gtkprefs.c:1985
msgid "Status at Startup"
msgstr "����������"
-#: ../pidgin/gtkprefs.c:1981
+#: ../pidgin/gtkprefs.c:1987
msgid "Use status from last _exit at startup"
msgstr "篏睡���罨∞�����������"
-#: ../pidgin/gtkprefs.c:1987
+#: ../pidgin/gtkprefs.c:1993
msgid "Status to a_pply at startup:"
msgstr "������絅���������鐚�"
-#: ../pidgin/gtkprefs.c:2025
+#: ../pidgin/gtkprefs.c:2031
msgid "Interface"
msgstr "篁���"
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2033
msgid "Smiley Themes"
msgstr "茵���筝脂�"
-#: ../pidgin/gtkprefs.c:2028
-msgid "Sounds"
-msgstr "�恰��"
-
-#: ../pidgin/gtkprefs.c:2034
+#: ../pidgin/gtkprefs.c:2040
msgid "Browser"
msgstr "�頳遵��"
-#: ../pidgin/gtkprefs.c:2038
+#: ../pidgin/gtkprefs.c:2044
msgid "Status / Idle"
msgstr "����鐚��靷�"
@@ -15064,23 +16549,23 @@
msgid "Apply"
msgstr "絅���"
-#: ../pidgin/gtkrequest.c:1478
+#: ../pidgin/gtkrequest.c:1507
msgid "That file already exists"
msgstr "�ｅ��罟�罅�綏牙�絖���"
-#: ../pidgin/gtkrequest.c:1479
+#: ../pidgin/gtkrequest.c:1508
msgid "Would you like to overwrite it?"
msgstr "���荀���絎����"
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1511
msgid "Overwrite"
msgstr "荀�絲�"
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1512
msgid "Choose New Name"
msgstr "�後��医��腮�"
-#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
+#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
msgid "Select Folder..."
msgstr "�御��莖�����..."
@@ -15122,7 +16607,7 @@
msgid "_Title:"
msgstr "罔�蕁�(_T)鐚�"
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1496
msgid "_Status:"
msgstr "����(_S)鐚�"
@@ -15136,94 +16621,46 @@
msgid "Sa_ve & Use"
msgstr "�峨�筝�戎��(_V)"
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtksavedstatuses.c:1479
#, c-format
msgid "Status for %s"
msgstr "����鐚�%s"
-#: ../pidgin/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "絅遵��糸��"
-
-#: ../pidgin/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "絅遵��糸��"
-
-#: ../pidgin/gtksound.c:65
-msgid "Message received"
-msgstr "�九�域���"
-
-#: ../pidgin/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "荐����九�逸���紮��画�篋よ�"
-
-#: ../pidgin/gtksound.c:67
-msgid "Message sent"
-msgstr "荐�������"
-
-#: ../pidgin/gtksound.c:68
-msgid "Person enters chat"
-msgstr "��篋咲�峨�ヨ��紊��"
-
-#: ../pidgin/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "��篋咲�∫����紊��"
-
-#: ../pidgin/gtksound.c:70
-msgid "You talk in chat"
-msgstr "������紊��茯��"
-
-#: ../pidgin/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "�銀�篋咲�峨�ヨ��紊��"
-
-#: ../pidgin/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "��篋阪����紊��筝㊥��井������絖�"
-
-#: ../pidgin/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer ���"
-
-#: ../pidgin/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer ��紮���紊掩����"
-
#: ../pidgin/gtkstatusbox.c:663
msgid "Waiting for network connection"
msgstr "膈�緇�膓画君�ｇ�..."
-#: ../pidgin/gtkutils.c:627
+#: ../pidgin/gtkutils.c:631
msgid "Google Talk"
msgstr "Google Talk"
-#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
+#: ../pidgin/gtkutils.c:1398 ../pidgin/gtkutils.c:1421
#, c-format
msgid "The following error has occurred loading %s: %s"
msgstr "莠��� %s ���主��篁ヤ����鐚�%s"
-#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1423
msgid "Failed to load image"
msgstr "莅���綵怨�鎀掩��"
-#: ../pidgin/gtkutils.c:1483
+#: ../pidgin/gtkutils.c:1497
#, c-format
msgid "Cannot send folder %s."
msgstr "�≧��渇������ %s��"
-#: ../pidgin/gtkutils.c:1484
+#: ../pidgin/gtkutils.c:1498
#, c-format
msgid ""
"%s cannot transfer a folder. You will need to send the files within "
"individually."
msgstr "%s 羃���莨���渇������鐚�����荀����ュ�渇�������х��罟�罅���"
-#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
-#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1530 ../pidgin/gtkutils.c:1542
+#: ../pidgin/gtkutils.c:1549
msgid "You have dragged an image"
msgstr "�����割�筝���綵怨��"
-#: ../pidgin/gtkutils.c:1517
+#: ../pidgin/gtkutils.c:1531
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."
@@ -15231,23 +16668,23 @@
"���札����镾��活叱�����ヨ����������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�"
"腟�����篏睡������"
-#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
+#: ../pidgin/gtkutils.c:1537 ../pidgin/gtkutils.c:1557
msgid "Set as buddy icon"
msgstr "荐㊦�阪ソ����腓�"
-#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
msgid "Send image file"
msgstr "�渇��綵怨�閡�"
-#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
+#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1558
msgid "Insert in message"
msgstr "���ュ�域���"
-#: ../pidgin/gtkutils.c:1529
+#: ../pidgin/gtkutils.c:1543
msgid "Would you like to set it as the buddy icon for this user?"
msgstr "�����絎�荐㊦�咲����篏睡������絅遵���腓阪���"
-#: ../pidgin/gtkutils.c:1536
+#: ../pidgin/gtkutils.c:1550
msgid ""
"You can send this image as a file transfer, or use it as the buddy icon for "
"this user."
@@ -15255,7 +16692,7 @@
"���札����镾��活叱鐚�������絎��倶�������絅遵���腓榊��劫�鐚�箴��渇��綵怨�閡�腟�����篏睡��"
"����"
-#: ../pidgin/gtkutils.c:1537
+#: ../pidgin/gtkutils.c:1551
msgid ""
"You can insert this image into this message, or use it as the buddy icon for "
"this user"
@@ -15268,17 +16705,17 @@
#. * send. The only logical one is "Application," but do we really want to send a binary and nothing else?
#. * Probably not. I'll just give an error and return.
#. The original patch sent the icon used by the launcher. That's probably wrong
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
msgid "Cannot send launcher"
msgstr "�≧��渇��������"
-#: ../pidgin/gtkutils.c:1595
+#: ../pidgin/gtkutils.c:1609
msgid ""
"You dragged a desktop launcher. Most likely you wanted to send whatever this "
"launcher points to instead of this launcher itself."
msgstr "�����割�筝������������ぇ网��喝�渇���������������罟�罅�鐚���筝�����������昆��"
-#: ../pidgin/gtkutils.c:2317
+#: ../pidgin/gtkutils.c:2344
#, c-format
msgid ""
"<b>File:</b> %s\n"
@@ -15289,25 +16726,25 @@
"<b>罟�罅�紊у�鐚�</b> %s\n"
"<b>���鎞阪�鐚�</b> %d�%d"
-#: ../pidgin/gtkutils.c:2613
+#: ../pidgin/gtkutils.c:2640
#, c-format
msgid "The file '%s' is too large for %s. Please try a smaller image.\n"
msgstr "'%s' 絨� %s 箴�茯�お紊т���茫�荅��絨鋇�藥���綵沿院��\n"
-#: ../pidgin/gtkutils.c:2615
+#: ../pidgin/gtkutils.c:2642
msgid "Icon Error"
msgstr "������"
-#: ../pidgin/gtkutils.c:2616
+#: ../pidgin/gtkutils.c:2643
msgid "Could not set icon"
msgstr "�≧�荐㊤�����"
-#: ../pidgin/gtkutils.c:2716
+#: ../pidgin/gtkutils.c:2743
#, c-format
msgid "Failed to open file '%s': %s"
msgstr "�≧�����罟�罅���%s��鐚�%s"
-#: ../pidgin/gtkutils.c:2765
+#: ../pidgin/gtkutils.c:2792
#, c-format
msgid ""
"Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -15321,31 +16758,31 @@
msgid "Select color"
msgstr "�御��蕁��"
-#: ../pidgin/pidginstock.c:81
+#: ../pidgin/pidginstock.c:86
msgid "_Alias"
msgstr "����(_A)"
-#: ../pidgin/pidginstock.c:83
+#: ../pidgin/pidginstock.c:88
msgid "Close _tabs"
msgstr "��������(_T)"
-#: ../pidgin/pidginstock.c:85
+#: ../pidgin/pidginstock.c:90
msgid "_Get Info"
msgstr "��緇�莖�荐�(_G)"
-#: ../pidgin/pidginstock.c:86
+#: ../pidgin/pidginstock.c:91
msgid "_Invite"
msgstr "��茫�(_I)"
-#: ../pidgin/pidginstock.c:87
+#: ../pidgin/pidginstock.c:92
msgid "_Modify"
msgstr "篆���(_M)"
-#: ../pidgin/pidginstock.c:88
+#: ../pidgin/pidginstock.c:93
msgid "_Open Mail"
msgstr "�����灸散(_O)"
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
msgid "Pidgin smileys"
msgstr "Pidgin 茵�����腓�"
@@ -15362,38 +16799,38 @@
msgid "none"
msgstr "��"
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/plugins/cap/cap.c:450
msgid "Display Statistics"
msgstr "蕁�ず腟沿�莖���"
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
msgid "Response Probability:"
msgstr "����膈������句�鐚�"
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
msgid "Statistics Configuration"
msgstr "腟沿�荐㊤�"
# NOTE ���� gtk/plugins/cap/README
#. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
msgid "Maximum response timeout:"
msgstr "絅遵�篏��阪��荀�������筝���鐚�"
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
msgid "minutes"
msgstr "����"
#. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
msgid "Maximum last-seen difference:"
msgstr ""
# NOTE ���� gtk/plugins/cap/README
# FIXME 篏������醇����⑮鐚�茘���腟�絨���緇��拷��
#. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
msgid "Threshold:"
msgstr "膕上�綺��"
@@ -15403,18 +16840,18 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../pidgin/plugins/cap/cap.c:935
+#: ../pidgin/plugins/cap/cap.c:936
msgid "Contact Availability Prediction"
msgstr "絅遵����������羝�"
#. *< name
#. *< version
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
msgid "Contact Availability Prediction plugin."
msgstr "絅遵����������羝�─腟�"
#. * summary
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:939
msgid ""
"The contact availability plugin (cap) is used to display statistical "
"information about buddies in a users contact list."
@@ -15528,19 +16965,6 @@
msgid "Select Color for %s"
msgstr "��%s�御��蕁��"
-#: ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "靕�蕭�"
-
-# NOTE��Italic�����������腮�綺��罔＞賛��絲���篁ユ�牙��坂源��絖���鐚�����蕭����九����茘��篏�綏我�号訓���削�筝����醇�号③
-#: ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "��蕭�"
-
-#: ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "綺�膩�"
-
#: ../pidgin/plugins/convcolors.c:310
msgid "Ignore incoming format"
msgstr "綽順�ユ�九�域���賢������弱�"
@@ -15705,30 +17129,30 @@
msgid "_Associate Buddy"
msgstr "���絅遵� (_A)"
-#: ../pidgin/plugins/gevolution/gevolution.c:238
-#: ../pidgin/plugins/gevolution/gevolution.c:244
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
msgid "Unable to send e-mail"
msgstr "�≧����咲�糸��灸散"
-#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:241
msgid "The evolution executable was not found in the PATH."
msgstr "�� PATH 茖≧�鞘��医��決��� Evolution 腮�綣��"
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:247
msgid "An e-mail address was not found for this buddy."
msgstr "�憘��域������絅遵��檎�����脂�球�医����"
# NOTE 羈����evolution ��昆��茘������������������������荐�����
-#: ../pidgin/plugins/gevolution/gevolution.c:271
+#: ../pidgin/plugins/gevolution/gevolution.c:273
msgid "Add to Address Book"
msgstr "紜����育��荐���"
-#: ../pidgin/plugins/gevolution/gevolution.c:283
+#: ../pidgin/plugins/gevolution/gevolution.c:285
msgid "Send E-Mail"
msgstr "�渇���糸��灸散"
#. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:410
+#: ../pidgin/plugins/gevolution/gevolution.c:412
msgid "Evolution Integration Configuration"
msgstr "Evolution �翫��荐㊤�"
@@ -15736,7 +17160,7 @@
# NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
# NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
#. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:413
+#: ../pidgin/plugins/gevolution/gevolution.c:415
msgid "Select all accounts that buddies should be auto-added to."
msgstr "茫��御���医�絅遵��渇�ｅ江��絽活����"
@@ -15746,7 +17170,7 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:525
+#: ../pidgin/plugins/gevolution/gevolution.c:527
msgid "Evolution Integration"
msgstr "Evolution �翫��"
@@ -15757,8 +17181,8 @@
#. *< version
#. * summary
#. * description
-#: ../pidgin/plugins/gevolution/gevolution.c:528
#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
msgid "Provides integration with Evolution."
msgstr "��箴��� Evolution ���翫����"
@@ -15811,6 +17235,15 @@
msgid "Test to see that all ui signals are working properly."
msgstr "罟∽�ヤ戎����篁��∝����腮�拭�������処�醇③絽檎��篏���"
+#: ../pidgin/plugins/gtkbuddynote.c:34
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+"\n"
+"<b>絅遵���荐�</b>鐚�%s"
+
#: ../pidgin/plugins/history.c:188
msgid "History"
msgstr "罩桁兓���"
@@ -15860,11 +17293,11 @@
msgid "Draw Markerline in "
msgstr "�����篏睡���腓榊�"
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
msgid "_IM windows"
msgstr "�恰��荐����腦�(_I)"
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
msgid "C_hat windows"
msgstr "��紊��腦�(_H)"
@@ -15880,32 +17313,32 @@
msgid "Music messaging session confirmed."
msgstr "����腆阪��恰�荐���轡篏������"
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:428
msgid "Music Messaging"
msgstr "�恰�荐���"
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:429
msgid "There was a conflict in running the command:"
msgstr "�決�筝�����篁ゆ���主��茵�腦�鐚�"
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:537
msgid "Error Running Editor"
msgstr "�決�膩�鹿����筝㊦�主�����"
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:538
msgid "The following error has occurred:"
msgstr "�主��篋�筝������鐚�"
#. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:637
msgid "Music Messaging Configuration"
msgstr "�恰�荐���┃絎�"
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:641
msgid "Score Editor Path"
msgstr "罔�茘�膩�鹿��君緇�"
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:642
msgid "_Apply"
msgstr "絅���(_A)"
@@ -15917,12 +17350,12 @@
#. *< id
#. *< name
#. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:683
msgid "Music Messaging Plugin for collaborative composition."
msgstr "��蕭�篏��牙�����恰�荐���─腟�"
#. * summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
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."
@@ -15930,35 +17363,35 @@
"�恰�荐���─腟��咲�恰�膩����箴��恰���活����緒�莅�紊���篏睡�����遵����膩�鹿��筝�篁醇�茘���"
#. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: ../pidgin/plugins/notify.c:678
msgid "Notify For"
msgstr "���ョ┏蕁�"
-#: ../pidgin/plugins/notify.c:691
+#: ../pidgin/plugins/notify.c:697
msgid "\t_Only when someone says your screen name"
msgstr "\t���倶��篋堺��井������絖�(_O)"
-#: ../pidgin/plugins/notify.c:701
+#: ../pidgin/plugins/notify.c:707
msgid "_Focused windows"
msgstr "���荀�腦�(_F)"
#. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: ../pidgin/plugins/notify.c:715
msgid "Notification Methods"
msgstr "���ユ�劫�"
-#: ../pidgin/plugins/notify.c:716
+#: ../pidgin/plugins/notify.c:722
msgid "Prepend _string into window title:"
msgstr "���ュ�筝峨�域�腦�罔�蕁�箙���(_S)鐚�"
#. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: ../pidgin/plugins/notify.c:741
msgid "Insert c_ount of new messages into window title"
msgstr "���ユ�域����悟���域�腦�罔�蕁�筝�(_O)"
# TODO 荀�荀��� - 20061029
#. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: ../pidgin/plugins/notify.c:750
msgid "Insert count of new message into _X property"
msgstr "���ユ�域����悟���� X 絮��т賢(_X)"
@@ -15966,42 +17399,42 @@
# NOTE��URGENT��筝�絖�紊ф���荅俄���鐚����榊�紊у��悟��荀�腦�膊∞���♂�巡���呃���筝���綣��翫�����緇���
# NOTE 茘����翫�� by Ambrose
#. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: ../pidgin/plugins/notify.c:758
msgid "Set window manager \"_URGENT\" hint"
msgstr "荐㊤�荀�腦�����URGENT��鐚�膩��ヨ�荐�鐚���腓�(_U)"
#. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: ../pidgin/plugins/notify.c:767
msgid "R_aise conversation window"
msgstr "羌�憘困茫�荀�腦�(_A)"
#. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: ../pidgin/plugins/notify.c:775
msgid "Notification Removal"
msgstr "���ョЩ��"
#. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: ../pidgin/plugins/notify.c:780
msgid "Remove when conversation window _gains focus"
msgstr "�銀困茫���緇�莠後�ョ�����腱脂�ら����(_G)"
#. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: ../pidgin/plugins/notify.c:787
msgid "Remove when conversation window _receives click"
msgstr "�銀困茫�荀�腦�茴���御��腱脂�ら����(_R)"
#. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: ../pidgin/plugins/notify.c:795
msgid "Remove when _typing in conversation window"
msgstr "�九��困茫�荀�腦�筝㊧叱�ユ��腱脂�ら����(_T)"
#. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: ../pidgin/plugins/notify.c:803
msgid "Remove when a _message gets sent"
msgstr "���肴����腱脂�ら����(_M)"
#. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: ../pidgin/plugins/notify.c:812
msgid "Remove on switch to conversation ta_b"
msgstr "�区�腦�罔�膠よ←藥��後�腱脂�ら����(_B)"
@@ -16011,7 +17444,7 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../pidgin/plugins/notify.c:901
+#: ../pidgin/plugins/notify.c:907
msgid "Message Notification"
msgstr "荐�������"
@@ -16019,7 +17452,7 @@
#. *< version
#. * summary
#. * description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
msgid "Provides a variety of ways of notifying you of unread messages."
msgstr "��箴�紊�腮��劫�箴����ユ�����������荐�����"
@@ -16396,45 +17829,45 @@
"timestamp formats."
msgstr "����罔∞���荐延戎�������荐㊤�篋よ����ヨ���荐��������活��弱���"
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
msgid "Opacity:"
msgstr "筝����嫜鐚�"
#. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
msgid "IM Conversation Windows"
msgstr "�恰��荐���困茫�荀�腦�"
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
msgid "_IM window transparency"
msgstr "�恰��荐����腦����嫜(_I)"
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
msgid "_Show slider bar in IM window"
msgstr "���恰��荐����腦�筝㊨¨腓� Slider Bar(_S)"
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
msgid "Remove IM window transparency on focus"
msgstr "���恰��荐����腦���緇������腱脂�ら���嫜"
# XXX ��荅我����W32腮�綣鋇㏍��絨�荀�腦�篆����惹��∽��筝�絮ゃ�����純��
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
msgid "Always on top"
msgstr "膰醇������筝�絮�"
#. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
msgid "Buddy List Window"
msgstr "絅遵�羝����腦�"
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
msgid "_Buddy List window transparency"
msgstr "絅遵�羝����腦����嫜(_B)"
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
msgid "Remove Buddy List window transparency on focus"
msgstr "��緇�莠後�ョ�����腱脂�ゅソ��羝����腦����嫜"
@@ -16444,19 +17877,19 @@
#. *< dependencies
#. *< priority
#. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
msgid "Transparency"
msgstr "���嫜"
#. *< name
#. *< version
#. * summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
msgid "Variable Transparency for the buddy list and conversations."
msgstr "篋よ�荀�腦���絅遵�羝����∝���������������"
#. * description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
msgid ""
"This plugin enables variable alpha transparency on conversation windows and "
"the buddy list.\n"
@@ -16467,47 +17900,47 @@
"\n"
"* 顇�羈��������罔∞���荀��喝� Win2000 �� Windows �������順�∝��������"
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
msgid "GTK+ Runtime Version"
msgstr "GTK+ Runtime ����"
#. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
msgid "Startup"
msgstr "����"
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
#, c-format
msgid "_Start %s on Windows startup"
msgstr "�� Windows �����������決� %s (_S)"
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
msgid "_Dockable Buddy List"
msgstr "����薈���絅遵�羝���(_D)"
#. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
msgid "_Keep Buddy List window on top:"
msgstr "絅遵�羝����腦�篆�������∽��筝�絮�(_K)鐚�"
#. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
msgid "Only when docked"
msgstr "������薈�������"
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
msgid "_Flash window when chat messages are received"
msgstr "�九�域��紊���������荀�腦�(_F)"
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
msgid "Windows Pidgin Options"
msgstr "Windows �� Pidgin �檎��"
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
msgid "Options specific to Pidgin for Windows."
msgstr "Windows �� Pidgin ���檎���檎����"
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
msgid ""
"Provides options specific to Pidgin for Windows , such as buddy list docking."
msgstr "��箴� Windows �� Pidgin ���檎���檎��鐚�箴�絋�絅遵�羝�������薈����純��"
@@ -16561,6 +17994,99 @@
msgid "This plugin is useful for debbuging XMPP servers or clients."
msgstr "綛����� XMPP 篌堺������絎∽�句��画��ら����"
+#~ msgid "You have just sent a Nudge!"
+#~ msgstr "�������坂�筝����弱ǚ�"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s ���弱ŭ���"
+
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "�����坂���������糸�冴��"
+
+#~ msgid "Are you sure to exit this Qun?"
+#~ msgstr "��∈絎�荀��∫������臂� (Qun) ���"
+
+#~ msgid "Go ahead"
+#~ msgstr "腆阪�"
+
+#~ msgid "Server ACK"
+#~ msgstr "篌堺��������"
+
+#~ msgid "Keep alive error, seems connection lost!"
+#~ msgstr "Keep alive �主�����鐚��ｇ�篌寂�綏牙��銀賢�件�"
+
+#~ msgid "Request login token error!"
+#~ msgstr "���糸�ヨ�羆���Token �榊憥���"
+
+# NOTE ��筝㊦����%s������UDP������TCP��鐚���篁ヨ⑮�����冴��篏������������医����
+#~ msgid "%s Address"
+#~ msgstr "%s 篏���"
+
+#~ msgid "QQ: Available"
+#~ msgstr "QQ: 筝�膩�"
+
+#~ msgid "QQ: Away"
+#~ msgstr "QQ: �∫��"
+
+#~ msgid "QQ: Invisible"
+#~ msgstr "QQ: �沿昆"
+
+#~ msgid "QQ: Offline"
+#~ msgstr "QQ: �∝�"
+
+#~ msgid "Modify My Information"
+#~ msgstr "篆��壕�荐�"
+
+#~ msgid "Login in TCP"
+#~ msgstr "篁� TCP �糸��"
+
+#~ msgid "Login Hidden"
+#~ msgstr "篁ラ�沿������嶃��"
+
+#~ msgid "Socket send error"
+#~ msgstr "絲��� Socket ��筝㊦�主�����"
+
+# XXX - 20061027
+#~ msgid "Connection refused"
+#~ msgstr "�ｇ�茴���"
+
+#~ msgid "Would like to add him?"
+#~ msgstr "���喝�篁�鐚�絅刻����ュ�井����絅遵�羝������"
+
+# XXX ���遵�札茘������筝�藥�
+#~ msgid "%s just sent you a Buzz!"
+#~ msgstr "%s ���弱ŭ���"
+
+# XXX ���遵�札茘������筝�藥�
+#~ msgid "You have just sent a Buzz!"
+#~ msgstr "�������坂�筝����弱ǚ�"
+
+#~ msgid "/Options/Show Buddy _Icon"
+#~ msgstr "/�檎��/蕁�ず絅遵���腓�(_I)"
+
+#~ msgid "/Options/Show Buddy Icon"
+#~ msgstr "/�檎��/蕁�ず絅遵���腓�"
+
+# XXX ����荅我����nn��腆種��潟��Nynorsk Norwegian��鐚���篁ョ�頑⑮���������筝���亥��
+# XXX 篏���������no��腆種�篏� no.po �九�綏牙�筝�絖��������＞��№����
+#~ msgid "Norwegian"
+#~ msgstr "�����"
+
+#~ msgid "_Bold"
+#~ msgstr "膕�蕭�(_B)"
+
+#~ msgid "_Larger"
+#~ msgstr "�上ぇ絖�蕭�(_L)"
+
+#~ msgid "_Smaller"
+#~ msgstr "膰��絖�蕭�(_S)"
+
+#~ msgid "_Reset font"
+#~ msgstr "羝��ゆ�弱���(_R)"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "蕁�ず絅遵���腓�(_I)"
+
# NOTE 羃�莨��鐚�����亥������鐚���羃�羈��号�絖�������
#~ msgid "Commands are not supported yet. Message was NOT sent."
#~ msgstr "絨�����吚��篁わ�荐�����罩ゆ���茴����冴��"
@@ -16589,24 +18115,15 @@
#~ msgid "/Buddies/_About Pidgin"
#~ msgstr "/絅遵�/���� Pidgin(_A)"
-#~ msgid "Larger font size"
-#~ msgstr "�上ぇ絖�蕭�"
-
#~ msgid "Smaller font size"
#~ msgstr "膰��絖�蕭�"
-#~ msgid "Reset formatting"
-#~ msgstr "羝��ゆ�弱���"
-
#~ msgid "Insert link"
#~ msgstr "���ラ�ｇ�"
#~ msgid "Insert image"
#~ msgstr "���ュ襲��"
-#~ msgid "Insert smiley"
-#~ msgstr "���ヨ；��"
-
#~ msgid "Tools"
#~ msgstr "綏ュ��"
@@ -16798,13 +18315,6 @@
#~ msgid ""
#~ "\n"
-#~ "<b>Buddy Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>絅遵��ュ��鐚�</b>%s"
-
-#~ msgid ""
-#~ "\n"
#~ "<b>Nickname:</b> %s"
#~ msgstr ""
#~ "\n"
@@ -17033,10 +18543,6 @@
#~ msgstr "�弱���絽活��..."
# XXX 荀�荀���
-#~ msgid "Selection"
-#~ msgstr "�御��"
-
-# XXX 荀�荀���
#~ msgid "Faces"
#~ msgstr "絅遵���腓�"
@@ -17054,9 +18560,6 @@
#~ msgid "<i>Information below may not be accurate</i><br>\n"
#~ msgstr "��筝���莖�荐����巡�羣�腆冴��<br>\n"
-#~ msgid "Change My Face"
-#~ msgstr "篆��劫ソ����腓�"
-
#~ msgid "Please wait for new version"
#~ msgstr "茫�膈�緇��亥����ｨ��"
@@ -17113,9 +18616,6 @@
#~ msgid "Gaim - Save As..."
#~ msgstr "Gaim - �峨���..."
-#~ msgid "Buzz!!"
-#~ msgstr "�駈�"
-
#~ msgid "The user %s wants to add %s to his or her buddy list%s%s."
#~ msgstr "篏睡���� %s �活�絨� %s ���ヤ�鐚�絅刻���絅遵�羝���%s%s��"
@@ -17252,9 +18752,6 @@
#~ msgid "Use TLS if available"
#~ msgstr "TLS ��������"
-#~ msgid "Require TLS"
-#~ msgstr "��荀�TLS"
-
#~ msgid "Lost connection with server for an unknown reason."
#~ msgstr "���坂������絨��頑��篌堺�����ｇ�筝㊥�激��"
@@ -17310,18 +18807,12 @@
#~ 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."
@@ -17354,9 +18845,6 @@
#~ msgid "Chat is currently unavailable"
#~ msgstr "�����≧�篏睡����紊��"
-#~ msgid "Unable to create new connection."
-#~ msgstr "�≧������育�ｇ���"
-
#~ msgid "Auth host"
#~ msgstr "茯�茘�篌堺����"
@@ -17417,9 +18905,6 @@
#~ msgid "Call ended."
#~ msgstr "腟����弱ù��"
-#~ msgid "Calling %s"
-#~ msgstr "�弱� %s"
-
#~ msgid "End Call"
#~ msgstr "靚����弱�"
@@ -17447,9 +18932,6 @@
#~ msgid "Realname"
#~ msgstr "鎈���"
-#~ msgid "Email Address"
-#~ msgstr "�糸��灸散"
-
#~ msgid "EMail"
#~ msgstr "�糸��灸散"
@@ -17518,194 +19000,3 @@
#, fuzzy
#~ 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)..."
-
-# 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 "Hide Disconnect Errors"
-#~ msgstr "筝�蕁�ず筝㊥�潔�ｇ����"
-
-#~ msgid "Hide Login Errors"
-#~ msgstr "筝�蕁�ず�糸�ラ���"
-
-#~ msgid "Hide Reconnecting Dialog"
-#~ msgstr "�沿����佉�ｇ�篋よ�荀�腦�"
-
-#~ msgid "When you are kicked offline, this reconnects you."
-#~ msgstr "�銀��欠���鐚�膤紫輝������綛�����育�ｇ���"
-
-# NOTE 茘����後� by Etan Reisner (���取��箙�筝�)
-#~ 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"